Moved PhpTheme to FrameworkBundle and renamed to PhpEngineTheme

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

@@ -9,11 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\Renderer\Theme;
+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\ThemeInterface;
 use Symfony\Component\Templating\PhpEngine;
 
 /**
@@ -23,7 +24,7 @@ use Symfony\Component\Templating\PhpEngine;
  *
  * @author Benjamin Eberlei <kontakt@beberlei.de>
  */
-class PhpTheme implements ThemeInterface
+class PhpEngineTheme implements ThemeInterface
 {
     /**
      * @var array

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

@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\Form;
 
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Bundle\FrameworkBundle\Form\PhpEngineTheme;
 use Symfony\Component\Form\Type\AbstractFieldType;
 use Symfony\Component\Form\FieldBuilder;
 use Symfony\Component\Form\CsrfProvider\DefaultCsrfProvider;
@@ -40,7 +41,7 @@ class PhpThemeFunctionalTest extends TestCase
                 )
             )
         ));
-        $this->theme = new \Symfony\Component\Form\Renderer\Theme\PhpTheme($this->engine);
+        $this->theme = new PhpEngineTheme($this->engine);
         $csrfProvider = new DefaultCsrfProvider('foo');
         $validator = $this->getMock('Symfony\Component\Validator\ValidatorInterface');
         $storage = new \Symfony\Component\HttpFoundation\File\TemporaryStorage('foo', 1, \sys_get_temp_dir());

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

@@ -12,6 +12,10 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\Form;
 
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Bundle\FrameworkBundle\Form\PhpEngineTheme;
+use Symfony\Component\Templating\TemplateNameParser;
+use Symfony\Component\Templating\Loader\FilesystemLoader;
+use Symfony\Component\Templating\PhpEngine;
 
 /**
  * Test theme template files shipped with framework bundle.
@@ -23,10 +27,10 @@ class PhpThemeTest extends TestCase
 
     public function setUp()
     {
-        $parser = new \Symfony\Component\Templating\TemplateNameParser();
-        $loader = new \Symfony\Component\Templating\Loader\FilesystemLoader(__DIR__ . '/../../Resources/views/Form/%name%');
-        $this->engine = new \Symfony\Component\Templating\PhpEngine($parser, $loader, array());
-        $this->theme = new \Symfony\Component\Form\Renderer\Theme\PhpTheme($this->engine);
+        $parser = new TemplateNameParser();
+        $loader = new FilesystemLoader(__DIR__ . '/../../Resources/views/Form/%name%');
+        $this->engine = new PhpEngine($parser, $loader, array());
+        $this->theme = new PhpEngineTheme($this->engine);
     }
 
     public function testTextWidgetDefault()