Revert "Fix wrong usage of discriminator map in complex document inheritance chains"

Author: alcaeus

lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataInfo.php

@@ -784,10 +784,6 @@ public function setDiscriminatorField($discriminatorField)
      */
     public function setDiscriminatorMap(array $map)
     {
-        $this->subClasses = [];
-        $this->discriminatorMap = [];
-        $this->discriminatorValue = null;
-
         foreach ($map as $value => $className) {
             if (strpos($className, '\\') === false && strlen($this->namespace)) {
                 $className = $this->namespace . '\\' . $className;

lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php

@@ -944,35 +944,27 @@ public function prepareFieldName($fieldName)
     }
 
     /**
-     * Adds a discriminator criteria to an already-prepared query if necessary.
-     *
-     * If the class we're querying has a discriminator field set, we add all
-     * possible discriminator values to the query. The list of possible
-     * discriminator values is based on the discriminatorValue of the class
-     * itself as well as those of all its subclasses.
+     * Adds discriminator criteria to an already-prepared query.
      *
      * This method should be used once for query criteria and not be used for
      * nested expressions. It should be called before
      * {@link DocumentPerister::addFilterToPreparedQuery()}.
      *
+     * @param array $preparedQuery
      * @return array
      */
     public function addDiscriminatorToPreparedQuery(array $preparedQuery)
     {
-        if (isset($preparedQuery[$this->class->discriminatorField]) || $this->class->discriminatorField === null) {
-            return $preparedQuery;
-        }
-
-        $discriminatorValues = $this->getClassDiscriminatorValues($this->class);
-
-        if ($discriminatorValues === []) {
-            return $preparedQuery;
-        }
-
-        if (count($discriminatorValues) === 1) {
-            $preparedQuery[$this->class->discriminatorField] = $discriminatorValues[0];
-        } else {
-            $preparedQuery[$this->class->discriminatorField] = ['$in' => $discriminatorValues];
+        /* If the class has a discriminator field, which is not already in the
+         * criteria, inject it now. The field/values need no preparation.
+         */
+        if ($this->class->hasDiscriminator() && ! isset($preparedQuery[$this->class->discriminatorField])) {
+            $discriminatorValues = $this->getClassDiscriminatorValues($this->class);
+            if (count($discriminatorValues) === 1) {
+                $preparedQuery[$this->class->discriminatorField] = $discriminatorValues[0];
+            } else {
+                $preparedQuery[$this->class->discriminatorField] = array('$in' => $discriminatorValues);
+            }
         }
 
         return $preparedQuery;
@@ -1341,19 +1333,14 @@ private function hasQueryOperators($value)
     }
 
     /**
-     * Returns the list of discriminator values for the given ClassMetadata
+     * Gets the array of discriminator values for the given ClassMetadata
      *
      * @param ClassMetadata $metadata
      * @return array
      */
     private function getClassDiscriminatorValues(ClassMetadata $metadata)
     {
-        $discriminatorValues = [];
-
-        if ($metadata->discriminatorValue !== null) {
-            $discriminatorValues[] = $metadata->discriminatorValue;
-        }
-
+        $discriminatorValues = array($metadata->discriminatorValue);
         foreach ($metadata->subClasses as $className) {
             if ($key = array_search($className, $metadata->discriminatorMap)) {
                 $discriminatorValues[] = $key;

tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH1962Test.php

@@ -25,25 +25,13 @@ public function testReferencesGoesThroughDiscriminatorMap()
             ->field('featureFull')->references($f)
             ->getQuery()->debug();
 
-        $this->assertEquals(
-            [
-                'featureFull.$id' => new \MongoId($f->id),
-                'type' => ['$in' => ['ca', 'cb', 'cc']],
-            ],
-            $q1['query']
-        );
+        $this->assertEquals([ 'featureFull.$id' => new \MongoId($f->id) ], $q1['query']);
 
         $q2 = $this->dm->createQueryBuilder(ParentClass::class)
             ->field('featureSimple')->references($f)
             ->getQuery()->debug();
 
-        $this->assertEquals(
-            [
-                'featureSimple' => new \MongoId($f->id),
-                'type' => ['$in' => ['ca', 'cb', 'cc']],
-            ],
-            $q2['query']
-        );
+        $this->assertEquals([ 'featureSimple' => new \MongoId($f->id) ], $q2['query']);
 
         $q3 = $this->dm->createQueryBuilder(ParentClass::class)
             ->field('featurePartial')->references($f)
@@ -53,7 +41,6 @@ public function testReferencesGoesThroughDiscriminatorMap()
             [
                 'featurePartial.$id' => new \MongoId($f->id),
                 'featurePartial.$ref' => 'Feature',
-                'type' => ['$in' => ['ca', 'cb', 'cc']],
             ],
             $q3['query']
         );
@@ -96,27 +83,13 @@ public function testIncludesReferenceToGoesThroughDiscriminatorMap()
             ->field('featureFullMany')->includesReferenceTo($f)
             ->getQuery()->debug();
 
-        $this->assertEquals(
-            [
-                'featureFullMany' => [
-                    '$elemMatch' => ['$id' => new \MongoId($f->id)],
-                ],
-                'type' => ['$in' => ['ca', 'cb', 'cc']],
-            ],
-            $q1['query']
-        );
+        $this->assertEquals([ 'featureFullMany' => [ '$elemMatch' => [ '$id' => new \MongoId($f->id) ] ] ], $q1['query']);
 
         $q2 = $this->dm->createQueryBuilder(ParentClass::class)
             ->field('featureSimpleMany')->includesReferenceTo($f)
             ->getQuery()->debug();
 
-        $this->assertEquals(
-            [
-                'featureSimpleMany' => new \MongoId($f->id),
-                'type' => ['$in' => ['ca', 'cb', 'cc']],
-            ],
-            $q2['query']
-        );
+        $this->assertEquals([ 'featureSimpleMany' => new \MongoId($f->id) ], $q2['query']);
 
         $q3 = $this->dm->createQueryBuilder(ParentClass::class)
             ->field('featurePartialMany')->includesReferenceTo($f)
@@ -128,9 +101,8 @@ public function testIncludesReferenceToGoesThroughDiscriminatorMap()
                     '$elemMatch' => [
                         '$id' => new \MongoId($f->id),
                         '$ref' => 'Feature',
-                    ],
-                ],
-                'type' => ['$in' => ['ca', 'cb', 'cc']],
+                    ]
+                ]
             ],
             $q3['query']
         );