Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit e5c7dd1

Browse filesBrowse files
committed
fix compatibility with Doctrine ORM 4
1 parent f35f975 commit e5c7dd1
Copy full SHA for e5c7dd1

File tree

Expand file treeCollapse file tree

2 files changed

+19
-2
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+19
-2
lines changed

‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
+13-1Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
use Doctrine\ORM\EntityRepository;
1717
use Doctrine\ORM\Mapping\ClassMetadata;
1818
use Doctrine\ORM\Mapping\ClassMetadataInfo;
19+
use Doctrine\ORM\Mapping\PropertyAccessors\PropertyAccessor;
20+
use Doctrine\ORM\Mapping\PropertyAccessors\RawValuePropertyAccessor;
1921
use Doctrine\ORM\Tools\SchemaTool;
2022
use Doctrine\Persistence\ManagerRegistry;
2123
use Doctrine\Persistence\ObjectManager;
@@ -115,11 +117,21 @@ class_exists(ClassMetadataInfo::class) ? ClassMetadataInfo::class : ClassMetadat
115117
->willReturn(true)
116118
;
117119
$refl = $this->createMock(\ReflectionProperty::class);
120+
$refl
121+
->method('getName')
122+
->willReturn('name')
123+
;
118124
$refl
119125
->method('getValue')
120126
->willReturn(true)
121127
;
122-
$classMetadata->reflFields = ['name' => $refl];
128+
129+
if (interface_exists(PropertyAccessor::class)) {
130+
$classMetadata->propertyAccessors['name'] = RawValuePropertyAccessor::fromReflectionProperty($refl);
131+
} else {
132+
$classMetadata->reflFields = ['name' => $refl];
133+
}
134+
123135
$em->expects($this->any())
124136
->method('getClassMetadata')
125137
->willReturn($classMetadata)

‎src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
+6-1Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Bridge\Doctrine\Validator\Constraints;
1313

14+
use Doctrine\ORM\Mapping\PropertyAccessors\PropertyAccessor;
1415
use Doctrine\Persistence\ManagerRegistry;
1516
use Doctrine\Persistence\Mapping\ClassMetadata;
1617
use Doctrine\Persistence\ObjectManager;
@@ -92,7 +93,11 @@ public function validate(mixed $entity, Constraint $constraint)
9293
throw new ConstraintDefinitionException(sprintf('The field "%s" is not mapped by Doctrine, so it cannot be validated for uniqueness.', $fieldName));
9394
}
9495

95-
$fieldValue = $class->reflFields[$fieldName]->getValue($entity);
96+
if (interface_exists(PropertyAccessor::class)) {
97+
$fieldValue = $class->propertyAccessors[$fieldName]->getValue($entity);
98+
} else {
99+
$fieldValue = $class->reflFields[$fieldName]->getValue($entity);
100+
}
96101

97102
if (null === $fieldValue && $this->ignoreNullForField($constraint, $fieldName)) {
98103
$hasIgnorableNullValue = true;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.