Merge pull request #2388 from pepeh/2387-fix-collection-documents-diff

Use array_diff_key to get diff for new or deleted documents
doctrine · Nov 12, 2021 · 5259b02 · 5259b02
2 parents 3deac8a + aeaa4a3
commit 5259b02
Showing 1 changed file with 11 additions and 24 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionTrait.php b/lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionTrait.php
@@ -11,13 +11,14 @@
 use Doctrine\ODM\MongoDB\UnitOfWork;
 use Doctrine\ODM\MongoDB\Utility\CollectionHelper;
 
-use function array_udiff;
+use function array_combine;
+use function array_diff_key;
+use function array_map;
 use function array_udiff_assoc;
 use function array_values;
 use function count;
 use function get_class;
 use function is_object;
-use function spl_object_hash;
 
 /**
  * Trait with methods needed to implement PersistentCollectionInterface.
@@ -255,18 +256,11 @@ static function ($a, $b) {
     /** {@inheritdoc} */
     public function getDeletedDocuments()
     {
-        $compare = static function ($a, $b) {
-            $compareA = is_object($a) ? spl_object_hash($a) : $a;
-            $compareb = is_object($b) ? spl_object_hash($b) : $b;
+        $coll               = $this->coll->toArray();
+        $loadedObjectsByOid = array_combine(array_map('spl_object_id', $this->snapshot), $this->snapshot);
+        $newObjectsByOid    = array_combine(array_map('spl_object_id', $coll), $coll);
 
-            return $compareA === $compareb ? 0 : ($compareA > $compareb ? 1 : -1);
-        };
-
-        return array_values(array_udiff(
-            $this->snapshot,
-            $this->coll->toArray(),
-            $compare
-        ));
+        return array_values(array_diff_key($loadedObjectsByOid, $newObjectsByOid));
     }
 
     /** {@inheritdoc} */
@@ -284,18 +278,11 @@ static function ($a, $b) {
     /** {@inheritdoc} */
     public function getInsertedDocuments()
     {
-        $compare = static function ($a, $b) {
-            $compareA = is_object($a) ? spl_object_hash($a) : $a;
-            $compareb = is_object($b) ? spl_object_hash($b) : $b;
+        $coll               = $this->coll->toArray();
+        $newObjectsByOid    = array_combine(array_map('spl_object_id', $coll), $coll);
+        $loadedObjectsByOid = array_combine(array_map('spl_object_id', $this->snapshot), $this->snapshot);
 
-            return $compareA === $compareb ? 0 : ($compareA > $compareb ? 1 : -1);
-        };
-
-        return array_values(array_udiff(
-            $this->coll->toArray(),
-            $this->snapshot,
-            $compare
-        ));
+        return array_values(array_diff_key($newObjectsByOid, $loadedObjectsByOid));
     }
 
     /** {@inheritdoc} */