Browse Source

Working on more Stacky setup.

Taylor Otwell 11 years ago
parent
commit
29fc9f694d
4 changed files with 43 additions and 11 deletions
  1. 2 2
      artisan
  2. 0 2
      bootstrap/start.php
  3. 2 1
      composer.json
  4. 39 6
      public/index.php

+ 2 - 2
artisan

@@ -29,8 +29,6 @@ require __DIR__.'/bootstrap/autoload.php';
 
 $app = require_once __DIR__.'/bootstrap/start.php';
 
-$app->boot();
-
 /*
 |--------------------------------------------------------------------------
 | Load The Artisan Console Application
@@ -43,6 +41,8 @@ $app->boot();
 |
 */
 
+$app->setRequestForConsoleEnvironment();
+
 $artisan = Illuminate\Console\Application::start($app);
 
 /*

+ 0 - 2
bootstrap/start.php

@@ -13,8 +13,6 @@
 
 $app = new Illuminate\Foundation\Application;
 
-$app->redirectIfTrailingSlash();
-
 /*
 |--------------------------------------------------------------------------
 | Detect The Application Environment

+ 2 - 1
composer.json

@@ -4,7 +4,8 @@
 	"keywords": ["framework", "laravel"],
 	"license": "MIT",
 	"require": {
-		"laravel/framework": "4.1.*"
+		"laravel/framework": "4.1.*",
+		"stack/builder": "dev-master"
 	},
 	"autoload": {
 		"classmap": [

+ 39 - 6
public/index.php

@@ -34,6 +34,21 @@ require __DIR__.'/../bootstrap/autoload.php';
 
 $app = require_once __DIR__.'/../bootstrap/start.php';
 
+/*
+|--------------------------------------------------------------------------
+| Capture The Request
+|--------------------------------------------------------------------------
+|
+| Next we will capture the HTTP request into an instance of the Symfony
+| request class. We will then pass that to a Laravel application for
+| processing and return the response we receive back from the app.
+|
+*/
+
+use Symfony\Component\HttpFoundation\Request;
+
+$request = Request::createFromGlobals();
+
 /*
 |--------------------------------------------------------------------------
 | Run The Application
@@ -42,21 +57,39 @@ $app = require_once __DIR__.'/../bootstrap/start.php';
 | Once we have the application, we can simply call the run method,
 | which will execute the request and send the response back to
 | the client's browser allowing them to enjoy the creative
-| and wonderful applications we have created for them.
+| and wonderful application we have whipped up for them.
 |
 */
 
-$app->run();
+$response = with(new Stack\Builder)
+				->push('Illuminate\Foundation\TrailingSlashRedirector')
+				->resolve($app)
+				->handle($request);
+
+/*
+|--------------------------------------------------------------------------
+| Close The Application & Send Response
+|--------------------------------------------------------------------------
+|
+| When closing the application, the session cookies will be set on the
+| request. Also, this is an opportunity to finish up any other work
+| that needs to be done before sending this response to browsers.
+|
+*/
+
+$app->callCloseCallbacks($request, $response);
+
+$response->send();
 
 /*
 |--------------------------------------------------------------------------
 | Shutdown The Application
 |--------------------------------------------------------------------------
 |
-| Once the app has finished running, we will fire off the shutdown events
-| so that any final work may be done by the application before we shut
-| down the process. This is the last thing to happen to the request.
+| Once the app has finished running we'll fire off the shutdown events
+| so that any end work may be done by an application before we shut
+| off the process. This is the final thing to happen to requests.
 |
 */
 
-$app->shutdown();
+$app->terminate($request, $response);