| @@ -62,7 +62,7 @@ discard block | ||
| 62 | 62 | /** | 
| 63 | 63 | * Return a response for application/json content not found | 
| 64 | 64 | * | 
| 65 | - * @return ResponseInterface | |
| 65 | + * @return string | |
| 66 | 66 | */ | 
| 67 | 67 | protected function renderJsonNotFoundOutput() | 
| 68 | 68 |      { | 
| @@ -72,7 +72,7 @@ discard block | ||
| 72 | 72 | /** | 
| 73 | 73 | * Return a response for xml content not found | 
| 74 | 74 | * | 
| 75 | - * @return ResponseInterface | |
| 75 | + * @return string | |
| 76 | 76 | */ | 
| 77 | 77 | protected function renderXmlNotFoundOutput() | 
| 78 | 78 |      { | 
| @@ -121,6 +121,6 @@ | ||
| 121 | 121 | <a href='$homeUrl'>Visit the Home Page</a> | 
| 122 | 122 | </body> | 
| 123 | 123 | </html> | 
| 124 | -END; | |
| 124 | +end; | |
| 125 | 125 | } | 
| 126 | 126 | } | 
| @@ -26,12 +26,12 @@ | ||
| 26 | 26 | * argument for `Slim::get`, `Slim::post`, `Slim::put`, `Slim::patch`, and `Slim::delete` | 
| 27 | 27 | * is an anonymous function. | 
| 28 | 28 | */ | 
| 29 | -$app->get('/', function ($request, $response, $args) { | |
| 29 | +$app->get('/', function($request, $response, $args) { | |
| 30 | 30 |      $response->write("Welcome to Slim!"); | 
| 31 | 31 | return $response; | 
| 32 | 32 | }); | 
| 33 | 33 | |
| 34 | -$app->get('/hello[/{name}]', function ($request, $response, $args) { | |
| 34 | +$app->get('/hello[/{name}]', function($request, $response, $args) { | |
| 35 | 35 |      $response->write("Hello, " . $args['name']); | 
| 36 | 36 | return $response; | 
| 37 | 37 |  })->setArgument('name', 'World!'); | 
| @@ -207,7 +207,7 @@ | ||
| 207 | 207 | */ | 
| 208 | 208 | protected function filterStatus($status) | 
| 209 | 209 |      { | 
| 210 | -        if (!is_integer($status) || $status<100 || $status>599) { | |
| 210 | +        if (!is_integer($status) || $status < 100 || $status > 599) { | |
| 211 | 211 |              throw new InvalidArgumentException('Invalid HTTP status code'); | 
| 212 | 212 | } | 
| 213 | 213 | |
| @@ -122,7 +122,7 @@ | ||
| 122 | 122 | * | 
| 123 | 123 | * @var string | 
| 124 | 124 | */ | 
| 125 | - const EOL = "\r\n"; | |
| 125 | + const EOL = "\r\n"; | |
| 126 | 126 | |
| 127 | 127 | /** | 
| 128 | 128 | * Create new HTTP response. | 
| @@ -56,7 +56,7 @@ | ||
| 56 | 56 | $key = strtoupper($key); | 
| 57 | 57 |              if (isset(static::$special[$key]) || strpos($key, 'HTTP_') === 0) { | 
| 58 | 58 |                  if ($key !== 'HTTP_CONTENT_LENGTH') { | 
| 59 | - $data[$key] = $value; | |
| 59 | + $data[$key] = $value; | |
| 60 | 60 | } | 
| 61 | 61 | } | 
| 62 | 62 | } | 
| @@ -433,7 +433,7 @@ discard block | ||
| 433 | 433 |          $router = $this->container->get('router'); | 
| 434 | 434 | |
| 435 | 435 | // If router hasn't been dispatched or the URI changed then dispatch | 
| 436 | -        if (null === $routeInfo || ($routeInfo['request'] !== [$request->getMethod(), (string) $request->getUri()])) { | |
| 436 | +        if (null === $routeInfo || ($routeInfo['request'] !== [$request->getMethod(), (string)$request->getUri()])) { | |
| 437 | 437 | $request = $this->dispatchRouterAndPrepareRoute($request, $router); | 
| 438 | 438 |              $routeInfo = $request->getAttribute('routeInfo'); | 
| 439 | 439 | } | 
| @@ -525,7 +525,7 @@ discard block | ||
| 525 | 525 |              $request = $request->withAttribute('route', $route); | 
| 526 | 526 | } | 
| 527 | 527 | |
| 528 | - $routeInfo['request'] = [$request->getMethod(), (string) $request->getUri()]; | |
| 528 | + $routeInfo['request'] = [$request->getMethod(), (string)$request->getUri()]; | |
| 529 | 529 | |
| 530 | 530 |          return $request->withAttribute('routeInfo', $routeInfo); | 
| 531 | 531 | } | 
| @@ -554,7 +554,7 @@ discard block | ||
| 554 | 554 | } | 
| 555 | 555 | $size = $response->getBody()->getSize(); | 
| 556 | 556 |              if ($size !== null && !$response->hasHeader('Content-Length')) { | 
| 557 | -                $response = $response->withHeader('Content-Length', (string) $size); | |
| 557 | +                $response = $response->withHeader('Content-Length', (string)$size); | |
| 558 | 558 | } | 
| 559 | 559 | } | 
| 560 | 560 | |
| @@ -126,7 +126,7 @@ | ||
| 126 | 126 | } | 
| 127 | 127 | } | 
| 128 | 128 | |
| 129 | -        throw new \BadMethodCallException("Method $method is not a valid method"); | |
| 129 | +        throw new \BadMethodCallException("method $method is not a valid method"); | |
| 130 | 130 | } | 
| 131 | 131 | |
| 132 | 132 | /******************************************************************************** | 
| @@ -14,7 +14,6 @@ discard block | ||
| 14 | 14 | use Throwable; | 
| 15 | 15 | use Closure; | 
| 16 | 16 | use InvalidArgumentException; | 
| 17 | -use Psr\Http\Message\RequestInterface; | |
| 18 | 17 | use Psr\Http\Message\ServerRequestInterface; | 
| 19 | 18 | use Psr\Http\Message\ResponseInterface; | 
| 20 | 19 | use Psr\Container\ContainerInterface; | 
| @@ -26,7 +25,6 @@ discard block | ||
| 26 | 25 | use Slim\Http\Headers; | 
| 27 | 26 | use Slim\Http\Body; | 
| 28 | 27 | use Slim\Http\Request; | 
| 29 | -use Slim\Interfaces\Http\EnvironmentInterface; | |
| 30 | 28 | use Slim\Interfaces\RouteGroupInterface; | 
| 31 | 29 | use Slim\Interfaces\RouteInterface; | 
| 32 | 30 | use Slim\Interfaces\RouterInterface; | 
| @@ -25,7 +25,7 @@ | ||
| 25 | 25 | */ | 
| 26 | 26 | public function __construct($displayErrorDetails = false) | 
| 27 | 27 |      { | 
| 28 | - $this->displayErrorDetails = (bool) $displayErrorDetails; | |
| 28 | + $this->displayErrorDetails = (bool)$displayErrorDetails; | |
| 29 | 29 | } | 
| 30 | 30 | |
| 31 | 31 | /** | 
| @@ -94,7 +94,7 @@ | ||
| 94 | 94 | * | 
| 95 | 95 | * @return array|\ArrayAccess | 
| 96 | 96 | */ | 
| 97 | -        $this['settings'] = function () use ($userSettings, $defaultSettings) { | |
| 97 | +        $this['settings'] = function() use ($userSettings, $defaultSettings) { | |
| 98 | 98 | return new Collection(array_merge($defaultSettings, $userSettings)); | 
| 99 | 99 | }; | 
| 100 | 100 | |
| @@ -44,7 +44,7 @@ discard block | ||
| 44 | 44 | * | 
| 45 | 45 | * @return EnvironmentInterface | 
| 46 | 46 | */ | 
| 47 | -            $container['environment'] = function () { | |
| 47 | +            $container['environment'] = function() { | |
| 48 | 48 | return new Environment($_SERVER); | 
| 49 | 49 | }; | 
| 50 | 50 | } | 
| @@ -57,7 +57,7 @@ discard block | ||
| 57 | 57 | * | 
| 58 | 58 | * @return ServerRequestInterface | 
| 59 | 59 | */ | 
| 60 | -            $container['request'] = function ($container) { | |
| 60 | +            $container['request'] = function($container) { | |
| 61 | 61 |                  return Request::createFromEnvironment($container->get('environment')); | 
| 62 | 62 | }; | 
| 63 | 63 | } | 
| @@ -70,7 +70,7 @@ discard block | ||
| 70 | 70 | * | 
| 71 | 71 | * @return ResponseInterface | 
| 72 | 72 | */ | 
| 73 | -            $container['response'] = function ($container) { | |
| 73 | +            $container['response'] = function($container) { | |
| 74 | 74 | $headers = new Headers(['Content-Type' => 'text/html; charset=UTF-8']); | 
| 75 | 75 | $response = new Response(200, $headers); | 
| 76 | 76 | |
| @@ -87,7 +87,7 @@ discard block | ||
| 87 | 87 | * | 
| 88 | 88 | * @return RouterInterface | 
| 89 | 89 | */ | 
| 90 | -            $container['router'] = function ($container) { | |
| 90 | +            $container['router'] = function($container) { | |
| 91 | 91 | $routerCacheFile = false; | 
| 92 | 92 |                  if (isset($container->get('settings')['routerCacheFile'])) { | 
| 93 | 93 |                      $routerCacheFile = $container->get('settings')['routerCacheFile']; | 
| @@ -104,7 +104,7 @@ discard block | ||
| 104 | 104 | * | 
| 105 | 105 | * @return InvocationStrategyInterface | 
| 106 | 106 | */ | 
| 107 | -            $container['foundHandler'] = function () { | |
| 107 | +            $container['foundHandler'] = function() { | |
| 108 | 108 | return new RequestResponse; | 
| 109 | 109 | }; | 
| 110 | 110 | } | 
| @@ -125,7 +125,7 @@ discard block | ||
| 125 | 125 | * | 
| 126 | 126 | * @return callable | 
| 127 | 127 | */ | 
| 128 | -            $container['phpErrorHandler'] = function ($container) { | |
| 128 | +            $container['phpErrorHandler'] = function($container) { | |
| 129 | 129 |                  return new PhpError($container->get('settings')['displayErrorDetails']); | 
| 130 | 130 | }; | 
| 131 | 131 | } | 
| @@ -146,7 +146,7 @@ discard block | ||
| 146 | 146 | * | 
| 147 | 147 | * @return callable | 
| 148 | 148 | */ | 
| 149 | -            $container['errorHandler'] = function ($container) { | |
| 149 | +            $container['errorHandler'] = function($container) { | |
| 150 | 150 |                  return new Error($container->get('settings')['displayErrorDetails']); | 
| 151 | 151 | }; | 
| 152 | 152 | } | 
| @@ -164,7 +164,7 @@ discard block | ||
| 164 | 164 | * | 
| 165 | 165 | * @return callable | 
| 166 | 166 | */ | 
| 167 | -            $container['notFoundHandler'] = function () { | |
| 167 | +            $container['notFoundHandler'] = function() { | |
| 168 | 168 | return new NotFound; | 
| 169 | 169 | }; | 
| 170 | 170 | } | 
| @@ -183,7 +183,7 @@ discard block | ||
| 183 | 183 | * | 
| 184 | 184 | * @return callable | 
| 185 | 185 | */ | 
| 186 | -            $container['notAllowedHandler'] = function () { | |
| 186 | +            $container['notAllowedHandler'] = function() { | |
| 187 | 187 | return new NotAllowed; | 
| 188 | 188 | }; | 
| 189 | 189 | } | 
| @@ -196,7 +196,7 @@ discard block | ||
| 196 | 196 | * | 
| 197 | 197 | * @return CallableResolverInterface | 
| 198 | 198 | */ | 
| 199 | -            $container['callableResolver'] = function ($container) { | |
| 199 | +            $container['callableResolver'] = function($container) { | |
| 200 | 200 | return new CallableResolver($container); | 
| 201 | 201 | }; | 
| 202 | 202 | } | 
| @@ -188,7 +188,7 @@ | ||
| 188 | 188 | return $this->dispatcher; | 
| 189 | 189 | } | 
| 190 | 190 | |
| 191 | -        $routeDefinitionCallback = function (RouteCollector $r) { | |
| 191 | +        $routeDefinitionCallback = function(RouteCollector $r) { | |
| 192 | 192 |              foreach ($this->getRoutes() as $route) { | 
| 193 | 193 | $r->addRoute($route->getMethods(), $route->getPattern(), $route->getIdentifier()); | 
| 194 | 194 | } |