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

bencorlett · bencorlett · commit 8a5f18e139c9 · 2013-02-07T09:27:15.000+11:00
Signed-off-by: Ben Corlett &lt;bencorlett@me.com&gt;
diff --git a/app/tests/TestCase.php b/app/tests/TestCase.php
@@ -13,7 +13,7 @@ public function createApplication()
 
         $testEnvironment = 'testing';
 
-    	return require __DIR__.'/../../start.php';
+    	return require __DIR__.'/../../bootstrap/start.php';
     }
 
-}
+}
diff --git a/artisan b/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();
diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
@@ -41,4 +41,4 @@
 if (is_dir($workbench = __DIR__.'/../workbench'))
 {
 	Illuminate\Workbench\Starter::start($workbench);
-}
+}
diff --git a/bootstrap/start.php b/bootstrap/start.php
@@ -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__.'/..');
 
 /*
 |--------------------------------------------------------------------------
@@ -69,4 +69,4 @@
 |
 */
 
-return $app;
+return $app;
diff --git a/public/index.php b/public/index.php
@@ -34,7 +34,7 @@
 |
 */
 
-$app = require_once __DIR__.'/../start.php';
+$app = require_once __DIR__.'/../bootstrap/start.php';
 
 /*
 |--------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public function createApplication()`
`13`	`13`
`14`	`14`	`$testEnvironment = 'testing';`
`15`	`15`
`16`		`- return require __DIR__.'/../../start.php';`
	`16`	`+ return require __DIR__.'/../../bootstrap/start.php';`
`17`	`17`	`}`
`18`	`18`
`19`		`-}`
	`19`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ require __DIR__.'/bootstrap/autoload.php';`
`27`	`27`	`\|`
`28`	`28`	`*/`
`29`	`29`
`30`		`-$app = require_once __DIR__.'/start.php';`
	`30`	`+$app = require_once __DIR__.'/bootstrap/start.php';`
`31`	`31`
`32`	`32`	`$app->boot();`
`33`	`33`
`@@ -56,4 +56,4 @@ $artisan = Illuminate\Console\Application::start($app);`
`56`	`56`	`\|`
`57`	`57`	`*/`
`58`	`58`
`59`		`-$artisan->run();`
	`59`	`+$artisan->run();`
Original file line number	Diff line number	Diff line change
`@@ -41,4 +41,4 @@`
`41`	`41`	`if (is_dir($workbench = __DIR__.'/../workbench'))`
`42`	`42`	`{`
`43`	`43`	`Illuminate\Workbench\Starter::start($workbench);`
`44`		`-}`
	`44`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@`
`24`	`24`	`\|`
`25`	`25`	`*/`
`26`	`26`
`27`		`-$app->instance('path', $appPath = __DIR__.'/app');`
	`27`	`+$app->instance('path', $appPath = __DIR__.'/../app');`
`28`	`28`
`29`		`-$app->instance('path.base', __DIR__);`
	`29`	`+$app->instance('path.base', __DIR__.'/..');`
`30`	`30`
`31`	`31`	`/*`
`32`	`32`	`\|--------------------------------------------------------------------------`
`@@ -69,4 +69,4 @@`
`69`	`69`	`\|`
`70`	`70`	`*/`
`71`	`71`
`72`		`-return $app;`
	`72`	`+return $app;`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`\|`
`35`	`35`	`*/`
`36`	`36`
`37`		`-$app = require_once __DIR__.'/../start.php';`
	`37`	`+$app = require_once __DIR__.'/../bootstrap/start.php';`
`38`	`38`
`39`	`39`	`/*`
`40`	`40`	`\|--------------------------------------------------------------------------`