Browse Source

Moving start.php to bootstrap/start.php to collate all bootstrapping files.

Signed-off-by: Ben Corlett <bencorlett@me.com>
Ben Corlett 11 years ago
parent
commit
8a5f18e139
5 changed files with 9 additions and 9 deletions
  1. 2 2
      app/tests/TestCase.php
  2. 2 2
      artisan
  3. 1 1
      bootstrap/autoload.php
  4. 3 3
      bootstrap/start.php
  5. 1 1
      public/index.php

+ 2 - 2
app/tests/TestCase.php

@@ -13,7 +13,7 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase {
 
         $testEnvironment = 'testing';
 
-    	return require __DIR__.'/../../start.php';
+    	return require __DIR__.'/../../bootstrap/start.php';
     }
 
-}
+}

+ 2 - 2
artisan

@@ -27,7 +27,7 @@ require __DIR__.'/bootstrap/autoload.php';
 |
 */
 
-$app = require_once __DIR__.'/start.php';
+$app = require_once __DIR__.'/bootstrap/start.php';
 
 $app->boot();
 
@@ -56,4 +56,4 @@ $artisan = Illuminate\Console\Application::start($app);
 |
 */
 
-$artisan->run();
+$artisan->run();

+ 1 - 1
bootstrap/autoload.php

@@ -41,4 +41,4 @@ Illuminate\Support\ClassLoader::register();
 if (is_dir($workbench = __DIR__.'/../workbench'))
 {
 	Illuminate\Workbench\Starter::start($workbench);
-}
+}

+ 3 - 3
start.php → bootstrap/start.php

@@ -24,9 +24,9 @@ $app = new Illuminate\Foundation\Application;
 |
 */
 
-$app->instance('path', $appPath = __DIR__.'/app');
+$app->instance('path', $appPath = __DIR__.'/../app');
 
-$app->instance('path.base', __DIR__);
+$app->instance('path.base', __DIR__.'/..');
 
 /*
 |--------------------------------------------------------------------------
@@ -69,4 +69,4 @@ require $app->getBootstrapFile();
 |
 */
 
-return $app;
+return $app;

+ 1 - 1
public/index.php

@@ -34,7 +34,7 @@ require __DIR__.'/../bootstrap/autoload.php';
 |
 */
 
-$app = require_once __DIR__.'/../start.php';
+$app = require_once __DIR__.'/../bootstrap/start.php';
 
 /*
 |--------------------------------------------------------------------------