Merge pull request #1461 from malarzm/gh1456-2

Do not refresh documents when loading sorted collection

Author: malarzm

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

@@ -713,9 +713,11 @@ private function loadReferenceManyCollectionOwningSide(PersistentCollection $col
             $documents = $cursor->toArray(false);
             foreach ($documents as $documentData) {
                 $document = $this->uow->getById($documentData['_id'], $class);
-                $data = $this->hydratorFactory->hydrate($document, $documentData);
-                $this->uow->setOriginalDocumentData($document, $data);
-                $document->__isInitialized__ = true;
+                if ($document instanceof Proxy && ! $document->__isInitialized()) {
+                    $data = $this->hydratorFactory->hydrate($document, $documentData);
+                    $this->uow->setOriginalDocumentData($document, $data);
+                    $document->__isInitialized__ = true;
+                }
                 if ($sorted) {
                     $collection->add($document);
                 }

tests/Doctrine/ODM/MongoDB/Tests/Functional/ReferencesTest.php

@@ -334,9 +334,11 @@ public function testSortReferenceManyOwningSide()
         $this->assertEquals('Group 1', $groups[0]->getName());
         $this->assertEquals('Group 2', $groups[1]->getName());
 
+        $groups[1]->setName('Group 2a');
+
         $groups = $user->getSortedDescGroups();
         $this->assertEquals(2, $groups->count());
-        $this->assertEquals('Group 2', $groups[0]->getName());
+        $this->assertEquals('Group 2a', $groups[0]->getName());
         $this->assertEquals('Group 1', $groups[1]->getName());
     }