Merge branch '3.4' into 4.1

* 3.4: Fixed typo Fix ini_get() for boolean values SCA: fixed broken tests SCA: applied code style as per guidelines SCA: minor code tweaks
Merge branch '2.8' into 3.4
2026-03-25 17:52:07 +01:00 · 2018-10-31 10:09:42 +01:00 · 2018-10-31 10:06:03 +01:00 · 2018-10-30 17:24:01 +01:00 · 2018-10-02 18:36:10 +02:00 · 2018-10-02 18:33:53 +02:00
2 changed files with 3 additions and 2 deletions
--- a/Debug.php
+++ b/Debug.php
@@ -45,7 +45,7 @@ class Debug
        if (!\in_array(\PHP_SAPI, array('cli', 'phpdbg'), true)) {
            ini_set('display_errors', 0);
            ExceptionHandler::register();
-        } elseif ($displayErrors && (!ini_get('log_errors') || ini_get('error_log'))) {
+        } elseif ($displayErrors && (!filter_var(ini_get('log_errors'), FILTER_VALIDATE_BOOLEAN) || ini_get('error_log'))) {
            // CLI - display errors only if they're not already logged to STDERR
            ini_set('display_errors', 1);
        }
--- a/Tests/phpt/decorate_exception_hander.phpt
+++ b/Tests/phpt/decorate_exception_hander.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test catching fatal errors when handlers are nested
+--INI--
+display_errors=0
 --FILE--
 <?php

@@ -24,7 +26,6 @@ if (true) {

 ?>
 --EXPECTF--
-Fatal error: Class 'Symfony\Component\Debug\missing' not found in %s on line %d
 object(Symfony\Component\Debug\Exception\ClassNotFoundException)#%d (8) {
  ["message":protected]=>
  string(131) "Attempted to load class "missing" from namespace "Symfony\Component\Debug".
Author	SHA1	Message	Date
Nicolas Grekas	19090917b8	Merge branch '3.4' into 4.1 * 3.4: Fixed typo Fix ini_get() for boolean values SCA: fixed broken tests SCA: applied code style as per guidelines SCA: minor code tweaks	2018-10-31 10:09:42 +01:00
Nicolas Grekas	fe9793af00	Merge branch '2.8' into 3.4 * 2.8: Fixed typo Fix ini_get() for boolean values	2018-10-31 10:06:03 +01:00
François-Xavier de Guillebon	6a198c52b6	Fix ini_get() for boolean values	2018-10-30 17:24:01 +01:00
Nicolas Grekas	e3f76ce619	Merge branch '3.4' into 4.1 * 3.4: CS fix [Debug] fix compat with PHP 7.3	2018-10-02 18:36:10 +02:00
Nicolas Grekas	0a612e9dfb	Merge branch '2.8' into 3.4 * 2.8: CS fix [Debug] fix compat with PHP 7.3	2018-10-02 18:33:53 +02:00
Nicolas Grekas	087890e02f	[Debug] fix compat with PHP 7.3	2018-10-02 18:22:14 +02:00
Gabriel Caruso	65d41d1696	[CS] Enforces null type hint on last position in phpDocs	2018-10-02 00:12:00 -03:00