Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added App::process() to expose Request -> Response functionality #1688

Merged
merged 2 commits into from
Dec 22, 2015
Merged

Added App::process() to expose Request -> Response functionality #1688

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b01ca4
Added App::process() to expose Request -> Response functionality
Dec 18, 2015
8bc17f1
Moved `App::finalize($response)` call into `App::process()`
AndrewCarterUK Dec 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions Slim/App.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,13 +297,37 @@ public function run($silent = false)
$request = $this->container->get('request');
$response = $this->container->get('response');

$response = $this->process($request, $response);

if (!$silent) {
$this->respond($response);
}

return $response;
}

/**
* Process a request
*
* This method traverses the application middleware stack and then returns the
* resultant Response object.
*
* @param ServerRequestInterface $request
* @param ResponseInterface $response
* @return ResponseInterface
*
* @throws Exception
* @throws MethodNotAllowedException
* @throws NotFoundException
*/
public function process(ServerRequestInterface $request, ResponseInterface $response)
{
// Ensure basePath is set
$router = $this->container->get('router');
if (is_callable([$request->getUri(), 'getBasePath']) && is_callable([$router, 'setBasePath'])) {
$router->setBasePath($request->getUri()->getBasePath());
}


// Dispatch the Router first if the setting for this is on
if ($this->container->get('settings')['determineRouteBeforeAppMiddleware'] === true) {
// Dispatch router (note: you won't be able to alter routes after this)
Expand Down Expand Up @@ -340,10 +364,6 @@ public function run($silent = false)

$response = $this->finalize($response);

if (!$silent) {
$this->respond($response);
}

return $response;
}

Expand Down