Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release 2.2.3 into 2.3.x #2393

Merged
merged 15 commits into from
Nov 30, 2021
Merged

Merge release 2.2.3 into 2.3.x #2393

Changes from 6 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
30b74bf
use @requires annotations to skip tests on older PHP versions
IonBazan Aug 16, 2021
5ff9dff
Merge pull request #2360 from IonBazan/refactor/requires
malarzm Aug 17, 2021
500d030
support wildcard index mapping
IonBazan Sep 28, 2021
e2d231f
add test
IonBazan Oct 15, 2021
3deac8a
Merge pull request #2372 from IonBazan/bugfix/wildcard-indexes
IonBazan Oct 17, 2021
78b60f2
Use array_diff_key to get diff for new or deleted documents (#2387)
pepeh Nov 5, 2021
1335901
remove backslashes
pepeh Nov 5, 2021
f0301a2
Fix code style
pepeh Nov 5, 2021
e01fe30
Return is_object check
pepeh Nov 5, 2021
aeaa4a3
Use spl_object_id instead of of spl_object_hash
pepeh Nov 11, 2021
5259b02
Merge pull request #2388 from pepeh/2387-fix-collection-documents-diff
IonBazan Nov 12, 2021
fe497bd
Reuse workflows from upstream
greg0ire Nov 13, 2021
bc49b1e
Merge pull request #2390 from greg0ire/reuse-workflows
greg0ire Nov 18, 2021
6c350f6
Merge remote-tracking branch 'upstream/2.3.x' into 2.2.x-merge-up-int…
franmomu Nov 30, 2021
fe4d27d
Add missing type declaration
franmomu Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 11 additions & 24 deletions lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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} */
Expand All @@ -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} */
Expand Down