Fix testsv1.0.2

2 files changed, 13 insertions, 8 deletions

diff --git a/tests/Router/Middleware/NotFoundTest.php b/tests/Router/Middleware/NotFoundTest.php
index b8cd657..9b79ad2 100644
--- a/tests/Router/Middleware/NotFoundTest.php
+++ b/tests/Router/Middleware/NotFoundTest.php
@@ -80,11 +80,11 @@ class NotFoundTest extends PHPUnit_Framework_TestCase
         };
         
         return [
-            [$request, $response, 404, 405, $mockCallback()],
-            [$request, $response, 404, null, $mockCallback()],
-            [$request, $response, '200', '402', $mockCallback()],
-            [$request, $response, $mockCallback(), $mockCallback(), $mockCallback()],
-            [$request, $response, $mockCallback(), null, $mockCallback()]
+            [clone $request, clone $response, 404, 405, $mockCallback()],
+            [clone $request, clone $response, 404, null, $mockCallback()],
+            [clone $request, clone $response, '200', '402', $mockCallback()],
+            [clone $request, clone $response, $mockCallback(), $mockCallback(), $mockCallback()],
+            [clone $request, clone $response, $mockCallback(), null, $mockCallback()]
         ];
     }
 
diff --git a/tests/Router/Routes/RouteBindingTest.php b/tests/Router/Routes/RouteBindingTest.php
index 96536ac..8255b52 100644
--- a/tests/Router/Routes/RouteBindingTest.php
+++ b/tests/Router/Routes/RouteBindingTest.php
@@ -5,7 +5,7 @@ namespace Jasny\Router\Routes;
 use Jasny\Router\Routes\Glob;
 use Jasny\Router\Route;
 use Psr\Http\Message\ServerRequestInterface;
-
+use Psr\Http\Message\UriInterface;
 use InvalidArgumentException;
 
 /**
@@ -60,7 +60,8 @@ class RouteBindingTest extends \PHPUnit_Framework_TestCase
         $values = [$pattern => $options];
 
         $glob = new Glob($values);
-        $request = $this->getServerRequest($uri);        
+        $request = $this->getServerRequest($uri);
+        
         $route = $glob->getRoute($request);
 
         $this->assertNotNull($route, "Route not found");
@@ -237,8 +238,12 @@ class RouteBindingTest extends \PHPUnit_Framework_TestCase
      */
     public function getServerRequest($uri, $method = 'GET', $globals = [], $header = '')
     {
+        $uriMock = $this->createMock(UriInterface::class);
+        $uriMock->method('__toString')->willReturn("http://www.example.com" . $uri);
+        $uriMock->method('getPath')->willReturn($uri);
+        
         $request = $this->createMock(ServerRequestInterface::class);
-        $request->method('getUri')->willReturn($uri);
+        $request->method('getUri')->willReturn($uriMock);
         $request->method('getMethod')->willReturn($method);
         $request->method('getQueryParams')->willReturn(isset($globals['get']) ? $globals['get'] : []);
         $request->method('getParsedBody')->willReturn(isset($globals['post']) ? $globals['post'] : []);