Cs fixes

Author: tersmitten

src/Model/Entity/QueuedTask.php

@@ -35,6 +35,6 @@ class QueuedTask extends Entity
         'failed_count' => true,
         'failure_message' => true,
         'worker_key' => true,
-        'created' => true
+        'created' => true,
     ];
 }

src/Model/Table/QueuedTasksTable.php

@@ -93,7 +93,7 @@ public function createJob($taskName, array $data = null, string $notBefore = nul
         $task = [
             'task' => $taskName,
             'data' => serialize($data),
-            'not_before' => $this->getDateTime()
+            'not_before' => $this->getDateTime(),
         ];
 
         if (!empty($notBefore)) {
@@ -116,8 +116,8 @@ public function getLength($taskName = null): int
     {
         $findConf = [
             'conditions' => [
-                'completed IS' => null
-            ]
+                'completed IS' => null,
+            ],
         ];
         if ($taskName !== null) {
             $findConf['conditions']['task'] = $taskName;
@@ -135,13 +135,13 @@ public function getTypes(): Query
     {
         $findCond = [
             'fields' => [
-                'task'
+                'task',
             ],
             'group' => [
-                'task'
+                'task',
             ],
             'keyField' => 'task',
-            'valueField' => 'task'
+            'valueField' => 'task',
         ];
 
         return $this->find('list', $findCond);
@@ -177,15 +177,15 @@ public function getStats(): Query
                     'num' => $query->func()->count('*'),
                     'alltime' => $alltime,
                     'runtime' => $runtime,
-                    'fetchdelay' => $fetchdelay
+                    'fetchdelay' => $fetchdelay,
                 ];
             },
             'conditions' => [
-                'completed IS NOT' => null
+                'completed IS NOT' => null,
             ],
             'group' => [
-                'task'
-            ]
+                'task',
+            ],
         ];
 
         return $this->find('all', $options);
@@ -216,12 +216,12 @@ public function getFullStats($taskName = null): array
             return [
                 'task',
                 'created',
-                'duration' => $runtime
+                'duration' => $runtime,
             ];
         };
 
         $conditions = [
-            'completed IS NOT' => null
+            'completed IS NOT' => null,
         ];
         if ($taskName) {
             $conditions['task'] = $taskName;
@@ -298,15 +298,15 @@ public function requestJob(array $capabilities, array $types = []): ?QueuedTask
         $options = [
             'conditions' => [
                 'completed IS' => null,
-                'OR' => []
+                'OR' => [],
             ],
             'fields' => [
-                'age' => $age
+                'age' => $age,
             ],
             'order' => [
                 'age' => 'ASC',
-                'id' => 'ASC'
-            ]
+                'id' => 'ASC',
+            ],
         ];
 
         if ($types) {
@@ -323,17 +323,17 @@ public function requestJob(array $capabilities, array $types = []): ?QueuedTask
                     [
                         'OR' => [
                             'not_before <=' => $nowStr,
-                            'not_before IS' => null
-                        ]
+                            'not_before IS' => null,
+                        ],
                     ],
                     [
                         'OR' => [
                             'fetched <' => $timeoutAt->subSeconds($task['timeout']),
-                            'fetched IS' => null
-                        ]
-                    ]
+                            'fetched IS' => null,
+                        ],
+                    ],
                 ],
-                'failed_count <' => ($task['retries'] + 1)
+                'failed_count <' => ($task['retries'] + 1),
             ];
             $options['conditions']['OR'][] = $tmp;
         }
@@ -353,7 +353,7 @@ public function requestJob(array $capabilities, array $types = []): ?QueuedTask
             /* @phan-suppress-next-line PhanPartialTypeMismatchArgument */
             $task = $this->patchEntity($task, [
                 'worker_key' => $key,
-                'fetched' => $now
+                'fetched' => $now,
             ]);
 
             return $this->saveOrFail($task);
