notamedia / console-jedi

src/Module/Command/UnregisterCommand.php

Indentation +18 added lines, -18 removed lines

@@ -17,24 +17,24 @@
  */
 class UnregisterCommand extends ModuleCommand
 {
-	/**
-	 * {@inheritdoc}
-	 */
-	protected function configure()
-	{
-		parent::configure();
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        parent::configure();
 
-		$this->setName('module:unregister')
-			->setDescription('Uninstall module');
-	}
+        $this->setName('module:unregister')
+            ->setDescription('Uninstall module');
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
-	{
-		$module = new Module($input->getArgument('module'));
-		$module->unRegister();
-		$output->writeln(sprintf('unregistered <info>%s</info>', $module->getName()));
-	}
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $module = new Module($input->getArgument('module'));
+        $module->unRegister();
+        $output->writeln(sprintf('unregistered <info>%s</info>', $module->getName()));
+    }
 }
\ No newline at end of file

src/Module/Command/UpdateCommand.php

Indentation +31 added lines, -31 removed lines

@@ -19,38 +19,38 @@
  */
 class UpdateCommand extends ModuleCommand
 {
-	use CanRestartTrait;
+    use CanRestartTrait;
 
-	/**
-	 * {@inheritdoc}
-	 */
-	protected function configure()
-	{
-		parent::configure();
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        parent::configure();
 
-		$this->setName('module:update')
-			->setDescription('Load module updates from Marketplace')
-			->addOption('beta', 'b', InputOption::VALUE_NONE, 'Allow the installation of beta releases');
-	}
+        $this->setName('module:update')
+            ->setDescription('Load module updates from Marketplace')
+            ->addOption('beta', 'b', InputOption::VALUE_NONE, 'Allow the installation of beta releases');
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
-	{
-		$module = new Module($input->getArgument('module'));
-		$modulesUpdated = null;
-		while ($module->update($modulesUpdated))
-		{
-			if (is_array($modulesUpdated))
-			{
-				foreach ($modulesUpdated as $moduleName => $moduleVersion)
-				{
-					$output->writeln(sprintf('updated %s to <info>%s</info>', $moduleName, $moduleVersion));
-				}
-			}
-			return $this->restartScript($input, $output);
-		}
-		return 0;
-	}
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $module = new Module($input->getArgument('module'));
+        $modulesUpdated = null;
+        while ($module->update($modulesUpdated))
+        {
+            if (is_array($modulesUpdated))
+            {
+                foreach ($modulesUpdated as $moduleName => $moduleVersion)
+                {
+                    $output->writeln(sprintf('updated %s to <info>%s</info>', $moduleName, $moduleVersion));
+                }
+            }
+            return $this->restartScript($input, $output);
+        }
+        return 0;
+    }
 }
\ No newline at end of file

src/Module/Command/RemoveCommand.php

Indentation +18 added lines, -18 removed lines

@@ -17,24 +17,24 @@
  */
 class RemoveCommand extends ModuleCommand
 {
-	/**
-	 * {@inheritdoc}
-	 */
-	protected function configure()
-	{
-		parent::configure();
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        parent::configure();
 
-		$this->setName('module:remove')
-			->setDescription('Uninstall and remove module folder from system');
-	}
+        $this->setName('module:remove')
+            ->setDescription('Uninstall and remove module folder from system');
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
-	{
-		$module = new Module($input->getArgument('module'));
-		$module->remove();
-		$output->writeln(sprintf('removed <info>%s</info>', $module->getName()));
-	}
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $module = new Module($input->getArgument('module'));
+        $module->remove();
+        $output->writeln(sprintf('removed <info>%s</info>', $module->getName()));
+    }
 }
\ No newline at end of file

src/Module/Command/ModuleCommand.php

Indentation +38 added lines, -38 removed lines

