Backport type fixes

Author: nicolas-grekas

Compiler/AutowirePass.php

@@ -374,7 +374,7 @@ private function set(string $type, string $id)
         $this->ambiguousServiceTypes[$type][] = $id;
     }
 
-    private function createTypeNotFoundMessageCallback(TypedReference $reference, string $label): callable
+    private function createTypeNotFoundMessageCallback(TypedReference $reference, string $label): \Closure
     {
         if (null === $this->typesClone->container) {
             $this->typesClone->container = new ContainerBuilder($this->container->getParameterBag());

Config/ContainerParametersResource.php

@@ -32,9 +32,6 @@ public function __construct(array $parameters)
         $this->parameters = $parameters;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __toString()
     {
         return 'container_parameters_'.md5(serialize($this->parameters));

Container.php

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

ContainerBuilder.php

@@ -883,8 +883,6 @@ public function hasAlias($id)
     }
 
     /**
-     * Gets all defined aliases.
-     *
      * @return Alias[] An array of aliases
      */
     public function getAliases()

ContainerInterface.php

@@ -54,8 +54,6 @@ public function set($id, $service);
     public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE);
 
     /**
-     * Returns true if the given service is defined.
-     *
      * @param string $id The service identifier
      *
      * @return bool true if the service is defined, false otherwise
@@ -76,7 +74,7 @@ public function initialized($id);
      *
      * @param string $name The parameter name
      *
-     * @return array|bool|float|int|string|null The parameter value
+     * @return mixed The parameter value
      *
      * @throws InvalidArgumentException if the parameter is not defined
      */

Definition.php

@@ -805,7 +805,7 @@ public function getDeprecationMessage($id)
     /**
      * Sets a configurator to call after the service is fully initialized.
      *
-     * @param string|array|Reference $configurator A PHP function, reference or an array containing a class/Reference and a method to call
+     * @param string|array|Reference|null $configurator A PHP function, reference or an array containing a class/Reference and a method to call
      *
      * @return $this
      */

Loader/Configurator/ServiceConfigurator.php

@@ -47,7 +47,7 @@ class ServiceConfigurator extends AbstractServiceConfigurator
     private $allowParent;
     private $path;
 
-    public function __construct(ContainerBuilder $container, array $instanceof, bool $allowParent, ServicesConfigurator $parent, Definition $definition, $id, array $defaultTags, string $path = null)
+    public function __construct(ContainerBuilder $container, array $instanceof, bool $allowParent, ServicesConfigurator $parent, Definition $definition, ?string $id, array $defaultTags, string $path = null)
     {
         $this->container = $container;
         $this->instanceof = $instanceof;

Loader/YamlFileLoader.php

@@ -850,9 +850,6 @@ private function resolveServices($value, string $file, bool $isParameter = false
         return $value;
     }
 
-    /**
-     * Loads from Extensions.
-     */
     private function loadFromExtensions(array $content)
     {
         foreach ($content as $namespace => $values) {
@@ -868,9 +865,6 @@ private function loadFromExtensions(array $content)
         }
     }
 
-    /**
-     * Checks the keywords used to define a service.
-     */
     private function checkDefinition(string $id, array $definition, string $file)
     {
         if ($this->isLoadingInstanceof) {

ParameterBag/ContainerBag.php

@@ -35,6 +35,8 @@ public function all()
 
     /**
      * {@inheritdoc}
+     *
+     * @return mixed
      */
     public function get($name)
     {
@@ -43,6 +45,8 @@ public function get($name)
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function has($name)
     {

ParameterBag/ParameterBag.php

@@ -25,26 +25,21 @@ class ParameterBag implements ParameterBagInterface
     protected $parameters = [];
     protected $resolved = false;
 
-    /**
-     * @param array $parameters An array of parameters
-     */
     public function __construct(array $parameters = [])
     {
         $this->add($parameters);
     }
 
     /**
-     * Clears all parameters.
+     * {@inheritdoc}
      */
     public function clear()
     {
         $this->parameters = [];
     }
 
     /**
-     * Adds parameters to the service container parameters.
-     *
-     * @param array $parameters An array of parameters
+     * {@inheritdoc}
      */
     public function add(array $parameters)
     {
@@ -104,10 +99,7 @@ public function get($name)
     }
 
     /**
-     * Sets a service container parameter.
-     *
-     * @param string $name  The parameter name
-     * @param mixed  $value The parameter value
+     * {@inheritdoc}
      */
     public function set($name, $value)
     {
@@ -123,9 +115,7 @@ public function has($name)
     }
 
     /**
-     * Removes a parameter.
-     *
-     * @param string $name The parameter name
+     * {@inheritdoc}
      */
     public function remove($name)
     {

ParameterBag/ParameterBagInterface.php

@@ -31,8 +31,6 @@ public function clear();
     /**
      * Adds parameters to the service container parameters.
      *
-     * @param array $parameters An array of parameters
-     *
      * @throws LogicException if the parameter can not be added
      */
     public function add(array $parameters);

Tests/Compiler/ResolveChildDefinitionsPassTest.php

@@ -250,7 +250,7 @@ public function testDeepDefinitionsResolving()
 
         $container->register('parent', 'parentClass');
         $container->register('sibling', 'siblingClass')
-            ->setConfigurator(new ChildDefinition('parent'), 'foo')
+            ->setConfigurator([new ChildDefinition('parent'), 'foo'])
             ->setFactory([new ChildDefinition('parent'), 'foo'])
             ->addArgument(new ChildDefinition('parent'))
             ->setProperty('prop', new ChildDefinition('parent'))
@@ -260,8 +260,8 @@ public function testDeepDefinitionsResolving()
         $this->process($container);
 
         $configurator = $container->getDefinition('sibling')->getConfigurator();
-        $this->assertSame('Symfony\Component\DependencyInjection\Definition', \get_class($configurator));
-        $this->assertSame('parentClass', $configurator->getClass());
+        $this->assertSame('Symfony\Component\DependencyInjection\Definition', \get_class($configurator[0]));
+        $this->assertSame('parentClass', $configurator[0]->getClass());
 
         $factory = $container->getDefinition('sibling')->getFactory();
         $this->assertSame('Symfony\Component\DependencyInjection\Definition', \get_class($factory[0]));