Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit d85f612

Browse filesBrowse files
committed
[Form] type cannot be a FormTypeInterface anymore
1 parent 64a2627 commit d85f612
Copy full SHA for d85f612

File tree

3 files changed

+4
-11
lines changed
Filter options

3 files changed

+4
-11
lines changed

‎src/Symfony/Component/Form/Form.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Form.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -849,8 +849,8 @@ public function add($child, $type = null, array $options = [])
849849

850850
$child = (string) $child;
851851

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');
854854
}
855855

856856
// Never initialize child forms automatically

‎src/Symfony/Component/Form/FormBuilder.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/FormBuilder.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ public function add($child, $type = null, array $options = [])
6666
throw new UnexpectedTypeException($child, 'string or Symfony\Component\Form\FormBuilderInterface');
6767
}
6868

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');
7171
}
7272

7373
// Add to "children" to maintain order

‎src/Symfony/Component/Form/Tests/FormBuilderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/FormBuilderTest.php
-7Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,6 @@ public function testMaintainOrderOfLazyAndExplicitChildren()
120120
$this->assertSame(['foo', 'bar', 'baz'], array_keys($children));
121121
}
122122

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-
130123
public function testRemove()
131124
{
132125
$this->builder->add('foo', 'Symfony\Component\Form\Extension\Core\Type\TextType');

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.