Merge branch '2.5' into 2.6

* 2.5: [Debug] fix error message on double exception Fix initialized() with aliased services Rename Symfony2 to Symfony compare version using PHP_VERSION_ID backport #12489 remove an unneeded check
Merge branch '2.3' into 2.5
2026-04-28 03:33:15 +02:00 · 2014-11-28 11:00:40 +01:00 · 2014-11-28 11:00:29 +01:00 · 2014-11-28 10:40:13 +01:00 · 2014-11-23 21:21:44 +01:00 · 2014-11-20 14:24:23 +01:00
3 changed files with 16 additions and 21 deletions
@@ -487,7 +487,6 @@ class ErrorHandler
    public static function handleFatalError(array $error = null)
    {
        self::$reservedMemory = '';
-        gc_collect_cycles();
        $handler = set_error_handler('var_dump', 0);
        $handler = is_array($handler) ? $handler[0] : null;
        restore_error_handler();
@@ -15,10 +15,6 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\Debug\Exception\OutOfMemoryException;

-if (!defined('ENT_SUBSTITUTE')) {
-    define('ENT_SUBSTITUTE', 8);
-}
-
 /**
 * ExceptionHandler converts an exception to a Response object.
 *
@@ -253,7 +249,7 @@ EOF
            } catch (\Exception $e) {
                // something nasty happened and we cannot throw an exception anymore
                if ($this->debug) {
-                    $title = sprintf('Exception thrown when handling an exception (%s: %s)', get_class($exception), $exception->getMessage());
+                    $title = sprintf('Exception thrown when handling an exception (%s: %s)', get_class($e), $e->getMessage());
                } else {
                    $title = 'Whoops, looks like something went wrong.';
                }
@@ -428,7 +424,7 @@ EOF;
            $str = iconv($charset, 'UTF-8', $str);
        }

-        return htmlspecialchars($str, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+        return htmlspecialchars($str, ENT_QUOTES | (PHP_VERSION_ID >= 50400 ? ENT_SUBSTITUTE : 0), 'UTF-8');
    }

    /**
@@ -162,21 +162,21 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
            $handler->setDefaultLogger($logger, array(E_USER_NOTICE => LogLevel::CRITICAL));

            $loggers = array(
-                E_DEPRECATED        => array(null, LogLevel::INFO),
-                E_USER_DEPRECATED   => array(null, LogLevel::INFO),
-                E_NOTICE            => array($logger, LogLevel::NOTICE),
-                E_USER_NOTICE       => array($logger, LogLevel::CRITICAL),
-                E_STRICT            => array(null, LogLevel::NOTICE),
-                E_WARNING           => array(null, LogLevel::WARNING),
-                E_USER_WARNING      => array(null, LogLevel::WARNING),
-                E_COMPILE_WARNING   => array(null, LogLevel::WARNING),
-                E_CORE_WARNING      => array(null, LogLevel::WARNING),
-                E_USER_ERROR        => array(null, LogLevel::ERROR),
+                E_DEPRECATED => array(null, LogLevel::INFO),
+                E_USER_DEPRECATED => array(null, LogLevel::INFO),
+                E_NOTICE => array($logger, LogLevel::NOTICE),
+                E_USER_NOTICE => array($logger, LogLevel::CRITICAL),
+                E_STRICT => array(null, LogLevel::NOTICE),
+                E_WARNING => array(null, LogLevel::WARNING),
+                E_USER_WARNING => array(null, LogLevel::WARNING),
+                E_COMPILE_WARNING => array(null, LogLevel::WARNING),
+                E_CORE_WARNING => array(null, LogLevel::WARNING),
+                E_USER_ERROR => array(null, LogLevel::ERROR),
                E_RECOVERABLE_ERROR => array(null, LogLevel::ERROR),
-                E_COMPILE_ERROR     => array(null, LogLevel::EMERGENCY),
-                E_PARSE             => array(null, LogLevel::EMERGENCY),
-                E_ERROR             => array(null, LogLevel::EMERGENCY),
-                E_CORE_ERROR        => array(null, LogLevel::EMERGENCY),
+                E_COMPILE_ERROR => array(null, LogLevel::EMERGENCY),
+                E_PARSE => array(null, LogLevel::EMERGENCY),
+                E_ERROR => array(null, LogLevel::EMERGENCY),
+                E_CORE_ERROR => array(null, LogLevel::EMERGENCY),
            );
            $this->assertSame($loggers, $handler->setLoggers(array()));
Author	SHA1	Message	Date
Fabien Potencier	e1e27710ef	Merge branch '2.5' into 2.6 * 2.5: [Debug] fix error message on double exception Fix initialized() with aliased services Rename Symfony2 to Symfony compare version using PHP_VERSION_ID backport #12489 remove an unneeded check	2014-11-28 11:00:40 +01:00
Fabien Potencier	cf157485a8	Merge branch '2.3' into 2.5 * 2.3: [Debug] fix error message on double exception Fix initialized() with aliased services Rename Symfony2 to Symfony backport #12489 Conflicts: CONTRIBUTING.md src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php	2014-11-28 11:00:29 +01:00
Nicolas Grekas	d492ff8385	[Debug] fix error message on double exception	2014-11-28 10:40:13 +01:00
Nicolas Grekas	bc1ba62d5d	[Debug] fix ENT_SUBSTITUTE usage	2014-11-23 21:21:44 +01:00
Fabien Potencier	15b9784606	Merge branch '2.5' into 2.6 * 2.5: [SecurityBundle] Authentication entry point is only registered with firewall exception listener, not with authentication listeners be smarter when guessing the document root Azerbaijani locale Fixed grammar error in docblock Adjust upgrade file rendering [Bridge/Propel1] Changed deps to accepts all upcoming propel1 versions compare version using PHP_VERSION_ID [Form] Add doc for FormEvents don't override internal PHP constants [Session] Fix parameter names in WriteCheckSessionHandler Add consistency with request type checking [FrameworkBundle] Fix server run in case the router script does not exist Conflicts: composer.json src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/Debug/ExceptionHandler.php	2014-11-20 14:24:23 +01:00
Fabien Potencier	6a7289a58d	Merge branch '2.3' into 2.5 * 2.3: [SecurityBundle] Authentication entry point is only registered with firewall exception listener, not with authentication listeners be smarter when guessing the document root Azerbaijani locale Fixed grammar error in docblock Adjust upgrade file rendering [Bridge/Propel1] Changed deps to accepts all upcoming propel1 versions compare version using PHP_VERSION_ID [Form] Add doc for FormEvents don't override internal PHP constants Conflicts: UPGRADE-3.0.md src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/HttpFoundation/Response.php	2014-11-20 14:22:25 +01:00
Christian Flothmann	5a7ebac6ac	compare version using PHP_VERSION_ID To let opcode caches optimize cached code, the `PHP_VERSION_ID` constant is used to detect the current PHP version instead of calling `version_compare()` with `PHP_VERSION`.	2014-11-17 17:27:42 +01:00
Christian Flothmann	d854bf96fe	don't override internal PHP constants	2014-11-16 18:59:41 +01:00
Nicolas Grekas	2ce999992e	[Debug] No gc_collect_cycles(), it's costly and can segfault	2014-11-06 21:49:33 +01:00
Disquedur	8a1bb02de0	Remove aligned '=>' and '='	2014-11-04 15:29:39 +01:00