ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use start.php for bundle bootstrapping, bundle.php for info.

Browse Source
This commit is contained in:
Taylor Otwell
2012-02-07 16:51:57 -06:00
parent e4d55cbc8e
commit 3292024e69
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
application/bundle.php → application/start.php
View File

4
laravel/bundle.php
View File

@@ -62,7 +62,7 @@ class Bundle {
// the location automatically since we know it. // the location automatically since we know it.
if ($item->isDir()) 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 // If we found a file, we'll require in the array it contains
// and add it to the directory. The info array will contain // and add it to the directory. The info array will contain
@@ -146,7 +146,7 @@ class Bundle {
// the bundle for use by the application. The start script may register any // 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 // classes the bundle uses with the auto-loader, or perhaps will start any
// dependent bundles so that they are available. // 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; require $path;
} }

4
laravel/config.php
View File

@@ -199,10 +199,6 @@ class Config {
// Configuration files can be made specific for a given environment. If an // Configuration files can be made specific for a given environment. If an
// environment has been set, we will merge the environment configuration // environment has been set, we will merge the environment configuration
// in last, so that it overrides all other options. // 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'])) if (isset($_SERVER['LARAVEL_ENV']))
{ {
$paths[] = $paths[count($paths) - 1].$_SERVER['LARAVEL_ENV'].'/'; $paths[] = $paths[count($paths) - 1].$_SERVER['LARAVEL_ENV'].'/';