merged branch cs278/master (PR #5172)

fabpot · fabpot · commit be41ca353b8b · 2012-08-03T14:48:44.000+02:00
Commits ------- d1aae0b [Form] Fix UnexpectedTypeException from HttpFoundation extension Discussion ---------- [Form] Fix UnexpectedTypeException from HttpFoundation extension Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: - Todo: - Fixes exception thrown by the `AbstractExtension` because the wrong method has been implemented. ``` Uncaught exception 'Symfony\\Component\\Form\\Exception\\UnexpectedTypeException' with message 'Expected argument of type "Symfony\\Component\\Form\\FormTypeInterface", "Symfony\\Component\\Form\\Extension\\HttpFoundation\\Type\\FormTypeHttpFoundationExtension" given' in vendor/symfony/form/Symfony/Component/Form/AbstractExtension.php:153 ``` --------------------------------------------------------------------------- by stof at 2012-08-03T12:36:55Z :+1:
diff --git a/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationExtension.php b/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationExtension.php
@@ -20,7 +20,7 @@
  */
 class HttpFoundationExtension extends AbstractExtension
 {
-    protected function loadTypes()
+    protected function loadTypeExtensions()
     {
         return array(
             new Type\FormTypeHttpFoundationExtension(),

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*/`
`21`	`21`	`class HttpFoundationExtension extends AbstractExtension`
`22`	`22`	`{`
`23`		`- protected function loadTypes()`
	`23`	`+ protected function loadTypeExtensions()`
`24`	`24`	`{`
`25`	`25`	`return array(`
`26`	`26`	`new Type\FormTypeHttpFoundationExtension(),`