Controls growing rate of the abstract test class

doctrine · May 3, 2020 · 33a3e2d · 33a3e2d
1 parent cad84ac
commit 33a3e2d
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 51 deletions.
diff --git a/tests/Doctrine/Tests/Models/CaseSensitiveDiscriminatorMap/Cube.php b/tests/Doctrine/Tests/Models/CaseSensitiveDiscriminatorMap/Cube.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\CaseSensitiveDiscriminatorMap;
+
+/** @Entity */
+final class Cube extends Shape
+{
+}
diff --git a/tests/Doctrine/Tests/Models/CaseSensitiveDiscriminatorMap/Shape.php b/tests/Doctrine/Tests/Models/CaseSensitiveDiscriminatorMap/Shape.php
@@ -0,0 +1,43 @@
+<?php
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\CaseSensitiveDiscriminatorMap;
+
+use Doctrine\ORM\Mapping\ClassMetadataInfo;
+
+/**
+ * @Entity
+ * @InheritanceType("SINGLE_TABLE")
+ * @DiscriminatorMap({"cube" = cube::class})
+ * @DiscriminatorColumn(name="discr", length=32, type="string")
+ */
+abstract class Shape
+{
+    /** @Id @Column(type="string") @GeneratedValue(strategy="AUTO") */
+    public $id;
+
+    public static function loadMetadata(ClassMetadataInfo $metadata)
+    {
+        $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_SINGLE_TABLE);
+        $metadata->setDiscriminatorColumn([
+            'name' => 'discr',
+            'type' => 'string',
+            'length' => 32,
+        ]);
+        $metadata->setDiscriminatorMap([
+            'cube' => cube::class,
+        ]);
+        $metadata->mapField([
+            'fieldName' => 'id',
+            'type' => 'string',
+            'length' => NULL,
+            'precision' => 0,
+            'scale' => 0,
+            'nullable' => false,
+            'unique' => false,
+            'id' => true,
+            'columnName' => 'id',
+        ]);
+        $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
+    }
+}
diff --git a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
@@ -14,6 +14,7 @@
 use Doctrine\ORM\Mapping\MappingException;
 use Doctrine\ORM\Mapping\UnderscoreNamingStrategy;
 use Doctrine\Tests\Models\Cache\City;
+use Doctrine\Tests\Models\CaseSensitiveDiscriminatorMap\Shape;
 use Doctrine\Tests\Models\CMS\CmsAddress;
 use Doctrine\Tests\Models\CMS\CmsAddressListener;
 use Doctrine\Tests\Models\CMS\CmsUser;
@@ -1079,12 +1080,10 @@ public function testDiscriminatorColumnDefaultName()
         $this->assertEquals('dtype', $class->discriminatorColumn['name']);
     }
 
-    /**
-     * @expectedException \Doctrine\ORM\Mapping\MappingException
-     * @expectedExceptionMessage Entity class 'Doctrine\Tests\ORM\Mapping\cube' used in the discriminator map of class 'Doctrine\Tests\ORM\Mapping\Shape' does not exist.
-     */
     public function testInvalidSubClassCase()
     {
+        $this->expectException(MappingException::class);
+        $this->expectExceptionMessage('Entity class \'Doctrine\Tests\Models\CaseSensitiveDiscriminatorMap\cube\' used in the discriminator map of class \'Doctrine\Tests\Models\CaseSensitiveDiscriminatorMap\Shape\' does not exist.');
         $this->createClassMetadata(Shape::class);
     }
 }
@@ -1352,48 +1351,6 @@ public static function loadMetadata(ClassMetadataInfo $metadata)
     }
 }
 
-/**
- * @Entity
- * @InheritanceType("SINGLE_TABLE")
- * @DiscriminatorMap({"cube" = cube::class})
- * @DiscriminatorColumn(name="discr", length=32, type="string")
- */
-abstract class Shape
-{
-    /** @Id @Column(type="string") @GeneratedValue(strategy="AUTO") */
-    public $id;
-
-    public static function loadMetadata(ClassMetadataInfo $metadata)
-    {
-        $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_SINGLE_TABLE);
-        $metadata->setDiscriminatorColumn([
-            'name' => 'discr',
-            'type' => 'string',
-            'length' => 32,
-        ]);
-        $metadata->setDiscriminatorMap([
-            'cube' => cube::class,
-        ]);
-        $metadata->mapField([
-            'fieldName' => 'id',
-            'type' => 'string',
-            'length' => NULL,
-            'precision' => 0,
-            'scale' => 0,
-            'nullable' => false,
-            'unique' => false,
-            'id' => true,
-            'columnName' => 'id',
-        ]);
-        $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
-    }
-}
-
-/** @Entity */
-class Cube extends Shape
-{
-}
-
 /**
  * @Entity
  */

diff --git a/.../php/Doctrine.Tests.ORM.Mapping.Shape.php → ...s.CaseSensitiveDiscriminatorMap.Shape.php b/.../php/Doctrine.Tests.ORM.Mapping.Shape.php → ...s.CaseSensitiveDiscriminatorMap.Shape.php
@@ -1,7 +1,7 @@
 <?php
 
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
-use Doctrine\Tests\ORM\Mapping\cube;
+use Doctrine\Tests\Models\CaseSensitiveDiscriminatorMap\cube;
 
 /* @var $metadata ClassMetadataInfo */
 $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_SINGLE_TABLE);

diff --git a/.../Doctrine.Tests.ORM.Mapping.Shape.dcm.xml → ...seSensitiveDiscriminatorMap.Shape.dcm.xml b/.../Doctrine.Tests.ORM.Mapping.Shape.dcm.xml → ...seSensitiveDiscriminatorMap.Shape.dcm.xml
@@ -3,10 +3,10 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
                           https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Doctrine\Tests\ORM\Mapping\Shape" inheritance-type="SINGLE_TABLE">
+    <entity name="Doctrine\Tests\Models\CaseSensitiveDiscriminatorMap\Shape" inheritance-type="SINGLE_TABLE">
         <discriminator-column name="discr" type="string" length="32" />
         <discriminator-map>
-            <discriminator-mapping value="cube" class="Doctrine\Tests\ORM\Mapping\cube" />
+            <discriminator-mapping value="cube" class="Doctrine\Tests\Models\CaseSensitiveDiscriminatorMap\cube" />
         </discriminator-map>
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO" />

diff --git a/.../Doctrine.Tests.ORM.Mapping.Shape.dcm.yml → ...seSensitiveDiscriminatorMap.Shape.dcm.yml b/.../Doctrine.Tests.ORM.Mapping.Shape.dcm.yml → ...seSensitiveDiscriminatorMap.Shape.dcm.yml
@@ -1,8 +1,8 @@
-Doctrine\Tests\ORM\Mapping\Shape:
+Doctrine\Tests\Models\CaseSensitiveDiscriminatorMap\Shape:
   type: entity
   inheritanceType: SINGLE_TABLE
   discriminatorMap:
-    cube: Doctrine\Tests\ORM\Mapping\cube
+    cube: Doctrine\Tests\Models\CaseSensitiveDiscriminatorMap\cube
   discriminatorColumn:
     type: string
     name: discr