From 2b2c0b7c975663b5559048a124c1ad6343feb9e9 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 12 Jul 2017 16:37:06 +0200 Subject: [PATCH 1/2] fix merge --- src/Symfony/Component/HttpFoundation/Tests/CookieTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php b/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php index 90d8f4bd4f..3986a7e8f8 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php @@ -174,7 +174,7 @@ class CookieTest extends TestCase { $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()); From 8e6accc4d0226278ba2118507d6a18337ad2b288 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 12 Jul 2017 16:41:59 +0200 Subject: [PATCH 2/2] fix merge --- .../Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php index 47c24471a6..3a7e9d8739 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php @@ -589,6 +589,7 @@ class PhpDumperTest extends TestCase { $container = new ContainerBuilder(); $container->register('foo', '\\stdClass'); + $container->compile(); $dumper = new PhpDumper($container); eval('?>'.$dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Literal_Class_With_Root_Namespace')));