Merge branch '7.2' into 7.3

* 7.2:
  [VarExporter] Fix support for hooks and asymmetric visibility
  [TypeInfo] Fix promoted property with `@var` tag
  fix(process): use a pipe for stderr in pty mode to avoid mixed output between stdout and stderr
  [Cache] fix data collector

Author: nicolas-grekas

src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php

@@ -60,6 +60,7 @@ public function lateCollect(): void
 
         $this->data['instances']['statistics'] = $this->calculateStatistics();
         $this->data['total']['statistics'] = $this->calculateTotalStatistics();
+        $this->data['instances']['calls'] = $this->cloneVar($this->data['instances']['calls']);
     }
 
     public function getName(): string

src/Symfony/Component/Cache/Tests/DataCollector/CacheDataCollectorTest.php

@@ -17,6 +17,7 @@
 use Symfony\Component\Cache\DataCollector\CacheDataCollector;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\VarDumper\Cloner\Data;
 
 class CacheDataCollectorTest extends TestCase
 {
@@ -122,6 +123,7 @@ public function testLateCollect()
         $this->assertEquals($stats[self::INSTANCE_NAME]['hits'], 0, 'hits');
         $this->assertEquals($stats[self::INSTANCE_NAME]['misses'], 1, 'misses');
         $this->assertEquals($stats[self::INSTANCE_NAME]['calls'], 1, 'calls');
+        $this->assertInstanceOf(Data::class, $collector->getCalls());
     }
 
     private function getCacheDataCollectorStatisticsFromEvents(array $traceableAdapterEvents)

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_lazy.php

@@ -76,7 +76,7 @@ class WitherProxy1991f2a extends \Symfony\Component\DependencyInjection\Tests\Co
     use \Symfony\Component\VarExporter\LazyProxyTrait;
 
     private const LAZY_OBJECT_PROPERTY_SCOPES = [
-        'foo' => [parent::class, 'foo', null],
+        'foo' => [parent::class, 'foo', null, 4],
     ];
 }
 

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_lazy_non_shared.php

@@ -78,7 +78,7 @@ class WitherProxyE94fdba extends \Symfony\Component\DependencyInjection\Tests\Co
     use \Symfony\Component\VarExporter\LazyProxyTrait;
 
     private const LAZY_OBJECT_PROPERTY_SCOPES = [
-        'foo' => [parent::class, 'foo', null],
+        'foo' => [parent::class, 'foo', null, 4],
     ];
 }
 

src/Symfony/Component/DependencyInjection/composer.json

@@ -20,7 +20,7 @@
         "psr/container": "^1.1|^2.0",
         "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/service-contracts": "^3.5",
-        "symfony/var-exporter": "^6.4|^7.0"
+        "symfony/var-exporter": "^6.4.20|^7.2.5"
     },
     "require-dev": {
         "symfony/yaml": "^6.4|^7.0",

src/Symfony/Component/Process/Pipes/UnixPipes.php

@@ -70,7 +70,7 @@ public function getDescriptors(): array
             return [
                 ['pty'],
                 ['pty'],
-                ['pty'],
+                ['pipe', 'w'], // stderr needs to be in a pipe to correctly split error and output, since PHP will use the same stream for both
             ];
         }
 

src/Symfony/Component/Process/Tests/ProcessTest.php

@@ -559,6 +559,20 @@ public function testExitCodeTextIsNullWhenExitCodeIsNull()
         $this->assertNull($process->getExitCodeText());
     }
 
