[BrowserKit] Fix cookie path handling when $domain is null

dunglas · dunglas · commit b97784c2eae4 · 2018-03-16T18:38:21.000+01:00
diff --git a/src/Symfony/Component/BrowserKit/CookieJar.php b/src/Symfony/Component/BrowserKit/CookieJar.php
@@ -43,32 +43,21 @@ public function get($name, $path = '/', $domain = null)
     {
         $this->flushExpiredCookies();
 
-        if (!empty($domain)) {
-            foreach ($this->cookieJar as $cookieDomain => $pathCookies) {
-                if ($cookieDomain) {
-                    $cookieDomain = '.'.ltrim($cookieDomain, '.');
-                    if ($cookieDomain != substr('.'.$domain, -strlen($cookieDomain))) {
-                        continue;
-                    }
-                }
-
-                foreach ($pathCookies as $cookiePath => $namedCookies) {
-                    if ($cookiePath != substr($path, 0, strlen($cookiePath))) {
-                        continue;
-                    }
-                    if (isset($namedCookies[$name])) {
-                        return $namedCookies[$name];
-                    }
+        foreach ($this->cookieJar as $cookieDomain => $pathCookies) {
+            if ($cookieDomain && $domain) {
+                $cookieDomain = '.'.ltrim($cookieDomain, '.');
+                if ($cookieDomain != substr('.'.$domain, -strlen($cookieDomain))) {
+                    continue;
                 }
             }
 
-            return;
-        }
-
-        // avoid relying on this behavior that is mainly here for BC reasons
-        foreach ($this->cookieJar as $cookies) {
-            if (isset($cookies[$path][$name])) {
-                return $cookies[$path][$name];
+            foreach ($pathCookies as $cookiePath => $namedCookies) {
+                if ($cookiePath != substr($path, 0, strlen($cookiePath))) {
+                    continue;
+                }
+                if (isset($namedCookies[$name])) {
+                    return $namedCookies[$name];
+                }
             }
         }
     }
diff --git a/src/Symfony/Component/BrowserKit/Tests/CookieJarTest.php b/src/Symfony/Component/BrowserKit/Tests/CookieJarTest.php
@@ -237,6 +237,8 @@ public function testCookieGetWithSubdirectory()
         $this->assertEquals($cookie1, $cookieJar->get('foo', '/test', 'example.com'));
         $this->assertEquals($cookie2, $cookieJar->get('foo1', '/', 'example.com'));
         $this->assertEquals($cookie2, $cookieJar->get('foo1', '/bar', 'example.com'));
+
+        $this->assertEquals($cookie2, $cookieJar->get('foo1', '/bar'));
     }
 
     public function testCookieWithWildcardDomain()

Original file line number	Diff line number	Diff line change
`@@ -237,6 +237,8 @@ public function testCookieGetWithSubdirectory()`
`237`	`237`	`$this->assertEquals($cookie1, $cookieJar->get('foo', '/test', 'example.com'));`
`238`	`238`	`$this->assertEquals($cookie2, $cookieJar->get('foo1', '/', 'example.com'));`
`239`	`239`	`$this->assertEquals($cookie2, $cookieJar->get('foo1', '/bar', 'example.com'));`
	`240`	`+`
	`241`	`+ $this->assertEquals($cookie2, $cookieJar->get('foo1', '/bar'));`
`240`	`242`	`}`
`241`	`243`
`242`	`244`	`public function testCookieWithWildcardDomain()`