Split out fixtures from tests namespace (#143)

martin-georgiev · Aug 28, 2023 · 57414d7 · 57414d7
1 parent 1d714b9
commit 57414d7
Show file tree

Hide file tree

Showing 85 changed files with 154 additions and 132 deletions.
diff --git a/ci/rector/config.php b/ci/rector/config.php
@@ -4,6 +4,7 @@
 
 use Rector\Config\RectorConfig;
 use Rector\Doctrine\Set\DoctrineSetList;
+use Rector\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
 
@@ -19,6 +20,7 @@
     $rectorConfig->parallel();
     $rectorConfig->phpstanConfig($basePath.'ci/phpstan/config.neon');
     $rectorConfig->skip([
+        ArraySpreadInsteadOfArrayMergeRector::class,
     ]);
     $rectorConfig->importShortClasses(false);
     $rectorConfig->importNames(false, false); // @todo Enable once Rector introduces better support for function imports.

diff --git a/composer.json b/composer.json
@@ -30,6 +30,7 @@
     },
     "autoload-dev": {
         "psr-4": {
+            "Fixtures\\MartinGeorgiev\\": "fixtures/MartinGeorgiev/",
             "Tests\\MartinGeorgiev\\": "tests/MartinGeorgiev/"
         }
     },
@@ -56,6 +57,12 @@
         "php": "^8.2",
         "doctrine/orm": "~2.5||~3.0"
     },
