Merge branch '3.4' into 4.2

fabpot · fabpot · commit 14b040933919 · 2019-06-26T15:53:23.000+02:00
* 3.4:
  Fixed type annotation.
diff --git a/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php b/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php
@@ -71,9 +71,9 @@ interface UrlGeneratorInterface extends RequestContextAwareInterface
      *
      * The special parameter _fragment will be used as the document fragment suffixed to the final URL.
      *
-     * @param string $name          The name of the route
-     * @param mixed  $parameters    An array of parameters
-     * @param int    $referenceType The type of reference to be generated (one of the constants)
+     * @param string  $name          The name of the route
+     * @param mixed[] $parameters    An array of parameters
+     * @param int     $referenceType The type of reference to be generated (one of the constants)
      *
      * @return string The generated URL
      *

Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,9 @@ interface UrlGeneratorInterface extends RequestContextAwareInterface`
`71`	`71`	`*`
`72`	`72`	`* The special parameter _fragment will be used as the document fragment suffixed to the final URL.`
`73`	`73`	`*`
`74`		`- * @param string $name The name of the route`
`75`		`- * @param mixed $parameters An array of parameters`
`76`		`- * @param int $referenceType The type of reference to be generated (one of the constants)`
	`74`	`+ * @param string $name The name of the route`
	`75`	`+ * @param mixed[] $parameters An array of parameters`
	`76`	`+ * @param int $referenceType The type of reference to be generated (one of the constants)`
`77`	`77`	`*`
`78`	`78`	`* @return string The generated URL`
`79`	`79`	`*`