[TypeInfo] Fix isSatisfiedBy not traversing type tree

mtarld · mtarld · commit 8df764aa2eb0 · 2025-03-03T12:20:16.000+01:00
diff --git a/src/Symfony/Component/TypeInfo/Tests/TypeTest.php b/src/Symfony/Component/TypeInfo/Tests/TypeTest.php
@@ -13,6 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\Type\CollectionType;
+use Symfony\Component\TypeInfo\Type\UnionType;
 use Symfony\Component\TypeInfo\TypeIdentifier;
 
 class TypeTest extends TestCase
@@ -34,4 +36,12 @@ public function testIsNullable()
 
         $this->assertFalse(Type::int()->isNullable());
     }
+
+    public function testIsSatisfiedBy()
+    {
+        $this->assertTrue(Type::union(Type::int(), Type::string())->isSatisfiedBy(fn (Type $t): bool => 'int' === (string) $t));
+        $this->assertTrue(Type::union(Type::int(), Type::string())->isSatisfiedBy(fn (Type $t): bool => $t instanceof UnionType));
+        $this->assertTrue(Type::list(Type::int())->isSatisfiedBy(fn (Type $t): bool => $t instanceof CollectionType && 'int' === (string) $t->getCollectionValueType()));
+        $this->assertFalse(Type::list(Type::int())->isSatisfiedBy(fn (Type $t): bool => 'int' === (string) $t));
+    }
 }
diff --git a/src/Symfony/Component/TypeInfo/Type.php b/src/Symfony/Component/TypeInfo/Type.php
@@ -29,6 +29,14 @@ abstract class Type implements \Stringable
      */
     public function isSatisfiedBy(callable $specification): bool
     {
+        if ($this instanceof WrappingTypeInterface && $this->wrappedTypeIsSatisfiedBy($specification)) {
+            return true;
+        }
+
+        if ($this instanceof CompositeTypeInterface && $this->composedTypesAreSatisfiedBy($specification)) {
+            return true;
+        }
+
         return $specification($this);
     }
 
@@ -37,19 +45,17 @@ public function isSatisfiedBy(callable $specification): bool
      */
     public function isIdentifiedBy(TypeIdentifier|string ...$identifiers): bool
     {
-        $specification = static function (Type $type) use (&$specification, $identifiers): bool {
-            if ($type instanceof WrappingTypeInterface) {
-                return $type->wrappedTypeIsSatisfiedBy($specification);
-            }
+        $specification = static fn (Type $type): bool => $type->isIdentifiedBy(...$identifiers);
 
-            if ($type instanceof CompositeTypeInterface) {
-                return $type->composedTypesAreSatisfiedBy($specification);
-            }
+        if ($this instanceof WrappingTypeInterface && $this->wrappedTypeIsSatisfiedBy($specification)) {
+            return true;
+        }
 
-            return $type->isIdentifiedBy(...$identifiers);
-        };
+        if ($this instanceof CompositeTypeInterface && $this->composedTypesAreSatisfiedBy($specification)) {
+            return true;
+        }
 
-        return $this->isSatisfiedBy($specification);
+        return false;
     }
 
     public function isNullable(): bool
