Fix calling scope detection inside magic accessors

vtsykun · vtsykun · commit e20479ee8411 · 2023-07-25T05:39:32.000+02:00
diff --git a/src/Symfony/Component/VarExporter/Internal/LazyObjectRegistry.php b/src/Symfony/Component/VarExporter/Internal/LazyObjectRegistry.php
@@ -137,7 +137,7 @@ public static function getScope($propertyScopes, $class, $property, $readonlySco
         if (\ReflectionProperty::class === $scope = $frame['class'] ?? \Closure::class) {
             $scope = $frame['object']->class;
         }
-        if (null === $readonlyScope && '*' === $k[1] && ($class === $scope || is_subclass_of($class, $scope))) {
+        if (null === $readonlyScope && '*' === $k[1] && ($class === $scope || (is_subclass_of($class, $scope) && !isset($propertyScopes["\0$scope\0$property"])))) {
             return null;
         }
 
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/LazyProxy/TestOverwritePropClass.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/LazyProxy/TestOverwritePropClass.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy;
+
+class TestOverwritePropClass extends FinalPublicClass
+{
+    public function __construct(
+        protected string $dep,
+        protected int $count
+    ) {
+    }
+
+    public function getDep(): string
+    {
+        return $this->dep;
+    }
+}
diff --git a/src/Symfony/Component/VarExporter/Tests/LazyProxyTraitTest.php b/src/Symfony/Component/VarExporter/Tests/LazyProxyTraitTest.php
@@ -19,6 +19,7 @@
 use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\ReadOnlyClass;
 use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\StringMagicGetClass;
 use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\TestClass;
+use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\TestOverwritePropClass;
 use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\TestUnserializeClass;
 use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\TestWakeupClass;
 
@@ -190,6 +191,14 @@ public function testFinalPublicClass()
         $this->assertSame(1, $proxy->decrement());
     }
 
+    public function testOverwritePropClass()
+    {
+        $proxy = $this->createLazyProxy(TestOverwritePropClass::class, fn () => new TestOverwritePropClass('123', 5));
+
+        $this->assertSame('123', $proxy->getDep());
+        $this->assertSame(1, $proxy->increment());
+    }
+
     public function testWither()
     {
         $obj = new class() {

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public static function getScope($propertyScopes, $class, $property, $readonlySco`
`137`	`137`	`if (\ReflectionProperty::class === $scope = $frame['class'] ?? \Closure::class) {`
`138`	`138`	`$scope = $frame['object']->class;`
`139`	`139`	`}`
`140`		`- if (null === $readonlyScope && '*' === $k[1] && ($class === $scope \|\| is_subclass_of($class, $scope))) {`
	`140`	`+ if (null === $readonlyScope && '*' === $k[1] && ($class === $scope \|\| (is_subclass_of($class, $scope) && !isset($propertyScopes["\0$scope\0$property"])))) {`
`141`	`141`	`return null;`
`142`	`142`	`}`
`143`	`143`