[Form] Simplified the interface names of the Renderer subnamespace

src/Symfony/Bundle/FrameworkBundle/Form/ContainerAwareRendererFactoryLoader.php

@@ -12,10 +12,10 @@
 namespace Symfony\Bundle\FrameworkBundle\Form;
 
 use Symfony\Component\Form\Exception\FormException;
-use Symfony\Component\Form\Renderer\Loader\FormRendererFactoryLoaderInterface;
+use Symfony\Component\Form\Renderer\Loader\RendererFactoryLoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
-class ContainerAwareRendererFactoryLoader implements FormRendererFactoryLoaderInterface
+class ContainerAwareRendererFactoryLoader implements RendererFactoryLoaderInterface
 {
     private $container;
 

src/Symfony/Bundle/FrameworkBundle/Form/PhpEngineTheme.php

@@ -12,7 +12,7 @@
 namespace Symfony\Bundle\FrameworkBundle\Form;
 
 use Symfony\Component\Form\Exception\FormException;
-use Symfony\Component\Form\Renderer\Theme\FormThemeInterface;
+use Symfony\Component\Form\Renderer\Theme\ThemeInterface;
 use Symfony\Component\Templating\PhpEngine;
 
 /**
@@ -22,7 +22,7 @@ use Symfony\Component\Templating\PhpEngine;
  *
  * @author Benjamin Eberlei <kontakt@beberlei.de>
  */
-class PhpEngineTheme implements FormThemeInterface
+class PhpEngineTheme implements ThemeInterface
 {
     /**
      * @var array

src/Symfony/Bundle/FrameworkBundle/Form/PhpEngineThemeFactory.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Form;
 
-use Symfony\Component\Form\Renderer\Theme\FormThemeFactoryInterface;
+use Symfony\Component\Form\Renderer\Theme\ThemeFactoryInterface;
 use Symfony\Component\Templating\PhpEngine;
 
 /**
@@ -19,7 +19,7 @@ use Symfony\Component\Templating\PhpEngine;
  *
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
-class PhpEngineThemeFactory implements FormThemeFactoryInterface
+class PhpEngineThemeFactory implements ThemeFactoryInterface
 {
     /**
      * @var PhpEngine
@@ -38,7 +38,7 @@ class PhpEngineThemeFactory implements FormThemeFactoryInterface
     }
 
     /**
-     * @see Symfony\Component\Form\Renderer\Theme\FormThemeFactoryInterface::create()
+     * @see Symfony\Component\Form\Renderer\Theme\ThemeFactoryInterface::create()
      */
     public function create($templateDir = null)
     {

src/Symfony/Component/Form/DefaultFormFactory.php

@@ -19,7 +19,7 @@ use Symfony\Component\Form\Type\FormTypeInterface;
 use Symfony\Component\Form\Type\AbstractFieldType;
 use Symfony\Component\Form\Type\Loader\TypeLoaderInterface;
 use Symfony\Component\Form\Type\Loader\DefaultTypeLoader;
-use Symfony\Component\Form\Renderer\Theme\FormThemeFactoryInterface;
+use Symfony\Component\Form\Renderer\Theme\ThemeFactoryInterface;
 use Symfony\Component\Form\Renderer\Theme\PhpThemeFactory;
 use Symfony\Component\Form\CsrfProvider\CsrfProviderInterface;
 use Symfony\Component\Form\CsrfProvider\DefaultCsrfProvider;
@@ -55,14 +55,14 @@ class DefaultFormFactory extends FormFactory
     /**
      * Factory method to simplify creation of a default form factory.
      *
-     * @param FormThemeFactoryInterface $themeFactory
+     * @param ThemeFactoryInterface $themeFactory
      * @param ValidatorInterface $validator
      * @param CsrfProviderInterface $crsfProvider
      * @param TemporaryStorage $tempStorage
      * @param \Doctrine\ORM\EntityManager $entityManager
      * @return DefaultFormFactory
      */
-    public static function createInstance(FormThemeFactoryInterface $themeFactory,
+    public static function createInstance(ThemeFactoryInterface $themeFactory,
             ValidatorInterface $validator,
             CsrfProviderInterface $crsfProvider,
             TemporaryStorage $tempStorage,

src/Symfony/Component/Form/Form.php

@@ -26,7 +26,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\FormRendererInterface;
+use Symfony\Component\Form\Renderer\ThemeRendererInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 

src/Symfony/Component/Form/FormFactory.php

@@ -17,7 +17,7 @@ use Symfony\Component\Form\Type\Guesser\TypeGuesserInterface;
 use Symfony\Component\Form\Type\Guesser\Guess;
 use Symfony\Component\Form\Exception\FormException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
-use Symfony\Component\Form\Renderer\Loader\FormRendererFactoryLoaderInterface;
+use Symfony\Component\Form\Renderer\Loader\RendererFactoryLoaderInterface;
 
 class FormFactory implements FormFactoryInterface
 {
@@ -27,7 +27,7 @@ class FormFactory implements FormFactoryInterface
 
     private $guessers = array();
 
-    public function __construct(TypeLoaderInterface $typeLoader, FormRendererFactoryLoaderInterface $rendererFactoryLoader, array $guessers = array())
+    public function __construct(TypeLoaderInterface $typeLoader, RendererFactoryLoaderInterface $rendererFactoryLoader, array $guessers = array())
     {
         foreach ($guessers as $guesser) {
             if (!$guesser instanceof TypeGuesserInterface) {

src/Symfony/Component/Form/Renderer/Loader/ArrayRendererFactoryLoader.php

@@ -13,17 +13,17 @@ namespace Symfony\Component\Form\Renderer\Loader;
 
 use Symfony\Component\Form\Exception\FormException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
-use Symfony\Component\Form\Renderer\FormRendererFactoryInterface;
+use Symfony\Component\Form\Renderer\RendererFactoryInterface;
 
-class ArrayRendererFactoryLoader implements FormRendererFactoryLoaderInterface
+class ArrayRendererFactoryLoader implements RendererFactoryLoaderInterface
 {
     private $factories;
 
     public function __construct(array $factories)
     {
         foreach ($factories as $factory) {
-            if (!$factory instanceof FormRendererFactoryInterface) {
-                throw new UnexpectedTypeException($factory, 'Symfony\Component\Form\Renderer\FormRendererFactoryInterface');
+            if (!$factory instanceof RendererFactoryInterface) {
+                throw new UnexpectedTypeException($factory, 'Symfony\Component\Form\Renderer\RendererFactoryInterface');
             }
         }
 

src/Symfony/Component/Form/Renderer/Loader/FormRendererFactoryLoaderInterface.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Form\Renderer\Loader;
 
-interface FormRendererFactoryLoaderInterface
+interface RendererFactoryLoaderInterface
 {
     function getRendererFactory($name);
 

src/Symfony/Component/Form/Renderer/FormRendererFactoryInterface.php

@@ -13,7 +13,7 @@ namespace Symfony\Component\Form\Renderer;
 
 use Symfony\Component\Form\FormInterface;
 
-interface FormRendererFactoryInterface
+interface RendererFactoryInterface
 {
     function create(FormInterface $form);
 }

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 FormThemeInterface
+class PhpTheme implements ThemeInterface
 {
     /**
      * Charset to be used with htmlentities.

src/Symfony/Component/Form/Renderer/Theme/PhpThemeFactory.php

@@ -18,7 +18,7 @@ use Symfony\Component\Form\Exception\FormException;
  *
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
-class PhpThemeFactory implements FormThemeFactoryInterface
+class PhpThemeFactory implements ThemeFactoryInterface
 {
     /**
      * @var string
@@ -31,7 +31,7 @@ class PhpThemeFactory implements FormThemeFactoryInterface
     }
 
     /**
-     * @see Symfony\Component\Form\Renderer\Theme\FormThemeFactoryInterface::create()
+     * @see Symfony\Component\Form\Renderer\Theme\ThemeFactoryInterface::create()
      */
     public function create($template = null)
     {

src/Symfony/Component/Form/Renderer/Theme/FormThemeFactoryInterface.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Form\Renderer\Theme;
 
-interface FormThemeFactoryInterface
+interface ThemeFactoryInterface
 {
     function create($template = null);
 }

src/Symfony/Component/Form/Renderer/Theme/FormThemeInterface.php

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

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 FormThemeInterface
+class TwigTheme implements ThemeInterface
 {
     private $environment;
     private $templates;

src/Symfony/Component/Form/Renderer/Theme/TwigThemeFactory.php

@@ -19,7 +19,7 @@ use Symfony\Component\Form\Exception\UnexpectedTypeException;
  *
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
-class TwigThemeFactory implements FormThemeFactoryInterface
+class TwigThemeFactory implements ThemeFactoryInterface
 {
     /**
      * @var Twig_Environment
@@ -46,7 +46,7 @@ class TwigThemeFactory implements FormThemeFactoryInterface
     }
 
     /**
-     * @see Symfony\Component\Form\Renderer\Theme\FormThemeFactoryInterface::create()
+     * @see Symfony\Component\Form\Renderer\Theme\ThemeFactoryInterface::create()
      */
     public function create($template = null)
     {

src/Symfony/Component/Form/Renderer/ThemeRenderer.php

@@ -12,10 +12,10 @@
 namespace Symfony\Component\Form\Renderer;
 
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Renderer\Theme\FormThemeInterface;
-use Symfony\Component\Form\Renderer\Theme\FormThemeFactoryInterface;
+use Symfony\Component\Form\Renderer\Theme\ThemeInterface;
+use Symfony\Component\Form\Renderer\Theme\ThemeFactoryInterface;
 
-class ThemeRenderer implements FormRendererInterface, \ArrayAccess, \IteratorAggregate
+class ThemeRenderer implements ThemeRendererInterface, \ArrayAccess, \IteratorAggregate
 {
     private $blockHistory = array();
 
@@ -40,7 +40,7 @@ class ThemeRenderer implements FormRendererInterface, \ArrayAccess, \IteratorAgg
 
     private $children = array();
 
-    public function __construct(FormThemeFactoryInterface $themeFactory)
+    public function __construct(ThemeFactoryInterface $themeFactory)
     {
         $this->themeFactory = $themeFactory;
     }
@@ -60,7 +60,7 @@ class ThemeRenderer implements FormRendererInterface, \ArrayAccess, \IteratorAgg
         $this->setTheme($this->themeFactory->create($template));
     }
 
-    public function setTheme(FormThemeInterface $theme)
+    public function setTheme(ThemeInterface $theme)
     {
         $this->theme = $theme;
     }

src/Symfony/Component/Form/Renderer/ThemeRendererFactory.php

@@ -14,15 +14,15 @@ namespace Symfony\Component\Form\Renderer;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\Exception\FormException;
 use Symfony\Component\Form\Renderer\ThemeRenderer;
-use Symfony\Component\Form\Renderer\Theme\FormThemeFactoryInterface;
+use Symfony\Component\Form\Renderer\Theme\ThemeFactoryInterface;
 
-class ThemeRendererFactory implements FormRendererFactoryInterface
+class ThemeRendererFactory implements RendererFactoryInterface
 {
     private $themeFactory;
 
     private $defaultTemplate;
 
-    public function __construct(FormThemeFactoryInterface $themeFactory, $defaultTemplate = null)
+    public function __construct(ThemeFactoryInterface $themeFactory, $defaultTemplate = null)
     {
         $this->themeFactory = $themeFactory;
         $this->defaultTemplate = $defaultTemplate;

src/Symfony/Component/Form/Renderer/FormRendererInterface.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Form\Renderer;
 
-interface FormRendererInterface
+interface ThemeRendererInterface
 {
     /**
      * Set a renderer variable that is used to render a relevant part of the attached field.

src/Symfony/Component/Form/Type/AbstractType.php

@@ -14,7 +14,7 @@ namespace Symfony\Component\Form\Type;
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Renderer\FormRendererInterface;
+use Symfony\Component\Form\Renderer\ThemeRendererInterface;
 
 abstract class AbstractType implements FormTypeInterface
 {
@@ -22,11 +22,11 @@ abstract class AbstractType implements FormTypeInterface
     {
     }
 
-    public function buildRenderer(FormRendererInterface $renderer, FormInterface $form)
+    public function buildRenderer(ThemeRendererInterface $renderer, FormInterface $form)
     {
     }
 
-    public function buildRendererBottomUp(FormRendererInterface $renderer, FormInterface $form)
+    public function buildRendererBottomUp(ThemeRendererInterface $renderer, FormInterface $form)
     {
     }
 

src/Symfony/Component/Form/Type/CheckboxType.php

@@ -14,7 +14,7 @@ namespace Symfony\Component\Form\Type;
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\DataTransformer\BooleanToStringTransformer;
-use Symfony\Component\Form\Renderer\FormRendererInterface;
+use Symfony\Component\Form\Renderer\ThemeRendererInterface;
 
 class CheckboxType extends AbstractType
 {
@@ -24,7 +24,7 @@ class CheckboxType extends AbstractType
             ->setAttribute('value', $options['value']);
     }
 
-    public function buildRenderer(FormRendererInterface $renderer, FormInterface $form)
+    public function buildRenderer(ThemeRendererInterface $renderer, FormInterface $form)
     {
         $renderer->setVar('value', $form->getAttribute('value'));
         $renderer->setVar('checked', (bool)$form->getData());

src/Symfony/Component/Form/Type/ChoiceType.php

@@ -15,7 +15,7 @@ use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\ChoiceList\DefaultChoiceList;
 use Symfony\Component\Form\EventListener\FixRadioInputListener;
-use Symfony\Component\Form\Renderer\FormRendererInterface;
+use Symfony\Component\Form\Renderer\ThemeRendererInterface;
 use Symfony\Component\Form\DataTransformer\ScalarToChoicesTransformer;
 use Symfony\Component\Form\DataTransformer\ArrayToChoicesTransformer;
 
@@ -52,7 +52,7 @@ class ChoiceType extends AbstractType
         }
     }
 
-    public function buildRenderer(FormRendererInterface $renderer, FormInterface $form)
+    public function buildRenderer(ThemeRendererInterface $renderer, FormInterface $form)
     {
         $choiceList = $form->getAttribute('choice_list');
 

src/Symfony/Component/Form/Type/DateType.php

@@ -15,7 +15,7 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\ChoiceList\PaddedChoiceList;
 use Symfony\Component\Form\ChoiceList\MonthChoiceList;
-use Symfony\Component\Form\Renderer\FormRendererInterface;
+use Symfony\Component\Form\Renderer\ThemeRendererInterface;
 use Symfony\Component\Form\DataTransformer\DateTimeToLocalizedStringTransformer;
 use Symfony\Component\Form\DataTransformer\DateTimeToArrayTransformer;
 use Symfony\Component\Form\DataTransformer\DateTimeToStringTransformer;
@@ -77,7 +77,7 @@ class DateType extends AbstractType
             ->setAttribute('widget', $options['widget']);
     }
 
-    public function buildRendererBottomUp(FormRendererInterface $renderer, FormInterface $form)
+    public function buildRendererBottomUp(ThemeRendererInterface $renderer, FormInterface $form)
     {
         $renderer->setVar('widget', $form->getAttribute('widget'));
 

src/Symfony/Component/Form/Type/FieldType.php

@@ -14,7 +14,7 @@ namespace Symfony\Component\Form\Type;
 use Symfony\Component\Form\Util\PropertyPath;
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Renderer\FormRendererInterface;
+use Symfony\Component\Form\Renderer\ThemeRendererInterface;
 use Symfony\Component\Form\EventListener\TrimListener;
 use Symfony\Component\Form\Validator\DefaultValidator;
 use Symfony\Component\Form\Validator\DelegatingValidator;
@@ -63,7 +63,7 @@ class FieldType extends AbstractType
         }
     }
 
-    public function buildRenderer(FormRendererInterface $renderer, FormInterface $form)
+    public function buildRenderer(ThemeRendererInterface $renderer, FormInterface $form)
     {
         if ($renderer->hasParent()) {
             $parentId = $renderer->getParent()->getVar('id');

src/Symfony/Component/Form/Type/FileType.php

@@ -19,7 +19,7 @@ use Symfony\Component\Form\DataTransformer\DataTransformerChain;
 use Symfony\Component\Form\DataTransformer\ReversedTransformer;
 use Symfony\Component\Form\DataTransformer\FileToStringTransformer;
 use Symfony\Component\Form\DataTransformer\FileToArrayTransformer;
-use Symfony\Component\Form\Renderer\FormRendererInterface;
+use Symfony\Component\Form\Renderer\ThemeRendererInterface;
 use Symfony\Component\HttpFoundation\File\TemporaryStorage;
 
 class FileType extends AbstractType
@@ -48,7 +48,7 @@ class FileType extends AbstractType
             ->add('name', 'hidden');
     }
 
-    public function buildRendererBottomUp(FormRendererInterface $renderer, FormInterface $form)
+    public function buildRendererBottomUp(ThemeRendererInterface $renderer, FormInterface $form)
     {
         $renderer->setVar('multipart', true);
         $renderer['file']->setVar('type', 'file');

src/Symfony/Component/Form/Type/FormType.php

@@ -13,7 +13,7 @@ namespace Symfony\Component\Form\Type;
 
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Renderer\FormRendererInterface;
+use Symfony\Component\Form\Renderer\ThemeRendererInterface;
 use Symfony\Component\Form\CsrfProvider\CsrfProviderInterface;
 use Symfony\Component\Form\DataMapper\PropertyPathMapper;
 use Symfony\Component\EventDispatcher\EventDispatcher;
@@ -36,7 +36,7 @@ class FormType extends AbstractType
         }
     }
 
-    public function buildRendererBottomUp(FormRendererInterface $renderer, FormInterface $form)
+    public function buildRendererBottomUp(ThemeRendererInterface $renderer, FormInterface $form)
     {
         $multipart = false;
 

src/Symfony/Component/Form/Type/FormTypeInterface.php

@@ -13,15 +13,15 @@ namespace Symfony\Component\Form\Type;
 
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Renderer\FormRendererInterface;
+use Symfony\Component\Form\Renderer\ThemeRendererInterface;
 
 interface FormTypeInterface
 {
     function buildForm(FormBuilder $builder, array $options);
 
-    function buildRenderer(FormRendererInterface $renderer, FormInterface $form);
+    function buildRenderer(ThemeRendererInterface $renderer, FormInterface $form);
 
-    function buildRendererBottomUp(FormRendererInterface $renderer, FormInterface $form);
+    function buildRendererBottomUp(ThemeRendererInterface $renderer, FormInterface $form);
 
     function createBuilder(array $options);
 

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\FormTypeInterface;
-use Symfony\Component\Form\Renderer\Theme\FormThemeFactoryInterface;
+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,7 +22,7 @@ use Symfony\Component\HttpFoundation\File\TemporaryStorage;
 class DefaultTypeLoader extends ArrayTypeLoader
 {
     public function __construct(
-            FormThemeFactoryInterface $themeFactory, $template = null, ValidatorInterface $validator = null,
+            ThemeFactoryInterface $themeFactory, $template = null, ValidatorInterface $validator = null,
             CsrfProviderInterface $csrfProvider = null, TemporaryStorage $storage = null)
     {
         $types = array(

src/Symfony/Component/Form/Type/MoneyType.php

@@ -14,7 +14,7 @@ namespace Symfony\Component\Form\Type;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\DataTransformer\MoneyToLocalizedStringTransformer;
-use Symfony\Component\Form\Renderer\FormRendererInterface;
+use Symfony\Component\Form\Renderer\ThemeRendererInterface;
 
 class MoneyType extends AbstractType
 {
@@ -26,7 +26,7 @@ class MoneyType extends AbstractType
             ->setAttribute('currency', $options['currency']);
     }
 
-    public function buildRenderer(FormRendererInterface $renderer, FormInterface $form)
+    public function buildRenderer(ThemeRendererInterface $renderer, FormInterface $form)
     {
         $renderer->setVar('money_pattern', self::getPattern($form->getAttribute('currency')));
     }

src/Symfony/Component/Form/Type/PasswordType.php

@@ -13,7 +13,7 @@ namespace Symfony\Component\Form\Type;
 
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\Form\Renderer\FormRendererInterface;
+use Symfony\Component\Form\Renderer\ThemeRendererInterface;
 
 class PasswordType extends AbstractType
 {
@@ -22,7 +22,7 @@ class PasswordType extends AbstractType
         $builder->setAttribute('always_empty', $options['always_empty']);
     }
 
-    public function buildRenderer(FormRendererInterface $renderer, FormInterface $form)
+    public function buildRenderer(ThemeRendererInterface $renderer, FormInterface $form)
     {
         if ($form->getAttribute('always_empty') || !$form->isBound()) {
             $renderer->setVar('value', '');

src/Symfony/Component/Form/Type/RadioType.php

@@ -14,7 +14,7 @@ namespace Symfony\Component\Form\Type;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\DataTransformer\BooleanToStringTransformer;
-use Symfony\Component\Form\Renderer\FormRendererInterface;
+use Symfony\Component\Form\Renderer\ThemeRendererInterface;
 
 class RadioType extends AbstractType
 {
@@ -24,7 +24,7 @@ class RadioType extends AbstractType
             ->setAttribute('value', $options['value']);
     }
 
-    public function buildRenderer(FormRendererInterface $renderer, FormInterface $form)
+    public function buildRenderer(ThemeRendererInterface $renderer, FormInterface $form)
     {
         $renderer->setVar('value', $form->getAttribute('value'));
         $renderer->setVar('checked', (bool)$form->getData());

src/Symfony/Component/Form/Type/TextType.php

@@ -13,7 +13,7 @@ namespace Symfony\Component\Form\Type;
 
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Renderer\FormRendererInterface;
+use Symfony\Component\Form\Renderer\ThemeRendererInterface;
 
 class TextType extends AbstractType
 {
@@ -22,7 +22,7 @@ class TextType extends AbstractType
         $builder->setAttribute('max_length', $options['max_length']);
     }
 
-    public function buildRenderer(FormRendererInterface $renderer, FormInterface $form)
+    public function buildRenderer(ThemeRendererInterface $renderer, FormInterface $form)
     {
         $renderer->setVar('max_length', $form->getAttribute('max_length'));
     }

src/Symfony/Component/Form/Type/TimeType.php

@@ -18,7 +18,7 @@ use Symfony\Component\Form\DataTransformer\ReversedTransformer;
 use Symfony\Component\Form\DataTransformer\DateTimeToStringTransformer;
 use Symfony\Component\Form\DataTransformer\DateTimeToTimestampTransformer;
 use Symfony\Component\Form\DataTransformer\DateTimeToArrayTransformer;
-use Symfony\Component\Form\Renderer\FormRendererInterface;
+use Symfony\Component\Form\Renderer\ThemeRendererInterface;
 
 class TimeType extends AbstractType
 {
@@ -71,7 +71,7 @@ class TimeType extends AbstractType
             ->setAttribute('with_seconds', $options['with_seconds']);
     }
 
-    public function buildRenderer(FormRendererInterface $renderer, FormInterface $form)
+    public function buildRenderer(ThemeRendererInterface $renderer, FormInterface $form)
     {
         $renderer->setVar('widget', $form->getAttribute('widget'));
         $renderer->setVar('with_seconds', $form->getAttribute('with_seconds'));

tests/Symfony/Tests/Component/Form/FormFactoryTest.php

@@ -27,7 +27,7 @@ class FormFactoryTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->typeLoader = $this->getMock('Symfony\Component\Form\Type\Loader\TypeLoaderInterface');
-        $this->rendererFactoryLoader = $this->getMock('Symfony\Component\Form\Renderer\Loader\FormRendererFactoryLoaderInterface');
+        $this->rendererFactoryLoader = $this->getMock('Symfony\Component\Form\Renderer\Loader\RendererFactoryLoaderInterface');
         $this->factory = new FormFactory($this->typeLoader, $this->rendererFactoryLoader);
     }
 

tests/Symfony/Tests/Component/Form/Renderer/Plugin/CheckedPluginTest.php

@@ -27,7 +27,7 @@ class CheckedPluginTest extends \PHPUnit_Framework_TestCase
               ->method('getData')
               ->will($this->returnValue(1));
 
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\ThemeRendererInterface');
         $renderer->expects($this->once())
                 ->method('setVar')
                 ->with($this->equalTo('checked'), $this->equalTo(true));
@@ -43,7 +43,7 @@ class CheckedPluginTest extends \PHPUnit_Framework_TestCase
               ->method('getData')
               ->will($this->returnValue(0));
 
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\ThemeRendererInterface');
         $renderer->expects($this->once())
                 ->method('setVar')
                 ->with($this->equalTo('checked'), $this->equalTo(false));

tests/Symfony/Tests/Component/Form/Renderer/Plugin/ChoicePluginTest.php

@@ -31,7 +31,7 @@ class ChoicePluginTest extends \PHPUnit_Framework_TestCase
               ->will($this->returnValue('somethingelse'));
 
         $form = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\ThemeRendererInterface');
 
         $renderer->expects($this->at(0))
                 ->method('setVar')

tests/Symfony/Tests/Component/Form/Renderer/Plugin/DatePatternPluginTest.php

@@ -26,7 +26,7 @@ class DatePatternPluginTest extends \PHPUnit_Framework_TestCase
         $intl = new \IntlDateFormatter("en_US" ,\IntlDateFormatter::SHORT, \IntlDateFormatter::NONE);
 
         $form = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\ThemeRendererInterface');
 
         $renderer->expects($this->once())
                 ->method('setVar')
@@ -42,7 +42,7 @@ class DatePatternPluginTest extends \PHPUnit_Framework_TestCase
 
         $form = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
 
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\ThemeRendererInterface');
 
         $renderer->expects($this->once())
                 ->method('setVar')
@@ -57,7 +57,7 @@ class DatePatternPluginTest extends \PHPUnit_Framework_TestCase
         $intl = new \IntlDateFormatter("de_DE" ,\IntlDateFormatter::SHORT, \IntlDateFormatter::NONE);
 
         $form = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\ThemeRendererInterface');
 
         $renderer->expects($this->once())
                 ->method('setVar')
@@ -72,7 +72,7 @@ class DatePatternPluginTest extends \PHPUnit_Framework_TestCase
         $intl = new \IntlDateFormatter("de_DE" ,\IntlDateFormatter::SHORT, \IntlDateFormatter::SHORT);
 
         $form = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\ThemeRendererInterface');
 
         $renderer->expects($this->once())
                 ->method('setVar')

tests/Symfony/Tests/Component/Form/Renderer/Plugin/FieldPluginTest.php

@@ -48,7 +48,7 @@ class FieldPluginTest extends \PHPUnit_Framework_TestCase
               ->will($this->returnValue(true));
 
 
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\ThemeRendererInterface');
 
         $renderer->expects($this->at(0))
                 ->method('setVar')

tests/Symfony/Tests/Component/Form/Renderer/Plugin/FormPluginTest.php

@@ -24,7 +24,7 @@ class FormPluginTest extends \PHPUnit_Framework_TestCase
     {
         $form = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
 
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\ThemeRendererInterface');
 
         $renderer->expects($this->at(0))
                 ->method('setVar')

tests/Symfony/Tests/Component/Form/Renderer/Plugin/MaxLengthPluginTest.php

@@ -23,7 +23,7 @@ class MaxLengthPluginTest extends \PHPUnit_Framework_TestCase
     public function testSetUp()
     {
         $form = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\ThemeRendererInterface');
         $renderer->expects($this->once())
                 ->method('setVar')
                 ->with($this->equalTo('max_length'), $this->equalTo(12));

tests/Symfony/Tests/Component/Form/Renderer/Plugin/MoneyPatternPluginTest.php

@@ -23,7 +23,7 @@ class MoneyPatternPluginTest extends \PHPUnit_Framework_TestCase
     public function testSetUpEur()
     {
         $form = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\ThemeRendererInterface');
         $renderer->expects($this->once())
                 ->method('setVar')
                 ->with($this->equalTo('money_pattern'), $this->equalTo('€ {{ widget }}'));

tests/Symfony/Tests/Component/Form/Renderer/Plugin/ParentNamePluginTest.php

@@ -22,7 +22,7 @@ class ParentNamePluginTest extends \PHPUnit_Framework_TestCase
 
     public function testSetUpHasParent()
     {
-        $parentRenderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
+        $parentRenderer = $this->getMock('Symfony\Component\Form\Renderer\ThemeRendererInterface');
         $parentRenderer->expects($this->once())
                 ->method('getVar')
                 ->will($this->returnValue("parentName"));
@@ -41,7 +41,7 @@ class ParentNamePluginTest extends \PHPUnit_Framework_TestCase
               ->method('hasParent')
               ->will($this->returnValue(true));
 
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\ThemeRendererInterface');
         $renderer->expects($this->once())
                 ->method('setVar')
                 ->with($this->equalTo('name'), $this->equalTo('parentName'));
@@ -60,7 +60,7 @@ class ParentNamePluginTest extends \PHPUnit_Framework_TestCase
               ->method('hasParent')
               ->will($this->returnValue(false));
 
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\ThemeRendererInterface');
         $renderer->expects($this->never())
                 ->method('setVar');
 

tests/Symfony/Tests/Component/Form/Renderer/Plugin/PasswordValuePluginTest.php

@@ -31,7 +31,7 @@ class PasswordValuePluginTest extends \PHPUnit_Framework_TestCase
               ->method('isBound')
               ->will($this->returnValue(true));
 
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\ThemeRendererInterface');
         $renderer->expects($this->once())
                 ->method('setVar')
                 ->with($this->equalTo('value'), $this->equalTo('pAs5w0rd'));
@@ -51,7 +51,7 @@ class PasswordValuePluginTest extends \PHPUnit_Framework_TestCase
               ->method('isBound')
               ->will($this->returnValue(false));
 
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\ThemeRendererInterface');
         $renderer->expects($this->once())
                 ->method('setVar')
                 ->with($this->equalTo('value'), $this->equalTo(''));

tests/Symfony/Tests/Component/Form/Renderer/Plugin/SelectMultipleNamePluginTest.php

@@ -23,7 +23,7 @@ class SelectMultipleNamePluginTest extends \PHPUnit_Framework_TestCase
     public function testSetUp()
     {
         $form = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\ThemeRendererInterface');
         $renderer->expects($this->once())
                 ->method('getVar')
                 ->with($this->equalTo('name'))

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

@@ -39,7 +39,7 @@ abstract class AbstractThemeFunctionalTest extends \PHPUnit_Framework_TestCase
         $template = $this->getTemplate();
         $csrfProvider = new DefaultCsrfProvider('foo');
         $validator = $this->getMock('Symfony\Component\Validator\ValidatorInterface');
-        $rendererFactoryLoader = $this->getMock('Symfony\Component\Form\Renderer\Loader\FormRendererFactoryLoaderInterface');
+        $rendererFactoryLoader = $this->getMock('Symfony\Component\Form\Renderer\Loader\RendererFactoryLoaderInterface');
         $storage = new \Symfony\Component\HttpFoundation\File\TemporaryStorage('foo', 1, \sys_get_temp_dir());
 
         // ok more than 2 lines, see DefaultFormFactory.php for proposed simplication

tests/Symfony/Tests/Component/Form/Renderer/ThemeRendererTest.php

@@ -17,7 +17,7 @@ class ThemeRendererTest extends \PHPUnit_Framework_TestCase
 {
     protected function createThemeFactory()
     {
-        return $this->getMock('Symfony\Component\Form\Renderer\Theme\FormThemeFactoryInterface');
+        return $this->getMock('Symfony\Component\Form\Renderer\Theme\ThemeFactoryInterface');
     }
 
     public function testArrayAccess()

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

@@ -39,14 +39,14 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->themeFactory = $this->getMock('Symfony\Component\Form\Renderer\Theme\FormThemeFactoryInterface');
+        $this->themeFactory = $this->getMock('Symfony\Component\Form\Renderer\Theme\ThemeFactoryInterface');
         $this->themeFactory->expects($this->any())
             ->method('create')
-            ->will($this->returnValue($this->getMock('Symfony\Component\Form\Renderer\Theme\FormThemeInterface')));
+            ->will($this->returnValue($this->getMock('Symfony\Component\Form\Renderer\Theme\ThemeInterface')));
         $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');
-        $this->rendererFactoryLoader = $this->getMock('Symfony\Component\Form\Renderer\Loader\FormRendererFactoryLoaderInterface');
+        $this->rendererFactoryLoader = $this->getMock('Symfony\Component\Form\Renderer\Loader\RendererFactoryLoaderInterface');
 
         $this->storage = $this->getMockBuilder('Symfony\Component\HttpFoundation\File\TemporaryStorage')
             ->disableOriginalConstructor()