[VarExporter] Fix serializing objects that implement __sleep() and that are made lazy

Author: nicolas-grekas

LazyGhostTrait.php

@@ -355,7 +355,7 @@ public function __serialize(): array
         $data = [];
 
         foreach (parent::__sleep() as $name) {
-            $value = $properties[$k = $name] ?? $properties[$k = "\0*\0$name"] ?? $properties[$k = "\0$scope\0$name"] ?? $k = null;
+            $value = $properties[$k = $name] ?? $properties[$k = "\0*\0$name"] ?? $properties[$k = "\0$class\0$name"] ?? $properties[$k = "\0$scope\0$name"] ?? $k = null;
 
             if (null === $k) {
                 trigger_error(sprintf('serialize(): "%s" returned as member variable from __sleep() but does not exist', $name), \E_USER_NOTICE);

LazyProxyTrait.php

@@ -295,7 +295,7 @@ public function __serialize(): array
         $data = [];
 
         foreach (parent::__sleep() as $name) {
-            $value = $properties[$k = $name] ?? $properties[$k = "\0*\0$name"] ?? $properties[$k = "\0$scope\0$name"] ?? $k = null;
+            $value = $properties[$k = $name] ?? $properties[$k = "\0*\0$name"] ?? $properties[$k = "\0$class\0$name"] ?? $properties[$k = "\0$scope\0$name"] ?? $k = null;
 
             if (null === $k) {
                 trigger_error(sprintf('serialize(): "%s" returned as member variable from __sleep() but does not exist', $name), \E_USER_NOTICE);

Tests/LazyGhostTraitTest.php

@@ -146,7 +146,13 @@ public function testMagicClass(MagicClass $instance)
         $instance->bar = 123;
         $serialized = serialize($instance);
         $clone = unserialize($serialized);
-        $this->assertSame(123, $clone->bar);
+
+        if ($instance instanceof ChildMagicClass) {
+            // ChildMagicClass redefines the $data property but not the __sleep() method
+            $this->assertFalse(isset($clone->bar));
+        } else {
+            $this->assertSame(123, $clone->bar);
+        }
     }
 
     public static function provideMagicClass()