Merge branch '7.1' into 7.2

* 7.1:
  Fix resolve enum in string type resolver
  [PropertyInfo] Upmerge #59012
  [BeanstalkMessenger] Round delay to an integer to avoid deprecation warning
  [PropertyInfo] Fix interface handling in `PhpStanTypeHelper`
  [HttpClient] Test POST to GET redirects
  [HttpKernel] Denormalize request data using the csv format when using "#[MapQueryString]" or "#[MapRequestPayload]" (except for content data)
  fix: preserve and nowrap in profiler code highlighting

Author: xabbuh

Tests/TypeResolver/StringTypeResolverTest.php

@@ -16,7 +16,9 @@
 use Symfony\Component\TypeInfo\Exception\UnsupportedException;
 use Symfony\Component\TypeInfo\Tests\Fixtures\AbstractDummy;
 use Symfony\Component\TypeInfo\Tests\Fixtures\Dummy;
+use Symfony\Component\TypeInfo\Tests\Fixtures\DummyBackedEnum;
 use Symfony\Component\TypeInfo\Tests\Fixtures\DummyCollection;
+use Symfony\Component\TypeInfo\Tests\Fixtures\DummyEnum;
 use Symfony\Component\TypeInfo\Tests\Fixtures\DummyWithTemplates;
 use Symfony\Component\TypeInfo\Type;
 use Symfony\Component\TypeInfo\TypeContext\TypeContext;
@@ -138,6 +140,8 @@ public static function resolveDataProvider(): iterable
         yield [Type::object(Dummy::class), 'static', $typeContextFactory->createFromClassName(Dummy::class, AbstractDummy::class)];
         yield [Type::object(AbstractDummy::class), 'parent', $typeContextFactory->createFromClassName(Dummy::class)];
         yield [Type::object(Dummy::class), 'Dummy', $typeContextFactory->createFromClassName(Dummy::class)];
+        yield [Type::enum(DummyEnum::class), 'DummyEnum', $typeContextFactory->createFromClassName(DummyEnum::class)];
+        yield [Type::enum(DummyBackedEnum::class), 'DummyBackedEnum', $typeContextFactory->createFromClassName(DummyBackedEnum::class)];
         yield [Type::template('T', Type::union(Type::int(), Type::string())), 'T', $typeContextFactory->createFromClassName(DummyWithTemplates::class)];
         yield [Type::template('V'), 'V', $typeContextFactory->createFromReflection(new \ReflectionMethod(DummyWithTemplates::class, 'getPrice'))];
 

TypeResolver/ReflectionTypeResolver.php

@@ -25,11 +25,6 @@
  */
 final class ReflectionTypeResolver implements TypeResolverInterface
 {
-    /**
-     * @var array<class-string, \ReflectionEnum>
-     */
-    private static array $reflectionEnumCache = [];
-
     public function resolve(mixed $subject, ?TypeContext $typeContext = null): Type
     {
         if ($subject instanceof \ReflectionUnionType) {
@@ -81,11 +76,7 @@ public function resolve(mixed $subject, ?TypeContext $typeContext = null): Type
             default => $identifier,
         };
 
-        if (is_subclass_of($className, \BackedEnum::class)) {
-            $reflectionEnum = (self::$reflectionEnumCache[$className] ??= new \ReflectionEnum($className));
-            $backingType = $this->resolve($reflectionEnum->getBackingType(), $typeContext);
-            $type = Type::enum($className, $backingType);
-        } elseif (is_subclass_of($className, \UnitEnum::class)) {
+        if (is_subclass_of($className, \UnitEnum::class)) {
             $type = Type::enum($className);
         } else {
             $type = Type::object($className);

TypeResolver/StringTypeResolver.php

@@ -246,14 +246,16 @@ private function resolveCustomIdentifier(string $identifier, ?TypeContext $typeC
                 try {
                     new \ReflectionClass($className);
                     self::$classExistCache[$className] = true;
-
-                    return Type::object($className);
                 } catch (\Throwable) {
                 }
             }
         }
 
         if (self::$classExistCache[$className]) {
+            if (is_subclass_of($className, \UnitEnum::class)) {
+                return Type::enum($className);
+            }
+
             return Type::object($className);
         }