moving XML projects and other projects into different dir/namespace

weaverryan · weaverryan · commit 069bd64e2402 · 2018-12-13T13:43:27.000-05:00
This avoids the metadata being cached in one test, then used in the
next. These tests are a bit of a mess, this is more of a workaround.
diff --git a/tests/Doctrine/EntityRegeneratorTest.php b/tests/Doctrine/EntityRegeneratorTest.php
@@ -35,7 +35,8 @@ public function testRegenerateEntities(string $expectedDirName, bool $overwrite)
             $kernel,
             'Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity',
             $expectedDirName,
-            $overwrite
+            $overwrite,
+            'current_project'
         );
     }
 
@@ -58,16 +59,17 @@ public function testXmlRegeneration()
         $this->doTestRegeneration(
             __DIR__.'/fixtures/xml_source_project',
             $kernel,
-            'Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity',
+            'Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity',
             'expected_xml',
-            false
+            false,
+            'current_project_xml'
         );
     }
 
-    private function doTestRegeneration(string $sourceDir, Kernel $kernel, string $namespace, string $expectedDirName, bool $overwrite)
+    private function doTestRegeneration(string $sourceDir, Kernel $kernel, string $namespace, string $expectedDirName, bool $overwrite, string $targetDirName)
     {
         $fs = new Filesystem();
-        $tmpDir = __DIR__.'/../tmp/current_project';
+        $tmpDir = __DIR__.'/../tmp/'.$targetDirName;
         $fs->remove($tmpDir);
 
         // if traits (Timestampable, Teamable) gets copied into new project, tests will fail because of double exclusion
@@ -79,8 +81,8 @@ private function doTestRegeneration(string $sourceDir, Kernel $kernel, string $n
         $autoloaderUtil = $this->createMock(AutoloaderUtil::class);
         $autoloaderUtil->expects($this->any())
             ->method('getPathForFutureClass')
-            ->willReturnCallback(function($className) use ($tmpDir) {
-                $shortClassName = str_replace('Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\\', '', $className);
+            ->willReturnCallback(function($className) use ($tmpDir, $targetDirName) {
+                $shortClassName = str_replace('Symfony\Bundle\MakerBundle\Tests\tmp\\'.$targetDirName.'\src\\', '', $className);
 
                 // strip the App\, change \ to / and add .php
                 return $tmpDir.'/src/'.str_replace('\\', '/', $shortClassName).'.php';
@@ -197,7 +199,7 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
                         'is_bundle' => false,
                         'type' => 'xml',
                         'dir' => '%kernel.root_dir%/config/doctrine',
-                        'prefix' => 'Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity',
+                        'prefix' => 'Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity',
                         'alias' => 'EntityRegeneratorApp',
                     ]
                 ]
@@ -207,7 +209,7 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
 
     public function getRootDir()
     {
-        return __DIR__.'/../tmp/current_project';
+        return __DIR__.'/../tmp/current_project_xml';
     }
 }
 
diff --git a/tests/Doctrine/fixtures/expected_xml/src/Entity/UserAvatar.php b/tests/Doctrine/fixtures/expected_xml/src/Entity/UserAvatar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity;
 
 class UserAvatar
 {
diff --git a/tests/Doctrine/fixtures/expected_xml/src/Entity/UserXml.php b/tests/Doctrine/fixtures/expected_xml/src/Entity/UserXml.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
diff --git a/tests/Doctrine/fixtures/expected_xml/src/Entity/XOther.php b/tests/Doctrine/fixtures/expected_xml/src/Entity/XOther.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity;
 
 class XOther
 {
diff --git a/tests/Doctrine/fixtures/expected_xml/src/Repository/UserRepository.php b/tests/Doctrine/fixtures/expected_xml/src/Repository/UserRepository.php
@@ -1,26 +1,26 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Repository;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Repository;
 
-use Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity\User;
+use Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity\UserXml;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Symfony\Bridge\Doctrine\RegistryInterface;
 
 /**
- * @method User|null find($id, $lockMode = null, $lockVersion = null)
- * @method User|null findOneBy(array $criteria, array $orderBy = null)
- * @method User[]    findAll()
- * @method User[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ * @method UserXml|null find($id, $lockMode = null, $lockVersion = null)
+ * @method UserXml|null findOneBy(array $criteria, array $orderBy = null)
+ * @method UserXml[]    findAll()
+ * @method UserXml[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
 class UserRepository extends ServiceEntityRepository
 {
     public function __construct(RegistryInterface $registry)
     {
-        parent::__construct($registry, User::class);
+        parent::__construct($registry, UserXml::class);
     }
 
     // /**
-    //  * @return User[] Returns an array of User objects
+    //  * @return UserXml[] Returns an array of UserXml objects
     //  */
     /*
     public function findByExampleField($value)
@@ -37,7 +37,7 @@ public function findByExampleField($value)
     */
 
     /*
-    public function findOneBySomeField($value): ?User
+    public function findOneBySomeField($value): ?UserXml
     {
         return $this->createQueryBuilder('u')
             ->andWhere('u.exampleField = :val')
diff --git a/tests/Doctrine/fixtures/expected_xml/src/Repository/XOtherRepository.php b/tests/Doctrine/fixtures/expected_xml/src/Repository/XOtherRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Repository;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Repository;
 
-use Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity\XOther;
+use Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity\XOther;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Symfony\Bridge\Doctrine\RegistryInterface;
 
diff --git a/tests/Doctrine/fixtures/xml_source_project/config/doctrine/UserAvatar.orm.xml b/tests/Doctrine/fixtures/xml_source_project/config/doctrine/UserAvatar.orm.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
         http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
-    <entity name="Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity\UserAvatar">
+    <entity name="Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity\UserAvatar">
         <id name="id" type="integer">
             <generator strategy="AUTO" />
         </id>
diff --git a/tests/Doctrine/fixtures/xml_source_project/config/doctrine/UserXml.orm.xml b/tests/Doctrine/fixtures/xml_source_project/config/doctrine/UserXml.orm.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
         http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
-    <entity name="Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity\UserXml" repository-class="Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Repository\UserRepository">
+    <entity name="Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity\UserXml" repository-class="Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Repository\UserRepository">
         <id name="id" type="integer">
             <generator strategy="AUTO" />
         </id>
diff --git a/tests/Doctrine/fixtures/xml_source_project/config/doctrine/XOther.orm.xml b/tests/Doctrine/fixtures/xml_source_project/config/doctrine/XOther.orm.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
         http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
-    <entity name="Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity\XOther" repository-class="Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Repository\XOtherRepository">
+    <entity name="Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity\XOther" repository-class="Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Repository\XOtherRepository">
         <id name="id" type="integer">
             <generator strategy="AUTO" />
         </id>
diff --git a/tests/Doctrine/fixtures/xml_source_project/src/Entity/UserXml.php b/tests/Doctrine/fixtures/xml_source_project/src/Entity/UserXml.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity;
 
 class UserXml
 {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;`
	`3`	`+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity;`
`4`	`4`
`5`	`5`	`class UserAvatar`
`6`	`6`	`{`