symfony · vudaltsov · Jul 15, 2019 · Jul 29, 2019 · nicolas-grekas · Jul 30, 2019
@@ -79,9 +79,9 @@ public function __construct(?string $name, array $options = [])
      *
      * This method should not be invoked.
      *
-     * @param string|int|FormBuilderInterface $child
-     * @param string|FormTypeInterface        $type
-     * @param array                           $options
+     * @param string|FormBuilderInterface $child
+     * @param string|FormTypeInterface    $type
+     * @param array                       $options
         *
      * @throws BadMethodCallException
      */

@@ -77,7 +77,7 @@ public function preSetData(FormEvent $event)
 
         // Then add all rows again in the correct order
         foreach ($data as $name => $value) {
-            $form->add($name, $this->type, array_replace([
+            $form->add((string) $name, $this->type, array_replace([
                 'property_path' => '['.$name.']',
             ], $this->options));
         }
@@ -105,7 +105,7 @@ public function preSubmit(FormEvent $event)
         if ($this->allowAdd) {
             foreach ($data as $name => $value) {
                 if (!$form->has($name)) {
-                    $form->add($name, $this->type, array_replace([
+                    $form->add((string) $name, $this->type, array_replace([
                         'property_path' => '['.$name.']',
                     ], $this->options));
                 }

@@ -843,8 +843,13 @@ public function add($child, $type = null, array $options = [])
         }
 
         if (!$child instanceof FormInterface) {
-            if (!\is_string($child) && !\is_int($child)) {
-                throw new UnexpectedTypeException($child, 'string, integer or Symfony\Component\Form\FormInterface');
+            if (\is_int($child)) {
+                @trigger_error(sprintf('Passing an integer child name to "%s" is deprecated since Symfony 4.4. Pass a string instead.', __METHOD__), \E_USER_DEPRECATED);
+                $child = (string) $child;
+            }
+
+            if (!\is_string($child)) {
+                throw new UnexpectedTypeException($child, 'string or Symfony\Component\Form\FormInterface');
             }
 
             $child = (string) $child;

@@ -62,8 +62,13 @@ public function add($child, $type = null, array $options = [])
             return $this;
         }
 
-        if (!\is_string($child) && !\is_int($child)) {
-            throw new UnexpectedTypeException($child, 'string, integer or Symfony\Component\Form\FormBuilderInterface');
+        if (\is_int($child)) {
+            @trigger_error(sprintf('Passing an integer child name to "%s" is deprecated since Symfony 4.4. Pass a string instead.', __METHOD__), \E_USER_DEPRECATED);
+            $child = (string) $child;
+        }
+
+        if (!\is_string($child)) {
+            throw new UnexpectedTypeException($child, 'string or Symfony\Component\Form\FormBuilderInterface');
         }
 
         if (null !== $type && !\is_string($type) && !$type instanceof FormTypeInterface) {
@@ -86,6 +91,11 @@ public function create($name, $type = null, array $options = [])
             throw new BadMethodCallException('FormBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
         }
 
+        if (\is_int($name)) {
+            @trigger_error(sprintf('Passing an integer name to "%s" is deprecated since Symfony 4.4. Pass a string instead.', __METHOD__), \E_USER_DEPRECATED);
+            $name = (string) $name;
+        }
+
         if (null === $type && null === $this->getDataClass()) {
             $type = 'Symfony\Component\Form\Extension\Core\Type\TextType';
         }
@@ -106,6 +116,10 @@ public function get($name)
             throw new BadMethodCallException('FormBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
         }
 
+        if (\is_int($name)) {
+            @trigger_error(sprintf('Passing an integer name to "%s" is deprecated since Symfony 4.4. Pass a string instead.', __METHOD__), \E_USER_DEPRECATED);
+        }
+
         if (isset($this->unresolvedChildren[$name])) {
             return $this->resolveChild($name);
         }
@@ -126,6 +140,10 @@ public function remove($name)
             throw new BadMethodCallException('FormBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
         }
 
+        if (\is_int($name)) {
+            @trigger_error(sprintf('Passing an integer name to "%s" is deprecated since Symfony 4.4. Pass a string instead.', __METHOD__), \E_USER_DEPRECATED);
+        }
+
         unset($this->unresolvedChildren[$name], $this->children[$name]);
 
         return $this;
@@ -140,6 +158,10 @@ public function has($name)
             throw new BadMethodCallException('FormBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
         }
 
+        if (\is_int($name)) {
+            @trigger_error(sprintf('Passing an integer name to "%s" is deprecated since Symfony 4.4. Pass a string instead.', __METHOD__), \E_USER_DEPRECATED);
+        }
+
         return isset($this->unresolvedChildren[$name]) || isset($this->children[$name]);
     }
 
@@ -241,7 +263,7 @@ private function resolveChild(string $name): FormBuilderInterface
     private function resolveChildren()
     {
         foreach ($this->unresolvedChildren as $name => $info) {
-            $this->children[$name] = $this->create($name, $info[0], $info[1]);
+            $this->children[$name] = $this->create((string) $name, $info[0], $info[1]);
         }
 
         $this->unresolvedChildren = [];

@@ -23,9 +23,9 @@ interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuild
      * If you add a nested group, this group should also be represented in the
      * object hierarchy.
      *
-     * @param string|int|FormBuilderInterface $child
-     * @param string|null                     $type
-     * @param array                           $options
+     * @param string|FormBuilderInterface $child
+     * @param string|null                 $type
+     * @param array                       $options
      *
      * @return self
      */

@@ -776,6 +776,11 @@ public function getFormConfig()
      */
     public static function validateName($name)
     {
+        if (\is_int($name)) {
+            @trigger_error(sprintf('Passing an integer name to "%s" is deprecated since Symfony 4.4. Pass a string instead.', __METHOD__), \E_USER_DEPRECATED);
+            $name = (string) $name;
+        }
+
         if (null !== $name && !\is_string($name)) {
             throw new UnexpectedTypeException($name, 'string or null');
         }

@@ -35,6 +35,11 @@ public function create($type = 'Symfony\Component\Form\Extension\Core\Type\FormT
      */
     public function createNamed($name, $type = 'Symfony\Component\Form\Extension\Core\Type\FormType', $data = null, array $options = [])
     {
+        if (\is_int($name)) {
+            @trigger_error(sprintf('Passing an integer name to "%s" is deprecated since Symfony 4.4. Pass a string instead.', __METHOD__), \E_USER_DEPRECATED);
+            $name = (string) $name;
+        }
+
         return $this->createNamedBuilder($name, $type, $data, $options)->getForm();
     }
 
@@ -63,6 +68,11 @@ public function createBuilder($type = 'Symfony\Component\Form\Extension\Core\Typ
      */
     public function createNamedBuilder($name, $type = 'Symfony\Component\Form\Extension\Core\Type\FormType', $data = null, array $options = [])
     {
+        if (\is_int($name)) {
+            @trigger_error(sprintf('Passing an integer name to "%s" is deprecated since Symfony 4.4. Pass a string instead.', __METHOD__), \E_USER_DEPRECATED);
+            $name = (string) $name;
+        }
+
         if (null !== $data && !\array_key_exists('data', $options)) {
             $options['data'] = $data;
         }

@@ -38,10 +38,10 @@ public function create($type = 'Symfony\Component\Form\Extension\Core\Type\FormT
      *
      * @see createNamedBuilder()
      *
-     * @param string|int $name    The name of the form
-     * @param string     $type    The type of the form
-     * @param mixed      $data    The initial data
-     * @param array      $options The options
+     * @param string $name    The name of the form
+     * @param string $type    The type of the form
+     * @param mixed  $data    The initial data
+     * @param array  $options The options
      *
      * @return FormInterface The form
      *
@@ -81,10 +81,10 @@ public function createBuilder($type = 'Symfony\Component\Form\Extension\Core\Typ
     /**
      * Returns a form builder.
      *
-     * @param string|int $name    The name of the form
-     * @param string     $type    The type of the form
-     * @param mixed      $data    The initial data
-     * @param array      $options The options
+     * @param string $name    The name of the form
+     * @param string $type    The type of the form
+     * @param mixed  $data    The initial data
+     * @param array  $options The options
      *
      * @return FormBuilderInterface The form builder
      *

@@ -43,9 +43,9 @@ public function getParent();
     /**
      * Adds or replaces a child to the form.
      *
-     * @param FormInterface|string|int $child   The FormInterface instance or the name of the child
-     * @param string|null              $type    The child's type, if a name was passed
-     * @param array                    $options The child's options, if a name was passed
+     * @param FormInterface|string $child   The FormInterface instance or the name of the child
+     * @param string|null          $type    The child's type, if a name was passed
+     * @param array                $options The child's options, if a name was passed
      *
      * @return $this
      *

@@ -93,6 +93,11 @@ public function getTypeExtensions()
      */
     public function createBuilder(FormFactoryInterface $factory, $name, array $options = [])
     {
+        if (\is_int($name)) {
+            @trigger_error(sprintf('Passing an integer name to "%s" is deprecated since Symfony 4.4. Pass a string instead.', __METHOD__), \E_USER_DEPRECATED);
+            $name = (string) $name;
+        }
+
         try {
             $options = $this->getOptionsResolver()->resolve($options);
         } catch (ExceptionInterface $e) {
@@ -218,6 +223,11 @@ public function getOptionsResolver()
      */
     protected function newBuilder($name, $dataClass, FormFactoryInterface $factory, array $options)
     {
+        if (\is_int($name)) {
+            @trigger_error(sprintf('Passing an integer name to "%s" is deprecated since Symfony 4.4. Pass a string instead.', __METHOD__), \E_USER_DEPRECATED);
+            $name = (string) $name;
+        }
+
         if ($this->innerType instanceof ButtonTypeInterface) {
             return new ButtonBuilder($name, $options);
         }

@@ -188,6 +188,9 @@ public function testAddUsingNameAndType()
         $this->assertSame(['foo' => $child], $this->form->all());
     }
 
+    /**
+     * @group legacy
+     */
     public function testAddUsingIntegerNameAndType()
     {
         $child = $this->getBuilder(0)->getForm();

@@ -81,6 +81,9 @@ public function testAdd()
         $this->assertTrue($this->builder->has('foo'));
     }
 
+    /**
+     * @group legacy
+     */
     public function testAddIntegerName()
     {
         $this->assertFalse($this->builder->has(0));