Skip to content

Commit f9dbfdf

Browse files
author
Valentin SALMERON
committed
Fix issue #11481 
1 parent ca3319c commit f9dbfdf

File tree

8 files changed

+341
-60
lines changed

8 files changed

+341
-60
lines changed

‎src/Persisters/Collection/ManyToManyPersister.php

+5-1
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
use Doctrine\ORM\Mapping\ManyToManyAssociationMapping;
1616
use Doctrine\ORM\PersistentCollection;
1717
use Doctrine\ORM\Persisters\SqlValueVisitor;
18+
use Doctrine\ORM\Persisters\Traits\ResolveValuesHelper;
1819
use Doctrine\ORM\Query;
1920
use Doctrine\ORM\Utility\PersisterHelper;
2021

2122
use function array_fill;
23+
use function array_merge;
2224
use function array_pop;
2325
use function assert;
2426
use function count;
@@ -32,6 +34,8 @@
3234
*/
3335
class ManyToManyPersister extends AbstractCollectionPersister
3436
{
37+
use ResolveValuesHelper;
38+
3539
public function delete(PersistentCollection $collection): void
3640
{
3741
$mapping = $this->getMapping($collection);
@@ -249,7 +253,7 @@ public function loadCriteria(PersistentCollection $collection, Criteria $criteri
249253
$whereClauses[] = sprintf('te.%s %s NULL', $field, $operator === Comparison::EQ ? 'IS' : 'IS NOT');
250254
} else {
251255
$whereClauses[] = sprintf('te.%s %s ?', $field, $operator);
252-
$params[] = $value;
256+
$params = array_merge($params, $this->getValues($value));
253257
$paramTypes[] = PersisterHelper::getTypeOfField($name, $targetClass, $this->em)[0];
254258
}
255259
}

‎src/Persisters/Entity/BasicEntityPersister.php

+2-59
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace Doctrine\ORM\Persisters\Entity;
66

7-
use BackedEnum;
87
use Doctrine\Common\Collections\Criteria;
98
use Doctrine\Common\Collections\Expr\Comparison;
109
use Doctrine\Common\Collections\Order;
@@ -31,7 +30,7 @@
3130
use Doctrine\ORM\Persisters\Exception\UnrecognizedField;
3231
use Doctrine\ORM\Persisters\SqlExpressionVisitor;
3332
use Doctrine\ORM\Persisters\SqlValueVisitor;
34-
use Doctrine\ORM\Proxy\DefaultProxyClassNameResolver;
33+
use Doctrine\ORM\Persisters\Traits\ResolveValuesHelper;
3534
use Doctrine\ORM\Query;
3635
use Doctrine\ORM\Query\QueryException;
3736
use Doctrine\ORM\Query\ResultSetMapping;
@@ -53,7 +52,6 @@
5352
use function count;
5453
use function implode;
5554
use function is_array;
56-
use function is_object;
5755
use function reset;
5856
use function spl_object_id;
5957
use function sprintf;
@@ -99,6 +97,7 @@
9997
class BasicEntityPersister implements EntityPersister
10098
{
10199
use LockSqlHelper;
100+
use ResolveValuesHelper;
102101

103102
/** @var array<string,string> */
104103
private static array $comparisonMap = [
@@ -1912,62 +1911,6 @@ private function getArrayBindingType(ParameterType|int|string $type): ArrayParam
19121911
};
19131912
}
19141913

1915-
/**
1916-
* Retrieves the parameters that identifies a value.
1917-
*
1918-
* @return mixed[]
1919-
*/
1920-
private function getValues(mixed $value): array
1921-
{
1922-
if (is_array($value)) {
1923-
$newValue = [];
1924-
1925-
foreach ($value as $itemValue) {
1926-
$newValue = array_merge($newValue, $this->getValues($itemValue));
1927-
}
1928-
1929-
return [$newValue];
1930-
}
1931-
1932-
return $this->getIndividualValue($value);
1933-
}
1934-
1935-
/**
1936-
* Retrieves an individual parameter value.
1937-
*
1938-
* @psalm-return list<mixed>
1939-
*/
1940-
private function getIndividualValue(mixed $value): array
1941-
{
1942-
if (! is_object($value)) {
1943-
return [$value];
1944-
}
1945-
1946-
if ($value instanceof BackedEnum) {
1947-
return [$value->value];
1948-
}
1949-
1950-
$valueClass = DefaultProxyClassNameResolver::getClass($value);
1951-
1952-
if ($this->em->getMetadataFactory()->isTransient($valueClass)) {
1953-
return [$value];
1954-
}
1955-
1956-
$class = $this->em->getClassMetadata($valueClass);
1957-
1958-
if ($class->isIdentifierComposite) {
1959-
$newValue = [];
1960-
1961-
foreach ($class->getIdentifierValues($value) as $innerValue) {
1962-
$newValue = array_merge($newValue, $this->getValues($innerValue));
1963-
}
1964-
1965-
return $newValue;
1966-
}
1967-
1968-
return [$this->em->getUnitOfWork()->getSingleIdentifierValue($value)];
1969-
}
1970-
19711914
public function exists(object $entity, Criteria|null $extraConditions = null): bool
19721915
{
19731916
$criteria = $this->class->getIdentifierValues($entity);

‎src/Persisters/Traits/ResolveValuesHelper.php

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\ORM\Persisters\Traits;
6+
7+
use BackedEnum;
8+
use Doctrine\ORM\EntityManagerInterface;
9+
use Doctrine\ORM\Proxy\DefaultProxyClassNameResolver;
10+
11+
use function array_merge;
12+
use function is_array;
13+
use function is_object;
14+
15+
trait ResolveValuesHelper
16+
{
17+
protected EntityManagerInterface $em;
18+
19+
/**
20+
* Retrieves the parameters that identifies a value.
21+
*
22+
* @return mixed[]
23+
*/
24+
private function getValues(mixed $value): array
25+
{
26+
if (is_array($value)) {
27+
$newValue = [];
28+
29+
foreach ($value as $itemValue) {
30+
$newValue = array_merge($newValue, $this->getValues($itemValue));
31+
}
32+
33+
return [$newValue];
34+
}
35+
36+
return $this->getIndividualValue($value);
37+
}
38+
39+
/**
40+
* Retrieves an individual parameter value.
41+
*
42+
* @psalm-return list<mixed>
43+
*/
44+
private function getIndividualValue(mixed $value): array
45+
{
46+
if (! is_object($value)) {
47+
return [$value];
48+
}
49+
50+
if ($value instanceof BackedEnum) {
51+
return [$value->value];
52+
}
53+
54+
$valueClass = DefaultProxyClassNameResolver::getClass($value);
55+
56+
if ($this->em->getMetadataFactory()->isTransient($valueClass)) {
57+
return [$value];
58+
}
59+
60+
$class = $this->em->getClassMetadata($valueClass);
61+
62+
if ($class->isIdentifierComposite) {
63+
$newValue = [];
64+
65+
foreach ($class->getIdentifierValues($value) as $innerValue) {
66+
$newValue = array_merge($newValue, $this->getValues($innerValue));
67+
}
68+
69+
return $newValue;
70+
}
71+
72+
return [$this->em->getUnitOfWork()->getSingleIdentifierValue($value)];
73+
}
74+
}

‎tests/Tests/Models/Enums/Book.php

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\Tests\Models\Enums;
6+
7+
use Doctrine\Common\Collections\ArrayCollection;
8+
use Doctrine\Common\Collections\Collection;
9+
use Doctrine\ORM\Mapping\Column;
10+
use Doctrine\ORM\Mapping\Entity;
11+
use Doctrine\ORM\Mapping\GeneratedValue;
12+
use Doctrine\ORM\Mapping\Id;
13+
use Doctrine\ORM\Mapping\JoinColumn;
14+
use Doctrine\ORM\Mapping\ManyToMany;
15+
use Doctrine\ORM\Mapping\ManyToOne;
16+
use Doctrine\ORM\Mapping\Table;
17+
18+
#[Entity]
19+
#[Table(name: 'books')]
20+
class Book
21+
{
22+
#[Id]
23+
#[GeneratedValue]
24+
#[Column]
25+
public int $id;
26+
27+
#[ManyToOne(targetEntity: Library::class, inversedBy: 'books')]
28+
#[JoinColumn(name: 'library_id', referencedColumnName: 'id')]
29+
public Library $library;
30+
31+
#[Column(enumType: BookColor::class)]
32+
public BookColor $bookColor;
33+
34+
#[ManyToMany(targetEntity: BookCategory::class, mappedBy: 'books')]
35+
public Collection $categories;
36+
37+
public function __construct()
38+
{
39+
$this->categories = new ArrayCollection();
40+
}
41+
42+
public function setLibrary(Library $library): void
43+
{
44+
$this->library = $library;
45+
}
46+
47+
public function addCategory(BookCategory $bookCategory): void
48+
{
49+
$this->categories->add($bookCategory);
50+
$bookCategory->addBook($this);
51+
}
52+
}

‎tests/Tests/Models/Enums/BookCategory.php

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\Tests\Models\Enums;
6+
7+
use Doctrine\Common\Collections\ArrayCollection;
8+
use Doctrine\Common\Collections\Collection;
9+
use Doctrine\Common\Collections\Criteria;
10+
use Doctrine\ORM\Mapping\Column;
11+
use Doctrine\ORM\Mapping\Entity;
12+
use Doctrine\ORM\Mapping\GeneratedValue;
13+
use Doctrine\ORM\Mapping\Id;
14+
use Doctrine\ORM\Mapping\ManyToMany;
15+
16+
#[Entity]
17+
class BookCategory
18+
{
19+
#[Id]
20+
#[Column]
21+
#[GeneratedValue]
22+
public int $id;
23+
24+
#[Column]
25+
public string $name;
26+
27+
#[ManyToMany(targetEntity: Book::class, inversedBy: 'categories')]
28+
public Collection $books;
29+
30+
public function __construct()
31+
{
32+
$this->books = new ArrayCollection();
33+
}
34+
35+
public function addBook(Book $book): void
36+
{
37+
$this->books->add($book);
38+
}
39+
40+
public function getBooks(): Collection
41+
{
42+
return $this->books;
43+
}
44+
45+
public function getBooksWithColor(BookColor $bookColor): Collection
46+
{
47+
$criteria = Criteria::create()
48+
->andWhere(Criteria::expr()->eq('bookColor', $bookColor));
49+
50+
return $this->books->matching($criteria);
51+
}
52+
}

‎tests/Tests/Models/Enums/BookColor.php

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\Tests\Models\Enums;
6+
7+
enum BookColor: string
8+
{
9+
case RED = 'red';
10+
case BLUE = 'blue';
11+
}

‎tests/Tests/Models/Enums/Library.php

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\Tests\Models\Enums;
6+
7+
use Doctrine\Common\Collections\ArrayCollection;
8+
use Doctrine\Common\Collections\Collection;
9+
use Doctrine\Common\Collections\Criteria;
10+
use Doctrine\ORM\Mapping\Column;
11+
use Doctrine\ORM\Mapping\Entity;
12+
use Doctrine\ORM\Mapping\GeneratedValue;
13+
use Doctrine\ORM\Mapping\Id;
14+
use Doctrine\ORM\Mapping\OneToMany;
15+
16+
#[Entity]
17+
class Library
18+
{
19+
#[Id]
20+
#[GeneratedValue]
21+
#[Column]
22+
public int $id;
23+
24+
#[OneToMany(targetEntity: Book::class, mappedBy: 'library')]
25+
public Collection $books;
26+
27+
public function __construct()
28+
{
29+
$this->books = new ArrayCollection();
30+
}
31+
32+
public function getBooksWithColor(BookColor $bookColor): Collection
33+
{
34+
$criteria = Criteria::create()
35+
->andWhere(Criteria::expr()->eq('bookColor', $bookColor));
36+
37+
return $this->books->matching($criteria);
38+
}
39+
40+
public function getBooks(): Collection
41+
{
42+
return $this->books;
43+
}
44+
45+
public function addBook(Book $book): void
46+
{
47+
$this->books->add($book);
48+
$book->setLibrary($this);
49+
}
50+
}

0 commit comments

Comments
 (0)