1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
|
<?php
declare(strict_types=1);
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\Collection;
use Doctrine\Common\Collections\Criteria;
use Doctrine\ORM\Mapping\Column;
use Doctrine\ORM\Mapping\Entity;
use Doctrine\ORM\Mapping\GeneratedValue;
use Doctrine\ORM\Mapping\Id;
use Doctrine\ORM\Mapping\ManyToOne;
use Doctrine\ORM\Mapping\OneToMany;
use Doctrine\ORM\Mapping\OrderBy;
use Doctrine\Tests\OrmFunctionalTestCase;
use function assert;
/** @group GH7836 */
class GH7836Test extends OrmFunctionalTestCase
{
protected function setUp(): void
{
parent::setUp();
$this->setUpEntitySchema([GH7836ParentEntity::class, GH7836ChildEntity::class]);
$parent = new GH7836ParentEntity();
$parent->addChild(100, 'foo');
$parent->addChild(100, 'bar');
$parent->addChild(200, 'baz');
$this->_em->persist($parent);
$this->_em->flush();
$this->_em->clear();
}
public function testMatchingRespectsCollectionOrdering(): void
{
$parent = $this->_em->find(GH7836ParentEntity::class, 1);
assert($parent instanceof GH7836ParentEntity);
$children = $parent->getChildren()->matching(Criteria::create());
self::assertSame(100, $children[0]->position);
self::assertSame('bar', $children[0]->name);
self::assertSame(100, $children[1]->position);
self::assertSame('foo', $children[1]->name);
self::assertSame(200, $children[2]->position);
self::assertSame('baz', $children[2]->name);
}
public function testMatchingOverrulesCollectionOrdering(): void
{
$parent = $this->_em->find(GH7836ParentEntity::class, 1);
assert($parent instanceof GH7836ParentEntity);
$children = $parent->getChildren()->matching(Criteria::create()->orderBy(['position' => 'DESC', 'name' => 'ASC']));
self::assertSame(200, $children[0]->position);
self::assertSame('baz', $children[0]->name);
self::assertSame(100, $children[1]->position);
self::assertSame('bar', $children[1]->name);
self::assertSame(100, $children[2]->position);
self::assertSame('foo', $children[2]->name);
}
public function testMatchingKeepsOrderOfCriteriaOrderingKeys(): void
{
$parent = $this->_em->find(GH7836ParentEntity::class, 1);
assert($parent instanceof GH7836ParentEntity);
$children = $parent->getChildren()->matching(Criteria::create()->orderBy(['name' => 'ASC', 'position' => 'ASC']));
self::assertSame(100, $children[0]->position);
self::assertSame('bar', $children[0]->name);
self::assertSame(200, $children[1]->position);
self::assertSame('baz', $children[1]->name);
self::assertSame(100, $children[2]->position);
self::assertSame('foo', $children[2]->name);
}
}
/** @Entity */
class GH7836ParentEntity
{
/**
* @var int
* @Id
* @Column(type="integer")
* @GeneratedValue
*/
private $id;
/**
* @var Collection<int, GH7836ChildEntity>
* @OneToMany(targetEntity=GH7836ChildEntity::class, mappedBy="parent", fetch="EXTRA_LAZY", cascade={"persist"})
* @OrderBy({"position" = "ASC", "name" = "ASC"})
*/
private $children;
public function addChild(int $position, string $name): void
{
$this->children[] = new GH7836ChildEntity($this, $position, $name);
}
/** @psalm-return Collection<int, GH7836ChildEntity> */
public function getChildren(): Collection
{
return $this->children;
}
}
/** @Entity */
class GH7836ChildEntity
{
/**
* @var int
* @Id
* @Column(type="integer")
* @GeneratedValue
*/
private $id;
/**
* @var int
* @Column(type="integer")
*/
public $position;
/**
* @var string
* @Column(type="string", length=255)
*/
public $name;
/**
* @var GH7836ParentEntity
* @ManyToOne(targetEntity=GH7836ParentEntity::class, inversedBy="children")
*/
private $parent;
public function __construct(GH7836ParentEntity $parent, int $position, string $name)
{
$this->parent = $parent;
$this->position = $position;
$this->name = $name;
}
}
|
