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 +13 added lines, -13 removed lines

@@ -13,10 +13,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);
@@ -33,15 +33,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'];
             }
@@ -56,10 +56,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;
             }
         }
@@ -72,7 +72,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';
         }
 
@@ -81,15 +81,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;
                 }
             }

src/Cron.php

Spacing +28 added lines, -28 removed lines

@@ -38,12 +38,12 @@ 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $logger = EnvHelper::getLogger('bx_cron');
-        if($logger) {
+        if ($logger) {
             $this->setLogger($logger);
         }
 
-        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;
@@ -57,20 +57,20 @@ 
          */
         $this->minAgentPeriod = (count($jobs) + 1) * self::BX_CRON_PERIOD;
 
-        if(!empty($jobs)) {
+        if (!empty($jobs)) {
 
             $lockStore = new FlockStore(pathinfo(EnvHelper::getCrontabFile(), PATHINFO_DIRNAME));
             $lockFactory = new LockFactory($lockStore);
-            if($this->logger) {
+            if ($this->logger) {
                 $lockFactory->setLogger($this->logger);
             }
 
-            foreach($jobs as $cmd => $job) {
+            foreach ($jobs as $cmd => $job) {
 
-                if($this->isActualJob($job)) {
+                if ($this->isActualJob($job)) {
 
                     $lock = $lockFactory->createLock($this->getLockName($cmd), self::EXEC_TIMEOUT);
-                    if($lock->acquire()) {
+                    if ($lock->acquire()) {
 
                         $job['status'] = self::EXEC_STATUS_WORK;
                         $this->updaateJob($cmd, $job);
@@ -82,12 +82,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);
@@ -98,7 +98,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);
@@ -110,7 +110,7 @@ 
                             $job['error'] = $e->getMessage();
 
 
-                            if($this->logger) {
+                            if ($this->logger) {
                                 $this->logger->error($e, ['command' => $cmd]);
                             }
                             $output->writeln(PHP_EOL . 'ERROR: ' . $e->getMessage());
@@ -130,7 +130,7 @@ 
                         break;
 
                     } else {
-                        if($this->logger) {
+                        if ($this->logger) {
                             $this->logger->warning($cmd . " is locked");
                         }
                     }
@@ -146,21 +146,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:
         }
 
@@ -175,9 +175,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,
@@ -187,12 +187,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();
                 }
             }
@@ -200,9 +200,9 @@ 
 
         $crontab = $this->getCronTab();
 
-        if(is_array($crontab)) {
-            foreach($crontab as $cmd => $job) {
-                if(is_array($job) && isset($agents[$cmd])) {
+        if (is_array($crontab)) {
+            foreach ($crontab as $cmd => $job) {
+                if (is_array($job) && isset($agents[$cmd])) {
                     $agents[$cmd] = array_merge($job, $agents[$cmd]);
                 }
             }
@@ -235,7 +235,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);
             }
         }
@@ -253,7 +253,7 @@ 
         $filename = EnvHelper::getCrontabFile();
 
         $fh = fopen($filename, 'r');
-        if(flock($fh, LOCK_SH)) {
+        if (flock($fh, LOCK_SH)) {
             $data = @fread($fh, filesize($filename));
             $cronTab = json_decode($data, true);
         }