Revert "[Form] Changed naming of Themes to ThemeEngines. Theme templates are now 'themes'"

This reverts commit 1efd680b68e7b49baa743bef27893df1c42a3b14.

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -408,20 +408,10 @@ class FrameworkExtension extends Extension
             $container->setAlias('templating', 'templating.engine.delegating');
         }
 
-        // Use the plain PHP engine as default theming engine for Forms
-        $container->setAlias('form.theme.engine', 'form.theme.engine.php');
-
-        // Use the first engine that we find as Form theme engine
+        $container->setAlias('form.theme', 'form.theme.default');
         foreach ($config['engines'] as $engine) {
-            if ($container->hasDefinition('form.theme.engine.templating.' . $engine)) {
-                $container->setAlias('form.theme.engine', 'form.theme.engine.templating.' . $engine);
-                break;
-            }
-
-            // Twig is supported seperately from Templating
-            if ($engine === 'twig') {
-                $container->setAlias('form.theme.engine', 'form.theme.engine.twig');
-                break;
+            if ($container->hasDefinition('form.theme.' . $engine)) {
+                $container->setAlias('form.theme', 'form.theme.' . $engine);
             }
         }
     }

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

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

src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml

@@ -11,10 +11,10 @@
         <parameter key="form.type.loader.tagged.class">Symfony\Bundle\FrameworkBundle\Form\ContainerAwareTypeLoader</parameter>
         <parameter key="form.guesser.validator.class">Symfony\Component\Form\Type\Guesser\ValidatorTypeGuesser</parameter>
         <parameter key="form.csrf_provider.class">Symfony\Component\Form\CsrfProvider\SessionCsrfProvider</parameter>
-        <parameter key="form.theme.engine.twig.class">Symfony\Component\Form\Renderer\Theme\TwigThemeEngine</parameter>
-        <parameter key="form.theme.engine.php.class">Symfony\Component\Form\Renderer\Theme\PhpThemeEngine</parameter>
-        <parameter key="form.theme.engine.templating.php.class">Symfony\Bundle\FrameworkBundle\Form\PhpTemplatingThemeEngine</parameter>
-        <parameter key="form.theme">TwigBundle::div_layout.html.twig</parameter>
+        <parameter key="form.theme.twig.class">Symfony\Component\Form\Renderer\Theme\TwigTheme</parameter>
+        <parameter key="form.theme.php.class">Symfony\Component\Form\Renderer\Theme\PhpTheme</parameter>
+        <parameter key="form.theme.phpengine.class">Symfony\Bundle\FrameworkBundle\Form\PhpEngineTheme</parameter>
+        <parameter key="form.theme.template">TwigBundle::div_layout.html.twig</parameter>
         <parameter key="form.factory.class">Symfony\Component\Form\FormFactory</parameter>
         <parameter key="form.csrf_protection.enabled">true</parameter>
         <parameter key="form.csrf_protection.field_name">_token</parameter>
@@ -46,18 +46,18 @@
         </service>
         
         <!-- Themes -->
-        <service id="form.theme.engine.twig" class="%form.theme.engine.twig.class%">
+        <service id="form.theme.twig" class="%form.theme.twig.class%">
             <argument type="service" id="twig" />
-            <argument>%form.theme%</argument>
+            <argument>%form.theme.template%</argument>
         </service>
 
-        <service id="form.theme.engine.php" class="%form.theme.engine.php.class%">
+        <service id="form.theme.default" class="%form.theme.php.class%">
             <argument>%kernel.charset%</argument>
         </service>
 
-        <service id="form.theme.engine.templating.php" class="%form.theme.engine.templating.php.class%">
+        <service id="form.theme.php" class="%form.theme.phpengine.class%">
             <argument type="service" id="templating.engine.php" />
-            <argument>%form.theme%</argument>
+            <argument>%form.theme.template%</argument>
         </service>
         
         <!-- TemporaryStorage - where should we put this? -->
@@ -95,7 +95,7 @@
         <!-- FieldTypes -->
         <service id="form.type.field" class="Symfony\Component\Form\Type\FieldType">
             <tag name="form.type" alias="field" />
