notamedia / console-jedi

src/Cache/Command/ClearCommand.php

Spacing +2 added lines, -2 removed lines

@@ -61,13 +61,13 @@
         if ($dir)
         {
             $cache->cleanDir($dir);
-            $output->writeln('<info>Bitrix cache by "/' . BX_ROOT . '/cache/' . $dir . '" dir was deleted</info>');
+            $output->writeln('<info>Bitrix cache by "/'.BX_ROOT.'/cache/'.$dir.'" dir was deleted</info>');
         }
 
         if ($tag)
         {
             Application::getInstance()->getTaggedCache()->clearByTag($tag);
-            $output->writeln('<info>Bitrix cache by tag "' . $tag . '" was deleted</info>');
+            $output->writeln('<info>Bitrix cache by tag "'.$tag.'" was deleted</info>');
         }
     }
 }
\ No newline at end of file

src/Module/Exception/ModuleException.php

Spacing +1 added lines, -1 removed lines

@@ -17,6 +17,6 @@
 	 */
 	public function __construct($message, $moduleName, \Exception $previous = null)
 	{
-		parent::__construct("[$moduleName] " . $message, 0, $previous);
+		parent::__construct("[$moduleName] ".$message, 0, $previous);
 	}
 }
\ No newline at end of file

src/Module/Command/ModuleCommand.php

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/Module/Module.php

Spacing +14 added lines, -14 removed lines

