[PropertyAccess] Fix accessing dynamic properties
This commit is contained in:
parent
fc3095ff2f
commit
47bd0180d1
@ -435,11 +435,17 @@ class PropertyAccessor implements PropertyAccessorInterface
|
|||||||
|
|
||||||
throw $e;
|
throw $e;
|
||||||
}
|
}
|
||||||
} elseif ($object instanceof \stdClass && property_exists($object, $property)) {
|
} elseif (property_exists($object, $property)) {
|
||||||
|
try {
|
||||||
$result[self::VALUE] = $object->$property;
|
$result[self::VALUE] = $object->$property;
|
||||||
if (isset($zval[self::REF])) {
|
if (isset($zval[self::REF])) {
|
||||||
$result[self::REF] = &$object->$property;
|
$result[self::REF] = &$object->$property;
|
||||||
}
|
}
|
||||||
|
} catch (\Error $e) {
|
||||||
|
if (!$ignoreInvalidProperty) {
|
||||||
|
throw new NoSuchPropertyException(sprintf('Can\'t read protected or private property "%s" in class "%s".', $property, $class), 0, $e);
|
||||||
|
}
|
||||||
|
}
|
||||||
} elseif (!$ignoreInvalidProperty) {
|
} elseif (!$ignoreInvalidProperty) {
|
||||||
throw new NoSuchPropertyException(sprintf('Can\'t get a way to read the property "%s" in class "%s".', $property, $class));
|
throw new NoSuchPropertyException(sprintf('Can\'t get a way to read the property "%s" in class "%s".', $property, $class));
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,11 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Symfony\Component\PropertyAccess\Tests\Fixtures;
|
||||||
|
|
||||||
|
class TestClassDynamicProperty
|
||||||
|
{
|
||||||
|
public function __construct($dynamicProperty)
|
||||||
|
{
|
||||||
|
$this->dynamicProperty = $dynamicProperty;
|
||||||
|
}
|
||||||
|
}
|
@ -21,6 +21,7 @@ use Symfony\Component\PropertyAccess\Tests\Fixtures\ReturnTyped;
|
|||||||
use Symfony\Component\PropertyAccess\Tests\Fixtures\TestAdderRemoverInvalidArgumentLength;
|
use Symfony\Component\PropertyAccess\Tests\Fixtures\TestAdderRemoverInvalidArgumentLength;
|
||||||
use Symfony\Component\PropertyAccess\Tests\Fixtures\TestAdderRemoverInvalidMethods;
|
use Symfony\Component\PropertyAccess\Tests\Fixtures\TestAdderRemoverInvalidMethods;
|
||||||
use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClass;
|
use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClass;
|
||||||
|
use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassDynamicProperty;
|
||||||
use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassIsWritable;
|
use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassIsWritable;
|
||||||
use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassMagicCall;
|
use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassMagicCall;
|
||||||
use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassMagicGet;
|
use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassMagicGet;
|
||||||
@ -97,6 +98,29 @@ class PropertyAccessorTest extends TestCase
|
|||||||
$this->assertSame($value, $this->propertyAccessor->getValue($objectOrArray, $path));
|
$this->assertSame($value, $this->propertyAccessor->getValue($objectOrArray, $path));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test get dynamic value from object is other than \stdClass instance.
|
||||||
|
*/
|
||||||
|
public function testGetDynamicValue()
|
||||||
|
{
|
||||||
|
$value = 'dynamicPropertyValue';
|
||||||
|
$path = 'dynamicProperty';
|
||||||
|
$object = new TestClassDynamicProperty($value);
|
||||||
|
|
||||||
|
$this->assertSame($value, $this->propertyAccessor->getValue($object, $path));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ensure exact exception with message was thrown on access to non-public property.
|
||||||
|
*/
|
||||||
|
public function testGetInaccessibleProperty()
|
||||||
|
{
|
||||||
|
$this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException');
|
||||||
|
$this->expectExceptionMessage(sprintf('Can\'t read protected or private property "%s" in class "%s".', 'protectedProperty', TestClass::class));
|
||||||
|
|
||||||
|
$this->propertyAccessor->getValue(new TestClass('Bernhard'), 'protectedProperty');
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @dataProvider getPathsWithMissingProperty
|
* @dataProvider getPathsWithMissingProperty
|
||||||
*/
|
*/
|
||||||
|
Reference in New Issue
Block a user