symfony
diff --git a/‎src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
+7-2Lines changed: 7 additions & 2 deletions b/‎src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
+7-2Lines changed: 7 additions & 2 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
+3-2Lines changed: 3 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
+3-2Lines changed: 3 additions & 2 deletions
@@ -107,7 +107,7 @@ public static function register($mode = 0)
 
             $trace = debug_backtrace(true);
             $group = 'other';
-
+            $isVendor = false;
             $isWeak = DeprecationErrorHandler::MODE_WEAK === $mode || (DeprecationErrorHandler::MODE_WEAK_VENDORS === $mode && $isVendor = $inVendors($file));
 
             $i = count($trace);
@@ -121,6 +121,11 @@ public static function register($mode = 0)
                     $msg = $parsedMsg['deprecation'];
                     $class = $parsedMsg['class'];
                     $method = $parsedMsg['method'];
+                    // If the deprecation has been triggered via
+                    // \Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait::endTest()
+                    // then we need to use the serialized information to determine
+                    // if the error has been triggered from vendor code.
+                    $isWeak = DeprecationErrorHandler::MODE_WEAK === $mode || (DeprecationErrorHandler::MODE_WEAK_VENDORS === $mode && $isVendor = $inVendors($parsedMsg['triggering_file']));
                 } else {
                     $class = isset($trace[$i]['object']) ? get_class($trace[$i]['object']) : $trace[$i]['class'];
                     $method = $trace[$i]['function'];
@@ -261,7 +266,7 @@ public static function collectDeprecations($outputFile)
 
                 return $ErrorHandler::handleError($type, $msg, $file, $line, $context);
             }
-            $deprecations[] = array(error_reporting(), $msg);
+            $deprecations[] = array(error_reporting(), $msg, $file);
         });
 
         register_shutdown_function(function () use ($outputFile, &$deprecations) {
 
@@ -272,10 +272,11 @@ public function endTest($test, $time)
             unlink($this->runsInSeparateProcess);
             putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
             foreach ($deprecations ? unserialize($deprecations) : array() as $deprecation) {
+                $error = serialize(array('deprecation' => $deprecation[1], 'class' => $className, 'method' => $test->getName(false), 'triggering_file' => $deprecation[2]));
                 if ($deprecation[0]) {
-                    trigger_error(serialize(array('deprecation' => $deprecation[1], 'class' => $className, 'method' => $test->getName(false))), E_USER_DEPRECATED);
+                    trigger_error($error, E_USER_DEPRECATED);
                 } else {
-                    @trigger_error(serialize(array('deprecation' => $deprecation[1], 'class' => $className, 'method' => $test->getName(false))), E_USER_DEPRECATED);
+                    @trigger_error($error, E_USER_DEPRECATED);
                 }
             }
             $this->runsInSeparateProcess = false;