@@ -375,7 +375,7 @@ public function requestJob(array $capabilities, array $types = []): ?QueuedTask
     public function markJobDone(QueuedTask $task): bool
     {
         $fields = [
-            'completed' => $this->getDateTime()
+            'completed' => $this->getDateTime(),
         ];
         $task = $this->patchEntity($task, $fields);
 
@@ -393,7 +393,7 @@ public function markJobFailed(QueuedTask $task, $failureMessage = null): bool
     {
         $fields = [
             'failed_count' => $task->failed_count + 1,
-            'failure_message' => $failureMessage
+            'failure_message' => $failureMessage,
         ];
         $task = $this->patchEntity($task, $fields);
 
@@ -414,10 +414,10 @@ public function reset($id = null): int
             'fetched' => null,
             'failed_count' => 0,
             'worker_key' => null,
-            'failure_message' => null
+            'failure_message' => null,
         ];
         $conditions = [
-            'completed IS' => null
+            'completed IS' => null,
         ];
         if ($id) {
             $conditions['id'] = $id;
@@ -439,11 +439,11 @@ public function rerun($taskName): int
             'fetched' => null,
             'failed_count' => 0,
             'worker_key' => null,
-            'failure_message' => null
+            'failure_message' => null,
         ];
         $conditions = [
             'completed IS NOT' => null,
-            'task' => $taskName
+            'task' => $taskName,
         ];
 
         return $this->updateAll($fields, $conditions);
@@ -461,7 +461,7 @@ public function cleanOldJobs(array $capabilities): void
             list (, $name) = pluginSplit($task['name']);
             $conditions = [
                 'task' => $name,
-                'completed <' => date('Y-m-d H:i:s', time() - (int)$task['cleanupTimeout'])
+                'completed <' => date('Y-m-d H:i:s', time() - (int)$task['cleanupTimeout']),
             ];
             $this->deleteAll($conditions);
         }
@@ -479,7 +479,7 @@ public function cleanFailedJobs(array $capabilities): void
             list (, $name) = pluginSplit($task['name']);
             $conditions = [
                 'task' => $name,
-                'failed_count >' => $task['retries']
+                'failed_count >' => $task['retries'],
             ];
             $this->deleteAll($conditions);
         }

src/Shell/QueueShell.php

@@ -17,7 +17,7 @@
 use RuntimeException;
 use Throwable;
 
-declare(ticks = 1);
+declare(ticks=1);
 
 /**
  * Main shell to init and run queue workers.
@@ -164,19 +164,19 @@ public function runworker(): void
         if (function_exists('pcntl_signal')) {
             pcntl_signal(SIGTERM, [
                 &$this,
-                '_exit'
+                '_exit',
             ]);
             pcntl_signal(SIGINT, [
                 &$this,
-                '_exit'
+                '_exit',
             ]);
             pcntl_signal(SIGTSTP, [
                 &$this,
-                '_exit'
+                '_exit',
             ]);
             pcntl_signal(SIGQUIT, [
                 &$this,
-                '_exit'
+                '_exit',
             ]);
         }
         $this->_exit = false;
@@ -357,39 +357,39 @@ public function getOptionParser(): ConsoleOptionParser
                  * 'boolean' => true
                  * ),
                  */
-            ]
+            ],
         ];
         $subcommandParserFull = $subcommandParser;
         $subcommandParserFull['options']['type'] = [
             'short' => 't',
             'help' => 'Type (comma separated list possible)',
-            'default' => null
+            'default' => null,
         ];
 
         return parent::getOptionParser()->setDescription($this->getDescription())
             ->addSubcommand('clean', [
                 'help' => 'Remove old jobs (cleanup)',
-                'parser' => $subcommandParser
+                'parser' => $subcommandParser,
             ])
             ->addSubcommand('clean_failed', [
                 'help' => 'Remove old failed jobs (cleanup)',
-                'parser' => $subcommandParser
+                'parser' => $subcommandParser,
             ])
             ->addSubcommand('add', [
                 'help' => 'Add Job',
-                'parser' => $subcommandParser
+                'parser' => $subcommandParser,
             ])
             ->addSubcommand('stats', [
                 'help' => 'Stats',
-                'parser' => $subcommandParserFull
+                'parser' => $subcommandParserFull,
             ])
             ->addSubcommand('settings', [
                 'help' => 'Settings',
-                'parser' => $subcommandParserFull
+                'parser' => $subcommandParserFull,
             ])
             ->addSubcommand('runworker', [
                 'help' => 'Run Worker',
-                'parser' => $subcommandParserFull
+                'parser' => $subcommandParserFull,
             ]);
     }
 
@@ -417,7 +417,7 @@ protected function _log($message, $pid = null, $addDetails = true): void
             $message .= ' (pid ' . $pid . ')';
         }
         Log::write('info', $message, [
-            'scope' => 'queue'
+            'scope' => 'queue',
         ]);
     }