notamedia / console-jedi

src/Application/Application.php

Spacing +1 added lines, -1 removed lines

@@ -348,7 +348,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);

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

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * For the full copyright and license information, please view the LICENSE.md
- * file that was distributed with this source code.
- */
+     * For the full copyright and license information, please view the LICENSE.md
+     * file that was distributed with this source code.
+     */
 
 namespace Notamedia\ConsoleJedi\Agent\Command;
 

src/Application/Exception/BitrixException.php

Indentation +33 added lines, -33 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 /**
- * For the full copyright and license information, please view the LICENSE.md
- * file that was distributed with this source code.
- */
+     * For the full copyright and license information, please view the LICENSE.md
+     * file that was distributed with this source code.
+     */
 
 namespace Notamedia\ConsoleJedi\Application\Exception;
 
@@ -14,37 +14,37 @@ 
  */
 class BitrixException extends \RuntimeException
 {
-	public static function hasException(\CMain $APPLICATION = null)
-	{
-		if (null === $APPLICATION)
-		{
-			$APPLICATION = $GLOBALS['APPLICATION'];
-		}
+    public static function hasException(\CMain $APPLICATION = null)
+    {
+        if (null === $APPLICATION)
+        {
+            $APPLICATION = $GLOBALS['APPLICATION'];
+        }
 
-		return is_object($APPLICATION->GetException());
-	}
+        return is_object($APPLICATION->GetException());
+    }
 
-	/**
-	 * Check for legacy bitrix exception, throws new self if any
-	 *
-	 * @param string $message [optional] Additional error message
-	 * @param \CMain $APPLICATION [optional] $APPLICATION instance
-	 * @throws static
-	 */
-	public static function generate($message = null, \CMain $APPLICATION = null)
-	{
-		if (null === $APPLICATION)
-		{
-			$APPLICATION = $GLOBALS['APPLICATION'];
-		}
+    /**
+     * Check for legacy bitrix exception, throws new self if any
+     *
+     * @param string $message [optional] Additional error message
+     * @param \CMain $APPLICATION [optional] $APPLICATION instance
+     * @throws static
+     */
+    public static function generate($message = null, \CMain $APPLICATION = null)
+    {
+        if (null === $APPLICATION)
+        {
+            $APPLICATION = $GLOBALS['APPLICATION'];
+        }
 
-		if ($ex = $APPLICATION->GetException())
-		{
-			throw new static($message ? $message . ': ' . $ex->GetString() : $ex->GetString());
-		}
-		else
-		{
-			throw new static($message ? $message : 'Unknown exception');
-		}
-	}
+        if ($ex = $APPLICATION->GetException())
+        {
+            throw new static($message ? $message . ': ' . $ex->GetString() : $ex->GetString());
+        }
+        else
+        {
+            throw new static($message ? $message : 'Unknown exception');
+        }
+    }
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

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

src/Application/Command/InitCommand.php

Spacing +1 added lines, -1 removed lines

@@ -180,7 +180,7 @@
         }
         
         $question = new Question('    <info>Enter path to web directory (document root of main site):</info> ');
