HOR-3688

2017-08-14 18:46:31 -04:00
parent 9ec2e50638
commit 6cfb6994fd
21 changed files with 232 additions and 263 deletions
--- a/framework/src/Maveriks/WebApplication.php
+++ b/framework/src/Maveriks/WebApplication.php
@@ -2,7 +2,7 @@
 namespace Maveriks;

 use Maveriks\Util;
-use Processmaker\Core\System;
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 use ProcessMaker\Services;
 use ProcessMaker\Services\Api;
--- a/workflow/engine/classes/model/map/PluginsRegistryMapBuilder.php
+++ b/workflow/engine/classes/model/map/PluginsRegistryMapBuilder.php
@@ -63,9 +63,7 @@ class PluginsRegistryMapBuilder
        $tMap = $this->dbMap->addTable('PLUGINS_REGISTRY');
        $tMap->setPhpName('PluginsRegistry');

-        $tMap->setUseIdGenerator(true);
-
-        $tMap->addColumn('ID', 'Id', 'int', CreoleTypes::INTEGER, true, null);
+        $tMap->setUseIdGenerator(false);

        $tMap->addPrimaryKey('PR_UID', 'PrUid', 'string', CreoleTypes::VARCHAR, true, 32);

@@ -89,9 +87,9 @@ class PluginsRegistryMapBuilder

        $tMap->addColumn('PLUGIN_VERSION', 'PluginVersion', 'string', CreoleTypes::VARCHAR, false, 50);

-        $tMap->addColumn('PLUGIN_ENABLE', 'PluginEnable', 'boolean', CreoleTypes::BOOLEAN, false, null);
+        $tMap->addColumn('PLUGIN_ENABLE', 'PluginEnable', 'int', CreoleTypes::TINYINT, false, null);

-        $tMap->addColumn('PLUGIN_PRIVATE', 'PluginPrivate', 'boolean', CreoleTypes::BOOLEAN, false, null);
+        $tMap->addColumn('PLUGIN_PRIVATE', 'PluginPrivate', 'int', CreoleTypes::TINYINT, false, null);

        $tMap->addColumn('PLUGIN_MENUS', 'PluginMenus', 'string', CreoleTypes::LONGVARCHAR, false, null);

--- a/workflow/engine/classes/model/om/BasePluginsRegistry.php
+++ b/workflow/engine/classes/model/om/BasePluginsRegistry.php
--- a/workflow/engine/classes/model/om/BasePluginsRegistryPeer.php
+++ b/workflow/engine/classes/model/om/BasePluginsRegistryPeer.php
@@ -25,15 +25,12 @@ abstract class BasePluginsRegistryPeer
    const CLASS_DEFAULT = 'classes.model.PluginsRegistry';

    /** The total number of columns. */
-    const NUM_COLUMNS = 24;
+    const NUM_COLUMNS = 23;

    /** The number of lazy-loaded columns. */
    const NUM_LAZY_LOAD_COLUMNS = 0;


-    /** the column name for the ID field */
-    const ID = 'PLUGINS_REGISTRY.ID';
-
    /** the column name for the PR_UID field */
    const PR_UID = 'PLUGINS_REGISTRY.PR_UID';

@@ -114,10 +111,10 @@ abstract class BasePluginsRegistryPeer
     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
     */
    private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('Id', 'PrUid', 'PluginNamespace', 'PluginDescription', 'PluginClassName', 'PluginFriendlyName', 'PluginFile', 'PluginFolder', 'PluginSetupPage', 'PluginCompanyLogo', 'PluginWorkspaces', 'PluginVersion', 'PluginEnable', 'PluginPrivate', 'PluginMenus', 'PluginFolders', 'PluginTriggers', 'PluginPmFunctions', 'PluginRedirectLogin', 'PluginSteps', 'PluginCss', 'PluginJs', 'PluginRestService', 'PluginAttributes', ),
