From 776daf28b4e5240a830ff0c724604a4968e51b24 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Mon, 29 Jun 2020 12:48:16 +0200
Subject: [PATCH] fix validating lazy properties that evaluate to null

---
 .../Validator/Tests/Fixtures/EntityParent.php |  6 +++++
 .../Validator/RecursiveValidatorTest.php      | 27 +++++++++++++++++++
 .../RecursiveContextualValidator.php          |  4 +++
 3 files changed, 37 insertions(+)

diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/EntityParent.php b/src/Symfony/Component/Validator/Tests/Fixtures/EntityParent.php
index 4674f8b35a226..eb09e5a4b2375 100644
--- 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
index 484236241c7fa..c9e30b458780f 100644
--- a/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php
@@ -21,6 +21,7 @@
 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;
@@ -28,6 +29,7 @@
 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
index 24206bfc27d92..a51e66d2906d0 100644
--- 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)) {

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/37447.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/37447.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/37447.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/37447.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>