Improve Context::__serialize (#1794)

Author: DerManoMann

src/Context.php

@@ -49,7 +49,7 @@ class Context
     /**
      * Prototypical inheritance for properties.
      */
-    private ?Context $parent;
+    protected ?Context $parent;
 
     public function __construct(array $properties = [], ?Context $parent = null)
     {
@@ -183,16 +183,22 @@ public function getDebugLocation(): string
         return $location;
     }
 
-    /**
-     * Excludes `reflector` property.
-     */
     public function __serialize(): array
     {
-        $data = (array) $this;
-        $data['reflector'] = null;
-        unset($data['reflector']);
+        return array_filter(get_object_vars($this), function ($value): bool {
+            $rc = is_object($value) ? new \ReflectionClass($value) : null;
+
+            return (!$rc || !$rc->isAnonymous())
+                && !$value instanceof \Reflector
+                && !$value instanceof \Closure;
+        });
+    }
 
-        return $data;
+    public function __unserialize(array $data): void
+    {
+        foreach ($data as $name => $value) {
+            $this->{$name} = $value;
+        }
     }
 
     /**

tests/ContextTest.php

@@ -68,4 +68,18 @@ public function testDebugLocation(): void
             $customerPropertyFirstName->_context->getDebugLocation()
         );
     }
+
+    // -------------------------------------------------------------------------
+
+    public function testSerialize(): void
+    {
+        $context = new Context(['filename' => __FILE__], $this->getContext());
+        $serialized = serialize($context);
+        $unserialized = unserialize($serialized);
+
+        $this->assertEquals($serialized, serialize($unserialized));
+        $this->assertInstanceOf(Context::class, $unserialized->root());
+        $this->assertNotSame($unserialized, $unserialized->root());
+        $this->assertEquals(__FILE__, $unserialized->filename);
+    }
 }