Merge branch '7.2' into 7.3

xabbuh · xabbuh · commit 9b71beb58780 · 2025-03-31T10:49:55.000+02:00
* 7.2:
  fix tests with Doctrine ORM 3.4+ on PHP &lt; 8.4
  reject URLs with URL-encoded non UTF-8 characters in the host part
  Bump Symfony version to 7.2.6
  Update VERSION for 7.2.5
  Update CHANGELOG for 7.2.5
  Bump Symfony version to 6.4.21
  Update VERSION for 6.4.20
  Update CONTRIBUTORS for 6.4.20
  Update CHANGELOG for 6.4.20
diff --git a/Tests/Fixtures/SingleIntIdEntity.php b/Tests/Fixtures/SingleIntIdEntity.php
@@ -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)]
diff --git a/Tests/Fixtures/SingleIntIdEntityRepository.php b/Tests/Fixtures/SingleIntIdEntityRepository.php
@@ -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;
+    }
+}
diff --git a/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -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;
@@ -33,8 +31,8 @@
 use Symfony\Bridge\Doctrine\Tests\Fixtures\Dto;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\Employee;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\HireAnEmployee;
-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;
@@ -99,63 +97,6 @@ protected function createRegistryMock($em = null)
         return $registry;
     }
 
-    protected function createRepositoryMock(string $className)
-    {
-        $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)
-    {
-        $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
-            ->method('getName')
-            ->willReturn($repositoryMock->getClassName())
-        ;
-        $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);
@@ -445,13 +386,7 @@ public function testValidateUniquenessWithValidCustomErrorPath()
 
     public function testValidateUniquenessUsingCustomRepositoryMethod()
     {
-        $repository = $this->createRepositoryMock(SingleIntIdEntity::class);
-        $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);
 
@@ -466,22 +401,12 @@ public function testValidateUniquenessWithUnrewoundArray()
     {
         $entity = new SingleIntIdEntity(1, 'foo');
 
-        $repository = $this->createRepositoryMock(SingleIntIdEntity::class);
-        $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);
 
@@ -502,13 +427,7 @@ public function testValidateResultTypes($entity1, $result)
             repositoryMethod: 'findByCustom',
         );
 
-        $repository = $this->createRepositoryMock($entity1::class);
-        $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);
 
@@ -658,9 +577,6 @@ public function testAssociatedEntityReferencedByPrimaryKey()
 
     public function testValidateUniquenessWithArrayValue()
     {
-        $repository = $this->createRepositoryMock(SingleIntIdEntity::class);
-        $this->repositoryFactory->setRepository($this->em, SingleIntIdEntity::class, $repository);
-
         $constraint = new UniqueEntity(
             message: 'myMessage',
             fields: ['phoneNumbers'],
@@ -671,10 +587,7 @@ public function testValidateUniquenessWithArrayValue()
         $entity1 = new SingleIntIdEntity(1, 'foo');
         $entity1->phoneNumbers[] = 123;
 
-        $repository->expects($this->once())
-            ->method('findByCustom')
-            ->willReturn([$entity1])
-        ;
+        $this->em->getRepository(SingleIntIdEntity::class)->result = $entity1;
 
         $this->em->persist($entity1);
         $this->em->flush();
@@ -724,8 +637,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);
 
@@ -739,14 +650,6 @@ public function testEntityManagerNullObject()
 
     public function testValidateUniquenessOnNullResult()
     {
-        $repository = $this->createRepositoryMock(SingleIntIdEntity::class);
-        $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);
 
@@ -927,13 +830,7 @@ public function testValidateUniquenessWithEmptyIterator($entity, $result)
             repositoryMethod: 'findByCustom',
         );
 
-        $repository = $this->createRepositoryMock($entity::class);
-        $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)]`