chore: fix styling

mychidarko · github-actions[bot] · commit 12401b062342 · 2023-09-09T10:08:53.000Z
diff --git a/src/Job.php b/src/Job.php
@@ -120,17 +120,17 @@ public function release($delay = 0)
      */
     public static function create(callable $job)
     {
-        // 
+        //
     }
 
     public function handle()
     {
-        // 
+        //
     }
 
     public static function dispatch($config = [], $queue = 'default')
     {
-        $queue = new Queue;
+        $queue = new Queue();
         $queueConfig = MvcConfig('queue') ?? [];
 
         if (empty($queueConfig)) {
diff --git a/src/Queue.php b/src/Queue.php
@@ -63,7 +63,7 @@ public function connect(): Queue
 
         $adapter = ucfirst($config['adapter']);
         $adapter = "\\Leaf\\Queue\\Adapters\\$adapter";
-        
+
         $this->adapter = new $adapter($config);
         $this->adapter->connect($config['connections'][$config['default'] ?? 'redis']);
 
@@ -106,7 +106,7 @@ public function pop($id)
 
     /**
      * Set job status
-     * 
+     *
      * @param string|int $id The id of the job to set status
      * @param string $status The status to set
      */
diff --git a/src/Queue/Adapters/Adapter.php b/src/Queue/Adapters/Adapter.php
@@ -16,7 +16,7 @@ public function __construct($config = []);
      * @param array $connection Credentials for the queue storage
      */
     public function connect($connection);
-    
+
     /**
      * Push job to queue
      * @param array $job The job to push to the queue
@@ -31,7 +31,7 @@ public function popJobFromQueue($id);
 
     /**
      * Set job status
-     * 
+     *
      * @param string|int $id The id of the job to set status
      * @param string $status The status to set
      */
diff --git a/src/Queue/Adapters/Db.php b/src/Queue/Adapters/Db.php
@@ -55,6 +55,7 @@ public function pushJobToQueue($job)
 
         if ($this->db->errors()) {
             $this->errors = $this->db->errors();
+
             return false;
         }
 
@@ -69,12 +70,13 @@ public function popJobFromQueue($id)
         $this->db
             ->delete($this->config['table'])
             ->where([
-                "id" => $id
+                "id" => $id,
             ])
             ->execute();
 
         if ($this->db->errors()) {
             $this->errors = $this->db->errors();
+
             return false;
         }
 
@@ -89,15 +91,16 @@ public function setJobStatus($id, $status)
         $this->db
             ->update($this->config['table'])
             ->params([
-                "status" => $status
+                "status" => $status,
             ])
             ->where([
-                "id" => $id
+                "id" => $id,
             ])
             ->execute();
 
         if ($this->db->errors()) {
             $this->errors = $this->db->errors();
+
             return false;
         }
 
@@ -112,15 +115,16 @@ public function markJobAsFailed($id)
         $this->db
             ->update($this->config['table'])
             ->params([
-                "status" => "failed"
+                "status" => "failed",
             ])
             ->where([
-                "id" => $id
+                "id" => $id,
             ])
             ->execute();
 
         if ($this->db->errors()) {
             $this->errors = $this->db->errors();
+
             return false;
         }
 
@@ -141,7 +145,7 @@ protected function setupAdapterStorage()
                 'retry_count' => 'INT',
                 'created_at' => 'TIMESTAMP DEFAULT CURRENT_TIMESTAMP',
                 'updated_at' => 'DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
-                'PRIMARY KEY' => '(ID)'
+                'PRIMARY KEY' => '(ID)',
             ])
             ->execute();
     }
@@ -162,7 +166,7 @@ public function getNextJob()
         return $this->db
             ->select($this->config['table'])
             ->where([
-                'status' => 'pending'
+                'status' => 'pending',
             ])
             ->orderBy('id', 'asc')
             ->limit(1)
@@ -178,15 +182,16 @@ public function retryFailedJob($id, $retryCount)
             ->update($this->config['table'])
             ->params([
                 "status" => "pending",
-                "retry_count" => (int) $retryCount + 1
+                "retry_count" => (int) $retryCount + 1,
             ])
             ->where([
-                "id" => $id
+                "id" => $id,
             ])
             ->execute();
 
         if ($this->db->errors()) {
             $this->errors = $this->db->errors();
+
             return false;
         }
 
diff --git a/src/Queue/Adapters/Redis.php b/src/Queue/Adapters/Redis.php
@@ -28,7 +28,7 @@ public function __construct($config = [])
     public function connect($connection)
     {
         $this->redis->init($connection);
-        
+
         if (!$this->redis->get($this->config['table'])) {
             $this->redis->set($this->config['table'], json_encode([]));
         }
@@ -65,6 +65,7 @@ public function popJobFromQueue($id)
             if ($job['id'] === $id) {
                 unset($jobs[$key]);
                 $this->redis->set($this->config['table'], json_encode($jobs));
+
                 return true;
             }
         }
