[Form] Moved Doctrine2 specific files

symfony · Feb 1, 2011 · d152b5e · d152b5e
1 parent 3bf9f77
commit d152b5e
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 26 deletions.
diff --git a/.../Extension/Doctrine/EntityChoiceField.php → ...fony/Component/Form/EntityChoiceField.php b/.../Extension/Doctrine/EntityChoiceField.php → ...fony/Component/Form/EntityChoiceField.php
@@ -9,10 +9,8 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\Extension\Doctrine;
+namespace Symfony\Component\Form;
 
-use Symfony\Component\Form\ChoiceField;
-use Symfony\Component\Form\PropertyPath;
 use Symfony\Component\Form\ValueTransformer\TransformationFailedException;
 use Symfony\Component\Form\Exception\FormException;
 use Symfony\Component\Form\Exception\InvalidOptionsException;

diff --git a/...on/Doctrine/EntityFieldFactoryGuesser.php → ...ieldFactory/EntityFieldFactoryGuesser.php b/...on/Doctrine/EntityFieldFactoryGuesser.php → ...ieldFactory/EntityFieldFactoryGuesser.php
@@ -9,11 +9,8 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\Extension\Doctrine;
+namespace Symfony\Component\Form\FieldFactory;
 
-use Symfony\Component\Form\FieldFactory\FieldFactoryGuesserInterface;
-use Symfony\Component\Form\FieldFactory\FieldFactoryGuess;
-use Symfony\Component\Form\FieldFactory\FieldFactoryClassGuess;
 use Doctrine\ORM\EntityManager;
 
 /**

diff --git a/...octrine/CollectionToStringTransformer.php → ...sformer/CollectionToStringTransformer.php b/...octrine/CollectionToStringTransformer.php → ...sformer/CollectionToStringTransformer.php
@@ -9,10 +9,8 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\Extension\Doctrine;
+namespace Symfony\Component\Form\ValueTransformer;
 
-use Symfony\Component\Form\ValueTransformer\BaseValueTransformer;
-use Symfony\Component\Form\ValueTransformer\TransformationFailedException;
 use Doctrine\Common\Collections\Collection;
 
 /**

diff --git a/...nent/Form/Extension/Doctrine/TestCase.php → ...ts/Component/Form/DoctrineOrmTestCase.php b/...nent/Form/Extension/Doctrine/TestCase.php → ...ts/Component/Form/DoctrineOrmTestCase.php
@@ -9,15 +9,15 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form\Extension\Doctrine;
+namespace Symfony\Tests\Component\Form;
 
 use Doctrine\ORM\EntityManager;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Bundle\DoctrineBundle\DependencyInjection\DoctrineExtension;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 
-class TestCase extends \PHPUnit_Framework_TestCase
+class DoctrineOrmTestCase extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {

diff --git a/...ension/Doctrine/EntityChoiceFieldTest.php → .../Component/Form/EntityChoiceFieldTest.php b/...ension/Doctrine/EntityChoiceFieldTest.php → .../Component/Form/EntityChoiceFieldTest.php
@@ -9,24 +9,24 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form\Extension\Doctrine;
+namespace Symfony\Tests\Component\Form;
 
-require_once __DIR__.'/TestCase.php';
+require_once __DIR__.'/DoctrineOrmTestCase.php';
 require_once __DIR__.'/Fixtures/SingleIdentEntity.php';
 require_once __DIR__.'/Fixtures/CompositeIdentEntity.php';
 
-use Symfony\Component\Form\Extension\Doctrine\EntityChoiceField;
+use Symfony\Component\Form\EntityChoiceField;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
-use Symfony\Tests\Component\Form\Extension\Doctrine\Fixtures\SingleIdentEntity;
-use Symfony\Tests\Component\Form\Extension\Doctrine\Fixtures\CompositeIdentEntity;
+use Symfony\Tests\Component\Form\Fixtures\SingleIdentEntity;
+use Symfony\Tests\Component\Form\Fixtures\CompositeIdentEntity;
 use Doctrine\ORM\Tools\SchemaTool;
 use Doctrine\Common\Collections\ArrayCollection;
 
-class EntityChoiceFieldTest extends TestCase
+class EntityChoiceFieldTest extends DoctrineOrmTestCase
 {
-    const SINGLE_IDENT_CLASS = 'Symfony\Tests\Component\Form\Extension\Doctrine\Fixtures\SingleIdentEntity';
+    const SINGLE_IDENT_CLASS = 'Symfony\Tests\Component\Form\Fixtures\SingleIdentEntity';
 
-    const COMPOSITE_IDENT_CLASS = 'Symfony\Tests\Component\Form\Extension\Doctrine\Fixtures\CompositeIdentEntity';
+    const COMPOSITE_IDENT_CLASS = 'Symfony\Tests\Component\Form\Fixtures\CompositeIdentEntity';
 
     /**
      * @var EntityManager

diff --git a/...octrine/Fixtures/CompositeIdentEntity.php → ...nt/Form/Fixtures/CompositeIdentEntity.php b/...octrine/Fixtures/CompositeIdentEntity.php → ...nt/Form/Fixtures/CompositeIdentEntity.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Tests\Component\Form\Extension\Doctrine\Fixtures;
+namespace Symfony\Tests\Component\Form\Fixtures;
 
 /** @Entity */
 class CompositeIdentEntity

diff --git a/...n/Doctrine/Fixtures/SingleIdentEntity.php → ...onent/Form/Fixtures/SingleIdentEntity.php b/...n/Doctrine/Fixtures/SingleIdentEntity.php → ...onent/Form/Fixtures/SingleIdentEntity.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Tests\Component\Form\Extension\Doctrine\Fixtures;
+namespace Symfony\Tests\Component\Form\Fixtures;
 
 /** @Entity */
 class SingleIdentEntity

diff --git a/...ine/CollectionToStringTransformerTest.php → ...mer/CollectionToStringTransformerTest.php b/...ine/CollectionToStringTransformerTest.php → ...mer/CollectionToStringTransformerTest.php
@@ -9,15 +9,16 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form\Extension\Doctrine;
+namespace Symfony\Tests\Component\Form\ValueTransformer;
 
-require_once __DIR__.'/TestCase.php';
+require_once __DIR__.'/../DoctrineOrmTestCase.php';
 
-use Symfony\Component\Form\Extension\Doctrine\CollectionToStringTransformer;
+use Symfony\Tests\Component\Form\DoctrineOrmTestCase;
+use Symfony\Component\Form\ValueTransformer\CollectionToStringTransformer;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Tools\SchemaTool;
 
-class CollectionToStringTransformerTest extends TestCase
+class CollectionToStringTransformerTest extends DoctrineOrmTestCase
 {
     /**
      * @var EntityManager