Stop using array and object types in tests

doctrine · Jul 7, 2022 · ed9d444 · ed9d444
1 parent 9e0c7de
commit ed9d444
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 7 deletions.
diff --git a/psalm.xml b/psalm.xml
@@ -36,6 +36,12 @@
                 <file name="lib/Doctrine/ORM/Query/TreeWalkerChain.php"/>
             </errorLevel>
         </DeprecatedMethod>
+        <DeprecatedConstant>
+            <errorLevel type="suppress">
+                <!-- DBAL 3 backward compatibility -->
+                <file name="lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php"/>
+            </errorLevel>
+        </DeprecatedConstant>
         <DocblockTypeContradiction>
             <errorLevel type="suppress">
                 <!-- We're catching invalid input here. -->

diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php
@@ -10,9 +10,11 @@
 use Doctrine\Tests\DbalTypes\CustomIdObjectType;
 use Doctrine\Tests\DbalTypes\NegativeToPositiveType;
 use Doctrine\Tests\DbalTypes\UpperCaseStringType;
+use Doctrine\Tests\Models\Generic\SerializationModel;
 use Doctrine\Tests\OrmFunctionalTestCase;
 
 use function array_keys;
+use function class_exists;
 use function constant;
 use function implode;
 
@@ -68,6 +70,10 @@ public function testValidateModelSets(string $modelSet): void
         $classes   = [];
 
         foreach (self::$modelSets[$modelSet] as $className) {
+            if ($modelSet === 'generic' && $className === SerializationModel::class && ! class_exists(Type\ArrayType::class)) {
+                continue;
+            }
+
             $classes[] = $this->_em->getClassMetadata($className);
         }
 

diff --git a/tests/Doctrine/Tests/ORM/Functional/TypeTest.php b/tests/Doctrine/Tests/ORM/Functional/TypeTest.php
@@ -6,6 +6,8 @@
 
 use DateTime;
 use DateTimeZone;
+use Doctrine\DBAL\Types\ArrayType;
+use Doctrine\DBAL\Types\ObjectType;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\Tests\Models\Generic\BooleanModel;
 use Doctrine\Tests\Models\Generic\DateTimeModel;
@@ -14,6 +16,8 @@
 use Doctrine\Tests\OrmFunctionalTestCase;
 use stdClass;
 
+use function class_exists;
+
 class TypeTest extends OrmFunctionalTestCase
 {
     protected function setUp(): void
@@ -70,6 +74,10 @@ public function testBoolean(): void
 
     public function testArray(): void
     {
+        if (! class_exists(ArrayType::class)) {
+            self::markTestSkipped('Test valid for doctrine/dbal:3.x only.');
+        }
+
         $serialize               = new SerializationModel();
         $serialize->array['foo'] = 'bar';
         $serialize->array['bar'] = 'baz';
@@ -86,6 +94,10 @@ public function testArray(): void
 
     public function testObject(): void
     {
+        if (! class_exists(ObjectType::class)) {
+            self::markTestSkipped('Test valid for doctrine/dbal:3.x only.');
+        }
+
         $serialize         = new SerializationModel();
         $serialize->object = new stdClass();
 

diff --git a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
@@ -18,7 +18,7 @@
 use Doctrine\Tests\Models\DDC889\DDC889Class;
 use Doctrine\Tests\Models\DDC889\DDC889Entity;
 use Doctrine\Tests\Models\DDC889\DDC889SuperClass;
-use Doctrine\Tests\Models\Generic\SerializationModel;
+use Doctrine\Tests\Models\Generic\BooleanModel;
 use Doctrine\Tests\Models\GH7141\GH7141Article;
 use Doctrine\Tests\Models\GH7316\GH7316Article;
 use Doctrine\Tests\Models\ValueObjects\Name;
@@ -154,8 +154,8 @@ public function testEmbeddedMapping(): void
     public function testInvalidMappingFileException(): void
     {
         $this->expectException(\Doctrine\Persistence\Mapping\MappingException::class);
-        $this->expectExceptionMessage('Invalid mapping file \'Doctrine.Tests.Models.Generic.SerializationModel.dcm.xml\' for class \'Doctrine\Tests\Models\Generic\SerializationModel\'.');
-        $this->createClassMetadata(SerializationModel::class);
+        $this->expectExceptionMessage('Invalid mapping file \'Doctrine.Tests.Models.Generic.BooleanModel.dcm.xml\' for class \'Doctrine\Tests\Models\Generic\BooleanModel\'.');
+        $this->createClassMetadata(BooleanModel::class);
     }
 
     /**

diff --git a/...Models.Generic.SerializationModel.dcm.xml → ...Tests.Models.Generic.BooleanModel.dcm.xml b/...Models.Generic.SerializationModel.dcm.xml → ...Tests.Models.Generic.BooleanModel.dcm.xml
@@ -9,9 +9,7 @@
             <generator strategy="AUTO"/>
         </id>
 
-        <field name="array" column="array" type="array"/>
-
-        <field name="object" column="object" type="object"/>
+        <field name="booleanField" column="boolean_field" type="boolean"/>
     </entity>
 
 </doctrine-mapping>
diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
@@ -10,6 +10,7 @@
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\Table;
+use Doctrine\DBAL\Types\ArrayType;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Cache\CacheConfiguration;
 use Doctrine\ORM\Cache\DefaultCacheFactory;
@@ -180,6 +181,7 @@
 use function array_reverse;
 use function array_slice;
 use function assert;
+use function class_exists;
 use function explode;
 use function get_debug_type;
 use function getenv;
@@ -560,7 +562,9 @@ protected function tearDown(): void
             $conn->executeStatement('DELETE FROM boolean_model');
             $conn->executeStatement('DELETE FROM date_time_model');
             $conn->executeStatement('DELETE FROM decimal_model');
-            $conn->executeStatement('DELETE FROM serialize_model');
+            if (class_exists(ArrayType::class)) {
+                $conn->executeStatement('DELETE FROM serialize_model');
+            }
         }
 
         if (isset($this->_usedModelSets['routing'])) {
@@ -839,6 +843,10 @@ protected function setUp(): void
         foreach ($this->_usedModelSets as $setName => $bool) {
             if (! isset(static::$tablesCreated[$setName])) {
                 foreach (static::$modelSets[$setName] as $className) {
+                    if ($setName === 'generic' && $className === SerializationModel::class && ! class_exists(ArrayType::class)) {
+                        continue;
+                    }
+
                     $classes[] = $this->_em->getClassMetadata($className);
                 }