[Form] removed unused constructor argument from Type\FieldType (themeFactory and template)

src/Symfony/Component/Form/DefaultFormFactory.php

@@ -69,7 +69,7 @@ class DefaultFormFactory extends FormFactory
             CsrfProviderInterface $crsfProvider,
             TemporaryStorage $tempStorage)
     {
-        $typeLoader = new DefaultTypeLoader($themeFactory, null, $validator, $crsfProvider, $tempStorage);
+        $typeLoader = new DefaultTypeLoader($validator, $crsfProvider, $tempStorage);
 
         return new self($typeLoader, $themeFactory);
     }

src/Symfony/Component/Form/Type/Loader/DefaultTypeLoader.php

@@ -11,10 +11,7 @@
 
 namespace Symfony\Component\Form\Type\Loader;
 
-use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\Type;
-use Symfony\Component\Form\Type\FormTypeInterface;
-use Symfony\Component\Form\Renderer\Theme\ThemeFactoryInterface;
 use Symfony\Component\Form\CsrfProvider\CsrfProviderInterface;
 use Symfony\Component\Validator\ValidatorInterface;
 use Symfony\Component\HttpFoundation\File\TemporaryStorage;
@@ -22,11 +19,11 @@ use Symfony\Component\HttpFoundation\File\TemporaryStorage;
 class DefaultTypeLoader extends ArrayTypeLoader
 {
     public function __construct(
-            ThemeFactoryInterface $themeFactory, $template = null, ValidatorInterface $validator = null,
+            ValidatorInterface $validator = null,
             CsrfProviderInterface $csrfProvider = null, TemporaryStorage $storage = null)
     {
         $types = array(
-            new Type\FieldType($validator, $themeFactory, $template),
+            new Type\FieldType($validator),
             new Type\FormType(),
             new Type\BirthdayType(),
             new Type\CheckboxType(),

tests/Symfony/Tests/Component/Form/Renderer/Theme/AbstractThemeFunctionalTest.php

@@ -27,16 +27,8 @@ abstract class AbstractThemeFunctionalTest extends \PHPUnit_Framework_TestCase
     /** @var FormFactory */
     private $factory;
 
-    abstract protected function createThemeFactory();
-
-    protected function getTemplate()
-    {
-    }
-
     public function setUp()
     {
-        $themeFactory = $this->createThemeFactory();
-        $template = $this->getTemplate();
         $csrfProvider = new DefaultCsrfProvider('foo');
         $validator = $this->getMock('Symfony\Component\Validator\ValidatorInterface');
         $rendererFactoryLoader = $this->getMock('Symfony\Component\Form\Renderer\Loader\RendererFactoryLoaderInterface');
@@ -44,7 +36,7 @@ abstract class AbstractThemeFunctionalTest extends \PHPUnit_Framework_TestCase
 
         // ok more than 2 lines, see DefaultFormFactory.php for proposed simplication
         $loaderChain = new TypeLoaderChain();
-        $loaderChain->addLoader(new DefaultTypeLoader($themeFactory, $template, $validator, $csrfProvider , $storage));
+        $loaderChain->addLoader(new DefaultTypeLoader($validator, $csrfProvider , $storage));
         $loaderChain->addLoader(new ArrayTypeLoader(array(
             new MyTestFormConfig(),
             new MyTestSubFormConfig()

tests/Symfony/Tests/Component/Form/Renderer/Theme/PhpThemeFunctionalTest.php

@@ -18,8 +18,4 @@ use Symfony\Component\Form\Renderer\Theme\PhpThemeFactory;
  */
 class PhpThemeFunctionalTest extends AbstractThemeFunctionalTest
 {
-    protected function createThemeFactory()
-    {
-        return new PhpThemeFactory();
-    }
-}
+}

tests/Symfony/Tests/Component/Form/Type/TestCase.php

@@ -66,7 +66,6 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase
 
     protected function getTypeLoaders()
     {
-        return array(new DefaultTypeLoader($this->themeFactory, null,
-                $this->validator, $this->csrfProvider, $this->storage));
+        return array(new DefaultTypeLoader($this->validator, $this->csrfProvider, $this->storage));
     }
 }