Merge branch '4.4' into 5.1

nicolas-grekas · nicolas-grekas · commit 2a0af832b82f · 2020-12-23T16:26:14.000+01:00
* 4.4:
  Add missing `@return` annotations to fix deprecations on PHP 8
  [ProxyManagerBridge] fix PHP notice, switch to "friendsofphp/proxy-manager-lts"
diff --git a/Controller/AbstractController.php b/Controller/AbstractController.php
@@ -74,7 +74,7 @@ public function setContainer(ContainerInterface $container): ?ContainerInterface
     /**
      * Gets a container parameter by its name.
      *
-     * @return mixed
+     * @return array|bool|float|int|string|null
      */
     protected function getParameter(string $name)
     {
diff --git a/Test/TestContainer.php b/Test/TestContainer.php
@@ -58,6 +58,8 @@ public function getParameterBag(): ParameterBagInterface
 
     /**
      * {@inheritdoc}
+     *
+     * @return array|bool|float|int|string|null
      */
     public function getParameter(string $name)
     {

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function setContainer(ContainerInterface $container): ?ContainerInterface`
`74`	`74`	`/**`
`75`	`75`	`* Gets a container parameter by its name.`
`76`	`76`	`*`
`77`		`- * @return mixed`
	`77`	`+ * @return array\|bool\|float\|int\|string\|null`
`78`	`78`	`*/`
`79`	`79`	`protected function getParameter(string $name)`
`80`	`80`	`{`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,8 @@ public function getParameterBag(): ParameterBagInterface`
`58`	`58`
`59`	`59`	`/**`
`60`	`60`	`* {@inheritdoc}`
	`61`	`+ *`
	`62`	`+ * @return array\|bool\|float\|int\|string\|null`
`61`	`63`	`*/`
`62`	`64`	`public function getParameter(string $name)`
`63`	`65`	`{`