@@ -84,6 +85,7 @@ public function setJobStatus($id, $status)
             if ($job['id'] === $id) {
                 $jobs[$key]['status'] = $status;
                 $this->redis->set($this->config['table'], json_encode($jobs));
+
                 return true;
             }
         }
@@ -105,6 +107,7 @@ public function markJobAsFailed($id)
     public function getJobs()
     {
         $jobs = $this->redis->get($this->config['table']) ?? [];
+
         return json_decode($jobs, true);
     }
 
@@ -136,6 +139,7 @@ public function retryFailedJob($id, $retryCount)
                 $jobs[$key]['status'] = 'pending';
                 $jobs[$key]['retry_count'] = (int) $retryCount + 1;
                 $this->redis->set($this->config['table'], json_encode($jobs));
+
                 return true;
             }
         }
diff --git a/src/Queue/Commands/DeleteJobCommand.php b/src/Queue/Commands/DeleteJobCommand.php
@@ -28,12 +28,14 @@ protected function handle()
 
         if (!file_exists($file)) {
             $this->error("$job doesn't exist");
+
             return 1;
         }
 
         unlink($file);
 
         $this->comment("$job deleted successfully");
+
         return 0;
     }
 }
diff --git a/src/Queue/Commands/GenerateJobCommand.php b/src/Queue/Commands/GenerateJobCommand.php
@@ -28,6 +28,7 @@ protected function handle()
 
         if (file_exists($file)) {
             $this->error("$job already exists");
+
             return 1;
         }
 
@@ -39,6 +40,7 @@ protected function handle()
         file_put_contents($file, $fileContent);
 
         $this->comment("$job generated successfully");
+
         return 0;
     }
 }
diff --git a/src/Queue/Commands/QueueRunCommand.php b/src/Queue/Commands/QueueRunCommand.php
@@ -15,7 +15,7 @@ protected function handle()
     {
         $this->writeln('Starting queue worker...');
 
-        $queue = new Queue;
+        $queue = new Queue();
         $queueConfigFile = getcwd() . '/config/queue.php';
         $queueConfig = [];
 
diff --git a/src/Worker.php b/src/Worker.php
@@ -13,7 +13,7 @@ class Worker
         'timeout' => 60,
         'sleep' => 3,
         'tries' => 3,
-        'force' => false
+        'force' => false,
     ];
 
     /**
@@ -22,12 +22,14 @@ class Worker
     public function config($config)
     {
         $this->config = array_merge($this->config, $config);
+
         return $this;
     }
 
     public function queue($queue)
     {
         $this->queue = $queue;
+
         return $this;
     }
 
@@ -58,7 +60,7 @@ public function run()
             }
 
             $jobConfig = json_decode($jobData['config'] ?? "{}", true);
-            
+
             try {
                 /** @var \Leaf\Job */
                 $job = new $jobData['class']($jobData, $jobConfig, $this->queue);
@@ -67,11 +69,13 @@ public function run()
 
                 if ($job->hasExpired()) {
                     $job->handleExpiry();
+
                     continue;
                 }
 
                 if ($job->hasReachedRetryLimit()) {
                     $job->handleRetryLimit();
+
                     continue;
                 }
 
@@ -84,9 +88,11 @@ public function run()
 
                 // at this point, the job has been successfully processed
                 $job->removeFromQueue();
+
                 continue;
             } catch (\Throwable $th) {
                 $job->retry();
+
                 continue;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -120,17 +120,17 @@ public function release($delay = 0)`
`120`	`120`	`*/`
`121`	`121`	`public static function create(callable $job)`
`122`	`122`	`{`
`123`		`- //`
	`123`	`+ //`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`public function handle()`
`127`	`127`	`{`
`128`		`- //`
	`128`	`+ //`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`public static function dispatch($config = [], $queue = 'default')`
`132`	`132`	`{`
`133`		`- $queue = new Queue;`
	`133`	`+ $queue = new Queue();`
`134`	`134`	`$queueConfig = MvcConfig('queue') ?? [];`
`135`	`135`
`136`	`136`	`if (empty($queueConfig)) {`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function __construct($config = [])`
`28`	`28`	`public function connect($connection)`
`29`	`29`	`{`
`30`	`30`	`$this->redis->init($connection);`
`31`		`-`
	`31`	`+`
`32`	`32`	`if (!$this->redis->get($this->config['table'])) {`
`33`	`33`	`$this->redis->set($this->config['table'], json_encode([]));`
`34`	`34`	`}`
`@@ -65,6 +65,7 @@ public function popJobFromQueue($id)`
`65`	`65`	`if ($job['id'] === $id) {`
`66`	`66`	`unset($jobs[$key]);`
`67`	`67`	`$this->redis->set($this->config['table'], json_encode($jobs));`
	`68`	`+`
`68`	`69`	`return true;`
`69`	`70`	`}`
`70`	`71`	`}`
`@@ -84,6 +85,7 @@ public function setJobStatus($id, $status)`
`84`	`85`	`if ($job['id'] === $id) {`
`85`	`86`	`$jobs[$key]['status'] = $status;`
`86`	`87`	`$this->redis->set($this->config['table'], json_encode($jobs));`
	`88`	`+`
`87`	`89`	`return true;`
`88`	`90`	`}`
`89`	`91`	`}`
`@@ -105,6 +107,7 @@ public function markJobAsFailed($id)`
`105`	`107`	`public function getJobs()`
`106`	`108`	`{`
`107`	`109`	`$jobs = $this->redis->get($this->config['table']) ?? [];`
	`110`	`+`
`108`	`111`	`return json_decode($jobs, true);`
`109`	`112`	`}`
`110`	`113`
`@@ -136,6 +139,7 @@ public function retryFailedJob($id, $retryCount)`
`136`	`139`	`$jobs[$key]['status'] = 'pending';`
`137`	`140`	`$jobs[$key]['retry_count'] = (int) $retryCount + 1;`
`138`	`141`	`$this->redis->set($this->config['table'], json_encode($jobs));`
	`142`	`+`
`139`	`143`	`return true;`
`140`	`144`	`}`
`141`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,14 @@ protected function handle()`
`28`	`28`
`29`	`29`	`if (!file_exists($file)) {`
`30`	`30`	`$this->error("$job doesn't exist");`
	`31`	`+`
