Merge branch '7.3' into 7.4

* 7.3:
  [JsonStreamer] Fix exponential resource class memory growth
  [Cache] Fix DSN auth not passed to clusters in RedisTrait
  do not parse "scalar" as an object
  [Form] Fix OrderedHashMap auto-increment logic with mixed keys
  [HttpClient] Skip HTTP/3 when using a proxy
  don't skip custom view transformers while normalizing submitted newlines
  [Serializer] Fix is/has/can accessor naming regression while preserving collision detection

Author: nicolas-grekas

Tests/Extractor/PhpDocExtractorTest.php

@@ -447,7 +447,23 @@ public function testUnknownPseudoTypeLegacy()
     {
         $this->expectUserDeprecationMessage('Since symfony/property-info 7.3: The "Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor::getTypes()" method is deprecated, use "Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor::getType()" instead.');
 
-        $this->assertEquals([new LegacyType(LegacyType::BUILTIN_TYPE_OBJECT, false, 'scalar')], $this->extractor->getTypes(PseudoTypeDummy::class, 'unknownPseudoType'));
+        $this->assertEquals([
+            new LegacyType(LegacyType::BUILTIN_TYPE_OBJECT, false, 'Symfony\\Component\\PropertyInfo\\Tests\\Fixtures\\unknownpseudo')
+        ], $this->extractor->getTypes(PseudoTypeDummy::class, 'unknownPseudoType'));
+    }
+
+    #[IgnoreDeprecations]
+    #[Group('legacy')]
+    public function testScalarPseudoTypeLegacy()
+    {
+        $this->expectUserDeprecationMessage('Since symfony/property-info 7.3: The "Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor::getTypes()" method is deprecated, use "Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor::getType()" instead.');
+
+        $this->assertEquals([
+            new LegacyType(LegacyType::BUILTIN_TYPE_BOOL),
+            new LegacyType(LegacyType::BUILTIN_TYPE_FLOAT),
+            new LegacyType(LegacyType::BUILTIN_TYPE_INT),
+            new LegacyType(LegacyType::BUILTIN_TYPE_STRING),
+        ], $this->extractor->getTypes(PseudoTypeDummy::class, 'scalarPseudoType'));
     }
 
     #[IgnoreDeprecations]
@@ -814,9 +830,15 @@ public static function propertiesParentTypeProvider(): iterable
 
     public function testUnknownPseudoType()
     {
-        $this->assertEquals(Type::object('scalar'), $this->extractor->getType(PseudoTypeDummy::class, 'unknownPseudoType'));
+        $this->assertEquals(Type::object('Symfony\\Component\\PropertyInfo\\Tests\\Fixtures\\unknownpseudo'), $this->extractor->getType(PseudoTypeDummy::class, 'unknownPseudoType'));
     }
 
+    public function testScalarPseudoType()
+    {
+        $this->assertEquals(Type::object('scalar'), $this->extractor->getType(PseudoTypeDummy::class, 'scalarPseudoType'));
+    }
+
+
     #[DataProvider('constructorTypesProvider')]
     public function testExtractConstructorType(string $property, ?Type $type)
     {

Tests/Fixtures/PseudoTypeDummy.php

@@ -16,5 +16,10 @@ class PseudoTypeDummy
     /**
      * @var scalar
      */
+    public $scalarPseudoType;
+
+    /**
+     * @var unknownpseudo
+     */
     public $unknownPseudoType;
 }

Util/PhpDocTypeHelper.php

@@ -21,6 +21,7 @@
 use phpDocumentor\Reflection\Types\Integer;
 use phpDocumentor\Reflection\Types\Null_;
 use phpDocumentor\Reflection\Types\Nullable;
+use phpDocumentor\Reflection\Types\Scalar;
 use phpDocumentor\Reflection\Types\String_;
 use Symfony\Component\PropertyInfo\Type as LegacyType;
 use Symfony\Component\TypeInfo\Type;
@@ -62,6 +63,15 @@ public function getTypes(DocType $varType): array
             $varType = $varType->getActualType();
         }
 
+        if ($varType instanceof Scalar) {
+            return [
+                new LegacyType(LegacyType::BUILTIN_TYPE_BOOL),
+                new LegacyType(LegacyType::BUILTIN_TYPE_FLOAT),
+                new LegacyType(LegacyType::BUILTIN_TYPE_INT),
+                new LegacyType(LegacyType::BUILTIN_TYPE_STRING),
+            ];
+        }
+
         if (!$varType instanceof Compound) {
             if ($varType instanceof Null_) {
                 $nullable = true;