Merge pull request #105 from schmittjoh/backward-compat-8.1

Backward compatible usage of the new __serialize/__deserialize methods
schmittjoh · Nov 15, 2021 · 3c5f34f · 3c5f34f
2 parents 3653cd1 + 30a3893
commit 3c5f34f
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 34 deletions.
diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.x-dev"
+            "dev-master": "2.x-dev"
         }
     }
 }
diff --git a/src/ClassMetadata.php b/src/ClassMetadata.php
@@ -82,7 +82,13 @@ public function isFresh(?int $timestamp = null): bool
      */
     public function serialize()
     {
-        return serialize($this->__serialize());
+        return serialize([
+            $this->name,
+            $this->methodMetadata,
+            $this->propertyMetadata,
+            $this->fileResources,
+            $this->createdAt,
+        ]);
     }
 
     /**
@@ -96,34 +102,28 @@ public function serialize()
      */
     public function unserialize($str)
     {
-        $this->__unserialize((array) unserialize((string) $str));
+        [
+            $this->name,
+            $this->methodMetadata,
+            $this->propertyMetadata,
+            $this->fileResources,
+            $this->createdAt,
+        ] = unserialize($str);
     }
 
     /**
-     * @return array<mixed>
+     * @phpcsSuppress SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification
      */
     public function __serialize(): array
     {
-        return [
-            $this->name,
-            $this->methodMetadata,
-            $this->propertyMetadata,
-            $this->fileResources,
-            $this->createdAt,
-        ];
+        return [$this->serialize()];
     }
 
     /**
-     * @param array<mixed> $data
+     * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification
      */
     public function __unserialize(array $data): void
     {
-        [
-            $this->name,
-            $this->methodMetadata,
-            $this->propertyMetadata,
-            $this->fileResources,
-            $this->createdAt,
-        ] = $data;
+        $this->unserialize($data[0]);
     }
 }
diff --git a/src/MethodMetadata.php b/src/MethodMetadata.php
@@ -55,7 +55,7 @@ public function invoke(object $obj, array $args = [])
      */
     public function serialize()
     {
-        return serialize($this->__serialize());
+        return serialize([$this->class, $this->name]);
     }
 
     /**
@@ -69,23 +69,23 @@ public function serialize()
      */
     public function unserialize($str)
     {
-        $this->__unserialize((array) unserialize((string) $str));
+        [$this->class, $this->name] = unserialize($str);
     }
 
     /**
-     * @return array<string>
+     * @phpcsSuppress SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification
      */
     public function __serialize(): array
     {
-        return [$this->class, $this->name];
+        return [$this->serialize()];
     }
 
     /**
-     * @param array<string> $data
+     * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification
      */
     public function __unserialize(array $data): void
     {
-        [$this->class, $this->name] = $data;
+        $this->unserialize($data[0]);
     }
 
     /**

diff --git a/src/PropertyMetadata.php b/src/PropertyMetadata.php
@@ -39,7 +39,10 @@ public function __construct(string $class, string $name)
      */
     public function serialize()
     {
-        return serialize($this->__serialize());
+        return serialize([
+            $this->class,
+            $this->name,
+        ]);
     }
 
     /**
@@ -53,25 +56,22 @@ public function serialize()
      */
     public function unserialize($str)
     {
-        $this->__unserialize((array) unserialize((string) $str));
+        [$this->class, $this->name] = unserialize($str);
     }
 
     /**
-     * @return array<string>
+     * @phpcsSuppress SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification
      */
     public function __serialize(): array
     {
-        return [
-            $this->class,
-            $this->name,
-        ];
+        return [$this->serialize()];
     }
 
     /**
-     * @param array<string> $data
+     * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification
      */
     public function __unserialize(array $data): void
     {
-        [$this->class, $this->name] = $data;
+        $this->unserialize($data[0]);
     }
 }