From 6ebd03de9c7a797289e7e52c812cf7c6092f5494 Mon Sep 17 00:00:00 2001 From: Andrey Astakhov Date: Sat, 8 Oct 2016 00:19:14 +0200 Subject: [PATCH] Changed mentions of 'symfony2' to 'symfony' - Changed surrogate capability name to symfony - Changed user agent of the BrowserKit Client to 'Symfony BrowserKit' - Changed 'symfony2' to 'symfony' in timing templates - Updated changelog and upgrade files --- UPGRADE-3.2.md | 17 +++++++++++++++++ .../Tests/Extension/StopwatchExtensionTest.php | 2 +- src/Symfony/Component/BrowserKit/CHANGELOG.md | 5 +++++ src/Symfony/Component/BrowserKit/Client.php | 2 +- .../Component/BrowserKit/Tests/ClientTest.php | 12 ++++++------ src/Symfony/Component/HttpKernel/CHANGELOG.md | 1 + .../HttpKernel/HttpCache/AbstractSurrogate.php | 2 +- .../HttpKernel/Tests/HttpCache/EsiTest.php | 4 ++-- .../HttpKernel/Tests/HttpCache/SsiTest.php | 4 ++-- 9 files changed, 36 insertions(+), 13 deletions(-) diff --git a/UPGRADE-3.2.md b/UPGRADE-3.2.md index 8da6fd3f14..b2060d1e9c 100644 --- a/UPGRADE-3.2.md +++ b/UPGRADE-3.2.md @@ -1,6 +1,11 @@ UPGRADE FROM 3.1 to 3.2 ======================= +BrowserKit +---------- + + * Client HTTP user agent has been changed to 'Symfony BrowserKit' (was 'Symfony2 BrowserKit' before). + FrameworkBundle --------------- @@ -71,6 +76,18 @@ HttpKernel * `DataCollector::varToString()` is deprecated and will be removed in Symfony 4.0. Use the `cloneVar()` method instead. + * Surrogate name in a `Surrogate-Capability` HTTP request header has been changed to 'symfony'. + + Before: + ``` + Surrogate-Capability: symfony2="ESI/1.0" + ``` + + After: + ``` + Surrogate-Capability: symfony="ESI/1.0" + ``` + HttpFoundation --------------- diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php index 8c0cdfe69b..daca220e49 100644 --- a/src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php @@ -42,7 +42,7 @@ class StopwatchExtensionTest extends \PHPUnit_Framework_TestCase { return array( array('{% stopwatch "foo" %}something{% endstopwatch %}', 'foo'), - array('{% stopwatch "foo" %}symfony2 is fun{% endstopwatch %}{% stopwatch "bar" %}something{% endstopwatch %}', array('foo', 'bar')), + array('{% stopwatch "foo" %}symfony is fun{% endstopwatch %}{% stopwatch "bar" %}something{% endstopwatch %}', array('foo', 'bar')), array('{% set foo = "foo" %}{% stopwatch foo %}something{% endstopwatch %}', 'foo'), array('{% set foo = "foo" %}{% stopwatch foo %}something {% set foo = "bar" %}{% endstopwatch %}', 'foo'), array('{% stopwatch "foo.bar" %}something{% endstopwatch %}', 'foo.bar'), diff --git a/src/Symfony/Component/BrowserKit/CHANGELOG.md b/src/Symfony/Component/BrowserKit/CHANGELOG.md index d2b1074029..37b6f6e991 100644 --- a/src/Symfony/Component/BrowserKit/CHANGELOG.md +++ b/src/Symfony/Component/BrowserKit/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +3.2.0 +----- + + * Client HTTP user agent has been changed to 'Symfony BrowserKit' + 2.3.0 ----- diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php index 278a767bf0..e6911d1b07 100644 --- a/src/Symfony/Component/BrowserKit/Client.php +++ b/src/Symfony/Component/BrowserKit/Client.php @@ -123,7 +123,7 @@ abstract class Client public function setServerParameters(array $server) { $this->server = array_merge(array( - 'HTTP_USER_AGENT' => 'Symfony2 BrowserKit', + 'HTTP_USER_AGENT' => 'Symfony BrowserKit', ), $server); } diff --git a/src/Symfony/Component/BrowserKit/Tests/ClientTest.php b/src/Symfony/Component/BrowserKit/Tests/ClientTest.php index e57cc4c06a..7d2684084f 100644 --- a/src/Symfony/Component/BrowserKit/Tests/ClientTest.php +++ b/src/Symfony/Component/BrowserKit/Tests/ClientTest.php @@ -432,7 +432,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase { $headers = array( 'HTTP_HOST' => 'www.example.com', - 'HTTP_USER_AGENT' => 'Symfony2 BrowserKit', + 'HTTP_USER_AGENT' => 'Symfony BrowserKit', 'CONTENT_TYPE' => 'application/vnd.custom+xml', 'HTTPS' => false, ); @@ -459,7 +459,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase { $headers = array( 'HTTP_HOST' => 'www.example.com:8080', - 'HTTP_USER_AGENT' => 'Symfony2 BrowserKit', + 'HTTP_USER_AGENT' => 'Symfony BrowserKit', 'HTTPS' => false, 'HTTP_REFERER' => 'http://www.example.com:8080/', ); @@ -602,7 +602,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase { $client = new TestClient(); $this->assertEquals('', $client->getServerParameter('HTTP_HOST')); - $this->assertEquals('Symfony2 BrowserKit', $client->getServerParameter('HTTP_USER_AGENT')); + $this->assertEquals('Symfony BrowserKit', $client->getServerParameter('HTTP_USER_AGENT')); $this->assertEquals('testvalue', $client->getServerParameter('testkey', 'testvalue')); } @@ -611,7 +611,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase $client = new TestClient(); $this->assertEquals('', $client->getServerParameter('HTTP_HOST')); - $this->assertEquals('Symfony2 BrowserKit', $client->getServerParameter('HTTP_USER_AGENT')); + $this->assertEquals('Symfony BrowserKit', $client->getServerParameter('HTTP_USER_AGENT')); $client->setServerParameter('HTTP_HOST', 'testhost'); $this->assertEquals('testhost', $client->getServerParameter('HTTP_HOST')); @@ -625,7 +625,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase $client = new TestClient(); $this->assertEquals('', $client->getServerParameter('HTTP_HOST')); - $this->assertEquals('Symfony2 BrowserKit', $client->getServerParameter('HTTP_USER_AGENT')); + $this->assertEquals('Symfony BrowserKit', $client->getServerParameter('HTTP_USER_AGENT')); $client->request('GET', 'https://www.example.com/https/www.example.com', array(), array(), array( 'HTTP_HOST' => 'testhost', @@ -635,7 +635,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase )); $this->assertEquals('', $client->getServerParameter('HTTP_HOST')); - $this->assertEquals('Symfony2 BrowserKit', $client->getServerParameter('HTTP_USER_AGENT')); + $this->assertEquals('Symfony BrowserKit', $client->getServerParameter('HTTP_USER_AGENT')); $this->assertEquals('http://www.example.com/https/www.example.com', $client->getRequest()->getUri()); diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md index b3b70547f4..0c95ff5640 100644 --- a/src/Symfony/Component/HttpKernel/CHANGELOG.md +++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md @@ -5,6 +5,7 @@ CHANGELOG ----- * deprecated `DataCollector::varToString()`, use `cloneVar()` instead + * changed surrogate capability name in `AbstractSurrogate::addSurrogateCapability` to 'symfony' 3.1.0 ----- diff --git a/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php b/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php index a33f754d4e..af94bea9ba 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php @@ -68,7 +68,7 @@ abstract class AbstractSurrogate implements SurrogateInterface public function addSurrogateCapability(Request $request) { $current = $request->headers->get('Surrogate-Capability'); - $new = sprintf('symfony2="%s/1.0"', strtoupper($this->getName())); + $new = sprintf('symfony="%s/1.0"', strtoupper($this->getName())); $request->headers->set('Surrogate-Capability', $current ? $current.', '.$new : $new); } diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php index 0d52ce89db..e41f7b5b93 100644 --- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php @@ -39,10 +39,10 @@ class EsiTest extends \PHPUnit_Framework_TestCase $request = Request::create('/'); $esi->addSurrogateCapability($request); - $this->assertEquals('symfony2="ESI/1.0"', $request->headers->get('Surrogate-Capability')); + $this->assertEquals('symfony="ESI/1.0"', $request->headers->get('Surrogate-Capability')); $esi->addSurrogateCapability($request); - $this->assertEquals('symfony2="ESI/1.0", symfony2="ESI/1.0"', $request->headers->get('Surrogate-Capability')); + $this->assertEquals('symfony="ESI/1.0", symfony="ESI/1.0"', $request->headers->get('Surrogate-Capability')); } public function testAddSurrogateControl() diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php index 07b70dcee8..74ef0965b4 100644 --- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php @@ -39,10 +39,10 @@ class SsiTest extends \PHPUnit_Framework_TestCase $request = Request::create('/'); $ssi->addSurrogateCapability($request); - $this->assertEquals('symfony2="SSI/1.0"', $request->headers->get('Surrogate-Capability')); + $this->assertEquals('symfony="SSI/1.0"', $request->headers->get('Surrogate-Capability')); $ssi->addSurrogateCapability($request); - $this->assertEquals('symfony2="SSI/1.0", symfony2="SSI/1.0"', $request->headers->get('Surrogate-Capability')); + $this->assertEquals('symfony="SSI/1.0", symfony="SSI/1.0"', $request->headers->get('Surrogate-Capability')); } public function testAddSurrogateControl()