From 01abc67fe7b561008d4a652606c83a6584241659 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Tue, 29 Jan 2019 19:24:09 +0100
Subject: [PATCH] [Form] fix some docblocks and type checks

---
 src/Symfony/Component/Form/AbstractType.php              | 2 +-
 src/Symfony/Component/Form/FormBuilder.php               | 2 +-
 src/Symfony/Component/Form/FormFactory.php               | 4 ++--
 src/Symfony/Component/Form/ResolvedFormType.php          | 2 +-
 src/Symfony/Component/Form/ResolvedFormTypeInterface.php | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/Form/AbstractType.php b/src/Symfony/Component/Form/AbstractType.php
index 3509db5d94a92..1a9cfd75be7f6 100644
--- a/src/Symfony/Component/Form/AbstractType.php
+++ b/src/Symfony/Component/Form/AbstractType.php
@@ -52,7 +52,7 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getBlockPrefix()
     {
-        return StringUtil::fqcnToBlockPrefix(\get_class($this));
+        return StringUtil::fqcnToBlockPrefix(\get_class($this)) ?: '';
     }
 
     /**
diff --git a/src/Symfony/Component/Form/FormBuilder.php b/src/Symfony/Component/Form/FormBuilder.php
index 00affbf6d8c3d..e93d72934cf92 100644
--- a/src/Symfony/Component/Form/FormBuilder.php
+++ b/src/Symfony/Component/Form/FormBuilder.php
@@ -40,7 +40,7 @@ class FormBuilder extends FormConfigBuilder implements \IteratorAggregate, FormB
     /**
      * Creates a new form builder.
      *
-     * @param string                   $name
+     * @param string|int               $name
      * @param string|null              $dataClass
      * @param EventDispatcherInterface $dispatcher
      * @param FormFactoryInterface     $factory
diff --git a/src/Symfony/Component/Form/FormFactory.php b/src/Symfony/Component/Form/FormFactory.php
index d474d5903f86f..a82605b3bf63b 100644
--- a/src/Symfony/Component/Form/FormFactory.php
+++ b/src/Symfony/Component/Form/FormFactory.php
@@ -67,8 +67,8 @@ public function createNamedBuilder($name, $type = 'Symfony\Component\Form\Extens
             $options['data'] = $data;
         }
 
-        if (!\is_string($type)) {
-            throw new UnexpectedTypeException($type, 'string');
+        if (!\is_string($type) && !\is_int($type)) {
+            throw new UnexpectedTypeException($type, 'string|int');
         }
 
         $type = $this->registry->getType($type);
diff --git a/src/Symfony/Component/Form/ResolvedFormType.php b/src/Symfony/Component/Form/ResolvedFormType.php
index 0efde40849f06..9f455ab0b6b7e 100644
--- a/src/Symfony/Component/Form/ResolvedFormType.php
+++ b/src/Symfony/Component/Form/ResolvedFormType.php
@@ -204,7 +204,7 @@ public function getOptionsResolver()
      *
      * Override this method if you want to customize the builder class.
      *
-     * @param string               $name      The name of the builder
+     * @param string|int           $name      The name of the builder
      * @param string|null          $dataClass The data class
      * @param FormFactoryInterface $factory   The current form factory
      * @param array                $options   The builder options
diff --git a/src/Symfony/Component/Form/ResolvedFormTypeInterface.php b/src/Symfony/Component/Form/ResolvedFormTypeInterface.php
index c4ab1d6477807..ecdbc92b2a314 100644
--- a/src/Symfony/Component/Form/ResolvedFormTypeInterface.php
+++ b/src/Symfony/Component/Form/ResolvedFormTypeInterface.php
@@ -52,7 +52,7 @@ public function getTypeExtensions();
      * Creates a new form builder for this type.
      *
      * @param FormFactoryInterface $factory The form factory
-     * @param string               $name    The name for the builder
+     * @param string|int           $name    The name for the builder
      * @param array                $options The builder options
      *
      * @return FormBuilderInterface The created form builder