merged branch bamarni/patch-1 (PR #7895)

This PR was merged into the master branch.

Discussion
----------

[Debug] tweak for #6474

This keeps the previous behavior as described in the comment.

Commits
-------

7d67b5b [Debug] tweak for #6474

src/Symfony/Component/Debug/Debug.php

@@ -46,7 +46,8 @@ class Debug
         ErrorHandler::register($errorReportingLevel, $displayErrors);
         if ('cli' !== php_sapi_name()) {
             ExceptionHandler::register();
-        } elseif (!ini_get('log_errors') || ini_get('error_log') && $displayErrors) {
+        // CLI - display errors only if they're not already logged to STDERR
+        } elseif ($displayErrors && (!ini_get('log_errors') || ini_get('error_log'))) {
             ini_set('display_errors', 1);
         }