notamedia / console-jedi

src/Application/Command/InitCommand.php

Spacing +12 added lines, -12 removed lines

@@ -84,7 +84,7 @@ 
      */
     protected function initialize(InputInterface $input, OutputInterface $output)
     {
-        $this->tmplDir = __DIR__ . '/../../../tmpl';
+        $this->tmplDir = __DIR__.'/../../../tmpl';
         $this->questionHelper = $this->getHelper('question');
         
         parent::initialize($input, $output);
@@ -100,7 +100,7 @@ 
         $this->createEnvironmentsDir($input, $output);
         $this->createConfiguration($input, $output);
         
-        $output->writeln('<info>' . static::COMPLETED_LOGO . '</info>');
+        $output->writeln('<info>'.static::COMPLETED_LOGO.'</info>');
     }
 
     /**
@@ -111,15 +111,15 @@ 
      */
     protected function createEnvironmentsDir(InputInterface $input, OutputInterface $output)
     {
-        $targetDir = getcwd() . '/' . $this->envDir;
-        $tmplDir = $this->tmplDir . '/environments';
+        $targetDir = getcwd().'/'.$this->envDir;
+        $tmplDir = $this->tmplDir.'/environments';
         
         $output->writeln('  - Environment settings');
         
         if (file_exists($targetDir))
         {
             $question = new ConfirmationQuestion(
-                '    <error>Directory ' . $targetDir . ' already exists</error>' . PHP_EOL 
+                '    <error>Directory '.$targetDir.' already exists</error>'.PHP_EOL 
                 . '    <info>Overwrite? [Y/n]</info> ',
                 true,
                 '/^(y|j)/i'
@@ -137,7 +137,7 @@ 
 
         foreach ($iterator as $item)
         {
-            $itemPath = $targetDir . '/' . $iterator->getSubPathName();
+            $itemPath = $targetDir.'/'.$iterator->getSubPathName();
 
             if ($item->isDir())
             {
@@ -149,7 +149,7 @@ 
             }
         }
         
-        $output->writeln('    Created directory settings of environments: <comment>' . $targetDir . '</comment>');
+        $output->writeln('    Created directory settings of environments: <comment>'.$targetDir.'</comment>');
     }
 
     /**
@@ -160,14 +160,14 @@ 
      */
     protected function createConfiguration(InputInterface $input, OutputInterface $output)
     {
-        $path = $this->getApplication()->getRoot() . '/.jedi.php';
+        $path = $this->getApplication()->getRoot().'/.jedi.php';
 
         $output->writeln('  - Configuration');
 
         if (file_exists($path))
         {
             $question = new ConfirmationQuestion(
-                '    <error>Configuration file ' . $path . ' already exists</error>' . PHP_EOL
+                '    <error>Configuration file '.$path.' already exists</error>'.PHP_EOL
                 . '    <info>Overwrite? [Y/n]</info> ',
                 true,
                 '/^(y|j)/i'
@@ -180,7 +180,7 @@ 
         }
         
         $question = new Question('    <info>Enter path to web directory relative to ('.getcwd().'):</info> ');
-        $question->setValidator(function ($answer) {
+        $question->setValidator(function($answer) {
             /*if (!is_dir($answer))
             {
                 throw new \RuntimeException('Directory "' . $answer . '" is missing');
@@ -191,7 +191,7 @@ 
         $webDir = $this->questionHelper->ask($input, $output, $question);
 
         $fs = new Filesystem();
-        $content = file_get_contents($this->tmplDir . '/.jedi.php');
+        $content = file_get_contents($this->tmplDir.'/.jedi.php');
         $content = str_replace(
             ['%web-dir%', '%env-dir%'], 
             [addslashes($webDir), addslashes($this->envDir)],
@@ -199,6 +199,6 @@ 
         );
         $fs->dumpFile($path, $content);
 
-        $output->writeln('    Created configuration file of application <comment>' . $path . '</comment>');
+        $output->writeln('    Created configuration file of application <comment>'.$path.'</comment>');
     }
 }
\ No newline at end of file

src/Application/Application.php

Spacing +15 added lines, -15 removed lines

@@ -108,7 +108,7 @@ 
 
         if ($this->getConfiguration() === null)
         {
-            $output->writeln(PHP_EOL . '<error>No configuration loaded.</error> ' 
+            $output->writeln(PHP_EOL.'<error>No configuration loaded.</error> ' 
                 . 'Please run <info>init</info> command first');
         }
         else
@@ -116,18 +116,18 @@ 
             switch ($this->getBitrixStatus())
             {
                 case static::BITRIX_STATUS_UNAVAILABLE:
-                    $output->writeln(PHP_EOL . sprintf('<error>No Bitrix kernel found in %s.</error> ' 
+                    $output->writeln(PHP_EOL.sprintf('<error>No Bitrix kernel found in %s.</error> ' 
                             . 'Please run <info>env:init</info> command to configure', $this->getDocumentRoot()));
                     break;
 
                 case static::BITRIX_STATUS_NO_DB_CONNECTION:
-                    $output->writeln(PHP_EOL . '<error>Bitrix database connection is unavailable.</error>');
+                    $output->writeln(PHP_EOL.'<error>Bitrix database connection is unavailable.</error>');
                     break;
 
                 case static::BITRIX_STATUS_COMPLETE:
                     if ($this->getCommandName($input) === null)
                     {
-                        $output->writeln(PHP_EOL . sprintf('Using Bitrix <info>kernel v%s</info>.</info>', SM_VERSION),
+                        $output->writeln(PHP_EOL.sprintf('Using Bitrix <info>kernel v%s</info>.</info>', SM_VERSION),
                             OutputInterface::VERBOSITY_VERY_VERBOSE);
                     }
                     break;
@@ -179,7 +179,7 @@ 
 
         foreach (ModuleManager::getInstalledModules() as $module)
         {
-            $cliFile = getLocalPath('modules/' . $module['ID'] . '/cli.php');
+            $cliFile = getLocalPath('modules/'.$module['ID'].'/cli.php');
 
             if ($cliFile === false)
             {
@@ -190,7 +190,7 @@ 
                 continue;
             }
 
-            $config = include_once $this->getDocumentRoot() . $cliFile;
+            $config = include_once $this->getDocumentRoot().$cliFile;
 
             if (isset($config['commands']) && is_array($config['commands']))
             {
@@ -221,7 +221,7 @@ 
         
         if (!is_array($this->configuration))
         {
-            throw new ConfigurationException('Configuration file ' . $path . ' must return an array');
+            throw new ConfigurationException('Configuration file '.$path.' must return an array');
         }
 
         //TODO-fox: Проверка на указание в качестве относительного пути /
@@ -236,7 +236,7 @@ 
         }
         else
         {
-            $this->setDocumentRoot($this->getRoot() . '/' . $this->configuration['web-dir']);
+            $this->setDocumentRoot($this->getRoot().'/'.$this->configuration['web-dir']);
         }
 
         if (!is_dir($_SERVER['DOCUMENT_ROOT']))
@@ -287,7 +287,7 @@ 
                 /** @noinspection PhpUnusedLocalVariableInspection */
                 $DB, $DBType, $DBHost, $DBLogin, $DBPassword, $DBName, $DBDebug, $DBDebugToFile, $APPLICATION, $USER, $DBSQLServerType;
 
-            require_once $_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/main/include/prolog_before.php';
+            require_once $_SERVER['DOCUMENT_ROOT'].'/bitrix/modules/main/include/prolog_before.php';
             
             if (defined('B_PROLOG_INCLUDED') && B_PROLOG_INCLUDED === true)
             {
@@ -310,8 +310,8 @@ 
     public function checkBitrix()
     {
         if (
-            !is_file($_SERVER['DOCUMENT_ROOT'] . '/bitrix/.settings.php') 
-            && !is_file($_SERVER['DOCUMENT_ROOT'] . '/bitrix/.settings_extra.php')
+            !is_file($_SERVER['DOCUMENT_ROOT'].'/bitrix/.settings.php') 
+            && !is_file($_SERVER['DOCUMENT_ROOT'].'/bitrix/.settings_extra.php')
         )
         {
             return false;
@@ -357,7 +357,7 @@ 
         
         $this->initializeBitrix();
         
-        spl_autoload_register(function ($className) {
+        spl_autoload_register(function($className) {
             $file = ltrim($className, "\\");
             $file = strtr($file, Loader::ALPHA_UPPER, Loader::ALPHA_LOWER);
             $file = str_replace('\\', '/', $file);
@@ -382,18 +382,18 @@ 
                 return false;
             }
 
-            $module = array_shift($arFile) . '.' . array_shift($arFile);
+            $module = array_shift($arFile).'.'.array_shift($arFile);
 
             if (!Loader::includeModule($module))
             {
                 return false;
             }
 
-            $path = getLocalPath('/modules/' . $module . '/' . implode('/', $arFile) . '.php');
+            $path = getLocalPath('/modules/'.$module.'/'.implode('/', $arFile).'.php');
 
             if ($path !== false)
             {
-                include_once $this->getDocumentRoot() . $path;
+                include_once $this->getDocumentRoot().$path;
             }
         });
     }

Braces +10 added lines, -16 removed lines

@@ -110,8 +110,7 @@ 
         {
             $output->writeln(PHP_EOL . '<error>No configuration loaded.</error> ' 
                 . 'Please run <info>init</info> command first');
-        }
-        else
+        } else
         {
             switch ($this->getBitrixStatus())
             {
@@ -184,8 +183,7 @@ 
             if ($cliFile === false)
             {
                 continue;
-            }
-            elseif (!Loader::includeModule($module['ID']))
+            } elseif (!Loader::includeModule($module['ID']))
             {
                 continue;
             }
@@ -225,16 +223,16 @@ 
         }
 
         //TODO-fox: Проверка на указание в качестве относительного пути /
-        if ($this->configuration['web-dir'] == '/')
-            $this->configuration['web-dir'] = '';
+        if ($this->configuration['web-dir'] == '/') {
+                    $this->configuration['web-dir'] = '';
+        }
 
         $filesystem = new Filesystem();
         
         if ($filesystem->isAbsolutePath($this->configuration['web-dir']))
         {
             $this->setDocumentRoot($this->configuration['web-dir']);
-        }
-        else
+        } else
         {
             $this->setDocumentRoot($this->getRoot() . '/' . $this->configuration['web-dir']);
         }
@@ -267,8 +265,7 @@ 
         if ($this->bitrixStatus === static::BITRIX_STATUS_COMPLETE)
         {
             return static::BITRIX_STATUS_COMPLETE;
-        }
-        elseif (!$this->checkBitrix())
+        } elseif (!$this->checkBitrix())
         {
             return static::BITRIX_STATUS_UNAVAILABLE;
         }
@@ -293,8 +290,7 @@ 
             {
                 $this->bitrixStatus = static::BITRIX_STATUS_COMPLETE;
             }
-        }
-        catch (ConnectionException $e)
+        } catch (ConnectionException $e)
         {
             $this->bitrixStatus = static::BITRIX_STATUS_NO_DB_CONNECTION;
         }
@@ -372,12 +368,10 @@ 
             if (preg_match("#[^\\\\/a-zA-Z0-9_]#", $file))
             {
                 return false;
-            }
-            elseif ($arFile[0] === 'bitrix')
+            } elseif ($arFile[0] === 'bitrix')
             {
                 return false;
-            }
-            elseif ($arFile[2] !== 'tests')
+            } elseif ($arFile[2] !== 'tests')
             {
                 return false;
             }