merged branch Seldaek/fix-deprecated-logs (PR #7587)

fabpot · fabpot · commit bf30a3df1145 · 2013-04-07T15:30:10.000+02:00
This PR was merged into the 2.2 branch. Discussion ---------- [2.2][HttpKernel] Remove args from 5.3 stack traces to avoid filling log files Fixes #7259 - it just makes the PHP 5.3 behavior match the one on 5.4. Commits ------- 99256e4 [HttpKernel] Remove args from 5.3 stack traces to avoid filling log files, fixes #7259
diff --git a/src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php b/src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
@@ -87,7 +87,17 @@ public function handle($level, $message, $file, $line, $context)
 
         if ($level & (E_USER_DEPRECATED | E_DEPRECATED)) {
             if (null !== self::$logger) {
-                $stack = version_compare(PHP_VERSION, '5.4', '<') ? array_slice(debug_backtrace(false), 0, 10) : debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 10);
+                if (version_compare(PHP_VERSION, '5.4', '<')) {
+                    $stack = array_map(
+                        function ($row) {
+                            unset($row['args']);
+                            return $row;
+                        },
+                        array_slice(debug_backtrace(false), 0, 10)
+                    );
+                } else {
+                    $stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 10);
+                }
 
                 self::$logger->warning($message, array('type' => self::TYPE_DEPRECATION, 'stack' => $stack));
             }
