Merge branch 'master' into feature/exception-only-on-5XX

Author: joelwurtz

CHANGELOG.md

@@ -1,11 +1,15 @@
 # Change Log
 
-## Upcoming
+## 1.8 (unreleased)
 
 ### Added
 
  - Add an option on ErrorPlugin to only throw exception on response with 5XX status code.
 
+### Changed
+
+- AddPathPlugin no longer add prefix multiple times if a request is restarted - it now only adds the prefix if that request chain has not yet passed through the AddPathPlugin
+
 ## 1.7.0 - 2017-11-30
 
 ### Added 

composer.json

@@ -37,7 +37,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.7-dev"
+            "dev-master": "1.8-dev"
         }
     }
 }

src/Plugin/AddPathPlugin.php

@@ -18,6 +18,13 @@ final class AddPathPlugin implements Plugin
      */
     private $uri;
 
+    /**
+     * Stores identifiers of the already altered requests.
+     *
+     * @var array
+     */
+    private $alteredRequests = [];
+
     /**
      * @param UriInterface $uri
      */
@@ -39,9 +46,14 @@ public function __construct(UriInterface $uri)
      */
     public function handleRequest(RequestInterface $request, callable $next, callable $first)
     {
-        $request = $request->withUri($request->getUri()
-            ->withPath($this->uri->getPath().$request->getUri()->getPath())
-        );
+        $identifier = spl_object_hash((object) $first);
+
+        if (!array_key_exists($identifier, $this->alteredRequests)) {
+            $request = $request->withUri($request->getUri()
+                ->withPath($this->uri->getPath().$request->getUri()->getPath())
+            );
+            $this->alteredRequests[$identifier] = $identifier;
+        }
 
         return $next($request);
     }