Merge branch '1.4.x'

Author: sagikazarmark

CHANGELOG.md

@@ -1,12 +1,21 @@
 # Change Log
 
+
 ## Unreleased
 
 ### Deprecated
 
  - FilteredStream::getReadFilter The read filter is internal and should never be used by consuming code.
  - FilteredStream::getWriteFilter We did not implement writing to the streams at all. And if we do, the filter is an internal information and should not be used by consuming code.
 
+
+## 1.4.1 - 2016-12-16
+
+### Fixed
+
+- Cookie::matchPath Cookie with root path (`/`) will not match sub path (e.g. `/cookie`).
+
+
 ## 1.4.0 - 2016-10-20
 
 ### Added
@@ -15,6 +24,7 @@
 - BufferedStream that allow you to decorate a non-seekable stream with a seekable one.
 - cUrlFormatter to be able to redo the request with a cURL command
 
+
 ## 1.3.1 - 2016-07-15
 
 ### Fixed

spec/CookieSpec.php

@@ -189,6 +189,7 @@ function it_matches_a_path()
         $this->beConstructedWith('name', 'value', null, null, '/path/to/somewhere');
 
         $this->matchPath('/path/to/somewhere')->shouldReturn(true);
+        $this->matchPath('/path/to/somewhere/else')->shouldReturn(true);
         $this->matchPath('/path/to/somewhereelse')->shouldReturn(false);
     }
 
@@ -197,6 +198,8 @@ function it_matches_the_root_path()
         $this->beConstructedWith('name', 'value', null, null, '/');
 
         $this->matchPath('/')->shouldReturn(true);
+        $this->matchPath('/cookies')->shouldReturn(true);
+        $this->matchPath('/cookies/')->shouldReturn(true);
     }
 
     function it_is_secure()

src/Cookie.php

@@ -313,7 +313,7 @@ public function withPath($path)
      */
     public function matchPath($path)
     {
-        return $this->path === $path || (strpos($path, $this->path.'/') === 0);
+        return $this->path === $path || (strpos($path, rtrim($this->path, '/').'/') === 0);
     }
 
     /**