bug #38031 Allow Drupal to wrap the Symfony test listener (5.1 backport) (fabpot, alexpott)

fabpot · fabpot · commit a36c43b41f33 · 2020-09-02T13:08:19.000+02:00
This PR was merged into the 5.1 branch. Discussion ---------- Allow Drupal to wrap the Symfony test listener (5.1 backport) | Q | A | ------------- | --- | Branch? | 5.1 | Bug fix? | kinda | New feature? | no | Deprecations? | no | Tickets | Fix #...  | License | MIT | Doc PR | symfony/symfony-docs#...  This is a backport of #37708 Commits ------- 244e8d2 Revert "Swallow errors" ee8cc26 Swallow errors f9bfe7f Allow Drupal to wrap the Symfony test listener
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php
@@ -12,7 +12,6 @@
 namespace Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
 
 use PHPUnit\Util\Test;
-use Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerFor;
 
 /**
  * @internal
@@ -61,10 +60,10 @@ public function __construct($message, array $trace, $file)
         $line = $trace[$i];
         $this->triggeringFile = $file;
         if (isset($line['object']) || isset($line['class'])) {
-            if (isset($line['class']) && 0 === strpos($line['class'], SymfonyTestsListenerFor::class)) {
-                set_error_handler(function () {});
-                $parsedMsg = unserialize($this->message);
-                restore_error_handler();
+            set_error_handler(function () {});
+            $parsedMsg = unserialize($this->message);
+            restore_error_handler();
+            if ($parsedMsg && isset($parsedMsg['deprecation'])) {
                 $this->message = $parsedMsg['deprecation'];
                 $this->originClass = $parsedMsg['class'];
                 $this->originMethod = $parsedMsg['method'];