-        BasePeer::TYPE_COLNAME => array (PluginsRegistryPeer::ID, PluginsRegistryPeer::PR_UID, PluginsRegistryPeer::PLUGIN_NAMESPACE, PluginsRegistryPeer::PLUGIN_DESCRIPTION, PluginsRegistryPeer::PLUGIN_CLASS_NAME, PluginsRegistryPeer::PLUGIN_FRIENDLY_NAME, PluginsRegistryPeer::PLUGIN_FILE, PluginsRegistryPeer::PLUGIN_FOLDER, PluginsRegistryPeer::PLUGIN_SETUP_PAGE, PluginsRegistryPeer::PLUGIN_COMPANY_LOGO, PluginsRegistryPeer::PLUGIN_WORKSPACES, PluginsRegistryPeer::PLUGIN_VERSION, PluginsRegistryPeer::PLUGIN_ENABLE, PluginsRegistryPeer::PLUGIN_PRIVATE, PluginsRegistryPeer::PLUGIN_MENUS, PluginsRegistryPeer::PLUGIN_FOLDERS, PluginsRegistryPeer::PLUGIN_TRIGGERS, PluginsRegistryPeer::PLUGIN_PM_FUNCTIONS, PluginsRegistryPeer::PLUGIN_REDIRECT_LOGIN, PluginsRegistryPeer::PLUGIN_STEPS, PluginsRegistryPeer::PLUGIN_CSS, PluginsRegistryPeer::PLUGIN_JS, PluginsRegistryPeer::PLUGIN_REST_SERVICE, PluginsRegistryPeer::PLUGIN_ATTRIBUTES, ),
-        BasePeer::TYPE_FIELDNAME => array ('ID', 'PR_UID', 'PLUGIN_NAMESPACE', 'PLUGIN_DESCRIPTION', 'PLUGIN_CLASS_NAME', 'PLUGIN_FRIENDLY_NAME', 'PLUGIN_FILE', 'PLUGIN_FOLDER', 'PLUGIN_SETUP_PAGE', 'PLUGIN_COMPANY_LOGO', 'PLUGIN_WORKSPACES', 'PLUGIN_VERSION', 'PLUGIN_ENABLE', 'PLUGIN_PRIVATE', 'PLUGIN_MENUS', 'PLUGIN_FOLDERS', 'PLUGIN_TRIGGERS', 'PLUGIN_PM_FUNCTIONS', 'PLUGIN_REDIRECT_LOGIN', 'PLUGIN_STEPS', 'PLUGIN_CSS', 'PLUGIN_JS', 'PLUGIN_REST_SERVICE', 'PLUGIN_ATTRIBUTES', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, )
+        BasePeer::TYPE_PHPNAME => array ('PrUid', 'PluginNamespace', 'PluginDescription', 'PluginClassName', 'PluginFriendlyName', 'PluginFile', 'PluginFolder', 'PluginSetupPage', 'PluginCompanyLogo', 'PluginWorkspaces', 'PluginVersion', 'PluginEnable', 'PluginPrivate', 'PluginMenus', 'PluginFolders', 'PluginTriggers', 'PluginPmFunctions', 'PluginRedirectLogin', 'PluginSteps', 'PluginCss', 'PluginJs', 'PluginRestService', 'PluginAttributes', ),
+        BasePeer::TYPE_COLNAME => array (PluginsRegistryPeer::PR_UID, PluginsRegistryPeer::PLUGIN_NAMESPACE, PluginsRegistryPeer::PLUGIN_DESCRIPTION, PluginsRegistryPeer::PLUGIN_CLASS_NAME, PluginsRegistryPeer::PLUGIN_FRIENDLY_NAME, PluginsRegistryPeer::PLUGIN_FILE, PluginsRegistryPeer::PLUGIN_FOLDER, PluginsRegistryPeer::PLUGIN_SETUP_PAGE, PluginsRegistryPeer::PLUGIN_COMPANY_LOGO, PluginsRegistryPeer::PLUGIN_WORKSPACES, PluginsRegistryPeer::PLUGIN_VERSION, PluginsRegistryPeer::PLUGIN_ENABLE, PluginsRegistryPeer::PLUGIN_PRIVATE, PluginsRegistryPeer::PLUGIN_MENUS, PluginsRegistryPeer::PLUGIN_FOLDERS, PluginsRegistryPeer::PLUGIN_TRIGGERS, PluginsRegistryPeer::PLUGIN_PM_FUNCTIONS, PluginsRegistryPeer::PLUGIN_REDIRECT_LOGIN, PluginsRegistryPeer::PLUGIN_STEPS, PluginsRegistryPeer::PLUGIN_CSS, PluginsRegistryPeer::PLUGIN_JS, PluginsRegistryPeer::PLUGIN_REST_SERVICE, PluginsRegistryPeer::PLUGIN_ATTRIBUTES, ),
+        BasePeer::TYPE_FIELDNAME => array ('PR_UID', 'PLUGIN_NAMESPACE', 'PLUGIN_DESCRIPTION', 'PLUGIN_CLASS_NAME', 'PLUGIN_FRIENDLY_NAME', 'PLUGIN_FILE', 'PLUGIN_FOLDER', 'PLUGIN_SETUP_PAGE', 'PLUGIN_COMPANY_LOGO', 'PLUGIN_WORKSPACES', 'PLUGIN_VERSION', 'PLUGIN_ENABLE', 'PLUGIN_PRIVATE', 'PLUGIN_MENUS', 'PLUGIN_FOLDERS', 'PLUGIN_TRIGGERS', 'PLUGIN_PM_FUNCTIONS', 'PLUGIN_REDIRECT_LOGIN', 'PLUGIN_STEPS', 'PLUGIN_CSS', 'PLUGIN_JS', 'PLUGIN_REST_SERVICE', 'PLUGIN_ATTRIBUTES', ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, )
    );

    /**
@@ -127,10 +124,10 @@ abstract class BasePluginsRegistryPeer
     * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
     */
    private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('Id' => 0, 'PrUid' => 1, 'PluginNamespace' => 2, 'PluginDescription' => 3, 'PluginClassName' => 4, 'PluginFriendlyName' => 5, 'PluginFile' => 6, 'PluginFolder' => 7, 'PluginSetupPage' => 8, 'PluginCompanyLogo' => 9, 'PluginWorkspaces' => 10, 'PluginVersion' => 11, 'PluginEnable' => 12, 'PluginPrivate' => 13, 'PluginMenus' => 14, 'PluginFolders' => 15, 'PluginTriggers' => 16, 'PluginPmFunctions' => 17, 'PluginRedirectLogin' => 18, 'PluginSteps' => 19, 'PluginCss' => 20, 'PluginJs' => 21, 'PluginRestService' => 22, 'PluginAttributes' => 23, ),
