Skip to content

Commit

Permalink
Working on more Stacky setup.
Browse files Browse the repository at this point in the history
  • Loading branch information
taylorotwell committed Oct 25, 2013
1 parent 39e265f commit 29fc9f6
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 11 deletions.
4 changes: 2 additions & 2 deletions artisan
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ require __DIR__.'/bootstrap/autoload.php';

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

$app->boot();

/*
|--------------------------------------------------------------------------
| Load The Artisan Console Application
Expand All @@ -43,6 +41,8 @@ $app->boot();
|
*/

$app->setRequestForConsoleEnvironment();

$artisan = Illuminate\Console\Application::start($app);

/*
Expand Down
2 changes: 0 additions & 2 deletions bootstrap/start.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@

$app = new Illuminate\Foundation\Application;

$app->redirectIfTrailingSlash();

/*
|--------------------------------------------------------------------------
| Detect The Application Environment
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"keywords": ["framework", "laravel"],
"license": "MIT",
"require": {
"laravel/framework": "4.1.*"
"laravel/framework": "4.1.*",
"stack/builder": "dev-master"
},
"autoload": {
"classmap": [
Expand Down
45 changes: 39 additions & 6 deletions public/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,21 @@

$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
Expand All @@ -42,21 +57,39 @@
| 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);

0 comments on commit 29fc9f6

Please sign in to comment.