Remove deprecated Serializable interface.

https://php.watch/versions/8.1/serializable-deprecated
goaop · Feb 18, 2024 · 906890c · 906890c
1 parent a1d357c
commit 906890c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/src/Aop/Framework/AbstractInterceptor.php b/src/Aop/Framework/AbstractInterceptor.php
@@ -17,7 +17,6 @@
 use Go\Core\AspectKernel;
 use ReflectionFunction;
 use ReflectionMethod;
-use Serializable;
 
 /**
  * Base class for all framework interceptor implementations
@@ -43,7 +42,7 @@
  *      return $result;
  *   }
  */
-abstract class AbstractInterceptor implements Interceptor, OrderedAdvice, Serializable
+abstract class AbstractInterceptor implements Interceptor, OrderedAdvice
 {
     /**
      * Local cache of advices for faster unserialization on big projects
@@ -128,28 +127,26 @@ public function getRawAdvice(): Closure
     }
 
     /**
-     * Serializes an interceptor into string representation
+     * Serializes an interceptor into it's representation
      */
-    final public function serialize(): string
+    final public function __serialize(): array
     {
-        $vars = array_filter(get_object_vars($this));
+        $state = array_filter(get_object_vars($this));
 
-        $vars['adviceMethod'] = static::serializeAdvice($this->adviceMethod);
+        $state['adviceMethod'] = static::serializeAdvice($this->adviceMethod);
 
-        return serialize($vars);
+        return $state;
     }
 
     /**
-     * Unserialize an interceptor from the string
+     * Un-serializes an interceptor from it's stored state
      *
-     * @param string $serialized The string representation of the object.
+     * @param array $state The stored representation of the interceptor.
      */
-    final public function unserialize($serialized): void
+    final public function __unserialize(array $state): void
     {
-        $vars = unserialize($serialized, ['allowed_classes' => false]);
-
-        $vars['adviceMethod'] = static::unserializeAdvice($vars['adviceMethod']);
-        foreach ($vars as $key => $value) {
+        $state['adviceMethod'] = static::unserializeAdvice($state['adviceMethod']);
+        foreach ($state as $key => $value) {
             $this->$key = $value;
         }
     }

diff --git a/tests/Go/Aop/Framework/BaseInterceptorTest.php b/tests/Go/Aop/Framework/BaseInterceptorTest.php
@@ -43,7 +43,7 @@ public function testCanSerializeInterceptor()
         $mockClass      = get_class($mock);
         $mockNameLength = strlen($mockClass);
         $result         = serialize($mock);
-        $expected       = 'C:' . $mockNameLength . ':"' . $mockClass . '":161:{a:1:{s:12:"adviceMethod";a:3:{s:5:"scope";s:6:"aspect";s:6:"method";s:26:"Go\Aop\Framework\{closure}";s:6:"aspect";s:36:"Go\Aop\Framework\BaseInterceptorTest";}}}';
+        $expected       = 'O:' . $mockNameLength . ':"' . $mockClass . '":1:{s:12:"adviceMethod";a:3:{s:5:"scope";s:6:"aspect";s:6:"method";s:26:"Go\Aop\Framework\{closure}";s:6:"aspect";s:36:"Go\Aop\Framework\BaseInterceptorTest";}}';
 
         $this->assertEquals($expected, $result);
     }
@@ -57,7 +57,7 @@ public function testCanUnserializeInterceptor()
         $mockClass      = get_class($mock);
         $mockNameLength = strlen($mockClass);
         // Trick to mock unserialization of advice
-        $serialized = 'C:' . $mockNameLength .':"' . $mockClass . '":161:{a:1:{s:12:"adviceMethod";a:3:{s:5:"scope";s:6:"aspect";s:6:"method";s:26:"Go\Aop\Framework\{closure}";s:6:"aspect";s:36:"Go\Aop\Framework\BaseInterceptorTest";}}}';
+        $serialized = 'O:' . $mockNameLength .':"' . $mockClass . '":1:{s:12:"adviceMethod";a:3:{s:5:"scope";s:6:"aspect";s:6:"method";s:26:"Go\Aop\Framework\{closure}";s:6:"aspect";s:36:"Go\Aop\Framework\BaseInterceptorTest";}}';
         $result     = unserialize($serialized);
         $this->assertEquals($advice, $result->getRawAdvice());
     }