Add check and tests for public properties

Author: OskarStark

Tests/Generator/UrlGeneratorTest.php

@@ -104,28 +104,50 @@ public function testNotPassedOptionalParameterInBetween()
         $this->assertSame('/app.php/', $this->getGenerator($routes)->generate('test'));
     }
 
-    public function testRelativeUrlWithExtraParameters()
+    /**
+     * @dataProvider valuesProvider
+     */
+    public function testRelativeUrlWithExtraParameters(string $expectedQueryString, string $parameter, $value)
     {
         $routes = $this->getRoutes('test', new Route('/testing'));
-        $url = $this->getGenerator($routes)->generate('test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_PATH);
+        $url = $this->getGenerator($routes)->generate('test', [$parameter => $value], UrlGeneratorInterface::ABSOLUTE_PATH);
 
-        $this->assertEquals('/app.php/testing?foo=bar', $url);
+        $this->assertSame('/app.php/testing'.$expectedQueryString, $url);
     }
 
-    public function testAbsoluteUrlWithExtraParameters()
+    /**
+     * @dataProvider valuesProvider
+     */
+    public function testAbsoluteUrlWithExtraParameters(string $expectedQueryString, string $parameter, $value)
     {
         $routes = $this->getRoutes('test', new Route('/testing'));
-        $url = $this->getGenerator($routes)->generate('test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_URL);
+        $url = $this->getGenerator($routes)->generate('test', [$parameter => $value], UrlGeneratorInterface::ABSOLUTE_URL);
 
-        $this->assertEquals('http://localhost/app.php/testing?foo=bar', $url);
+        $this->assertSame('http://localhost/app.php/testing'.$expectedQueryString, $url);
     }
 
-    public function testUrlWithNullExtraParameters()
+    public function valuesProvider(): array
     {
-        $routes = $this->getRoutes('test', new Route('/testing'));
-        $url = $this->getGenerator($routes)->generate('test', ['foo' => null], UrlGeneratorInterface::ABSOLUTE_URL);
+        $stdClass = new \stdClass();
+        $stdClass->baz = 'bar';
 
-        $this->assertEquals('http://localhost/app.php/testing', $url);
+        $nestedStdClass = new \stdClass();
+        $nestedStdClass->nested = $stdClass;
+
+        return [
+            'null' => ['', 'foo', null],
+            'string' => ['?foo=bar', 'foo', 'bar'],
+            '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()]],
+            '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],
+            'non stringable object' => ['', 'foo', new NonStringableObject()],
+            'non stringable object but has public property' => ['?foo%5Bfoo%5D=property', 'foo', new NonStringableObjectWithPublicProperty()],
+        ];
     }
 
     public function testUrlWithExtraParametersFromGlobals()
@@ -898,3 +920,30 @@ protected function getRoutes($name, Route $route)
         return $routes;
     }
 }
+
+class StringableObject
+{
+    public function __toString()
+    {
+        return 'bar';
+    }
+}
+
+class StringableObjectWithPublicProperty
+{
+    public $foo = 'property';
+
+    public function __toString()
+    {
+        return 'bar';
+    }
+}
+
+class NonStringableObject
+{
+}
+
+class NonStringableObjectWithPublicProperty
+{
+    public $foo = 'property';
+}