-        BasePeer::TYPE_COLNAME => array (PluginsRegistryPeer::ID => 0, PluginsRegistryPeer::PR_UID => 1, PluginsRegistryPeer::PLUGIN_NAMESPACE => 2, PluginsRegistryPeer::PLUGIN_DESCRIPTION => 3, PluginsRegistryPeer::PLUGIN_CLASS_NAME => 4, PluginsRegistryPeer::PLUGIN_FRIENDLY_NAME => 5, PluginsRegistryPeer::PLUGIN_FILE => 6, PluginsRegistryPeer::PLUGIN_FOLDER => 7, PluginsRegistryPeer::PLUGIN_SETUP_PAGE => 8, PluginsRegistryPeer::PLUGIN_COMPANY_LOGO => 9, PluginsRegistryPeer::PLUGIN_WORKSPACES => 10, PluginsRegistryPeer::PLUGIN_VERSION => 11, PluginsRegistryPeer::PLUGIN_ENABLE => 12, PluginsRegistryPeer::PLUGIN_PRIVATE => 13, PluginsRegistryPeer::PLUGIN_MENUS => 14, PluginsRegistryPeer::PLUGIN_FOLDERS => 15, PluginsRegistryPeer::PLUGIN_TRIGGERS => 16, PluginsRegistryPeer::PLUGIN_PM_FUNCTIONS => 17, PluginsRegistryPeer::PLUGIN_REDIRECT_LOGIN => 18, PluginsRegistryPeer::PLUGIN_STEPS => 19, PluginsRegistryPeer::PLUGIN_CSS => 20, PluginsRegistryPeer::PLUGIN_JS => 21, PluginsRegistryPeer::PLUGIN_REST_SERVICE => 22, PluginsRegistryPeer::PLUGIN_ATTRIBUTES => 23, ),
-        BasePeer::TYPE_FIELDNAME => array ('ID' => 0, 'PR_UID' => 1, 'PLUGIN_NAMESPACE' => 2, 'PLUGIN_DESCRIPTION' => 3, 'PLUGIN_CLASS_NAME' => 4, 'PLUGIN_FRIENDLY_NAME' => 5, 'PLUGIN_FILE' => 6, 'PLUGIN_FOLDER' => 7, 'PLUGIN_SETUP_PAGE' => 8, 'PLUGIN_COMPANY_LOGO' => 9, 'PLUGIN_WORKSPACES' => 10, 'PLUGIN_VERSION' => 11, 'PLUGIN_ENABLE' => 12, 'PLUGIN_PRIVATE' => 13, 'PLUGIN_MENUS' => 14, 'PLUGIN_FOLDERS' => 15, 'PLUGIN_TRIGGERS' => 16, 'PLUGIN_PM_FUNCTIONS' => 17, 'PLUGIN_REDIRECT_LOGIN' => 18, 'PLUGIN_STEPS' => 19, 'PLUGIN_CSS' => 20, 'PLUGIN_JS' => 21, 'PLUGIN_REST_SERVICE' => 22, 'PLUGIN_ATTRIBUTES' => 23, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, )
+        BasePeer::TYPE_PHPNAME => array ('PrUid' => 0, 'PluginNamespace' => 1, 'PluginDescription' => 2, 'PluginClassName' => 3, 'PluginFriendlyName' => 4, 'PluginFile' => 5, 'PluginFolder' => 6, 'PluginSetupPage' => 7, 'PluginCompanyLogo' => 8, 'PluginWorkspaces' => 9, 'PluginVersion' => 10, 'PluginEnable' => 11, 'PluginPrivate' => 12, 'PluginMenus' => 13, 'PluginFolders' => 14, 'PluginTriggers' => 15, 'PluginPmFunctions' => 16, 'PluginRedirectLogin' => 17, 'PluginSteps' => 18, 'PluginCss' => 19, 'PluginJs' => 20, 'PluginRestService' => 21, 'PluginAttributes' => 22, ),
+        BasePeer::TYPE_COLNAME => array (PluginsRegistryPeer::PR_UID => 0, PluginsRegistryPeer::PLUGIN_NAMESPACE => 1, PluginsRegistryPeer::PLUGIN_DESCRIPTION => 2, PluginsRegistryPeer::PLUGIN_CLASS_NAME => 3, PluginsRegistryPeer::PLUGIN_FRIENDLY_NAME => 4, PluginsRegistryPeer::PLUGIN_FILE => 5, PluginsRegistryPeer::PLUGIN_FOLDER => 6, PluginsRegistryPeer::PLUGIN_SETUP_PAGE => 7, PluginsRegistryPeer::PLUGIN_COMPANY_LOGO => 8, PluginsRegistryPeer::PLUGIN_WORKSPACES => 9, PluginsRegistryPeer::PLUGIN_VERSION => 10, PluginsRegistryPeer::PLUGIN_ENABLE => 11, PluginsRegistryPeer::PLUGIN_PRIVATE => 12, PluginsRegistryPeer::PLUGIN_MENUS => 13, PluginsRegistryPeer::PLUGIN_FOLDERS => 14, PluginsRegistryPeer::PLUGIN_TRIGGERS => 15, PluginsRegistryPeer::PLUGIN_PM_FUNCTIONS => 16, PluginsRegistryPeer::PLUGIN_REDIRECT_LOGIN => 17, PluginsRegistryPeer::PLUGIN_STEPS => 18, PluginsRegistryPeer::PLUGIN_CSS => 19, PluginsRegistryPeer::PLUGIN_JS => 20, PluginsRegistryPeer::PLUGIN_REST_SERVICE => 21, PluginsRegistryPeer::PLUGIN_ATTRIBUTES => 22, ),
+        BasePeer::TYPE_FIELDNAME => array ('PR_UID' => 0, 'PLUGIN_NAMESPACE' => 1, 'PLUGIN_DESCRIPTION' => 2, 'PLUGIN_CLASS_NAME' => 3, 'PLUGIN_FRIENDLY_NAME' => 4, 'PLUGIN_FILE' => 5, 'PLUGIN_FOLDER' => 6, 'PLUGIN_SETUP_PAGE' => 7, 'PLUGIN_COMPANY_LOGO' => 8, 'PLUGIN_WORKSPACES' => 9, 'PLUGIN_VERSION' => 10, 'PLUGIN_ENABLE' => 11, 'PLUGIN_PRIVATE' => 12, 'PLUGIN_MENUS' => 13, 'PLUGIN_FOLDERS' => 14, 'PLUGIN_TRIGGERS' => 15, 'PLUGIN_PM_FUNCTIONS' => 16, 'PLUGIN_REDIRECT_LOGIN' => 17, 'PLUGIN_STEPS' => 18, 'PLUGIN_CSS' => 19, 'PLUGIN_JS' => 20, 'PLUGIN_REST_SERVICE' => 21, 'PLUGIN_ATTRIBUTES' => 22, ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, )
    );

    /**
@@ -231,8 +228,6 @@ abstract class BasePluginsRegistryPeer
    public static function addSelectColumns(Criteria $criteria)
    {

-        $criteria->addSelectColumn(PluginsRegistryPeer::ID);
-
        $criteria->addSelectColumn(PluginsRegistryPeer::PR_UID);

        $criteria->addSelectColumn(PluginsRegistryPeer::PLUGIN_NAMESPACE);
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -5641,7 +5641,6 @@
  </table>
  <table name="PLUGINS_REGISTRY" idMethod="native">
    <!--PluginDetails-->
-    <column name="ID" type="INTEGER" required="true" autoIncrement="true" unique="true"/>
    <column name="PR_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
    <column name="PLUGIN_NAMESPACE" type="VARCHAR" size="100" required="true"/>
    <column name="PLUGIN_DESCRIPTION" type="VARCHAR" size="200" default=""/>
@@ -5666,8 +5665,5 @@
    <column name="PLUGIN_JS" type="LONGVARCHAR"/>
    <column name="PLUGIN_REST_SERVICE" type="LONGVARCHAR"/>
    <column name="PLUGIN_ATTRIBUTES" type="LONGVARCHAR"/>
-    <unique name="INDEX_PLUGINS_REGISTRY_ID">
-      <unique-column name="ID" />
-    </unique>
  </table>
 </database>
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -3153,7 +3153,6 @@ DROP TABLE IF EXISTS `PLUGINS_REGISTRY`;

 CREATE TABLE `PLUGINS_REGISTRY`
 (
-	`ID` INTEGER  NOT NULL AUTO_INCREMENT,
 	`PR_UID` VARCHAR(32) default '' NOT NULL,
 	`PLUGIN_NAMESPACE` VARCHAR(100)  NOT NULL,
 	`PLUGIN_DESCRIPTION` VARCHAR(200) default '',
@@ -3177,8 +3176,7 @@ CREATE TABLE `PLUGINS_REGISTRY`
 	`PLUGIN_JS` MEDIUMTEXT,
 	`PLUGIN_REST_SERVICE` MEDIUMTEXT,
 	`PLUGIN_ATTRIBUTES` MEDIUMTEXT,
-	PRIMARY KEY (`PR_UID`),
-	UNIQUE KEY `INDEX_PLUGINS_REGISTRY_ID` (`ID`)
+	PRIMARY KEY (`PR_UID`)
 )ENGINE=InnoDB ;
 # This restores the fkey checks, after having unset them earlier
 SET FOREIGN_KEY_CHECKS = 1;
--- a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
@@ -2,7 +2,7 @@

 namespace ProcessMaker\BusinessModel;

-use Processmaker\Core\System;
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 use PmDynaform;
 use SpoolRun;
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
@@ -5,7 +5,7 @@ use G;
 use UsersPeer;
 use CasesPeer;
 use AppDelegation;
-use Processmaker\Core\System;
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 use Exception;
 use WsBase;
--- a/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
@@ -4,7 +4,7 @@ use G;
 use Exception;
 use Bootstrap;
 use SpoolRun;
-use Processmaker\Core\System;
+use ProcessMaker\Core\System;

 class EmailServer
 {
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
@@ -7,7 +7,7 @@ use Criteria;
 use UsersPeer;
 use AppDelegationPeer;
 use AppDelayPeer;
-use Processmaker\Core\System;
+use ProcessMaker\Core\System;
 use ProcessMaker\Util\DateTime;
 use PmLicenseManager;

--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php
@@ -2,7 +2,7 @@

 namespace ProcessMaker\BusinessModel\Light;

-use Processmaker\Core\System;
+use ProcessMaker\Core\System;
 use \ProcessMaker\Services\Api;
 use G;

--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageAndroid.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageAndroid.php
@@ -13,7 +13,7 @@

 namespace ProcessMaker\BusinessModel\Light;

-use Processmaker\Core\System;
+use ProcessMaker\Core\System;

 class PushMessageAndroid
 {
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageIOS.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageIOS.php
@@ -12,7 +12,7 @@

 namespace ProcessMaker\BusinessModel\Light;

-use Processmaker\Core\System;
+use ProcessMaker\Core\System;

 class PushMessageIOS
 {
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php
@@ -2,7 +2,7 @@

 namespace ProcessMaker\BusinessModel\Migrator;

-use Processmaker\Core\System;
+use ProcessMaker\Core\System;
 use ProcessMaker\Project;
 use ProcessMaker\Util\Common;

--- a/workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php
@@ -6,7 +6,7 @@ use \Criteria;
 use \UsersPeer;
 use \GroupUserPeer;
 use \ResultSet;
-use Processmaker\Core\System;
+use ProcessMaker\Core\System;

 /**
 * @copyright Colosa - Bolivia
--- a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
@@ -1,7 +1,7 @@
 <?php
 namespace ProcessMaker\BusinessModel;

-use Processmaker\Core\System;
+use ProcessMaker\Core\System;

 class WebEntry
 {
--- a/workflow/engine/src/ProcessMaker/Core/System.php
+++ b/workflow/engine/src/ProcessMaker/Core/System.php
@@ -84,7 +84,6 @@ class System
     * for each.
     * This is a class method, it does not require an instance.
     *
-     * @author Alexandre Rosenfeld <alexandre@colosa.com>
     * @access public
     * @return array of workspace tools objects
     */
