Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit c83fe9e6995e · 2021-11-18T12:54:07.000+01:00
* 5.4:
  [PropertyAccess] Fix on PHP &lt; 7.4
  [PropertyAccess] fix error msg when accessing typed but uninitializer public properties
diff --git a/PropertyAccessor.php b/PropertyAccessor.php
@@ -415,7 +415,7 @@ private function readProperty(array $zval, string $property, bool $ignoreInvalid
                         throw $e;
                     }
                 } elseif (PropertyReadInfo::TYPE_PROPERTY === $type) {
-                    if (!method_exists($object, '__get') && !\array_key_exists($name, (array) $object)) {
+                    if (!method_exists($object, '__get') && !\array_key_exists($name, (array) $object) && !(new \ReflectionProperty($class, $name))->hasType()) {
                         throw new UninitializedPropertyException(sprintf('The property "%s::$%s" is not initialized.', $class, $name));
                     }
 

Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ private function readProperty(array $zval, string $property, bool $ignoreInvalid`
`415`	`415`	`throw $e;`
`416`	`416`	`}`
`417`	`417`	`} elseif (PropertyReadInfo::TYPE_PROPERTY === $type) {`
`418`		`- if (!method_exists($object, '__get') && !\array_key_exists($name, (array) $object)) {`
	`418`	`+ if (!method_exists($object, '__get') && !\array_key_exists($name, (array) $object) && !(new \ReflectionProperty($class, $name))->hasType()) {`
`419`	`419`	`throw new UninitializedPropertyException(sprintf('The property "%s::$%s" is not initialized.', $class, $name));`
`420`	`420`	`}`
`421`	`421`