Merge remote-tracking branch 'origin/master' into 2.x

Author: dbu

CHANGELOG.md

@@ -10,11 +10,12 @@
 ### Removed
 - Deprecated option `debug_plugins` has been removed from `PluginClient`
 
-## 1.8.2 (unreleased)
+## 1.8.2 - 2018-12-14
 
 ### Changed
 
 - When multiple cookies exist, a single header with all cookies is sent as per RFC 6265 Section 5.4
+- AddPathPlugin will now trim of ending slashes in paths
 
 ## 1.8.1 - 2018-10-09
 

spec/Plugin/AddPathPluginSpec.php

@@ -46,12 +46,24 @@ public function it_adds_path(
         $this->handleRequest($request, PluginStub::next(), function () {});
     }
 
-    public function it_throws_exception_on_trailing_slash(UriInterface $host)
-    {
+    function it_removes_ending_slashes(
+        RequestInterface $request,
+        UriInterface $host,
+        UriInterface $host2,
+        UriInterface $uri
+    ) {
         $host->getPath()->shouldBeCalled()->willReturn('/api/');
+        $host2->getPath()->shouldBeCalled()->willReturn('/api');
+        $host->withPath('/api')->shouldBeCalled()->willReturn($host2);
+
+        $request->getUri()->shouldBeCalled()->willReturn($uri);
+        $request->withUri($uri)->shouldBeCalled()->willReturn($request);
+
+        $uri->withPath('/api/users')->shouldBeCalled()->willReturn($uri);
+        $uri->getPath()->shouldBeCalled()->willReturn('/users');
 
         $this->beConstructedWith($host);
-        $this->shouldThrow(\LogicException::class)->duringInstantiation();
+        $this->handleRequest($request, function () {}, function () {});
     }
 
     public function it_throws_exception_on_empty_path(UriInterface $host)

src/Plugin/AddPathPlugin.php

@@ -33,7 +33,7 @@ public function __construct(UriInterface $uri)
         }
 
         if ('/' === substr($uri->getPath(), -1)) {
-            throw new \LogicException('URI path cannot end with a slash.');
+            $uri = $uri->withPath(rtrim($uri->getPath(), '/'));
         }
 
         $this->uri = $uri;