bug #16677 [Form] Fixed wrong usages of the "text" type (webmozart)

fabpot · fabpot · commit 402d474a9690 · 2015-11-26T18:59:59.000+01:00
This PR was merged into the 2.8 branch. Discussion ---------- [Form] Fixed wrong usages of the "text" type | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 9149622 [Form] Fixed wrong usages of the "text" type
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
@@ -910,7 +910,7 @@ public function add($child, $type = null, array $options = array())
             $options['auto_initialize'] = false;
 
             if (null === $type && null === $this->config->getDataClass()) {
-                $type = 'text';
+                $type = 'Symfony\Component\Form\Extension\Core\Type\TextType';
             }
 
             if (null === $type) {
diff --git a/src/Symfony/Component/Form/Tests/CompoundFormTest.php b/src/Symfony/Component/Form/Tests/CompoundFormTest.php
@@ -172,13 +172,13 @@ public function testAddUsingNameAndType()
 
         $this->factory->expects($this->once())
             ->method('createNamed')
-            ->with('foo', 'text', null, array(
+            ->with('foo', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array(
                 'bar' => 'baz',
                 'auto_initialize' => false,
             ))
             ->will($this->returnValue($child));
 
-        $this->form->add('foo', 'text', array('bar' => 'baz'));
+        $this->form->add('foo', 'Symfony\Component\Form\Extension\Core\Type\TextType', array('bar' => 'baz'));
 
         $this->assertTrue($this->form->has('foo'));
         $this->assertSame($this->form, $child->getParent());
@@ -191,14 +191,14 @@ public function testAddUsingIntegerNameAndType()
 
         $this->factory->expects($this->once())
             ->method('createNamed')
-            ->with('0', 'text', null, array(
+            ->with('0', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array(
                 'bar' => 'baz',
                 'auto_initialize' => false,
             ))
             ->will($this->returnValue($child));
 
         // in order to make casting unnecessary
-        $this->form->add(0, 'text', array('bar' => 'baz'));
+        $this->form->add(0, 'Symfony\Component\Form\Extension\Core\Type\TextType', array('bar' => 'baz'));
 
         $this->assertTrue($this->form->has(0));
         $this->assertSame($this->form, $child->getParent());
@@ -211,7 +211,7 @@ public function testAddWithoutType()
 
         $this->factory->expects($this->once())
             ->method('createNamed')
-            ->with('foo', 'text')
+            ->with('foo', 'Symfony\Component\Form\Extension\Core\Type\TextType')
             ->will($this->returnValue($child));
 
         $this->form->add('foo');

Original file line number	Diff line number	Diff line change
`@@ -910,7 +910,7 @@ public function add($child, $type = null, array $options = array())`
`910`	`910`	`$options['auto_initialize'] = false;`
`911`	`911`
`912`	`912`	`if (null === $type && null === $this->config->getDataClass()) {`
`913`		`- $type = 'text';`
	`913`	`+ $type = 'Symfony\Component\Form\Extension\Core\Type\TextType';`
`914`	`914`	`}`
`915`	`915`
`916`	`916`	`if (null === $type) {`