itrukhin / bxconsole

src/Bitrix/Loader.php

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
      */
     public function initializeBitrix() {
 
-        if($this->checkBitrix()) {
+        if ($this->checkBitrix()) {
 
             /**
              * Declare global legacy variables
@@ -53,7 +53,7 @@ 
 
             $cliFile = getLocalPath('modules/' . $module['ID'] . '/cli.php');
 
-            if(!$cliFile) {
+            if (!$cliFile) {
                 continue;
             }
 

src/BxCommand.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
         /** @var Command $annotation */
         $annotation = $this->getAnnotation(\App\BxConsole\Annotations\Command::class);
 
-        if($annotation) {
+        if ($annotation) {
             $this->setName($annotation->name);
             $this->setDescription($annotation->description);
             $this->setHelp($annotation->help);

src/Application.php

Spacing +3 added lines, -3 removed lines

@@ -25,8 +25,8 @@ 
 
         $this->isBitrixLoaded = $loader->initializeBitrix();
 
-        if($this->isBitrixLoaded) {
-            foreach($loader->getModulesCommands() as $command) {
+        if ($this->isBitrixLoaded) {
+            foreach ($loader->getModulesCommands() as $command) {
                 $this->add($command);
             }
         }
@@ -38,7 +38,7 @@ 
 
         $exitCode = parent::doRun($input, $output);
 
-        if($this->isBitrixLoaded) {
+        if ($this->isBitrixLoaded) {
             if ($this->getCommandName($input) === null) {
                 $output->writeln(PHP_EOL . sprintf('Using Bitrix <info>kernel v%s</info>.</info>', SM_VERSION),
                     OutputInterface::VERBOSITY_VERY_VERBOSE);

src/EnvHelper.php

Spacing +21 added lines, -21 removed lines

@@ -18,10 +18,10 @@ 
     public static function loadEnv() {
 
         $envFile = realpath(__DIR__ . '/../../../../.env');
-        if(!is_file($envFile)) {
+        if (!is_file($envFile)) {
             $envFile = realpath(__DIR__ . '/../../../../../.env');
         }
-        if(is_file($envFile)) {
+        if (is_file($envFile)) {
             try {
                 $env = new \Symfony\Component\Dotenv\Dotenv();
                 $env->load($envFile);
@@ -38,15 +38,15 @@ 
 
         $_SERVER['DOCUMENT_ROOT'] = realpath(__DIR__ . '/../../../../');
 
-        if(isset($_ENV['APP_DOCUMENT_ROOT']) && is_dir($_ENV['APP_DOCUMENT_ROOT'])) {
+        if (isset($_ENV['APP_DOCUMENT_ROOT']) && is_dir($_ENV['APP_DOCUMENT_ROOT'])) {
             $_SERVER['DOCUMENT_ROOT'] = $_ENV['APP_DOCUMENT_ROOT'];
             return $_SERVER['DOCUMENT_ROOT'];
         }
 
         $composerFile = realpath(__DIR__ . '/../../../../composer.json');
-        if(is_file($composerFile)) {
+        if (is_file($composerFile)) {
             $composerConfig = json_decode(file_get_contents($composerFile), true);
-            if(isset($composerConfig['extra']['document-root']) && is_dir($composerConfig['extra']['document-root'])) {
+            if (isset($composerConfig['extra']['document-root']) && is_dir($composerConfig['extra']['document-root'])) {
                 $_SERVER['DOCUMENT_ROOT'] = $composerConfig['extra']['document-root'];
                 return $_SERVER['DOCUMENT_ROOT'];
             }
@@ -61,10 +61,10 @@ 
      */
     public static function getLogger($channel) {
 
-        if(isset($_ENV['APP_LOG_CLASS']) && class_exists($_ENV['APP_LOG_CLASS'])) {
+        if (isset($_ENV['APP_LOG_CLASS']) && class_exists($_ENV['APP_LOG_CLASS'])) {
             $logClass = $_ENV['APP_LOG_CLASS'];
             $log = new $logClass($channel);
-            if($log instanceof LoggerInterface) {
+            if ($log instanceof LoggerInterface) {
                 return $log;
             }
         }
@@ -77,7 +77,7 @@ 
      */
     public static function getCrontabFile() {
 
-        if(isset($_ENV['BX_CRONTAB_FOLDER']) && $_ENV['BX_CRONTAB_FOLDER']) {
+        if (isset($_ENV['BX_CRONTAB_FOLDER']) && $_ENV['BX_CRONTAB_FOLDER']) {
             return rtrim($_ENV['BX_CRONTAB_FOLDER'], "/") . '/bx_crontab.json';
         }
 
@@ -86,7 +86,7 @@ 
 
     public static function getCrontabTimeout() {
 
-        if(isset($_ENV['BX_CRONTAB_FOLDER']) && is_numeric($_ENV['BX_CRONTAB_FOLDER'])) {
+        if (isset($_ENV['BX_CRONTAB_FOLDER']) && is_numeric($_ENV['BX_CRONTAB_FOLDER'])) {
             return (int) $_ENV['BX_CRONTAB_FOLDER'];
         }
 
@@ -95,7 +95,7 @@ 
 
     public static function getBxCrontabPeriod() {
 
-        if(isset($_ENV['BX_CRONTAB_PERIOD']) && is_numeric($_ENV['BX_CRONTAB_PERIOD'])) {
+        if (isset($_ENV['BX_CRONTAB_PERIOD']) && is_numeric($_ENV['BX_CRONTAB_PERIOD'])) {
             return (int) $_ENV['BX_CRONTAB_PERIOD'];
         }
 
@@ -104,15 +104,15 @@ 
 
     public static function getSwitch($name, $state) {
 
-        if(isset($_ENV[$name])) {
+        if (isset($_ENV[$name])) {
 
             $val = strtolower(trim($_ENV[$name]));
-            if($state == self::SWITCH_STATE_ON) {
-                if($val === self::SWITCH_STATE_ON || $val === '1' || $val === 'true') {
+            if ($state == self::SWITCH_STATE_ON) {
+                if ($val === self::SWITCH_STATE_ON || $val === '1' || $val === 'true') {
                     return true;
                 }
-            } else if($state == self::SWITCH_STATE_OFF) {
-                if($val === self::SWITCH_STATE_OFF || $val === '0' || $val === 'false') {
+            } else if ($state == self::SWITCH_STATE_OFF) {
+                if ($val === self::SWITCH_STATE_OFF || $val === '0' || $val === 'false') {
                     return true;
                 }
             }
@@ -125,7 +125,7 @@ 
 
         $timeZone = self::BX_CRONTAB_TIMEZONE;
 
-        if(isset($_ENV['BX_CRONTAB_TIMEZONE']) && $_ENV['BX_CRONTAB_TIMEZONE']) {
+        if (isset($_ENV['BX_CRONTAB_TIMEZONE']) && $_ENV['BX_CRONTAB_TIMEZONE']) {
             $timeZone = trim($_ENV['BX_CRONTAB_TIMEZONE']);
         }
 
@@ -134,17 +134,17 @@ 
 
     public static function checkSleepInterval() {
 
-        if(isset($_ENV['BX_CRONTAB_SLEEP_TIME']) && $_ENV['BX_CRONTAB_SLEEP_TIME']) {
+        if (isset($_ENV['BX_CRONTAB_SLEEP_TIME']) && $_ENV['BX_CRONTAB_SLEEP_TIME']) {
             $intervals = explode(',', $_ENV['BX_CRONTAB_SLEEP_TIME']);
-            foreach($intervals as $interval) {
+            foreach ($intervals as $interval) {
                 $times = explode('-', $interval);
-                if(count($times) != 2) {
+                if (count($times) != 2) {
                     continue;
                 }
                 $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)) {
                         return $interval;
                     }
                 }

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($hours)
     {
         $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($minutes)
     {
         $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($seconds)
     {
         $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) {
 
         $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 = '') {
 
         $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;
         }
 

Braces +9 added lines, -3 removed lines

@@ -16,9 +16,15 @@
         }
         $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]);
+        }
     }
 
     /**

src/Cron.php

Spacing +42 added lines, -42 removed lines

@@ -37,45 +37,45 @@ 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $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");
@@ -99,10 +99,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;
             }
         }
@@ -121,7 +121,7 @@ 
             'Status',
         ];
 
-        if($hasError) {
+        if ($hasError) {
             $header[] = 'Error';
         }
 
@@ -131,15 +131,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);
@@ -168,11 +168,11 @@ 
          */
         $this->minAgentPeriod = (count($jobs) + 1) * EnvHelper::getBxCrontabPeriod();
 
-        if(!empty($jobs)) {
+        if (!empty($jobs)) {
 
-            foreach($jobs as $cmd => $job) {
+            foreach ($jobs as $cmd => $job) {
 
-                if($this->isActualJob($job)) {
+                if ($this->isActualJob($job)) {
 
                     $job['status'] = self::EXEC_STATUS_WORK;
                     $this->updaateJob($cmd, $job);
@@ -184,12 +184,12 @@ 
                         $timeStart = microtime(true);
                         $returnCode = $command->run($cmdInput, $output);
 
-                        if(!$returnCode) {
+                        if (!$returnCode) {
 
                             $job['status'] = self::EXEC_STATUS_SUCCESS;
 
                             $msg = sprintf("%s: SUCCESS [%.2f s]", $cmd, microtime(true) - $timeStart);
-                            if($this->logger) {
+                            if ($this->logger) {
                                 $this->logger->alert($msg);
                             }
                             $output->writeln(PHP_EOL . $msg);
@@ -200,7 +200,7 @@ 
                             $job['error_code'] = $returnCode;
 
                             $msg = sprintf("%s: ERROR [%.2f s]", $cmd, microtime(true) - $timeStart);
-                            if($this->logger) {
+                            if ($this->logger) {
                                 $this->logger->alert($msg);
                             }
                             $output->writeln(PHP_EOL . $msg);
@@ -212,7 +212,7 @@ 
                         $job['error'] = $e->getMessage();
 
 
-                        if($this->logger) {
+                        if ($this->logger) {
                             $this->logger->error($e, ['command' => $cmd]);
                         }
                         $output->writeln(PHP_EOL . 'ERROR: ' . $e->getMessage());
@@ -234,21 +234,21 @@ 
 
     protected function isActualJob(&$job) {
 
-        if(isset($job['status']) && $job['status'] !== self::EXEC_STATUS_SUCCESS) {
+        if (isset($job['status']) && $job['status'] !== self::EXEC_STATUS_SUCCESS) {
             return false;
         }
 
         $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) {
                 return true;
             }
-        } else if(!empty($job['times'])) {
+        } else if (!empty($job['times'])) {
             //TODO:
         }
 
@@ -263,9 +263,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,
@@ -275,12 +275,12 @@ 
 
         $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();
                 }
             }
@@ -288,8 +288,8 @@ 
 
         $crontab = $this->getCronTab();
 
-        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]);
             }
         }
@@ -323,7 +323,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);
             }
         }
@@ -341,10 +341,10 @@ 
         $filename = EnvHelper::getCrontabFile();
 
         $fh = fopen($filename, 'r');
-        if(flock($fh, LOCK_SH)) {
-            if($data = @fread($fh, filesize($filename))) {
+        if (flock($fh, LOCK_SH)) {
+            if ($data = @fread($fh, filesize($filename))) {
                 $decoded = json_decode($data, true);
-                if(is_array($decoded)) {
+                if (is_array($decoded)) {
                     $cronTab = $decoded;
                 }
             }
@@ -357,14 +357,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;

Braces +6 added lines, -2 removed lines

@@ -101,7 +101,9 @@ 
 
         foreach($jobs as $cmd => $job) {
             $execTime = $job['last_exec'];
-            if($execTime > $lastExec) $lastExec = $execTime;
+            if($execTime > $lastExec) {
+                $lastExec = $execTime;
+            }
             if(!empty($job['error'])) {
                 $hasError = true;
             }
@@ -132,7 +134,9 @@ 
 
         $cnt = 1;
         foreach($jobs as $cmd => $job) {
-            if($cnt > 1) $table->addRow(new TableSeparator());
+            if($cnt > 1) {
+                $table->addRow(new TableSeparator());
+            }
             $row = [
                 $cmd,
                 $job['period'],