[8.x] Added support of PHP 7.3 to RateLimiter middleware(queue) serialization

src/Illuminate/Queue/Middleware/RateLimited.php

@@ -126,25 +126,21 @@ protected function getTimeUntilNextRetry($key)
      *
      * @return array
      */
-    public function __serialize()
+    public function __sleep()
     {
         return [
-            'limiterName' => $this->limiterName,
-            'shouldRelease' => $this->shouldRelease,
+            'limiterName',
+            'shouldRelease',
         ];
     }
 
     /**
      * Prepare the object after unserialization.
      *
-     * @param  array  $data
      * @return void
      */
-    public function __unserialize(array $data)
+    public function __wakeup()
     {
         $this->limiter = Container::getInstance()->make(RateLimiter::class);
-
-        $this->limiterName = $data['limiterName'];
-        $this->shouldRelease = $data['shouldRelease'];
     }
 }

src/Illuminate/Queue/Middleware/RateLimitedWithRedis.php

@@ -92,12 +92,11 @@ protected function getTimeUntilNextRetry($key)
     /**
      * Prepare the object after unserialization.
      *
-     * @param  array  $data
      * @return void
      */
-    public function __unserialize(array $data)
+    public function __wakeup()
     {
-        parent::__unserialize($data);
+        parent::__wakeup();
 
         $this->redis = Container::getInstance()->make(Redis::class);
     }

tests/Integration/Queue/RateLimitedTest.php

@@ -80,6 +80,22 @@ public function testJobsCanHaveConditionalRateLimits()
         $this->assertJobWasReleased(NonAdminTestJob::class);
     }
 
+    public function testMiddlewareSerialization()
+    {
+        $rateLimited = new RateLimited('limiterName');
+        $rateLimited->shouldRelease = false;
+
+        $restoredRateLimited = unserialize(serialize($rateLimited));
+
+        $fetch = (function (string $name) {
+            return $this->{$name};
+        })->bindTo($restoredRateLimited, RateLimited::class);
+
+        $this->assertFalse($restoredRateLimited->shouldRelease);
+        $this->assertEquals('limiterName', $fetch('limiterName'));
+        $this->assertInstanceOf(RateLimiter::class, $fetch('limiter'));
+    }
+
     protected function assertJobRanSuccessfully($class)
     {
         $class::$handled = false;

tests/Integration/Queue/RateLimitedWithRedisTest.php

@@ -7,6 +7,7 @@
 use Illuminate\Cache\RateLimiter;
 use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Contracts\Queue\Job;
+use Illuminate\Contracts\Redis\Factory as Redis;
 use Illuminate\Foundation\Testing\Concerns\InteractsWithRedis;
 use Illuminate\Queue\CallQueuedHandler;
 use Illuminate\Queue\InteractsWithQueue;
@@ -111,6 +112,23 @@ public function testJobsCanHaveConditionalRateLimits()
         $this->assertJobWasReleased($nonAdminJob);
     }
 
+    public function testMiddlewareSerialization()
+    {
+        $rateLimited = new RateLimitedWithRedis('limiterName');
+        $rateLimited->shouldRelease = false;
+
+        $restoredRateLimited = unserialize(serialize($rateLimited));
+
+        $fetch = (function (string $name) {
+            return $this->{$name};
+        })->bindTo($restoredRateLimited, RateLimitedWithRedis::class);
+
+        $this->assertFalse($restoredRateLimited->shouldRelease);
+        $this->assertEquals('limiterName', $fetch('limiterName'));
+        $this->assertInstanceOf(RateLimiter::class, $fetch('limiter'));
+        $this->assertInstanceOf(Redis::class, $fetch('redis'));
+    }
+
     protected function assertJobRanSuccessfully($testJob)
     {
         $testJob::$handled = false;