[Form] type cannot be a FormTypeInterface anymore

Tobion · Tobion · commit b69a366dfe53 · 2019-08-04T21:26:13.000+02:00
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

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`