Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit 39c1a8458f8b · 2021-07-02T17:14:39.000+02:00
* 4.4:
  Backport type fixes
  uzb translation
  [DependencyInjection] Fix doc blocks
  [DependencyInjection] Turn $defaultDeprecationTemplate into a constant
  [Form] better form doc types to support static analysis
diff --git a/Alias.php b/Alias.php
@@ -15,12 +15,12 @@
 
 class Alias
 {
+    private const DEFAULT_DEPRECATION_TEMPLATE = 'The "%alias_id%" service alias is deprecated. You should stop using it, as it will be removed in the future.';
+
     private $id;
     private $public;
     private $deprecation = [];
 
-    private static $defaultDeprecationTemplate = 'The "%alias_id%" service alias is deprecated. You should stop using it, as it will be removed in the future.';
-
     public function __construct(string $id, bool $public = false)
     {
         $this->id = $id;
@@ -117,7 +117,7 @@ public function setDeprecated(/* string $package, string $version, string $messa
             }
         }
 
-        $this->deprecation = $status ? ['package' => $package, 'version' => $version, 'message' => $message ?: self::$defaultDeprecationTemplate] : [];
+        $this->deprecation = $status ? ['package' => $package, 'version' => $version, 'message' => $message ?: self::DEFAULT_DEPRECATION_TEMPLATE] : [];
 
         return $this;
     }
diff --git a/Compiler/AutowirePass.php b/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());
diff --git a/Config/ContainerParametersResource.php b/Config/ContainerParametersResource.php
@@ -32,9 +32,6 @@ public function __construct(array $parameters)
         $this->parameters = $parameters;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __toString(): string
     {
         return 'container_parameters_'.md5(serialize($this->parameters));
diff --git a/Container.php b/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
      */
diff --git a/ContainerBuilder.php b/ContainerBuilder.php
@@ -853,8 +853,6 @@ public function hasAlias(string $id)
     }
 
     /**
-     * Gets all defined aliases.
-     *
      * @return Alias[] An array of aliases
      */
     public function getAliases()
diff --git a/ContainerInterface.php b/ContainerInterface.php
@@ -51,8 +51,6 @@ public function set(string $id, ?object $service);
     public function get($id, int $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
@@ -71,7 +69,7 @@ public function initialized(string $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
      */
diff --git a/Definition.php b/Definition.php
@@ -22,6 +22,8 @@
  */
 class Definition
 {
+    private const DEFAULT_DEPRECATION_TEMPLATE = 'The "%service_id%" service is deprecated. You should stop using it, as it will be removed in the future.';
+
     private $class;
     private $file;
     private $factory;
@@ -45,8 +47,6 @@ class Definition
 
     protected $arguments = [];
 
-    private static $defaultDeprecationTemplate = 'The "%service_id%" service is deprecated. You should stop using it, as it will be removed in the future.';
-
     /**
      * @internal
      *
@@ -743,7 +743,7 @@ public function setDeprecated(/* string $package, string $version, string $messa
         }
 
         $this->changes['deprecated'] = true;
-        $this->deprecation = $status ? ['package' => $package, 'version' => $version, 'message' => $message ?: self::$defaultDeprecationTemplate] : [];
+        $this->deprecation = $status ? ['package' => $package, 'version' => $version, 'message' => $message ?: self::DEFAULT_DEPRECATION_TEMPLATE] : [];
 
         return $this;
     }
@@ -790,7 +790,7 @@ public function getDeprecation(string $id): array
     /**
      * 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
      */
diff --git a/Exception/ParameterNotFoundException.php b/Exception/ParameterNotFoundException.php
@@ -27,12 +27,12 @@ class ParameterNotFoundException extends InvalidArgumentException implements Not
     private $nonNestedAlternative;
 
     /**
-     * @param string      $key                  The requested parameter key
-     * @param string      $sourceId             The service id that references the non-existent parameter
-     * @param string      $sourceKey            The parameter key that references the non-existent parameter
-     * @param \Throwable  $previous             The previous exception
-     * @param string[]    $alternatives         Some parameter name alternatives
-     * @param string|null $nonNestedAlternative The alternative parameter name when the user expected dot notation for nested parameters
+     * @param string          $key                  The requested parameter key
+     * @param string|null     $sourceId             The service id that references the non-existent parameter
+     * @param string|null     $sourceKey            The parameter key that references the non-existent parameter
+     * @param \Throwable|null $previous             The previous exception
+     * @param string[]        $alternatives         Some parameter name alternatives
+     * @param string|null     $nonNestedAlternative The alternative parameter name when the user expected dot notation for nested parameters
      */
     public function __construct(string $key, string $sourceId = null, string $sourceKey = null, \Throwable $previous = null, array $alternatives = [], string $nonNestedAlternative = null)
     {
diff --git a/Loader/Configurator/ServiceConfigurator.php b/Loader/Configurator/ServiceConfigurator.php
@@ -46,7 +46,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;
diff --git a/Loader/YamlFileLoader.php b/Loader/YamlFileLoader.php
@@ -905,9 +905,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) {
@@ -923,9 +920,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) {
diff --git a/ParameterBag/ContainerBag.php b/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)
     {
diff --git a/ParameterBag/ParameterBag.php b/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)
     {
@@ -102,10 +97,7 @@ public function get(string $name)
     }
 
     /**
-     * Sets a service container parameter.
-     *
-     * @param string $name  The parameter name
-     * @param mixed  $value The parameter value
+     * {@inheritdoc}
      */
     public function set(string $name, $value)
     {
@@ -121,9 +113,7 @@ public function has(string $name)
     }
 
     /**
-     * Removes a parameter.
-     *
-     * @param string $name The parameter name
+     * {@inheritdoc}
      */
     public function remove(string $name)
     {
diff --git a/ParameterBag/ParameterBagInterface.php b/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);
diff --git a/Tests/Compiler/ResolveChildDefinitionsPassTest.php b/Tests/Compiler/ResolveChildDefinitionsPassTest.php
@@ -253,7 +253,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'))
@@ -263,8 +263,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]));
diff --git a/TypedReference.php b/TypedReference.php
@@ -22,10 +22,10 @@ class TypedReference extends Reference
     private $name;
 
     /**
-     * @param string $id              The service identifier
-     * @param string $type            The PHP type of the identified service
-     * @param int    $invalidBehavior The behavior when the service does not exist
-     * @param string $name            The name of the argument targeting the service
+     * @param string      $id              The service identifier
+     * @param string      $type            The PHP type of the identified service
+     * @param int         $invalidBehavior The behavior when the service does not exist
+     * @param string|null $name            The name of the argument targeting the service
      */
     public function __construct(string $id, string $type, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, string $name = null)
     {

Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,12 @@`
`15`	`15`
`16`	`16`	`class Alias`
`17`	`17`	`{`
	`18`	`+ private const DEFAULT_DEPRECATION_TEMPLATE = 'The "%alias_id%" service alias is deprecated. You should stop using it, as it will be removed in the future.';`
	`19`	`+`
`18`	`20`	`private $id;`
`19`	`21`	`private $public;`
`20`	`22`	`private $deprecation = [];`
`21`	`23`
`22`		`- private static $defaultDeprecationTemplate = 'The "%alias_id%" service alias is deprecated. You should stop using it, as it will be removed in the future.';`
`23`		`-`
`24`	`24`	`public function __construct(string $id, bool $public = false)`
`25`	`25`	`{`
`26`	`26`	`$this->id = $id;`
`@@ -117,7 +117,7 @@ public function setDeprecated(/* string $package, string $version, string $messa`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`
`120`		`- $this->deprecation = $status ? ['package' => $package, 'version' => $version, 'message' => $message ?: self::$defaultDeprecationTemplate] : [];`
	`120`	`+ $this->deprecation = $status ? ['package' => $package, 'version' => $version, 'message' => $message ?: self::DEFAULT_DEPRECATION_TEMPLATE] : [];`
`121`	`121`
`122`	`122`	`return $this;`
`123`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ private function set(string $type, string $id)`
`374`	`374`	`$this->ambiguousServiceTypes[$type][] = $id;`
`375`	`375`	`}`
`376`	`376`
`377`		`- private function createTypeNotFoundMessageCallback(TypedReference $reference, string $label): callable`
	`377`	`+ private function createTypeNotFoundMessageCallback(TypedReference $reference, string $label): \Closure`
`378`	`378`	`{`
`379`	`379`	`if (null === $this->typesClone->container) {`
`380`	`380`	`$this->typesClone->container = new ContainerBuilder($this->container->getParameterBag());`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,6 @@ public function __construct(array $parameters)`
`32`	`32`	`$this->parameters = $parameters;`
`33`	`33`	`}`
`34`	`34`
`35`		`- /**`
`36`		`- * {@inheritdoc}`
`37`		`- */`
`38`	`35`	`public function __toString(): string`
`39`	`36`	`{`
`40`	`37`	`return 'container_parameters_'.md5(serialize($this->parameters));`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public function getParameterBag()`
`109`	`109`	`*`
`110`	`110`	`* @param string $name The parameter name`
`111`	`111`	`*`
`112`		`- * @return array\|bool\|float\|int\|string\|null The parameter value`
	`112`	`+ * @return mixed`
`113`	`113`	`*`
`114`	`114`	`* @throws InvalidArgumentException if the parameter is not defined`
`115`	`115`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -853,8 +853,6 @@ public function hasAlias(string $id)`
`853`	`853`	`}`
`854`	`854`
`855`	`855`	`/**`
`856`		`- * Gets all defined aliases.`
`857`		`- *`
`858`	`856`	`* @return Alias[] An array of aliases`
`859`	`857`	`*/`
`860`	`858`	`public function getAliases()`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,6 @@ public function set(string $id, ?object $service);`
`51`	`51`	`public function get($id, int $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE);`
`52`	`52`
`53`	`53`	`/**`
`54`		`- * Returns true if the given service is defined.`
`55`		`- *`
`56`	`54`	`* @param string $id The service identifier`
`57`	`55`	`*`
`58`	`56`	`* @return bool true if the service is defined, false otherwise`
`@@ -71,7 +69,7 @@ public function initialized(string $id);`
`71`	`69`	`*`
`72`	`70`	`* @param string $name The parameter name`
`73`	`71`	`*`
`74`		`- * @return array\|bool\|float\|int\|string\|null The parameter value`
	`72`	`+ * @return mixed The parameter value`
`75`	`73`	`*`
`76`	`74`	`* @throws InvalidArgumentException if the parameter is not defined`
`77`	`75`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@`
`22`	`22`	`*/`
`23`	`23`	`class Definition`
`24`	`24`	`{`
	`25`	`+ private const DEFAULT_DEPRECATION_TEMPLATE = 'The "%service_id%" service is deprecated. You should stop using it, as it will be removed in the future.';`
	`26`	`+`
`25`	`27`	`private $class;`
`26`	`28`	`private $file;`
`27`	`29`	`private $factory;`
`@@ -45,8 +47,6 @@ class Definition`
`45`	`47`
`46`	`48`	`protected $arguments = [];`
`47`	`49`
`48`		`- private static $defaultDeprecationTemplate = 'The "%service_id%" service is deprecated. You should stop using it, as it will be removed in the future.';`
`49`		`-`
`50`	`50`	`/**`
`51`	`51`	`* @internal`
`52`	`52`	`*`
`@@ -743,7 +743,7 @@ public function setDeprecated(/* string $package, string $version, string $messa`
`743`	`743`	`}`
`744`	`744`
`745`	`745`	`$this->changes['deprecated'] = true;`
`746`		`- $this->deprecation = $status ? ['package' => $package, 'version' => $version, 'message' => $message ?: self::$defaultDeprecationTemplate] : [];`
	`746`	`+ $this->deprecation = $status ? ['package' => $package, 'version' => $version, 'message' => $message ?: self::DEFAULT_DEPRECATION_TEMPLATE] : [];`
`747`	`747`
`748`	`748`	`return $this;`
`749`	`749`	`}`
`@@ -790,7 +790,7 @@ public function getDeprecation(string $id): array`
`790`	`790`	`/**`
`791`	`791`	`* Sets a configurator to call after the service is fully initialized.`
`792`	`792`	`*`
`793`		`- * @param string\|array\|Reference $configurator A PHP function, reference or an array containing a class/Reference and a method to call`
	`793`	`+ * @param string\|array\|Reference\|null $configurator A PHP function, reference or an array containing a class/Reference and a method to call`
`794`	`794`	`*`
`795`	`795`	`* @return $this`
`796`	`796`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class ServiceConfigurator extends AbstractServiceConfigurator`
`46`	`46`	`private $allowParent;`
`47`	`47`	`private $path;`
`48`	`48`
`49`		`- public function __construct(ContainerBuilder $container, array $instanceof, bool $allowParent, ServicesConfigurator $parent, Definition $definition, $id, array $defaultTags, string $path = null)`
	`49`	`+ public function __construct(ContainerBuilder $container, array $instanceof, bool $allowParent, ServicesConfigurator $parent, Definition $definition, ?string $id, array $defaultTags, string $path = null)`
`50`	`50`	`{`
`51`	`51`	`$this->container = $container;`
`52`	`52`	`$this->instanceof = $instanceof;`
Original file line number	Diff line number	Diff line change
`@@ -905,9 +905,6 @@ private function resolveServices($value, string $file, bool $isParameter = false`
`905`	`905`	`return $value;`
`906`	`906`	`}`
`907`	`907`
`908`		`- /**`
`909`		`- * Loads from Extensions.`
`910`		`- */`
`911`	`908`	`private function loadFromExtensions(array $content)`
`912`	`909`	`{`
`913`	`910`	`foreach ($content as $namespace => $values) {`
`@@ -923,9 +920,6 @@ private function loadFromExtensions(array $content)`
`923`	`920`	`}`
`924`	`921`	`}`
`925`	`922`
`926`		`- /**`
`927`		`- * Checks the keywords used to define a service.`
`928`		`- */`
`929`	`923`	`private function checkDefinition(string $id, array $definition, string $file)`
`930`	`924`	`{`
`931`	`925`	`if ($this->isLoadingInstanceof) {`