Oefenweb / cakephp-queue

src/Shell/Task/QueueTask.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
         $class = get_class($this);
 
         preg_match('#\\\\Queue(.+)Task$#', $class, $matches);
-        if (! $matches) {
+        if (!$matches) {
             throw new InvalidArgumentException('Invalid class name: ' . $class);
         }
 

src/Shell/QueueShell.php

Spacing +18 added lines, -18 removed lines

@@ -17,7 +17,7 @@ 
 use Queue\Shell\Task\QueueTaskInterface;
 use RuntimeException;
 use Throwable;
-declare(ticks = 1);
+declare(ticks=1);
 
 /**
  * Main shell to init and run queue workers.
@@ -121,7 +121,7 @@ 
         if (in_array('Queue' . $name, $this->taskNames, true)) {
             /** @var \Queue\Shell\Task\QueueTask|\Queue\Shell\Task\AddInterface $task */
             $task = $this->{'Queue' . $name};
-            if (! ($task instanceof AddInterface)) {
+            if (!($task instanceof AddInterface)) {
                 $this->abort('This task does not support adding via CLI call');
             }
             $task->add();
@@ -160,7 +160,7 @@ 
             $pid = $this->_initPid();
         } catch (PersistenceFailedException $exception) {
             $this->err($exception->getMessage());
-            $limit = (int) Configure::read('Queue.maxWorkers');
+            $limit = (int)Configure::read('Queue.maxWorkers');
             if ($limit) {
                 $this->out('Cannot start worker: Too many workers already/still running on this server (' . $limit . '/' . $limit . ')');
             }
@@ -194,7 +194,7 @@ 
         $startTime = time();
         $types = $this->_stringToArray($this->param('type'));
 
-        while (! $this->_exit) {
+        while (!$this->_exit) {
             $this->out(__d('queue', 'Looking for a job.'), 1, Shell::VERBOSE);
 
             $QueuedTask = $this->QueuedTasks->requestJob($this->_getTaskConf(), $types);
@@ -214,7 +214,7 @@ 
                 $this->_exit = true;
                 $this->out('queue', 'Reached runtime of ' . (time() - $startTime) . ' Seconds (Max ' . Configure::readOrFail('Queue.workerMaxRuntime') . '), terminating.');
             }
-            if ($this->_exit || mt_rand(0, 100) > (100 - (int) Config::gcprob())) {
+            if ($this->_exit || mt_rand(0, 100) > (100 - (int)Config::gcprob())) {
                 $this->out(__d('queue', 'Performing old job cleanup.'));
                 $this->QueuedTasks->cleanOldJobs();
             }
@@ -246,11 +246,11 @@ 
             $data = unserialize($QueuedTask->data);
             /** @var \Queue\Shell\Task\QueueTask $task */
             $task = $this->{$taskName};
-            if (! $task instanceof QueueTaskInterface) {
+            if (!$task instanceof QueueTaskInterface) {
                 throw new RuntimeException('Task must implement ' . QueueTaskInterface::class);
             }
 
-            $return = $task->run((array) $data, $QueuedTask->id);
+            $return = $task->run((array)$data, $QueuedTask->id);
             if ($return !== null) {
                 trigger_error('run() should be void and throw exception in error case now.', E_USER_DEPRECATED);
             }
@@ -259,7 +259,7 @@ 
             $return = false;
 
             $failureMessage = get_class($e) . ': ' . $e->getMessage();
-            if (! ($e instanceof QueueException)) {
+            if (!($e instanceof QueueException)) {
                 $failureMessage .= "\n" . $e->getTraceAsString();
             }
 
@@ -290,11 +290,11 @@ 
      */
     public function clean()
     {
-        if (! Configure::read('Queue.cleanupTimeout')) {
+        if (!Configure::read('Queue.cleanupTimeout')) {
             $this->abort('You disabled cleanuptimout in config. Aborting.');
         }
 
-        $this->out('Deleting old jobs, that have finished before ' . date('Y-m-d H:i:s', time() - (int) Configure::read('Queue.cleanupTimeout')));
+        $this->out('Deleting old jobs, that have finished before ' . date('Y-m-d H:i:s', time() - (int)Configure::read('Queue.cleanupTimeout')));
         $this->QueuedTasks->cleanOldJobs();
     }
 
@@ -306,7 +306,7 @@ 
     public function settings()
     {
         $this->out('Current Settings:');
-        $conf = (array) Configure::read('Queue');
+        $conf = (array)Configure::read('Queue');
         foreach ($conf as $key => $val) {
             if ($val === false) {
                 $val = 'no';
@@ -355,7 +355,7 @@ 
     public function getOptionParser()
     {
         $subcommandParser = [
-            'options' => [ /*
+            'options' => [/*
                              * 'dry-run'=> array(
                              * 'short' => 'd',
                              * 'help' => 'Dry run the update, no jobs will actually be added.',
@@ -406,7 +406,7 @@ 
      */
     protected function _log($message, $pid = null, $addDetails = true)
     {
-        if (! Configure::read('Queue.log')) {
+        if (!Configure::read('Queue.log')) {
             return;
         }
 
@@ -451,7 +451,7 @@ 
      */
     protected function _getTaskConf()
     {
-        if (! is_array($this->_taskConf)) {
+        if (!is_array($this->_taskConf)) {
             $this->_taskConf = [];
             foreach ($this->tasks as $task) {
                 list ($pluginName, $taskName) = pluginSplit($task);
@@ -519,7 +519,7 @@ 
     protected function _retrievePid()
     {
         if (function_exists('posix_getpid')) {
-            $pid = (string) posix_getpid();
+            $pid = (string)posix_getpid();
         } else {
             $pid = $this->QueuedTasks->key();
         }
@@ -550,10 +550,10 @@ 
      */
     protected function _deletePid($pid)
     {
-        if (! $pid) {
+        if (!$pid) {
             $pid = $this->_pid;
         }
-        if (! $pid) {
+        if (!$pid) {
             return;
         }
     }
@@ -592,7 +592,7 @@ 
      */
     protected function _stringToArray($param)
     {
-        if (! $param) {
+        if (!$param) {
             return [];
         }
 

src/Model/Table/QueuedTasksTable.php

Spacing +15 added lines, -15 removed lines

@@ -68,7 +68,7 @@ 
     public static function defaultConnectionName()
     {
         $connection = Configure::read('Queue.connection');
-        if (! empty($connection)) {
+        if (!empty($connection)) {
             return $connection;
         }
 
@@ -108,7 +108,7 @@ 
             'not_before' => $this->getDateTime()
         ];
 
-        if (! empty($notBefore)) {
+        if (!empty($notBefore)) {
             $task['not_before'] = $this->getDateTime(strtotime($notBefore));
         }
 
@@ -134,7 +134,7 @@ 
             $conditions['task'] = $taskName;
         }
 
-        return (bool) $this->find()
+        return (bool)$this->find()
             ->where($conditions)
             ->select([
             'id'
@@ -194,7 +194,7 @@ 
     {
         $driverName = $this->_getDriverName();
         $options = [
-            'fields' => function (Query $query) use ($driverName) {
+            'fields' => function(Query $query) use ($driverName) {
                 $alltime = $query->func()->avg('UNIX_TIMESTAMP(completed) - UNIX_TIMESTAMP(created)');
                 $runtime = $query->func()->avg('UNIX_TIMESTAMP(completed) - UNIX_TIMESTAMP(fetched)');
                 $fetchdelay = $query->func()->avg('UNIX_TIMESTAMP(fetched) - IF(not_before is NULL, UNIX_TIMESTAMP(created), UNIX_TIMESTAMP(not_before))');
@@ -241,7 +241,7 @@ 
     public function getFullStats($taskName = null)
     {
         $driverName = $this->_getDriverName();
-        $fields = function (Query $query) use ($driverName) {
+        $fields = function(Query $query) use ($driverName) {
             $runtime = $query->newExpr('UNIX_TIMESTAMP(completed) - UNIX_TIMESTAMP(fetched)');
             switch ($driverName) {
                 case static::DRIVER_SQLSERVER:
@@ -280,7 +280,7 @@ 
             /** @var \DateTime $created */
             $created = $task['created'];
             $day = $created->format('Y-m-d');
-            if (! isset($days[$day])) {
+            if (!isset($days[$day])) {
                 $days[$day] = $day;
             }
 
@@ -290,7 +290,7 @@ 
         foreach ($result as $type => $tasks) {
             foreach ($tasks as $day => $durations) {
                 $average = array_sum($durations) / count($durations);
-                $result[$type][$day] = (int) $average;
+                $result[$type][$day] = (int)$average;
             }
 
             foreach ($days as $day) {
@@ -377,13 +377,13 @@ 
         }
 
         /** @var \Queue\Model\Entity\QueuedTask|null $task */
-        $task = $this->getConnection()->transactional(function () use ($query, $options, $now) {
+        $task = $this->getConnection()->transactional(function() use ($query, $options, $now) {
             $task = $query->find('all', $options)
                 ->enableAutoFields(true)
                 ->epilog('FOR UPDATE')
                 ->first();
 
-            if (! $task) {
+            if (!$task) {
                 return null;
             }
 
@@ -396,7 +396,7 @@ 
             return $this->saveOrFail($task);
         });
 
-        if (! $task) {
+        if (!$task) {
             return null;
         }
 
@@ -417,7 +417,7 @@ 
         ];
         $task = $this->patchEntity($task, $fields);
 
-        return (bool) $this->save($task);
+        return (bool)$this->save($task);
     }
 
     /**
@@ -437,7 +437,7 @@ 
         ];
         $task = $this->patchEntity($task, $fields);
 
-        return (bool) $this->save($task);
+        return (bool)$this->save($task);
     }
 
     /**
@@ -496,12 +496,12 @@ 
      */
     public function cleanOldJobs()
     {
-        if (! Configure::read('Queue.cleanuptimeout')) {
+        if (!Configure::read('Queue.cleanuptimeout')) {
             return;
         }
 
         $this->deleteAll([
-            'completed <' => time() - (int) Configure::read('Queue.cleanuptimeout')
+            'completed <' => time() - (int)Configure::read('Queue.cleanuptimeout')
         ]);
     }
 
@@ -540,7 +540,7 @@ 
             return $this->_key;
         }
         $this->_key = sha1(microtime());
-        if (! $this->_key) {
+        if (!$this->_key) {
             throw new RuntimeException('Invalid key generated');
         }
 

tests/TestCase/Model/Table/QueuedTasksTableTest.php

Spacing +23 added lines, -23 removed lines

@@ -70,7 +70,7 @@ 
         $this->assertSame(0, $this->QueuedTasks->getLength());
 
         // create a job
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('test1', [
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('test1', [
             'some' => 'random',
             'test' => 'data'
         ]));
@@ -79,15 +79,15 @@ 
         $this->assertSame(1, $this->QueuedTasks->getLength());
 
         // create some more jobs
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('test2', [
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('test2', [
             'some' => 'random',
             'test' => 'data2'
         ]));
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('test2', [
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('test2', [
             'some' => 'random',
             'test' => 'data3'
         ]));
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('test3', [
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('test3', [
             'some' => 'random',
             'test' => 'data4'
         ]));
@@ -133,7 +133,7 @@ 
         // there are no jobs, so we cant fetch any.
         $this->assertNull($this->QueuedTasks->requestJob($capabilities));
         // insert one job.
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('task1', $testData));
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', $testData));
 
         // fetch and check the first job.
         $job = $this->QueuedTasks->requestJob($capabilities);
@@ -178,7 +178,7 @@ 
         $this->assertSame(0, $this->QueuedTasks->getLength());
         // create some more jobs
         foreach (range(0, 9) as $num) {
-            $this->assertTrue((bool) $this->QueuedTasks->createJob('task1', [
+            $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', [
                 'tasknum' => $num
             ]));
         }
@@ -217,9 +217,9 @@ 
      */
     public function testNotBefore()
     {
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('task1', null, '+ 1 Min'));
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('task1', null, '+ 1 Day'));
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('task1', null, '2009-07-01 12:00:00'));
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', null, '+ 1 Min'));
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', null, '+ 1 Day'));
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', null, '2009-07-01 12:00:00'));
         $data = $this->QueuedTasks->find('all')->toArray();
         $this->assertWithinRange((new Time('+ 1 Min'))->toUnixString(), $data[0]['not_before']->toUnixString(), 60);
         $this->assertWithinRange((new Time('+ 1 Day'))->toUnixString(), $data[1]['not_before']->toUnixString(), 60);
@@ -248,20 +248,20 @@ 
                 'retries' => 2
             ]
         ];
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('dummytask'));
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('dummytask'));
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('dummytask'));
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('dummytask'));
         // create a task with it's execution target some seconds in the past, so it should jump to the top of the list.
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('task1', [
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', [
             'three'
         ], [
             'notBefore' => '- 3 Seconds'
         ]));
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('task1', [
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', [
             'two'
         ], [
             'notBefore' => '- 5 Seconds'
         ]));
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('task1', [
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', [
             'one'
         ], [
             'notBefore' => '- 7 Seconds'
@@ -336,19 +336,19 @@ 
         $data1 = [
             'key' => 1
         ];
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('task1', $data1));
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', $data1));
         $data2 = [
             'key' => 2
         ];
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('task1', $data2));
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', $data2));
         $data3 = [
             'key' => 3
         ];
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('task1', $data3));
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('dummytask'));
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('dummytask'));
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('dummytask'));
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('dummytask'));
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', $data3));
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('dummytask'));
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('dummytask'));
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('dummytask'));
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('dummytask'));
 
         // At first we get task1-1.
         $this->QueuedTasks->clearKey();
@@ -424,7 +424,7 @@ 
         $data = [
             'key' => '1'
         ];
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('task1', $data));
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', $data));
 
         $this->QueuedTasks->clearKey();
         $tmp = $this->QueuedTasks->requestJob($capabilities);
@@ -466,7 +466,7 @@ 
             ]
         ];
 
-        $this->assertTrue((bool) $this->QueuedTasks->createJob('task1', [
+        $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', [
             '1'
         ]));