updating namespace so the autoloader finds things in the correct, final

weaverryan · weaverryan · commit 389e07a7f34c · 2018-12-12T23:39:08.000-05:00
location
diff --git a/.travis.yml b/.travis.yml
@@ -27,8 +27,7 @@ before_install:
 install:
     - composer update --no-suggest
     - ./vendor/bin/simple-phpunit install
-    - cp tmp/AnnotationDriver.php vendor/doctrine/persistence/lib/Doctrine/Common/Persistence/Mapping/Driver/AnnotationDriver.php
 
 script:
-    - ./vendor/bin/simple-phpunit --verbose --debug --stop-on-error
+    - ./vendor/bin/simple-phpunit
     - ./vendor/bin/php-cs-fixer fix --dry-run --diff
diff --git a/tests/Doctrine/EntityRegeneratorTest.php b/tests/Doctrine/EntityRegeneratorTest.php
@@ -33,15 +33,15 @@ public function testRegenerateEntities(string $expectedDirName, bool $overwrite)
         $this->doTestRegeneration(
             __DIR__.'/fixtures/source_project',
             $kernel,
-            'Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity',
+            'Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity',
             $expectedDirName,
             $overwrite
         );
     }
 
     public function getRegenerateEntitiesTests()
     {
-        yield 'regnerate_no_overwrite' => [
+        yield 'regenerate_no_overwrite' => [
             'expected_no_overwrite',
             false
         ];
@@ -152,7 +152,7 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
                         'is_bundle' => false,
                         'type' => 'annotation',
                         'dir' => '%kernel.root_dir%/src/Entity',
-                        'prefix' => 'Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity',
+                        'prefix' => 'Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity',
                         'alias' => 'EntityRegeneratorApp',
                     ]
                 ]
@@ -214,6 +214,6 @@ public function getRootDir()
 class AllButTraitsIterator extends \RecursiveFilterIterator
 {
     public function accept() {
-        return !in_array($this->current()->getFilename(), ['TeamTrait.php', 'TimestampableTrait.php']);
+        return !in_array($this->current()->getFilename(), []);
     }
 }
diff --git a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/BaseClient.php b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/BaseClient.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/Client.php b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/Client.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
diff --git a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/Embed.php b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/Embed.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/Tag.php b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/Tag.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/User.php b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
diff --git a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/UserAvatar.php b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/UserAvatar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/UserProfile.php b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/UserProfile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/BaseClient.php b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/BaseClient.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/Client.php b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/Client.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
diff --git a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/Embed.php b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/Embed.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/Tag.php b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/Tag.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/User.php b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
diff --git a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/UserAvatar.php b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/UserAvatar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/UserProfile.php b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/UserProfile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/expected_xml/src/Entity/UserAvatar.php b/tests/Doctrine/fixtures/expected_xml/src/Entity/UserAvatar.php
@@ -13,12 +13,12 @@ public function getId(): ?int
         return $this->id;
     }
 
-    public function getUser(): ?User
+    public function getUser(): ?UserXml
     {
         return $this->user;
     }
 
