Fix discriminatorValue key 0 (#2716)

doctrine · Jan 17, 2025 · 0b9c1c7 · 0b9c1c7
1 parent 27002d1
commit 0b9c1c7
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 3 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/DiscriminatorMap.php b/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/DiscriminatorMap.php
@@ -16,10 +16,10 @@
 #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY)]
 final class DiscriminatorMap implements Annotation
 {
-    /** @var array<string, class-string> */
+    /** @var array<class-string> */
     public $value;
 
-    /** @param array<string, class-string> $value */
+    /** @param array<class-string> $value */
     public function __construct(array $value)
     {
         $this->value = $value;

diff --git a/lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php b/lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php
@@ -1470,7 +1470,7 @@ private function getClassDiscriminatorValues(ClassMetadata $metadata): array
 
         foreach ($metadata->subClasses as $className) {
             $key = array_search($className, $metadata->discriminatorMap);
-            if (! $key) {
+            if ($key === false) {
                 continue;
             }
 

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH2158Test.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH2158Test.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket;
+
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+use Doctrine\ODM\MongoDB\Tests\BaseTestCase;
+
+class GH2158Test extends BaseTestCase
+{
+    public function testDiscriminatorMapCreationType(): void
+    {
+        $obj = new GH2158FirstType();
+        $this->dm->persist($obj);
+        $this->dm->flush();
+
+        self::assertEquals($this->dm->find(GH2158Abstract::class, $obj->getId()), $obj);
+    }
+}
+
+#[ODM\Document(collection: 'documents')]
+#[ODM\InheritanceType('SINGLE_COLLECTION')]
+#[ODM\DiscriminatorField('type')]
+#[ODM\DiscriminatorMap([0 => GH2158FirstType::class, 1 => GH2158SecondType::class])]
+abstract class GH2158Abstract
+{
+    /** @var string */
+    #[ODM\Id]
+    protected $id;
+
+    public function getId(): string
+    {
+        return $this->id;
+    }
+}
+
+#[ODM\Document]
+class GH2158FirstType extends GH2158Abstract
+{
+}
+
+#[ODM\Document]
+class GH2158SecondType extends GH2158Abstract
+{
+}