minor #32934 [Form] type cannot be a FormTypeInterface anymore (Tobion)

fabpot · fabpot · commit c754f15205b6 · 2019-08-05T07:21:37.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Form] type cannot be a FormTypeInterface anymore | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | | License | MIT | Doc PR | Found in #32237. This style of adding FormTypes has been removed in sf 3. Could also be merged in 3.4 if preferred. But there was an outdated, broken test. So 4.4 seems enough as well. Commits ------- 6ee0d53 [Form] type cannot be a FormTypeInterface anymore
diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
@@ -79,9 +79,6 @@ public function __construct(?string $name, array $options = [])
      *
      * This method should not be invoked.
      *
-     * @param string|FormBuilderInterface $child
-     * @param string|FormTypeInterface    $type
-     *
      * @throws BadMethodCallException
      */
     public function add($child, $type = null, array $options = [])
@@ -94,10 +91,6 @@ public function add($child, $type = null, array $options = [])
      *
      * This method should not be invoked.
      *
-     * @param string                   $name
-     * @param string|FormTypeInterface $type
-     * @param array                    $options
-     *
      * @throws BadMethodCallException
      */
     public function create($name, $type = null, array $options = [])
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
@@ -849,8 +849,8 @@ public function add($child, $type = null, array $options = [])
 
             $child = (string) $child;
 
-            if (null !== $type && !\is_string($type) && !$type instanceof FormTypeInterface) {
-                throw new UnexpectedTypeException($type, 'string or Symfony\Component\Form\FormTypeInterface');
+            if (null !== $type && !\is_string($type)) {
+                throw new UnexpectedTypeException($type, 'string or null');
             }
 
             // Never initialize child forms automatically
diff --git a/src/Symfony/Component/Form/FormBuilder.php b/src/Symfony/Component/Form/FormBuilder.php
@@ -66,8 +66,8 @@ public function add($child, $type = null, array $options = [])
             throw new UnexpectedTypeException($child, 'string or Symfony\Component\Form\FormBuilderInterface');
         }
 
-        if (null !== $type && !\is_string($type) && !$type instanceof FormTypeInterface) {
-            throw new UnexpectedTypeException($type, 'string or Symfony\Component\Form\FormTypeInterface');
+        if (null !== $type && !\is_string($type)) {
+            throw new UnexpectedTypeException($type, 'string or null');
         }
 
         // Add to "children" to maintain order
diff --git a/src/Symfony/Component/Form/Tests/FormBuilderTest.php b/src/Symfony/Component/Form/Tests/FormBuilderTest.php
@@ -120,13 +120,6 @@ public function testMaintainOrderOfLazyAndExplicitChildren()
         $this->assertSame(['foo', 'bar', 'baz'], array_keys($children));
     }
 
-    public function testAddFormType()
-    {
-        $this->assertFalse($this->builder->has('foo'));
-        $this->builder->add('foo', $this->getMockBuilder('Symfony\Component\Form\FormTypeInterface')->getMock());
-        $this->assertTrue($this->builder->has('foo'));
-    }
-
     public function testRemove()
     {
         $this->builder->add('foo', 'Symfony\Component\Form\Extension\Core\Type\TextType');

Original file line number	Diff line number	Diff line change
`@@ -79,9 +79,6 @@ public function __construct(?string $name, array $options = [])`
`79`	`79`	`*`
`80`	`80`	`* This method should not be invoked.`
`81`	`81`	`*`
`82`		`- * @param string\|FormBuilderInterface $child`
`83`		`- * @param string\|FormTypeInterface $type`
`84`		`- *`
`85`	`82`	`* @throws BadMethodCallException`
`86`	`83`	`*/`
`87`	`84`	`public function add($child, $type = null, array $options = [])`
`@@ -94,10 +91,6 @@ public function add($child, $type = null, array $options = [])`
`94`	`91`	`*`
`95`	`92`	`* This method should not be invoked.`
`96`	`93`	`*`
`97`		`- * @param string $name`
`98`		`- * @param string\|FormTypeInterface $type`
`99`		`- * @param array $options`
`100`		`- *`
`101`	`94`	`* @throws BadMethodCallException`
`102`	`95`	`*/`
`103`	`96`	`public function create($name, $type = null, array $options = [])`
Original file line number	Diff line number	Diff line change
`@@ -849,8 +849,8 @@ public function add($child, $type = null, array $options = [])`
`849`	`849`
`850`	`850`	`$child = (string) $child;`
`851`	`851`
`852`		`- if (null !== $type && !\is_string($type) && !$type instanceof FormTypeInterface) {`
`853`		`- throw new UnexpectedTypeException($type, 'string or Symfony\Component\Form\FormTypeInterface');`
	`852`	`+ if (null !== $type && !\is_string($type)) {`
	`853`	`+ throw new UnexpectedTypeException($type, 'string or null');`
`854`	`854`	`}`
`855`	`855`
`856`	`856`	`// Never initialize child forms automatically`
Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,8 @@ public function add($child, $type = null, array $options = [])`
`66`	`66`	`throw new UnexpectedTypeException($child, 'string or Symfony\Component\Form\FormBuilderInterface');`
`67`	`67`	`}`
`68`	`68`
`69`		`- if (null !== $type && !\is_string($type) && !$type instanceof FormTypeInterface) {`
`70`		`- throw new UnexpectedTypeException($type, 'string or Symfony\Component\Form\FormTypeInterface');`
	`69`	`+ if (null !== $type && !\is_string($type)) {`
	`70`	`+ throw new UnexpectedTypeException($type, 'string or null');`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`// Add to "children" to maintain order`
Original file line number	Diff line number	Diff line change
`@@ -120,13 +120,6 @@ public function testMaintainOrderOfLazyAndExplicitChildren()`
`120`	`120`	`$this->assertSame(['foo', 'bar', 'baz'], array_keys($children));`
`121`	`121`	`}`
`122`	`122`
`123`		`- public function testAddFormType()`
`124`		`- {`
`125`		`- $this->assertFalse($this->builder->has('foo'));`
`126`		`- $this->builder->add('foo', $this->getMockBuilder('Symfony\Component\Form\FormTypeInterface')->getMock());`
`127`		`- $this->assertTrue($this->builder->has('foo'));`
`128`		`- }`
`129`		`-`
`130`	`123`	`public function testRemove()`
`131`	`124`	`{`
`132`	`125`	`$this->builder->add('foo', 'Symfony\Component\Form\Extension\Core\Type\TextType');`