[VarExporter] Fix lazy ghost trait when using nullsafe operator

nicolas-grekas · nicolas-grekas · commit c2091b5de8ff · 2023-11-29T15:53:25.000+01:00
diff --git a/src/Symfony/Component/VarExporter/LazyGhostTrait.php b/src/Symfony/Component/VarExporter/LazyGhostTrait.php
@@ -175,8 +175,9 @@ public function &__get($name): mixed
             if ($state && (null === $scope || isset($propertyScopes["\0$scope\0$name"]))) {
                 if (LazyObjectState::STATUS_INITIALIZED_FULL === $state->status) {
                     // Work around php/php-src#12695
-                    $property = $propertyScopes[null === $scope ? $name : "\0$scope\0$name"][3]
-                        ?? (Hydrator::$propertyScopes[$this::class] = Hydrator::getPropertyScopes($this::class))[3];
+                    $property = null === $scope ? $name : "\0$scope\0$name";
+                    $property = $propertyScopes[$property][3]
+                        ?? (Hydrator::$propertyScopes[$this::class] = Hydrator::getPropertyScopes($this::class))[$property][3];
                 } else {
                     $property = null;
                 }
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/LazyGhost/ChildMagicClass.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/LazyGhost/ChildMagicClass.php
@@ -18,5 +18,14 @@ class ChildMagicClass extends MagicClass implements LazyObjectInterface
 {
     use LazyGhostTrait;
 
+    private const LAZY_OBJECT_PROPERTY_SCOPES = [
+        "\0".self::class."\0".'data' => [self::class, 'data', null],
+        "\0".self::class."\0".'lazyObjectState' => [self::class, 'lazyObjectState', null],
+        "\0".'Symfony\\Component\\VarExporter\\Tests\\Fixtures\\LazyGhost\\MagicClass'."\0".'data' => ['Symfony\\Component\\VarExporter\\Tests\\Fixtures\\LazyGhost\\MagicClass', 'data', null],
+        'cloneCounter' => [self::class, 'cloneCounter', null],
+        'data' => [self::class, 'data', null],
+        'lazyObjectState' => [self::class, 'lazyObjectState', null],
+    ];
+
     private int $data = 123;
 }

Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,14 @@ class ChildMagicClass extends MagicClass implements LazyObjectInterface`
`18`	`18`	`{`
`19`	`19`	`use LazyGhostTrait;`
`20`	`20`
	`21`	`+ private const LAZY_OBJECT_PROPERTY_SCOPES = [`
	`22`	`+ "\0".self::class."\0".'data' => [self::class, 'data', null],`
	`23`	`+ "\0".self::class."\0".'lazyObjectState' => [self::class, 'lazyObjectState', null],`
	`24`	`+ "\0".'Symfony\\Component\\VarExporter\\Tests\\Fixtures\\LazyGhost\\MagicClass'."\0".'data' => ['Symfony\\Component\\VarExporter\\Tests\\Fixtures\\LazyGhost\\MagicClass', 'data', null],`
	`25`	`+ 'cloneCounter' => [self::class, 'cloneCounter', null],`
	`26`	`+ 'data' => [self::class, 'data', null],`
	`27`	`+ 'lazyObjectState' => [self::class, 'lazyObjectState', null],`
	`28`	`+ ];`
	`29`	`+`
`21`	`30`	`private int $data = 123;`
`22`	`31`	`}`