fix merge

nicolas-grekas · nicolas-grekas · commit 2b2c0b7c9756 · 2017-07-12T16:37:06.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php b/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
@@ -174,7 +174,7 @@ public function testRawCookie()
     {
         $cookie = new Cookie('foo', 'b a r', 0, '/', null, false, false);
         $this->assertFalse($cookie->isRaw());
-        $this->assertEquals('foo=b+a+r; path=/', (string) $cookie);
+        $this->assertEquals('foo=b%20a%20r; path=/', (string) $cookie);
 
         $cookie = new Cookie('foo', 'b+a+r', 0, '/', null, false, false, true);
         $this->assertTrue($cookie->isRaw());

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ public function testRawCookie()`
`174`	`174`	`{`
`175`	`175`	`$cookie = new Cookie('foo', 'b a r', 0, '/', null, false, false);`
`176`	`176`	`$this->assertFalse($cookie->isRaw());`
`177`		`- $this->assertEquals('foo=b+a+r; path=/', (string) $cookie);`
	`177`	`+ $this->assertEquals('foo=b%20a%20r; path=/', (string) $cookie);`
`178`	`178`
`179`	`179`	`$cookie = new Cookie('foo', 'b+a+r', 0, '/', null, false, false, true);`
`180`	`180`	`$this->assertTrue($cookie->isRaw());`