Merge branch '4.4' into 5.2

* 4.4:
  [Console] Fix line wrapping for decorated text in block output
  [Inflector] Fixed pluralize "coupon"
  [PhpUnitBridge] fix compat with symfony/debug
  [VarDumper] Adds support for ReflectionUnionType to VarDumper
  Correctly clear lines for multi-line progress bar messages.

Author: nicolas-grekas

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;
@@ -87,41 +89,45 @@ public function __construct($message, array $trace, $file)
             }
         }
 
-        if (isset($line['object']) || isset($line['class'])) {
-            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'];
-                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 (!isset($line['object']) && !isset($line['class'])) {
+            return;
+        }
 
-                return;
+        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'];
+            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'];
+            }
+
+            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 (!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'];
 
-                return;
-            }
+            return;
+        }
 
-            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();
+        $test = $line['args'][0] ?? null;
 
-                return;
-            }
+        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;
         }
     }