Fix Utils::modifyRequest dropping ServerRequest attributes (#400)

Fixes #344

Co-Authored-By: Imad Bazzal <12641890+ImadBazzal@users.noreply.github.com>

Co-authored-by: Imad Bazzal <12641890+ImadBazzal@users.noreply.github.com>

src/Utils.php

@@ -203,7 +203,7 @@ public static function modifyRequest(RequestInterface $request, array $changes)
         }
 
         if ($request instanceof ServerRequestInterface) {
-            return (new ServerRequest(
+            $new = (new ServerRequest(
                 isset($changes['method']) ? $changes['method'] : $request->getMethod(),
                 $uri,
                 $headers,
@@ -217,6 +217,12 @@ public static function modifyRequest(RequestInterface $request, array $changes)
             ->withQueryParams($request->getQueryParams())
             ->withCookieParams($request->getCookieParams())
             ->withUploadedFiles($request->getUploadedFiles());
+
+            foreach ($request->getAttributes() as $key => $value) {
+                $new = $new->withAttribute($key, $value);
+            }
+
+            return $new;
         }
 
         return new Request(

tests/UtilsTest.php

@@ -455,4 +455,15 @@ public function testModifyServerRequestQueryParams()
 
         self::assertSame(['name' => 'value'], $modifiedRequest->getQueryParams());
     }
+
+    public function testModifyServerRequestRetainsAttributes()
+    {
+        $request = (new Psr7\ServerRequest('GET', 'http://example.com/bla'))
+            ->withAttribute('foo', 'bar');
+
+        /** @var Psr7\ServerRequest $modifiedRequest */
+        $modifiedRequest = Psr7\Utils::modifyRequest($request, []);
+
+        self::assertSame(['foo' => 'bar'], $modifiedRequest->getAttributes());
+    }
 }