Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '2.4' into 2.5

* 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
  • Loading branch information...
commit c1309b0ee195ad264a4314435bdaecdfacb8ae9c 2 parents 92d5e2f + 78e17e0
@fabpot fabpot authored
Showing with 0 additions and 6 deletions.
  1. +0 −6 phpunit.xml.dist
View
6 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>
Please sign in to comment.
Something went wrong with that request. Please try again.