Merge branch '4.x' into patch-route-context-base-path

README.md

@@ -35,7 +35,7 @@ To install the Slim-Http library simply run the following command:
 composer require slim/http
 ```
 
-The `ServerRequest` and `Response` object decorators are automatically detected and applied by the internal factories. If you have installed Slim-Http and wish to turn off automatic object decoration you can use the following statements:
+The `ServerRequest` and `Response` object decorators are automatically detected and applied by the internal factories. If you have installed Slim-Http and wish to turn off automatic object decoration then you can use the following statements:
 ```php
 <?php
 
@@ -74,7 +74,7 @@ $app = AppFactory::create();
 $app->addErrorMiddleware(true, true, true);
 
 // Add routes
-$app->get('/', function () {
+$app->get('/', function (Request $request, Response $response) {
     $response->getBody()->write('<a href="/hello/world">Try /hello/world</a>');
     return $response;
 });

Slim/Exception/HttpMethodNotAllowedException.php

@@ -36,6 +36,7 @@ public function getAllowedMethods(): array
     public function setAllowedMethods(array $methods): HttpMethodNotAllowedException
     {
         $this->allowedMethods = $methods;
+        $this->message = 'Method not allowed. Must be one of: ' . implode(', ', $methods);
         return $this;
     }
 }

Slim/Routing/Dispatcher.php

@@ -3,7 +3,7 @@
 
 namespace Slim\Routing;
 
-use FastRoute\RouteCollector;
+use FastRoute\RouteCollector as FastRouteCollector;
 use FastRoute\RouteParser\Std;
 use Slim\Interfaces\DispatcherInterface;
 use Slim\Interfaces\RouteCollectorInterface;
@@ -37,7 +37,7 @@ protected function createDispatcher(): FastRouteDispatcher
             return $this->dispatcher;
         }
 
-        $routeDefinitionCallback = function (RouteCollector $r) {
+        $routeDefinitionCallback = function (FastRouteCollector $r) {
             $basePath = $this->routeCollector->getBasePath();
 
             foreach ($this->routeCollector->getRoutes() as $route) {

Slim/Routing/RouteCollectorProxy.php

@@ -9,7 +9,6 @@
 
 namespace Slim\Routing;
 
-use Closure;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Slim\Interfaces\CallableResolverInterface;

tests/CallableResolverTest.php

@@ -13,7 +13,6 @@
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use RuntimeException;
 use Slim\CallableResolver;
 use Slim\Tests\Mocks\CallableTest;
 use Slim\Tests\Mocks\InvokableTest;

tests/Exception/HttpExceptionTest.php

@@ -43,8 +43,10 @@ public function testHttpNotAllowedExceptionGetAllowedMethods()
         $exception = new HttpMethodNotAllowedException($request);
         $exception->setAllowedMethods(['GET']);
         $this->assertEquals(['GET'], $exception->getAllowedMethods());
+        $this->assertEquals('Method not allowed. Must be one of: GET', $exception->getMessage());
 
         $exception = new HttpMethodNotAllowedException($request);
         $this->assertEquals([], $exception->getAllowedMethods());
+        $this->assertEquals('Method not allowed.', $exception->getMessage());
     }
 }

tests/Factory/AppFactoryTest.php

@@ -16,7 +16,6 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use ReflectionProperty;
-use RuntimeException;
 use Slim\Factory\AppFactory;
 use Slim\Factory\Psr17\GuzzlePsr17Factory;
 use Slim\Factory\Psr17\NyholmPsr17Factory;

tests/Factory/Psr17/Psr17FactoryTest.php

@@ -9,7 +9,6 @@
 
 namespace Slim\Tests\Factory\Psr17;
 
-use RuntimeException;
 use Slim\Tests\Mocks\MockPsr17Factory;
 use Slim\Tests\TestCase;
 

tests/Factory/Psr17/SlimHttpServerRequestCreatorTest.php

@@ -11,7 +11,6 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 use ReflectionProperty;
-use RuntimeException;
 use Slim\Factory\Psr17\SlimHttpServerRequestCreator;
 use Slim\Http\ServerRequest;
 use Slim\Interfaces\ServerRequestCreatorInterface;

tests/Factory/ServerRequestCreatorFactoryTest.php

@@ -12,7 +12,6 @@
 use GuzzleHttp\Psr7\ServerRequest as GuzzleServerRequest;
 use Nyholm\Psr7\ServerRequest as NyholmServerRequest;
 use Psr\Http\Message\ServerRequestInterface;
-use RuntimeException;
 use Slim\Factory\Psr17\GuzzlePsr17Factory;
 use Slim\Factory\Psr17\NyholmPsr17Factory;
 use Slim\Factory\Psr17\Psr17FactoryProvider;
@@ -22,7 +21,6 @@
 use Slim\Factory\ServerRequestCreatorFactory;
 use Slim\Http\ServerRequest;
 use Slim\Interfaces\ServerRequestCreatorInterface;
-use Slim\Psr7\Factory\ServerRequestFactory;
 use Slim\Psr7\Request as SlimServerRequest;
 use Slim\Tests\TestCase;
 use Zend\Diactoros\ServerRequest as ZendServerRequest;

tests/Middleware/RoutingMiddlewareTest.php

@@ -13,7 +13,6 @@
 use Prophecy\Argument;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use RuntimeException;
 use Slim\CallableResolver;
 use Slim\Exception\HttpMethodNotAllowedException;
 use Slim\Exception\HttpNotFoundException;

tests/Mocks/RequestHandlerTest.php

@@ -43,6 +43,9 @@ public function handle(ServerRequestInterface $request): ResponseInterface
 
     public function custom(ServerRequestInterface $request): ResponseInterface
     {
+        $psr7ObjectProvider = new PSR7ObjectProvider();
+        $responseFactory = $psr7ObjectProvider->getResponseFactory();
+
         return $responseFactory->createResponse();
     }
 }

tests/Routing/RouteContextTest.php

@@ -10,7 +10,6 @@
 namespace Slim\Tests\Routing;
 
 use Psr\Http\Message\ServerRequestInterface;
-use RuntimeException;
 use Slim\Interfaces\RouteInterface;
 use Slim\Interfaces\RouteParserInterface;
 use Slim\Routing\RouteContext;

tests/Routing/RouteRunnerTest.php

@@ -11,7 +11,6 @@
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Slim\CallableResolver;
 use Slim\MiddlewareDispatcher;
 use Slim\Routing\RouteCollector;
 use Slim\Routing\RouteParser;