-        $question->setValidator(function ($answer) {
+        $question->setValidator(function($answer) {
             if (!is_dir($answer))
             {
                 throw new \RuntimeException('Directory "' . $answer . '" is missing');

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * For the full copyright and license information, please view the LICENSE.md
- * file that was distributed with this source code.
- */
+     * For the full copyright and license information, please view the LICENSE.md
+     * file that was distributed with this source code.
+     */
 
 namespace Notamedia\ConsoleJedi\Agent\Command;
 

Braces +1 added lines, -2 removed lines

@@ -51,8 +51,7 @@
             if (Cache::clearCache(true))
             {
                 $output->writeln('<info>All Bitrix cache was deleted</info>');
-            }
-            else
+            } else
             {
                 $output->writeln('<error>Error deleting Bitrix cache</error>');
             }

src/Environment/Command/InitCommand.php

Spacing +1 added lines, -1 removed lines

@@ -394,7 +394,7 @@
                     }
                     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

Braces +12 added lines, -20 removed lines

@@ -86,8 +86,7 @@ 
         if (!is_array($environments))
         {
             throw new \Exception('File with description of environments is missing');
-        }
-        elseif (count($environments) == 0)
+        } elseif (count($environments) == 0)
         {
             throw new \Exception('Environments not found in description file');
         }
@@ -100,8 +99,7 @@ 
             {
                 throw new \Exception('Invalid environment code!');
             }
-        }
-        else
+        } else
         {
             foreach ($environments as $code => $environment)
             {
@@ -171,8 +169,7 @@ 
             if ($item->isDir())
             {
                 $fs->mkdir($itemPath);
-            }
-            else
+            } else
             {
                 $fs->copy($item, $itemPath, true);
             }
@@ -227,10 +224,10 @@ 
         if ($app->getConfiguration())
         {
             $app->addCommands(ModuleCommand::getCommands());
-            if ($app->getBitrixStatus() != \Notamedia\ConsoleJedi\Application\Application::BITRIX_STATUS_COMPLETE)
-                throw new BitrixException('Bitrix core is not available');
-        }
-        else
+            if ($app->getBitrixStatus() != \Notamedia\ConsoleJedi\Application\Application::BITRIX_STATUS_COMPLETE) {
+                            throw new BitrixException('Bitrix core is not available');
+            }
+        } else
         {
             throw new BitrixException('No configuration loaded');
         }
@@ -265,14 +262,12 @@ 
 
                 $bar->clear();
                 $output->writeln($message . '<info>ok</info>');
-            }
-            catch (ModuleInstallException $e)
+            } catch (ModuleInstallException $e)
             {
                 $bar->clear();
                 $output->writeln($e->getMessage(), OutputInterface::VERBOSITY_VERBOSE);
                 $output->writeln($message . '<comment>not registered</comment> (install it in admin panel)');
-            }
-            catch (ModuleException $e)
+            } catch (ModuleException $e)
             {
                 $bar->clear();
                 $output->writeln($e->getMessage(), OutputInterface::VERBOSITY_VERBOSE);
@@ -346,8 +341,7 @@ 
                 if ($serverId && !$input->getOption('memcache-cold-start'))
                 {
                     $memcache->Resume($serverId);
-                }
-                else
+                } else
                 {
                     $exception = $APPLICATION->GetException();
                     $message = 'Invalid memcache config with index ' . $index;
@@ -391,13 +385,11 @@ 
                     if (isset($value['value']) && isset($value['siteId']))
                     {
                         Option::set($module, $code, $value['value'], $value['siteId']);
-                    }
-                    else
+                    } else
                     {
                         $output->writeln('<error>Invalid option for module "' . $module . '" with code "' . $code. '"</error>');
                     }
-                }
-                else
+                } else
                 {
                     Option::set($module, $code, $value);
 

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * For the full copyright and license information, please view the LICENSE.md
- * file that was distributed with this source code.
- */
+     * For the full copyright and license information, please view the LICENSE.md
+     * file that was distributed with this source code.
+     */
 
 namespace Notamedia\ConsoleJedi\Agent\Command;
 

src/Module/Module.php

Spacing +1 added lines, -1 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)

Braces +2 added lines, -4 removed lines

@@ -73,8 +73,7 @@ 
 		try
 		{
 			$this->getObject();
-		}
-		catch (Exception\ModuleNotFoundException $e)
+		} catch (Exception\ModuleNotFoundException $e)
 		{
 			return false;
 		}
@@ -342,8 +341,7 @@ 
 					\CEventLog::Log("INFO", "MP_MODULE_DOWNLOADED", "main", $key, $value);
 				}
 			}
-		}
-		else
+		} else
 		{
 			throw new Exception\ModuleUpdateException('[CL04] UpdateStepModules failed. ' . $errorMessage, $this->getName());
 		}

