notamedia / console-jedi

src/Application/Application.php

Spacing +15 added lines, -15 removed lines

@@ -101,22 +101,22 @@ 
         $exitCode = parent::doRun($input, $output);
 
         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 {
             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;
@@ -168,7 +168,7 @@ 
         $commands = [];
 
         foreach (ModuleManager::getInstalledModules() as $module) {
-            $cliFile = getLocalPath('modules/' . $module['ID'] . '/cli.php');
+            $cliFile = getLocalPath('modules/'.$module['ID'].'/cli.php');
 
             if ($cliFile === false) {
                 continue;
@@ -176,7 +176,7 @@ 
                 continue;
             }
 
-            $config = include_once $this->getDocumentRoot() . $cliFile;
+            $config = include_once $this->getDocumentRoot().$cliFile;
 
             if (isset($config['commands']) && is_array($config['commands'])) {
                 $commands = array_merge($commands, $config['commands']);
@@ -204,7 +204,7 @@ 
         $this->configuration = include $path;
 
         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');
         }
 
         $filesystem = new Filesystem();
@@ -212,7 +212,7 @@ 
         if ($filesystem->isAbsolutePath($this->configuration['web-dir'])) {
             $this->setDocumentRoot($this->configuration['web-dir']);
         } else {
-            $this->setDocumentRoot($this->getRoot() . '/' . $this->configuration['web-dir']);
+            $this->setDocumentRoot($this->getRoot().'/'.$this->configuration['web-dir']);
         }
 
         if (!is_dir($_SERVER['DOCUMENT_ROOT'])) {
@@ -258,7 +258,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) {
                 $this->bitrixStatus = static::BITRIX_STATUS_COMPLETE;
@@ -278,8 +278,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;
         }
@@ -323,7 +323,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);
@@ -342,16 +342,16 @@ 
                 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

@@ -73,13 +73,13 @@ 
             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)) {
             throw new \Exception('File with description of environments is missing');
@@ -107,8 +107,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';
     }
 
     /**
@@ -121,10 +121,10 @@ 
         }
 
         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);
             }
         }
@@ -150,7 +150,7 @@ 
                 continue;
             }
 
-            $itemPath = $this->getApplication()->getRoot() . '/' . $iterator->getSubPathName();
+            $itemPath = $this->getApplication()->getRoot().'/'.$iterator->getSubPathName();
 
             if ($item->isDir()) {
                 $fs->mkdir($itemPath);
@@ -158,7 +158,7 @@ 
                 $fs->copy($item, $itemPath, true);
             }
 
-            $output->writeln('   ' . $itemPath);
+            $output->writeln('   '.$itemPath);
         }
     }
 
@@ -186,8 +186,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);
     }
 
     /**
@@ -225,7 +225,7 @@ 
         $bar->setFormat('verbose');
 
         foreach ($modules as $moduleName) {
-            $message = "\r" . '   module:load ' . $moduleName . ': ';
+            $message = "\r".'   module:load '.$moduleName.': ';
 
             try {
                 if (isset($bar)) {
@@ -236,15 +236,15 @@ 
                 (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();
         }
@@ -309,13 +309,13 @@ 
                     $memcache->Resume($serverId);
                 } 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>');
                 }
             }
         }
@@ -344,12 +344,12 @@ 
                     if (isset($value['value']) && isset($value['siteId'])) {
                         Option::set($module, $code, $value['value'], $value['siteId']);
                     } 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.'"');
                 }
             }
         }

src/Module/Module.php

Spacing +14 added lines, -14 removed lines

@@ -108,7 +108,7 @@ 
     public function register()
     {
         if (!$this->isRegistered()) {
-            $moduleObject =& $this->getObject();
+            $moduleObject = & $this->getObject();
 
             /**
              * It's important to check if module class defines InstallDB method (it must register module)
@@ -123,7 +123,7 @@ 
 
             if (!$moduleObject->InstallDB() && BitrixException::hasException()) {
                 throw new Exception\ModuleInstallException(
-                    get_class($moduleObject) . '::InstallDB() returned false',
+                    get_class($moduleObject).'::InstallDB() returned false',
                     $this->name
                 );
             }
@@ -133,7 +133,7 @@ 
             /** @noinspection PhpVoidFunctionResultUsedInspection */
             if (!$moduleObject->InstallFiles() && BitrixException::hasException()) {
                 throw new Exception\ModuleInstallException(
-                    get_class($moduleObject) . '::InstallFiles() returned false',
+                    get_class($moduleObject).'::InstallFiles() returned false',
                     $this->name
                 );
             }
