refactor: fix variable types

kenjis · kenjis · commit e8c074bae85f · 2023-12-17T14:13:48.000+09:00
diff --git a/src/Commands/QueueWork.php b/src/Commands/QueueWork.php
@@ -94,7 +94,9 @@ public function run(array $params)
         $memory     = $params['memory'] ?? CLI::getOption('memory') ?? 128;
         $priority   = $params['priority'] ?? CLI::getOption('priority') ?? $config->getQueuePriorities($queue) ?? 'default';
         $tries      = $params['tries'] ?? CLI::getOption('tries');
+        $tries      = ($tries !== null) ? (int) $tries : $tries;
         $retryAfter = $params['retry-after'] ?? CLI::getOption('retry-after');
+        $retryAfter = ($retryAfter !== null) ? (int) $retryAfter : $retryAfter;
         $countJobs  = 0;
 
         if (array_key_exists('stop-when-empty', $params) || CLI::getOption('stop-when-empty')) {
diff --git a/src/Handlers/PredisHandler.php b/src/Handlers/PredisHandler.php
@@ -80,7 +80,7 @@ public function pop(string $queue, array $priorities): ?QueueJob
         $queueJob->status = Status::RESERVED->value;
         $queueJob->syncOriginal();
 
-        $this->predis->hset("queues:{$queue}::reserved", $queueJob->id, json_encode($queueJob));
+        $this->predis->hset("queues:{$queue}::reserved", (string) $queueJob->id, json_encode($queueJob));
 
         return $queueJob;
     }
diff --git a/src/Handlers/RedisHandler.php b/src/Handlers/RedisHandler.php
@@ -99,7 +99,7 @@ public function pop(string $queue, array $priorities): ?QueueJob
         $queueJob->status = Status::RESERVED->value;
         $queueJob->syncOriginal();
 
-        $this->redis->hSet("queues:{$queue}::reserved", $queueJob->id, json_encode($queueJob));
+        $this->redis->hSet("queues:{$queue}::reserved", (string) $queueJob->id, json_encode($queueJob));
 
         return $queueJob;
     }
@@ -115,7 +115,7 @@ public function later(QueueJob $queueJob, int $seconds): bool
         $queueJob->available_at = Time::now()->addSeconds($seconds)->timestamp;
 
         if ($result = (int) $this->redis->zAdd("queues:{$queueJob->queue}:{$queueJob->priority}", $queueJob->available_at->timestamp, json_encode($queueJob))) {
-            $this->redis->hDel("queues:{$queueJob->queue}::reserved", $queueJob->id);
+            $this->redis->hDel("queues:{$queueJob->queue}::reserved", (string) $queueJob->id);
         }
 
         return $result > 0;
@@ -130,7 +130,7 @@ public function failed(QueueJob $queueJob, Throwable $err, bool $keepJob): bool
             $this->logFailed($queueJob, $err);
         }
 
-        return (bool) $this->redis->hDel("queues:{$queueJob->queue}::reserved", $queueJob->id);
+        return (bool) $this->redis->hDel("queues:{$queueJob->queue}::reserved", (string) $queueJob->id);
     }
 
     /**
@@ -145,7 +145,7 @@ public function done(QueueJob $queueJob, bool $keepJob): bool
             $this->redis->lPush("queues:{$queueJob->queue}::done", json_encode($queueJob));
         }
 
-        return (bool) $this->redis->hDel("queues:{$queueJob->queue}::reserved", $queueJob->id);
+        return (bool) $this->redis->hDel("queues:{$queueJob->queue}::reserved", (string) $queueJob->id);
     }
 
     /**
diff --git a/tests/_support/Database/Seeds/TestRedisQueueSeeder.php b/tests/_support/Database/Seeds/TestRedisQueueSeeder.php
@@ -40,7 +40,7 @@ public function run(): void
             'attempts'     => 0,
             'available_at' => 1_697_269_864,
         ]);
-        $redis->hSet("queues:{$jobQueue->queue}::reserved", $jobQueue->id, json_encode($jobQueue));
+        $redis->hSet("queues:{$jobQueue->queue}::reserved", (string) $jobQueue->id, json_encode($jobQueue));
 
         $jobQueue = new QueueJob([
             'id'           => '1234567890654321',

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public function pop(string $queue, array $priorities): ?QueueJob`
`80`	`80`	`$queueJob->status = Status::RESERVED->value;`
`81`	`81`	`$queueJob->syncOriginal();`
`82`	`82`
`83`		`- $this->predis->hset("queues:{$queue}::reserved", $queueJob->id, json_encode($queueJob));`
	`83`	`+ $this->predis->hset("queues:{$queue}::reserved", (string) $queueJob->id, json_encode($queueJob));`
`84`	`84`
`85`	`85`	`return $queueJob;`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public function pop(string $queue, array $priorities): ?QueueJob`
`99`	`99`	`$queueJob->status = Status::RESERVED->value;`
`100`	`100`	`$queueJob->syncOriginal();`
`101`	`101`
`102`		`- $this->redis->hSet("queues:{$queue}::reserved", $queueJob->id, json_encode($queueJob));`
	`102`	`+ $this->redis->hSet("queues:{$queue}::reserved", (string) $queueJob->id, json_encode($queueJob));`
`103`	`103`
`104`	`104`	`return $queueJob;`
`105`	`105`	`}`
`@@ -115,7 +115,7 @@ public function later(QueueJob $queueJob, int $seconds): bool`
`115`	`115`	`$queueJob->available_at = Time::now()->addSeconds($seconds)->timestamp;`
`116`	`116`
`117`	`117`	`if ($result = (int) $this->redis->zAdd("queues:{$queueJob->queue}:{$queueJob->priority}", $queueJob->available_at->timestamp, json_encode($queueJob))) {`
`118`		`- $this->redis->hDel("queues:{$queueJob->queue}::reserved", $queueJob->id);`
	`118`	`+ $this->redis->hDel("queues:{$queueJob->queue}::reserved", (string) $queueJob->id);`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`return $result > 0;`
`@@ -130,7 +130,7 @@ public function failed(QueueJob $queueJob, Throwable $err, bool $keepJob): bool`
`130`	`130`	`$this->logFailed($queueJob, $err);`
`131`	`131`	`}`
`132`	`132`
`133`		`- return (bool) $this->redis->hDel("queues:{$queueJob->queue}::reserved", $queueJob->id);`
	`133`	`+ return (bool) $this->redis->hDel("queues:{$queueJob->queue}::reserved", (string) $queueJob->id);`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`/**`
`@@ -145,7 +145,7 @@ public function done(QueueJob $queueJob, bool $keepJob): bool`
`145`	`145`	`$this->redis->lPush("queues:{$queueJob->queue}::done", json_encode($queueJob));`
`146`	`146`	`}`
`147`	`147`
`148`		`- return (bool) $this->redis->hDel("queues:{$queueJob->queue}::reserved", $queueJob->id);`
	`148`	`+ return (bool) $this->redis->hDel("queues:{$queueJob->queue}::reserved", (string) $queueJob->id);`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`/**`