bug #25685 Use triggering file to determine weak vendors if when the test is run in a separate process (alexpott)

nicolas-grekas · nicolas-grekas · commit 228453b33a7b · 2018-01-04T18:00:19.000+01:00
This PR was squashed before being merged into the 3.4 branch (closes #25685). Discussion ---------- Use triggering file to determine weak vendors if when the test is run in a separate process | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no  | BC breaks? | no | Deprecations? | no  | Tests pass? | I think so | Fixed tickets | #25684 | License | MIT | Doc PR | symfony/symfony-docs#...   Commits ------- 3830577 Use triggering file to determine weak vendors if when the test is run in a separate process
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -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) {
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -272,10 +272,11 @@ public function endTest($test, $time)`
`272`	`272`	`unlink($this->runsInSeparateProcess);`
`273`	`273`	`putenv('SYMFONY_DEPRECATIONS_SERIALIZE');`
`274`	`274`	`foreach ($deprecations ? unserialize($deprecations) : array() as $deprecation) {`
	`275`	`+ $error = serialize(array('deprecation' => $deprecation[1], 'class' => $className, 'method' => $test->getName(false), 'triggering_file' => $deprecation[2]));`
`275`	`276`	`if ($deprecation[0]) {`
`276`		`- trigger_error(serialize(array('deprecation' => $deprecation[1], 'class' => $className, 'method' => $test->getName(false))), E_USER_DEPRECATED);`
	`277`	`+ trigger_error($error, E_USER_DEPRECATED);`
`277`	`278`	`} else {`
`278`		`- @trigger_error(serialize(array('deprecation' => $deprecation[1], 'class' => $className, 'method' => $test->getName(false))), E_USER_DEPRECATED);`
	`279`	`+ @trigger_error($error, E_USER_DEPRECATED);`
`279`	`280`	`}`
`280`	`281`	`}`
`281`	`282`	`$this->runsInSeparateProcess = false;`