PHPDoc fixes

vudaltsov · vudaltsov · commit 7f0f67938c4d · 2019-07-06T04:49:51.000+03:00
diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
@@ -50,8 +50,8 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
     private $options;
 
     /**
-     * @param string $name    The name of the button
-     * @param array  $options The button's options
+     * @param string|int $name    The name of the button
+     * @param array      $options The button's options
      *
      * @throws InvalidArgumentException if the name is empty
      */
@@ -87,7 +87,7 @@ public function add($child, $type = null, array $options = [])
      *
      * This method should not be invoked.
      *
-     * @param string                   $name
+     * @param string|int               $name
      * @param string|FormTypeInterface $type
      * @param array                    $options
      *
@@ -103,7 +103,7 @@ public function create($name, $type = null, array $options = [])
      *
      * This method should not be invoked.
      *
-     * @param string $name
+     * @param string|int $name
      *
      * @throws BadMethodCallException
      */
@@ -117,7 +117,7 @@ public function get($name)
      *
      * This method should not be invoked.
      *
-     * @param string $name
+     * @param string|int $name
      *
      * @throws BadMethodCallException
      */
@@ -129,7 +129,7 @@ public function remove($name)
     /**
      * Unsupported method.
      *
-     * @param string $name
+     * @param string|int $name
      *
      * @return bool Always returns false
      */
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
@@ -140,7 +140,7 @@ class Form implements \IteratorAggregate, FormInterface
     private $lockSetData = false;
 
     /**
-     * @var string|int|null
+     * @var string
      */
     private $name;
 
@@ -211,7 +211,7 @@ public function getPropertyPath()
             return $this->propertyPath;
         }
 
