notamedia / console-jedi

src/Application/Application.php

Braces +7 added lines, -14 removed lines

@@ -105,8 +105,7 @@ 
         {
             $output->writeln(PHP_EOL . '<error>No configuration loaded.</error> ' 
                 . 'Please run <info>init</info> command first');
-        }
-        else
+        } else
         {
             switch ($this->getBitrixStatus())
             {
@@ -179,8 +178,7 @@ 
             if ($cliFile === false)
             {
                 continue;
-            }
-            elseif (!Loader::includeModule($module['ID']))
+            } elseif (!Loader::includeModule($module['ID']))
             {
                 continue;
             }
@@ -224,8 +222,7 @@ 
         if ($filesystem->isAbsolutePath($this->configuration['web-dir']))
         {
             $this->setDocumentRoot($this->configuration['web-dir']);
-        }
-        else
+        } else
         {
             $this->setDocumentRoot($this->getRoot() . '/' . $this->configuration['web-dir']);
         }
@@ -258,8 +255,7 @@ 
         if ($this->bitrixStatus === static::BITRIX_STATUS_COMPLETE)
         {
             return static::BITRIX_STATUS_COMPLETE;
-        }
-        elseif (!$this->checkBitrix())
+        } elseif (!$this->checkBitrix())
         {
             return static::BITRIX_STATUS_UNAVAILABLE;
         }
@@ -284,8 +280,7 @@ 
             {
                 $this->bitrixStatus = static::BITRIX_STATUS_COMPLETE;
             }
-        }
-        catch (ConnectionException $e)
+        } catch (ConnectionException $e)
         {
             $this->bitrixStatus = static::BITRIX_STATUS_NO_DB_CONNECTION;
         }
@@ -363,12 +358,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;
             }

src/Application/Command/InitCommand.php

Spacing +16 added lines, -16 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'
@@ -182,10 +182,10 @@ 
         $fs = new Filesystem();
         
         $question = new Question('    <info>Enter path to web directory relative to ' 
-            . $this->getApplication()->getRoot(). ':</info> ' . PHP_EOL 
-            . '    (or do not specify if you are already in the web directory)' . PHP_EOL);
+            . $this->getApplication()->getRoot().':</info> '.PHP_EOL 
+            . '    (or do not specify if you are already in the web directory)'.PHP_EOL);
         
-        $question->setValidator(function ($answer) use ($fs) {
+        $question->setValidator(function($answer) use ($fs) {
             $path = $answer;
             
             if ($answer === null)
@@ -194,12 +194,12 @@ 
             }
             elseif (!$fs->isAbsolutePath($answer))
             {
-                $path = $this->getApplication()->getRoot() . '/' . $answer;
+                $path = $this->getApplication()->getRoot().'/'.$answer;
             }
             
             if (!is_dir($path))
             {
-                throw new \RuntimeException('Directory "' . $path . '" is missing');
+                throw new \RuntimeException('Directory "'.$path.'" is missing');
             }
             
             return $answer;
@@ -207,7 +207,7 @@ 
         
         $webDir = $this->questionHelper->ask($input, $output, $question);
 
-        $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)],
@@ -215,6 +215,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

Braces +2 added lines, -4 removed lines

@@ -142,8 +142,7 @@ 
             if ($item->isDir())
             {
                 $fs->mkdir($itemPath);
-            }
-            else
+            } else
             {
                 $fs->copy($item, $itemPath, true);
             }
@@ -191,8 +190,7 @@ 
             if ($answer === null)
             {
                 $path = $this->getApplication()->getRoot();
-            }
-            elseif (!$fs->isAbsolutePath($answer))
+            } elseif (!$fs->isAbsolutePath($answer))
             {
                 $path = $this->getApplication()->getRoot() . '/' . $answer;
             }