Merge branch '4.4' into 5.2

* 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

Author: nicolas-grekas

FormBuilderInterface.php

@@ -13,6 +13,8 @@
 
 /**
  * @author Bernhard Schussek <[email protected]>
+ *
+ * @extends \Traversable<string, self>
  */
 interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuilderInterface
 {
@@ -24,6 +26,7 @@ interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuild
      * object hierarchy.
      *
      * @param string|FormBuilderInterface $child
+     * @param array<string, mixed>        $options
      *
      * @return self
      */
@@ -32,8 +35,9 @@ public function add($child, string $type = null, array $options = []);
     /**
      * Creates a form builder.
      *
-     * @param string      $name The name of the form or the name of the property
-     * @param string|null $type The type of the form or null if name is a property
+     * @param string               $name    The name of the form or the name of the property
+     * @param string|null          $type    The type of the form or null if name is a property
+     * @param array<string, mixed> $options
      *
      * @return self
      */
@@ -65,7 +69,7 @@ public function has(string $name);
     /**
      * Returns the children.
      *
-     * @return array
+     * @return array<string, self>
      */
     public function all();
 

FormConfigInterface.php

@@ -228,7 +228,7 @@ public function getAutoInitialize();
     /**
      * Returns all options passed during the construction of the form.
      *
-     * @return array The passed options
+     * @return array<string, mixed> The passed options
      */
     public function getOptions();
 

FormTypeInterface.php

@@ -24,6 +24,8 @@ interface FormTypeInterface
      * This method is called for each type in the hierarchy starting from the
      * top most type. Type extensions can further modify the form.
      *
+     * @param array<string, mixed> $options
+     *
      * @see FormTypeExtensionInterface::buildForm()
      */
     public function buildForm(FormBuilderInterface $builder, array $options);
@@ -38,6 +40,8 @@ public function buildForm(FormBuilderInterface $builder, array $options);
      * This means that you cannot access child views in this method. If you need
      * to do so, move your logic to {@link finishView()} instead.
      *
+     * @param array<string, mixed> $options
+     *
      * @see FormTypeExtensionInterface::buildView()
      */
     public function buildView(FormView $view, FormInterface $form, array $options);
@@ -53,6 +57,8 @@ public function buildView(FormView $view, FormInterface $form, array $options);
      * such logic in this method that actually accesses child views. For everything
      * else you are recommended to implement {@link buildView()} instead.
      *
+     * @param array<string, mixed> $options
+     *
      * @see FormTypeExtensionInterface::finishView()
      */
     public function finishView(FormView $view, FormInterface $form, array $options);