doctrine#1130 DDC-3300 - fixed inheritance maps where inheritance mem…

…bers were missing
Ocramius · Jan 16, 2015 · 00bad27 · 00bad27
1 parent e006ecb
commit 00bad27
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 21 deletions.
diff --git a/tests/Doctrine/Tests/Models/CompositeKeyInheritance/JoinedRootClass.php b/tests/Doctrine/Tests/Models/CompositeKeyInheritance/JoinedRootClass.php
@@ -5,7 +5,7 @@
  * @Entity
  * @InheritanceType("JOINED")
  * @DiscriminatorColumn(name="discr", type="string")
- * @DiscriminatorMap({"child" = "JoinedChildClass",})
+ * @DiscriminatorMap({"child" = "JoinedChildClass", "root" = "JoinedRootClass"})
  */
 class JoinedRootClass
 {

diff --git a/tests/Doctrine/Tests/Models/CompositeKeyInheritance/SingleRootClass.php b/tests/Doctrine/Tests/Models/CompositeKeyInheritance/SingleRootClass.php
@@ -5,7 +5,7 @@
  * @Entity
  * @InheritanceType("SINGLE_TABLE")
  * @DiscriminatorColumn(name="discr", type="string")
- * @DiscriminatorMap({"child" = "SingleChildClass",})
+ * @DiscriminatorMap({"child" = "SingleChildClass", "root" = "SingleRootClass"})
  */
 class SingleRootClass
 {

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php
@@ -50,7 +50,7 @@ public function testIssue()
 /**
  * @Entity
  * @InheritanceType("SINGLE_TABLE")
- * @DiscriminatorMap({"car" = "DDC1113Car", "bus" = "DDC1113Bus"})
+ * @DiscriminatorMap({"vehicle" = "DDC1113Vehicle", "car" = "DDC1113Car", "bus" = "DDC1113Bus"})
  */
 class DDC1113Vehicle
 {

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php
@@ -43,7 +43,7 @@ class DDC1454Picture extends DDC1454File
  * @Entity
  * @InheritanceType("JOINED")
  * @DiscriminatorColumn(name="discr", type="string")
- * @DiscriminatorMap({"picture" = "DDC1454Picture"})
+ * @DiscriminatorMap({"file" = "DDC1454File", "picture" = "DDC1454Picture"})
  */
 class DDC1454File
 {

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1509Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1509Test.php
@@ -115,7 +115,7 @@ public function setThumbnail($thumbnail)
  * @Entity
  * @InheritanceType("SINGLE_TABLE")
  * @DiscriminatorColumn(name="discr", type="string")
- * @DiscriminatorMap({"file" = "DDC1509File"})
+ * @DiscriminatorMap({"abstractFile" = "DDC1509AbstractFile", "file" = "DDC1509File"})
  */
 class DDC1509AbstractFile
 {

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1787Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1787Test.php
@@ -33,7 +33,7 @@ public function testIssue()
  * @Entity
  * @InheritanceType("JOINED")
  * @DiscriminatorColumn(name="discr", type="string")
- * @DiscriminatorMap({"bar" = "DDC1787Bar"})
+ * @DiscriminatorMap({"bar" = "DDC1787Bar", "foo" = "DDC1787Foo"})
  */
 class DDC1787Foo
 {

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2012Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2012Test.php
@@ -71,7 +71,8 @@ public function testIssue()
  * @InheritanceType("JOINED")
  * @DiscriminatorColumn(name="type_id", type="smallint")
  * @DiscriminatorMap({
- *      1 = "DDC2012ItemPerson"
+ *      1 = "DDC2012ItemPerson",
+ *      2 = "DDC2012Item"
  * })
  */
 class DDC2012Item

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2346Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2346Test.php
@@ -88,7 +88,7 @@ public function __construct() {
  * @Entity
  * @InheritanceType("JOINED")
  * @DiscriminatorColumn(name="discr", type="string")
- * @DiscriminatorMap({"baz" = "DDC2346Baz"})
+ * @DiscriminatorMap({"bar" = "DDC2346Bar", "baz" = "DDC2346Baz"})
  */
 class DDC2346Bar
 {

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3300Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3300Test.php
@@ -4,6 +4,7 @@
 
 use Doctrine\ORM\Events;
 use Doctrine\ORM\Tools\ResolveDiscriminatorMapListener;
+use Doctrine\ORM\Tools\ResolveTargetEntityListener;
 
 /**
  * @group DDC-3300
@@ -12,21 +13,28 @@ class DDC3300Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     public function testIssue()
     {
-        $this
-            ->_em
-            ->getEventManager()
-            ->addEventListener(
-                Events::loadClassMetadata,
-                new ResolveDiscriminatorMapListener(array(
-                    'Doctrine\Tests\ORM\Functional\Ticket\DDC3300BossInterface'     => 'Doctrine\Tests\ORM\Functional\Ticket\DDC3300Boss',
-                    'Doctrine\Tests\ORM\Functional\Ticket\DDC3300EmployeeInterface' => 'Doctrine\Tests\ORM\Functional\Ticket\DDC3300Employee',
-                ))
-            );
+        $resolveTargetEntity = new ResolveTargetEntityListener();
+
+        $resolveTargetEntity->addResolveTargetEntity(
+            DDC3300BossInterface::INTERFACENAME,
+            DDC3300Boss::CLASSNAME,
+            array()
+        );
+
+        $resolveTargetEntity->addResolveTargetEntity(
+            DDC3300EmployeeInterface::INTERFACENAME,
+            DDC3300Employee::CLASSNAME,
+            array()
+        );
+
+        $this->_em->getEventManager()->addEventSubscriber($resolveTargetEntity);
 
         $this->_schemaTool->createSchema(array(
-            $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC3300Person'),
+            $this->_em->getClassMetadata(DDC3300Person::CLASSNAME),
         ));
 
+        //die(var_dump($this->_em->getClassMetadata(DDC3300Person::CLASSNAME)->discriminatorMap));
+
         $boss = new DDC3300Boss();
         $this->_em->persist($boss);
 
@@ -48,6 +56,8 @@ public function testIssue()
  */
 abstract class DDC3300Person
 {
+    const CLASSNAME = __CLASS__;
+
     /**
      * @Id
      * @Column(type="integer")
@@ -58,25 +68,27 @@ abstract class DDC3300Person
 
 interface DDC3300BossInterface
 {
-
+    const INTERFACENAME = __CLASS__;
 }
 
 /**
  * @Entity
  */
 class DDC3300Boss extends DDC3300Person implements DDC3300BossInterface
 {
+    const CLASSNAME = __CLASS__;
 }
 
 interface DDC3300EmployeeInterface
 {
-
+    const INTERFACENAME = __CLASS__;
 }
 
 /**
  * @Entity
  */
 class DDC3300Employee extends DDC3300Person implements DDC3300EmployeeInterface
 {
+    const CLASSNAME = __CLASS__;
 }