symfony
diff --git a/‎src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
+18-4Lines changed: 18 additions & 4 deletions b/‎src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
+18-4Lines changed: 18 additions & 4 deletions
diff --git a/‎src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
+2-2Lines changed: 2 additions & 2 deletions
@@ -116,9 +116,16 @@ public static function register($mode = 0)
             }
 
             if (isset($trace[$i]['object']) || isset($trace[$i]['class'])) {
-                $class = isset($trace[$i]['object']) ? get_class($trace[$i]['object']) : $trace[$i]['class'];
-                $method = $trace[$i]['function'];
-                $Test = $UtilPrefix.'Test';
+                if (isset($trace[$i]['class']) && 'Symfony\Bridge\PhpUnit\SymfonyTestsListener' === $trace[$i]['class']) {
+                    $parsedMsg = unserialize($msg);
+                    $msg = $parsedMsg['deprecation'];
+                    $class = $parsedMsg['class'];
+                    $method = $parsedMsg['method'];
+                } else {
+                    $class = isset($trace[$i]['object']) ? get_class($trace[$i]['object']) : $trace[$i]['class'];
+                    $method = $trace[$i]['function'];
+                    $Test = $UtilPrefix.'Test';
+                }
 
                 if (0 !== error_reporting()) {
                     $group = 'unsilenced';
@@ -245,7 +252,14 @@ public static function collectDeprecations($outputFile)
             if (E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) {
                 return $previousErrorHandler ? $previousErrorHandler($type, $msg, $file, $line, $context) : false;
             }
-            $deprecations[] = array(error_reporting(), $msg);
+            $trace = debug_backtrace(true);
+            $i = count($trace);
+            while (1 < $i && (!isset($trace[--$i]['class']) || ('ReflectionMethod' === $trace[$i]['class'] || 0 === strpos($trace[$i]['class'], 'PHPUnit_') || 0 === strpos($trace[$i]['class'], 'PHPUnit\\')))) {
+                // No-op
+            }
+            $class = isset($trace[$i]['object']) ? get_class($trace[$i]['object']) : $trace[$i]['class'];
+            $method = $trace[$i]['function'];
+            $deprecations[] = array(error_reporting(), $msg, $class, $method);
         });
         register_shutdown_function(function () use ($outputFile, &$deprecations) {
             file_put_contents($outputFile, serialize($deprecations));
 
@@ -264,9 +264,9 @@ public function endTest($test, $time)
             unlink($this->runsInSeparateProcess);
             foreach ($deprecations ? unserialize($deprecations) : array() as $deprecation) {
                 if ($deprecation[0]) {
-                    trigger_error($deprecation[1], E_USER_DEPRECATED);
+                    trigger_error(serialize(array('deprecation' => $deprecation[1], 'class' => $deprecation[2], 'method' => $deprecation[3])), E_USER_DEPRECATED);
                 } else {
-                    @trigger_error($deprecation[1], E_USER_DEPRECATED);
+                    @trigger_error(serialize(array('deprecation' => $deprecation[1], 'class' => $deprecation[2], 'method' => $deprecation[3])), E_USER_DEPRECATED);
                 }
             }
             $this->runsInSeparateProcess = false;
Original file line number	Diff line number	Diff line change
`@@ -264,9 +264,9 @@ public function endTest($test, $time)`
`264`	`264`	`unlink($this->runsInSeparateProcess);`
`265`	`265`	`foreach ($deprecations ? unserialize($deprecations) : array() as $deprecation) {`
`266`	`266`	`if ($deprecation[0]) {`
`267`		`- trigger_error($deprecation[1], E_USER_DEPRECATED);`
	`267`	`+ trigger_error(serialize(array('deprecation' => $deprecation[1], 'class' => $deprecation[2], 'method' => $deprecation[3])), E_USER_DEPRECATED);`
`268`	`268`	`} else {`
`269`		`- @trigger_error($deprecation[1], E_USER_DEPRECATED);`
	`269`	`+ @trigger_error(serialize(array('deprecation' => $deprecation[1], 'class' => $deprecation[2], 'method' => $deprecation[3])), E_USER_DEPRECATED);`
`270`	`270`	`}`
`271`	`271`	`}`
`272`	`272`	`$this->runsInSeparateProcess = false;`