Skip to content

Commit a937c02

Browse files
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 90d9797 + 33185b2 commit a937c02

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

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)