bug #37447 [Validator] fix validating lazy properties that evaluate to null (xabbuh)

nicolas-grekas · nicolas-grekas · commit 52ddce1a74c2 · 2020-06-30T19:35:43.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [Validator] fix validating lazy properties that evaluate to null | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #37430 | License | MIT | Doc PR | Commits ------- 776daf2 fix validating lazy properties that evaluate to null
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/EntityParent.php b/src/Symfony/Component/Validator/Tests/Fixtures/EntityParent.php
@@ -18,6 +18,7 @@ class EntityParent implements EntityInterfaceA
     protected $firstName;
     private $internal;
     private $data = 'Data';
+    private $child;
 
     /**
      * @NotNull
@@ -28,4 +29,9 @@ public function getData()
     {
         return 'Data';
     }
+
+    public function getChild()
+    {
+        return $this->child;
+    }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php b/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php
@@ -21,13 +21,15 @@
 use Symfony\Component\Validator\Constraints\NotNull;
 use Symfony\Component\Validator\Constraints\Optional;
 use Symfony\Component\Validator\Constraints\Required;
+use Symfony\Component\Validator\Constraints\Valid;
 use Symfony\Component\Validator\ConstraintValidatorFactory;
 use Symfony\Component\Validator\Context\ExecutionContextFactory;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface;
 use Symfony\Component\Validator\Tests\Constraints\Fixtures\ChildA;
 use Symfony\Component\Validator\Tests\Constraints\Fixtures\ChildB;
 use Symfony\Component\Validator\Tests\Fixtures\Entity;
+use Symfony\Component\Validator\Tests\Fixtures\EntityParent;
 use Symfony\Component\Validator\Tests\Fixtures\EntityWithGroupedConstraintOnMethods;
 use Symfony\Component\Validator\Validator\RecursiveValidator;
 
@@ -143,6 +145,31 @@ public function testGroupedMethodConstraintValidateInSequence()
         $this->assertInstanceOf(IsTrue::class, $violations->get(1)->getConstraint());
     }
 
+    public function testValidConstraintOnGetterReturningNull()
+    {
+        $metadata = new ClassMetadata(EntityParent::class);
+        $metadata->addGetterConstraint('child', new Valid());
+
+        $this->metadataFactory->addMetadata($metadata);
+
+        $violations = $this->validator->validate(new EntityParent());
+
+        $this->assertCount(0, $violations);
+    }
+
+    public function testNotNullConstraintOnGetterReturningNull()
+    {
+        $metadata = new ClassMetadata(EntityParent::class);
+        $metadata->addGetterConstraint('child', new NotNull());
+
+        $this->metadataFactory->addMetadata($metadata);
+
+        $violations = $this->validator->validate(new EntityParent());
+
+        $this->assertCount(1, $violations);
+        $this->assertInstanceOf(NotNull::class, $violations->get(0)->getConstraint());
+    }
+
     public function testAllConstraintValidateAllGroupsForNestedConstraints()
     {
         $this->metadata->addPropertyConstraint('data', new All(['constraints' => [
diff --git a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
@@ -680,6 +680,10 @@ private function validateGenericNode($value, $object, $cacheKey, MetadataInterfa
 
         if ($value instanceof LazyProperty) {
             $value = $value->getPropertyValue();
+
+            if (null === $value) {
+                return;
+            }
         }
 
         if (\is_array($value)) {

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ class EntityParent implements EntityInterfaceA`
`18`	`18`	`protected $firstName;`
`19`	`19`	`private $internal;`
`20`	`20`	`private $data = 'Data';`
	`21`	`+ private $child;`
`21`	`22`
`22`	`23`	`/**`
`23`	`24`	`* @NotNull`
`@@ -28,4 +29,9 @@ public function getData()`
`28`	`29`	`{`
`29`	`30`	`return 'Data';`
`30`	`31`	`}`
	`32`	`+`
	`33`	`+ public function getChild()`
	`34`	`+ {`
	`35`	`+ return $this->child;`
	`36`	`+ }`
`31`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -680,6 +680,10 @@ private function validateGenericNode($value, $object, $cacheKey, MetadataInterfa`
`680`	`680`
`681`	`681`	`if ($value instanceof LazyProperty) {`
`682`	`682`	`$value = $value->getPropertyValue();`
	`683`	`+`
	`684`	`+ if (null === $value) {`
	`685`	`+ return;`
	`686`	`+ }`
`683`	`687`	`}`
`684`	`688`
`685`	`689`	`if (\is_array($value)) {`