Merge branch '4.4' into 5.1

* 4.4:
  Add missing `@return` annotations to fix deprecations on PHP 8
  [ProxyManagerBridge] fix PHP notice, switch to "friendsofphp/proxy-manager-lts"

Author: nicolas-grekas

Argument/ServiceLocator.php

@@ -34,6 +34,8 @@ public function __construct(\Closure $factory, array $serviceMap, array $service
 
     /**
      * {@inheritdoc}
+     *
+     * @return mixed
      */
     public function get($id)
     {

Container.php

@@ -109,7 +109,7 @@ public function getParameterBag()
      *
      * @param string $name The parameter name
      *
-     * @return mixed The parameter value
+     * @return array|bool|float|int|string|null The parameter value
      *
      * @throws InvalidArgumentException if the parameter is not defined
      */

ContainerInterface.php

@@ -71,7 +71,7 @@ public function initialized(string $id);
      *
      * @param string $name The parameter name
      *
-     * @return mixed The parameter value
+     * @return array|bool|float|int|string|null The parameter value
      *
      * @throws InvalidArgumentException if the parameter is not defined
      */

Dumper/PhpDumper.php

@@ -1512,6 +1512,9 @@ private function addDefaultParametersMethod(): string
 
         $code = <<<'EOF'
 
+    /**
+     * @return array|bool|float|int|string|null
+     */
     public function getParameter(string $name)
     {
         if (isset($this->buildParameters[$name])) {

ServiceLocator.php

@@ -33,6 +33,11 @@ class ServiceLocator implements ServiceProviderInterface
     private $externalId;
     private $container;
 
+    /**
+     * {@inheritdoc}
+     *
+     * @return mixed
+     */
     public function get($id)
     {
         if (!$this->externalId) {

Tests/Compiler/IntegrationTest.php

@@ -537,6 +537,9 @@ public function __construct(ServiceLocator $locator)
         $this->locator = $locator;
     }
 
+    /**
+     * @return mixed
+     */
     public function get($id)
     {
         return $this->locator->get($id);

Tests/Fixtures/php/services10.php

@@ -56,6 +56,9 @@ protected function getTestService()
         return $this->services['test'] = new \stdClass(['only dot' => '.', 'concatenation as value' => '.\'\'.', 'concatenation from the start value' => '\'\'.', '.' => 'dot as a key', '.\'\'.' => 'concatenation as a key', '\'\'.' => 'concatenation from the start key', 'optimize concatenation' => 'string1-string2', 'optimize concatenation with empty string' => 'string1string2', 'optimize concatenation from the start' => 'start', 'optimize concatenation at the end' => 'end', 'new line' => 'string with '."\n".'new line']);
     }
 
+    /**
+     * @return array|bool|float|int|string|null
+     */
     public function getParameter(string $name)
     {
         if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {

Tests/Fixtures/php/services12.php

@@ -56,6 +56,9 @@ protected function getTestService()
         return $this->services['test'] = new \stdClass(('file://'.\dirname(__DIR__, 1)), [('file://'.\dirname(__DIR__, 1)) => (\dirname(__DIR__, 2).'/')]);
     }
 
+    /**
+     * @return array|bool|float|int|string|null
+     */
     public function getParameter(string $name)
     {
         if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {

Tests/Fixtures/php/services19.php

@@ -71,6 +71,9 @@ protected function getServiceWithMethodCallAndFactoryService()
         return $instance;
     }
 
+    /**
+     * @return array|bool|float|int|string|null
+     */
     public function getParameter(string $name)
     {
         if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {

Tests/Fixtures/php/services26.php

@@ -67,6 +67,9 @@ protected function getTestService()
         return $this->services['test'] = new ${($_ = $this->getEnv('FOO')) && false ?: "_"}($this->getEnv('Bar'), 'foo'.$this->getEnv('string:FOO').'baz', $this->getEnv('int:Baz'));
     }
 
+    /**
+     * @return array|bool|float|int|string|null
+     */
     public function getParameter(string $name)
     {
         if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {