kbond
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/SingleIntIdEntity.php‎
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/SingleIntIdEntity.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/SingleIntIdEntityRepository.php‎
Lines changed: 24 additions & 0 deletions b/‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/SingleIntIdEntityRepository.php‎
Lines changed: 24 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php‎
Lines changed: 11 additions & 105 deletions b/‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php‎
Lines changed: 11 additions & 105 deletions
@@ -16,7 +16,7 @@
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\Id;
 
-#[Entity]
+#[Entity(repositoryClass: SingleIntIdEntityRepository::class)]
 class SingleIntIdEntity
 {
     #[Column(type: Types::JSON, nullable: true)]
 
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * 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\EntityRepository;
+
+class SingleIntIdEntityRepository extends EntityRepository
+{
+    public $result = null;
+
+    public function findByCustom()
+    {
+        return $this->result;
+    }
+}
@@ -14,9 +14,7 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
-use Doctrine\ORM\Mapping\PropertyAccessors\RawValuePropertyAccessor;
 use Doctrine\ORM\Tools\SchemaTool;
 use Doctrine\Persistence\ManagerRegistry;
 use Doctrine\Persistence\ObjectManager;
@@ -29,8 +27,8 @@
 use Symfony\Bridge\Doctrine\Tests\Fixtures\DoubleNameEntity;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\DoubleNullableNameEntity;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\Employee;
-use Symfony\Bridge\Doctrine\Tests\Fixtures\MockableRepository;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\Person;
+use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntityRepository;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdNoToStringEntity;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdStringWrapperNameEntity;
@@ -91,54 +89,6 @@ protected function createRegistryMock($em = null)
         return $registry;
     }
 
-    protected function createRepositoryMock()
-    {
-        return $this->getMockBuilder(MockableRepository::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['find', 'findAll', 'findOneBy', 'findBy', 'getClassName', 'findByCustom'])
-            ->getMock();
-    }
-
-    protected function createEntityManagerMock($repositoryMock)
-    {
-        $em = $this->createMock(ObjectManager::class);
-        $em->expects($this->any())
-            ->method('getRepository')
-            ->willReturn($repositoryMock)
-        ;
-
-        $classMetadata = $this->createMock(
-            class_exists(ClassMetadataInfo::class) ? ClassMetadataInfo::class : ClassMetadata::class
-        );
-        $classMetadata
-            ->expects($this->any())
-            ->method('hasField')
-            ->willReturn(true)
-        ;
-        $refl = $this->createMock(\ReflectionProperty::class);
-        $refl
-            ->method('getName')
-            ->willReturn('name')
-        ;
-        $refl
-            ->method('getValue')
-            ->willReturn(true)
-        ;
-
-        if (property_exists(ClassMetadata::class, 'propertyAccessors')) {
-            $classMetadata->propertyAccessors['name'] = RawValuePropertyAccessor::fromReflectionProperty($refl);
-        } else {
-            $classMetadata->reflFields = ['name' => $refl];
-        }
-
-        $em->expects($this->any())
-            ->method('getClassMetadata')
-            ->willReturn($classMetadata)
-        ;
-
-        return $em;
-    }
-
     protected function createValidator(): UniqueEntityValidator
     {
         return new UniqueEntityValidator($this->registry);
@@ -398,13 +348,7 @@ public function testValidateUniquenessWithValidCustomErrorPath()
      */
     public function testValidateUniquenessUsingCustomRepositoryMethod(UniqueEntity $constraint)
     {
-        $repository = $this->createRepositoryMock();
-        $repository->expects($this->once())
-            ->method('findByCustom')
-            ->willReturn([])
-        ;
-        $this->em = $this->createEntityManagerMock($repository);
-        $this->registry = $this->createRegistryMock($this->em);
+        $this->em->getRepository(SingleIntIdEntity::class)->result = [];
         $this->validator = $this->createValidator();
         $this->validator->initialize($this->context);
 
@@ -422,22 +366,12 @@ public function testValidateUniquenessWithUnrewoundArray(UniqueEntity $constrain
     {
         $entity = new SingleIntIdEntity(1, 'foo');
 
-        $repository = $this->createRepositoryMock();
-        $repository->expects($this->once())
-            ->method('findByCustom')
-            ->willReturnCallback(
-                function () use ($entity) {
-                    $returnValue = [
-                        $entity,
-                    ];
-                    next($returnValue);
-
-                    return $returnValue;
-                }
-            )
-        ;
-        $this->em = $this->createEntityManagerMock($repository);
-        $this->registry = $this->createRegistryMock($this->em);
+        $returnValue = [
+            $entity,
+        ];
+        next($returnValue);
+
+        $this->em->getRepository(SingleIntIdEntity::class)->result = $returnValue;
         $this->validator = $this->createValidator();
         $this->validator->initialize($this->context);
 
@@ -470,13 +404,7 @@ public function testValidateResultTypes($entity1, $result)
             'repositoryMethod' => 'findByCustom',
         ]);
 
-        $repository = $this->createRepositoryMock();
-        $repository->expects($this->once())
-            ->method('findByCustom')
-            ->willReturn($result)
-        ;
-        $this->em = $this->createEntityManagerMock($repository);
-        $this->registry = $this->createRegistryMock($this->em);
+        $this->em->getRepository(SingleIntIdEntity::class)->result = $result;
         $this->validator = $this->createValidator();
         $this->validator->initialize($this->context);
 
@@ -592,9 +520,6 @@ public function testAssociatedEntityWithNull()
 
     public function testValidateUniquenessWithArrayValue()
     {
-        $repository = $this->createRepositoryMock();
-        $this->repositoryFactory->setRepository($this->em, SingleIntIdEntity::class, $repository);
-
         $constraint = new UniqueEntity([
             'message' => 'myMessage
393B
9;,
             'fields' => ['phoneNumbers'],
@@ -605,10 +530,7 @@ public function testValidateUniquenessWithArrayValue()
         $entity1 = new SingleIntIdEntity(1, 'foo');
         $entity1->phoneNumbers[] = 123;
 
-        $repository->expects($this->once())
-            ->method('findByCustom')
-            ->willReturn([$entity1])
-        ;
+        
D285
$this->em->getRepository(SingleIntIdEntity::class)->result = $entity1;
 
         $this->em->persist($entity1);
         $this->em->flush();
@@ -658,8 +580,6 @@ public function testEntityManagerNullObject()
             // no "em" option set
         ]);
 
-        $this->em = null;
-        $this->registry = $this->createRegistryMock($this->em);
         $this->validator = $this->createValidator();
         $this->validator->initialize($this->context);
 
@@ -673,14 +593,6 @@ public function testEntityManagerNullObject()
 
     public function testValidateUniquenessOnNullResult()
     {
-        $repository = $this->createRepositoryMock();
-        $repository
-             ->method('find')
-             ->willReturn(null)
-        ;
-
-        $this->em = $this->createEntityManagerMock($repository);
-        $this->registry = $this->createRegistryMock($this->em);
         $this->validator = $this->createValidator();
         $this->validator->initialize($this->context);
 
@@ -861,13 +773,7 @@ public function testValidateUniquenessWithEmptyIterator($entity, $result)
             'repositoryMethod' => 'findByCustom',
         ]);
 
-        $repository = $this->createRepositoryMock();
-        $repository->expects($this->once())
-            ->method('findByCustom')
-            ->willReturn($result)
-        ;
-        $this->em = $this->createEntityManagerMock($repository);
-        $this->registry = $this->createRegistryMock($this->em);
+        $this->em->getRepository(SingleIntIdEntity::class)->result = $result;
         $this->validator = $this->createValidator();
         $this->validator->initialize($this->context);
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`use Doctrine\ORM\Mapping\Entity;`
`17`	`17`	`use Doctrine\ORM\Mapping\Id;`
`18`	`18`
`19`		`-#[Entity]`
	`19`	`+#[Entity(repositoryClass: SingleIntIdEntityRepository::class)]`
`20`	`20`	`class SingleIntIdEntity`
`21`	`21`	`{`
`22`	`22`	`#[Column(type: Types::JSON, nullable: true)]`