minor #24604 Fix deprecation triggering test deduction (alexpott)

nicolas-grekas · nicolas-grekas · commit e6d949b23312 · 2017-10-24T19:16:44.000+02:00
This PR was merged into the 3.3 branch. Discussion ---------- Fix deprecation triggering test deduction | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no  | BC breaks? | no | Deprecations? | no  | Tests pass? | yes | Fixed tickets | #...  | License | MIT | Doc PR | symfony/symfony-docs#...   This PR is just testing some additions #24597 - I want to see if the travis run is successful. Commits ------- 5333680 Fix review points
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -326,6 +326,12 @@ public function handleError($type, $msg, $file, $line, $context = array())
 
             return $h ? $h($type, $msg, $file, $line, $context) : false;
         }
+        // If the message is serialized we need to extract the message. This occurs when the error is triggered by
+        // by the isolated test path in \Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait::endTest().
+        $parsedMsg = @unserialize($msg);
+        if (is_array($parsedMsg)) {
+            $msg = $parsedMsg['deprecation'];
+        }
         if (error_reporting()) {
             $msg = 'Unsilenced deprecation: '.$msg;
         }

Original file line number	Diff line number	Diff line change
`@@ -326,6 +326,12 @@ public function handleError($type, $msg, $file, $line, $context = array())`
`326`	`326`
`327`	`327`	`return $h ? $h($type, $msg, $file, $line, $context) : false;`
`328`	`328`	`}`
	`329`	`+ // If the message is serialized we need to extract the message. This occurs when the error is triggered by`
	`330`	`+ // by the isolated test path in \Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait::endTest().`
	`331`	`+ $parsedMsg = @unserialize($msg);`
	`332`	`+ if (is_array($parsedMsg)) {`
	`333`	`+ $msg = $parsedMsg['deprecation'];`
	`334`	`+ }`
`329`	`335`	`if (error_reporting()) {`
`330`	`336`	`$msg = 'Unsilenced deprecation: '.$msg;`
`331`	`337`	`}`