fix: stop considering properties marked with NotBlank(allowNull=true) as required (#6184)

ostrolucky · web-flow · commit e7b4421496b5 · 2024-02-29T10:09:55.000+01:00
Fixes #6183
diff --git a/src/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactory.php b/src/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactory.php
@@ -193,6 +193,10 @@ private function getPropertyConstraints(
      */
     private function isRequired(Constraint $constraint): bool
     {
+        if ($constraint instanceof NotBlank && $constraint->allowNull) {
+            return false;
+        }
+
         foreach (self::REQUIRED_CONSTRAINTS as $requiredConstraint) {
             if ($constraint instanceof $requiredConstraint) {
                 return true;
diff --git a/tests/Fixtures/DummyValidatedEntity.php b/tests/Fixtures/DummyValidatedEntity.php
@@ -39,6 +39,7 @@ class DummyValidatedEntity
      * @var string
      */
     #[Assert\Email]
+    #[Assert\NotBlank(allowNull: true)]
     public $dummyEmail;
 
     /**
diff --git a/tests/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactoryTest.php b/tests/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactoryTest.php
@@ -69,11 +69,12 @@ protected function setUp(): void
 
     public function testCreateWithPropertyWithRequiredConstraints(): void
     {
-        $propertyMetadata = (new ApiProperty())->withDescription('A dummy')->withReadable(true)->withWritable(true);
-        $expectedPropertyMetadata = $propertyMetadata->withRequired(true);
+        $dummyPropertyMetadata = (new ApiProperty())->withDescription('A dummy')->withReadable(true)->withWritable(true);
+        $emailPropertyMetadata = (new ApiProperty())->withTypes(['https://schema.org/email'])->withReadable(true)->withWritable(true);
 
         $decoratedPropertyMetadataFactory = $this->prophesize(PropertyMetadataFactoryInterface::class);
-        $decoratedPropertyMetadataFactory->create(DummyValidatedEntity::class, 'dummy', [])->willReturn($propertyMetadata)->shouldBeCalled();
+        $decoratedPropertyMetadataFactory->create(DummyValidatedEntity::class, 'dummy', [])->willReturn($dummyPropertyMetadata)->shouldBeCalled();
+        $decoratedPropertyMetadataFactory->create(DummyValidatedEntity::class, 'dummyEmail', [])->willReturn($emailPropertyMetadata)->shouldBeCalled();
 
         $validatorMetadataFactory = $this->prophesize(MetadataFactoryInterface::class);
         $validatorMetadataFactory->getMetadataFor(DummyValidatedEntity::class)->willReturn($this->validatorClassMetadata)->shouldBeCalled();
@@ -83,9 +84,16 @@ public function testCreateWithPropertyWithRequiredConstraints(): void
             $decoratedPropertyMetadataFactory->reveal(),
             []
         );
-        $resultedPropertyMetadata = $validatorPropertyMetadataFactory->create(DummyValidatedEntity::class, 'dummy');
 
-        $this->assertEquals($expectedPropertyMetadata, $resultedPropertyMetadata);
+        $this->assertEquals(
+            $dummyPropertyMetadata->withRequired(true),
+            $validatorPropertyMetadataFactory->create(DummyValidatedEntity::class, 'dummy'),
+        );
+
+        $this->assertEquals(
+            $emailPropertyMetadata->withRequired(false),
+            $validatorPropertyMetadataFactory->create(DummyValidatedEntity::class, 'dummyEmail'),
+        );
     }
 
     public function testCreateWithPropertyWithNotRequiredConstraints(): void
