Merge branch '5.2' into 5.3

* 5.2:
  Backport type fixes
  Fix CS
  Avoid triggering the autoloader in Deprecation::isLegacy()
  fix markdown markup
  Backport type fixes
  uzb translation
  [DependencyInjection] Fix doc blocks
  [DependencyInjection] Turn $defaultDeprecationTemplate into a constant
  [Form] better form doc types to support static analysis

Author: nicolas-grekas

OptionConfigurator.php

@@ -28,8 +28,6 @@ public function __construct(string $name, OptionsResolver $resolver)
     /**
      * Adds allowed types for this option.
      *
-     * @param string ...$types One or more accepted types
-     *
      * @return $this
      *
      * @throws AccessException If called from a lazy option or normalizer
@@ -100,8 +98,6 @@ public function deprecated(string $package, string $version, $message = 'The opt
     /**
      * Sets the normalizer for this option.
      *
-     * @param \Closure $normalizer The normalizer
-     *
      * @return $this
      *
      * @throws AccessException If called from a lazy option or normalizer

OptionsResolver.php

@@ -261,10 +261,6 @@ public function setDefault(string $option, $value)
     }
 
     /**
-     * Sets a list of default values.
-     *
-     * @param array $defaults The default values to set
-     *
      * @return $this
      *
      * @throws AccessException If called from a lazy option or normalizer
@@ -284,8 +280,6 @@ public function setDefaults(array $defaults)
      * Returns true if {@link setDefault()} was called for this option.
      * An option is also considered set if it was set to null.
      *
-     * @param string $option The option name
-     *
      * @return bool Whether a default value is set
      */
     public function hasDefault(string $option)
@@ -321,8 +315,6 @@ public function setRequired($optionNames)
      *
      * An option is required if it was passed to {@link setRequired()}.
      *
-     * @param string $option The name of the option
-     *
      * @return bool Whether the option is required
      */
     public function isRequired(string $option)
@@ -349,8 +341,6 @@ public function getRequiredOptions()
      * to {@link setDefault()}. This option must be passed explicitly to
      * {@link resolve()}, otherwise an exception will be thrown.
      *
-     * @param string $option The name of the option
-     *
      * @return bool Whether the option is missing
      */
     public function isMissing(string $option)
@@ -402,8 +392,6 @@ public function setDefined($optionNames)
      * Returns true for any option passed to {@link setDefault()},
      * {@link setRequired()} or {@link setDefined()}.
      *
-     * @param string $option The option name
-     *
      * @return bool Whether the option is defined
      */
     public function isDefined(string $option)
@@ -516,9 +504,6 @@ public function isDeprecated(string $option): bool
      *
      * The resolved option value is set to the return value of the closure.
      *
-     * @param string   $option     The option name
-     * @param \Closure $normalizer The normalizer
-     *
      * @return $this
      *
      * @throws UndefinedOptionsException If the option is undefined
@@ -560,10 +545,6 @@ public function setNormalizer(string $option, \Closure $normalizer)
      *
      * The resolved option value is set to the return value of the closure.
      *
-     * @param string   $option       The option name
-     * @param \Closure $normalizer   The normalizer
-     * @param bool     $forcePrepend If set to true, prepend instead of appending
-     *
      * @return $this
      *
      * @throws UndefinedOptionsException If the option is undefined
@@ -687,7 +668,6 @@ public function addAllowedValues(string $option, $allowedValues)
      * acceptable. Additionally, fully-qualified class or interface names may
      * be passed.
      *
-     * @param string          $option       The option name
      * @param string|string[] $allowedTypes One or more accepted types
      *
      * @return $this
@@ -722,7 +702,6 @@ public function setAllowedTypes(string $option, $allowedTypes)
      * acceptable. Additionally, fully-qualified class or interface names may
      * be passed.
      *
-     * @param string          $option       The option name
      * @param string|string[] $allowedTypes One or more accepted types
      *
      * @return $this
@@ -890,8 +869,6 @@ public function clear()
      *  - Options have invalid types;
      *  - Options have invalid values.
      *
-     * @param array $options A map of option names to values
-     *
      * @return array The merged and validated options
      *
      * @throws UndefinedOptionsException If an option name is undefined
@@ -953,8 +930,7 @@ public function resolve(array $options = [])
     /**
      * Returns the resolved value of an option.
      *
-     * @param string $option             The option name
-     * @param bool   $triggerDeprecation Whether to trigger the deprecation or not (true by default)
+     * @param bool $triggerDeprecation Whether to trigger the deprecation or not (true by default)
      *
      * @return mixed The option value
      *