[PropertyAccess] Fix accessing public property in Object

kevcomparadise · nicolas-grekas · commit 560ee102622b · 2021-12-11T12:52:28.000+01:00
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -408,7 +408,7 @@ private function readProperty(array $zval, string $property, bool $ignoreInvalid
                 }
             } elseif (self::ACCESS_TYPE_PROPERTY === $access[self::ACCESS_TYPE]) {
                 $name = $access[self::ACCESS_NAME];
-                if (!method_exists($object, '__get') && !isset($object->$name) && !\array_key_exists($name, (array) $object) && (\PHP_VERSION_ID < 70400 || !(new \ReflectionProperty($class, $name))->hasType())) {
+                if ($access[self::ACCESS_REF] && !isset($object->$name) && !\array_key_exists($name, (array) $object) && (\PHP_VERSION_ID < 70400 || !(new \ReflectionProperty($class, $name))->hasType())) {
                     throw new AccessException(sprintf('The property "%s::$%s" is not initialized.', $class, $name));
                 }
 
diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestPublicPropertyDynamicallyCreated.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestPublicPropertyDynamicallyCreated.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Symfony\Component\PropertyAccess\Tests\Fixtures;
+
+#[\AllowDynamicProperties]
+class TestPublicPropertyDynamicallyCreated
+{
+    public function __construct(string $bar)
+    {
+        $this->foo = $bar;
+    }
+}
diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestPublicPropertyGetterOnObject.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestPublicPropertyGetterOnObject.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Symfony\Component\PropertyAccess\Tests\Fixtures;
+
+class TestPublicPropertyGetterOnObject
+{
+    public $a = 'A';
+    private $b = 'B';
+}
diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestPublicPropertyGetterOnObjectMagicGet.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestPublicPropertyGetterOnObjectMagicGet.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Symfony\Component\PropertyAccess\Tests\Fixtures;
+
+class TestPublicPropertyGetterOnObjectMagicGet
+{
+    public $a = 'A';
+    private $b = 'B';
+
+    public function __get($property)
+    {
+        if ('b' === $property) {
+            return $this->b;
+        }
+    }
+}
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
@@ -29,6 +29,9 @@
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassMagicGet;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassSetValue;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassTypeErrorInsideCall;
+use Symfony\Component\PropertyAccess\Tests\Fixtures\TestPublicPropertyDynamicallyCreated;
+use Symfony\Component\PropertyAccess\Tests\Fixtures\TestPublicPropertyGetterOnObject;
+use Symfony\Component\PropertyAccess\Tests\Fixtures\TestPublicPropertyGetterOnObjectMagicGet;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TestSingularAndPluralProps;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\Ticket5775Object;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TypeHinted;
@@ -849,4 +852,39 @@ public function testSetterNeedsPublicAccess()
         $object = new TestClassSetValue(0);
         $this->propertyAccessor->setValue($object, 'foo', 1);
     }
+
+    public function testGetPublicProperty()
+    {
+        $value = 'A';
+        $path = 'a';
+        $object = new TestPublicPropertyGetterOnObject();
+
+        $this->assertSame($value, $this->propertyAccessor->getValue($object, $path));
+    }
+
+    public function testGetPrivateProperty()
+    {
+        $object = new TestPublicPropertyGetterOnObject();
+
+        $this->expectException(NoSuchPropertyException::class);
+        $this->expectExceptionMessageMatches('/.*Neither the property "b" nor one of the methods/');
+        $this->propertyAccessor->getValue($object, 'b');
+    }
+
+    public function testGetDynamicPublicProperty()
+    {
+        $value = 'Bar';
+        $path = 'foo';
+        $object = new TestPublicPropertyDynamicallyCreated('Bar');
+
+        $this->assertSame($value, $this->propertyAccessor->getValue($object, $path));
+    }
+
+    public function testGetDynamicPublicPropertyWithMagicGetterAllow()
+    {
+        $value = 'B';
+        $path = 'b';
+        $object = new TestPublicPropertyGetterOnObjectMagicGet();
+        $this->assertSame($value, $this->propertyAccessor->getValue($object, $path));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,7 @@ private function readProperty(array $zval, string $property, bool $ignoreInvalid`
`408`	`408`	`}`
`409`	`409`	`} elseif (self::ACCESS_TYPE_PROPERTY === $access[self::ACCESS_TYPE]) {`
`410`	`410`	`$name = $access[self::ACCESS_NAME];`
`411`		`- if (!method_exists($object, '__get') && !isset($object->$name) && !\array_key_exists($name, (array) $object) && (\PHP_VERSION_ID < 70400 \|\| !(new \ReflectionProperty($class, $name))->hasType())) {`
	`411`	`+ if ($access[self::ACCESS_REF] && !isset($object->$name) && !\array_key_exists($name, (array) $object) && (\PHP_VERSION_ID < 70400 \|\| !(new \ReflectionProperty($class, $name))->hasType())) {`
`412`	`412`	`throw new AccessException(sprintf('The property "%s::$%s" is not initialized.', $class, $name));`
`413`	`413`	`}`
`414`	`414`