From 3292024e69ea0c2dc91fbf80cc0e7da4c63c8579 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 7 Feb 2012 16:51:57 -0600 Subject: [PATCH] use start.php for bundle bootstrapping, bundle.php for info. --- application/{bundle.php => start.php} | 0 laravel/bundle.php | 4 ++-- laravel/config.php | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) rename application/{bundle.php => start.php} (100%) diff --git a/application/bundle.php b/application/start.php similarity index 100% rename from application/bundle.php rename to application/start.php diff --git a/laravel/bundle.php b/laravel/bundle.php index 57911ed8..b2cfa447 100644 --- a/laravel/bundle.php +++ b/laravel/bundle.php @@ -62,7 +62,7 @@ protected static function search($path) // the location automatically since we know it. if ($item->isDir()) { - $path = $item->getRealPath().DS.'bundle.info'; + $path = $item->getRealPath().DS.'bundle.php'; // If we found a file, we'll require in the array it contains // and add it to the directory. The info array will contain @@ -146,7 +146,7 @@ public static function start($bundle) // the bundle for use by the application. The start script may register any // classes the bundle uses with the auto-loader, or perhaps will start any // dependent bundles so that they are available. - if (file_exists($path = static::path($bundle).'bundle'.EXT)) + if (file_exists($path = static::path($bundle).'start'.EXT)) { require $path; } diff --git a/laravel/config.php b/laravel/config.php index 5cd55eb8..dc7ed806 100644 --- a/laravel/config.php +++ b/laravel/config.php @@ -199,10 +199,6 @@ protected static function paths($bundle) // Configuration files can be made specific for a given environment. If an // environment has been set, we will merge the environment configuration // in last, so that it overrides all other options. - // - // This allows the developer to quickly and easily create configurations - // for various scenarios, such as local development and production, - // without constantly changing configuration files. if (isset($_SERVER['LARAVEL_ENV'])) { $paths[] = $paths[count($paths) - 1].$_SERVER['LARAVEL_ENV'].'/';