diff --git a/application/config/application.php b/application/config/application.php index 8ce59fa9..e7c9b9ba 100644 --- a/application/config/application.php +++ b/application/config/application.php @@ -66,25 +66,6 @@ 'language' => 'en', - /* - |-------------------------------------------------------------------------- - | Auto-Loaded Packages - |-------------------------------------------------------------------------- - | - | The packages that should be auto-loaded each time Laravel handles a - | request. These should generally be packages that you use on almost every - | request to your application. - | - | Each package specified here will be bootstrapped and can be conveniently - | used by your application's routes, models, and libraries. - | - | Note: The package names in this array should correspond to a package - | directory in application/packages. - | - */ - - 'libraries' => array(), - /* |-------------------------------------------------------------------------- | SSL Link Generation diff --git a/laravel/autoloader.php b/laravel/autoloader.php index 3ca4b75c..07202c6b 100644 --- a/laravel/autoloader.php +++ b/laravel/autoloader.php @@ -56,9 +56,13 @@ protected static function find($class) $namespace = substr($class, 0, strpos($class, '\\')); - // If the namespace has been detected as a PSR-0 compliant library, - // we will load the library according to those naming conventions. - if (array_key_exists($namespace, static::$libraries)) + // If the namespace has been registered as a PSR-0 compliant library, we will + // load the library according to the PSR-0 naming standards, which state that + // namespaces and underscores indicate the directory hierarchy of the class. + // The PSR-0 standard is exactly like the typical Laravel standard, the only + // difference being that Laravel files are all lowercase, while PSR-0 states + // that the file name should match the class name. + if (isset(static::$libraries[$namespace])) { return str_replace('_', '/', $file).EXT; } @@ -71,10 +75,12 @@ protected static function find($class) } } - // If the file exists according to the PSR-0 naming conventions, - // we will add the namespace to the array of libraries and load - // the class according to the PSR-0 conventions. - if (file_exists($path = str_replace('_', '/', $file).EXT)) + // If we could not find the class file in any of the auto-loaded locations + // according to the Laravel naming standard, we will search the libraries + // directory for the class according to the PSR-0 naming standard. If the + // file exists, we will add the class namespace to the array of registered + // libraries that are loaded following the PSR-0 standard. + if (file_exists($path = LIBRARY_PATH.str_replace('_', '/', $file).EXT)) { static::$libraries[] = $namespace; diff --git a/laravel/bootstrap/constants.php b/laravel/bootstrap/constants.php deleted file mode 100644 index 9a6f99e3..00000000 --- a/laravel/bootstrap/constants.php +++ /dev/null @@ -1,58 +0,0 @@ - $value) - { - if ( ! defined($key)) define($key, $value); - } -} - -/** - * Register the core framework paths and all of the paths that - * derive from them. If any constant has already been defined, - * we will not attempt to define it again. - */ -$constants = array( - 'APP_PATH' => realpath($application).'/', - 'BASE_PATH' => realpath("$laravel/..").'/', - 'PUBLIC_PATH' => realpath($public).'/', - 'STORAGE_PATH' => realpath($storage).'/', - 'SYS_PATH' => realpath($laravel).'/', -); - -constants($constants); - -unset($application, $public, $storage, $laravel); - -$constants = array( - 'CACHE_PATH' => STORAGE_PATH.'cache/', - 'CONFIG_PATH' => APP_PATH.'config/', - 'CONTROLLER_PATH' => APP_PATH.'controllers/', - 'DATABASE_PATH' => STORAGE_PATH.'database/', - 'LANG_PATH' => APP_PATH.'language/', - 'LIBRARY_PATH' => APP_PATH.'libraries/', - 'MODEL_PATH' => APP_PATH.'models/', - 'ROUTE_PATH' => APP_PATH.'routes/', - 'SESSION_PATH' => STORAGE_PATH.'sessions/', - 'SYS_CONFIG_PATH' => SYS_PATH.'config/', - 'SYS_VIEW_PATH' => SYS_PATH.'views/', - 'VIEW_PATH' => APP_PATH.'views/', -); - - -constants($constants); - -/** - * Register the core framework paths and all of the paths that - * derive from them. If any constant has already been defined, - * we will not attempt to define it again. - */ -$environment = (isset($_SERVER['LARAVEL_ENV'])) ? CONFIG_PATH.$_SERVER['LARAVEL_ENV'].'/' : ''; - -constants(array('ENV_CONFIG_PATH' => $environment)); - -unset($constants, $environment); \ No newline at end of file diff --git a/laravel/bootstrap/core.php b/laravel/bootstrap/core.php index ab43bc94..0af85bbd 100644 --- a/laravel/bootstrap/core.php +++ b/laravel/bootstrap/core.php @@ -1,21 +1,87 @@ core('session')->flash(Input::old_input, static::get()); + } + /** * Determine if the old input data contains an item. * @@ -74,16 +84,6 @@ public static function had($key) return ( ! is_null(static::old($key)) and trim((string) static::old($key)) !== ''); } - /** - * Flash the input for the current request to the session. - * - * @return void - */ - public static function flash() - { - IoC::container()->core('session')->flash(Input::old_input, static::get()); - } - /** * Get input data from the previous request. * diff --git a/laravel/redis.php b/laravel/redis.php index 6108a7bb..c71047e6 100644 --- a/laravel/redis.php +++ b/laravel/redis.php @@ -1,7 +1,5 @@ path) > filemtime($compiled)) or ! file_exists($compiled)) + if ( ! file_exists($compiled) or (filemtime($this->path) > filemtime($compiled))) { file_put_contents($compiled, Blade::compile($this->path)); }