minor #54688 [TypeInfo] Support \Stringable objects in StringTypeResolver (xabbuh)

nicolas-grekas · nicolas-grekas · commit 39038406d36a · 2024-04-24T09:01:27.000+02:00
This PR was merged into the 7.1 branch. Discussion ---------- [TypeInfo] Support `\Stringable` objects in `StringTypeResolver` | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | | License | MIT Commits ------- 3870406 support Stringable objects in StringTypeResolver
diff --git a/src/Symfony/Component/TypeInfo/Tests/TypeResolver/StringTypeResolverTest.php b/src/Symfony/Component/TypeInfo/Tests/TypeResolver/StringTypeResolverTest.php
@@ -39,6 +39,23 @@ public function testResolve(Type $expectedType, string $string, ?TypeContext $ty
         $this->assertEquals($expectedType, $this->resolver->resolve($string, $typeContext));
     }
 
+    /**
+     * @dataProvider resolveDataProvider
+     */
+    public function testResolveStringable(Type $expectedType, string $string, ?TypeContext $typeContext = null)
+    {
+        $this->assertEquals($expectedType, $this->resolver->resolve(new class($string) implements \Stringable {
+            public function __construct(private string $value)
+            {
+            }
+
+            public function __toString(): string
+            {
+                return $this->value;
+            }
+        }, $typeContext));
+    }
+
     /**
      * @return iterable<array{0: Type, 1: string, 2?: TypeContext}>
      */
diff --git a/src/Symfony/Component/TypeInfo/TypeResolver/StringTypeResolver.php b/src/Symfony/Component/TypeInfo/TypeResolver/StringTypeResolver.php
@@ -71,7 +71,9 @@ public function __construct()
 
     public function resolve(mixed $subject, ?TypeContext $typeContext = null): Type
     {
-        if (!\is_string($subject)) {
+        if ($subject instanceof \Stringable) {
+            $subject = (string) $subject;
+        } elseif (!\is_string($subject)) {
             throw new UnsupportedException(sprintf('Expected subject to be a "string", "%s" given.', get_debug_type($subject)), $subject);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,9 @@ public function __construct()`
`71`	`71`
`72`	`72`	`public function resolve(mixed $subject, ?TypeContext $typeContext = null): Type`
`73`	`73`	`{`
`74`		`- if (!\is_string($subject)) {`
	`74`	`+ if ($subject instanceof \Stringable) {`
	`75`	`+ $subject = (string) $subject;`
	`76`	`+ } elseif (!\is_string($subject)) {`
`75`	`77`	`throw new UnsupportedException(sprintf('Expected subject to be a "string", "%s" given.', get_debug_type($subject)), $subject);`
`76`	`78`	`}`
`77`	`79`