Fix Http\Client\CookieCollection according to RFC6265.

src/Http/Client/CookieCollection.php

@@ -92,15 +92,15 @@ public function get($url)
                 continue;
             }
             $leadingDot = $cookie['domain'][0] === '.';
-            if (!$leadingDot && $host !== $cookie['domain']) {
-                continue;
-            }
             if ($leadingDot) {
-                $pattern = '/' . preg_quote(substr($cookie['domain'], 1), '/') . '$/';
-                if (!preg_match($pattern, $host)) {
-                    continue;
-                }
+                $cookie['domain'] = ltrim($cookie['domain'], '.');
+            }
+
+            $pattern = '/' . preg_quote(substr($cookie['domain'], 1), '/') . '$/';
+            if (!preg_match($pattern, $host)) {
+                continue;
             }
+
             $out[$cookie['name']] = $cookie['value'];
         }
 

tests/TestCase/Http/Client/CookieCollectionTest.php

@@ -226,7 +226,7 @@ public function testGetMatchingDomain()
     {
         $headers = [
             'HTTP/1.0 200 Ok',
-            'Set-Cookie: first=1; Domain=.example.com',
+            'Set-Cookie: first=1; Domain=example.com',
             'Set-Cookie: second=2;',
         ];
         $response = new Response($headers, '');
@@ -241,9 +241,45 @@ public function testGetMatchingDomain()
         $this->assertEquals($expected, $result);
 
         $result = $this->cookies->get('http://bar.foo.example.com');
+        $expected = ['first' => 1, 'second' => '2'];
+        $this->assertEquals($expected, $result);
+
+        $result = $this->cookies->get('http://api.example.com');
+        $expected = ['first' => 1];
+        $this->assertEquals($expected, $result);
+
+        $result = $this->cookies->get('http://google.com');
+        $expected = [];
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * Test getting cookies matching on paths exactly
+     *
+     * @return void
+     */
+    public function testGetMatchingDomainWithDot()
+    {
+        $headers = [
+            'HTTP/1.0 200 Ok',
+            'Set-Cookie: first=1; Domain=.example.com',
+            'Set-Cookie: second=2;',
+        ];
+        $response = new Response($headers, '');
+        $this->cookies->store($response, 'http://foo.example.com/');
+
+        $result = $this->cookies->get('http://example.com');
         $expected = ['first' => 1];
         $this->assertEquals($expected, $result);
 
+        $result = $this->cookies->get('http://foo.example.com');
+        $expected = ['first' => 1, 'second' => '2'];
+        $this->assertEquals($expected, $result);
+
+        $result = $this->cookies->get('http://bar.foo.example.com');
+        $expected = ['first' => 1, 'second' => '2'];
+        $this->assertEquals($expected, $result);
+
         $result = $this->cookies->get('http://api.example.com');
         $expected = ['first' => 1];
         $this->assertEquals($expected, $result);