-            <argument type="service" id="form.theme.engine" />
+            <argument type="service" id="form.theme" />
             <argument type="service" id="validator" />
         </service>
         <service id="form.type.form" class="Symfony\Component\Form\Type\FormType">

src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/collection_row.html.php

@@ -1 +1 @@
-<?php echo $renderer->getEngine()->render('form', 'widget', $renderer->getVars()); ?>
+<?php echo $renderer->getTheme()->render('form', 'widget', $renderer->getVars()); ?>

src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/integer_widget.html.php

@@ -1 +1 @@
-<?php echo $renderer->getEngine()->render('number', 'widget', $renderer->getVars()); ?>
+<?php echo $renderer->getTheme()->render('number', 'widget', $renderer->getVars()); ?>

src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_widget.html.php

@@ -1,4 +1,4 @@
 <?php echo str_replace('{{ widget }}',
-    $renderer->getEngine()->render('number', 'widget', $renderer->getVars()),
+    $renderer->getTheme()->render('number', 'widget', $renderer->getVars()),
     $money_pattern
 ) ?>

src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_widget.html.php

@@ -1 +1 @@
-<?php echo $renderer->getEngine()->render('number', 'widget', $renderer->getVars()) ?> %
+<?php echo $renderer->getTheme()->render('number', 'widget', $renderer->getVars()) ?> %

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -61,8 +61,8 @@ abstract class FrameworkExtensionTest extends TestCase
     {
         $container = $this->createContainerFromFile('full');
 
-        $this->assertTrue($container->hasAlias('form.theme.engine'), '->registerTemplatingConfiguration() aliases a form.theme.engine service.');
-        $this->assertEquals('form.theme.engine.templating.php', (string)$container->getAlias('form.theme.engine'));
+        $this->assertTrue($container->hasAlias('form.theme'), '->registerTemplatingConfiguration() aliases a form.theme service.');
+        $this->assertEquals('form.theme.twig', (string)$container->getAlias('form.theme'));
     }
 
     /**

src/Symfony/Bundle/FrameworkBundle/Tests/Form/PhpTemplatingThemeEngineFunctionalTest.php

@@ -12,20 +12,20 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\Form;
 
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
-use Symfony\Bundle\FrameworkBundle\Form\PhpTemplatingThemeEngine;
+use Symfony\Bundle\FrameworkBundle\Form\PhpEngineTheme;
 use Symfony\Component\Form\Type\AbstractFieldType;
 use Symfony\Component\Form\FieldBuilder;
 use Symfony\Component\Form\CsrfProvider\DefaultCsrfProvider;
 use Symfony\Component\Form\Type\Loader\DefaultTypeLoader;
 use Symfony\Component\Form\FormFactory;
-use Symfony\Tests\Component\Form\Renderer\Theme\AbstractThemeEngineFunctionalTest;
+use Symfony\Tests\Component\Form\Renderer\Theme\AbstractThemeFunctionalTest;
 
 /**
  * Test theme template files shipped with framework bundle.
  */
-class PhpTemplatingThemeEngineFunctionalTest extends AbstractThemeEngineFunctionalTest
+class PhpEngineThemeFunctionalTest extends AbstractThemeFunctionalTest
 {
-    protected function createEngine()
+    protected function createTheme()
     {
         $parser = new \Symfony\Component\Templating\TemplateNameParser();
         $loader = new \Symfony\Component\Templating\Loader\FilesystemLoader(__DIR__ . '/../../Resources/views/Form/%name%');
@@ -37,6 +37,6 @@ class PhpTemplatingThemeEngineFunctionalTest extends AbstractThemeEngineFunction
                 )
             )
         ));
-        return new PhpTemplatingThemeEngine($engine);
+        return new PhpEngineTheme($engine);
     }
 }

src/Symfony/Bundle/FrameworkBundle/Tests/Form/PhpTemplatingThemeEngineTest.php

@@ -12,19 +12,19 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\Form;
 
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
-use Symfony\Bundle\FrameworkBundle\Form\PhpTemplatingThemeEngine;
+use Symfony\Bundle\FrameworkBundle\Form\PhpEngineTheme;
 use Symfony\Component\Templating\TemplateNameParser;
 use Symfony\Component\Templating\Loader\FilesystemLoader;
 use Symfony\Component\Templating\PhpEngine;