+    "replace": {
+        "symfony/polyfill-php72": "*",
+        "symfony/polyfill-php73": "*",
+        "symfony/polyfill-php74": "*",
+        "symfony/polyfill-php80": "*"
+    },
 
     "scripts": {
         "check-code-style": [

diff --git a/fixtures/MartinGeorgiev/Doctrine/Entity/ContainsArrays.php b/fixtures/MartinGeorgiev/Doctrine/Entity/ContainsArrays.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fixtures\MartinGeorgiev\Doctrine\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity()
+ */
+class ContainsArrays extends Entity
+{
+    /**
+     * @ORM\Column(type="array")
+     */
+    public array $array1;
+
+    /**
+     * @ORM\Column(type="array")
+     */
+    public array $array2;
+}
diff --git a/...octrine/Fixtures/Entity/ContainsDates.php → ...eorgiev/Doctrine/Entity/ContainsDates.php b/...octrine/Fixtures/Entity/ContainsDates.php → ...eorgiev/Doctrine/Entity/ContainsDates.php
@@ -2,20 +2,22 @@
 
 declare(strict_types=1);
 
-namespace Tests\MartinGeorgiev\Doctrine\Fixtures\Entity;
+namespace Fixtures\MartinGeorgiev\Doctrine\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @Entity
+ * @ORM\Entity
  */
 class ContainsDates extends Entity
 {
     /**
-     * @Column(type="date_immutable")
+     * @ORM\Column(type="date_immutable")
      */
     public \DateTimeImmutable $date1;
 
     /**
-     * @Column(type="date_immutable")
+     * @ORM\Column(type="date_immutable")
      */
     public \DateTimeImmutable $date2;
 }
diff --git a/...rine/Fixtures/Entity/ContainsIntegers.php → ...giev/Doctrine/Entity/ContainsIntegers.php b/...rine/Fixtures/Entity/ContainsIntegers.php → ...giev/Doctrine/Entity/ContainsIntegers.php
@@ -2,25 +2,27 @@
 
 declare(strict_types=1);
 
-namespace Tests\MartinGeorgiev\Doctrine\Fixtures\Entity;
+namespace Fixtures\MartinGeorgiev\Doctrine\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @Entity
+ * @ORM\Entity
  */
 class ContainsIntegers extends Entity
 {
     /**
-     * @Column(type="integer")
+     * @ORM\Column(type="integer")
      */
     public int $integer1;
 
     /**
-     * @Column(type="integer")
+     * @ORM\Column(type="integer")
      */
     public int $integer2;
 
     /**
-     * @Column(type="integer")
+     * @ORM\Column(type="integer")
      */
     public int $integer3;
 }
diff --git a/...octrine/Fixtures/Entity/ContainsJsons.php → ...eorgiev/Doctrine/Entity/ContainsJsons.php b/...octrine/Fixtures/Entity/ContainsJsons.php → ...eorgiev/Doctrine/Entity/ContainsJsons.php
@@ -2,20 +2,22 @@
 
 declare(strict_types=1);
 
-namespace Tests\MartinGeorgiev\Doctrine\Fixtures\Entity;
+namespace Fixtures\MartinGeorgiev\Doctrine\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @Entity
+ * @ORM\Entity
  */
 class ContainsJsons extends Entity
 {
     /**
-     * @Column(type="json")
+     * @ORM\Column(type="json")
      */
     public array $object1;
 
     /**
-     * @Column(type="json")
+     * @ORM\Column(type="json")
      */
     public array $object2;
 }
diff --git a/...octrine/Fixtures/Entity/ContainsTexts.php → ...eorgiev/Doctrine/Entity/ContainsTexts.php b/...octrine/Fixtures/Entity/ContainsTexts.php → ...eorgiev/Doctrine/Entity/ContainsTexts.php
@@ -2,20 +2,22 @@
 
 declare(strict_types=1);
 
-namespace Tests\MartinGeorgiev\Doctrine\Fixtures\Entity;
+namespace Fixtures\MartinGeorgiev\Doctrine\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @Entity
+ * @ORM\Entity
  */
 class ContainsTexts extends Entity
 {
     /**
-     * @Column(type="text")
+     * @ORM\Column(type="text")
      */
     public string $text1;
 
     /**
-     * @Column(type="text")
+     * @ORM\Column(type="text")
      */
     public string $text2;
 }
diff --git a/fixtures/MartinGeorgiev/Doctrine/Entity/Entity.php b/fixtures/MartinGeorgiev/Doctrine/Entity/Entity.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fixtures\MartinGeorgiev\Doctrine\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+abstract class Entity
+{
+    /**
+     * @ORM\Id
+     *
+     * @ORM\Column(type="string")
+     *
+     * @ORM\GeneratedValue
+     */
+    public string $id;
+}
diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BaseFunction.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BaseFunction.php
@@ -71,7 +71,7 @@ public function getSql(SqlWalker $sqlWalker): string
     {
         $dispatched = [];
         foreach ($this->nodes as $node) {
-            $dispatched[] = $node === null ? 'null' : $node->dispatch($sqlWalker);
+            $dispatched[] = $node instanceof Node ? $node->dispatch($sqlWalker) : 'null';
         }
 
         return \vsprintf($this->functionPrototype, $dispatched);

diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BaseVariadicFunction.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BaseVariadicFunction.php
@@ -4,6 +4,7 @@
 
 namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
 
+use Doctrine\ORM\Query\AST\Node;
 use Doctrine\ORM\Query\Lexer;
 use Doctrine\ORM\Query\Parser;
 use Doctrine\ORM\Query\SqlWalker;
@@ -39,7 +40,7 @@ public function getSql(SqlWalker $sqlWalker): string
     {
         $dispatched = [];
         foreach ($this->nodes as $node) {
-            $dispatched[] = $node === null ? 'null' : $node->dispatch($sqlWalker);
+            $dispatched[] = $node instanceof Node ? $node->dispatch($sqlWalker) : 'null';
         }
 
         return \sprintf($this->functionPrototype, \implode(', ', $dispatched));

diff --git a/tests/MartinGeorgiev/Doctrine/Fixtures/Entity/ContainsArrays.php b/tests/MartinGeorgiev/Doctrine/Fixtures/Entity/ContainsArrays.php
diff --git a/tests/MartinGeorgiev/Doctrine/Fixtures/Entity/Entity.php b/tests/MartinGeorgiev/Doctrine/Fixtures/Entity/Entity.php
diff --git a/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/AllTest.php b/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/AllTest.php
@@ -4,8 +4,8 @@
 
 namespace Tests\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
 
+use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays;
 use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\All;
-use Tests\MartinGeorgiev\Doctrine\Fixtures\Entity\ContainsArrays;
 
 class AllTest extends TestCase
 {

diff --git a/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/AnyTest.php b/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/AnyTest.php
@@ -4,8 +4,8 @@
 
 namespace Tests\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
 
+use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays;
 use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\Any;
-use Tests\MartinGeorgiev\Doctrine\Fixtures\Entity\ContainsArrays;
 
 class AnyTest extends TestCase
 {

diff --git a/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayAggTest.php b/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayAggTest.php
@@ -4,8 +4,8 @@
 
 namespace Tests\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
 
+use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsTexts;
 use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\ArrayAgg;
-use Tests\MartinGeorgiev\Doctrine\Fixtures\Entity\ContainsTexts;
 
 class ArrayAggTest extends TestCase
 {

diff --git a/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayAppendTest.php b/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayAppendTest.php
@@ -4,8 +4,8 @@
 
 namespace Tests\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
 
+use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays;
 use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\ArrayAppend;
-use Tests\MartinGeorgiev\Doctrine\Fixtures\Entity\ContainsArrays;
 
 class ArrayAppendTest extends TestCase
 {

diff --git a/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayCardinalityTest.php b/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayCardinalityTest.php
@@ -4,8 +4,8 @@
 
 namespace Tests\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
 
+use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays;
 use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\ArrayCardinality;
-use Tests\MartinGeorgiev\Doctrine\Fixtures\Entity\ContainsArrays;
 
 class ArrayCardinalityTest extends TestCase
 {

diff --git a/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayCatTest.php b/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayCatTest.php
@@ -4,8 +4,8 @@
 
 namespace Tests\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
 
+use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays;
 use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\ArrayCat;
-use Tests\MartinGeorgiev\Doctrine\Fixtures\Entity\ContainsArrays;
 
 class ArrayCatTest extends TestCase
 {

diff --git a/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayDimensionsTest.php b/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayDimensionsTest.php
@@ -4,8 +4,8 @@
 
 namespace Tests\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
 
+use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays;
 use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\ArrayDimensions;
-use Tests\MartinGeorgiev\Doctrine\Fixtures\Entity\ContainsArrays;
 
 class ArrayDimensionsTest extends TestCase
 {

diff --git a/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayLengthTest.php b/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayLengthTest.php
@@ -4,8 +4,8 @@
 
 namespace Tests\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
 
+use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays;
 use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\ArrayLength;
-use Tests\MartinGeorgiev\Doctrine\Fixtures\Entity\ContainsArrays;
 
 class ArrayLengthTest extends TestCase
 {

diff --git a/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayNumberOfDimensionsTest.php b/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayNumberOfDimensionsTest.php
@@ -4,8 +4,8 @@
 
 namespace Tests\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
 
+use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays;
 use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\ArrayNumberOfDimensions;
-use Tests\MartinGeorgiev\Doctrine\Fixtures\Entity\ContainsArrays;
 
 class ArrayNumberOfDimensionsTest extends TestCase
 {

diff --git a/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayPrependTest.php b/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayPrependTest.php
@@ -4,8 +4,8 @@
 
 namespace Tests\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
 
+use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays;
 use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\ArrayPrepend;
-use Tests\MartinGeorgiev\Doctrine\Fixtures\Entity\ContainsArrays;
 
 class ArrayPrependTest extends TestCase
 {

diff --git a/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayRemoveTest.php b/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayRemoveTest.php
@@ -4,8 +4,8 @@
 
 namespace Tests\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
 
+use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays;
 use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\ArrayRemove;
-use Tests\MartinGeorgiev\Doctrine\Fixtures\Entity\ContainsArrays;
 
 class ArrayRemoveTest extends TestCase
 {

diff --git a/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayReplaceTest.php b/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayReplaceTest.php
@@ -4,8 +4,8 @@
 
 namespace Tests\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
 
+use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays;
 use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\ArrayReplace;
-use Tests\MartinGeorgiev\Doctrine\Fixtures\Entity\ContainsArrays;
 
 class ArrayReplaceTest extends TestCase
 {

diff --git a/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayToJsonTest.php b/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayToJsonTest.php
@@ -4,8 +4,8 @@
 
 namespace Tests\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
 
+use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays;
 use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\ArrayToJson;
-use Tests\MartinGeorgiev\Doctrine\Fixtures\Entity\ContainsArrays;
 
 class ArrayToJsonTest extends TestCase
 {