diff --git a/laravel/autoloader.php b/laravel/autoloader.php index 889ae7b9..65be66f1 100644 --- a/laravel/autoloader.php +++ b/laravel/autoloader.php @@ -64,10 +64,6 @@ class Autoloader { // 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[$library])) { return str_replace('_', '/', $file).EXT; diff --git a/laravel/config/container.php b/laravel/config/container.php index 995f1763..983d6980 100644 --- a/laravel/config/container.php +++ b/laravel/config/container.php @@ -2,12 +2,6 @@ return array( - 'laravel.view.composers' => array('singleton' => true, 'resolver' => function() - { - return require APP_PATH.'composers'.EXT; - }), - - 'laravel.routing.router' => array('singleton' => true, 'resolver' => function($c) { return new Routing\Router($c->core('routing.loader'), CONTROLLER_PATH); diff --git a/laravel/view.php b/laravel/view.php index 7ffd54aa..3026258e 100644 --- a/laravel/view.php +++ b/laravel/view.php @@ -193,7 +193,7 @@ class View { */ protected static function composers() { - static::$composers = IoC::container()->core('view.composers'); + static::$composers = require APP_PATH.'composers'.EXT; } /**