diff --git a/PropertyAccessor.php b/PropertyAccessor.php index c1401f4..045d7ed 100644 --- a/PropertyAccessor.php +++ b/PropertyAccessor.php @@ -72,11 +72,11 @@ class PropertyAccessor implements PropertyAccessorInterface * Should not be used by application code. Use * {@link PropertyAccess::createPropertyAccessor()} instead. * - * @param int $magicMethods A bitwise combination of the MAGIC_* constants - * to specify the allowed magic methods (__get, __set, __call) - * or self::DISALLOW_MAGIC_METHODS for none - * @param int $throw A bitwise combination of the THROW_* constants - * to specify when exceptions should be thrown + * @param int $magicMethodsFlags A bitwise combination of the MAGIC_* constants + * to specify the allowed magic methods (__get, __set, __call) + * or self::DISALLOW_MAGIC_METHODS for none + * @param int $throw A bitwise combination of the THROW_* constants + * to specify when exceptions should be thrown */ public function __construct( private int $magicMethodsFlags = self::MAGIC_GET | self::MAGIC_SET, @@ -629,15 +629,22 @@ private function getWriteInfo(string $class, string $property, mixed $value): Pr */ private function isPropertyWritable(object $object, string $property): bool { + if ($object instanceof \stdClass && property_exists($object, $property)) { + return true; + } + $mutatorForArray = $this->getWriteInfo($object::class, $property, []); + if (PropertyWriteInfo::TYPE_PROPERTY === $mutatorForArray->getType()) { + return $mutatorForArray->getVisibility() === 'public'; + } - if (PropertyWriteInfo::TYPE_NONE !== $mutatorForArray->getType() || ($object instanceof \stdClass && property_exists($object, $property))) { + if (PropertyWriteInfo::TYPE_NONE !== $mutatorForArray->getType()) { return true; } $mutator = $this->getWriteInfo($object::class, $property, ''); - return PropertyWriteInfo::TYPE_NONE !== $mutator->getType() || ($object instanceof \stdClass && property_exists($object, $property)); + return PropertyWriteInfo::TYPE_NONE !== $mutator->getType(); } /** diff --git a/Tests/Fixtures/AsymmetricVisibility.php b/Tests/Fixtures/AsymmetricVisibility.php new file mode 100644 index 0000000..5a74350 --- /dev/null +++ b/Tests/Fixtures/AsymmetricVisibility.php @@ -0,0 +1,21 @@ + + * + * 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 AsymmetricVisibility +{ + public public(set) mixed $publicPublic = null; + public protected(set) mixed $publicProtected = null; + public private(set) mixed $publicPrivate = null; + private private(set) mixed $privatePrivate = null; + public bool $virtualNoSetHook { get => true; } +} diff --git a/Tests/PropertyAccessorTest.php b/Tests/PropertyAccessorTest.php index a26ee20..6a67563 100644 --- a/Tests/PropertyAccessorTest.php +++ b/Tests/PropertyAccessorTest.php @@ -20,6 +20,7 @@ use Symfony\Component\PropertyAccess\PropertyAccess; use Symfony\Component\PropertyAccess\PropertyAccessor; use Symfony\Component\PropertyAccess\PropertyAccessorInterface; +use Symfony\Component\PropertyAccess\Tests\Fixtures\AsymmetricVisibility; use Symfony\Component\PropertyAccess\Tests\Fixtures\ExtendedUninitializedProperty; use Symfony\Component\PropertyAccess\Tests\Fixtures\ReturnTyped; use Symfony\Component\PropertyAccess\Tests\Fixtures\TestAdderRemoverInvalidArgumentLength; @@ -1046,4 +1047,62 @@ private function createUninitializedObjectPropertyGhost(): UninitializedObjectPr return $class::createLazyGhost(initializer: function ($instance) { }); } + + /** + * @requires PHP 8.4 + */ + public function testIsWritableWithAsymmetricVisibility() + { + $object = new AsymmetricVisibility(); + + $this->assertTrue($this->propertyAccessor->isWritable($object, 'publicPublic')); + $this->assertFalse($this->propertyAccessor->isWritable($object, 'publicProtected')); + $this->assertFalse($this->propertyAccessor->isWritable($object, 'publicPrivate')); + $this->assertFalse($this->propertyAccessor->isWritable($object, 'privatePrivate')); + $this->assertFalse($this->propertyAccessor->isWritable($object, 'virtualNoSetHook')); + } + + /** + * @requires PHP 8.4 + */ + public function testIsReadableWithAsymmetricVisibility() + { + $object = new AsymmetricVisibility(); + + $this->assertTrue($this->propertyAccessor->isReadable($object, 'publicPublic')); + $this->assertTrue($this->propertyAccessor->isReadable($object, 'publicProtected')); + $this->assertTrue($this->propertyAccessor->isReadable($object, 'publicPrivate')); + $this->assertFalse($this->propertyAccessor->isReadable($object, 'privatePrivate')); + $this->assertTrue($this->propertyAccessor->isReadable($object, 'virtualNoSetHook')); + } + + /** + * @requires PHP 8.4 + * + * @dataProvider setValueWithAsymmetricVisibilityDataProvider + */ + public function testSetValueWithAsymmetricVisibility(string $propertyPath, ?string $expectedException) + { + $object = new AsymmetricVisibility(); + + if ($expectedException) { + $this->expectException($expectedException); + } else { + $this->expectNotToPerformAssertions(); + } + + $this->propertyAccessor->setValue($object, $propertyPath, true); + } + + /** + * @return iterable + */ + public static function setValueWithAsymmetricVisibilityDataProvider(): iterable + { + yield ['publicPublic', null]; + yield ['publicProtected', \Error::class]; + yield ['publicPrivate', \Error::class]; + yield ['privatePrivate', NoSuchPropertyException::class]; + yield ['virtualNoSetHook', \Error::class]; + } }