diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #20183 Changed mentions of 'symfony2' to 'symfony' (a-ast)

Browse Source 
This PR was merged into the 3.2-dev branch.

Discussion
----------

Changed mentions of 'symfony2' to 'symfony'

| Q             | A
| ------------- | ---
| Branch?       | 3.0+
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Mentions of Symfony2 could be confusing for developers.
I changed
1. Surrogate capability name from 'symfony2' to 'symfony'
2. User Agent of BrowerKit Client from 'Symfony2 BrowserKit' to 'Symfony BrowserKit'
3. 'symfony2 is fun' in StopwatchExtensionTest. Not only Symfony2 is fun. Symfony3 is even more fun.

Commits
-------

6ebd03d Changed mentions of 'symfony2' to 'symfony'
This commit is contained in:
Fabien Potencier 2016-10-13 18:29:39 -07:00
commit 0f76683d33
9 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
UPGRADE-3.2.md
View File

@ -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
---------------

2
src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php
View File

@ -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'),

5
src/Symfony/Component/BrowserKit/CHANGELOG.md
View File

@ -1,6 +1,11 @@
CHANGELOG
=========
3.2.0
-----
* Client HTTP user agent has been changed to 'Symfony BrowserKit'
2.3.0
-----

2
src/Symfony/Component/BrowserKit/Client.php
View File

@ -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);
}

12
src/Symfony/Component/BrowserKit/Tests/ClientTest.php
View File

@ -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());

1
src/Symfony/Component/HttpKernel/CHANGELOG.md
View File

@ -5,6 +5,7 @@ CHANGELOG
-----
* deprecated `DataCollector::varToString()`, use `cloneVar()` instead
* changed surrogate capability name in `AbstractSurrogate::addSurrogateCapability` to 'symfony'
3.1.0
-----

2
src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php
View File

@ -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);
}

4
src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
View File

@ -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()

4
src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php
View File

@ -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()