From 35dd54a65436c1a3b41e81ba65efd8b49ee20f0f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 17 Mar 2021 09:49:43 +0100
Subject: [PATCH] [PhpUnitBridge] fix compat with symfony/debug

---
 .../DeprecationErrorHandler/Deprecation.php   | 60 ++++++++++---------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php
index ac1a95ef41..3ef1ee280a 100644
--- a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php
+++ b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
 
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\TestSuite;
 use PHPUnit\Util\Test;
 use Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerFor;
 use Symfony\Component\Debug\DebugClassLoader as LegacyDebugClassLoader;
@@ -82,37 +84,41 @@ class Deprecation
             }
         }
 
-        if (isset($line['object']) || isset($line['class'])) {
-            if (!isset($line['class'], $trace[$i - 2]['function']) || 0 !== strpos($line['class'], SymfonyTestsListenerFor::class)) {
-                $this->originClass = isset($line['object']) ? \get_class($line['object']) : $line['class'];
-                $this->originMethod = $line['function'];
+        if (!isset($line['object']) && !isset($line['class'])) {
+            return;
+        }
 
-                return;
-            }
+        if (!isset($line['class'], $trace[$i - 2]['function']) || 0 !== strpos($line['class'], SymfonyTestsListenerFor::class)) {
+            $this->originClass = isset($line['object']) ? \get_class($line['object']) : $line['class'];
+            $this->originMethod = $line['function'];
 
-            if ('trigger_error' !== $trace[$i - 2]['function'] || isset($trace[$i - 2]['class'])) {
-                $this->originClass = \get_class($line['args'][0]);
-                $this->originMethod = $line['args'][0]->getName();
+            return;
+        }
 
-                return;
-            }
+        $test = isset($line['args'][0]) ? $line['args'][0] : null;
 
-            set_error_handler(function () {});
-            $parsedMsg = unserialize($this->message);
-            restore_error_handler();
-            $this->message = $parsedMsg['deprecation'];
-            $this->originClass = $parsedMsg['class'];
-            $this->originMethod = $parsedMsg['method'];
-            if (isset($parsedMsg['files_stack'])) {
-                $this->originalFilesStack = $parsedMsg['files_stack'];
-            }
-            // 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.
-            if (isset($parsedMsg['triggering_file'])) {
-                $this->triggeringFile = $parsedMsg['triggering_file'];
-            }
+        if (($test instanceof TestCase || $test instanceof TestSuite) && ('trigger_error' !== $trace[$i - 2]['function'] || isset($trace[$i - 2]['class']))) {
+            $this->originClass = \get_class($line['args'][0]);
+            $this->originMethod = $line['args'][0]->getName();
+
+            return;
+        }
+
+        set_error_handler(function () {});
+        $parsedMsg = unserialize($this->message);
+        restore_error_handler();
+        $this->message = $parsedMsg['deprecation'];
+        $this->originClass = $parsedMsg['class'];
+        $this->originMethod = $parsedMsg['method'];
+        if (isset($parsedMsg['files_stack'])) {
+            $this->originalFilesStack = $parsedMsg['files_stack'];
+        }
+        // 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.
+        if (isset($parsedMsg['triggering_file'])) {
+            $this->triggeringFile = $parsedMsg['triggering_file'];
         }
     }