merged branch stloyd/form_texttypes (PR symfony#2343)

fabpot · fabpot · commit 50c47aa687b7 · 2011-10-07T14:07:29.000+02:00
Commits ------- 8bd0e42 [Form] Use proper parent (text) for EmailType and TextareaType Discussion ---------- [2.0][Form] Use proper parent (text) for EmailType and TextareaType Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: -
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php b/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php
@@ -20,7 +20,7 @@ class EmailType extends AbstractType
      */
     public function getParent(array $options)
     {
-        return 'field';
+        return 'text';
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TextareaType.php b/src/Symfony/Component/Form/Extension/Core/Type/TextareaType.php
@@ -20,7 +20,7 @@ class TextareaType extends AbstractType
      */
     public function getParent(array $options)
     {
-        return 'field';
+        return 'text';
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class EmailType extends AbstractType`
`20`	`20`	`*/`
`21`	`21`	`public function getParent(array $options)`
`22`	`22`	`{`
`23`		`- return 'field';`
	`23`	`+ return 'text';`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class TextareaType extends AbstractType`
`20`	`20`	`*/`
`21`	`21`	`public function getParent(array $options)`
`22`	`22`	`{`
`23`		`- return 'field';`
	`23`	`+ return 'text';`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`/**`