merged skunkworks into develop.
This commit is contained in:
117
laravel/core.php
117
laravel/core.php
@@ -9,59 +9,22 @@
|
||||
define('EXT', '.php');
|
||||
define('CRLF', "\r\n");
|
||||
define('BLADE_EXT', '.blade.php');
|
||||
define('APP_PATH', realpath($application).'/');
|
||||
define('PUBLIC_PATH', realpath($public).'/');
|
||||
define('SYS_PATH', realpath($laravel).'/');
|
||||
define('STORAGE_PATH', APP_PATH.'storage/');
|
||||
define('CACHE_PATH', STORAGE_PATH.'cache/');
|
||||
define('CONFIG_PATH', APP_PATH.'config/');
|
||||
define('CONTROLLER_PATH', APP_PATH.'controllers/');
|
||||
define('DATABASE_PATH', STORAGE_PATH.'database/');
|
||||
define('LANG_PATH', APP_PATH.'language/');
|
||||
define('LIBRARY_PATH', APP_PATH.'libraries/');
|
||||
define('MODEL_PATH', APP_PATH.'models/');
|
||||
define('ROUTE_PATH', APP_PATH.'routes/');
|
||||
define('SESSION_PATH', STORAGE_PATH.'sessions/');
|
||||
define('SYS_CONFIG_PATH', SYS_PATH.'config/');
|
||||
define('VIEW_PATH', APP_PATH.'views/');
|
||||
|
||||
/**
|
||||
* Define the Laravel environment configuration path. This path is used
|
||||
* by the configuration class to load configuration options specific for
|
||||
* the server environment, allowing the developer to conveniently change
|
||||
* configuration options based on the application environment.
|
||||
*
|
||||
*/
|
||||
$environment = '';
|
||||
|
||||
if (isset($_SERVER['LARAVEL_ENV']))
|
||||
{
|
||||
$environment = CONFIG_PATH.$_SERVER['LARAVEL_ENV'].'/';
|
||||
}
|
||||
|
||||
define('ENV_CONFIG_PATH', $environment);
|
||||
|
||||
unset($application, $public, $laravel, $environment);
|
||||
define('CACHE_PATH', STORAGE_PATH.'cache'.DS);
|
||||
define('DATABASE_PATH', STORAGE_PATH.'database'.DS);
|
||||
define('SESSION_PATH', STORAGE_PATH.'sessions'.DS);
|
||||
define('DEFAULT_BUNDLE', 'application');
|
||||
define('MB_STRING', (int) function_exists('mb_get_info'));
|
||||
|
||||
/**
|
||||
* Require all of the classes that can't be loaded by the auto-loader.
|
||||
* These are typically classes that the auto-loader itself relies upon
|
||||
* to load classes, such as the array and configuration classes.
|
||||
*/
|
||||
require SYS_PATH.'arr'.EXT;
|
||||
require SYS_PATH.'bundle'.EXT;
|
||||
require SYS_PATH.'config'.EXT;
|
||||
require SYS_PATH.'facades'.EXT;
|
||||
require SYS_PATH.'helpers'.EXT;
|
||||
require SYS_PATH.'autoloader'.EXT;
|
||||
|
||||
/**
|
||||
* Load a few of the core configuration files that are loaded for every
|
||||
* request to the application. It is quicker to load them manually each
|
||||
* request rather than parse the keys for every request.
|
||||
*/
|
||||
Config::load('application');
|
||||
Config::load('session');
|
||||
Config::load('error');
|
||||
|
||||
/**
|
||||
* Register the Autoloader's "load" method on the auto-loader stack.
|
||||
* This method provides the lazy-loading of all class files, as well
|
||||
@@ -75,22 +38,27 @@ spl_autoload_register(array('Laravel\\Autoloader', 'load'));
|
||||
* More mappings can also be registered by the developer as needed.
|
||||
*/
|
||||
Autoloader::$mappings = array(
|
||||
'Laravel\\Arr' => SYS_PATH.'arr'.EXT,
|
||||
'Laravel\\Asset' => SYS_PATH.'asset'.EXT,
|
||||
'Laravel\\Auth' => SYS_PATH.'auth'.EXT,
|
||||
'Laravel\\Asset' => SYS_PATH.'asset'.EXT,
|
||||
'Laravel\\Benchmark' => SYS_PATH.'benchmark'.EXT,
|
||||
'Laravel\\Blade' => SYS_PATH.'blade'.EXT,
|
||||
'Laravel\\Bundle' => SYS_PATH.'bundle'.EXT,
|
||||
'Laravel\\Cache' => SYS_PATH.'cache'.EXT,
|
||||
'Laravel\\Config' => SYS_PATH.'config'.EXT,
|
||||
'Laravel\\Cookie' => SYS_PATH.'cookie'.EXT,
|
||||
'Laravel\\Crypter' => SYS_PATH.'crypter'.EXT,
|
||||
'Laravel\\Database' => SYS_PATH.'database'.EXT,
|
||||
'Laravel\\Error' => SYS_PATH.'error'.EXT,
|
||||
'Laravel\\Event' => SYS_PATH.'event'.EXT,
|
||||
'Laravel\\File' => SYS_PATH.'file'.EXT,
|
||||
'Laravel\\Fluent' => SYS_PATH.'fluent'.EXT,
|
||||
'Laravel\\Form' => SYS_PATH.'form'.EXT,
|
||||
'Laravel\\Hash' => SYS_PATH.'hash'.EXT,
|
||||
'Laravel\\HTML' => SYS_PATH.'html'.EXT,
|
||||
'Laravel\\Inflector' => SYS_PATH.'inflector'.EXT,
|
||||
'Laravel\\Input' => SYS_PATH.'input'.EXT,
|
||||
'Laravel\\IoC' => SYS_PATH.'ioc'.EXT,
|
||||
'Laravel\\Lang' => SYS_PATH.'lang'.EXT,
|
||||
'Laravel\\Log' => SYS_PATH.'log'.EXT,
|
||||
'Laravel\\Memcached' => SYS_PATH.'memcached'.EXT,
|
||||
'Laravel\\Messages' => SYS_PATH.'messages'.EXT,
|
||||
'Laravel\\Paginator' => SYS_PATH.'paginator'.EXT,
|
||||
@@ -99,40 +67,62 @@ Autoloader::$mappings = array(
|
||||
'Laravel\\Request' => SYS_PATH.'request'.EXT,
|
||||
'Laravel\\Response' => SYS_PATH.'response'.EXT,
|
||||
'Laravel\\Section' => SYS_PATH.'section'.EXT,
|
||||
'Laravel\\Session' => SYS_PATH.'session'.EXT,
|
||||
'Laravel\\Str' => SYS_PATH.'str'.EXT,
|
||||
'Laravel\\URI' => SYS_PATH.'uri'.EXT,
|
||||
'Laravel\\URL' => SYS_PATH.'url'.EXT,
|
||||
'Laravel\\Validator' => SYS_PATH.'validator'.EXT,
|
||||
'Laravel\\View' => SYS_PATH.'view'.EXT,
|
||||
'Laravel\\Cache\\Manager' => SYS_PATH.'cache/manager'.EXT,
|
||||
|
||||
'Laravel\\Cache\\Drivers\\APC' => SYS_PATH.'cache/drivers/apc'.EXT,
|
||||
'Laravel\\Cache\\Drivers\\Driver' => SYS_PATH.'cache/drivers/driver'.EXT,
|
||||
'Laravel\\Cache\\Drivers\\File' => SYS_PATH.'cache/drivers/file'.EXT,
|
||||
'Laravel\\Cache\\Drivers\\Memcached' => SYS_PATH.'cache/drivers/memcached'.EXT,
|
||||
'Laravel\\Cache\\Drivers\\Redis' => SYS_PATH.'cache/drivers/redis'.EXT,
|
||||
'Laravel\\Cache\\Drivers\\Database' => SYS_PATH.'cache/drivers/database'.EXT,
|
||||
|
||||
'Laravel\\CLI\\Command' => SYS_PATH.'cli/command'.EXT,
|
||||
'Laravel\\CLI\\Tasks\\Task' => SYS_PATH.'cli/tasks/task'.EXT,
|
||||
'Laravel\\CLI\\Tasks\\Bundle\\Bundler' => SYS_PATH.'cli/tasks/bundle/bundler'.EXT,
|
||||
'Laravel\\CLI\\Tasks\\Bundle\\Repository' => SYS_PATH.'cli/tasks/bundle/repository'.EXT,
|
||||
'Laravel\\CLI\\Tasks\\Bundle\\Publisher' => SYS_PATH.'cli/tasks/bundle/publisher'.EXT,
|
||||
'Laravel\\CLI\\Tasks\\Bundle\\Providers\\Provider' => SYS_PATH.'cli/tasks/bundle/providers/provider'.EXT,
|
||||
'Laravel\\CLI\\Tasks\\Bundle\\Providers\\Github' => SYS_PATH.'cli/tasks/bundle/providers/github'.EXT,
|
||||
'Laravel\\CLI\\Tasks\\Migrate\\Migrator' => SYS_PATH.'cli/tasks/migrate/migrator'.EXT,
|
||||
'Laravel\\CLI\\Tasks\\Migrate\\Resolver' => SYS_PATH.'cli/tasks/migrate/resolver'.EXT,
|
||||
'Laravel\\CLI\\Tasks\\Migrate\\Database' => SYS_PATH.'cli/tasks/migrate/database'.EXT,
|
||||
|
||||
'Laravel\\Database\\Connection' => SYS_PATH.'database/connection'.EXT,
|
||||
'Laravel\\Database\\Expression' => SYS_PATH.'database/expression'.EXT,
|
||||
'Laravel\\Database\\Manager' => SYS_PATH.'database/manager'.EXT,
|
||||
'Laravel\\Database\\Query' => SYS_PATH.'database/query'.EXT,
|
||||
'Laravel\\Database\\Schema' => SYS_PATH.'database/schema'.EXT,
|
||||
'Laravel\\Database\\Grammar' => SYS_PATH.'database/grammar'.EXT,
|
||||
'Laravel\\Database\\Connectors\\Connector' => SYS_PATH.'database/connectors/connector'.EXT,
|
||||
'Laravel\\Database\\Connectors\\MySQL' => SYS_PATH.'database/connectors/mysql'.EXT,
|
||||
'Laravel\\Database\\Connectors\\Postgres' => SYS_PATH.'database/connectors/postgres'.EXT,
|
||||
'Laravel\\Database\\Connectors\\SQLite' => SYS_PATH.'database/connectors/sqlite'.EXT,
|
||||
'Laravel\\Database\\Eloquent\\Hydrator' => SYS_PATH.'database/eloquent/hydrator'.EXT,
|
||||
'Laravel\\Database\\Eloquent\\Model' => SYS_PATH.'database/eloquent/model'.EXT,
|
||||
'Laravel\\Database\\Grammars\\Grammar' => SYS_PATH.'database/grammars/grammar'.EXT,
|
||||
'Laravel\\Database\\Grammars\\MySQL' => SYS_PATH.'database/grammars/mysql'.EXT,
|
||||
'Laravel\\Database\\Connectors\\SQLServer' => SYS_PATH.'database/connectors/sqlserver'.EXT,
|
||||
'Laravel\\Database\\Query\\Grammars\\Grammar' => SYS_PATH.'database/query/grammars/grammar'.EXT,
|
||||
'Laravel\\Database\\Query\\Grammars\\MySQL' => SYS_PATH.'database/query/grammars/mysql'.EXT,
|
||||
'Laravel\\Database\\Query\\Grammars\\SQLServer' => SYS_PATH.'database/query/grammars/sqlserver'.EXT,
|
||||
'Laravel\\Database\\Schema\\Table' => SYS_PATH.'database/schema/table'.EXT,
|
||||
'Laravel\\Database\\Schema\\Grammars\\Grammar' => SYS_PATH.'database/schema/grammars/grammar'.EXT,
|
||||
'Laravel\\Database\\Schema\\Grammars\\MySQL' => SYS_PATH.'database/schema/grammars/mysql'.EXT,
|
||||
'Laravel\\Database\\Schema\\Grammars\\Postgres' => SYS_PATH.'database/schema/grammars/postgres'.EXT,
|
||||
'Laravel\\Database\\Schema\\Grammars\\SQLServer' => SYS_PATH.'database/schema/grammars/sqlserver'.EXT,
|
||||
'Laravel\\Database\\Schema\\Grammars\\SQLite' => SYS_PATH.'database/schema/grammars/sqlite'.EXT,
|
||||
|
||||
'Laravel\\Routing\\Controller' => SYS_PATH.'routing/controller'.EXT,
|
||||
'Laravel\\Routing\\Filter' => SYS_PATH.'routing/filter'.EXT,
|
||||
'Laravel\\Routing\\Loader' => SYS_PATH.'routing/loader'.EXT,
|
||||
'Laravel\\Routing\\Filter_Collection' => SYS_PATH.'routing/filter'.EXT,
|
||||
'Laravel\\Routing\\Route' => SYS_PATH.'routing/route'.EXT,
|
||||
'Laravel\\Routing\\Router' => SYS_PATH.'routing/router'.EXT,
|
||||
|
||||
'Laravel\\Session\\Payload' => SYS_PATH.'session/payload'.EXT,
|
||||
'Laravel\\Session\\Drivers\\APC' => SYS_PATH.'session/drivers/apc'.EXT,
|
||||
'Laravel\\Session\\Drivers\\Cookie' => SYS_PATH.'session/drivers/cookie'.EXT,
|
||||
'Laravel\\Session\\Drivers\\Database' => SYS_PATH.'session/drivers/database'.EXT,
|
||||
'Laravel\\Session\\Drivers\\Driver' => SYS_PATH.'session/drivers/driver'.EXT,
|
||||
'Laravel\\Session\\Drivers\\Factory' => SYS_PATH.'session/drivers/factory'.EXT,
|
||||
'Laravel\\Session\\Drivers\\File' => SYS_PATH.'session/drivers/file'.EXT,
|
||||
'Laravel\\Session\\Drivers\\Memcached' => SYS_PATH.'session/drivers/memcached'.EXT,
|
||||
'Laravel\\Session\\Drivers\\Redis' => SYS_PATH.'session/drivers/redis'.EXT,
|
||||
@@ -140,16 +130,9 @@ Autoloader::$mappings = array(
|
||||
);
|
||||
|
||||
/**
|
||||
* Register the default timezone for the application. This will be
|
||||
* the default timezone used by all date / timezone functions in
|
||||
* the entire application.
|
||||
* Register all of the core class aliases. These aliases provide a
|
||||
* convenient way of working with the Laravel core classes without
|
||||
* having to worry about the namespacing. The developer is also
|
||||
* free to remove aliases when they extend core classes.
|
||||
*/
|
||||
date_default_timezone_set(Config::$items['application']['timezone']);
|
||||
|
||||
/**
|
||||
* Define a few global, convenient functions. These functions
|
||||
* provide short-cuts for things like the retrieval of language
|
||||
* lines and HTML::entities. They just make our lives as devs a
|
||||
* little sweeter and more enjoyable.
|
||||
*/
|
||||
require SYS_PATH.'helpers'.EXT;
|
||||
Autoloader::$aliases = Config::get('application.aliases');
|
||||
Reference in New Issue
Block a user