bug #60956 [TypeInfo] Fix Type::fromValue incorrectly setting object type instead of enum (norkunas)

xabbuh · xabbuh · commit 65eb3eb0cc4b · 2025-06-30T13:30:36.000+02:00
This PR was squashed before being merged into the 7.3 branch. Discussion ---------- [TypeInfo] Fix `Type::fromValue` incorrectly setting object type instead of enum | Q | A | ------------- | --- | Branch? | 7.3 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | Fix #... | License | MIT Tried to apply #60820 (comment) comment, but found some failing cases Commits ------- a0cdd3f [TypeInfo] Fix `Type::fromValue` incorrectly setting object type instead of enum
diff --git a/src/Symfony/Component/TypeInfo/Tests/TypeFactoryTest.php b/src/Symfony/Component/TypeInfo/Tests/TypeFactoryTest.php
@@ -254,6 +254,8 @@ public static function createFromValueProvider(): iterable
         yield [Type::object(\DateTimeImmutable::class), new \DateTimeImmutable()];
         yield [Type::object(), new \stdClass()];
         yield [Type::list(Type::object()), [new \stdClass(), new \DateTimeImmutable()]];
+        yield [Type::enum(DummyEnum::class), DummyEnum::ONE];
+        yield [Type::enum(DummyBackedEnum::class), DummyBackedEnum::ONE];
 
         // collection
         $arrayAccess = new class implements \ArrayAccess {
diff --git a/src/Symfony/Component/TypeInfo/TypeFactoryTrait.php b/src/Symfony/Component/TypeInfo/TypeFactoryTrait.php
@@ -412,6 +412,7 @@ public static function fromValue(mixed $value): Type
         }
 
         $type = match (true) {
+            \is_object($value) && is_subclass_of($value::class, \UnitEnum::class) => Type::enum($value::class),
             \is_object($value) => \stdClass::class === $value::class ? self::object() : self::object($value::class),
             \is_array($value) => self::builtin(TypeIdentifier::ARRAY),
             default => null,
@@ -428,8 +429,6 @@ public static function fromValue(mixed $value): Type
             /** @var list<Type> $valueTypes */
             $valueTypes = [];
 
-            $i = 0;
-
             foreach ($value as $k => $v) {
                 $keyTypes[] = self::fromValue($k);
                 $valueTypes[] = self::fromValue($v);
