Merge branch '2.14.x' into 2.15.x

* 2.14.x: Remove calls to assertObjectHasAttribute() (doctrine#10502) Remove calls to withConsecutive() (doctrine#10501) Use recognized array key Fix doctrine#9095 by re-applying doctrine#9096 Use linebreaks
derrabus · Feb 7, 2023 · 6c17e47 · 6c17e47
2 parents 83d56d7 + 0bd5fbf
commit 6c17e47
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 20 deletions.
diff --git a/lib/Doctrine/ORM/Tools/SchemaValidator.php b/lib/Doctrine/ORM/Tools/SchemaValidator.php
@@ -253,7 +253,13 @@ public function validateClass(ClassMetadataInfo $class)
             }
         }
 
-        if (! $class->isInheritanceTypeNone() && ! $class->isRootEntity() && ! $class->isMappedSuperclass && array_search($class->name, $class->discriminatorMap, true) === false) {
+        if (
+            ! $class->isInheritanceTypeNone()
+            && ! $class->isRootEntity()
+            && ($class->reflClass !== null && ! $class->reflClass->isAbstract())
+            && ! $class->isMappedSuperclass
+            && array_search($class->name, $class->discriminatorMap, true) === false
+        ) {
             $ce[] = "Entity class '" . $class->name . "' is part of inheritance hierarchy, but is " .
                 "not mapped in the root entity '" . $class->rootEntityName . "' discriminator map. " .
                 'All subclasses must be listed in the discriminator map.';

diff --git a/tests/Doctrine/Tests/Models/DDC964/DDC964User.php b/tests/Doctrine/Tests/Models/DDC964/DDC964User.php
@@ -134,7 +134,7 @@ public static function loadMetadata(ClassMetadata $metadata): void
                 'fieldName'      => 'address',
                 'targetEntity'   => 'DDC964Address',
                 'cascade'        => ['persist','merge'],
-                'joinColumn'     => ['name' => 'address_id', 'referencedColumnMame' => 'id'],
+                'joinColumns'    => [['name' => 'address_id', 'referencedColumnMame' => 'id']],
             ]
         );
 

diff --git a/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php
@@ -29,6 +29,7 @@
 use Doctrine\Tests\PHPUnitCompatibility\MockBuilderCompatibilityTools;
 
 use function count;
+use function property_exists;
 
 class ObjectHydratorTest extends HydrationTestCase
 {
@@ -927,10 +928,10 @@ public function testEntityQueryCustomResultSetOrder(): void
         self::assertEquals(1, $result[0]->getId());
         self::assertEquals(2, $result[1]->getId());
 
-        self::assertObjectHasAttribute('boards', $result[0]);
+        self::assertTrue(property_exists($result[0], 'boards'));
         self::assertEquals(3, count($result[0]->boards));
 
-        self::assertObjectHasAttribute('boards', $result[1]);
+        self::assertTrue(property_exists($result[1], 'boards'));
         self::assertEquals(1, count($result[1]->boards));
     }
 

diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
@@ -181,16 +181,10 @@ public function testIsTransient(): void
         $driver = $this->createMock(MappingDriver::class);
         $driver->expects(self::exactly(2))
             ->method('isTransient')
-            ->withConsecutive(
-                [CmsUser::class],
-                [CmsArticle::class]
-            )
-            ->willReturnMap(
-                [
-                    [CmsUser::class, true],
-                    [CmsArticle::class, false],
-                ]
-            );
+            ->willReturnMap([
+                [CmsUser::class, true],
+                [CmsArticle::class, false],
+            ]);
 
         $em = $this->createEntityManager($driver);
 

diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/PaginatorTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/PaginatorTest.php
@@ -6,6 +6,7 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver;
+use Doctrine\DBAL\Result;
 use Doctrine\ORM\Decorator\EntityManagerDecorator;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Internal\Hydration\AbstractHydrator;
@@ -64,17 +65,24 @@ public function testExtraParametersAreStrippedWhenWalkerRemovingOriginalSelectEl
         $query->setMaxResults(1);
         $paginator = (new Paginator($query, true))->setUseOutputWalkers(false);
 
+        $receivedParams = [];
+        $resultMock     = $this->createMock(Result::class);
         $this->connection
-            ->expects(self::exactly(3))
             ->method('executeQuery')
-            ->withConsecutive(
-                [self::anything(), [$paramInWhere]],
-                [self::anything(), [$paramInWhere]],
-                [self::anything(), [$paramInSubSelect, $paramInWhere, $returnedIds]]
-            );
+            ->willReturnCallback(static function (string $sql, array $params) use (&$receivedParams, $resultMock): Result {
+                $receivedParams[] = $params;
+
+                return $resultMock;
+            });
 
         $paginator->count();
         $paginator->getIterator();
+
+        self::assertSame([
+            [$paramInWhere],
+            [$paramInWhere],
+            [$paramInSubSelect, $paramInWhere, $returnedIds],
+        ], $receivedParams);
     }
 
     public function testPaginatorNotCaringAboutExtraParametersWithoutOutputWalkers(): void

diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php
@@ -221,6 +221,14 @@ public function testMappedSuperclassNotPresentInDiscriminator(): void
 
         $this->assertEquals([], $ce);
     }
+
+    public function testAbstractChildClassNotPresentInDiscriminator(): void
+    {
+        $class1 = $this->em->getClassMetadata(Issue9095AbstractChild::class);
+        $ce     = $this->validator->validateClass($class1);
+
+        self::assertEmpty($ce);
+    }
 }
 
 /** @MappedSuperclass */
@@ -643,3 +651,28 @@ class EmbeddableWithAssociation
      */
     private $cart;
 }
+
+/**
+ * @Entity
+ * @InheritanceType("SINGLE_TABLE")
+ * @DiscriminatorMap({"child" = Issue9095Child::class})
+ */
+abstract class Issue9095Parent
+{
+    /**
+     * @var mixed
+     * @Id
+     * @Column
+     */
+    protected $key;
+}
+
+/** @Entity */
+abstract class Issue9095AbstractChild extends Issue9095Parent
+{
+}
+
+/** @Entity */
+class Issue9095Child extends Issue9095AbstractChild
+{
+}