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
3 changed files with 16 additions and 14 deletions
--- a/ErrorHandler.php
+++ b/ErrorHandler.php
@@ -144,6 +144,13 @@ 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']);
+            }

            $exception = new ContextErrorException(sprintf('%s: %s in %s line %d', isset($this->levels[$level]) ? $this->levels[$level] : $level, $message, $file, $line), 0, $level, $file, $line, $context);

--- a/Tests/ErrorHandlerTest.php
+++ b/Tests/ErrorHandlerTest.php
@@ -181,18 +181,18 @@ PHP
    {
        try {
            $handler = ErrorHandler::register(0);
-            $this->assertFalse($handler->handle(0, 'foo', 'foo.php', 12, 'foo'));
+            $this->assertFalse($handler->handle(0, 'foo', 'foo.php', 12, array()));

            restore_error_handler();

            $handler = ErrorHandler::register(3);
-            $this->assertFalse($handler->handle(4, 'foo', 'foo.php', 12, 'foo'));
+            $this->assertFalse($handler->handle(4, 'foo', 'foo.php', 12, array()));

            restore_error_handler();

            $handler = ErrorHandler::register(3);
            try {
-                $handler->handle(111, 'foo', 'foo.php', 12, 'foo');
+                $handler->handle(111, 'foo', 'foo.php', 12, array());
            } catch (\ErrorException $e) {
                $this->assertSame('111: foo in foo.php line 12', $e->getMessage());
                $this->assertSame(111, $e->getSeverity());
@@ -203,12 +203,12 @@ PHP
            restore_error_handler();

            $handler = ErrorHandler::register(E_USER_DEPRECATED);
-            $this->assertTrue($handler->handle(E_USER_DEPRECATED, 'foo', 'foo.php', 12, 'foo'));
+            $this->assertTrue($handler->handle(E_USER_DEPRECATED, 'foo', 'foo.php', 12, array()));

            restore_error_handler();

            $handler = ErrorHandler::register(E_DEPRECATED);
-            $this->assertTrue($handler->handle(E_DEPRECATED, 'foo', 'foo.php', 12, 'foo'));
+            $this->assertTrue($handler->handle(E_DEPRECATED, 'foo', 'foo.php', 12, array()));

            restore_error_handler();

@@ -231,7 +231,7 @@ PHP

            $handler = ErrorHandler::register(E_USER_DEPRECATED);
            $handler->setLogger($logger);
-            $handler->handle(E_USER_DEPRECATED, 'foo', 'foo.php', 12, 'foo');
+            $handler->handle(E_USER_DEPRECATED, 'foo', 'foo.php', 12, array());

            restore_error_handler();
        } catch (\Exception $e) {
--- 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
Fabien Potencier	ec8b67232e	Merge branch '2.3' into 2.4 * 2.3: [Debug] fix ErrorHandlerTest when context is not an array Conflicts: src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php	2014-04-29 08:55:57 +02:00
Nicolas Grekas	9fb191fa62	[Debug] fix ErrorHandlerTest when context is not an array	2014-04-28 20:50:14 +02:00
Fabien Potencier	3e375dc708	Merge branch '2.3' into 2.4 * 2.3: [Debug] ErrorHandler: remove $GLOBALS from context in PHP5.3 fix #10292 Allow File instance to be passed to BinaryFileResponse Add upgrade instructions for the LoggerInterface fixed CS Removed strict check when found variables inside a translation	2014-04-28 19:43:58 +02:00
Nicolas Grekas	b2e922174d	[Debug] ErrorHandler: remove $GLOBALS from context in PHP5.3 fix #10292	2014-04-28 18:43:50 +02:00