Merge branch '7.4' into 8.0

* 7.4:
  [DependencyInjection] Fix lazy proxy type resolution for decorated services
  [HttpClient] Fix dealing with truncated streams after headers arrived with CurlHttpClient
  [PropertyInfo] Fix DocBlock resolution for inherited promoted properties
  [HttpFoundation] Fix PdoSessionHandler charset-collation mismatch with the Doctrine DBAL on MySQL
  [HttpClient] Fix dealing with multiple levels of AsyncResponse decoration
  [Messenger] Only send UNLISTEN query if we are actively listening
  [RateLimiter] Persist state when consuming negative tokens

Author: nicolas-grekas

Extractor/PhpDocExtractor.php

@@ -249,8 +249,8 @@ private function findDocBlock(string $class, string $property): array
         $ucFirstProperty = ucfirst($property);
 
         switch (true) {
-            case $reflectionProperty?->isPromoted() && $docBlock = $this->getDocBlockFromConstructor($class, $property):
-                $data = [$docBlock, self::MUTATOR, null, $reflectionProperty->getDeclaringClass()->getName()];
+            case $reflectionProperty?->isPromoted() && $docBlock = $this->getDocBlockFromConstructor($reflectionProperty->class, $property):
+                $data = [$docBlock, self::MUTATOR, null, $reflectionProperty->class];
                 break;
 
             case [$docBlock, $declaringClass] = $this->getDocBlockFromProperty($class, $property):

Tests/Extractor/PhpDocExtractorTest.php

@@ -23,10 +23,13 @@
 use Symfony\Component\PropertyInfo\Tests\Fixtures\DummyCollection;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\Extractor\ChildOfParentUsingTrait;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\Extractor\ChildOfParentWithPromotedSelfDocBlock;
+use Symfony\Component\PropertyInfo\Tests\Fixtures\Extractor\ChildWithConstructorOverride;
+use Symfony\Component\PropertyInfo\Tests\Fixtures\Extractor\ChildWithoutConstructorOverride;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\Extractor\ChildWithSelfDocBlock;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\Extractor\ClassUsingNestedTrait;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\Extractor\ClassUsingTraitWithSelfDocBlock;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\Extractor\ParentUsingTraitWithSelfDocBlock;
+use Symfony\Component\PropertyInfo\Tests\Fixtures\Extractor\ParentWithPromotedPropertyDocBlock;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\Extractor\ParentWithPromotedSelfDocBlock;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\Extractor\ParentWithSelfDocBlock;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\InvalidDummy;
@@ -327,6 +330,16 @@ public function testPropertiesParentType(string $class, string $property, ?Type
         $this->assertEquals($type, $this->extractor->getType($class, $property));
     }
 
+    /**
+     * @return iterable<array{0: class-string, 1: string, 2: ?Type}>
+     */
+    public static function propertiesParentTypeProvider(): iterable
+    {
+        yield [ParentDummy::class, 'parentAnnotationNoParent', Type::object('parent')];
+        yield [Dummy::class, 'parentAnnotation', Type::object(ParentDummy::class)];
+    }
+
+
     /**
      * @param class-string $class
      * @param class-string $expectedResolvedClass
@@ -359,13 +372,22 @@ public static function selfDocBlockResolutionProvider(): iterable
         yield 'promoted property from child' => [ChildOfParentWithPromotedSelfDocBlock::class, 'promotedSelfProp', ParentWithPromotedSelfDocBlock::class];
     }
 
+    #[DataProvider('inheritedPromotedPropertyWithConstructorOverrideProvider')]
+    public function testInheritedPromotedPropertyWithConstructorOverride(string $class, string $property, ?Type $expectedType)
+    {
+        $this->assertEquals($expectedType, $this->extractor->getType($class, $property));
+    }
+
     /**
-     * @return iterable<array{0: class-string, 1: string, 2: ?Type}>
+     * @return iterable<string, array{0: class-string, 1: string, 2: ?Type}>
      */
-    public static function propertiesParentTypeProvider(): iterable
+    public static function inheritedPromotedPropertyWithConstructorOverrideProvider(): iterable
     {
-        yield [ParentDummy::class, 'parentAnnotationNoParent', Type::object('parent')];
-        yield [Dummy::class, 'parentAnnotation', Type::object(ParentDummy::class)];
+        $expectedItemsType = Type::dict(Type::int(), Type::string());
+
+        yield 'parent promoted property' => [ParentWithPromotedPropertyDocBlock::class, 'items', $expectedItemsType];
+        yield 'child without constructor override' => [ChildWithoutConstructorOverride::class, 'items', $expectedItemsType];
+        yield 'child with constructor override' => [ChildWithConstructorOverride::class, 'items', $expectedItemsType];
     }
 
     public function testUnknownPseudoType()

Tests/Fixtures/Extractor/ParentWithPromotedPropertyDocBlock.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo\Tests\Fixtures\Extractor;
+
+class ParentWithPromotedPropertyDocBlock
+{
+    /**
+     * @param array<string, int> $items
+     */
+    public function __construct(
+        public $items = [],
+    ) {
+    }
+}
+
+class ChildWithoutConstructorOverride extends ParentWithPromotedPropertyDocBlock
+{
+}
+
+class ChildWithConstructorOverride extends ParentWithPromotedPropertyDocBlock
+{
+    public function __construct(
+        public $extraProp = null,
+    ) {
+        parent::__construct();
+    }
+}