@@ -110,7 +110,7 @@ 
 	{
 		if (!$this->isRegistered())
 		{
-			$moduleObject =& $this->getObject();
+			$moduleObject = & $this->getObject();
 
 			/**
 			 * It's important to check if module class defines InstallDB method (it must register module)
@@ -127,7 +127,7 @@ 
 			if (!$moduleObject->InstallDB() && BitrixException::hasException())
 			{
 				throw new Exception\ModuleInstallException(
-					get_class($moduleObject) . '::InstallDB() returned false',
+					get_class($moduleObject).'::InstallDB() returned false',
 					$this->name
 				);
 			}
@@ -138,7 +138,7 @@ 
 			if (!$moduleObject->InstallFiles() && BitrixException::hasException())
 			{
 				throw new Exception\ModuleInstallException(
-					get_class($moduleObject) . '::InstallFiles() returned false',
+					get_class($moduleObject).'::InstallFiles() returned false',
 					$this->name
 				);
 			}
@@ -166,7 +166,7 @@ 
 		{
 			if (!$this->exist())
 			{
-				require_once($_SERVER["DOCUMENT_ROOT"] . '/bitrix/modules/main/classes/general/update_client_partner.php');
+				require_once($_SERVER["DOCUMENT_ROOT"].'/bitrix/modules/main/classes/general/update_client_partner.php');
 
 				if (!\CUpdateClientPartner::LoadModuleNoDemand(
 					$this->getName(),
@@ -211,7 +211,7 @@ 
 			if (!$moduleObject->UnInstallFiles() && BitrixException::hasException())
 			{
 				throw new Exception\ModuleUninstallException(
-					get_class($moduleObject) . '::UnInstallFiles() returned false',
+					get_class($moduleObject).'::UnInstallFiles() returned false',
 					$this->name
 				);
 			}
@@ -222,7 +222,7 @@ 
 			if (!$moduleObject->UnInstallDB() && BitrixException::hasException())
 			{
 				throw new Exception\ModuleUninstallException(
-					get_class($moduleObject) . '::UnInstallFiles() returned false',
+					get_class($moduleObject).'::UnInstallFiles() returned false',
 					$this->name
 				);
 			}
@@ -246,11 +246,11 @@ 
 			$this->unRegister();
 		}
 
-		$path = getLocalPath('modules/' . $this->getName());
+		$path = getLocalPath('modules/'.$this->getName());
 
 		if ($path)
 		{
-			(new Filesystem())->remove($_SERVER['DOCUMENT_ROOT'] . $path);
+			(new Filesystem())->remove($_SERVER['DOCUMENT_ROOT'].$path);
 		}
 
 		unset($this->object);
@@ -269,7 +269,7 @@ 
 	 */
 	public function update(&$modulesUpdated = null)
 	{
-		require_once($_SERVER["DOCUMENT_ROOT"] . '/bitrix/modules/main/classes/general/update_client_partner.php');
+		require_once($_SERVER["DOCUMENT_ROOT"].'/bitrix/modules/main/classes/general/update_client_partner.php');
 
 		if (!$this->isThirdParty())
 		{
@@ -312,14 +312,14 @@ 
 
 		if (!\CUpdateClientPartner::UnGzipArchive($updateDir, $errorMessage, true))
 		{
-			throw new Exception\ModuleUpdateException('[CL02] UnGzipArchive failed. ' . $errorMessage, $this->getName());
+			throw new Exception\ModuleUpdateException('[CL02] UnGzipArchive failed. '.$errorMessage, $this->getName());
 		}
 
 		$this->validateUpdate($updateDir);
 
 		if (isset($updateDescription["DATA"]["#"]["NOUPDATES"]))
 		{
-			\CUpdateClientPartner::ClearUpdateFolder($_SERVER["DOCUMENT_ROOT"] . "/bitrix/updates/" . $updateDir);
+			\CUpdateClientPartner::ClearUpdateFolder($_SERVER["DOCUMENT_ROOT"]."/bitrix/updates/".$updateDir);
 			return false;
 		}
 
@@ -345,7 +345,7 @@ 
 		}
 		else
 		{
-			throw new Exception\ModuleUpdateException('[CL04] UpdateStepModules failed. ' . $errorMessage, $this->getName());
+			throw new Exception\ModuleUpdateException('[CL04] UpdateStepModules failed. '.$errorMessage, $this->getName());
 		}
 
 		return true;
@@ -361,7 +361,7 @@ 
 		$errorMessage = null;
 		if (!\CUpdateClientPartner::CheckUpdatability($updateDir, $errorMessage))
 		{
-			throw new Exception\ModuleUpdateException('[CL03] CheckUpdatability failed. ' . $errorMessage, $this->getName());
+			throw new Exception\ModuleUpdateException('[CL03] CheckUpdatability failed. '.$errorMessage, $this->getName());
 		}
 
 		if (isset($updateDescription["DATA"]["#"]["ERROR"]))
@@ -369,7 +369,7 @@ 
 			$errorMessage = "";
 			foreach ($updateDescription["DATA"]["#"]["ERROR"] as $errorDescription)
 			{
-				$errorMessage .= "[" . $errorDescription["@"]["TYPE"] . "] " . $errorDescription["#"];
+				$errorMessage .= "[".$errorDescription["@"]["TYPE"]."] ".$errorDescription["#"];
 			}
 			throw new Exception\ModuleUpdateException($errorMessage, $this->getName());
 		}

src/Application/Exception/BitrixException.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 
 		if ($ex = $APPLICATION->GetException())
 		{
-			throw new static($message ? $message . ': ' . $ex->GetString() : $ex->GetString());
+			throw new static($message ? $message.': '.$ex->GetString() : $ex->GetString());
 		}
 		else
 		{

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

src/Environment/Command/InitCommand.php

Spacing +19 added lines, -19 removed lines

@@ -74,14 +74,14 @@ 
             throw new \Exception('Config env-dir is missing');
         }
         
-        $dir = $this->getApplication()->getRoot() . '/' . $this->getApplication()->getConfiguration()['env-dir'];
+        $dir = $this->getApplication()->getRoot().'/'.$this->getApplication()->getConfiguration()['env-dir'];
 
         if (!is_dir($dir))
         {
-            throw new \Exception('Directory ' . $dir . ' is missing');
+            throw new \Exception('Directory '.$dir.' is missing');
         }
 
-        $environments = include $dir . '/index.php';
+        $environments = include $dir.'/index.php';
 
         if (!is_array($environments))
         {
@@ -118,8 +118,8 @@ 
             throw new \Exception('Environment path not found!');
         }
 
-        $this->dir = $dir . '/' . $environments[$code]['path'];
-        $this->config = include $this->dir . '/config.php';
+        $this->dir = $dir.'/'.$environments[$code]['path'];
+        $this->config = include $this->dir.'/config.php';
     }
 
     /**
@@ -134,11 +134,11 @@ 
                 
         foreach ($this->config as $config => $settings)
         {
-            $method = 'configure' . ucfirst($config);
+            $method = 'configure'.ucfirst($config);
 
             if (!in_array($method, $this->bootstrap) && method_exists($this, $method))
             {
-                $output->writeln('<comment>Setup "' . $config . '"</comment>');
+                $output->writeln('<comment>Setup "'.$config.'"</comment>');
                 $this->$method($input, $output, $settings);
             }
         }
@@ -166,7 +166,7 @@ 
                 continue;
             }
             
-            $itemPath = $this->getApplication()->getRoot() . '/' . $iterator->getSubPathName();
+            $itemPath = $this->getApplication()->getRoot().'/'.$iterator->getSubPathName();
             
             if ($item->isDir())
             {
@@ -177,7 +177,7 @@ 
                 $fs->copy($item, $itemPath, true);
             }
 
-            $output->writeln('   ' . $itemPath);
+            $output->writeln('   '.$itemPath);
         }
     }
     
@@ -207,8 +207,8 @@ 
             throw new \InvalidArgumentException('Config "licenseKey" must be string type.');
         }
         
-        $licenseFileContent = "<" . "? $" . "LICENSE_KEY = \"" . EscapePHPString($licenseKey) . "\"; ?" . ">";
-        File::putFileContents(Application::getDocumentRoot() . BX_ROOT . '/license_key.php', $licenseFileContent);
+        $licenseFileContent = "<"."? $"."LICENSE_KEY = \"".EscapePHPString($licenseKey)."\"; ?".">";
+        File::putFileContents(Application::getDocumentRoot().BX_ROOT.'/license_key.php', $licenseFileContent);
     }
 
     /**
@@ -251,7 +251,7 @@ 
 
         foreach ($modules as $moduleName)
         {
-            $message = "\r" . '   module:load ' . $moduleName . ': ';
+            $message = "\r".'   module:load '.$moduleName.': ';
 
             try
             {
@@ -264,19 +264,19 @@ 
                 (new Module($moduleName))->load()->register();
 
                 $bar->clear();
-                $output->writeln($message . '<info>ok</info>');
+                $output->writeln($message.'<info>ok</info>');
             }
             catch (ModuleInstallException $e)
             {
                 $bar->clear();
                 $output->writeln($e->getMessage(), OutputInterface::VERBOSITY_VERBOSE);
-                $output->writeln($message . '<comment>not registered</comment> (install it in admin panel)');
+                $output->writeln($message.'<comment>not registered</comment> (install it in admin panel)');
             }
             catch (ModuleException $e)
             {
                 $bar->clear();
                 $output->writeln($e->getMessage(), OutputInterface::VERBOSITY_VERBOSE);
-                $output->writeln($message . '<error>FAILED</error>');
+                $output->writeln($message.'<error>FAILED</error>');
             }
             $bar->advance();
         }
@@ -350,14 +350,14 @@ 
                 else
                 {
                     $exception = $APPLICATION->GetException();
-                    $message = 'Invalid memcache config with index ' . $index;
+                    $message = 'Invalid memcache config with index '.$index;
 
                     if ($exception->GetString())
                     {
                         $message = str_replace('<br>', "\n", $exception->GetString());
                     }
 
-                    $output->writeln('<error>' . $message . '</error>');
+                    $output->writeln('<error>'.$message.'</error>');
                 }
             }
         }
@@ -394,14 +394,14 @@ 
                     }
                     else
                     {
-                        $output->writeln('<error>Invalid option for module "' . $module . '" with code "' . $code. '"</error>');
+                        $output->writeln('<error>Invalid option for module "'.$module.'" with code "'.$code.'"</error>');
                     }
                 }
                 else
                 {
                     Option::set($module, $code, $value);
 
-                    $output->writeln('   option: "' . $code . '", module: "' . $module . '"');
+                    $output->writeln('   option: "'.$code.'", module: "'.$module.'"');
                 }
             }
         }