@@ -105,7 +104,6 @@ class System
     * If version-pmos.php is not found, try to
     * retrieve the version from git.
     *
-     * @author Alexandre Rosenfeld <alexandre@colosa.com>
     * @return string system
     */
    public static function getVersion()
@@ -127,7 +125,6 @@ class System
    /**
     * Get the branch and tag information from a git repository.
     *
-     * @author Alexandre Rosenfeld <alexandre@colosa.com>
     * @return string branch and tag information
     */
    public static function getVersionFromGit($dir = null)
@@ -148,7 +145,6 @@ class System
    /**
     * Get system information
     *
-     * param
     *
     * @return array with system information
     */
@@ -211,6 +207,11 @@ class System
        return $Fields;
    }

+    /**
+     * Load the po files
+     *
+     * @return array $items
+     */
    public static function listPoFiles()
    {
        $folders = glob(PATH_CORE . '/content/translations/*');
@@ -226,6 +227,11 @@ class System
        return $items;
    }

+    /**
+     * Review the checksum.txt
+     *
+     * @return array $result
+     */
    public static function verifyChecksum()
    {
        if (!file_exists(PATH_TRUNK . "checksum.txt")) {
@@ -257,10 +263,8 @@ class System
    /**
     * This function checks files to do updated to pm
     *
-     *
     * @name verifyFileForUpgrade
     *
-     * param
     * @return boolean
     */
    public function verifyFileForUpgrade()
@@ -285,11 +289,9 @@ class System
    /**
     * This function gets files to do updated to pm
     *
-     *
     * @name getUpgradedFilesList
-     *
-     * param
     * @return void
+     * @throws Exception
     */
    public function getUpgradedFilesList()
    {
@@ -312,10 +314,7 @@ class System
    /**
     * This function checks to do updated for boot
     *
-     *
     * @name verifyForBootstrapUpgrade
-     *
-     * param
     * @return boolean
     */
    public function verifyForBootstrapUpgrade()
@@ -332,11 +331,10 @@ class System
    /**
     * This function updates to the files
     *
-     *
     * @name upgrade
     *
-     * param
-     * @return array
+     * @return object
+     * @throws Exception
     */
    public function upgrade()
    {
@@ -636,10 +634,8 @@ class System
    /**
     * This function does to clean up to the upgrate directory
     *
-     *
     * @name cleanupUpgradeDirectory
     *
-     * param
     * @return array
     */
    public function cleanupUpgradeDirectory()
@@ -671,11 +667,10 @@ class System
    /**
     * This function gets info about db
     *
-     *
     * @name getDatabaseCredentials
     *
     * @param string $dbFile
-     * @return $sContent
+     * @return string $sContent
     */
    public function getDatabaseCredentials($dbFile)
    {
@@ -732,7 +727,7 @@ class System
     * Retrieves a schema array from a file.
     *
     * @param string $sSchemaFile schema filename
-     * @return $sContent
+     * @return string $sContent
     */
    public static function getSchema($sSchemaFile)
    {
@@ -845,18 +840,11 @@ class System
     */
    public static function compareSchema($aOldSchema, $aNewSchema)
    {
-        //$aChanges = array('tablesToDelete' => array(), 'tablesToAdd' => array(), 'tablesToAlter' => array());
-        //Tables to delete, but this is disabled
-        //foreach ($aOldSchema as $sTableName => $aColumns) {
-        //  if ( !isset($aNewSchema[$sTableName])) {
-        //    if (!in_array($sTableName, array('KT_APPLICATION', 'KT_DOCUMENT', 'KT_PROCESS'))) {
-        //      $aChanges['tablesToDelete'][] = $sTableName;
-        //    }
-        //  }
-        //}
-
-
-        $aChanges = array('tablesToAdd' => array(), 'tablesToAlter' => array(), 'tablesWithNewIndex' => array(), 'tablesToAlterIndex' => array()
+        $aChanges = array(
+            'tablesToAdd' => array(),
+            'tablesToAlter' => array(),
+            'tablesWithNewIndex' => array(),
+            'tablesToAlterIndex' => array()
        );

        //new tables  to create and alter
@@ -943,7 +931,6 @@ class System
                    //only columns, no the indexes column
                }
                //foreach $aColumns
-
                //now check the indexes of table
                if (isset($aNewSchema[$sTableName]['INDEXES'])) {
                    foreach ($aNewSchema[$sTableName]['INDEXES'] as $indexName => $indexFields) {
@@ -1007,6 +994,11 @@ class System
        }
    }

+    /**
+     * Get the list of skins
+     *
+     * @return array $skinListArray
+     */
    public function getSkingList()
    {
        //Create Skins custom folder if it doesn't exists
@@ -1085,11 +1077,23 @@ class System
        return $skinListArray;
    }

+    /**
+     * Get all time zones
+     *
+     * @return array $skinListArray
+     * @throws Exception
+     * @deprecated this method is deprecated
+     */
    public function getAllTimeZones()
    {
        throw new Exception(__METHOD__ . ': The method is deprecated');
    }

+    /**
+     * Get the system configuration
+     *
+     * @return array $config
+     */
    public static function getSystemConfiguration($globalIniFile = '', $wsIniFile = '', $wsName = '')
    {
        if (!is_null(self::$config)) {
@@ -1150,12 +1154,12 @@ class System
        return $config;
    }

-    /*
-    * Get information about the queries permitted and tables we can modified
-    * @access public
-    * @param string $globalIniFile
-    * @return array of execute query Black list
-    */
+    /**
+     * Get information about the queries permitted and tables we can modified
+     * @access public
+     * @param string $globalIniFile
+     * @return array of execute query Black list
+     */
    public static function getQueryBlackList($globalIniFile = '')
    {
        $config = array();
@@ -1174,6 +1178,13 @@ class System
        return $config;
    }

+    /**
+     * Update index file
+     *
+     * @param string $conf
+     * @return string $result
+     * @throws Exception
+     */
    public function updateIndexFile($conf)
    {
        if (!file_exists(PATH_HTML . 'index.html')) {
@@ -1203,6 +1214,12 @@ class System
        return $result;
    }

+    /**
+     * Get the system configuration
+     *
+     * @param string $sysName
+     * @return array $config
+     */
    public static function solrEnv($sysName = '')
    {
        if (empty($sysName)) {
@@ -1223,6 +1240,11 @@ class System
        return false;
    }

+    /**
+     * Get the instance of the class
+     *
+     * @return array $instance
+     */
    public static function getInstance()
    {
        if (is_null(self::$instance)) {
@@ -1232,6 +1254,11 @@ class System
        return self::$instance;
    }

+    /**
+     * Get if is debug mode
+     *
+     * @return array $debug
+     */
    public static function isDebugMode()
    {
        if (is_null(self::$debug)) {
@@ -1245,6 +1272,7 @@ class System
     * Get the complete name of the server host configured for requests Front-End (e.g. https://127.0.0.1:81)
     *
     * @return string Returns an string with the complete name of the server host configured for requests Front-End
+     * @throws Exception
     */
    public static function getHttpServerHostnameRequestsFrontEnd()
    {
--- a/workflow/engine/src/ProcessMaker/Exporter/Exporter.php
+++ b/workflow/engine/src/ProcessMaker/Exporter/Exporter.php
@@ -1,7 +1,7 @@
 <?php
 namespace ProcessMaker\Exporter;

-use Processmaker\Core\System;
+use ProcessMaker\Core\System;
 use ProcessMaker\Project;
 use ProcessMaker\Util;

--- a/workflow/engine/src/ProcessMaker/Project/Handler.php
+++ b/workflow/engine/src/ProcessMaker/Project/Handler.php
@@ -1,7 +1,7 @@
 <?php
 namespace ProcessMaker\Project;

-use Processmaker\Core\System;
+use ProcessMaker\Core\System;
 use ProcessMaker\Util\Logger;

 /**
--- a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
+++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
@@ -3,7 +3,7 @@ namespace ProcessMaker\Services\OAuth2;

 use Luracast\Restler\iAuthenticate;
 use Luracast\Restler\RestException;
-use Processmaker\Core\System;
+use ProcessMaker\Core\System;

 class Server implements iAuthenticate
 {
--- a/workflow/engine/src/ProcessMaker/Util/System.php
+++ b/workflow/engine/src/ProcessMaker/Util/System.php
@@ -48,10 +48,10 @@ class System
    {
        $workspaces = array();
        foreach ($args as $arg) {
-            $workspaces[] = new \workspaceTools($arg);
+            $workspaces[] = new \WorkspaceTools($arg);
        }
        if (empty($workspaces) && $includeAll) {
-            $workspaces = \System::listWorkspaces();
+            $workspaces = PmSystem::listWorkspaces();
        }
        return $workspaces;
    }