-use Symfony\Tests\Component\Form\Renderer\Theme\AbstractThemeEngineTest;
+use Symfony\Tests\Component\Form\Renderer\Theme\AbstractThemeTest;
 
-class PhpTemplatingThemeEngineTest extends AbstractThemeEngineTest
+class PhpEngineThemeTest extends AbstractThemeTest
 {
-    protected function createEngine()
+    protected function createTheme()
     {
         $parser = new TemplateNameParser();
         $loader = new FilesystemLoader(__DIR__ . '/../../Resources/views/Form/%name%');
         $engine = new PhpEngine($parser, $loader, array());
-        return new PhpTemplatingThemeEngine($engine);
+        return new PhpEngineTheme($engine);
     }
 }

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\FormTypeInterface;
-use Symfony\Component\Form\Renderer\Theme\FormThemeEngineInterface;
+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;
@@ -47,21 +47,21 @@ class DefaultFormFactory extends FormFactory
     {
         $csrfProvider = new DefaultCsrfProvider($csrfSecret);
         $tempStorage = new TemporaryStorage($storageSecret);
-        $defaultTheme = new PhpThemeEngine($charset);
+        $defaultTheme = new PhpTheme($charset);
         return self::createInstance($defaultTheme, $validator, $csrfProvider, $tempStorage, $entityManager);
     }
 
     /**
      * Factory method to simplify creation of a default form factory.
      * 
-     * @param FormThemeEngineInterface $theme
+     * @param FormThemeInterface $theme
      * @param ValidatorInterface $validator
      * @param CsrfProviderInterface $crsfProvider
      * @param TemporaryStorage $tempStorage
      * @param \Doctrine\ORM\EntityManager $entityManager
      * @return DefaultFormFactory
      */
