bug #35532 [Validator] fix access to uninitialized property when getting value (greedyivan)

fabpot · fabpot · commit aeea451433d8 · 2020-01-31T09:56:30.000+01:00
This PR was squashed before being merged into the 3.4 branch (closes #35532). Discussion ---------- [Validator] fix access to uninitialized property when getting value | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #35454 | License | MIT | Doc PR | In PHP 7.4, the type-hinted property is [uninitialized](https://wiki.php.net/rfc/typed_properties_v2#uninitialized_and_unset_properties) by default. So it needs to be checked before use. Commits ------- 1edecf7 [Validator] fix access to uninitialized property when getting value
diff --git a/src/Symfony/Component/Validator/Mapping/PropertyMetadata.php b/src/Symfony/Component/Validator/Mapping/PropertyMetadata.php
@@ -48,7 +48,13 @@ public function __construct($class, $name)
      */
     public function getPropertyValue($object)
     {
-        return $this->getReflectionMember($object)->getValue($object);
+        $reflProperty = $this->getReflectionMember($object);
+
+        if (\PHP_VERSION_ID >= 70400 && !$reflProperty->isInitialized($object)) {
+            return null;
+        }
+
+        return $reflProperty->getValue($object);
     }
 
     /**
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/Entity_74.php b/src/Symfony/Component/Validator/Tests/Fixtures/Entity_74.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\Component\Validator\Tests\Fixtures;
+
+class Entity_74
+{
+    public int $uninitialized;
+}
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/PropertyMetadataTest.php b/src/Symfony/Component/Validator/Tests/Mapping/PropertyMetadataTest.php
@@ -14,10 +14,12 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Mapping\PropertyMetadata;
 use Symfony\Component\Validator\Tests\Fixtures\Entity;
+use Symfony\Component\Validator\Tests\Fixtures\Entity_74;
 
 class PropertyMetadataTest extends TestCase
 {
     const CLASSNAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';
+    const CLASSNAME_74 = 'Symfony\Component\Validator\Tests\Fixtures\Entity_74';
     const PARENTCLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityParent';
 
     public function testInvalidPropertyName()
@@ -53,4 +55,15 @@ public function testGetPropertyValueFromRemovedProperty()
         $this->expectException('Symfony\Component\Validator\Exception\ValidatorException');
         $metadata->getPropertyValue($entity);
     }
+
+    /**
+     * @requires PHP 7.4
+     */
+    public function testGetPropertyValueFromUninitializedProperty()
+    {
+        $entity = new Entity_74();
+        $metadata = new PropertyMetadata(self::CLASSNAME_74, 'uninitialized');
+
+        $this->assertNull($metadata->getPropertyValue($entity));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,13 @@ public function __construct($class, $name)`
`48`	`48`	`*/`
`49`	`49`	`8000 public function getPropertyValue($object)`
`50`	`50`	`{`
`51`		`- return $this->getReflectionMember($object)->getValue($object);`
	`51`	`+ $reflProperty = $this->getReflectionMember($object);`
	`52`	`+`
	`53`	`+ if (\PHP_VERSION_ID >= 70400 && !$reflProperty->isInitialized($object)) {`
	`54`	`+ return null;`
	`55`	`+ }`
	`56`	`+`
	`57`	`+ return $reflProperty->getValue($object);`
`52`	`58`	`}`
`53`	`59`
`54`	`60`	`/**`