@@ -158,7 +158,7 @@ 
     {
         if (!$this->isRegistered()) {
             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(),
@@ -199,7 +199,7 @@ 
             /** @noinspection PhpVoidFunctionResultUsedInspection */
             if (!$moduleObject->UnInstallFiles() && BitrixException::hasException()) {
                 throw new Exception\ModuleUninstallException(
-                    get_class($moduleObject) . '::UnInstallFiles() returned false',
+                    get_class($moduleObject).'::UnInstallFiles() returned false',
                     $this->name
                 );
             }
@@ -209,7 +209,7 @@ 
             /** @noinspection PhpVoidFunctionResultUsedInspection */
             if (!$moduleObject->UnInstallDB() && BitrixException::hasException()) {
                 throw new Exception\ModuleUninstallException(
-                    get_class($moduleObject) . '::UnInstallFiles() returned false',
+                    get_class($moduleObject).'::UnInstallFiles() returned false',
                     $this->name
                 );
             }
@@ -231,10 +231,10 @@ 
             $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);
@@ -253,7 +253,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()) {
             throw new Exception\ModuleUpdateException('Kernel module updates are currently not supported.',
@@ -294,14 +294,14 @@ 
         $updateDir = null;
 
         if (!\CUpdateClientPartner::UnGzipArchive($updateDir, $errorMessage, true)) {
-            throw new Exception\ModuleUpdateException('[CL02] UnGzipArchive failed. ' . $errorMessage,
+            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;
         }
 
@@ -320,7 +320,7 @@ 
                 }
             }
         } else {
-            throw new Exception\ModuleUpdateException('[CL04] UpdateStepModules failed. ' . $errorMessage,
+            throw new Exception\ModuleUpdateException('[CL04] UpdateStepModules failed. '.$errorMessage,
                 $this->getName());
         }
 
@@ -336,14 +336,14 @@ 
     {
         $errorMessage = null;
         if (!\CUpdateClientPartner::CheckUpdatability($updateDir, $errorMessage)) {
-            throw new Exception\ModuleUpdateException('[CL03] CheckUpdatability failed. ' . $errorMessage,
+            throw new Exception\ModuleUpdateException('[CL03] CheckUpdatability failed. '.$errorMessage,
                 $this->getName());
         }
 
         if (isset($updateDescription["DATA"]["#"]["ERROR"])) {
             $errorMessage = "";
             foreach ($updateDescription["DATA"]["#"]["ERROR"] as $errorDescription) {
-                $errorMessage .= "[" . $errorDescription["@"]["TYPE"] . "] " . $errorDescription["#"];
+                $errorMessage .= "[".$errorDescription["@"]["TYPE"]."] ".$errorDescription["#"];
             }
             throw new Exception\ModuleUpdateException($errorMessage, $this->getName());
         }

src/Module/Command/ModuleCommand.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
         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!');
+            $output->writeln($module->isThirdParty().' is not a kernel module. Correct operation cannot be guaranteed for third-party modules!');
         }
     }
 

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/Schema/Command/ExportCommand.php

Unused Use Statements +8 added lines, -8 removed lines

@@ -2,14 +2,14 @@
 

 namespace Notamedia\ConsoleJedi\Schema\Command;

 

-use Notamedia\ConsoleJedi\Application\Command\BitrixCommand;

-use Notamedia\ConsoleJedi\Schema\Exception\SchemaException;

-use Notamedia\ConsoleJedi\Schema\Schema;

-use Symfony\Component\Console\Input\InputArgument;

-use Symfony\Component\Console\Input\InputInterface;

-use Symfony\Component\Console\Input\InputOption;

-use Symfony\Component\Console\Output\OutputInterface;

-use Symfony\Component\Console\Helper\FormatterHelper;

+use Notamedia\ConsoleJedi\Application\Command\BitrixCommand;
+use Notamedia\ConsoleJedi\Schema\Exception\SchemaException;
+use Notamedia\ConsoleJedi\Schema\Schema;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Helper\FormatterHelper;
 use Bitrix\Main\Loader;

 

 class ExportCommand extends BitrixCommand

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 

             try {

                 $xml_id = \CIBlockCMLExport::GetIBlockXML_ID($iblock['ID']);

-                $path = implode('/', [$this->dir, $xml_id]) . $this->extension;

+                $path = implode('/', [$this->dir, $xml_id]).$this->extension;

 

                 $export

                     ->setPath($path)

src/Schema/Command/ImportCommand.php

Unused Use Statements +8 added lines, -8 removed lines

@@ -2,14 +2,14 @@
 

 namespace Notamedia\ConsoleJedi\Schema\Command;

 

-use Notamedia\ConsoleJedi\Application\Command\BitrixCommand;

-use Notamedia\ConsoleJedi\Schema\Exception\SchemaException;

-use Notamedia\ConsoleJedi\Schema\Schema;

-use Symfony\Component\Console\Input\InputArgument;

-use Symfony\Component\Console\Input\InputInterface;

-use Symfony\Component\Console\Input\InputOption;

-use Symfony\Component\Console\Output\OutputInterface;

-use Symfony\Component\Console\Helper\FormatterHelper;

+use Notamedia\ConsoleJedi\Application\Command\BitrixCommand;
+use Notamedia\ConsoleJedi\Schema\Exception\SchemaException;
+use Notamedia\ConsoleJedi\Schema\Schema;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Helper\FormatterHelper;
 use Bitrix\Main\Loader;

 

 class ImportCommand extends BitrixCommand

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
             ->setType($this->type)

             ->setSites($this->sites)

             ->setActionSection($input->getOption('sections'))

-            ->setActionElement($input->getOption('elements'));;

+            ->setActionElement($input->getOption('elements')); ;

 

         foreach (glob(implode('/*', [$this->dir, $this->extension])) as $file) {

 

src/Schema/Import.php

Braces +3 added lines, -2 removed lines

@@ -122,8 +122,9 @@
     {

         $handle = fopen($this->config['path'], "r");

 

-        if (!$handle)

-            throw new ImportException('Unable to open file, or file not exist');

+        if (!$handle) {
+                    throw new ImportException('Unable to open file, or file not exist');
+        }
 

         if (!$this->import->CheckIfFileIsCML($this->config['path'])) {

             throw new ImportException('File is not valid');

src/Schema/Export.php

Spacing +2 added lines, -2 removed lines

@@ -109,7 +109,7 @@ 
     protected function export()

     {

         $filesystem = new Filesystem();

-        $handle = fopen($this->config['path'] . $this->prefix, "w");

+        $handle = fopen($this->config['path'].$this->prefix, "w");

 

         $checkPermissions = true;

         if (PHP_SAPI == 'cli') {

@@ -159,6 +159,6 @@ 
 

         fclose($handle);

         $filesystem->remove($this->config['path']);

-        $filesystem->rename($this->config['path'] . $this->prefix, $this->config['path'], true);

+        $filesystem->rename($this->config['path'].$this->prefix, $this->config['path'], true);

     }

 }
\ No newline at end of file