Browse Source

[Form] Improved naming of various interfaces. Renamed DefaultRenderer to ThemeRenderer

Bernhard Schussek 14 năm trước cách đây
mục cha
commit
01a47457d0
25 tập tin đã thay đổi với 101 bổ sung112 xóa
  1. 3 3
      src/Symfony/Component/Form/DefaultFormFactory.php
  2. 4 4
      src/Symfony/Component/Form/Form.php
  3. 7 7
      src/Symfony/Component/Form/FormBuilder.php
  4. 26 0
      src/Symfony/Component/Form/Renderer/FormRendererInterface.php
  5. 3 3
      src/Symfony/Component/Form/Renderer/Plugin/CheckedPlugin.php
  6. 3 3
      src/Symfony/Component/Form/Renderer/Plugin/ChoicePlugin.php
  7. 3 3
      src/Symfony/Component/Form/Renderer/Plugin/DatePatternPlugin.php
  8. 3 3
      src/Symfony/Component/Form/Renderer/Plugin/EnctypePlugin.php
  9. 3 3
      src/Symfony/Component/Form/Renderer/Plugin/FieldPlugin.php
  10. 3 3
      src/Symfony/Component/Form/Renderer/Plugin/FormPlugin.php
  11. 3 3
      src/Symfony/Component/Form/Renderer/Plugin/RendererPluginInterface.php
  12. 3 3
      src/Symfony/Component/Form/Renderer/Plugin/MaxLengthPlugin.php
  13. 3 3
      src/Symfony/Component/Form/Renderer/Plugin/MoneyPatternPlugin.php
  14. 3 3
      src/Symfony/Component/Form/Renderer/Plugin/ParentNamePlugin.php
  15. 3 3
      src/Symfony/Component/Form/Renderer/Plugin/PasswordValuePlugin.php
  16. 3 3
      src/Symfony/Component/Form/Renderer/Plugin/SelectMultipleNamePlugin.php
  17. 0 37
      src/Symfony/Component/Form/Renderer/RendererInterface.php
  18. 1 1
      src/Symfony/Component/Form/Renderer/Theme/ThemeInterface.php
  19. 1 1
      src/Symfony/Component/Form/Renderer/Theme/PhpTheme.php
  20. 1 1
      src/Symfony/Component/Form/Renderer/Theme/TwigTheme.php
  21. 14 14
      src/Symfony/Component/Form/Renderer/DefaultRenderer.php
  22. 4 4
      src/Symfony/Component/Form/Type/FieldType.php
  23. 1 1
      src/Symfony/Component/Form/Type/FormType.php
  24. 2 2
      src/Symfony/Component/Form/Type/Loader/DefaultTypeLoader.php
  25. 1 1
      tests/Symfony/Tests/Component/Form/Type/TestCase.php

+ 3 - 3
src/Symfony/Component/Form/DefaultFormFactory.php

@@ -16,7 +16,7 @@ use Symfony\Component\Validator\ValidatorInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\Type;
 use Symfony\Component\Form\Type\FieldTypeInterface;
-use Symfony\Component\Form\Renderer\Theme\ThemeInterface;
+use Symfony\Component\Form\Renderer\Theme\FormThemeInterface;
 use Symfony\Component\Form\Type\Loader\TypeLoaderInterface;
 use Symfony\Component\Form\Type\Loader\DefaultTypeLoader;
 use Symfony\Component\Form\Type\AbstractFieldType;
@@ -54,14 +54,14 @@ class DefaultFormFactory extends FormFactory
     /**
      * Factory method to simplify creation of a default form factory.
      * 
-     * @param ThemeInterface $theme
+     * @param FormThemeInterface $theme
      * @param ValidatorInterface $validator
      * @param CsrfProviderInterface $crsfProvider
      * @param TemporaryStorage $tempStorage
      * @param \Doctrine\ORM\EntityManager $entityManager
      * @return DefaultFormFactory
      */
