itrukhin / bxconsole

src/Cron.php

Spacing +56 added lines, -56 removed lines

@@ -42,45 +42,45 @@ 
         set_time_limit(EnvHelper::getCrontabTimeout());
 
         $logger = EnvHelper::getLogger('bx_cron');
-        if($logger) {
+        if ($logger) {
             $this->setLogger($logger);
         }
 
         $showStatus = $input->getOption('status');
         $byTime = $input->getOption('bytime');
-        if($showStatus) {
+        if ($showStatus) {
             $sort = ($byTime ? self::SORT_TIME : self::SORT_NAME);
             $this->showStatus($output, $sort);
             return 0;
         }
 
-        if(EnvHelper::getSwitch('BX_CRONTAB_RUN', EnvHelper::SWITCH_STATE_OFF)) {
-            if($this->logger) {
+        if (EnvHelper::getSwitch('BX_CRONTAB_RUN', EnvHelper::SWITCH_STATE_OFF)) {
+            if ($this->logger) {
                 $this->logger->alert('BxCron switch off');
             }
             return 0;
         }
 
-        if(!$this->lock()) {
+        if (!$this->lock()) {
             $msg = 'The command is already running in another process.';
             $output->writeln($msg);
-            if($this->logger) {
+            if ($this->logger) {
                 $this->logger->warning($msg);
             }
             return 0;
         }
 
-        if($sleepInterval = EnvHelper::checkSleepInterval()) {
+        if ($sleepInterval = EnvHelper::checkSleepInterval()) {
             $msg = sprintf("Sleep in interval %s", $sleepInterval);
             $output->writeln($msg);
-            if($this->logger) {
+            if ($this->logger) {
                 $this->logger->warning($msg);
             }
             return 0;
         }
 
         $clean = $input->getOption('clean');
-        if($clean) {
+        if ($clean) {
             $command = $this->getApplication()->find($clean);
             $this->cleanJob($command->getName());
             $output->writeln($command->getName() . " will be executed now");
@@ -88,7 +88,7 @@ 
         }
 
         $cleanAll = $input->getOption('all');
-        if($cleanAll) {
+        if ($cleanAll) {
             $this->cleanJob();
             $output->writeln("All commands will be executed now");
             return 0;
@@ -113,10 +113,10 @@ 
         $lastExec = 0;
         $hasError = false;
 
-        foreach($jobs as $cmd => $job) {
+        foreach ($jobs as $cmd => $job) {
             $execTime = $job['last_exec'];
-            if($execTime > $lastExec) $lastExec = $execTime;
-            if(!empty($job['error'])) {
+            if ($execTime > $lastExec) $lastExec = $execTime;
+            if (!empty($job['error'])) {
                 $hasError = true;
             }
         }
@@ -135,7 +135,7 @@ 
             'Status',
         ];
 
-        if($hasError) {
+        if ($hasError) {
             $header[] = 'Error';
         }
 
@@ -145,15 +145,15 @@ 
         ]);
 
         $cnt = 1;
-        foreach($jobs as $cmd => $job) {
-            if($cnt > 1) $table->addRow(new TableSeparator());
+        foreach ($jobs as $cmd => $job) {
+            if ($cnt > 1) $table->addRow(new TableSeparator());
             $row = [
                 $cmd,
                 $job['period'],
                 ($job['last_exec'] ? date("d.m.Y H:i:s", $job['last_exec']) : 'NONE'),
                 $job['status'],
             ];
-            if($hasError) {
+            if ($hasError) {
                 $row[] = $job['error'];
             }
             $table->addRow($row);
@@ -167,9 +167,9 @@ 
 
         $crontab = [];
 
-        if($command) {
+        if ($command) {
             $crontab = $this->getCronTab();
-            if($crontab === false) {
+            if ($crontab === false) {
                 return false;
             }
             unset($crontab[$command]);
@@ -184,7 +184,7 @@ 
         $allTimeout = EnvHelper::getCrontabTimeout();
         $workTime = 0;
 
-        if(!empty($jobs)) {
+        if (!empty($jobs)) {
 
             /*
              * Минимально допустимый период выполнения одной задачи
@@ -195,10 +195,10 @@ 
             $this->logger->alert($msg);
             $output->writeln($msg);
 
-            foreach($jobs as $cmd => $job) {
+            foreach ($jobs as $cmd => $job) {
 
                 $job['cmd'] = $cmd;
-                if($this->isActualJob($job)) {
+                if ($this->isActualJob($job)) {
 
                     $job['status'] = self::EXEC_STATUS_WORK;
                     $job['start_time'] = time();
@@ -213,12 +213,12 @@ 
                         $returnCode = $command->run($cmdInput, $output);
                         $execTime = microtime(true) - $timeStart;
 
-                        if(!$returnCode) {
+                        if (!$returnCode) {
 
                             $job['status'] = self::EXEC_STATUS_SUCCESS;
 
                             $msg = sprintf("%s: SUCCESS [%.2f s]", $cmd, $execTime);
-                            if($this->logger) {
+                            if ($this->logger) {
                                 $this->logger->alert($msg);
                             }
                             $output->writeln(PHP_EOL . $msg);
@@ -229,7 +229,7 @@ 
                             $job['error_code'] = $returnCode;
 
                             $msg = sprintf("%s: ERROR [%.2f s]", $cmd, $execTime);
-                            if($this->logger) {
+                            if ($this->logger) {
                                 $this->logger->alert($msg);
                             }
                             $output->writeln(PHP_EOL . $msg);
@@ -241,14 +241,14 @@ 
                         $job['error'] = $e->getMessage();
 
 
-                        if($this->logger) {
+                        if ($this->logger) {
                             $this->logger->error($e, ['command' => $cmd]);
                         }
                         $output->writeln(PHP_EOL . 'ERROR: ' . $e->getMessage());
 
                     } finally {
 
-                        if(!$execTime) {
+                        if (!$execTime) {
                             $execTime = microtime(true) - $timeStart;
                         }
                         $job['last_exec'] = time();
@@ -258,7 +258,7 @@ 
                     $this->updateJob($cmd, $job);
 
                     $workTime += $execTime;
-                    if($workTime * 2 > $allTimeout) {
+                    if ($workTime * 2 > $allTimeout) {
                         break;
                     }
                     /*
@@ -274,35 +274,35 @@ 
     {
         $actual = false;
 
-        if($job['status'] == self::EXEC_STATUS_WORK) {
-            if($job['start_time'] && $job['start_time'] < (time() - self::RESTART_TIME)) {
+        if ($job['status'] == self::EXEC_STATUS_WORK) {
+            if ($job['start_time'] && $job['start_time'] < (time() - self::RESTART_TIME)) {
                 $actual = true;
             }
         }
 
         $period = intval($job['period']);
 
-        if($period > 0) {
-            if($period < $this->minAgentPeriod) {
+        if ($period > 0) {
+            if ($period < $this->minAgentPeriod) {
                 $job['orig_period'] = $period;
                 $period = $job['period'] = $this->minAgentPeriod;
             }
-            if(time() - $job['last_exec'] >= $period) {
+            if (time() - $job['last_exec'] >= $period) {
                 $actual = true;
             }
-        } else if(!empty($job['times'])) {
+        } else if (!empty($job['times'])) {
             //TODO:
         }
 
-        if($actual && !empty($job['interval'])) {
+        if ($actual && !empty($job['interval'])) {
             $times = explode('-', $job['interval']);
-            if(count($times) == 2) {
+            if (count($times) == 2) {
                 $minTime = Time24::validateTimeString($times[0]);
                 $maxTime = Time24::validateTimeString($times[1]);
-                if($minTime && $maxTime) {
-                    if(!Time24::inInterval($minTime, $maxTime)) {
+                if ($minTime && $maxTime) {
+                    if (!Time24::inInterval($minTime, $maxTime)) {
                         $msg = sprintf("%s not in interval %s", $job['cmd'], $job['interval']);
-                        if($this->logger) {
+                        if ($this->logger) {
                             $this->logger->alert($msg);
                         }
                         return false;
@@ -316,7 +316,7 @@ 
     public function getCronJobs(): array
     {
         $crontab = $this->getCronTab();
-        if($crontab === false) {
+        if ($crontab === false) {
             return [];
         }
 
@@ -326,9 +326,9 @@ 
         $commands = $app->all();
 
         $selfCommands = [];
-        foreach($commands as $command) {
+        foreach ($commands as $command) {
             /** @var BxCommand $command */
-            if($command instanceof BxCommand) {
+            if ($command instanceof BxCommand) {
                 $name = $command->getName();
                 $selfCommands[$name] = [
                     'object' => $command,
@@ -338,19 +338,19 @@ 
 
         $agents = [];
         $reader = new AnnotationReader();
-        foreach($selfCommands as $cmd => $selfCommand) {
+        foreach ($selfCommands as $cmd => $selfCommand) {
             $reflectionClass = new \ReflectionClass($selfCommand['object']);
             $annotations = $reader->getClassAnnotations($reflectionClass);
 
-            foreach($annotations as $annotation) {
-                if($annotation instanceof Agent) {
+            foreach ($annotations as $annotation) {
+                if ($annotation instanceof Agent) {
                     $agents[$cmd] = $annotation->toArray();
                 }
             }
         }
 
-        foreach($crontab as $cmd => $job) {
-            if(is_array($job) && isset($agents[$cmd])) {
+        foreach ($crontab as $cmd => $job) {
+            if (is_array($job) && isset($agents[$cmd])) {
                 $agents[$cmd] = array_merge($job, $agents[$cmd]);
             }
         }
@@ -369,7 +369,7 @@ 
 
         $crontab = $this->getCronTab();
 
-        if($crontab === false) {
+        if ($crontab === false) {
             return false;
         } else {
             $crontab = array_merge($crontab, $changedAgents);
@@ -387,7 +387,7 @@ 
         $fh = fopen($filename, 'c');
         if (flock($fh, LOCK_EX)) {
             ftruncate($fh, 0);
-            if(!fwrite($fh, json_encode($agents, JSON_PRETTY_PRINT))) {
+            if (!fwrite($fh, json_encode($agents, JSON_PRETTY_PRINT))) {
                 throw new \Exception('Unable to write BX_CRONTAB : ' . $filename);
             }
         } else {
@@ -407,16 +407,16 @@ 
         $filename = EnvHelper::getCrontabFile();
 
         $fh = fopen($filename, 'r');
-        if(!$fh) {
+        if (!$fh) {
             return false;
         }
-        if(flock($fh, LOCK_SH)) {
+        if (flock($fh, LOCK_SH)) {
             $cronTab = [];
             clearstatcache();
             $filesize = (int) filesize($filename);
-            if($filesize > 0 && $data = fread($fh, $filesize)) {
+            if ($filesize > 0 && $data = fread($fh, $filesize)) {
                 $decoded = json_decode($data, true);
-                if(is_array($decoded)) {
+                if (is_array($decoded)) {
                     $cronTab = $decoded;
                 } else {
                     throw new \Exception("Unable to parse cronTab");
@@ -433,14 +433,14 @@ 
 
     protected function sortCronTab(array &$crontab, $sort = self::SORT_NAME) {
 
-        if($sort == self::SORT_TIME) {
+        if ($sort == self::SORT_TIME) {
             $sorting = [];
-            foreach($crontab as $cmd => $data) {
+            foreach ($crontab as $cmd => $data) {
                 $sorting[$cmd] = $data['last_exec'];
             }
             arsort($sorting, SORT_NUMERIC);
             $sorted = [];
-            foreach($sorting as $cmd => $time) {
+            foreach ($sorting as $cmd => $time) {
                 $sorted[$cmd] = $crontab[$cmd];
             }
             $crontab = $sorted;

src/Time24.php

Spacing +25 added lines, -25 removed lines

@@ -10,15 +10,15 @@ 
     public function __construct($time = '') {
 
         $time = trim($time);
-        if(empty($time)) {
+        if (empty($time)) {
             \App\BxConsole\EnvHelper::timeZoneSet();
             $time = date("H:i:s");
         }
         $timeparts = array_map('intval', explode(':', $time));
 
-        if(isset($timeparts[0])) $this->setHours($timeparts[0]);
-        if(isset($timeparts[1])) $this->setMinutes($timeparts[1]);
-        if(isset($timeparts[2])) $this->setSeconds($timeparts[2]);
+        if (isset($timeparts[0])) $this->setHours($timeparts[0]);
+        if (isset($timeparts[1])) $this->setMinutes($timeparts[1]);
+        if (isset($timeparts[2])) $this->setSeconds($timeparts[2]);
     }
 
     /**
@@ -38,7 +38,7 @@ 
         $timeparts = [];
         $timeparts[] = sprintf("%02d", $this->hours);
         $timeparts[] = sprintf("%02d", $this->minutes);
-        if($seconds) {
+        if ($seconds) {
             $timeparts[] = sprintf("%02d", $this->seconds);
         }
         return join(':', $timeparts);
@@ -74,9 +74,9 @@ 
     public function setHours(int $hours): void
     {
         $hours = (int) $hours;
-        if($hours < 0) {
+        if ($hours < 0) {
             $hours = 0;
-        } else if($hours > 23) {
+        } else if ($hours > 23) {
             $hours = 23;
         }
         $this->hours = $hours;
@@ -88,9 +88,9 @@ 
     public function setMinutes(int $minutes): void
     {
         $minutes = (int) $minutes;
-        if($minutes < 0) {
+        if ($minutes < 0) {
             $minutes = 0;
-        } else if($minutes > 59) {
+        } else if ($minutes > 59) {
             $minutes = 59;
         }
         $this->minutes = $minutes;
@@ -102,9 +102,9 @@ 
     public function setSeconds(int $seconds): void
     {
         $seconds = (int) $seconds;
-        if($seconds < 0) {
+        if ($seconds < 0) {
             $seconds = 0;
-        } else if($seconds > 59) {
+        } else if ($seconds > 59) {
             $seconds = 59;
         }
         $this->seconds = $seconds;
@@ -113,13 +113,13 @@ 
     public static function validateTimeString($str): ?string
     {
         $str = trim($str);
-        if(strpos($str, ':') !== false) {
+        if (strpos($str, ':') !== false) {
             $timeParts = explode(':', $str);
-            if(count($timeParts) == 2) {
+            if (count($timeParts) == 2) {
                 $timeParts[2] = '00';
             }
             $str = join(':', $timeParts);
-            if(preg_match("/^(?:2[0-3]|[01][0-9]):[0-5][0-9]:[0-5][0-9]$/", $str)) {
+            if (preg_match("/^(?:2[0-3]|[01][0-9]):[0-5][0-9]:[0-5][0-9]$/", $str)) {
                 return $str;
             }
         }
@@ -129,33 +129,33 @@ 
     public static function inInterval($minStrTime, $maxStrTime, $checkStrTime = ''): bool
     {
         $minTime = new self($minStrTime);
-        if($maxStrTime == '00:00') {
+        if ($maxStrTime == '00:00') {
             $maxStrTime = '23:59';
         }
         $maxTime = new self($maxStrTime);
         $checkTime = new self($checkStrTime);
 
-        if($minTime->getHours() == $checkTime->getHours()) {
-            if($minTime->getMinutes() == $checkTime->getMinutes()) {
-                if($minTime->getSeconds() > $checkTime->getSeconds()) {
+        if ($minTime->getHours() == $checkTime->getHours()) {
+            if ($minTime->getMinutes() == $checkTime->getMinutes()) {
+                if ($minTime->getSeconds() > $checkTime->getSeconds()) {
                     return false;
                 }
-            } else if($minTime->getMinutes() > $checkTime->getMinutes()) {
+            } else if ($minTime->getMinutes() > $checkTime->getMinutes()) {
                 return false;
             }
-        } else if($minTime->getHours() > $checkTime->getHours()) {
+        } else if ($minTime->getHours() > $checkTime->getHours()) {
             return false;
         }
 
-        if($maxTime->getHours() == $checkTime->getHours()) {
-            if($maxTime->getMinutes() == $checkTime->getMinutes()) {
-                if($minTime->getSeconds() < $checkTime->getSeconds()) {
+        if ($maxTime->getHours() == $checkTime->getHours()) {
+            if ($maxTime->getMinutes() == $checkTime->getMinutes()) {
+                if ($minTime->getSeconds() < $checkTime->getSeconds()) {
                     return false;
                 }
-            } else if($maxTime->getMinutes() < $checkTime->getMinutes()) {
+            } else if ($maxTime->getMinutes() < $checkTime->getMinutes()) {
                 return false;
             }
-        } else if($maxTime->getHours() < $checkTime->getHours()) {
+        } else if ($maxTime->getHours() < $checkTime->getHours()) {
             return false;
         }