more changes to the handler and interface

Author: michalsn

src/Commands/QueueForget.php

@@ -56,7 +56,7 @@ public function run(array $params)
             return EXIT_ERROR;
         }
 
-        if (service('queue')->forget($id, true)) {
+        if (service('queue')->forget($id)) {
             CLI::write(sprintf('Failed job with ID %s has been removed.', $id), 'green');
         } else {
             CLI::write(sprintf('Could not find the failed job with ID %s', $id), 'red');

src/Config/Queue.php

@@ -26,7 +26,6 @@ class Queue extends BaseConfig
     public array $database = [
         'dbGroup'   => 'default',
         'getShared' => true,
-        'table'     => 'queue_jobs',
     ];
 
     /**

src/Handlers/DatabaseHandler.php

@@ -23,7 +23,6 @@ public function __construct(protected QueueConfig $config)
     {
         $connection     = db_connect($config->database['dbGroup'], $config->database['getShared']);
         $this->jobModel = model(QueueJobModel::class, true, $connection);
-        $this->jobModel->setTable($config->database['table']);
     }
 
     /**
@@ -55,7 +54,17 @@ public function push(string $queue, string $job, array $data): bool
      */
     public function pop(string $queue): ?QueueJob
     {
-        return $this->jobModel->getFromQueue($queue);
+        $queueJob = $this->jobModel->getFromQueue($queue);
+
+        if ($queueJob === null) {
+            return null;
+        }
+
+        // Set the actual status as in DB.
+        $queueJob->status = Status::RESERVED->value;
+        $queueJob->syncOriginal();
+
+        return $queueJob;
     }
 
     /**
@@ -96,11 +105,13 @@ public function failed(QueueJob $queueJob, Throwable $err, bool $keepJob): bool
 
     /**
      * Change job status to DONE od delete it.
+     *
+     * @throws ReflectionException
      */
     public function done(QueueJob $queueJob, bool $keepJob): bool
     {
         if ($keepJob) {
-            return $this->jobModel->update($queueJob->id, ['status' => Status::DONE]);
+            return $this->jobModel->update($queueJob->id, ['status' => Status::DONE->value]);
         }
 
         return $this->jobModel->delete($queueJob->id);
@@ -120,6 +131,9 @@ public function clear(?string $queue = null): bool
 
     /**
      * Retry failed job.
+     * ∂
+     *
+     * @throws ReflectionException
      */
     public function retry(?int $id, ?string $queue): int
     {
@@ -145,17 +159,24 @@ public function retry(?int $id, ?string $queue): int
     /**
      * Delete failed job by ID.
      */
-    public function forget(int $id, bool $affectedRows = false): bool
+    public function forget(int $id): bool
     {
-        return model(QueueJobFailedModel::class)->delete($id)
-            && (! $affectedRows || model(QueueJobFailedModel::class)->affectedRows() > 0);
+        if (model(QueueJobFailedModel::class)->delete($id)) {
+            return model(QueueJobFailedModel::class)->affectedRows() > 0;
+        }
+
+        return false;
     }
 
     /**
      * Delete many failed jobs at once.
      */
     public function flush(?int $hours, ?string $queue): bool
     {
+        if ($hours === null && $queue === null) {
+            return model(QueueJobFailedModel::class)->truncate();
+        }
+
         return model(QueueJobFailedModel::class)
             ->when(
                 $hours !== null,

src/Interfaces/QueueInterface.php

@@ -19,9 +19,9 @@ public function done(QueueJob $queueJob, bool $keepJob);
 
     public function clear(?string $queue = null);
 
-   public function retry(?int $id, ?string $queue);
+    public function retry(?int $id, ?string $queue);
 
-    public function forget(int $id, bool $affectedRows = false);
+    public function forget(int $id);
 
     public function flush(?int $hours, ?string $queue);
 

src/Models/QueueJobModel.php

@@ -10,7 +10,7 @@
 
 class QueueJobModel extends Model
 {
-    protected $table            = '';
+    protected $table            = 'queue_jobs';
     protected $primaryKey       = 'id';
     protected $useAutoIncrement = true;
     protected $returnType       = QueueJob::class;
@@ -37,8 +37,12 @@ class QueueJobModel extends Model
      */
     public function getFromQueue(string $name): ?QueueJob
     {
-        // Make sure we still have the connection
-        $this->db->reconnect();
+        // For SQLite3 memory database this will cause problems
+        // so check if we're not in the testing environment first.
+        if (ENVIRONMENT !== 'testing' && $this->db->database !== ':memory:') {
+            // Make sure we still have the connection
+            $this->db->reconnect();
+        }
         // Start transaction
         $this->db->transStart();
 
@@ -53,6 +57,9 @@ public function getFromQueue(string $name): ?QueueJob
             ->getCompiledSelect();
 
         $query = $this->db->query($this->skipLocked($sql));
+        if ($query === false) {
+            return null;
+        }
         /** @var QueueJob $row */
         $row = $query->getCustomRowObject(0, QueueJob::class);