[PropertyAccess] Improved errors when reading uninitialized properties
This commit is contained in:
parent
13ea421e1c
commit
a71023ba65
@ -465,8 +465,18 @@ class PropertyAccessor implements PropertyAccessorInterface
|
|||||||
$object = $zval[self::VALUE];
|
$object = $zval[self::VALUE];
|
||||||
$access = $this->getReadAccessInfo(\get_class($object), $property);
|
$access = $this->getReadAccessInfo(\get_class($object), $property);
|
||||||
|
|
||||||
|
try {
|
||||||
if (self::ACCESS_TYPE_METHOD === $access[self::ACCESS_TYPE]) {
|
if (self::ACCESS_TYPE_METHOD === $access[self::ACCESS_TYPE]) {
|
||||||
|
try {
|
||||||
$result[self::VALUE] = $object->{$access[self::ACCESS_NAME]}();
|
$result[self::VALUE] = $object->{$access[self::ACCESS_NAME]}();
|
||||||
|
} catch (\TypeError $e) {
|
||||||
|
// handle uninitialized properties in PHP >= 7
|
||||||
|
if (preg_match((sprintf('/^Return value of %s::%s\(\) must be of the type (\w+), null returned$/', preg_quote(\get_class($object)), $access[self::ACCESS_NAME])), $e->getMessage(), $matches)) {
|
||||||
|
throw new AccessException(sprintf('The method "%s::%s()" returned "null", but expected type "%3$s". Have you forgotten to initialize a property or to make the return type nullable using "?%3$s" instead?', \get_class($object), $access[self::ACCESS_NAME], $matches[1]), 0, $e);
|
||||||
|
}
|
||||||
|
|
||||||
|
throw $e;
|
||||||
|
}
|
||||||
} elseif (self::ACCESS_TYPE_PROPERTY === $access[self::ACCESS_TYPE]) {
|
} elseif (self::ACCESS_TYPE_PROPERTY === $access[self::ACCESS_TYPE]) {
|
||||||
$result[self::VALUE] = $object->{$access[self::ACCESS_NAME]};
|
$result[self::VALUE] = $object->{$access[self::ACCESS_NAME]};
|
||||||
|
|
||||||
@ -490,6 +500,16 @@ class PropertyAccessor implements PropertyAccessorInterface
|
|||||||
} else {
|
} else {
|
||||||
throw new NoSuchPropertyException($access[self::ACCESS_NAME]);
|
throw new NoSuchPropertyException($access[self::ACCESS_NAME]);
|
||||||
}
|
}
|
||||||
|
} catch (\Error $e) {
|
||||||
|
// handle uninitialized properties in PHP >= 7.4
|
||||||
|
if (\PHP_VERSION_ID >= 70400 && preg_match('/^Typed property ([\w\\\]+)::\$(\w+) must not be accessed before initialization$/', $e->getMessage(), $matches)) {
|
||||||
|
$r = new \ReflectionProperty($matches[1], $matches[2]);
|
||||||
|
|
||||||
|
throw new AccessException(sprintf('The property "%s::$%s" is not readable because it is typed "%3$s". You should either initialize it or make it nullable using "?%3$s" instead.', $r->getDeclaringClass()->getName(), $r->getName(), $r->getType()->getName()), 0, $e);
|
||||||
|
}
|
||||||
|
|
||||||
|
throw $e;
|
||||||
|
}
|
||||||
|
|
||||||
// Objects are always passed around by reference
|
// Objects are always passed around by reference
|
||||||
if (isset($zval[self::REF]) && \is_object($result[self::VALUE])) {
|
if (isset($zval[self::REF]) && \is_object($result[self::VALUE])) {
|
||||||
|
@ -0,0 +1,22 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the Symfony package.
|
||||||
|
*
|
||||||
|
* (c) Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Symfony\Component\PropertyAccess\Tests\Fixtures;
|
||||||
|
|
||||||
|
class UninitializedPrivateProperty
|
||||||
|
{
|
||||||
|
private $uninitialized;
|
||||||
|
|
||||||
|
public function getUninitialized(): array
|
||||||
|
{
|
||||||
|
return $this->uninitialized;
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,17 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the Symfony package.
|
||||||
|
*
|
||||||
|
* (c) Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Symfony\Component\PropertyAccess\Tests\Fixtures;
|
||||||
|
|
||||||
|
class UninitializedProperty
|
||||||
|
{
|
||||||
|
public string $uninitialized;
|
||||||
|
}
|
@ -25,6 +25,8 @@ use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassTypeErrorInsideCall
|
|||||||
use Symfony\Component\PropertyAccess\Tests\Fixtures\TestSingularAndPluralProps;
|
use Symfony\Component\PropertyAccess\Tests\Fixtures\TestSingularAndPluralProps;
|
||||||
use Symfony\Component\PropertyAccess\Tests\Fixtures\Ticket5775Object;
|
use Symfony\Component\PropertyAccess\Tests\Fixtures\Ticket5775Object;
|
||||||
use Symfony\Component\PropertyAccess\Tests\Fixtures\TypeHinted;
|
use Symfony\Component\PropertyAccess\Tests\Fixtures\TypeHinted;
|
||||||
|
use Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedPrivateProperty;
|
||||||
|
use Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedProperty;
|
||||||
|
|
||||||
class PropertyAccessorTest extends TestCase
|
class PropertyAccessorTest extends TestCase
|
||||||
{
|
{
|
||||||
@ -118,6 +120,28 @@ class PropertyAccessorTest extends TestCase
|
|||||||
$this->propertyAccessor->getValue($objectOrArray, $path);
|
$this->propertyAccessor->getValue($objectOrArray, $path);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @requires PHP 7.4
|
||||||
|
*/
|
||||||
|
public function testGetValueThrowsExceptionIfUninitializedProperty()
|
||||||
|
{
|
||||||
|
$this->expectException('Symfony\Component\PropertyAccess\Exception\AccessException');
|
||||||
|
$this->expectExceptionMessage('The property "Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedProperty::$uninitialized" is not readable because it is typed "string". You should either initialize it or make it nullable using "?string" instead.');
|
||||||
|
|
||||||
|
$this->propertyAccessor->getValue(new UninitializedProperty(), 'uninitialized');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @requires PHP 7
|
||||||
|
*/
|
||||||
|
public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetter()
|
||||||
|
{
|
||||||
|
$this->expectException('Symfony\Component\PropertyAccess\Exception\AccessException');
|
||||||
|
$this->expectExceptionMessage('The method "Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedPrivateProperty::getUninitialized()" returned "null", but expected type "array". Have you forgotten to initialize a property or to make the return type nullable using "?array" instead?');
|
||||||
|
|
||||||
|
$this->propertyAccessor->getValue(new UninitializedPrivateProperty(), 'uninitialized');
|
||||||
|
}
|
||||||
|
|
||||||
public function testGetValueThrowsExceptionIfNotArrayAccess()
|
public function testGetValueThrowsExceptionIfNotArrayAccess()
|
||||||
{
|
{
|
||||||
$this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchIndexException');
|
$this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchIndexException');
|
||||||
|
Reference in New Issue
Block a user