Indentation +391 added lines, -391 removed lines

@@ -18,395 +18,395 @@
  */
 class Module
 {
-	/** @var string */
-	private $name;
-
-	/** @var \CModule */
-	private $object;
-
-	/** @var bool */
-	private $beta = false;
-
-	/**
-	 * @param string $moduleName
-	 */
-	public function __construct($moduleName)
-	{
-		$this->name = $this->normalizeName($moduleName);
-	}
-
-	/**
-	 * @param string $moduleName
-	 * @return string
-	 */
-	protected function normalizeName($moduleName)
-	{
-		return preg_replace("/[^a-zA-Z0-9_.]+/i", "", trim($moduleName));
-	}
-
-	/**
-	 * @return \CModule
-	 */
-	protected function &getObject()
-	{
-		if (!isset($this->object))
-		{
-			$this->object = \CModule::CreateModuleObject($this->name);
-		}
-
-		if (!is_object($this->object) || !($this->object instanceof \CModule))
-		{
-			unset($this->object);
-			throw new Exception\ModuleNotFoundException('Module not found or incorrect', $this->name);
-		}
-
-		return $this->object;
-	}
-
-	/**
-	 * Checks for module and module object existence
-	 *
-	 * @return bool
-	 */
-	public function exist()
-	{
-		try
-		{
-			$this->getObject();
-		}
-		catch (Exception\ModuleNotFoundException $e)
-		{
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check if module exists and installed
-	 *
-	 * @return bool
-	 */
-	public function isRegistered()
-	{
-		return ModuleManager::isModuleInstalled($this->name) && $this->exist();
-	}
-
-	/**
-	 * @return bool true for marketplace modules, false for kernel modules
-	 */
-	public function isThirdParty()
-	{
-		return strpos($this->name, '.') !== false;
-	}
-
-	/**
-	 * Install module
-	 *
-	 * @throws Exception\ModuleException
-	 * @throws BitrixException
-	 */
-	public function register()
-	{
-		if (!$this->isRegistered())
-		{
-			$moduleObject =& $this->getObject();
-
-			/**
-			 * It's important to check if module class defines InstallDB method (it must register module)
-			 * Thus absent InstallDB indicates that the module does not support automatic installation
-			 */
-			if ((new \ReflectionClass($moduleObject))->getMethod('InstallDB')->class !== get_class($moduleObject))
-			{
-				throw new Exception\ModuleInstallException(
-					'Missing InstallDB method. This module does not support automatic installation',
-					$this->name
-				);
-			}
-
-			if (!$moduleObject->InstallDB() && BitrixException::hasException())
-			{
-				throw new Exception\ModuleInstallException(
-					get_class($moduleObject) . '::InstallDB() returned false',
-					$this->name
-				);
-			}
-
-			$moduleObject->InstallEvents();
-
-			/** @noinspection PhpVoidFunctionResultUsedInspection */
-			if (!$moduleObject->InstallFiles() && BitrixException::hasException())
-			{
-				throw new Exception\ModuleInstallException(
-					get_class($moduleObject) . '::InstallFiles() returned false',
-					$this->name
-				);
-			}
-
-			if (!$this->isRegistered())
-			{
-				throw new Exception\ModuleInstallException(
-					'Module was not registered. Probably it does not support automatic installation.',
-					$this->name
-				);
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Download module from marketplace
-	 *
-	 * @return $this
-	 */
-	public function load()
-	{
-		if (!$this->isRegistered())
-		{
-			if (!$this->exist())
-			{
-				require_once($_SERVER["DOCUMENT_ROOT"] . '/bitrix/modules/main/classes/general/update_client_partner.php');
-
-				if (!\CUpdateClientPartner::LoadModuleNoDemand(
-					$this->getName(),
-					$strError,
-					$this->isBeta() ? 'N' : 'Y',
-					LANGUAGE_ID)
-				)
-				{
-					throw new Exception\ModuleLoadException($strError, $this->getName());
-				}
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Uninstall module
-	 *
-	 * @throws Exception\ModuleException
-	 * @throws BitrixException
-	 */
-	public function unRegister()
-	{
-		$moduleObject = $this->getObject();
-
-		if ($this->isRegistered())
-		{
-			/**
-			 * It's important to check if module class defines UnInstallDB method (it should unregister module)
-			 * Thus absent UnInstallDB indicates that the module does not support automatic uninstallation
-			 */
-			if ((new \ReflectionClass($moduleObject))->getMethod('UnInstallDB')->class !== get_class($moduleObject))
-			{
-				throw new Exception\ModuleUninstallException(
-					'Missing UnInstallDB method. This module does not support automatic uninstallation',
-					$this->name
-				);
-			}
-
-			/** @noinspection PhpVoidFunctionResultUsedInspection */
-			if (!$moduleObject->UnInstallFiles() && BitrixException::hasException())
-			{
-				throw new Exception\ModuleUninstallException(
-					get_class($moduleObject) . '::UnInstallFiles() returned false',
-					$this->name
-				);
-			}
-
-			$moduleObject->UnInstallEvents();
-
-			/** @noinspection PhpVoidFunctionResultUsedInspection */
-			if (!$moduleObject->UnInstallDB() && BitrixException::hasException())
-			{
-				throw new Exception\ModuleUninstallException(
-					get_class($moduleObject) . '::UnInstallFiles() returned false',
-					$this->name
-				);
-			}
-
-			if ($this->isRegistered())
-			{
-				throw new Exception\ModuleUninstallException('Module was not unregistered', $this->name);
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Uninstall and remove module directory
-	 */
-	public function remove()
-	{
-		if ($this->isRegistered())
-		{
-			$this->unRegister();
-		}
-
-		$path = getLocalPath('modules/' . $this->getName());
-
-		if ($path)
-		{
-			(new Filesystem())->remove($_SERVER['DOCUMENT_ROOT'] . $path);
-		}
-
-		unset($this->object);
-
-		return $this;
-	}
-
-	/**
-	 * Update module
-	 *
-	 * It must be called repeatedly until the method returns false.
-	 * After each call php must be restarted (new process created) to update module class and function definitions.
-	 *
-	 * @param array $modulesUpdated [optional]
-	 * @return bool
-	 */
-	public function update(&$modulesUpdated = null)
-	{
-		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.', $this->getName());
-		}
-
-		// ensures module existence
-		$this->getObject();
-
-		$errorMessage = $updateDescription = null;
-		$loadResult = \CUpdateClientPartner::LoadModulesUpdates(
-			$errorMessage,
-			$updateDescription,
-			LANGUAGE_ID,
-			$this->isBeta() ? 'N' : 'Y',
-			[$this->getName()],
-			true
-		);
-		switch ($loadResult)
-		{
-			// archive loaded
-			case "S":
-				return $this->update($modulesUpdated);
-
-			// error
-			case "E":
-				throw new Exception\ModuleUpdateException($errorMessage, $this->getName());
-
-			// finished installing updates
-			case "F":
-				return false;
-
-			// need to process loaded update
-			case 'U':
-				break;
-		}
-
-		/** @var string Temp directory with update files */
-		$updateDir = null;
-
-		if (!\CUpdateClientPartner::UnGzipArchive($updateDir, $errorMessage, true))
-		{
-			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);
-			return false;
-		}
-
-		$modulesUpdated = $updateDescr = [];
-		if (isset($updateDescription["DATA"]["#"]["ITEM"]))
-		{
-			foreach ($updateDescription["DATA"]["#"]["ITEM"] as $moduleInfo)
-			{
-				$modulesUpdated[$moduleInfo["@"]["NAME"]] = $moduleInfo["@"]["VALUE"];
-				$updateDescr[$moduleInfo["@"]["NAME"]] = $moduleInfo["@"]["DESCR"];
-			}
-		}
-
-		if (\CUpdateClientPartner::UpdateStepModules($updateDir, $errorMessage))
-		{
-			foreach ($modulesUpdated as $key => $value)
-			{
-				if (Option::set('main', 'event_log_marketplace', "Y") === "Y")
-				{
-					\CEventLog::Log("INFO", "MP_MODULE_DOWNLOADED", "main", $key, $value);
-				}
-			}
-		}
-		else
-		{
-			throw new Exception\ModuleUpdateException('[CL04] UpdateStepModules failed. ' . $errorMessage, $this->getName());
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check update files
-	 * 
-	 * @param string $updateDir
-	 */
-	protected function validateUpdate($updateDir)
-	{
-		$errorMessage = null;
-		if (!\CUpdateClientPartner::CheckUpdatability($updateDir, $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["#"];
-			}
-			throw new Exception\ModuleUpdateException($errorMessage, $this->getName());
-		}
-	}
-
-	/**
-	 * Returns module name
-	 *
-	 * @return string
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * Beta releases allowed?
-	 *
-	 * @return boolean
-	 */
-	public function isBeta()
-	{
-		return $this->beta;
-	}
-
-	/**
-	 * Set beta releases installation
-	 *
-	 * @param boolean $beta
-	 */
-	public function setBeta($beta = true)
-	{
-		$this->beta = $beta;
-	}
-
-	public function getVersion()
-	{
-		return $this->getObject()->MODULE_VERSION;
-	}
+    /** @var string */
+    private $name;
+
+    /** @var \CModule */
+    private $object;
+
+    /** @var bool */
+    private $beta = false;
+
+    /**
+     * @param string $moduleName
+     */
+    public function __construct($moduleName)
+    {
+        $this->name = $this->normalizeName($moduleName);
+    }
+
+    /**
+     * @param string $moduleName
+     * @return string
+     */
+    protected function normalizeName($moduleName)
+    {
+        return preg_replace("/[^a-zA-Z0-9_.]+/i", "", trim($moduleName));
+    }
+
+    /**
+     * @return \CModule
+     */
+    protected function &getObject()
+    {
+        if (!isset($this->object))
+        {
+            $this->object = \CModule::CreateModuleObject($this->name);
+        }
+
+        if (!is_object($this->object) || !($this->object instanceof \CModule))
+        {
+            unset($this->object);
+            throw new Exception\ModuleNotFoundException('Module not found or incorrect', $this->name);
+        }
+
+        return $this->object;
+    }
+
+    /**
+     * Checks for module and module object existence
+     *
+     * @return bool
+     */
+    public function exist()
+    {
+        try
+        {
+            $this->getObject();
+        }
+        catch (Exception\ModuleNotFoundException $e)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check if module exists and installed
+     *
+     * @return bool
+     */
+    public function isRegistered()
+    {
+        return ModuleManager::isModuleInstalled($this->name) && $this->exist();
+    }
+
+    /**
+     * @return bool true for marketplace modules, false for kernel modules
+     */
+    public function isThirdParty()
+    {
+        return strpos($this->name, '.') !== false;
+    }
+
+    /**
+     * Install module
+     *
+     * @throws Exception\ModuleException
+     * @throws BitrixException
+     */
+    public function register()
+    {
+        if (!$this->isRegistered())
+        {
+            $moduleObject =& $this->getObject();
+
+            /**
+             * It's important to check if module class defines InstallDB method (it must register module)
+             * Thus absent InstallDB indicates that the module does not support automatic installation
+             */
+            if ((new \ReflectionClass($moduleObject))->getMethod('InstallDB')->class !== get_class($moduleObject))
+            {
+                throw new Exception\ModuleInstallException(
+                    'Missing InstallDB method. This module does not support automatic installation',
+                    $this->name
+                );
+            }
+
+            if (!$moduleObject->InstallDB() && BitrixException::hasException())
+            {
+                throw new Exception\ModuleInstallException(
+                    get_class($moduleObject) . '::InstallDB() returned false',
+                    $this->name
+                );
+            }
+
+            $moduleObject->InstallEvents();
+
+            /** @noinspection PhpVoidFunctionResultUsedInspection */
+            if (!$moduleObject->InstallFiles() && BitrixException::hasException())
+            {
+                throw new Exception\ModuleInstallException(
+                    get_class($moduleObject) . '::InstallFiles() returned false',
+                    $this->name
+                );
+            }
+
+            if (!$this->isRegistered())
+            {
+                throw new Exception\ModuleInstallException(
+                    'Module was not registered. Probably it does not support automatic installation.',
+                    $this->name
+                );
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Download module from marketplace
+     *
+     * @return $this
+     */
+    public function load()
+    {
+        if (!$this->isRegistered())
+        {
+            if (!$this->exist())
+            {
+                require_once($_SERVER["DOCUMENT_ROOT"] . '/bitrix/modules/main/classes/general/update_client_partner.php');
+
+                if (!\CUpdateClientPartner::LoadModuleNoDemand(
+                    $this->getName(),
+                    $strError,
+                    $this->isBeta() ? 'N' : 'Y',
+                    LANGUAGE_ID)
+                )
+                {
+                    throw new Exception\ModuleLoadException($strError, $this->getName());
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Uninstall module
+     *
+     * @throws Exception\ModuleException
+     * @throws BitrixException
+     */
+    public function unRegister()
+    {
+        $moduleObject = $this->getObject();
+
+        if ($this->isRegistered())
+        {
+            /**
+             * It's important to check if module class defines UnInstallDB method (it should unregister module)
+             * Thus absent UnInstallDB indicates that the module does not support automatic uninstallation
+             */
+            if ((new \ReflectionClass($moduleObject))->getMethod('UnInstallDB')->class !== get_class($moduleObject))
+            {
+                throw new Exception\ModuleUninstallException(
+                    'Missing UnInstallDB method. This module does not support automatic uninstallation',
+                    $this->name
+                );
+            }
+
+            /** @noinspection PhpVoidFunctionResultUsedInspection */
+            if (!$moduleObject->UnInstallFiles() && BitrixException::hasException())
+            {
+                throw new Exception\ModuleUninstallException(
+                    get_class($moduleObject) . '::UnInstallFiles() returned false',
+                    $this->name
+                );
+            }
+
+            $moduleObject->UnInstallEvents();
+
+            /** @noinspection PhpVoidFunctionResultUsedInspection */
+            if (!$moduleObject->UnInstallDB() && BitrixException::hasException())
+            {
+                throw new Exception\ModuleUninstallException(
+                    get_class($moduleObject) . '::UnInstallFiles() returned false',
+                    $this->name
+                );
+            }
+
+            if ($this->isRegistered())
+            {
+                throw new Exception\ModuleUninstallException('Module was not unregistered', $this->name);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Uninstall and remove module directory
+     */
+    public function remove()
+    {
+        if ($this->isRegistered())
+        {
+            $this->unRegister();
+        }
+
+        $path = getLocalPath('modules/' . $this->getName());
+
+        if ($path)
+        {
+            (new Filesystem())->remove($_SERVER['DOCUMENT_ROOT'] . $path);
+        }
+
+        unset($this->object);
+
+        return $this;
+    }
+
+    /**
+     * Update module
+     *
+     * It must be called repeatedly until the method returns false.
+     * After each call php must be restarted (new process created) to update module class and function definitions.
+     *
+     * @param array $modulesUpdated [optional]
+     * @return bool
+     */
+    public function update(&$modulesUpdated = null)
+    {
+        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.', $this->getName());
+        }
+
+        // ensures module existence
+        $this->getObject();
+
+        $errorMessage = $updateDescription = null;
+        $loadResult = \CUpdateClientPartner::LoadModulesUpdates(
+            $errorMessage,
+            $updateDescription,
+            LANGUAGE_ID,
+            $this->isBeta() ? 'N' : 'Y',
+            [$this->getName()],
+            true
+        );
+        switch ($loadResult)
+        {
+            // archive loaded
+            case "S":
+                return $this->update($modulesUpdated);
+
+            // error
+            case "E":
+                throw new Exception\ModuleUpdateException($errorMessage, $this->getName());
+
+            // finished installing updates
+            case "F":
+                return false;
+
+            // need to process loaded update
+            case 'U':
+                break;
+        }
+
+        /** @var string Temp directory with update files */
+        $updateDir = null;
+
+        if (!\CUpdateClientPartner::UnGzipArchive($updateDir, $errorMessage, true))
+        {
+            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);
+            return false;
+        }
+
+        $modulesUpdated = $updateDescr = [];
+        if (isset($updateDescription["DATA"]["#"]["ITEM"]))
+        {
+            foreach ($updateDescription["DATA"]["#"]["ITEM"] as $moduleInfo)
+            {
+                $modulesUpdated[$moduleInfo["@"]["NAME"]] = $moduleInfo["@"]["VALUE"];
+                $updateDescr[$moduleInfo["@"]["NAME"]] = $moduleInfo["@"]["DESCR"];
+            }
+        }
+
+        if (\CUpdateClientPartner::UpdateStepModules($updateDir, $errorMessage))
+        {
+            foreach ($modulesUpdated as $key => $value)
+            {
+                if (Option::set('main', 'event_log_marketplace', "Y") === "Y")
+                {
+                    \CEventLog::Log("INFO", "MP_MODULE_DOWNLOADED", "main", $key, $value);
+                }
+            }
+        }
+        else
+        {
+            throw new Exception\ModuleUpdateException('[CL04] UpdateStepModules failed. ' . $errorMessage, $this->getName());
+        }
+
+        return true;
+    }
+
+    /**
+     * Check update files
+     * 
+     * @param string $updateDir
+     */
+    protected function validateUpdate($updateDir)
+    {
+        $errorMessage = null;
+        if (!\CUpdateClientPartner::CheckUpdatability($updateDir, $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["#"];
+            }
+            throw new Exception\ModuleUpdateException($errorMessage, $this->getName());
+        }
+    }
+
+    /**
+     * Returns module name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Beta releases allowed?
+     *
+     * @return boolean
+     */
+    public function isBeta()
+    {
+        return $this->beta;
+    }
+
+    /**
+     * Set beta releases installation
+     *
+     * @param boolean $beta
+     */
+    public function setBeta($beta = true)
+    {
+        $this->beta = $beta;
+    }
+
+    public function getVersion()
+    {
+        return $this->getObject()->MODULE_VERSION;
+    }
 }
\ No newline at end of file

src/Module/Exception/ModuleException.php

Indentation +11 added lines, -11 removed lines

@@ -8,15 +8,15 @@
 
 class ModuleException extends \RuntimeException
 {
-	/**
-	 * ModuleException constructor.
-	 *
-	 * @param string $message
-	 * @param int $moduleName
-	 * @param \Exception|null $previous
-	 */
-	public function __construct($message, $moduleName, \Exception $previous = null)
-	{
-		parent::__construct("[$moduleName] " . $message, 0, $previous);
-	}
+    /**
+     * ModuleException constructor.
+     *
+     * @param string $message
+     * @param int $moduleName
+     * @param \Exception|null $previous
+     */
+    public function __construct($message, $moduleName, \Exception $previous = null)
+    {
+        parent::__construct("[$moduleName] " . $message, 0, $previous);
+    }
 }
\ No newline at end of file

src/Module/Command/ModuleCommand.php

Indentation +41 added lines, -41 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 /**
- * For the full copyright and license information, please view the LICENSE.md
- * file that was distributed with this source code.
- */
+     * For the full copyright and license information, please view the LICENSE.md
+     * file that was distributed with this source code.
+     */
 
 namespace Notamedia\ConsoleJedi\Module\Command;
 
@@ -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

src/Module/Command/RegisterCommand.php

Indentation +18 added lines, -18 removed lines

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

src/Module/Command/LoadCommand.php

Braces +1 added lines, -2 removed lines

@@ -75,8 +75,7 @@
 			try
 			{
 				$module->register();
-			}
-			catch (ModuleInstallException $e)
+			} catch (ModuleInstallException $e)
 			{
 				$output->writeln(sprintf('<comment>%s</comment>', $e->getMessage()), OutputInterface::VERBOSITY_VERBOSE);
 				$output->writeln(sprintf('Module loaded, but <error>not registered</error>. You need to do it yourself in admin panel.', $module->getName()));

Indentation +61 added lines, -61 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 /**
- * For the full copyright and license information, please view the LICENSE.md
- * file that was distributed with this source code.
- */
+     * For the full copyright and license information, please view the LICENSE.md
+     * file that was distributed with this source code.
+     */
 
 namespace Notamedia\ConsoleJedi\Module\Command;
 
@@ -20,72 +20,72 @@ 
  */
 class LoadCommand extends ModuleCommand
 {
-	use CanRestartTrait;
+    use CanRestartTrait;
 
-	/**
-	 * {@inheritdoc}
-	 */
-	protected function configure()
-	{
-		parent::configure();
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        parent::configure();
 
-		$this->setName('module:load')
-			->setDescription('Load and install module from Marketplace')
-			->addOption('no-update', 'nu', InputOption::VALUE_NONE, 'Don\' update module')
-			->addOption('no-register', 'ni', InputOption::VALUE_NONE, 'Load only, don\' register module')
-			->addOption('beta', 'b', InputOption::VALUE_NONE, 'Allow the installation of beta releases');
-	}
+        $this->setName('module:load')
+            ->setDescription('Load and install module from Marketplace')
+            ->addOption('no-update', 'nu', InputOption::VALUE_NONE, 'Don\' update module')
+            ->addOption('no-register', 'ni', InputOption::VALUE_NONE, 'Load only, don\' register module')
+            ->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'));
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $module = new Module($input->getArgument('module'));
 
-		if (!$module->isThirdParty())
-		{
-			$output->writeln('<info>Loading kernel modules is unsupported</info>');
-		}
+        if (!$module->isThirdParty())
+        {
+            $output->writeln('<info>Loading kernel modules is unsupported</info>');
+        }
 
-		if ($input->getOption('beta'))
-		{
-			$module->setBeta();
-		}
+        if ($input->getOption('beta'))
+        {
+            $module->setBeta();
+        }
 
-		$module->load();
+        $module->load();
 
-		if (!$input->getOption('no-update'))
-		{
-			$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);
-			}
-		}
+        if (!$input->getOption('no-update'))
+        {
+            $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);
+            }
+        }
 
-		if (!$input->getOption('no-register'))
-		{
-			try
-			{
-				$module->register();
-			}
-			catch (ModuleInstallException $e)
-			{
-				$output->writeln(sprintf('<comment>%s</comment>', $e->getMessage()), OutputInterface::VERBOSITY_VERBOSE);
-				$output->writeln(sprintf('Module loaded, but <error>not registered</error>. You need to do it yourself in admin panel.', $module->getName()));
-			}
-		}
+        if (!$input->getOption('no-register'))
+        {
+            try
+            {
+                $module->register();
+            }
+            catch (ModuleInstallException $e)
+            {
+                $output->writeln(sprintf('<comment>%s</comment>', $e->getMessage()), OutputInterface::VERBOSITY_VERBOSE);
+                $output->writeln(sprintf('Module loaded, but <error>not registered</error>. You need to do it yourself in admin panel.', $module->getName()));
+            }
+        }
 
-		$output->writeln(sprintf('installed <info>%s</info>', $module->getName()));
+        $output->writeln(sprintf('installed <info>%s</info>', $module->getName()));
 
-		return 0;
-	}
+        return 0;
+    }
 }
\ No newline at end of file