-        if (null === $this->name || '' === $this->name) {
+        if ('' === $this->name) {
             return null;
         }
 
diff --git a/src/Symfony/Component/Form/FormBuilder.php b/src/Symfony/Component/Form/FormBuilder.php
@@ -38,7 +38,7 @@ class FormBuilder extends FormConfigBuilder implements \IteratorAggregate, FormB
     private $unresolvedChildren = [];
 
     /**
-     * @param string                   $name
+     * @param string|int               $name
      * @param string|null              $dataClass
      * @param EventDispatcherInterface $dispatcher
      * @param FormFactoryInterface     $factory
diff --git a/src/Symfony/Component/Form/FormBuilderInterface.php b/src/Symfony/Component/Form/FormBuilderInterface.php
@@ -34,7 +34,7 @@ public function add($child, $type = null, array $options = []);
     /**
      * Creates a form builder.
      *
-     * @param string      $name    The name of the form or the name of the property
+     * @param string|int  $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       $options The options
      *
@@ -45,7 +45,7 @@ public function create($name, $type = null, array $options = []);
     /**
      * Returns a child by name.
      *
-     * @param string $name The name of the child
+     * @param string|int $name The name of the child
      *
      * @return self
      *
@@ -56,7 +56,7 @@ public function get($name);
     /**
      * Removes the field with the given name.
      *
-     * @param string $name
+     * @param string|int $name
      *
      * @return self
      */
@@ -65,7 +65,7 @@ public function remove($name);
     /**
      * Returns whether a field with the given name exists.
      *
-     * @param string $name
+     * @param string|int $name
      *
      * @return bool
      */
diff --git a/src/Symfony/Component/Form/FormConfigBuilder.php b/src/Symfony/Component/Form/FormConfigBuilder.php
@@ -813,7 +813,7 @@ public static function validateName($name)
      *   * contains only letters, digits, numbers, underscores ("_"),
      *     hyphens ("-") and colons (":")
      *
-     * @param string|null $name The tested form name
+     * @param string|int $name The tested form name
      *
      * @return bool Whether the name is valid
      */
diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php
@@ -58,7 +58,7 @@ public function add($child, $type = null, array $options = []);
     /**
      * Returns the child with the given name.
      *
-     * @param string $name The name of the child
+     * @param string|int $name The name of the child
      *
      * @return self
      *
@@ -69,7 +69,7 @@ public function get($name);
     /**
      * Returns whether a child with the given name exists.
      *
-     * @param string $name The name of the child
+     * @param string|int $name The name of the child
      *
      * @return bool
      */
@@ -78,7 +78,7 @@ public function has($name);
     /**
      * Removes a child from the form.
      *
-     * @param string $name The name of the child to remove
+     * @param string|int $name The name of the child to remove
      *
      * @return $this
      *
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,8 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface`
`50`	`50`	`private $options;`
`51`	`51`
`52`	`52`	`/**`
`53`		`- * @param string $name The name of the button`
`54`		`- * @param array $options The button's options`
	`53`	`+ * @param string\|int $name The name of the button`
	`54`	`+ * @param array $options The button's options`
`55`	`55`	`*`
`56`	`56`	`* @throws InvalidArgumentException if the name is empty`
`57`	`57`	`*/`
`@@ -87,7 +87,7 @@ public function add($child, $type = null, array $options = [])`
`87`	`87`	`*`
`88`	`88`	`* This method should not be invoked.`
`89`	`89`	`*`
`90`		`- * @param string $name`
	`90`	`+ * @param string\|int $name`
`91`	`91`	`* @param string\|FormTypeInterface $type`
`92`	`92`	`* @param array $options`
`93`	`93`	`*`
`@@ -103,7 +103,7 @@ public function create($name, $type = null, array $options = [])`
`103`	`103`	`*`
`104`	`104`	`* This method should not be invoked.`
`105`	`105`	`*`
`106`		`- * @param string $name`
	`106`	`+ * @param string\|int $name`
`107`	`107`	`*`
`108`	`108`	`* @throws BadMethodCallException`
`109`	`109`	`*/`
`@@ -117,7 +117,7 @@ public function get($name)`
`117`	`117`	`*`
`118`	`118`	`* This method should not be invoked.`
`119`	`119`	`*`
`120`		`- * @param string $name`
	`120`	`+ * @param string\|int $name`
`121`	`121`	`*`
`122`	`122`	`* @throws BadMethodCallException`
`123`	`123`	`*/`
`@@ -129,7 +129,7 @@ public function remove($name)`
`129`	`129`	`/**`
`130`	`130`	`* Unsupported method.`
`131`	`131`	`*`
`132`		`- * @param string $name`
	`132`	`+ * @param string\|int $name`
`133`	`133`	`*`
`134`	`134`	`* @return bool Always returns false`
`135`	`135`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ class Form implements \IteratorAggregate, FormInterface`
`140`	`140`	`private $lockSetData = false;`
`141`	`141`
`142`	`142`	`/**`
`143`		`- * @var string\|int\|null`
	`143`	`+ * @var string`
`144`	`144`	`*/`
`145`	`145`	`private $name;`
`146`	`146`
`@@ -211,7 +211,7 @@ public function getPropertyPath()`
`211`	`211`	`return $this->propertyPath;`
`212`	`212`	`}`
`213`	`213`
`214`		`- if (null === $this->name \|\| '' === $this->name) {`
	`214`	`+ if ('' === $this->name) {`
`215`	`215`	`return null;`
`216`	`216`	`}`
`217`	`217`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function add($child, $type = null, array $options = []);`
`34`	`34`	`/**`
`35`	`35`	`* Creates a form builder.`
`36`	`36`	`*`
`37`		`- * @param string $name The name of the form or the name of the property`
	`37`	`+ * @param string\|int $name The name of the form or the name of the property`
`38`	`38`	`* @param string\|null $type The type of the form or null if name is a property`
`39`	`39`	`* @param array $options The options`
`40`	`40`	`*`
`@@ -45,7 +45,7 @@ public function create($name, $type = null, array $options = []);`
`45`	`45`	`/**`
`46`	`46`	`* Returns a child by name.`
`47`	`47`	`*`
`48`		`- * @param string $name The name of the child`
	`48`	`+ * @param string\|int $name The name of the child`
`49`	`49`	`*`
`50`	`50`	`* @return self`
`51`	`51`	`*`
`@@ -56,7 +56,7 @@ public function get($name);`
`56`	`56`	`/**`
`57`	`57`	`* Removes the field with the given name.`
`58`	`58`	`*`
`59`		`- * @param string $name`
	`59`	`+ * @param string\|int $name`
`60`	`60`	`*`
`61`	`61`	`* @return self`
`62`	`62`	`*/`
`@@ -65,7 +65,7 @@ public function remove($name);`
`65`	`65`	`/**`
`66`	`66`	`* Returns whether a field with the given name exists.`
`67`	`67`	`*`
`68`		`- * @param string $name`
	`68`	`+ * @param string\|int $name`
`69`	`69`	`*`
`70`	`70`	`* @return bool`
`71`	`71`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -813,7 +813,7 @@ public static function validateName($name)`
`813`	`813`	`* * contains only letters, digits, numbers, underscores ("_"),`
`814`	`814`	`* hyphens ("-") and colons (":")`
`815`	`815`	`*`
`816`		`- * @param string\|null $name The tested form name`
	`816`	`+ * @param string\|int $name The tested form name`
`817`	`817`	`*`
`818`	`818`	`* @return bool Whether the name is valid`
`819`	`819`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function add($child, $type = null, array $options = []);`
`58`	`58`	`/**`
`59`	`59`	`* Returns the child with the given name.`
`60`	`60`	`*`
`61`		`- * @param string $name The name of the child`
	`61`	`+ * @param string\|int $name The name of the child`
`62`	`62`	`*`
`63`	`63`	`* @return self`
`64`	`64`	`*`
`@@ -69,7 +69,7 @@ public function get($name);`
`69`	`69`	`/**`
`70`	`70`	`* Returns whether a child with the given name exists.`
`71`	`71`	`*`
`72`		`- * @param string $name The name of the child`
	`72`	`+ * @param string\|int $name The name of the child`
`73`	`73`	`*`
`74`	`74`	`* @return bool`
`75`	`75`	`*/`
`@@ -78,7 +78,7 @@ public function has($name);`
`78`	`78`	`/**`
`79`	`79`	`* Removes a child from the form.`
`80`	`80`	`*`
`81`		`- * @param string $name The name of the child to remove`
	`81`	`+ * @param string\|int $name The name of the child to remove`
`82`	`82`	`*`
`83`	`83`	`* @return $this`
`84`	`84`	`*`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ public function getOptionsResolver()`
`204`	`204`	`*`
`205`	`205`	`* Override this method if you want to customize the builder class.`
`206`	`206`	`*`
`207`		`- * @param string $name The name of the builder`
	`207`	`+ * @param string\|int $name The name of the builder`
`208`	`208`	`* @param string\|null $dataClass The data class`
`209`	`209`	`* @param FormFactoryInterface $factory The current form factory`
`210`	`210`	`* @param array $options The builder options`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function getTypeExtensions();`
`52`	`52`	`* Creates a new form builder for this type.`
`53`	`53`	`*`
`54`	`54`	`* @param FormFactoryInterface $factory The form factory`
`55`		`- * @param string $name The name for the builder`
	`55`	`+ * @param string\|int $name The name for the builder`
`56`	`56`	`* @param array $options The builder options`
`57`	`57`	`*`
`58`	`58`	`* @return FormBuilderInterface The created form builder`