Fixed object info resolver

Author: sorinsarca

src/AbstractInfo.php

@@ -2,6 +2,8 @@
 
 namespace Opis\Closure;
 
+use WeakMap;
+
 abstract class AbstractInfo
 {
     protected ?string $key = null;
@@ -116,4 +118,19 @@ final public static function createKey(string $header, string $body): string
         $code = "$body\n$header";
         return $code === "\n" ? "" : md5($code);
     }
+
+    private static ?WeakMap $weakAssoc = null;
+
+    final public function assoc(object $obj): void
+    {
+        (self::$weakAssoc ??= new WeakMap())->offsetSet($obj, $this);
+    }
+
+    public static function search(object $object): ?static
+    {
+        if (!self::$weakAssoc || !self::$weakAssoc->offsetExists($object)) {
+            return null;
+        }
+        return self::$weakAssoc->offsetGet($object);
+    }
 }

src/AbstractParser.php

@@ -200,12 +200,6 @@ protected static function resolve(
             return null;
         }
 
-        // Try already deserialized
-        // closure://...
-        if ($fromStream = CodeStream::info($file)) {
-            return $fromStream;
-        }
-
         // Get file key
         $fileKey = md5($file);
 

src/ClosureInfo.php

@@ -68,7 +68,9 @@ public function hasScope(): bool
 
     public function getClosure(?array &$vars = null, ?object $thisObj = null, ?string $scope = null): Closure
     {
-        return $this->getFactory($thisObj, $scope)($vars);
+        $closure = $this->getFactory($thisObj, $scope)($vars);
+        $this->assoc($closure);
+        return $closure;
     }
 
     /**

src/ReflectionClass.php

@@ -78,7 +78,17 @@ public function info(): ?AnonymousClassInfo
             // we don't provide info for non-anonymous classes
             return null;
         }
-        return $this->_info ??= AnonymousClassParser::parse($this);
+
+        if ($this->_info) {
+            return $this->_info;
+        }
+
+        if (parent::isAnonymous()) {
+            return $this->_info = AnonymousClassParser::parse($this);
+        }
+
+        $key = substr($this->getShortName(), strlen(ReflectionClass::ANONYMOUS_CLASS_PREFIX));
+        return $this->_info = AnonymousClassInfo::resolve($key);
     }
 
     /**

src/ReflectionClosure.php

@@ -19,6 +19,8 @@ public function __construct(Closure $closure)
     {
         /** @noinspection PhpUnhandledExceptionInspection */
         parent::__construct($closure);
+        // grab the info if deserialized
+        $this->info = ClosureInfo::search($closure);
     }
 
     public function info(): ClosureInfo

src/SerializationHandler.php

@@ -34,9 +34,12 @@ public function serialize(mixed $data): string
         try {
             // get boxed structure
             $data = $this->handle($data);
-            if ($this->hasClosures && $this->priority->count()) {
+            if ($this->hasClosures && ($count = $this->priority->count())) {
                 // we only need priority when we have closures
-                $data = new PriorityWrapper(iterator_to_array($this->priority), $data);
+                // do not try to wrap a single object
+                if ($count !== 1 || !is_object($data) || !$this->priority->offsetExists($data)) {
+                    $data = new PriorityWrapper(iterator_to_array($this->priority), $data);
+                }
             }
             return serialize($data);
         } finally {
@@ -136,26 +139,26 @@ private function handleObject(object $data): object
             return $this->handleClosure($data);
         }
 
-        $info = ReflectionClass::get(get_class($data));
-        if (!$this->shouldBox($info)) {
+        $reflector = ReflectionClass::get($data);
+        if (!$this->shouldBox($reflector)) {
             // skip boxing
             return $this->objectMap[$data] = $data;
         }
 
-        if ($info->isAnonymousLike()) {
-            $anonInfo = AnonymousClassParser::parse($info);
+        if ($reflector->isAnonymousLike()) {
+            $anonInfo = $reflector->info();
             $box = new Box(Box::TYPE_ANONYMOUS_CLASS, [null, null]);
             $box->data[0] = &$this->getCachedInfo($anonInfo);
             unset($anonInfo);
         } else {
-            $box = new Box(Box::TYPE_OBJECT, [$info->name, null]);
+            $box = new Box(Box::TYPE_OBJECT, [$reflector->name, null]);
         }
 
         // Set mapping (before vars!)
         $this->objectMap[$data] = $box;
 
         // Set vars
-        $box->data[1] = $this->getObjectVars($data, $info);
+        $box->data[1] = $this->getObjectVars($data, $reflector);
 
         // Add to priority
         $this->priority->offsetSet($box);

tests/PHP80/SerializeTest.php

@@ -474,6 +474,17 @@ public function testFactoryObj()
         $this->assertTrue((new ReflectionClosure($u1->factory))->info() === (new ReflectionClosure($u2->factory))->info());
     }
 
+    public function testNestedReserialization()
+    {
+        $f1 = fn() => [
+            fn(int $a, int $b) => $a + $b,
+        ];
+        $f1 = $this->process($f1);
+
+        $f2 = $this->process($f1()[0]);
+        $this->assertEquals(3, $f2(1, 2));
+    }
+
     /**
      * @dataProvider fnDataProvider
      */