+    public function testStderrNotMixedWithStdout()
+    {
+        if (!Process::isPtySupported()) {
+            $this->markTestSkipped('PTY is not supported on this operating system.');
+        }
+
+        $process = $this->getProcess('echo "foo" && echo "bar" >&2');
+        $process->setPty(true);
+        $process->run();
+
+        $this->assertSame("foo\r\n", $process->getOutput());
+        $this->assertSame("bar\n", $process->getErrorOutput());
+    }
+
     public function testPTYCommand()
     {
         if (!Process::isPtySupported()) {

src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithPhpDoc.php

@@ -29,9 +29,18 @@ final class DummyWithPhpDoc
 
     /**
      * @param bool $promoted
+     * @param bool $promotedVarAndParam
      */
     public function __construct(
         public mixed $promoted,
+        /**
+         * @var string
+         */
+        public mixed $promotedVar,
+        /**
+         * @var string
+         */
+        public mixed $promotedVarAndParam,
     ) {
     }
 

src/Symfony/Component/TypeInfo/Tests/TypeResolver/PhpDocAwareReflectionTypeResolverTest.php

@@ -41,6 +41,8 @@ public static function readPhpDocDataProvider(): iterable
 
         yield [Type::array(Type::object(Dummy::class)), $reflection->getProperty('arrayOfDummies')];
         yield [Type::bool(), $reflection->getProperty('promoted')];
+        yield [Type::string(), $reflection->getProperty('promotedVar')];
+        yield [Type::string(), $reflection->getProperty('promotedVarAndParam')];
         yield [Type::object(Dummy::class), $reflection->getMethod('getNextDummy')];
         yield [Type::object(Dummy::class), $reflection->getMethod('getNextDummy')->getParameters()[0]];
         yield [Type::int(), $reflection->getProperty('aliasedInt')];

src/Symfony/Component/TypeInfo/TypeResolver/PhpDocAwareReflectionTypeResolver.php

@@ -64,36 +64,38 @@ public function resolve(mixed $subject, ?TypeContext $typeContext = null): Type
             throw new UnsupportedException(\sprintf('Expected subject to be a "ReflectionProperty", a "ReflectionParameter" or a "ReflectionFunctionAbstract", "%s" given.', get_debug_type($subject)), $subject);
         }
 
-        $docComment = match (true) {
-            $subject instanceof \ReflectionProperty => $subject->isPromoted() ? $subject->getDeclaringClass()?->getConstructor()?->getDocComment() : $subject->getDocComment(),
-            $subject instanceof \ReflectionParameter => $subject->getDeclaringFunction()->getDocComment(),
-            $subject instanceof \ReflectionFunctionAbstract => $subject->getDocComment(),
+        $typeContext ??= $this->typeContextFactory->createFromReflection($subject);
+
+        $docComments = match (true) {
+            $subject instanceof \ReflectionProperty => $subject->isPromoted()
+                ? ['@var' => $subject->getDocComment(), '@param' => $subject->getDeclaringClass()?->getConstructor()?->getDocComment()]
+                : ['@var' => $subject->getDocComment()],
+            $subject instanceof \ReflectionParameter => ['@param' => $subject->getDeclaringFunction()->getDocComment()],
+            $subject instanceof \ReflectionFunctionAbstract => ['@return' => $subject->getDocComment()],
         };
 
-        if (!$docComment) {
-            return $this->reflectionTypeResolver->resolve($subject);
-        }
+        foreach ($docComments as $tagName => $docComment) {
+            if (!$docComment) {
+                continue;
+            }
 
-        $typeContext ??= $this->typeContextFactory->createFromReflection($subject);
+            $tokens = new TokenIterator($this->lexer->tokenize($docComment));
+            $docNode = $this->phpDocParser->parse($tokens);
 
-        $tagName = match (true) {
-            $subject instanceof \ReflectionProperty => $subject->isPromoted() ? '@param' : '@var',
-            $subject instanceof \ReflectionParameter => '@param',
-            $subject instanceof \ReflectionFunctionAbstract => '@return',
-        };
+            foreach ($docNode->getTagsByName($tagName) as $tag) {
+                $tagValue = $tag->value;
 
-        $tokens = new TokenIterator($this->lexer->tokenize($docComment));
-        $docNode = $this->phpDocParser->parse($tokens);
+                if ('@var' === $tagName && $tagValue instanceof VarTagValueNode) {
+                    return $this->stringTypeResolver->resolve((string) $tagValue, $typeContext);
+                }
 
-        foreach ($docNode->getTagsByName($tagName) as $tag) {
-            $tagValue = $tag->value;
+                if ('@param' === $tagName && $tagValue instanceof ParamTagValueNode && '$'.$subject->getName() === $tagValue->parameterName) {
+                    return $this->stringTypeResolver->resolve((string) $tagValue, $typeContext);
+                }
 
-            if (
-                $tagValue instanceof VarTagValueNode
-                || $tagValue instanceof ParamTagValueNode && $tagName && '$'.$subject->getName() === $tagValue->parameterName
-                || $tagValue instanceof ReturnTagValueNode
-            ) {
-                return $this->stringTypeResolver->resolve((string) $tagValue, $typeContext);
+                if ('@return' === $tagName && $tagValue instanceof ReturnTagValueNode) {
+                    return $this->stringTypeResolver->resolve((string) $tagValue, $typeContext);
+                }
             }
         }