Add check and tests for public properties

OskarStark · OskarStark · commit cdfd7a0db43b · 2021-07-13T13:50:13.000+02:00
diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
@@ -298,7 +298,7 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
             if ($v instanceof \stdClass) {
                 $v = (array) $v;
                 array_walk_recursive($v, $caster);
-            } elseif (\is_object($v) && method_exists($v, '__toString')) {
+            } elseif (\is_object($v) && !get_object_vars($v) && method_exists($v, '__toString')) {
                 $v = (string) $v;
             }
         });
diff --git a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
@@ -140,10 +140,13 @@ public function valuesProvider(): array
             'boolean-false' => ['?foo=0', 'foo', false],
             'boolean-true' => ['?foo=1', 'foo', true],
             'object implementing __toString()' => ['?foo=bar', 'foo', new StringableObject()],
+            'object implementing __toString() but has public property' => ['?foo%5Bfoo%5D=property', 'foo', new StringableObjectWithPublicProperty()],
             'object implementing __toString() in nested array' => ['?foo%5Bbaz%5D=bar', 'foo', ['baz' => new StringableObject()]],
-            'stdClass' => ['foo%5Bbaz%5D=bar', '?foo', $stdClass],
+            'object implementing __toString() in nested array but has public property' => ['?foo%5Bbaz%5D%5Bfoo%5D=property', 'foo', ['baz' => new StringableObjectWithPublicProperty()]],
+            'stdClass' => ['?foo%5Bbaz%5D=bar', 'foo', $stdClass],
             'stdClass in nested stdClass' => ['?foo%5Bnested%5D%5Bbaz%5D=bar', 'foo', $nestedStdClass],
-            'not stringable object' => ['', 'foo', new NotStringableObject()],
+            'non stringable object' => ['', 'foo', new NonStringableObject()],
+            'non stringable object but has public property' => ['?foo%5Bfoo%5D=property', 'foo', new NonStringableObjectWithPublicProperty()],
         ];
     }
 
@@ -920,6 +923,21 @@ public function __toString()
     }
 }
 
-class NotStringableObject
+class StringableObjectWithPublicProperty
 {
+    public $foo = 'property';
+
+    public function __toString()
+    {
+        return 'bar';
+    }
+}
+
+class NonStringableObject
+{
+}
+
+class NonStringableObjectWithPublicProperty
+{
+    public $foo = 'property';
 }

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa`
`298`	`298`	`if ($v instanceof \stdClass) {`
`299`	`299`	`$v = (array) $v;`
`300`	`300`	`array_walk_recursive($v, $caster);`
`301`		`- } elseif (\is_object($v) && method_exists($v, '__toString')) {`
	`301`	`+ } elseif (\is_object($v) && !get_object_vars($v) && method_exists($v, '__toString')) {`
`302`	`302`	`$v = (string) $v;`
`303`	`303`	`}`
`304`	`304`	`});`