Merge pull request #1554

Author: Maciej Malarz

lib/Doctrine/ODM/MongoDB/Query/Expr.php

@@ -90,7 +90,7 @@ public function references($document)
                 }
 
                 foreach ($keys as $key => $value) {
-                    $this->query[$this->currentField . '.$' . $key] = $dbRef['$' . $key];
+                    $this->query[$mapping['name'] . '.$' . $key] = $dbRef['$' . $key];
                 }
             }
         } else {
@@ -128,7 +128,7 @@ public function includesReferenceTo($document)
                 }
 
                 foreach ($keys as $key => $value) {
-                    $this->query[$this->currentField]['$elemMatch']['$' . $key] = $dbRef['$' . $key];
+                    $this->query[$mapping['name']]['$elemMatch']['$' . $key] = $dbRef['$' . $key];
                 }
             }
         } else {

tests/Doctrine/ODM/MongoDB/Tests/Query/ExprTest.php

@@ -206,11 +206,11 @@ public function testReferencesUsesMinimalKeys()
             ->will($this->returnValue($expected));
         $class->expects($this->once())
             ->method('getFieldMapping')
-            ->will($this->returnValue(array('targetDocument' => 'Foo')));
+            ->will($this->returnValue(array('targetDocument' => 'Foo', 'name' => 'foo')));
 
         $expr = new Expr($dm);
         $expr->setClassMetadata($class);
-        $expr->field('foo')->references(new \stdClass());
+        $expr->field('bar')->references(new \stdClass());
 
         $this->assertEquals($expected, $expr->getQuery(), '->references() uses just $id if a targetDocument is set');
     }
@@ -239,11 +239,11 @@ public function testReferencesUsesAllKeys()
             ->will($this->returnValue($expected));
         $class->expects($this->once())
             ->method('getFieldMapping')
-            ->will($this->returnValue(array()));
+            ->will($this->returnValue(array('name' => 'foo')));
 
         $expr = new Expr($dm);
         $expr->setClassMetadata($class);
-        $expr->field('foo')->references(new \stdClass());
+        $expr->field('bar')->references(new \stdClass());
 
         $this->assertEquals($expected, $expr->getQuery(), '->references() uses all keys if no targetDocument is set');
     }
@@ -272,11 +272,11 @@ public function testReferencesUsesSomeKeys()
             ->will($this->returnValue($expected));
         $class->expects($this->once())
             ->method('getFieldMapping')
-            ->will($this->returnValue(array('storeAs' => ClassMetadataInfo::REFERENCE_STORE_AS_DB_REF)));
+            ->will($this->returnValue(array('storeAs' => ClassMetadataInfo::REFERENCE_STORE_AS_DB_REF, 'name' => 'foo')));
 
         $expr = new Expr($dm);
         $expr->setClassMetadata($class);
-        $expr->field('foo')->references(new \stdClass());
+        $expr->field('bar')->references(new \stdClass());
 
         $this->assertEquals($expected, $expr->getQuery(), '->references() uses some keys if storeAs=dbRef is set');
     }