Skip to content

Commit

Permalink
Merge branch 'irfanevrens-3.x.InvocationStrategyInterface' into 3.x
Browse files Browse the repository at this point in the history
Closes #1653
  • Loading branch information
akrabat committed Dec 6, 2015
2 parents cb87423 + bc33f19 commit 293f839
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
7 changes: 7 additions & 0 deletions Slim/App.php
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,10 @@ public function group($pattern, $callable)
*
* @param bool|false $silent
* @return ResponseInterface
*
* @throws Exception
* @throws MethodNotAllowedException
* @throws NotFoundException
*/
public function run($silent = false)
{
Expand Down Expand Up @@ -407,6 +411,8 @@ public function respond(ResponseInterface $response)
* @param ResponseInterface $response The most recent Response object
*
* @return ResponseInterface
* @throws MethodNotAllowedException
* @throws NotFoundException
*/
public function __invoke(ServerRequestInterface $request, ResponseInterface $response)
{
Expand Down Expand Up @@ -482,6 +488,7 @@ public function subRequest($method, $path, $query = '', array $headers = [], arr
* Dispatch the router to find the route. Prepare the route for use.
*
* @param ServerRequestInterface $request
* @param RouterInterface $router
* @return ServerRequestInterface
*/
protected function dispatchRouterAndPrepareRoute(ServerRequestInterface $request, RouterInterface $router)
Expand Down
1 change: 0 additions & 1 deletion Slim/Http/Headers.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
namespace Slim\Http;

use Slim\Collection;
use Slim\Http\Environment;
use Slim\Interfaces\Http\HeadersInterface;

/**
Expand Down
1 change: 1 addition & 0 deletions Slim/Route.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ class Route extends Routable implements RouteInterface
* @param string[] $methods The route HTTP methods
* @param string $pattern The route pattern
* @param callable $callable The route callable
* @param int $identifier The route identifier
* @param RouteGroup[] $groups The parent route groups
*/
public function __construct($methods, $pattern, $callable, $groups = [], $identifier = 0)
Expand Down

0 comments on commit 293f839

Please sign in to comment.