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
|
<?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 GH7767 */
class GH7767Test extends OrmFunctionalTestCase
{
protected function setUp(): void
{
parent::setUp();
$this->setUpEntitySchema([GH7767ParentEntity::class, GH7767ChildEntity::class]);
$parent = new GH7767ParentEntity();
$parent->addChild(200);
$parent->addChild(100);
$parent->addChild(300);
$this->_em->persist($parent);
$this->_em->flush();
$this->_em->clear();
}
public function testMatchingRespectsCollectionOrdering(): void
{
$parent = $this->_em->find(GH7767ParentEntity::class, 1);
assert($parent instanceof GH7767ParentEntity);
$children = $parent->getChildren()->matching(Criteria::create());
self::assertEquals(100, $children[0]->position);
self::assertEquals(200, $children[1]->position);
self::assertEquals(300, $children[2]->position);
}
public function testMatchingOverrulesCollectionOrdering(): void
{
$parent = $this->_em->find(GH7767ParentEntity::class, 1);
assert($parent instanceof GH7767ParentEntity);
$children = $parent->getChildren()->matching(Criteria::create()->orderBy(['position' => 'DESC']));
self::assertEquals(300, $children[0]->position);
self::assertEquals(200, $children[1]->position);
self::assertEquals(100, $children[2]->position);
}
}
/** @Entity */
class GH7767ParentEntity
{
/**
* @var int
* @Id
* @Column(type="integer")
* @GeneratedValue
*/
private $id;
/**
* @psalm-var Collection<int, GH7767ChildEntity>
* @OneToMany(targetEntity=GH7767ChildEntity::class, mappedBy="parent", fetch="EXTRA_LAZY", cascade={"persist"})
* @OrderBy({"position" = "ASC"})
*/
private $children;
public function addChild(int $position): void
{
$this->children[] = new GH7767ChildEntity($this, $position);
}
/** @psalm-return Collection<int, GH7767ChildEntity> */
public function getChildren(): Collection
{
return $this->children;
}
}
/** @Entity */
class GH7767ChildEntity
{
/**
* @var int
* @Id
* @Column(type="integer")
* @GeneratedValue
*/
private $id;
/**
* @var int
* @Column(type="integer")
*/
public $position;
/**
* @var GH7767ParentEntity
* @ManyToOne(targetEntity=GH7767ParentEntity::class, inversedBy="children")
*/
private $parent;
public function __construct(GH7767ParentEntity $parent, int $position)
{
$this->parent = $parent;
$this->position = $position;
}
}
|
