dualfroz/doctrine-collections
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upstream doctrine/collections state of the touched files before 990f3f475a

Browse Source
This commit is contained in:
upstream committed 2026-09-04 06:21:06 +02:00
1 parent 2572a60593
commit f0274aca89
2 files changed
+2 -50
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Expr/ClosureExpressionVisitor.php
+2 -4
View File
@@ -170,13 +170,11 @@ class ClosureExpressionVisitor extends ExpressionVisitor
$aValue = ClosureExpressionVisitor::getObjectFieldValue($a, $name, $accessRawFieldValues);
$bValue = ClosureExpressionVisitor::getObjectFieldValue($b, $name, $accessRawFieldValues);
$comparison = $aValue <=> $bValue;
if ($comparison === 0) {
if ($aValue === $bValue) {
return $next($a, $b);
}
return $comparison * $orientation;
return ($aValue > $bValue ? 1 : -1) * $orientation;
};
}
tests/ClosureExpressionVisitorTest.php
-46
View File
@@ -6,7 +6,6 @@ namespace Doctrine\Tests\Common\Collections;
use ArrayAccess;
use ArrayIterator;
use DateTimeImmutable;
use Doctrine\Common\Collections\Expr\ClosureExpressionVisitor;
use Doctrine\Common\Collections\Expr\Comparison;
use Doctrine\Common\Collections\Expr\CompositeExpression;
@@ -488,51 +487,6 @@ class ClosureExpressionVisitorTest extends TestCase
self::assertEquals('c', $objects[2]->getBar());
}
public function testSortDelegateWithEqualButNotIdenticalObjectPrimaryField(): void
{
// Value-equal but not identical primary values must still fall through to
// the secondary field.
$sameInstant = static fn (): DateTimeImmutable => new DateTimeImmutable('2024-12-10 16:04:11');
$objects = [
new TestObject($sameInstant(), 5),
new TestObject($sameInstant(), 6),
];
self::assertNotSame($objects[0]->getFoo(), $objects[1]->getFoo());
self::assertEquals($objects[0]->getFoo(), $objects[1]->getFoo());
$sort = ClosureExpressionVisitor::sortByField('bar', -1, null, true);
$sort = ClosureExpressionVisitor::sortByField('foo', -1, $sort, true);
usort($objects, $sort);
self::assertEquals(6, $objects[0]->getBar());
self::assertEquals(5, $objects[1]->getBar());
}
public function testSortByFieldComparatorIsAntisymmetricForEqualButNotIdenticalObjects(): void
{
// Swapping the input order of two value-equal elements must not change
// which one sorts first.
$sameInstant = static fn (): DateTimeImmutable => new DateTimeImmutable('2024-12-10 16:04:11');
$element5 = new TestObject($sameInstant(), 5);
$element6 = new TestObject($sameInstant(), 6);
$sort = ClosureExpressionVisitor::sortByField('bar', -1, null, true);
$sort = ClosureExpressionVisitor::sortByField('foo', -1, $sort, true);
$orderedFromAscendingInput = [$element5, $element6];
usort($orderedFromAscendingInput, $sort);
$orderedFromDescendingInput = [$element6, $element5];
usort($orderedFromDescendingInput, $sort);
self::assertEquals(6, $orderedFromAscendingInput[0]->getBar());
self::assertEquals(6, $orderedFromDescendingInput[0]->getBar());
}
public function testArrayComparison(): void
{
$closure = $this->visitor->walkComparison($this->builder->eq('foo', 42));