bug #29004 [BrowserKit] Remove undefined variable $str (samnela)

fabpot · fabpot · commit edcd6272300e · 2018-10-28T16:36:26.000+01:00
This PR was merged into the 4.2-dev branch. Discussion ---------- [BrowserKit] Remove undefined variable $str | Q | A | ------------- | --- | Branch? | master  | Bug fix? | yes | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | no  | License | MIT | Doc PR | no   Commits ------- 4b3fdd6 [BrowserKit] Remove undefined variable
diff --git a/src/Symfony/Component/BrowserKit/Cookie.php b/src/Symfony/Component/BrowserKit/Cookie.php
@@ -110,7 +110,7 @@ public function __toString()
         }
 
         if (null !== $this->samesite) {
-            $str .= '; samesite='.$this->samesite;
+            $cookie .= '; samesite='.$this->samesite;
         }
 
         return $cookie;
diff --git a/src/Symfony/Component/BrowserKit/Tests/CookieTest.php b/src/Symfony/Component/BrowserKit/Tests/CookieTest.php
@@ -29,6 +29,9 @@ public function testToString()
 
         $cookie = new Cookie('foo', 'bar', 0, '/', '');
         $this->assertEquals('foo=bar; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; httponly', (string) $cookie);
+
+        $cookie = new Cookie('foo', 'bar', 2, '/', '', true, true, false, 'lax');
+        $this->assertEquals('foo=bar; expires=Thu, 01 Jan 1970 00:00:02 GMT; path=/; secure; httponly; samesite=lax', (string) $cookie);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public function __toString()`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`if (null !== $this->samesite) {`
`113`		`- $str .= '; samesite='.$this->samesite;`
	`113`	`+ $cookie .= '; samesite='.$this->samesite;`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`return $cookie;`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,9 @@ public function testToString()`
`29`	`29`
`30`	`30`	`$cookie = new Cookie('foo', 'bar', 0, '/', '');`
`31`	`31`	`$this->assertEquals('foo=bar; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; httponly', (string) $cookie);`
	`32`	`+`
	`33`	`+ $cookie = new Cookie('foo', 'bar', 2, '/', '', true, true, false, 'lax');`
	`34`	`+ $this->assertEquals('foo=bar; expires=Thu, 01 Jan 1970 00:00:02 GMT; path=/; secure; httponly; samesite=lax', (string) $cookie);`
`32`	`35`	`}`
`33`	`36`
`34`	`37`	`/**`