Merge branch '4.4' into 5.1

* 4.4:
  [PhpUnitBridge] Fix qualification of deprecations triggered by the debug class loader
  Improve return phpdoc for Normalizer
  Use a partial buffer in SymfonyStyle
  Fix console closing tag
  Fix typo in comment
  [VarDumper] fix casting resources turned into objects on PHP 8

.gitignore

@@ -1,3 +1,4 @@
 vendor/
 composer.lock
 phpunit.xml
+Tests/DeprecationErrorHandler/fake_vendor/symfony/error-handler/DebugClassLoader.php

DeprecationErrorHandler/Deprecation.php

@@ -13,6 +13,8 @@
 
 use PHPUnit\Util\Test;
 use Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerFor;
+use Symfony\Component\Debug\DebugClassLoader as LegacyDebugClassLoader;
+use Symfony\Component\ErrorHandler\DebugClassLoader;
 
 /**
  * @internal
@@ -58,6 +60,18 @@ public function __construct($message, array $trace, $file)
         }
 
         $this->trace = $trace;
+
+        if ('trigger_error' === ($trace[1]['function'] ?? null)
+            && (DebugClassLoader::class === ($class = $trace[2]['class'] ?? null) || LegacyDebugClassLoader::class === $class)
+            && 'checkClass' === ($trace[2]['function'] ?? null)
+            && null !== ($extraFile = $trace[2]['args'][1] ?? null)
+            && '' !== $extraFile
+            && false !== $extraFile = realpath($extraFile)
+        ) {
+            $this->getOriginalFilesStack();
+            array_splice($this->originalFilesStack, 2, 1, $extraFile);
+        }
+
         $this->message = $message;
         $i = \count($this->trace);
         while (1 < $i && $this->lineShouldBeSkipped($this->trace[--$i])) {

Tests/DeprecationErrorHandler/debug_class_loader_autoload.phpt

@@ -0,0 +1,51 @@
+--TEST--
+Test that a deprecation from the DebugClassLoader on a vendor class autoload triggered by an app class is considered indirect.
+--FILE--
+<?php
+
+$k = 'SYMFONY_DEPRECATIONS_HELPER';
+putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[total]=0');
+putenv('ANSICON');
+putenv('ConEmuANSI');
+putenv('TERM');
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = dirname($vendor);
+}
+define('PHPUNIT_COMPOSER_INSTALL', $vendor.'/vendor/autoload.php');
+require PHPUNIT_COMPOSER_INSTALL;
+require_once __DIR__.'/../../bootstrap.php';
+eval(<<<'EOPHP'
+namespace PHPUnit\Util;
+
+class Test
+{
+    public static function getGroups()
+    {
+        return array();
+    }
+}
+EOPHP
+);
+require __DIR__.'/fake_vendor/autoload.php';
+
+// We need the real DebugClassLoader FQCN but in a vendor path.
+if (!file_exists($errorHandlerRootDir = __DIR__.'/../../../../Component/ErrorHandler')) {
+    if (!file_exists($errorHandlerRootDir = __DIR__.'/../../vendor/symfony/error-handler')) {
+        die('Could not find the ErrorHandler component root directory.');
+    }
+}
+
+file_put_contents($fakeDebugClassLoadPath = __DIR__.'/fake_vendor/symfony/error-handler/DebugClassLoader.php', file_get_contents($errorHandlerRootDir.'/DebugClassLoader.php'));
+require $fakeDebugClassLoadPath;
+
+\Symfony\Component\ErrorHandler\DebugClassLoader::enable();
+new \App\Services\BarService();
+
+?>
+--EXPECTF--
+Remaining indirect deprecation notices (1)
+
+  1x: The "acme\lib\ExtendsDeprecatedClassFromOtherVendor" class extends "fcy\lib\DeprecatedClass" that is deprecated.
+    1x in BarService::__construct from App\Services

Tests/DeprecationErrorHandler/fake_app/BarService.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Services;
+
+use acme\lib\ExtendsDeprecatedClassFromOtherVendor;
+
+final class BarService
+{
+    public function __construct()
+    {
+        ExtendsDeprecatedClassFromOtherVendor::FOO;
+    }
+}

Tests/DeprecationErrorHandler/fake_vendor/acme/lib/ExtendsDeprecatedClassFromOtherVendor.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace acme\lib;
+
+use fcy\lib\DeprecatedClass;
+
+final class ExtendsDeprecatedClassFromOtherVendor extends DeprecatedClass
+{
+    public const FOO = 'bar';
+}

Tests/DeprecationErrorHandler/fake_vendor/composer/autoload_real.php

@@ -13,23 +13,33 @@ public function getPrefixesPsr4()
             'App\\Services\\' => [__DIR__.'/../../fake_app/'],
             'acme\\lib\\' => [__DIR__.'/../acme/lib/'],
             'bar\\lib\\' => [__DIR__.'/../bar/lib/'],
+            'fcy\\lib\\' => [__DIR__.'/../fcy/lib/'],
         ];
     }
 
     public function loadClass($className)
+    {
+        if ($file = $this->findFile($className)) {
+            require $file;
+        }
+    }
+
+    public function findFile($class)
     {
         foreach ($this->getPrefixesPsr4() as $prefix => $baseDirs) {
-            if (strpos($className, $prefix) !== 0) {
+            if (strpos($class, $prefix) !== 0) {
                 continue;
             }
 
             foreach ($baseDirs as $baseDir) {
-                $file = str_replace([$prefix, '\\'], [$baseDir, '/'], $className.'.php');
+                $file = str_replace([$prefix, '\\'], [$baseDir, '/'], $class.'.php');
                 if (file_exists($file)) {
-                    require $file;
+                    return $file;
                 }
             }
         }
+
+        return false;
     }
 }
 

Tests/DeprecationErrorHandler/fake_vendor/fcy/lib/DeprecatedClass.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace fcy\lib;
+
+/**
+ * @deprecated
+ */
+class DeprecatedClass
+{
+}

composer.json

@@ -21,7 +21,8 @@
         "php": ">=5.5.9"
     },
     "require-dev": {
-        "symfony/deprecation-contracts": "^2.1"
+        "symfony/deprecation-contracts": "^2.1",
+        "symfony/error-handler": "^4.4|^5.0"
     },
     "suggest": {
         "symfony/error-handler": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"