diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-07-09 11:05:48 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-07-09 11:05:48 +0200 |
| commit | 531c4a7fda814e9f918673173a9aa0b2666f21ed (patch) | |
| tree | 05877e67fb49b8d87f8300eb2115cb9a11620de4 /phpunit.xml.dist | |
| parent | b4a38709f0ca040ea6710f0e8f60425bccd96036 (diff) | |
| parent | b2b3e0be1652603249f8781612f150c152537e3b (diff) | |
| download | symfony-security-531c4a7fda814e9f918673173a9aa0b2666f21ed.zip symfony-security-531c4a7fda814e9f918673173a9aa0b2666f21ed.tar.gz symfony-security-531c4a7fda814e9f918673173a9aa0b2666f21ed.tar.bz2 | |
Merge branch '2.4' into 2.5v2.5.2
* 2.4:
added missing test
fixed CS
[HttpFoundation] Remove content-related headers if content is empty
bumped Symfony version to 2.4.8
removed defaults from PHPUnit configuration
Conflicts:
src/Symfony/Component/HttpKernel/Kernel.php
Diffstat (limited to 'phpunit.xml.dist')
| -rw-r--r-- | phpunit.xml.dist | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 3298cea..4d167b7 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -3,13 +3,7 @@ <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd" backupGlobals="false" - backupStaticAttributes="false" colors="true" - convertErrorsToExceptions="true" - convertNoticesToExceptions="true" - convertWarningsToExceptions="true" - processIsolation="false" - stopOnFailure="false" bootstrap="vendor/autoload.php" > <testsuites> |