Skip to content

Commit 267f238

Browse files
Merge branch '6.4' into 7.2
* 6.4: [Validator] Fix incorrect assertion in `WhenTest` [DoctrineBridge] Fix deprecation with `doctrine/dbal` ^4.3
2 parents 39cfc02 + 16f40ca commit 267f238

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/Symfony/Bridge/Doctrine/Tests/Fixtures/SingleAssociationToIntIdEntity.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@
1414
use Doctrine\ORM\Mapping\Column;
1515
use Doctrine\ORM\Mapping\Entity;
1616
use Doctrine\ORM\Mapping\Id;
17+
use Doctrine\ORM\Mapping\JoinColumn;
1718
use Doctrine\ORM\Mapping\OneToOne;
1819

1920
#[Entity]
2021
class SingleAssociationToIntIdEntity
2122
{
2223
public function __construct(
2324
#[Id, OneToOne(cascade: ['ALL'])]
25+
#[JoinColumn(nullable: false)]
2426
protected SingleIntIdNoToStringEntity $entity,
2527

2628
#[Column(nullable: true)]

src/Symfony/Component/Validator/Tests/Constraints/WhenTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function testAttributes()
7373

7474
[$barConstraint] = $metadata->properties['bar']->getConstraints();
7575

76-
self::assertInstanceOf(When::class, $fooConstraint);
76+
self::assertInstanceOf(When::class, $barConstraint);
7777
self::assertSame('false', $barConstraint->expression);
7878
self::assertEquals([
7979
new NotNull([

0 commit comments

Comments
 (0)