-    public function setUser(?User $user): self
+    public function setUser(?UserXml $user): self
     {
         $this->user = $user;
 
diff --git a/tests/Doctrine/fixtures/expected_xml/src/Entity/UserXml.php b/tests/Doctrine/fixtures/expected_xml/src/Entity/UserXml.php
@@ -5,7 +5,7 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 
-class User
+class UserXml
 {
     private $id;
 
diff --git a/tests/Doctrine/fixtures/source_project/src/Entity/BaseClient.php b/tests/Doctrine/fixtures/source_project/src/Entity/BaseClient.php
@@ -1,12 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
-
-if (!class_exists('Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity\BaseClient')) {
-    throw new \Exception('Who is causing this?');
-}
-
-var_dump('Inside File: '.__FILE__);
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/source_project/src/Entity/Client.php b/tests/Doctrine/fixtures/source_project/src/Entity/Client.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/source_project/src/Entity/Embed.php b/tests/Doctrine/fixtures/source_project/src/Entity/Embed.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/source_project/src/Entity/Tag.php b/tests/Doctrine/fixtures/source_project/src/Entity/Tag.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/source_project/src/Entity/TeamTrait.php b/tests/Doctrine/fixtures/source_project/src/Entity/TeamTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/source_project/src/Entity/TimestampableTrait.php b/tests/Doctrine/fixtures/source_project/src/Entity/TimestampableTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/source_project/src/Entity/User.php b/tests/Doctrine/fixtures/source_project/src/Entity/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
diff --git a/tests/Doctrine/fixtures/source_project/src/Entity/UserAvatar.php b/tests/Doctrine/fixtures/source_project/src/Entity/UserAvatar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/source_project/src/Entity/UserProfile.php b/tests/Doctrine/fixtures/source_project/src/Entity/UserProfile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
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
@@ -7,7 +7,7 @@
         <id name="id" type="integer">
             <generator strategy="AUTO" />
         </id>
-        <many-to-one field="user" target-entity="User" inversed-by="avatars">
+        <many-to-one field="user" target-entity="UserXml" inversed-by="avatars">
             <cascade>
                 <cascade-persist/>
                 <cascade-remove/>
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\User" repository-class="Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Repository\UserRepository">
+    <entity name="Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity\UserXml" repository-class="Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Repository\UserRepository">
         <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
@@ -2,7 +2,7 @@
 
 namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
-class User
+class UserXml
 {
     private $id;
 
diff --git a/tmp/AnnotationDriver.php b/tmp/AnnotationDriver.php

Original file line number	Diff line number	Diff line change
`@@ -33,15 +33,15 @@ public function testRegenerateEntities(string $expectedDirName, bool $overwrite)`
`33`	`33`	`$this->doTestRegeneration(`
`34`	`34`	`__DIR__.'/fixtures/source_project',`
`35`	`35`	`$kernel,`
`36`		`- 'Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity',`
	`36`	`+ 'Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity',`
`37`	`37`	`$expectedDirName,`
`38`	`38`	`$overwrite`
`39`	`39`	`);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public function getRegenerateEntitiesTests()`
`43`	`43`	`{`
`44`		`- yield 'regnerate_no_overwrite' => [`
	`44`	`+ yield 'regenerate_no_overwrite' => [`
`45`	`45`	`'expected_no_overwrite',`
`46`	`46`	`false`
`47`	`47`	`];`
`@@ -152,7 +152,7 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load`
`152`	`152`	`'is_bundle' => false,`
`153`	`153`	`'type' => 'annotation',`
`154`	`154`	`'dir' => '%kernel.root_dir%/src/Entity',`
`155`		`- 'prefix' => 'Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity',`
	`155`	`+ 'prefix' => 'Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity',`
`156`	`156`	`'alias' => 'EntityRegeneratorApp',`
`157`	`157`	`]`
`158`	`158`	`]`
`@@ -214,6 +214,6 @@ public function getRootDir()`
`214`	`214`	`class AllButTraitsIterator extends \RecursiveFilterIterator`
`215`	`215`	`{`
`216`	`216`	`public function accept() {`
`217`		`- return !in_array($this->current()->getFilename(), ['TeamTrait.php', 'TimestampableTrait.php']);`
	`217`	`+ return !in_array($this->current()->getFilename(), []);`
`218`	`218`	`}`
`219`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@ public function getId(): ?int`
`13`	`13`	`return $this->id;`
`14`	`14`	`}`
`15`	`15`
`16`		`- public function getUser(): ?User`
	`16`	`+ public function getUser(): ?UserXml`
`17`	`17`	`{`
`18`	`18`	`return $this->user;`
`19`	`19`	`}`
`20`	`20`
`21`		`- public function setUser(?User $user): self`
	`21`	`+ public function setUser(?UserXml $user): self`
`22`	`22`	`{`
`23`	`23`	`$this->user = $user;`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use Doctrine\Common\Collections\ArrayCollection;`
`6`	`6`	`use Doctrine\Common\Collections\Collection;`
`7`	`7`
`8`		`-class User`
	`8`	`+class UserXml`
`9`	`9`	`{`
`10`	`10`	`private $id;`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;`
`4`	`4`
`5`		`-class User`
	`5`	`+class UserXml`
`6`	`6`	`{`
`7`	`7`	`private $id;`
`8`	`8`