-    public static function createInstance(ThemeInterface $theme,
+    public static function createInstance(FormThemeInterface $theme,
             ValidatorInterface $validator,
             CsrfProviderInterface $crsfProvider,
             TemporaryStorage $tempStorage,

+ 4 - 4
src/Symfony/Component/Form/Form.php

@@ -27,7 +27,7 @@ use Symfony\Component\Form\DataTransformer\DataTransformerInterface;
 use Symfony\Component\Form\DataTransformer\TransformationFailedException;
 use Symfony\Component\Form\DataMapper\DataMapperInterface;
 use Symfony\Component\Form\Validator\FormValidatorInterface;
-use Symfony\Component\Form\Renderer\RendererInterface;
+use Symfony\Component\Form\Renderer\FormRendererInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
@@ -107,7 +107,7 @@ class Form implements \IteratorAggregate, FormInterface
     private $attributes;
 
     public function __construct($name, EventDispatcherInterface $dispatcher,
-        RendererInterface $renderer = null, DataTransformerInterface $clientTransformer = null,
+        FormRendererInterface $renderer = null, DataTransformerInterface $clientTransformer = null,
         DataTransformerInterface $normTransformer = null,
         DataMapperInterface $dataMapper = null, array $validators = array(),
         $required = false, $readOnly = false, array $attributes = array())
@@ -130,7 +130,7 @@ class Form implements \IteratorAggregate, FormInterface
         $this->attributes = $attributes;
 
         if ($renderer) {
-            $renderer->setField($this);
+            $renderer->setForm($this);
         }
 
         $this->setData(null);
@@ -519,7 +519,7 @@ class Form implements \IteratorAggregate, FormInterface
     /**
      * Returns the renderer
      *
-     * @return RendererInterface
+     * @return FormRendererInterface
      */
     public function getRenderer()
     {

+ 7 - 7
src/Symfony/Component/Form/FormBuilder.php

@@ -14,9 +14,9 @@ namespace Symfony\Component\Form;
 use Symfony\Component\Form\CsrfProvider\CsrfProviderInterface;
 use Symfony\Component\Form\DataMapper\DataMapperInterface;
 use Symfony\Component\Form\DataTransformer\DataTransformerInterface;
-use Symfony\Component\Form\Renderer\DefaultRenderer;
-use Symfony\Component\Form\Renderer\RendererInterface;
-use Symfony\Component\Form\Renderer\Plugin\RendererPluginInterface;
+use Symfony\Component\Form\Renderer\ThemeRenderer;
+use Symfony\Component\Form\Renderer\FormRendererInterface;
+use Symfony\Component\Form\Renderer\Plugin\FormRendererPluginInterface;
 use Symfony\Component\Form\Validator\FormValidatorInterface;
 use Symfony\Component\Form\Exception\FormException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
@@ -226,16 +226,16 @@ class FormBuilder
     /**
      * Sets the renderer
      *
-     * @param RendererInterface $renderer
+     * @param FormRendererInterface $renderer
      */
-    public function setRenderer(RendererInterface $renderer)
+    public function setRenderer(FormRendererInterface $renderer)
     {
         $this->renderer = $renderer;
 
         return $this;
     }
 
-    public function addRendererPlugin(RendererPluginInterface $plugin)
+    public function addRendererPlugin(FormRendererPluginInterface $plugin)
     {
         $this->rendererVars[] = $plugin;
 
@@ -256,7 +256,7 @@ class FormBuilder
                 throw new FormException('A renderer must be set in order to add renderer variables or plugins');
             }
 
-            if ($value instanceof RendererPluginInterface) {
+            if ($value instanceof FormRendererPluginInterface) {
                 $this->renderer->addPlugin($value);
                 continue;
             }

+ 26 - 0
src/Symfony/Component/Form/Renderer/FormRendererInterface.php

@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Renderer;
+
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\Renderer\Plugin\FormRendererPluginInterface;
+
+interface FormRendererInterface
+{
+    function setForm(FormInterface $form);
+
+    function setChildren(array $renderers);
+
+    function setVar($name, $value);
+
+    function addPlugin(FormRendererPluginInterface $plugin);
+}

+ 3 - 3
src/Symfony/Component/Form/Renderer/Plugin/CheckedPlugin.php

@@ -11,12 +11,12 @@
 
 namespace Symfony\Component\Form\Renderer\Plugin;
 
-use Symfony\Component\Form\Renderer\RendererInterface;
+use Symfony\Component\Form\Renderer\FormRendererInterface;
 use Symfony\Component\Form\FormInterface;
 
-class CheckedPlugin implements RendererPluginInterface
+class CheckedPlugin implements FormRendererPluginInterface
 {
-    public function setUp(FormInterface $field, RendererInterface $renderer)
+    public function setUp(FormInterface $field, FormRendererInterface $renderer)
     {
         $renderer->setVar('checked', (bool)$field->getData());
     }

+ 3 - 3
src/Symfony/Component/Form/Renderer/Plugin/ChoicePlugin.php

@@ -12,10 +12,10 @@
 namespace Symfony\Component\Form\Renderer\Plugin;
 
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Renderer\RendererInterface;
+use Symfony\Component\Form\Renderer\FormRendererInterface;
 use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
 
-class ChoicePlugin implements RendererPluginInterface
+class ChoicePlugin implements FormRendererPluginInterface
 {
     private $choiceList;
 
@@ -24,7 +24,7 @@ class ChoicePlugin implements RendererPluginInterface
         $this->choiceList = $choiceList;
     }
 
-    public function setUp(FormInterface $field, RendererInterface $renderer)
+    public function setUp(FormInterface $field, FormRendererInterface $renderer)
     {
         $choiceList = $this->choiceList;
 

+ 3 - 3
src/Symfony/Component/Form/Renderer/Plugin/DatePatternPlugin.php

@@ -12,9 +12,9 @@
 namespace Symfony\Component\Form\Renderer\Plugin;
 
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Renderer\RendererInterface;
+use Symfony\Component\Form\Renderer\FormRendererInterface;
 
-class DatePatternPlugin implements RendererPluginInterface
+class DatePatternPlugin implements FormRendererPluginInterface
 {
     private $formatter;
 
@@ -23,7 +23,7 @@ class DatePatternPlugin implements RendererPluginInterface
         $this->formatter = $formatter;
     }
 
-    public function setUp(FormInterface $field, RendererInterface $renderer)
+    public function setUp(FormInterface $field, FormRendererInterface $renderer)
     {
         $renderer->setVar('date_pattern', $this->getPattern());
     }

+ 3 - 3
src/Symfony/Component/Form/Renderer/Plugin/EnctypePlugin.php

@@ -12,11 +12,11 @@
 namespace Symfony\Component\Form\Renderer\Plugin;
 
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Renderer\RendererInterface;
+use Symfony\Component\Form\Renderer\FormRendererInterface;
 
-class EnctypePlugin implements RendererPluginInterface
+class EnctypePlugin implements FormRendererPluginInterface
 {
-    public function setUp(FormInterface $field, RendererInterface $renderer)
+    public function setUp(FormInterface $field, FormRendererInterface $renderer)
     {
         $renderer->setVar('enctype', $field->isMultipart() ? 'enctype="multipart/form-data"' : '');
     }

+ 3 - 3
src/Symfony/Component/Form/Renderer/Plugin/FieldPlugin.php

@@ -11,10 +11,10 @@
 
 namespace Symfony\Component\Form\Renderer\Plugin;
 
-use Symfony\Component\Form\Renderer\RendererInterface;
+use Symfony\Component\Form\Renderer\FormRendererInterface;
 use Symfony\Component\Form\FormInterface;
 
-class FieldPlugin implements RendererPluginInterface
+class FieldPlugin implements FormRendererPluginInterface
 {
     /**
      * Renders the HTML enctype in the field tag, if necessary
@@ -25,7 +25,7 @@ class FieldPlugin implements RendererPluginInterface
      *
      * @param Form $field   The field for which to render the encoding type
      */
-    public function setUp(FormInterface $field, RendererInterface $renderer)
+    public function setUp(FormInterface $field, FormRendererInterface $renderer)
     {
         $fieldKey = $field->getName();
 

+ 3 - 3
src/Symfony/Component/Form/Renderer/Plugin/FormPlugin.php

@@ -12,12 +12,12 @@
 namespace Symfony\Component\Form\Renderer\Plugin;
 
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Renderer\RendererInterface;
+use Symfony\Component\Form\Renderer\FormRendererInterface;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
-class FormPlugin implements RendererPluginInterface
+class FormPlugin implements FormRendererPluginInterface
 {
-    public function setUp(FormInterface $form, RendererInterface $renderer)
+    public function setUp(FormInterface $form, FormRendererInterface $renderer)
     {
         if (!$form instanceof FormInterface) {
             throw new UnexpectedTypeException($form, 'Symfony\Component\Form\FormInterface');

+ 3 - 3
src/Symfony/Component/Form/Renderer/Plugin/RendererPluginInterface.php

@@ -12,9 +12,9 @@
 namespace Symfony\Component\Form\Renderer\Plugin;
 
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Renderer\RendererInterface;
+use Symfony\Component\Form\Renderer\FormRendererInterface;
 
-interface RendererPluginInterface
+interface FormRendererPluginInterface
 {
-    function setUp(FormInterface $field, RendererInterface $renderer);
+    function setUp(FormInterface $field, FormRendererInterface $renderer);
 }

+ 3 - 3
src/Symfony/Component/Form/Renderer/Plugin/MaxLengthPlugin.php

@@ -12,9 +12,9 @@
 namespace Symfony\Component\Form\Renderer\Plugin;
 
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Renderer\RendererInterface;
+use Symfony\Component\Form\Renderer\FormRendererInterface;
 
-class MaxLengthPlugin implements RendererPluginInterface
+class MaxLengthPlugin implements FormRendererPluginInterface
 {
     private $maxLength;
 
@@ -23,7 +23,7 @@ class MaxLengthPlugin implements RendererPluginInterface
         $this->maxLength = $maxLength;
     }
 
-    public function setUp(FormInterface $field, RendererInterface $renderer)
+    public function setUp(FormInterface $field, FormRendererInterface $renderer)
     {
         $renderer->setVar('max_length', $this->maxLength);
     }

+ 3 - 3
src/Symfony/Component/Form/Renderer/Plugin/MoneyPatternPlugin.php

@@ -12,9 +12,9 @@
 namespace Symfony\Component\Form\Renderer\Plugin;
 
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Renderer\RendererInterface;
+use Symfony\Component\Form\Renderer\FormRendererInterface;
 
-class MoneyPatternPlugin implements RendererPluginInterface
+class MoneyPatternPlugin implements FormRendererPluginInterface
 {
     private static $patterns = array();
 
@@ -25,7 +25,7 @@ class MoneyPatternPlugin implements RendererPluginInterface
         $this->currency = $currency;
     }
 
-    public function setUp(FormInterface $field, RendererInterface $renderer)
+    public function setUp(FormInterface $field, FormRendererInterface $renderer)
     {
         $renderer->setVar('money_pattern', self::getPattern($this->currency));
     }

+ 3 - 3
src/Symfony/Component/Form/Renderer/Plugin/ParentNamePlugin.php

@@ -12,11 +12,11 @@
 namespace Symfony\Component\Form\Renderer\Plugin;
 
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Renderer\RendererInterface;
+use Symfony\Component\Form\Renderer\FormRendererInterface;
 
-class ParentNamePlugin implements RendererPluginInterface
+class ParentNamePlugin implements FormRendererPluginInterface
 {
-    public function setUp(FormInterface $field, RendererInterface $renderer)
+    public function setUp(FormInterface $field, FormRendererInterface $renderer)
     {
         if ($field->hasParent()) {
             $parentRenderer = $field->getParent()->getRenderer();

+ 3 - 3
src/Symfony/Component/Form/Renderer/Plugin/PasswordValuePlugin.php

@@ -12,9 +12,9 @@
 namespace Symfony\Component\Form\Renderer\Plugin;
 
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Renderer\RendererInterface;
+use Symfony\Component\Form\Renderer\FormRendererInterface;
 
-class PasswordValuePlugin implements RendererPluginInterface
+class PasswordValuePlugin implements FormRendererPluginInterface
 {
     private $alwaysEmpty;
 
@@ -23,7 +23,7 @@ class PasswordValuePlugin implements RendererPluginInterface
         $this->alwaysEmpty = $alwaysEmpty;
     }
 
-    public function setUp(FormInterface $field, RendererInterface $renderer)
+    public function setUp(FormInterface $field, FormRendererInterface $renderer)
     {
         $value = $this->alwaysEmpty || !$field->isBound()
                 ? ''

+ 3 - 3
src/Symfony/Component/Form/Renderer/Plugin/SelectMultipleNamePlugin.php

@@ -12,11 +12,11 @@
 namespace Symfony\Component\Form\Renderer\Plugin;
 
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Renderer\RendererInterface;
+use Symfony\Component\Form\Renderer\FormRendererInterface;
 
-class SelectMultipleNamePlugin implements RendererPluginInterface
+class SelectMultipleNamePlugin implements FormRendererPluginInterface
 {
-    public function setUp(FormInterface $field, RendererInterface $renderer)
+    public function setUp(FormInterface $field, FormRendererInterface $renderer)
     {
         // Add "[]" to the name in case a select tag with multiple options is
         // displayed. Otherwise only one of the selected options is sent in the

+ 0 - 37
src/Symfony/Component/Form/Renderer/RendererInterface.php

@@ -1,37 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form\Renderer;
-
-interface RendererInterface
-{
-    function setChildren(array $renderers);
-
-    function setVar($name, $value);
-
-    function getVar($name);
-
-    function getWidget(array $vars = array());
-
-    function getErrors(array $vars = array());
-
-    function getRow(array $vars = array());
-
-    function getRest(array $vars = array());
-
-    /**
-     * Renders the label of the given field
-     *
-     * @param FormInterface $field  The field to render the label for
-     * @param array $params          Additional variables passed to the template
-     */
-    function getLabel($label = null, array $vars = array());
-}

+ 1 - 1
src/Symfony/Component/Form/Renderer/Theme/ThemeInterface.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Form\Renderer\Theme;
 
-interface ThemeInterface
+interface FormThemeInterface
 {
     function render($field, $section, array $parameters);
 }

+ 1 - 1
src/Symfony/Component/Form/Renderer/Theme/PhpTheme.php

@@ -19,7 +19,7 @@ namespace Symfony\Component\Form\Renderer\Theme;
  *
  * @author Benjamin Eberlei <kontakt@beberlei.de>
  */
-class PhpTheme implements ThemeInterface
+class PhpTheme implements FormThemeInterface
 {
     /**
      * Charset to be used with htmlentities.

+ 1 - 1
src/Symfony/Component/Form/Renderer/Theme/TwigTheme.php

@@ -15,7 +15,7 @@ use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\Exception\FormException;
 
-class TwigTheme implements ThemeInterface
+class TwigTheme implements FormThemeInterface
 {
     private $environment;
     private $templates;

+ 14 - 14
src/Symfony/Component/Form/Renderer/DefaultRenderer.php

@@ -12,12 +12,12 @@
 namespace Symfony\Component\Form\Renderer;
 
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Renderer\Theme\ThemeInterface;
-use Symfony\Component\Form\Renderer\Plugin\RendererPluginInterface;
+use Symfony\Component\Form\Renderer\Theme\FormThemeInterface;
+use Symfony\Component\Form\Renderer\Plugin\FormRendererPluginInterface;
 
-class DefaultRenderer implements RendererInterface, \ArrayAccess
+class ThemeRenderer implements FormRendererInterface, \ArrayAccess
 {
-    private $field;
+    private $form;
 
     private $template;
 
@@ -30,7 +30,7 @@ class DefaultRenderer implements RendererInterface, \ArrayAccess
     private $initialized = false;
 
     /**
-     * Is the field attached to this renderer rendered?
+     * Is the form attached to this renderer rendered?
      *
      * Rendering happens when either the widget or the row method was called.
      * Row implicitly includes widget, however certain rendering mechanisms
@@ -42,7 +42,7 @@ class DefaultRenderer implements RendererInterface, \ArrayAccess
 
     private $children = array();
 
-    public function __construct(ThemeInterface $theme, $template)
+    public function __construct(FormThemeInterface $theme, $template)
     {
         $this->theme = $theme;
         $this->template = $template;
@@ -65,8 +65,8 @@ class DefaultRenderer implements RendererInterface, \ArrayAccess
             // Make sure that plugins and set variables are applied in the
             // order they were added
             foreach ($this->changes as $key => $value) {
-                if ($value instanceof RendererPluginInterface) {
-                    $value->setUp($this->field, $this);
+                if ($value instanceof FormRendererPluginInterface) {
+                    $value->setUp($this->form, $this);
                 } else {
                     $this->vars[$key] = $value;
                 }
@@ -76,9 +76,9 @@ class DefaultRenderer implements RendererInterface, \ArrayAccess
         }
     }
 
-    public function setField(FormInterface $field)
+    public function setForm(FormInterface $form)
     {
-        $this->field = $field;
+        $this->form = $form;
     }
 
     public function setChildren(array $renderers)
@@ -86,7 +86,7 @@ class DefaultRenderer implements RendererInterface, \ArrayAccess
         $this->children = $renderers;
     }
 
-    public function setTheme(ThemeInterface $theme)
+    public function setTheme(FormThemeInterface $theme)
     {
         $this->theme = $theme;
     }
@@ -96,7 +96,7 @@ class DefaultRenderer implements RendererInterface, \ArrayAccess
         return $this->theme;
     }
 
-    public function addPlugin(RendererPluginInterface $plugin)
+    public function addPlugin(FormRendererPluginInterface $plugin)
     {
         $this->initialized = false;
         $this->changes[] = $plugin;
@@ -159,9 +159,9 @@ class DefaultRenderer implements RendererInterface, \ArrayAccess
     }
 
     /**
-     * Renders the label of the given field
+     * Renders the label of the given form
      *
-     * @param FormInterface $field  The field to render the label for
+     * @param FormInterface $form  The form to render the label for
      * @param array $params          Additional variables passed to the template
      */
     public function getLabel($label = null, array $vars = array())

+ 4 - 4
src/Symfony/Component/Form/Type/FieldType.php

@@ -13,8 +13,8 @@ namespace Symfony\Component\Form\Type;
 
 use Symfony\Component\Form\PropertyPath;
 use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\Form\Renderer\DefaultRenderer;
-use Symfony\Component\Form\Renderer\Theme\ThemeInterface;
+use Symfony\Component\Form\Renderer\ThemeRenderer;
+use Symfony\Component\Form\Renderer\Theme\FormThemeInterface;
 use Symfony\Component\Form\Renderer\Plugin\FieldPlugin;
 use Symfony\Component\Form\EventListener\TrimListener;
 use Symfony\Component\Form\EventListener\ValidationListener;
@@ -30,7 +30,7 @@ class FieldType extends AbstractType
 
     private $validator;
 
-    public function __construct(ThemeInterface $theme, ValidatorInterface $validator)
+    public function __construct(FormThemeInterface $theme, ValidatorInterface $validator)
     {
         $this->theme = $theme;
         $this->validator = $validator;
@@ -58,7 +58,7 @@ class FieldType extends AbstractType
             ->setAttribute('property_path', $options['property_path'])
             ->setAttribute('validation_groups', $options['validation_groups'])
             ->setData($options['data'])
-            ->setRenderer(new DefaultRenderer($this->theme, $options['template']))
+            ->setRenderer(new ThemeRenderer($this->theme, $options['template']))
             ->addRendererPlugin(new FieldPlugin())
             ->addValidator(new DefaultValidator())
             ->addValidator(new DelegatingValidator($this->validator));

+ 1 - 1
src/Symfony/Component/Form/Type/FormType.php

@@ -12,7 +12,7 @@
 namespace Symfony\Component\Form\Type;
 
 use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\Form\Renderer\Theme\ThemeInterface;
+use Symfony\Component\Form\Renderer\Theme\FormThemeInterface;
 use Symfony\Component\Form\CsrfProvider\CsrfProviderInterface;
 use Symfony\Component\Form\DataMapper\PropertyPathMapper;
 use Symfony\Component\Form\Renderer\Plugin\FormPlugin;

+ 2 - 2
src/Symfony/Component/Form/Type/Loader/DefaultTypeLoader.php

@@ -14,7 +14,7 @@ namespace Symfony\Component\Form\Type\Loader;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\Type;
 use Symfony\Component\Form\Type\FieldTypeInterface;
-use Symfony\Component\Form\Renderer\Theme\ThemeInterface;
+use Symfony\Component\Form\Renderer\Theme\FormThemeInterface;
 use Symfony\Component\Form\CsrfProvider\CsrfProviderInterface;
 use Symfony\Component\Validator\ValidatorInterface;
 use Symfony\Component\HttpFoundation\File\TemporaryStorage;
@@ -25,7 +25,7 @@ class DefaultTypeLoader implements TypeLoaderInterface
     private $types = array();
 
     public function initialize(FormFactoryInterface $factory,
-            ThemeInterface $theme, CsrfProviderInterface $csrfProvider,
+            FormThemeInterface $theme, CsrfProviderInterface $csrfProvider,
             ValidatorInterface $validator, TemporaryStorage $storage,
             EntityManager $em = null)
     {

+ 1 - 1
tests/Symfony/Tests/Component/Form/Type/TestCase.php

@@ -36,7 +36,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->theme = $this->getMock('Symfony\Component\Form\Renderer\Theme\ThemeInterface');
+        $this->theme = $this->getMock('Symfony\Component\Form\Renderer\Theme\FormThemeInterface');
         $this->csrfProvider = $this->getMock('Symfony\Component\Form\CsrfProvider\CsrfProviderInterface');
         $this->validator = $this->getMock('Symfony\Component\Validator\ValidatorInterface');
         $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');