Permalink
Browse files

Merge branch '2.3' into 2.4

* 2.3:
  fixed CS
  [HttpFoundation] Remove content-related headers if content is empty
  removed defaults from PHPUnit configuration
  • Loading branch information...
2 parents e5a774f + 9d365d2 commit 78e17e062ff03bcb5d284e05dfa33e616d546aa2 @fabpot fabpot committed Jul 9, 2014
Showing with 0 additions and 6 deletions.
  1. +0 −6 phpunit.xml.dist
View
@@ -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>

0 comments on commit 78e17e0

Please sign in to comment.