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
2026-03-25 01:32:09 +01:00 · 2014-07-09 11:04:55 +02:00 · 2014-07-08 13:46:35 +02:00 · 2014-07-07 12:13:42 +02:00 · 2014-07-07 11:57:21 +02:00 · 2014-04-30 08:22:28 +02:00
2 changed files with 6 additions and 8 deletions
--- a/ErrorHandler.php
+++ b/ErrorHandler.php
@@ -144,6 +144,9 @@ class ErrorHandler
            if (!class_exists('Symfony\Component\Debug\Exception\ContextErrorException')) {
                require __DIR__.'/Exception/ContextErrorException.php';
            }
+            if (!class_exists('Symfony\Component\Debug\Exception\FlattenException')) {
+                require __DIR__.'/Exception/FlattenException.php';
+            }

            if (PHP_VERSION_ID < 50400 && isset($context['GLOBALS']) && is_array($context)) {
                unset($context['GLOBALS']);
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         backupGlobals="false"
         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
         bootstrap="vendor/autoload.php"
 >
    <testsuites>
Author	SHA1	Message	Date
Fabien Potencier	c9532f4021	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	2014-07-09 11:04:55 +02:00
Fabien Potencier	1ae44befec	Merge branch '2.3' into 2.4 * 2.3: bumped Symfony version to 2.3.18 updated VERSION for 2.3.17 update CONTRIBUTORS for 2.3.17 updated CHANGELOG for 2.3.17 added XSD to PHPUnit configuration bug #11319 [HttpKernel] Ensure the storage exists before purging it in ProfilerTest [Translation] Added unescaping of ids in PoFileLoader updated italian translation for validation messages [DomCrawler] Fix docblocks and formatting. [DomCrawler] Remove the query string and the anchor of the uri of a link Simplified the Travis test command [Console] Make sure formatter is the same Conflicts: src/Symfony/Component/HttpKernel/Kernel.php	2014-07-08 13:46:35 +02:00
Christian Raue	91e3a1480c	removed defaults from PHPUnit configuration	2014-07-07 12:13:42 +02:00
Christian Raue	732b41060b	added XSD to PHPUnit configuration	2014-07-07 11:57:21 +02:00
Fabien Potencier	6e721ae2cd	Merge branch '2.3' into 2.4 * 2.3: [Debug] fix #10313: FlattenException not found because of https://bugs.php.net/42098	2014-04-30 08:22:28 +02:00
Nicolas Grekas	ca764f8af9	[Debug] fix #10313 : FlattenException not found because of https://bugs.php.net/42098	2014-04-29 21:42:43 +02:00