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/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)

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