Merge branch '6.4' into 7.2

* 6.4:
  [TwigBridge] Fix `ModuleNode` call in `TwigNodeProvider`
  fix compatibility with Doctrine ORM 4
  Fix CS

Author: xabbuh

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

@@ -16,6 +16,7 @@
 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;
@@ -132,11 +133,21 @@ class_exists(ClassMetadataInfo::class) ? ClassMetadataInfo::class : ClassMetadat
             ->willReturn(true)
         ;
         $refl = $this->createMock(\ReflectionProperty::class);
+        $refl
+            ->method('getName')
+            ->willReturn('name')
+        ;
         $refl
             ->method('getValue')
             ->willReturn(true)
         ;
-        $classMetadata->reflFields = ['name' => $refl];
+
+        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)

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

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\Doctrine\Validator\Constraints;
 
+use Doctrine\ORM\Mapping\ClassMetadata as OrmClassMetadata;
 use Doctrine\ORM\Mapping\MappingException as ORMMappingException;
 use Doctrine\Persistence\ManagerRegistry;
 use Doctrine\Persistence\Mapping\ClassMetadata;
@@ -287,9 +288,13 @@ 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] = $isValueEntity && $object instanceof ($class->getName())
-                ? $class->reflFields[$fieldName]->getValue($object)
-                : $this->getPropertyValue($objectClass, $fieldName, $object);
+            if ($isValueEntity && $object instanceof ($class->getName()) && property_exists(OrmClassMetadata::class, 'propertyAccessors')) {
+                $fieldValues[$entityFieldName] = $class->propertyAccessors[$fieldName]->getValue($object);
+            } elseif ($isValueEntity && $object instanceof ($class->getName())) {
+                $fieldValues[$entityFieldName] = $class->reflFields[$fieldName]->getValue($object);
+            } else {
+                $fieldValues[$entityFieldName] = $this->getPropertyValue($objectClass, $fieldName, $object);
+            }
         }
 
         return $fieldValues;

src/Symfony/Bridge/Twig/Tests/NodeVisitor/TwigNodeProvider.php

@@ -14,6 +14,7 @@
 use Symfony\Bridge\Twig\Node\TransDefaultDomainNode;
 use Symfony\Bridge\Twig\Node\TransNode;
 use Twig\Node\BodyNode;
+use Twig\Node\EmptyNode;
 use Twig\Node\Expression\ArrayExpression;
 use Twig\Node\Expression\ConstantExpression;
 use Twig\Node\Expression\FilterExpression;
@@ -27,13 +28,15 @@ class TwigNodeProvider
 {
     public static function getModule($content)
     {
+        $emptyNodeExists = class_exists(EmptyNode::class);
+
         return new ModuleNode(
             new BodyNode([new ConstantExpression($content, 0)]),
             null,
-            new ArrayExpression([], 0),
-            new ArrayExpression([], 0),
-            new ArrayExpression([], 0),
-            null,
+            $emptyNodeExists ? new EmptyNode() : new ArrayExpression([], 0),
+            $emptyNodeExists ? new EmptyNode() : new ArrayExpression([], 0),
+            $emptyNodeExists ? new EmptyNode() : new ArrayExpression([], 0),
+            $emptyNodeExists ? new EmptyNode() : null,
             new Source('', '')
         );
     }

src/Symfony/Bundle/FrameworkBundle/Test/HttpClientAssertionsTrait.php

@@ -14,10 +14,9 @@
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Component\HttpClient\DataCollector\HttpClientDataCollector;
 
-/*
+/**
  * @author Mathieu Santostefano <[email protected]>
  */
-
 trait HttpClientAssertionsTrait
 {
     public static function assertHttpClientRequest(string $expectedUrl, string $expectedMethod = 'GET', string|array|null $expectedBody = null, array $expectedHeaders = [], string $httpClientId = 'http_client'): void

src/Symfony/Bundle/FrameworkBundle/Test/NotificationAssertionsTrait.php

@@ -17,7 +17,7 @@
 use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Test\Constraint as NotifierConstraint;
 
-/*
+/**
  * @author Smaïne Milianni <[email protected]>
  */
 trait NotificationAssertionsTrait