`31`	`32`	`return 1;`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`unlink($file);`
`35`	`36`
`36`	`37`	`$this->comment("$job deleted successfully");`
	`38`	`+`
`37`	`39`	`return 0;`
`38`	`40`	`}`
`39`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ protected function handle()`
`28`	`28`
`29`	`29`	`if (file_exists($file)) {`
`30`	`30`	`$this->error("$job already exists");`
	`31`	`+`
`31`	`32`	`return 1;`
`32`	`33`	`}`
`33`	`34`
`@@ -39,6 +40,7 @@ protected function handle()`
`39`	`40`	`file_put_contents($file, $fileContent);`
`40`	`41`
`41`	`42`	`$this->comment("$job generated successfully");`
	`43`	`+`
`42`	`44`	`return 0;`
`43`	`45`	`}`
`44`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ protected function handle()`
`15`	`15`	`{`
`16`	`16`	`$this->writeln('Starting queue worker...');`
`17`	`17`
`18`		`- $queue = new Queue;`
	`18`	`+ $queue = new Queue();`
`19`	`19`	`$queueConfigFile = getcwd() . '/config/queue.php';`
`20`	`20`	`$queueConfig = [];`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class Worker`
`13`	`13`	`'timeout' => 60,`
`14`	`14`	`'sleep' => 3,`
`15`	`15`	`'tries' => 3,`
`16`		`- 'force' => false`
	`16`	`+ 'force' => false,`
`17`	`17`	`];`
`18`	`18`
`19`	`19`	`/**`
`@@ -22,12 +22,14 @@ class Worker`
`22`	`22`	`public function config($config)`
`23`	`23`	`{`
`24`	`24`	`$this->config = array_merge($this->config, $config);`
	`25`	`+`
`25`	`26`	`return $this;`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`public function queue($queue)`
`29`	`30`	`{`
`30`	`31`	`$this->queue = $queue;`
	`32`	`+`
`31`	`33`	`return $this;`
`32`	`34`	`}`
`33`	`35`
`@@ -58,7 +60,7 @@ public function run()`
`58`	`60`	`}`
`59`	`61`
`60`	`62`	`$jobConfig = json_decode($jobData['config'] ?? "{}", true);`
`61`		`-`
	`63`	`+`
`62`	`64`	`try {`
`63`	`65`	`/** @var \Leaf\Job */`
`64`	`66`	`$job = new $jobData['class']($jobData, $jobConfig, $this->queue);`
`@@ -67,11 +69,13 @@ public function run()`
`67`	`69`
`68`	`70`	`if ($job->hasExpired()) {`
`69`	`71`	`$job->handleExpiry();`
	`72`	`+`
`70`	`73`	`continue;`
`71`	`74`	`}`
`72`	`75`
`73`	`76`	`if ($job->hasReachedRetryLimit()) {`
`74`	`77`	`$job->handleRetryLimit();`
	`78`	`+`
`75`	`79`	`continue;`
`76`	`80`	`}`
`77`	`81`
`@@ -84,9 +88,11 @@ public function run()`
`84`	`88`
`85`	`89`	`// at this point, the job has been successfully processed`
`86`	`90`	`$job->removeFromQueue();`
	`91`	`+`
`87`	`92`	`continue;`
`88`	`93`	`} catch (\Throwable $th) {`
`89`	`94`	`$job->retry();`
	`95`	`+`
`90`	`96`	`continue;`
`91`	`97`	`}`
`92`	`98`	`}`