3 files changed, 9 insertions, 5 deletions
diff --git a/tests/Unit/Middleware/CallableHandlerTest.php b/tests/Unit/Middleware/CallableHandlerTest.php
index 6e6dab58..29424480 100644
--- a/tests/Unit/Middleware/CallableHandlerTest.php
+++ b/tests/Unit/Middleware/CallableHandlerTest.php
@@ -136,6 +136,6 @@ class CallableHandlerTest extends TestCase
         $callable = $this->getMockBuilder(stdClass::class)
             ->setMethods(['__invoke'])
             ->getMock();
-        return array($request, $response, $callable, $handler);
+        return [$request, $response, $callable, $handler];
     }
 }
diff --git a/tests/Unit/Middleware/RequestHandlerTest.php b/tests/Unit/Middleware/RequestHandlerTest.php
index b1ffbd33..cb5fc4a6 100644
--- a/tests/Unit/Middleware/RequestHandlerTest.php
+++ b/tests/Unit/Middleware/RequestHandlerTest.php
@@ -147,6 +147,6 @@ class RequestHandlerTest extends TestCase
         /** @var MiddlewareInterface $middlewareInterface */
         $middlewareInterface = $this->getMockForAbstractClass(MiddlewareInterface::class);
 
-        return array($container, $request, $handler, $response, $middlewareInterface);
+        return [$container, $request, $handler, $response, $middlewareInterface];
     }
 }
diff --git a/tests/Unit/Middleware/RouteDispatcherTest.php b/tests/Unit/Middleware/RouteDispatcherTest.php
index edb2f158..611d3b7c 100644
--- a/tests/Unit/Middleware/RouteDispatcherTest.php
+++ b/tests/Unit/Middleware/RouteDispatcherTest.php
@@ -2,6 +2,7 @@
 
 namespace Engelsystem\Test\Unit\Middleware;
 
+use Engelsystem\Http\Request;
 use Engelsystem\Middleware\RouteDispatcher;
 use FastRoute\Dispatcher as FastRouteDispatcher;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -127,7 +128,7 @@ class RouteDispatcherTest extends TestCase
         /** @var ResponseInterface|MockObject $response */
         $response = $this->getMockForAbstractClass(ResponseInterface::class);
         /** @var ServerRequestInterface|MockObject $request */
-        $request = $this->getMockForAbstractClass(ServerRequestInterface::class);
+        $request = $this->createMock(Request::class);
         /** @var RequestHandlerInterface|MockObject $handler */
         $handler = $this->getMockForAbstractClass(RequestHandlerInterface::class);
         /** @var UriInterface|MockObject $uriInterface */
@@ -139,10 +140,13 @@ class RouteDispatcherTest extends TestCase
         $request->expects($this->atLeastOnce())
             ->method('getUri')
             ->willReturn($uriInterface);
+        $request->expects($this->atLeastOnce())
+            ->method('getPathInfo')
+            ->willReturn('/foo%21bar');
         $uriInterface->expects($this->atLeastOnce())
             ->method('getPath')
-            ->willReturn('/foo%21bar');
+            ->willReturn('/lorem/foo%21bar');
 
-        return array($dispatcher, $response, $request, $handler);
+        return [$dispatcher, $response, $request, $handler];
     }
 }