misc: use WeakMap to detect circular references

CuyZ · Oct 8, 2023 · e901ded · e901ded
1 parent 6f59f02
commit e901ded
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/Normalizer/RecursiveNormalizer.php b/src/Normalizer/RecursiveNormalizer.php
@@ -15,6 +15,8 @@
 use stdClass;
 use UnitEnum;
 
+use WeakMap;
+
 use function array_filter;
 use function array_shift;
 use function is_array;
@@ -31,22 +33,25 @@ public function __construct(private FunctionsContainer $handlers) {}
 
     public function normalize(mixed $value): mixed
     {
-        return $this->doNormalize($value, []);
+        /** @var WeakMap<object, true> $references */
+        $references = new WeakMap();
+
+        return $this->doNormalize($value, $references);
     }
 
     /**
-     * @param array<int, true> $references
+     * @param WeakMap<object, true> $references
      */
-    private function doNormalize(mixed $value, array $references): mixed
+    private function doNormalize(mixed $value, WeakMap $references): mixed
     {
         if (is_object($value)) {
             $id = spl_object_id($value);
 
-            if (isset($references[$id])) {
+            if (isset($references[$value])) {
                 throw new CircularReferenceFoundDuringNormalization($value);
             }
 
-            $references[$id] = true;
+            $references[$value] = true;
         }
 
         if ($this->handlers->count() === 0) {