Merge branch '7.2' into 7.3

nicolas-grekas · nicolas-grekas · commit 1e74e696b77d · 2025-02-18T17:43:18.000+01:00
* 7.2:
  [Validator] Fix incorrect assertion in `WhenTest`
  [DoctrineBridge] Fix deprecation with `doctrine/dbal` ^4.3
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/SingleAssociationToIntIdEntity.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/SingleAssociationToIntIdEntity.php
@@ -14,13 +14,15 @@
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\Id;
+use Doctrine\ORM\Mapping\JoinColumn;
 use Doctrine\ORM\Mapping\OneToOne;
 
 #[Entity]
 class SingleAssociationToIntIdEntity
 {
     public function __construct(
         #[Id, OneToOne(cascade: ['ALL'])]
+        #[JoinColumn(nullable: false)]
         protected SingleIntIdNoToStringEntity $entity,
 
         #[Column(nullable: true)]
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/WhenTest.php b/src/Symfony/Component/Validator/Tests/Constraints/WhenTest.php
@@ -75,7 +75,7 @@ public function testAttributes()
 
         [$barConstraint] = $metadata->properties['bar']->getConstraints();
 
-        self::assertInstanceOf(When::class, $fooConstraint);
+        self::assertInstanceOf(When::class, $barConstraint);
         self::assertSame('false', $barConstraint->expression);
         self::assertEquals([
             new NotNull(groups: ['foo']),
