bug #26794 [PhpUnitBridge] Catch deprecation error handler (cvilleger)

nicolas-grekas · nicolas-grekas · commit 603f3abad9d6 · 2018-04-04T17:03:10.000+02:00
This PR was squashed before being merged into the 3.4 branch (closes #26794). Discussion ---------- [PhpUnitBridge] Catch deprecation error handler | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #26476 | License | MIT This fix `DeprecationErrorHandler` to catch deprecation triggered by `SymfonyTestListenerTrait`. `$trace[$i]['class']` points to `Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerForV6`, not the aliased version. The condition has been refactored to handle future version `SymfonyTestsListenerForV{x}` Commits ------- f40f181 [PhpUnitBridge] Catch deprecation error handler
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -118,7 +118,7 @@ public static function register($mode = 0)
             }
 
             if (isset($trace[$i]['object']) || isset($trace[$i]['class'])) {
-                if (isset($trace[$i]['class']) && in_array($trace[$i]['class'], array('Symfony\Bridge\PhpUnit\SymfonyTestsListener', 'Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListener'), true)) {
+                if (isset($trace[$i]['class']) && 0 === strpos($trace[$i]['class'], 'Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerFor')) {
                     $parsedMsg = unserialize($msg);
                     $msg = $parsedMsg['deprecation'];
                     $class = $parsedMsg['class'];
@@ -216,7 +216,7 @@ public static function register($mode = 0)
 
                 $groups = array('unsilenced', 'remaining');
                 if (DeprecationErrorHandler::MODE_WEAK_VENDORS === $mode) {
-                        $groups[] = 'remaining vendor';
+                    $groups[] = 'remaining vendor';
                 }
                 array_push($groups, 'legacy', 'other');
 

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public static function register($mode = 0)`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`if (isset($trace[$i]['object']) \|\| isset($trace[$i]['class'])) {`
`121`		`- if (isset($trace[$i]['class']) && in_array($trace[$i]['class'], array('Symfony\Bridge\PhpUnit\SymfonyTestsListener', 'Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListener'), true)) {`
	`121`	`+ if (isset($trace[$i]['class']) && 0 === strpos($trace[$i]['class'], 'Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerFor')) {`
`122`	`122`	`$parsedMsg = unserialize($msg);`
`123`	`123`	`$msg = $parsedMsg['deprecation'];`
`124`	`124`	`$class = $parsedMsg['class'];`
`@@ -216,7 +216,7 @@ public static function register($mode = 0)`
`216`	`216`
`217`	`217`	`$groups = array('unsilenced', 'remaining');`
`218`	`218`	`if (DeprecationErrorHandler::MODE_WEAK_VENDORS === $mode) {`
`219`		`- $groups[] = 'remaining vendor';`
	`219`	`+ $groups[] = 'remaining vendor';`
`220`	`220`	`}`
`221`	`221`	`array_push($groups, 'legacy', 'other');`
`222`	`222`