Merge branch '5.4' into 6.4

* 5.4:
  Issue #58821: [DependencyInjection] Support interfaces in ContainerBuilder::getReflectionClass().
  Dynamically fix compatibility with doctrine/data-fixtures v2
  [HttpKernel] Ensure HttpCache::getTraceKey() does not throw exception
  don't call EntityManager::initializeObject() with scalar values
  [Validator] review italian translations
  Update PR template

Author: nicolas-grekas

DataFixtures/AddFixtureImplementation.php

@@ -0,0 +1,35 @@
+<?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\DataFixtures;
+
+use Doctrine\Common\DataFixtures\FixtureInterface;
+use Doctrine\Common\DataFixtures\ReferenceRepository;
+
+if (method_exists(ReferenceRepository::class, 'getReferences')) {
+    /** @internal */
+    trait AddFixtureImplementation
+    {
+        public function addFixture(FixtureInterface $fixture)
+        {
+            $this->doAddFixture($fixture);
+        }
+    }
+} else {
+    /** @internal */
+    trait AddFixtureImplementation
+    {
+        public function addFixture(FixtureInterface $fixture): void
+        {
+            $this->doAddFixture($fixture);
+        }
+    }
+}

DataFixtures/ContainerAwareLoader.php

@@ -29,15 +29,14 @@
  */
 class ContainerAwareLoader extends Loader
 {
+    use AddFixtureImplementation;
+
     public function __construct(
         private readonly ContainerInterface $container,
     ) {
     }
 
-    /**
-     * @return void
-     */
-    public function addFixture(FixtureInterface $fixture)
+    private function doAddFixture(FixtureInterface $fixture): void
     {
         if ($fixture instanceof ContainerAwareInterface) {
             $fixture->setContainer($this->container);

Validator/Constraints/UniqueEntityValidator.php

@@ -102,7 +102,7 @@ public function validate(mixed $entity, Constraint $constraint)
 
             $criteria[$fieldName] = $fieldValue;
 
-            if (null !== $criteria[$fieldName] && $class->hasAssociation($fieldName)) {
+            if (\is_object($criteria[$fieldName]) && $class->hasAssociation($fieldName)) {
                 /* Ensure the Proxy is initialized before using reflection to
                  * read its identifiers. This is necessary because the wrapped
                  * getter methods in the Proxy are being bypassed.

composer.json

@@ -44,7 +44,7 @@
         "symfony/validator": "^6.4|^7.0",
         "symfony/var-dumper": "^5.4|^6.0|^7.0",
         "doctrine/collections": "^1.0|^2.0",
-        "doctrine/data-fixtures": "^1.1",
+        "doctrine/data-fixtures": "^1.1|^2",
         "doctrine/dbal": "^2.13.1|^3|^4",
         "doctrine/orm": "^2.15|^3",
         "psr/log": "^1|^2|^3"