Dont rewrite path if already rewritten

Author: Nyholm

src/Plugin/AddPathPlugin.php

@@ -46,17 +46,14 @@ public function __construct(UriInterface $uri)
      */
     public function handleRequest(RequestInterface $request, callable $next, callable $first)
     {
-        // Use the request URI as an identifier
-        $identifier = sha1((string) $request->getUri());
-
-        // If the current URL is a result of a previous rewrite, then do nothing.
-        if (!array_key_exists($identifier, $this->alteredRequests)) {
-            $prefixedUri = $request->getUri()->withPath($this->uri->getPath().$request->getUri()->getPath());
-            $request = $request->withUri($prefixedUri);
-
-            // Store for future checks
-            $this->alteredRequests[sha1((string) $prefixedUri)] = true;
-        }
+         $prepend = $this->uri->getPath();
+         $path = $request->getUri()->getPath();
+
+         if (substr($path, 0, strlen($prepend)) !== $prepend) {
+             $request = $request->withUri($request->getUri()
+                 ->withPath($prepend.$path)
+             );
+         }
 
         return $next($request);
     }

tests/Plugin/AddPathPluginTest.php

@@ -89,7 +89,7 @@ public function testRewriteWithDifferentUrlWhenSecondUrlIncludesAddedPath()
     public function testRewriteWhenPathIsIncluded()
     {
         $verify = function (RequestInterface $request) {
-            $this->assertEquals('https://example.com/api/api/foo', $request->getUri()->__toString());
+            $this->assertEquals('https://example.com/api/foo', $request->getUri()->__toString());
         };
 
         $request = new Request('GET', 'https://example.com/api/foo');