-    public static function createInstance(FormThemeEngineInterface $theme,
+    public static function createInstance(FormThemeInterface $theme,
             ValidatorInterface $validator,
             CsrfProviderInterface $crsfProvider,
             TemporaryStorage $tempStorage,

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

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

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

@@ -19,7 +19,7 @@ namespace Symfony\Component\Form\Renderer\Theme;
  *
  * @author Benjamin Eberlei <kontakt@beberlei.de>
  */
-class PhpThemeEngine implements FormThemeEngineInterface
+class PhpTheme implements FormThemeInterface
 {
     /**
      * Charset to be used with htmlentities.
@@ -40,7 +40,7 @@ class PhpThemeEngine implements FormThemeEngineInterface
         } else if (method_exists($this, $section)) {
             $method = $section;
         } else {
-            throw new \BadMethodCallException("PhpThemeEngine does not support to render the form block method '" . $method . "'.");
+            throw new \BadMethodCallException("PhpTheme does not support to render the form block method '" . $method . "'.");
         }
 
         return $this->$method($parameters);

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

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

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

@@ -12,7 +12,7 @@
 namespace Symfony\Component\Form\Renderer;
 
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Renderer\Theme\FormThemeEngineInterface;
+use Symfony\Component\Form\Renderer\Theme\FormThemeInterface;
 use Symfony\Component\Form\Renderer\Plugin\FormRendererPluginInterface;
 
 class ThemeRenderer implements FormRendererInterface, \ArrayAccess
@@ -21,7 +21,7 @@ class ThemeRenderer implements FormRendererInterface, \ArrayAccess
 
     private $template;
 
-    private $engine;
+    private $theme;
 
     private $vars = array();
 
@@ -42,9 +42,9 @@ class ThemeRenderer implements FormRendererInterface, \ArrayAccess
 
     private $children = array();
 
-    public function __construct(FormThemeEngineInterface $engine, $template)
+    public function __construct(FormThemeInterface $theme, $template)
     {
-        $this->engine = $engine;
+        $this->theme = $theme;
         $this->template = $template;
     }
 
@@ -86,14 +86,14 @@ class ThemeRenderer implements FormRendererInterface, \ArrayAccess
         $this->children = $renderers;
     }
 
-    public function setEngine(FormThemeEngineInterface $engine)
+    public function setTheme(FormThemeInterface $theme)
     {
-        $this->engine = $engine;
+        $this->theme = $theme;
     }
 
-    public function getEngine()
+    public function getTheme()
     {
-        return $this->engine;
+        return $this->theme;
     }
 
     public function addPlugin(FormRendererPluginInterface $plugin)
@@ -182,7 +182,7 @@ class ThemeRenderer implements FormRendererInterface, \ArrayAccess
     {
         $this->initialize();
 
-        return $this->engine->render($this->template, $block, array_replace(
+        return $this->theme->render($this->template, $block, array_replace(
             $this->vars,
             $vars
         ));

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

@@ -14,7 +14,7 @@ namespace Symfony\Component\Form\Type;
 use Symfony\Component\Form\PropertyPath;
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\Renderer\ThemeRenderer;
-use Symfony\Component\Form\Renderer\Theme\FormThemeEngineInterface;
+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(FormThemeEngineInterface $theme, ValidatorInterface $validator)
+    public function __construct(FormThemeInterface $theme, ValidatorInterface $validator)
     {
         $this->theme = $theme;
         $this->validator = $validator;

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\FormThemeEngineInterface;
+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;

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\FormThemeEngineInterface;
+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,
-            FormThemeEngineInterface $theme, CsrfProviderInterface $csrfProvider,
+            FormThemeInterface $theme, CsrfProviderInterface $csrfProvider,
             ValidatorInterface $validator, TemporaryStorage $storage,
             EntityManager $em = null)
     {

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

@@ -20,16 +20,16 @@ use Symfony\Component\Form\FormFactory;
 /**
  * Test theme template files shipped with framework bundle.
  */
-abstract class AbstractThemeEngineFunctionalTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractThemeFunctionalTest extends \PHPUnit_Framework_TestCase
 {
     /** @var FormFactory */
     private $factory;
 
-    abstract protected function createEngine();
+    abstract protected function createTheme();
 
     public function setUp()
     {
-        $theme = $this->createEngine();
+        $theme = $this->createTheme();
         $csrfProvider = new DefaultCsrfProvider('foo');
         $validator = $this->getMock('Symfony\Component\Validator\ValidatorInterface');
         $storage = new \Symfony\Component\HttpFoundation\File\TemporaryStorage('foo', 1, \sys_get_temp_dir());

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

@@ -11,18 +11,18 @@
 
 namespace Symfony\Tests\Component\Form\Renderer\Theme;
 
-use Symfony\Component\Form\Renderer\Theme\PhpThemeEngine;
+use Symfony\Component\Form\Renderer\Theme\PhpTheme;
 
-abstract class AbstractThemeEngineTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractThemeTest extends \PHPUnit_Framework_TestCase
 {
     private $theme;
 
     public function setUp()
     {
-        $this->theme = $this->createEngine();
+        $this->theme = $this->createTheme();
     }
 
-    abstract protected function createEngine();
+    abstract protected function createTheme();
 
     public function testTextWidgetDefault()
     {

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

@@ -11,15 +11,15 @@
 
 namespace Symfony\Tests\Component\Form\Renderer\Theme;
 
-use Symfony\Component\Form\Renderer\Theme\PhpThemeEngine;
+use Symfony\Component\Form\Renderer\Theme\PhpTheme;
 
 /**
  * Test theme template files shipped with framework bundle.
  */
-class PhpThemeEngineFunctionalTest extends AbstractThemeEngineFunctionalTest
+class PhpThemeFunctionalTest extends AbstractThemeFunctionalTest
 {
-    protected function createEngine()
+    protected function createTheme()
     {
-        return new PhpThemeEngine();
+        return new PhpTheme();
     }
 }

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

@@ -11,12 +11,12 @@
 
 namespace Symfony\Tests\Component\Form\Renderer\Theme;
 
-use Symfony\Component\Form\Renderer\Theme\PhpThemeEngine;
+use Symfony\Component\Form\Renderer\Theme\PhpTheme;
 
-class PhpThemeEngineTest extends AbstractThemeEngineTest
+class PhpThemeTest extends AbstractThemeTest
 {
-    protected function createEngine()
+    protected function createTheme()
     {
-        return new PhpThemeEngine();
+        return new PhpTheme();
     }
 }

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\FormThemeEngineInterface');
+        $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');