Replace __wakeup with __unserialize for object unserialization

Replace __wakeup with __unserialize for object unserialization

Replace __wakeup with __unserialize for object unserialization

Replace __wakeup with __unserialize for object unserialization

Author: Arshid

src/Illuminate/Database/Eloquent/Model.php

@@ -2601,8 +2601,8 @@ public function escapeWhenCastingToString($escape = true)
      * Prepare the object for serialization.
      *
      * @return array
-     */
-    public function __sleep()
+     */ 
+    public function __serialize()
     {
         $this->mergeAttributesFromCachedCasts();
 
@@ -2611,16 +2611,21 @@ public function __sleep()
         $this->relationAutoloadCallback = null;
         $this->relationAutoloadContext = null;
 
-        return array_keys(get_object_vars($this));
+        return get_object_vars($this);
     }
 
     /**
      * When a model is being unserialized, check if it needs to be booted.
      *
      * @return void
-     */
-    public function __wakeup()
+     */ 
+    public function __unserialize($data)
     {
+        foreach ($data as $property => $value) {
+            if (property_exists($this, $property)) {
+                $this->{$property} = $value;
+            }
+        }
         $this->bootIfNotBooted();
 
         $this->initializeTraits();

src/Illuminate/Queue/Middleware/RateLimited.php

@@ -147,11 +147,11 @@ protected function getTimeUntilNextRetry($key)
      *
      * @return array
      */
-    public function __sleep()
+    public function __serialize()
     {
         return [
-            'limiterName',
-            'shouldRelease',
+            'limiterName' => $this->limiterName,
+            'shouldRelease' => $this->shouldRelease,
         ];
     }
 
@@ -160,8 +160,13 @@ public function __sleep()
      *
      * @return void
      */
-    public function __wakeup()
+    public function __unserialize($data)
     {
+        foreach ($data as $property => $value) {
+            if (property_exists($this, $property)) {
+                $this->{$property} = $value;
+            }
+        }
         $this->limiter = Container::getInstance()->make(RateLimiter::class);
     }
 }

src/Illuminate/Queue/Middleware/RateLimitedWithRedis.php

@@ -93,9 +93,14 @@ protected function getTimeUntilNextRetry($key)
      *
      * @return void
      */
-    public function __wakeup()
+    public function __unserialize($data)
     {
-        parent::__wakeup();
+        foreach ($data as $property => $value) {
+            if (property_exists($this, $property)) {
+                $this->{$property} = $value;
+            }
+        }
+        parent::__unserialize($data);
 
         $this->redis = Container::getInstance()->make(Redis::class);
     }

tests/Integration/Cache/Fixtures/Unserializable.php

@@ -6,7 +6,7 @@
 
 class Unserializable
 {
-    public function __sleep()
+    public function __serialize()
     {
         throw new Exception('Not serializable');
     }

tests/Integration/Queue/CallQueuedHandlerTest.php

@@ -195,7 +195,7 @@ public function handle()
         //
     }
 
-    public function __wakeup()
+    public function __unserialize($data)
     {
         throw new ModelNotFoundException('Foo');
     }
@@ -209,7 +209,7 @@ public function handle()
         //
     }
 
-    public function __wakeup()
+    public function __unserialize($data)
     {
         throw new ModelNotFoundException('Foo');
     }