Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[DoctrineBridge] Fix UniqueEntityValidator with proxy object #57188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 31, 2024
Merged

[DoctrineBridge] Fix UniqueEntityValidator with proxy object #57188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions src/Symfony/Bridge/Doctrine/Tests/Fixtures/SingleIntIdWithPrivateNameEntity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?php

/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Symfony\Bridge\Doctrine\Tests\Fixtures;

use Doctrine\ORM\Mapping\Column;
use Doctrine\ORM\Mapping\Entity;
use Doctrine\ORM\Mapping\Id;

#[Entity]
class SingleIntIdWithPrivateNameEntity
{
public function __construct(
#[Id, Column(type: 'integer')]
protected int $id,

#[Column(type: 'string', nullable: true)]
private ?string $name,
) {
}

public function getName(): ?string
{
return $this->name;
}

public function __toString(): string
{
return (string) $this->name;
}
}
46 changes: 38 additions & 8 deletions src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity;
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdNoToStringEntity;
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdStringWrapperNameEntity;
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdWithPrivateNameEntity;
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringIdEntity;
use Symfony\Bridge\Doctrine\Tests\Fixtures\Type\StringWrapper;
use Symfony\Bridge\Doctrine\Tests\Fixtures\Type\StringWrapperType;
Expand Down Expand Up @@ -90,12 +91,17 @@ protected function createRegistryMock($em = null)
return $registry;
}

protected function createRepositoryMock()
protected function createRepositoryMock(string $className)
{
return $this->getMockBuilder(MockableRepository::class)
$repositoryMock = $this->getMockBuilder(MockableRepository::class)
->disableOriginalConstructor()
->onlyMethods(['find', 'findAll', 'findOneBy', 'findBy', 'getClassName', 'findByCustom'])
->getMock();

$repositoryMock->method('getClassName')
->willReturn($className);

return $repositoryMock;
}

protected function createEntityManagerMock($repositoryMock)
Expand All @@ -109,6 +115,10 @@ protected function createEntityManagerMock($repositoryMock)
$classMetadata = $this->createMock(
class_exists(ClassMetadataInfo::class) ? ClassMetadataInfo::class : ClassMetadata::class
);
$classMetadata
->method('getName')
->willReturn($repositoryMock->getClassName())
;
$classMetadata
->expects($this->any())
->method('hasField')
Expand Down Expand Up @@ -138,6 +148,7 @@ private function createSchema($em)
$schemaTool = new SchemaTool($em);
$schemaTool->createSchema([
$em->getClassMetadata(SingleIntIdEntity::class),
$em->getClassMetadata(SingleIntIdWithPrivateNameEntity::class),
$em->getClassMetadata(SingleIntIdNoToStringEntity::class),
$em->getClassMetadata(DoubleNameEntity::class),
$em->getClassMetadata(DoubleNullableNameEntity::class),
Expand Down Expand Up @@ -194,6 +205,25 @@ public static function provideUniquenessConstraints(): iterable
yield 'Named arguments' => [new UniqueEntity(message: 'myMessage', fields: ['name'], em: 'foo')];
}

public function testValidateEntityWithPrivatePropertyAndProxyObject()
{
$entity = new SingleIntIdWithPrivateNameEntity(1, 'Foo');
$this->em->persist($entity);
$this->em->flush();

$this->em->clear();

// this will load a proxy object
$entity = $this->em->getReference(SingleIntIdWithPrivateNameEntity::class, 1);

$this->validator->validate($entity, new UniqueEntity([
'fields' => ['name'],
'em' => self::EM_NAME,
]));

$this->assertNoViolation();
}

/**
* @dataProvider provideConstraintsWithCustomErrorPath
*/
Expand Down Expand Up @@ -387,7 +417,7 @@ public function testValidateUniquenessWithValidCustomErrorPath()
*/
public function testValidateUniquenessUsingCustomRepositoryMethod(UniqueEntity $constraint)
{
$repository = $this->createRepositoryMock();
$repository = $this->createRepositoryMock(SingleIntIdEntity::class);
$repository->expects($this->once())
->method('findByCustom')
->willReturn([])
Expand All @@ -411,7 +441,7 @@ public function testValidateUniquenessWithUnrewoundArray(UniqueEntity $constrain
{
$entity = new SingleIntIdEntity(1, 'foo');

$repository = $this->createRepositoryMock();
$repository = $this->createRepositoryMock(SingleIntIdEntity::class);
$repository->expects($this->once())
->method('findByCustom')
->willReturnCallback(
Expand Down Expand Up @@ -459,7 +489,7 @@ public function testValidateResultTypes($entity1, $result)
'repositoryMethod' => 'findByCustom',
]);

$repository = $this->createRepositoryMock();
$repository = $this->createRepositoryMock($entity1::class);
$repository->expects($this->once())
->method('findByCustom')
->willReturn($result)
Expand Down Expand Up @@ -581,7 +611,7 @@ public function testAssociatedEntityWithNull()

public function testValidateUniquenessWithArrayValue()
{
$repository = $this->createRepositoryMock();
$repository = $this->createRepositoryMock(SingleIntIdEntity::class);
$this->repositoryFactory->setRepository($this->em, SingleIntIdEntity::class, $repository);

$constraint = new UniqueEntity([
Expand Down Expand Up @@ -662,7 +692,7 @@ public function testEntityManagerNullObject()

public function testValidateUniquenessOnNullResult()
{
$repository = $this->createRepositoryMock();
$repository = $this->createRepositoryMock(SingleIntIdEntity::class);
$repository
->method('find')
->willReturn(null)
Expand Down Expand Up @@ -850,7 +880,7 @@ public function testValidateUniquenessWithEmptyIterator($entity, $result)
'repositoryMethod' => 'findByCustom',
]);

$repository = $this->createRepositoryMock();
$repository = $this->createRepositoryMock($entity::class);
$repository->expects($this->once())
->method('findByCustom')
->willReturn($result)
Expand Down
4 changes: 3 additions & 1 deletion src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,9 @@ private function getFieldValues(mixed $object, ClassMetadata $class, array $fiel
throw new ConstraintDefinitionException(sprintf('The field "%s" is not a property of class "%s".', $fieldName, $objectClass));
}

$fieldValues[$entityFieldName] = $this->getPropertyValue($objectClass, $fieldName, $object);
$fieldValues[$entityFieldName] = $isValueEntity && $object instanceof ($class->getName())
? $class->reflFields[$fieldName]->getValue($object)
: $this->getPropertyValue($objectClass, $fieldName, $object);
}

return $fieldValues;
Expand Down