8000 Merge branch '2.5' · symfony/symfony@d941f80 · GitHub
[go: up one dir, main page]
Skip to content

Commit d941f80

Browse files
fabpotfabpot
committed
Merge branch '2.5'
* 2.5: added missing test fixed CS [HttpFoundation] Remove content-related headers if content is empty bumped Symfony version to 2.5.2 bumped Symfony version to 2.4.8 updated VERSION for 2.5.1 updated CHANGELOG for 2.5.1 removed defaults from PHPUnit configuration Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
2 parents 229828d + 17009c1 commit d941f80

File tree

40 files changed

+69
-248
lines changed

40 files changed

+69
-248
lines changed

‎CHANGELOG-2.5.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,43 @@ in 2.5 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.5.0...v2.5.1
99

10+
* 2.5.1 (2014-07-08)
11+
12+
* bug #11283 [SecurityBundle] Remove Expression Language services when the component is unavailable (thewilkybarkid)
13+
* bug #11238 [Translation] Added unescaping of ids in PoFileLoader (JustBlackBird)
14+
* bug #11194 [DomCrawler] Remove the query string and the anchor of the uri of a link (benja-M-1)
15+
* bug #11272 [Console] Make sure formatter is the same. (akimsko)
16+
* bug #11259 [Config] Fixed failed config schema loads due to libxml_disable_entity_loader usage (ccorliss)
17+
* bug #11234 [ClassLoader] fixed PHP warning on PHP 5.3 (fabpot)
18+
* bug #11179 [Process] Fix ExecutableFinder with open basedir (cs278)
19+
* bug #11242 [CssSelector] Refactored the CssSelector to remove the circular object graph (stof)
20+
* bug #11219 [DomCrawler] properly handle buttons with single and double quotes insid... (xabbuh)
21+
* bug #11220 [Components][Serializer] optional constructor arguments can be omitted during the denormalization process (xabbuh)
22+
* bug #11186 Added missing `break` statement (apfelbox)
23+
* bug #11168 [YAML] fix merge node (<<) (Tobion)
24+
* bug #11170 [Console] Fixed notice in QuestionHelper (florianv)
25+
* bug #11169 [Console] Fixed notice in DialogHelper (florianv)
26+
* bug #11144 [HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6 (kicken)
27+
* bug #11121 [Process] Do not redirect output to file handles when output is disabled, simply discard it (romainneutron)
28+
* bug #10966 PHP Fatal error when getContainer method of ContainerAwareCommand has be... (kevinvergauwen)
29+
* bug #10981 [HttpFoundation] Fixed isSecure() check to be compliant with the docs (Jannik Zschiesche)
30+
* bug #11117 [Validator] Fix array notation in the PropertyPath::append() (jakzal)
31+
* bug #11113 [HttpKernel] Fix event dispatcher dependency (hacfi)
32+
* bug #11111 Fixed undefined ImageValidator::$suffices property when uploading an image during functional tests (OwlyCode)
33+
* bug #11099 [Debug] work-around https://bugs.php.net/61272 (nicolas-grekas)
34+
* bug #11092 [HttpFoundation] Fix basic authentication in url with PHP-FPM (Kdecherf)
35+
* bug #11097 [Debug] simplify code path to remove potential blank pages (nicolas-grekas)
36+
* bug #10808 [DomCrawler] Empty select with attribute name="foo[]" bug fix (darles)
37+
* bug #11063 [HttpFoundation] fix switch statement (Tobion)
38+
* bug #11054 [Serializer] Xml encoder whitespace fix (fieg)
39+
* bug #11009 [HttpFoundation] smaller fixes for PdoSessionHandler (Tobion)
40+
* bug #11047 #10862 loadClassMetadata vs loadValidatorMetadata: revert default config (phramz)
41+
* bug #11042 [Debug] fix debug handlers config (nicolas-grekas)
42+
* bug #11043 [Console] OutputFormatter Unset Bold has wrong id (DZunke)
43+
* bug #11033 [Debug] fix wrong case mismatch exception (nicolas-grekas)
44+
* bug #11044 [Serializer] Fix BC break since 2.5 (fieg)
45+
* bug #11041 Remove undefined variable $e (skydiablo)
46+
1047
* 2.5.0 (2014-05-31)
1148

1249
* bug #11014 [Validator] Remove property and method targets from the optional and required constraints (jakzal)

‎phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="autoload.php.dist"
148
>
159
<php>

‎src/Symfony/Bridge/Doctrine/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="Tests/bootstrap.php"
148
>
159
<testsuites>

‎src/Symfony/Bridge/Monolog/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="vendor/autoload.php"
148
>
159
<testsuites>

‎src/Symfony/Bridge/Propel1/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="vendor/autoload.php"
148
>
159
<testsuites>

‎src/Symfony/Bridge/ProxyManager/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="vendor/autoload.php"
148
>
159
<testsuites>

‎src/Symfony/Bridge/Twig/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="vendor/autoload.php"
148
>
159
<testsuites>

‎src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="vendor/autoload.php"
148
>
159
<testsuites>

‎src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrors 10000 ToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="vendor/autoload.php"
148
>
159

‎src/Symfony/Bundle/TwigBundle/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="vendor/autoload.php"
148
>
159

‎src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="vendor/autoload.php"
148
>
159

‎src/Symfony/Component/BrowserKit/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="vendor/autoload.php"
148
>
159
<testsuites>

‎src/Symfony/Component/ClassLoader/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="vendor/autoload.php"
148
>
159
<testsuites>

‎src/Symfony/Component/Config/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="vendor/autoload.php"
148
>
159
<testsuites>

‎src/Symfony/Component/Console/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="vendor/autoload.php"
148
>
159
<testsuites>

‎src/Symfony/Component/CssSelector/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="vendor/autoload.php"
148
>
159
<testsuites>

‎src/Symfony/Component/Debug/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="vendor/autoload.php"
148
>
159
<testsuites>

‎src/Symfony/Component/DependencyInjection/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="vendor/autoload.php"
148
>
159
<testsuites>

‎src/Symfony/Component/DomCrawler/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="vendor/autoload.php"
148
>
159
<testsuites>

‎src/Symfony/Component/EventDispatcher/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="vendor/autoload.php"
148
>
159
<testsuites>

‎src/Symfony/Component/Filesystem/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="vendor/autoload.php"
148
>
159
<testsuites>

‎src/Symfony/Component/Finder/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="vendor/autoload.php"
148
>
159
<testsuites>

‎src/Symfony/Component/Form/phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
colors="true"
8-
convertErrorsToExceptions="true"
9-
convertNoticesToExceptions="true"
10-
convertWarningsToExceptions="true"
11-
processIsolation="false"
12-
stopOnFailure="false"
137
bootstrap="vendor/autoload.php"
148
>
159
<testsuites>

0 commit comments

Comments
 (0)
0