bug #24910 [HttpKernel][Debug] Remove noise from stack frames of deprecations (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit d4d8d3a54c43 · 2017-11-10T18:58:45.000+01:00
This PR was merged into the 3.3 branch. Discussion ---------- [HttpKernel][Debug] Remove noise from stack frames of deprecations | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #24625 | License | MIT | Doc PR | - Collecting arguments of deprecations is too heavy, and was unintended in fact. Commits ------- f154be3 [HttpKernel][Debug] Remove noise from stack frames of deprecations
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -707,7 +707,7 @@ private function cleanTrace($backtrace, $type, $file, $line, $throw)
         }
         if (!($throw || $this->scopedErrors & $type)) {
             for ($i = 0; isset($lightTrace[$i]); ++$i) {
-                unset($lightTrace[$i]['args']);
+                unset($lightTrace[$i]['args'], $lightTrace[$i]['object']);
             }
         }
 
diff --git a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
@@ -86,7 +86,7 @@ public function configure(Event $event = null)
                         $handler->screamAt($levels);
                     }
                     if ($this->scope) {
-                        $handler->scopeAt($this->levels);
+                        $handler->scopeAt($levels & ~E_USER_DEPRECATED & ~E_DEPRECATED);
                     } else {
                         $handler->scopeAt(0, true);
                     }

Original file line number	Diff line number	Diff line change
`@@ -707,7 +707,7 @@ private function cleanTrace($backtrace, $type, $file, $line, $throw)`
`707`	`707`	`}`
`708`	`708`	`if (!($throw \|\| $this->scopedErrors & $type)) {`
`709`	`709`	`for ($i = 0; isset($lightTrace[$i]); ++$i) {`
`710`		`- unset($lightTrace[$i]['args']);`
	`710`	`+ unset($lightTrace[$i]['args'], $lightTrace[$i]['object']);`
`711`	`711`	`}`
`712`	`712`	`}`
`713`	`713`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function configure(Event $event = null)`
`86`	`86`	`$handler->screamAt($levels);`
`87`	`87`	`}`
`88`	`88`	`if ($this->scope) {`
`89`		`- $handler->scopeAt($this->levels);`
	`89`	`+ $handler->scopeAt($levels & ~E_USER_DEPRECATED & ~E_DEPRECATED);`
`90`	`90`	`} else {`
`91`	`91`	`$handler->scopeAt(0, true);`
`92`	`92`	`}`