@@ -21,48 +21,48 @@
  */
 abstract class ModuleCommand extends BitrixCommand
 {
-	/**
-	 * {@inheritdoc}
-	 */
-	protected function configure()
-	{
-		parent::configure();
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        parent::configure();
 
-		$this->addArgument('module', InputArgument::REQUIRED, 'Module name (e.g. `vendor.module`)')
-			->addOption('confirm-thirdparty', 'ct', InputOption::VALUE_NONE, 'Suppress third-party modules warning');
-	}
+        $this->addArgument('module', InputArgument::REQUIRED, 'Module name (e.g. `vendor.module`)')
+            ->addOption('confirm-thirdparty', 'ct', InputOption::VALUE_NONE, 'Suppress third-party modules warning');
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	protected function interact(InputInterface $input, OutputInterface $output)
-	{
-		parent::interact($input, $output);
+    /**
+     * @inheritdoc
+     */
+    protected function interact(InputInterface $input, OutputInterface $output)
+    {
+        parent::interact($input, $output);
 
-		$module = new Module($input->getArgument('module'));
+        $module = new Module($input->getArgument('module'));
 
-		if (in_array($this->getName(), ['module:register', 'module:unregister'])
-			&& $module->isThirdParty() && !$input->getOption('confirm-thirdparty')
-		)
-		{
-			$output->writeln($module->isThirdParty() . ' is not a kernel module. Correct operation cannot be guaranteed for third-party modules!');
-		}
-	}
+        if (in_array($this->getName(), ['module:register', 'module:unregister'])
+            && $module->isThirdParty() && !$input->getOption('confirm-thirdparty')
+        )
+        {
+            $output->writeln($module->isThirdParty() . ' is not a kernel module. Correct operation cannot be guaranteed for third-party modules!');
+        }
+    }
 
-	/**
-	 * Gets console commands from this package.
-	 *
-	 * @return Command[]
-	 */
-	public static function getCommands()
-	{
-		return [
-			new LoadCommand(),
-			new RegisterCommand(),
-			new RemoveCommand(),
-			new UnregisterCommand(),
-			new UpdateCommand(),
-		];
-	}
+    /**
+     * Gets console commands from this package.
+     *
+     * @return Command[]
+     */
+    public static function getCommands()
+    {
+        return [
+            new LoadCommand(),
+            new RegisterCommand(),
+            new RemoveCommand(),
+            new UnregisterCommand(),
+            new UpdateCommand(),
+        ];
+    }
 
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 			&& $module->isThirdParty() && !$input->getOption('confirm-thirdparty')
 		)
 		{
-			$output->writeln($module->isThirdParty() . ' is not a kernel module. Correct operation cannot be guaranteed for third-party modules!');
+			$output->writeln($module->isThirdParty().' is not a kernel module. Correct operation cannot be guaranteed for third-party modules!');
 		}
 	}
 

src/Application/CanRestartTrait.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
      */
     protected function restartScript(InputInterface $input, OutputInterface $output)
     {
-        $proc = popen('php -f ' . join(' ', $GLOBALS['argv']) . ' 2>&1', 'r');
+        $proc = popen('php -f '.join(' ', $GLOBALS['argv']).' 2>&1', 'r');
         while (!feof($proc))
         {
             $output->write(fread($proc, 4096));

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;
             }

src/Agent/AgentHelper.php

Spacing +2 added lines, -2 removed lines

@@ -39,11 +39,11 @@
                     throw new ArgumentTypeException('callChain', 'array');
                 }
                 
-                $chain .= '->' . $method . '(' . static::convertArgsToString($methodArgs) . ')';
+                $chain .= '->'.$method.'('.static::convertArgsToString($methodArgs).')';
             }
         }
 
-        return '\\' . $className . '::agent(' . static::convertArgsToString($args). ')' . $chain . ';';
+        return '\\'.$className.'::agent('.static::convertArgsToString($args).')'.$chain.';';
     }
 
     protected static function convertArgsToString(array $args)