Skip to content

Commit

Permalink
Moving start.php to bootstrap/start.php to collate all bootstrapping …
Browse files Browse the repository at this point in the history
…files.

Signed-off-by: Ben Corlett <[email protected]>
  • Loading branch information
bencorlett committed Feb 6, 2013
1 parent 106d3b7 commit 8a5f18e
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions app/tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public function createApplication()

$testEnvironment = 'testing';

return require __DIR__.'/../../start.php';
return require __DIR__.'/../../bootstrap/start.php';
}

}
}
4 changes: 2 additions & 2 deletions artisan
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require __DIR__.'/bootstrap/autoload.php';
|
*/

$app = require_once __DIR__.'/start.php';
$app = require_once __DIR__.'/bootstrap/start.php';

$app->boot();

Expand Down Expand Up @@ -56,4 +56,4 @@ $artisan = Illuminate\Console\Application::start($app);
|
*/

$artisan->run();
$artisan->run();
2 changes: 1 addition & 1 deletion bootstrap/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@
if (is_dir($workbench = __DIR__.'/../workbench'))
{
Illuminate\Workbench\Starter::start($workbench);
}
}
6 changes: 3 additions & 3 deletions start.php → bootstrap/start.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
|
*/

$app->instance('path', $appPath = __DIR__.'/app');
$app->instance('path', $appPath = __DIR__.'/../app');

$app->instance('path.base', __DIR__);
$app->instance('path.base', __DIR__.'/..');

/*
|--------------------------------------------------------------------------
Expand Down Expand Up @@ -69,4 +69,4 @@
|
*/

return $app;
return $app;
2 changes: 1 addition & 1 deletion public/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
|
*/

$app = require_once __DIR__.'/../start.php';
$app = require_once __DIR__.'/../bootstrap/start.php';

/*
|--------------------------------------------------------------------------
Expand Down

0 comments on commit 8a5f18e

Please sign in to comment.