From 4d59bc2d5a512f83b6c5f57b0bae1ecdd71ebfe2 Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Wed, 2 Apr 2014 16:51:28 -0400 Subject: [PATCH] Refactoring of classes that where in workflow/engine/src , now all of them have a unique parent namespace \ProcessMaker --- framework/src/Maveriks/WebApplication.php | 13 ++-- workflow/engine/controllers/designer.php | 8 +- .../BusinessModel/Calendar.php | 8 +- .../BusinessModel/CaseScheduler.php | 8 +- .../BusinessModel/CaseTracker.php | 2 +- .../BusinessModel/CaseTrackerObject.php | 6 +- .../BusinessModel/Cases.php | 2 +- .../BusinessModel/Cases/InputDocument.php | 6 +- .../BusinessModel/Cases/OutputDocument.php | 12 +-- .../BusinessModel/DataBaseConnection.php | 2 +- .../BusinessModel/Department.php | 2 +- .../BusinessModel/DynaForm.php | 10 +-- .../BusinessModel/Event.php | 2 +- .../BusinessModel/FilesManager.php | 2 +- .../BusinessModel/Group.php | 10 +-- .../BusinessModel/Group/User.php | 10 +-- .../BusinessModel/InputDocument.php | 6 +- .../BusinessModel/OutputDocument.php | 8 +- .../BusinessModel/Process.php | 22 +++--- .../BusinessModel/ProcessCategory.php | 4 +- .../BusinessModel/ProcessPermissions.php | 2 +- .../BusinessModel/ProcessSupervisor.php | 2 +- .../BusinessModel/ProjectUser.php | 2 +- .../{ => ProcessMaker}/BusinessModel/Step.php | 10 +-- .../BusinessModel/Step/Trigger.php | 8 +- .../BusinessModel/Subprocess.php | 2 +- .../BusinessModel/Table.php | 2 +- .../{ => ProcessMaker}/BusinessModel/Task.php | 4 +- .../BusinessModel/Trigger.php | 2 +- .../BusinessModel/TriggerWizard.php | 16 ++-- .../{ => ProcessMaker}/BusinessModel/User.php | 2 +- .../BusinessModel/Validator.php | 2 +- .../BusinessModel/WebEntry.php | 16 ++-- .../engine/src/ProcessMaker/Services/Api.php | 2 +- .../engine/src/ProcessMaker/Services/api.ini | 74 +++++++++++++++++++ workflow/engine/src/Services/api.ini | 74 ------------------- .../src/Tests/BusinessModel/CalendarTest.php | 2 +- .../BusinessModel/CasesActionTest13_17.php | 54 +++++++------- .../src/Tests/BusinessModel/CasesTest.php | 54 +++++++------- .../Tests/BusinessModel/DepartmentTest.php | 34 ++++----- .../BusinessModel/InputDocumentsCasesTest.php | 8 +- .../OutputDocumentsCasesTest.php | 10 +-- .../BusinessModel/ProcessCategoryTest.php | 2 +- 43 files changed, 264 insertions(+), 263 deletions(-) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/Calendar.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/CaseScheduler.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/CaseTracker.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/CaseTrackerObject.php (98%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/Cases.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/Cases/InputDocument.php (98%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/Cases/OutputDocument.php (98%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/DataBaseConnection.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/Department.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/DynaForm.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/Event.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/FilesManager.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/Group.php (98%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/Group/User.php (95%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/InputDocument.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/OutputDocument.php (98%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/Process.php (98%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/ProcessCategory.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/ProcessPermissions.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/ProcessSupervisor.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/ProjectUser.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/Step.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/Step/Trigger.php (98%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/Subprocess.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/Table.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/Task.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/Trigger.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/TriggerWizard.php (98%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/User.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/Validator.php (99%) rename workflow/engine/src/{ => ProcessMaker}/BusinessModel/WebEntry.php (98%) create mode 100644 workflow/engine/src/ProcessMaker/Services/api.ini delete mode 100644 workflow/engine/src/Services/api.ini diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php index 13c104749..81e13a50d 100644 --- a/framework/src/Maveriks/WebApplication.php +++ b/framework/src/Maveriks/WebApplication.php @@ -142,13 +142,13 @@ class WebApplication header('Access-Control-Allow-Origin: *'); // $servicesDir contains directory where Services Classes are allocated - $servicesDir = $this->workflowDir . 'engine' . DS . 'src' . DS . 'Services' . DS; + $servicesDir = $this->workflowDir . 'engine' . DS . 'src' . DS . 'ProcessMaker' . DS . 'Services' . DS; // $apiDir - contains directory to scan classes and add them to Restler $apiDir = $servicesDir . 'Api' . DS; // $apiIniFile - contains file name of api ini configuration $apiIniFile = $servicesDir . DS . 'api.ini'; // $authenticationClass - contains the class name that validate the authentication for Restler - $authenticationClass = 'Services\\Api\\OAuth2\\Server'; + $authenticationClass = 'ProcessMaker\\Services\\OAuth2\\Server'; // $pmOauthClientId - contains PM Local OAuth Id (Web Designer) $pmOauthClientId = 'x-pm-local-client'; @@ -179,10 +179,10 @@ class WebApplication // Setting database connection source list($host, $port) = strpos(DB_HOST, ':') !== false ? explode(':', DB_HOST) : array(DB_HOST, ''); $port = empty($port) ? '' : ";port=$port"; - \Services\Api\OAuth2\Server::setDatabaseSource(DB_USER, DB_PASS, DB_ADAPTER.":host=$host;dbname=".DB_NAME.$port); + \ProcessMaker\Services\OAuth2\Server::setDatabaseSource(DB_USER, DB_PASS, DB_ADAPTER.":host=$host;dbname=".DB_NAME.$port); // Setting default OAuth Client id, for local PM Web Designer - \Services\Api\OAuth2\Server::setPmClientId($pmOauthClientId); + \ProcessMaker\Services\OAuth2\Server::setPmClientId($pmOauthClientId); require_once $this->workflowDir . "engine/src/Extension/Restler/UploadFormat.php"; //require_once PATH_CORE @@ -212,17 +212,18 @@ class WebApplication foreach ($classesList as $classFile) { if (pathinfo($classFile, PATHINFO_EXTENSION) === 'php') { - $namespace = '\\Services\\' . str_replace( + $namespace = '\\ProcessMaker\\Services\\' . str_replace( DIRECTORY_SEPARATOR, '\\', str_replace('.php', '', str_replace($servicesDir, '', $classFile)) ); - //var_dump($namespace); + //var_dump($namespace); die; $rest->addAPIClass($namespace); } } // adding aliases for Restler + //print_r($apiIniConf); if (array_key_exists('alias', $apiIniConf)) { foreach ($apiIniConf['alias'] as $alias => $aliasData) { if (is_array($aliasData)) { diff --git a/workflow/engine/controllers/designer.php b/workflow/engine/controllers/designer.php index af0a5750c..0bdff090c 100644 --- a/workflow/engine/controllers/designer.php +++ b/workflow/engine/controllers/designer.php @@ -78,16 +78,16 @@ class Designer extends Controller protected function getClientCredentials() { - $oauthQuery = new Services\Api\OAuth2\PmPdo($this->getDsn()); + $oauthQuery = new ProcessMaker\Services\OAuth2\PmPdo($this->getDsn()); return $oauthQuery->getClientDetails($this->clientId); } protected function getAuthorizationCode($client) { - \Services\Api\OAuth2\Server::setDatabaseSource($this->getDsn()); - \Services\Api\OAuth2\Server::setPmClientId($client['CLIENT_ID']); + \ProcessMaker\Services\OAuth2\Server::setDatabaseSource($this->getDsn()); + \ProcessMaker\Services\OAuth2\Server::setPmClientId($client['CLIENT_ID']); - $oauthServer = new \Services\Api\OAuth2\Server(); + $oauthServer = new \ProcessMaker\Services\OAuth2\Server(); $userId = $_SESSION['USER_LOGGED']; $authorize = true; $_GET = array_merge($_GET, array( diff --git a/workflow/engine/src/BusinessModel/Calendar.php b/workflow/engine/src/ProcessMaker/BusinessModel/Calendar.php similarity index 99% rename from workflow/engine/src/BusinessModel/Calendar.php rename to workflow/engine/src/ProcessMaker/BusinessModel/Calendar.php index cbb0e3862..54886cb52 100644 --- a/workflow/engine/src/BusinessModel/Calendar.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Calendar.php @@ -1,5 +1,5 @@ throwExceptionIfDataNotMetFieldDefinition($arrayData, $this->arrayFieldDefinition, $this->arrayFieldNameForException, true); @@ -364,7 +364,7 @@ class Calendar $arrayData = \G::array_change_key_case2($arrayData, CASE_UPPER); //Verify data - $process = new \BusinessModel\Process(); + $process = new \ProcessMaker\BusinessModel\Process(); $this->throwExceptionIfNotExistsCalendar($calendarUid, $this->arrayFieldNameForException["calendarUid"]); @@ -576,7 +576,7 @@ class Calendar $arrayCalendar = array(); //Verify data - $process = new \BusinessModel\Process(); + $process = new \ProcessMaker\BusinessModel\Process(); $process->throwExceptionIfDataNotMetPagerVarDefinition(array("start" => $start, "limit" => $limit), $this->arrayFieldNameForException); diff --git a/workflow/engine/src/BusinessModel/CaseScheduler.php b/workflow/engine/src/ProcessMaker/BusinessModel/CaseScheduler.php similarity index 99% rename from workflow/engine/src/BusinessModel/CaseScheduler.php rename to workflow/engine/src/ProcessMaker/BusinessModel/CaseScheduler.php index 35e44225b..8c0abd98f 100644 --- a/workflow/engine/src/BusinessModel/CaseScheduler.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/CaseScheduler.php @@ -1,5 +1,5 @@ existsObjectUid($arrayData["CTO_TYPE_OBJ"], $arrayData["CTO_UID_OBJ"]); @@ -156,7 +156,7 @@ class CaseTrackerObject } if (isset($arrayData["CTO_TYPE_OBJ"]) && isset($arrayData["CTO_UID_OBJ"])) { - $step = new \BusinessModel\Step(); + $step = new \ProcessMaker\BusinessModel\Step(); $msg = $step->existsObjectUid($arrayData["CTO_TYPE_OBJ"], $arrayData["CTO_UID_OBJ"]); diff --git a/workflow/engine/src/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php similarity index 99% rename from workflow/engine/src/BusinessModel/Cases.php rename to workflow/engine/src/ProcessMaker/BusinessModel/Cases.php index 6614d8035..ca3efc8fd 100644 --- a/workflow/engine/src/BusinessModel/Cases.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php @@ -1,5 +1,5 @@ loadCase( $sApplicationUID ); $sProcessUID = $fields['PRO_UID']; $sTaskUID = ''; - $oCaseRest = new \BusinessModel\Cases(); + $oCaseRest = new \ProcessMaker\BusinessModel\Cases(); $oCaseRest->getAllUploadedDocumentsCriteria( $sProcessUID, $sApplicationUID, $sTaskUID, $sUserUID); $result = array (); global $_DBArray; @@ -65,7 +65,7 @@ class InputDocument $fields = $oCase->loadCase( $sApplicationUID ); $sProcessUID = $fields['PRO_UID']; $sTaskUID = ''; - $oCaseRest = new \BusinessModel\Cases(); + $oCaseRest = new \ProcessMaker\BusinessModel\Cases(); $oCaseRest->getAllUploadedDocumentsCriteria( $sProcessUID, $sApplicationUID, $sTaskUID, $sUserUID ); $result = array (); global $_DBArray; diff --git a/workflow/engine/src/BusinessModel/Cases/OutputDocument.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/OutputDocument.php similarity index 98% rename from workflow/engine/src/BusinessModel/Cases/OutputDocument.php rename to workflow/engine/src/ProcessMaker/BusinessModel/Cases/OutputDocument.php index 0e3d578c6..c47497f25 100644 --- a/workflow/engine/src/BusinessModel/Cases/OutputDocument.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/OutputDocument.php @@ -1,5 +1,5 @@ loadCase( $applicationUid ); $sProcessUID = $fields['PRO_UID']; $sTaskUID = ''; - $oCriteria = new \BusinessModel\Cases(); + $oCriteria = new \ProcessMaker\BusinessModel\Cases(); $oCriteria->getAllGeneratedDocumentsCriteria( $sProcessUID, $applicationUid, $sTaskUID, $userUid); $result = array (); global $_DBArray; @@ -63,7 +63,7 @@ class OutputDocument $fields = $oCase->loadCase( $sApplicationUID ); $sProcessUID = $fields['PRO_UID']; $sTaskUID = ''; - $oCaseRest = new \BusinessModel\Cases(); + $oCaseRest = new \ProcessMaker\BusinessModel\Cases(); $oCaseRest->getAllGeneratedDocumentsCriteria( $sProcessUID, $sApplicationUID, $sTaskUID, $sUserUID ); $result = array (); global $_DBArray; @@ -498,11 +498,11 @@ class OutputDocument ); } $g_media->set_security($GLOBALS['g_config']['pdfSecurity']); - require_once (HTML2PS_DIR . 'pdf.fpdf.encryption.php'); + require_once(HTML2PS_DIR . 'pdf.fpdf.encryption.php'); } $pipeline = new \Pipeline(); if (extension_loaded('curl')) { - require_once (HTML2PS_DIR . 'fetcher.url.curl.class.php'); + require_once(HTML2PS_DIR . 'fetcher.url.curl.class.php'); $pipeline->fetchers = array(new \FetcherURLCurl()); if (isset($proxy)) { if ($proxy != '') { @@ -510,7 +510,7 @@ class OutputDocument } } } else { - require_once (HTML2PS_DIR . 'fetcher.url.class.php'); + require_once(HTML2PS_DIR . 'fetcher.url.class.php'); $pipeline->fetchers[] = new \FetcherURL(); } $pipeline->data_filters[] = new \DataFilterDoctype(); diff --git a/workflow/engine/src/BusinessModel/DataBaseConnection.php b/workflow/engine/src/ProcessMaker/BusinessModel/DataBaseConnection.php similarity index 99% rename from workflow/engine/src/BusinessModel/DataBaseConnection.php rename to workflow/engine/src/ProcessMaker/BusinessModel/DataBaseConnection.php index 60d885fbb..c1765a4bf 100644 --- a/workflow/engine/src/BusinessModel/DataBaseConnection.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/DataBaseConnection.php @@ -1,5 +1,5 @@ throwExceptionIfNotExistsProcess($processUid, $this->arrayFieldNameForException["processUid"]); @@ -412,7 +412,7 @@ class DynaForm $processUid = $arrayDynaFormData["PRO_UID"]; //Verify data - $process = new \BusinessModel\Process(); + $process = new \ProcessMaker\BusinessModel\Process(); $process->throwExceptionIfDataNotMetFieldDefinition($arrayData, $this->arrayFieldDefinition, $this->arrayFieldNameForException, false); @@ -505,7 +505,7 @@ class DynaForm unset($arrayData["PMTABLE"]); //Verify data - $process = new \BusinessModel\Process(); + $process = new \ProcessMaker\BusinessModel\Process(); $process->throwExceptionIfNotExistsProcess($processUid, $this->arrayFieldNameForException["processUid"]); @@ -708,7 +708,7 @@ class DynaForm unset($arrayData["COPY_IMPORT"]); //Verify data - $process = new \BusinessModel\Process(); + $process = new \ProcessMaker\BusinessModel\Process(); $process->throwExceptionIfNotExistsProcess($processUid, $this->arrayFieldNameForException["processUid"]); diff --git a/workflow/engine/src/BusinessModel/Event.php b/workflow/engine/src/ProcessMaker/BusinessModel/Event.php similarity index 99% rename from workflow/engine/src/BusinessModel/Event.php rename to workflow/engine/src/ProcessMaker/BusinessModel/Event.php index 75b02237a..6b3e6baaf 100644 --- a/workflow/engine/src/BusinessModel/Event.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Event.php @@ -1,5 +1,5 @@ diff --git a/workflow/engine/src/BusinessModel/FilesManager.php b/workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php similarity index 99% rename from workflow/engine/src/BusinessModel/FilesManager.php rename to workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php index dcc719f6a..fc7205805 100644 --- a/workflow/engine/src/BusinessModel/FilesManager.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php @@ -1,5 +1,5 @@ throwExceptionIfDataNotMetFieldDefinition($arrayData, $this->arrayFieldDefinition, $this->arrayFieldNameForException, true); @@ -227,7 +227,7 @@ class Group $arrayData = array_change_key_case($arrayData, CASE_UPPER); //Verify data - $process = new \BusinessModel\Process(); + $process = new \ProcessMaker\BusinessModel\Process(); $this->throwExceptionIfNotExistsGroup($groupUid, $this->arrayFieldNameForException["groupUid"]); @@ -459,7 +459,7 @@ class Group $arrayGroup = array(); //Verify data - $process = new \BusinessModel\Process(); + $process = new \ProcessMaker\BusinessModel\Process(); $process->throwExceptionIfDataNotMetPagerVarDefinition(array("start" => $start, "limit" => $limit), $this->arrayFieldNameForException); @@ -671,7 +671,7 @@ class Group $arrayUser = array(); //Verify data - $process = new \BusinessModel\Process(); + $process = new \ProcessMaker\BusinessModel\Process(); $this->throwExceptionIfNotExistsGroup($groupUid, $this->arrayFieldNameForException["groupUid"]); diff --git a/workflow/engine/src/BusinessModel/Group/User.php b/workflow/engine/src/ProcessMaker/BusinessModel/Group/User.php similarity index 95% rename from workflow/engine/src/BusinessModel/Group/User.php rename to workflow/engine/src/ProcessMaker/BusinessModel/Group/User.php index d7f779f5e..d2de2b6aa 100644 --- a/workflow/engine/src/BusinessModel/Group/User.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Group/User.php @@ -1,5 +1,5 @@ throwExceptionIfNotExistsGroup($groupUid, $this->arrayFieldNameForException["groupUid"]); @@ -185,8 +185,8 @@ class User { try { //Verify data - $process = new \BusinessModel\Process(); - $group = new \BusinessModel\Group(); + $process = new \ProcessMaker\BusinessModel\Process(); + $group = new \ProcessMaker\BusinessModel\Group(); $group->throwExceptionIfNotExistsGroup($groupUid, $this->arrayFieldNameForException["groupUid"]); diff --git a/workflow/engine/src/BusinessModel/InputDocument.php b/workflow/engine/src/ProcessMaker/BusinessModel/InputDocument.php similarity index 99% rename from workflow/engine/src/BusinessModel/InputDocument.php rename to workflow/engine/src/ProcessMaker/BusinessModel/InputDocument.php index 22a37d89b..1660fa273 100644 --- a/workflow/engine/src/BusinessModel/InputDocument.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/InputDocument.php @@ -1,5 +1,5 @@ throwExceptionIfNotExistsProcess($processUid, $this->arrayFieldNameForException["processUid"]); @@ -278,7 +278,7 @@ class InputDocument $processUid = $arrayInputDocumentData["PRO_UID"]; //Verify data - $process = new \BusinessModel\Process(); + $process = new \ProcessMaker\BusinessModel\Process(); $process->throwExceptionIfDataNotMetFieldDefinition($arrayData, $this->arrayFieldDefinition, $this->arrayFieldNameForException, false); diff --git a/workflow/engine/src/BusinessModel/OutputDocument.php b/workflow/engine/src/ProcessMaker/BusinessModel/OutputDocument.php similarity index 98% rename from workflow/engine/src/BusinessModel/OutputDocument.php rename to workflow/engine/src/ProcessMaker/BusinessModel/OutputDocument.php index a97cb6a2e..b1e66c469 100644 --- a/workflow/engine/src/BusinessModel/OutputDocument.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/OutputDocument.php @@ -1,5 +1,5 @@ load( $sOutputDocumentUID ); diff --git a/workflow/engine/src/BusinessModel/Process.php b/workflow/engine/src/ProcessMaker/BusinessModel/Process.php similarity index 98% rename from workflow/engine/src/BusinessModel/Process.php rename to workflow/engine/src/ProcessMaker/BusinessModel/Process.php index 16621b58b..ab22db6da 100644 --- a/workflow/engine/src/BusinessModel/Process.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Process.php @@ -1,5 +1,5 @@ throwExceptionIfNotExistsCalendar($arrayData["PRO_CALENDAR"], $this->arrayFieldNameForException["processCalendar"]); } @@ -530,7 +530,7 @@ class Process } if (isset($arrayData["PRO_SUMMARY_DYNAFORM"]) && $arrayData["PRO_SUMMARY_DYNAFORM"] . "" != "") { - $dynaForm = new \BusinessModel\DynaForm(); + $dynaForm = new \ProcessMaker\BusinessModel\DynaForm(); $dynaForm->throwExceptionIfNotExistsDynaForm($arrayData["PRO_SUMMARY_DYNAFORM"], $processUid, $this->arrayFieldNameForException["processSummaryDynaform"]); } @@ -539,7 +539,7 @@ class Process $this->throwExceptionIfNotExistsRoutingScreenTemplate($processUid, $arrayData["PRO_DERIVATION_SCREEN_TPL"], $this->arrayFieldNameForException["processDerivationScreenTpl"]); } - $trigger = new \BusinessModel\Trigger(); + $trigger = new \ProcessMaker\BusinessModel\Trigger(); if (isset($arrayData["PRO_TRI_DELETED"]) && $arrayData["PRO_TRI_DELETED"] . "" != "") { $trigger->throwExceptionIfNotExistsTrigger($arrayData["PRO_TRI_DELETED"], $processUid, $this->arrayFieldNameForException["processTriDeleted"]); @@ -826,7 +826,7 @@ class Process $arrayDefineProcessData["process"]["tasks"][$index]["TAS_UID_OLD"] = $uidAux; //Update task properties - $task2 = new \BusinessModel\Task(); + $task2 = new \ProcessMaker\BusinessModel\Task(); $arrayResult = $task2->updateProperties($taskUid, $processUid, $arrayData); @@ -842,7 +842,7 @@ class Process $result = $task->update($arrayData); //Update task properties - $task2 = new \BusinessModel\Task(); + $task2 = new \ProcessMaker\BusinessModel\Task(); $arrayResult = $task2->updateProperties($arrayData["TAS_UID"], $processUid, $arrayData); break; @@ -1390,7 +1390,7 @@ class Process $this->throwExceptionIfNotExistsProcess($processUid, $this->arrayFieldNameForException["processUid"]); //Get data - $dynaForm = new \BusinessModel\DynaForm(); + $dynaForm = new \ProcessMaker\BusinessModel\DynaForm(); $dynaForm->setFormatFieldNameInUppercase($this->formatFieldNameInUppercase); $dynaForm->setArrayFieldNameForException($this->arrayFieldNameForException); @@ -1431,7 +1431,7 @@ class Process $this->throwExceptionIfNotExistsProcess($processUid, $this->arrayFieldNameForException["processUid"]); //Get data - $inputDocument = new \BusinessModel\InputDocument(); + $inputDocument = new \ProcessMaker\BusinessModel\InputDocument(); $inputDocument->setFormatFieldNameInUppercase($this->formatFieldNameInUppercase); $inputDocument->setArrayFieldNameForException($this->arrayFieldNameForException); @@ -1470,7 +1470,7 @@ class Process //Verify data //Get data - $webEntry = new \BusinessModel\WebEntry(); + $webEntry = new \ProcessMaker\BusinessModel\WebEntry(); $webEntry->setFormatFieldNameInUppercase($this->formatFieldNameInUppercase); $webEntry->setArrayFieldNameForException($this->arrayFieldNameForException); @@ -1575,7 +1575,7 @@ class Process break; case "GRIDVARS": //Verify data - $dynaForm = new \BusinessModel\DynaForm(); + $dynaForm = new \ProcessMaker\BusinessModel\DynaForm(); $dynaForm->throwExceptionIfNotExistsDynaForm($gridUid, $processUid, $this->arrayFieldNameForException["gridUid"]); $dynaForm->throwExceptionIfNotIsGridDynaForm($gridUid, $this->arrayFieldNameForException["gridUid"]); @@ -1622,7 +1622,7 @@ class Process //Get data \G::LoadClass("triggerLibrary"); - $triggerWizard = new \BusinessModel\TriggerWizard(); + $triggerWizard = new \ProcessMaker\BusinessModel\TriggerWizard(); $triggerWizard->setFormatFieldNameInUppercase($this->formatFieldNameInUppercase); $triggerWizard->setArrayFieldNameForException($this->arrayFieldNameForException); diff --git a/workflow/engine/src/BusinessModel/ProcessCategory.php b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessCategory.php similarity index 99% rename from workflow/engine/src/BusinessModel/ProcessCategory.php rename to workflow/engine/src/ProcessMaker/BusinessModel/ProcessCategory.php index 5ceb1502f..0225abc19 100644 --- a/workflow/engine/src/BusinessModel/ProcessCategory.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessCategory.php @@ -1,5 +1,5 @@ throwExceptionIfDataNotMetPagerVarDefinition(array("start" => $start, "limit" => $limit), $this->arrayFieldNameForException); diff --git a/workflow/engine/src/BusinessModel/ProcessPermissions.php b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessPermissions.php similarity index 99% rename from workflow/engine/src/BusinessModel/ProcessPermissions.php rename to workflow/engine/src/ProcessMaker/BusinessModel/ProcessPermissions.php index 585a2f264..bc42f9b1b 100644 --- a/workflow/engine/src/BusinessModel/ProcessPermissions.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessPermissions.php @@ -1,5 +1,5 @@ setFormatFieldNameInUppercase($this->formatFieldNameInUppercase); $step->setArrayParamException($this->arrayParamException); @@ -650,7 +650,7 @@ class Step } //Get data - $trigger = new \BusinessModel\Trigger(); + $trigger = new \ProcessMaker\BusinessModel\Trigger(); $flagStepAssignTask = 0; @@ -765,8 +765,8 @@ class Step } //Get data - $bmTrigger = new \BusinessModel\Trigger(); - $bmStepTrigger = new \BusinessModel\Step\Trigger(); + $bmTrigger = new \ProcessMaker\BusinessModel\Trigger(); + $bmStepTrigger = new \ProcessMaker\BusinessModel\Step\Trigger(); $stepTrigger = new \StepTrigger(); diff --git a/workflow/engine/src/BusinessModel/Step/Trigger.php b/workflow/engine/src/ProcessMaker/BusinessModel/Step/Trigger.php similarity index 98% rename from workflow/engine/src/BusinessModel/Step/Trigger.php rename to workflow/engine/src/ProcessMaker/BusinessModel/Step/Trigger.php index efdc11b15..f66a0c17f 100644 --- a/workflow/engine/src/BusinessModel/Step/Trigger.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Step/Trigger.php @@ -1,7 +1,7 @@ getTriggerCriteria(); @@ -373,7 +373,7 @@ class Trigger * @return void */ public function moveStepTriggers($tasUid, $stepUid, $triUid, $type, $newPos) { - $stepTrigger = new \BusinessModel\Step(); + $stepTrigger = new \ProcessMaker\BusinessModel\Step(); $tempStep = $stepUid; $typeCompare = $type; if ($tempStep == '-1' || $tempStep == '-2') { diff --git a/workflow/engine/src/BusinessModel/Subprocess.php b/workflow/engine/src/ProcessMaker/BusinessModel/Subprocess.php similarity index 99% rename from workflow/engine/src/BusinessModel/Subprocess.php rename to workflow/engine/src/ProcessMaker/BusinessModel/Subprocess.php index f2f327c4a..46c40c785 100644 --- a/workflow/engine/src/BusinessModel/Subprocess.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Subprocess.php @@ -1,5 +1,5 @@ setFormatFieldNameInUppercase($this->formatFieldNameInUppercase); $step->setArrayParamException($this->arrayParamException); diff --git a/workflow/engine/src/BusinessModel/Trigger.php b/workflow/engine/src/ProcessMaker/BusinessModel/Trigger.php similarity index 99% rename from workflow/engine/src/BusinessModel/Trigger.php rename to workflow/engine/src/ProcessMaker/BusinessModel/Trigger.php index 5ae6bcdac..8b1fc7870 100644 --- a/workflow/engine/src/BusinessModel/Trigger.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Trigger.php @@ -1,5 +1,5 @@ throwExceptionIfNotExistsMethodInLibrary($libraryName, $methodName, $libraryFieldNameForException, $methodFieldNameForException); - $trigger = new \BusinessModel\Trigger(); + $trigger = new \ProcessMaker\BusinessModel\Trigger(); $trigger->throwExceptionIfNotExistsTrigger($triggerUid, "", $triggerUidFieldNameForException); @@ -303,7 +303,7 @@ class TriggerWizard array("paramDefinition" => $arrayMethodOutputParam, "paramData" => (isset($arrayParamData["output"]))? $arrayParamData["output"] : array()) ); - $process = new \BusinessModel\Process(); + $process = new \ProcessMaker\BusinessModel\Process(); foreach ($arrayVerify as $key1 => $value1) { if (count($value1["paramDefinition"]) > 0) { @@ -491,7 +491,7 @@ class TriggerWizard //Verify data $this->throwExceptionIfNotExistsMethodInLibrary($libraryName, $methodName, $this->arrayFieldNameForException["libraryName"], $this->arrayFieldNameForException["methodName"]); - $trigger = new \BusinessModel\Trigger(); + $trigger = new \ProcessMaker\BusinessModel\Trigger(); $trigger->throwExceptionIfNotExistsTrigger($triggerUid, "", $this->arrayFieldNameForException["triggerUid"]); @@ -671,8 +671,8 @@ class TriggerWizard $arrayData = array_change_key_case($arrayData, CASE_UPPER); //Verify data - $process = new \BusinessModel\Process(); - $trigger = new \BusinessModel\Trigger(); + $process = new \ProcessMaker\BusinessModel\Process(); + $trigger = new \ProcessMaker\BusinessModel\Trigger(); $this->throwExceptionIfNotExistsMethodInLibrary($libraryName, $methodName, $this->arrayFieldNameForException["libraryName"], $this->arrayFieldNameForException["methodName"]); @@ -745,8 +745,8 @@ class TriggerWizard $processUid = $arrayTriggerData["PRO_UID"]; //Verify data - $process = new \BusinessModel\Process(); - $trigger = new \BusinessModel\Trigger(); + $process = new \ProcessMaker\BusinessModel\Process(); + $trigger = new \ProcessMaker\BusinessModel\Trigger(); $process->throwExceptionIfDataNotMetFieldDefinition($arrayData, $this->arrayFieldDefinition, $this->arrayFieldNameForException, false); diff --git a/workflow/engine/src/BusinessModel/User.php b/workflow/engine/src/ProcessMaker/BusinessModel/User.php similarity index 99% rename from workflow/engine/src/BusinessModel/User.php rename to workflow/engine/src/ProcessMaker/BusinessModel/User.php index baf8282b3..95fd73aa1 100644 --- a/workflow/engine/src/BusinessModel/User.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/User.php @@ -1,5 +1,5 @@ throwExceptionIfNotExistsProcess($processUid, $this->arrayFieldNameForException["processUid"]); @@ -158,7 +158,7 @@ class WebEntry } if ($dynaFormUid != "") { - $dynaForm = new \BusinessModel\DynaForm(); + $dynaForm = new \ProcessMaker\BusinessModel\DynaForm(); $dynaForm->throwExceptionIfNotExistsDynaForm($dynaFormUid, $processUid, $this->arrayFieldNameForException["dynaFormUid"]); } @@ -170,7 +170,7 @@ class WebEntry $task = new \Task(); $dynaForm = new \Dynaform(); - $step = new \BusinessModel\Step(); + $step = new \ProcessMaker\BusinessModel\Step(); $arrayDirFile = scandir($webEntryPath); //Ascending Order @@ -277,13 +277,13 @@ class WebEntry $arrayData = array_change_key_case($arrayData, CASE_UPPER); //Verify data - $process = new \BusinessModel\Process(); + $process = new \ProcessMaker\BusinessModel\Process(); $process->throwExceptionIfNotExistsProcess($processUid, $this->arrayFieldNameForException["processUid"]); $process->throwExceptionIfDataNotMetFieldDefinition($arrayData, $this->arrayFieldDefinition, $this->arrayFieldNameForException, true); - $projectUser = new \BusinessModel\ProjectUser(); + $projectUser = new \ProcessMaker\BusinessModel\ProjectUser(); if ($arrayData["METHOD"] == "WS") { $process->throwExceptionIfDataNotMetFieldDefinition($arrayData, $this->arrayUserFieldDefinition, $this->arrayFieldNameForException, true); @@ -297,7 +297,7 @@ class WebEntry $process->throwExceptionIfNotExistsTask($processUid, $arrayData["TAS_UID"], $this->arrayFieldNameForException["taskUid"]); - $dynaForm = new \BusinessModel\DynaForm(); + $dynaForm = new \ProcessMaker\BusinessModel\DynaForm(); $dynaForm->throwExceptionIfNotExistsDynaForm($arrayData["DYN_UID"], $processUid, $this->arrayFieldNameForException["dynaFormUid"]); @@ -327,7 +327,7 @@ class WebEntry $arrayDynaFormData = $dynaForm->Load($arrayData["DYN_UID"]); - $step = new \BusinessModel\Step(); + $step = new \ProcessMaker\BusinessModel\Step(); if (!$step->existsRecord($arrayData["TAS_UID"], "DYNAFORM", $arrayData["DYN_UID"])) { throw (new \Exception(str_replace(array("{0}", "{1}"), array($arrayDynaFormData["DYN_TITLE"], $arrayTaskData["TAS_TITLE"]), "The DynaForm \"{0}\" isn't assigned to the task \"{1}\""))); diff --git a/workflow/engine/src/ProcessMaker/Services/Api.php b/workflow/engine/src/ProcessMaker/Services/Api.php index 0bca4307f..bcaf29d00 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api.php +++ b/workflow/engine/src/ProcessMaker/Services/Api.php @@ -39,7 +39,7 @@ abstract class Api public function getUserId() { - return \Services\Api\OAuth2\Server::getUserId(); + return \ProcessMaker\Services\OAuth2\Server::getUserId(); } } diff --git a/workflow/engine/src/ProcessMaker/Services/api.ini b/workflow/engine/src/ProcessMaker/Services/api.ini new file mode 100644 index 000000000..85717c3b0 --- /dev/null +++ b/workflow/engine/src/ProcessMaker/Services/api.ini @@ -0,0 +1,74 @@ +; +; API Rest Configuration File +; + +debug = 1 + +[api] + version = 1.0 + vendor = "ProcessMaker - Michelangelo (Enterprise)" + +[alias: test] + test2 = "ProcessMaker\Services\Api\Test2" + test3 = "ProcessMaker\Services\Api\Test3" + +[alias: project] + activity = "ProcessMaker\Services\Api\Project\Activity" + step = "ProcessMaker\Services\Api\Project\Activity\Step" + assignee = "ProcessMaker\Services\Api\Project\Activity\Assignee" + trigger = "ProcessMaker\Services\Api\Project\Activity\Step\Trigger" + project = "ProcessMaker\Services\Api\Project" + trigger2 = "ProcessMaker\Services\Api\Project\Trigger" + event = "ProcessMaker\Services\Api\Project\Event" + dynaform = "ProcessMaker\Services\Api\Project\DynaForm" + input-document = "ProcessMaker\Services\Api\Project\InputDocument" + output-documents = "ProcessMaker\Services\Api\Project\OutputDocuments" + supervisors = "ProcessMaker\Services\Api\Project\ProcessSupervisors" + process-permissions = "ProcessMaker\Services\Api\Project\ProcessPermissions" + case-scheduler = "ProcessMaker\Services\Api\Project\CaseScheduler" + case-tracker = "ProcessMaker\Services\Api\Project\CaseTracker" + case-tracker-object = "ProcessMaker\Services\Api\Project\CaseTrackerObject" + project-users = "ProcessMaker\Services\Api\Project\ProjectUsers" + web-entry = "ProcessMaker\Services\Api\Project\WebEntry" + data-base-connections = "ProcessMaker\Services\Api\Project\DataBaseConnection" + files-manager = "ProcessMaker\Services\Api\Project\FilesManager" + report-Table = "ProcessMaker\Services\Api\Project\ReportTable" + sub-process= "ProcessMaker\Services\Api\Project\SubProcess" + trigger-wizard = "ProcessMaker\Services\Api\Project\TriggerWizard" + category = "ProcessMaker\Services\Api\ProcessCategory" + +[alias: projects] + project = "ProcessMaker\Services\Api\Project" + +[alias: group] + group = "ProcessMaker\Services\Api\Group" + user = "ProcessMaker\Services\Api\Group\User" + +[alias: groups] + group = "ProcessMaker\Services\Api\Group" + +[alias: user] + user = "ProcessMaker\Services\Api\User" + +[alias: users] + user = "ProcessMaker\Services\Api\User" + +[alias: calendar] + calendar = "ProcessMaker\Services\Api\Calendar" + +[alias: calendars] + calendar = "ProcessMaker\Services\Api\Calendar" + +[alias: case] + case = "ProcessMaker\Services\Api\Case" + +[alias: cases] + case = "ProcessMaker\Services\Api\Case" + input-document = "ProcessMaker\Services\Api\Cases\InputDocument" + output-document = "ProcessMaker\Services\Api\Cases\OutputDocument" + +[alias: category] + category = "ProcessMaker\Services\Api\ProcessCategory" + +[alias: categories] + category = "ProcessMaker\Services\Api\ProcessCategory" \ No newline at end of file diff --git a/workflow/engine/src/Services/api.ini b/workflow/engine/src/Services/api.ini deleted file mode 100644 index 70c69d0cd..000000000 --- a/workflow/engine/src/Services/api.ini +++ /dev/null @@ -1,74 +0,0 @@ -; -; API Rest Configuration File -; - -debug = 1 - -[api] - version = 1.0 - vendor = "ProcessMaker - Michelangelo (Enterprise)" - -[alias: test] - test2 = "Services\Api\ProcessMaker\Test2" - test3 = "Services\Api\ProcessMaker\Test3" - -[alias: project] - activity = "Services\Api\ProcessMaker\Project\Activity" - step = "Services\Api\ProcessMaker\Project\Activity\Step" - assignee = "Services\Api\ProcessMaker\Project\Activity\Assignee" - trigger = "Services\Api\ProcessMaker\Project\Activity\Step\Trigger" - project = "Services\Api\ProcessMaker\Project" - trigger2 = "Services\Api\ProcessMaker\Project\Trigger" - event = "Services\Api\ProcessMaker\Project\Event" - dynaform = "Services\Api\ProcessMaker\Project\DynaForm" - input-document = "Services\Api\ProcessMaker\Project\InputDocument" - output-documents = "Services\Api\ProcessMaker\Project\OutputDocuments" - supervisors = "Services\Api\ProcessMaker\Project\ProcessSupervisors" - process-permissions = "Services\Api\ProcessMaker\Project\ProcessPermissions" - case-scheduler = "Services\Api\ProcessMaker\Project\CaseScheduler" - case-tracker = "Services\Api\ProcessMaker\Project\CaseTracker" - case-tracker-object = "Services\Api\ProcessMaker\Project\CaseTrackerObject" - project-users = "Services\Api\ProcessMaker\Project\ProjectUsers" - web-entry = "Services\Api\ProcessMaker\Project\WebEntry" - data-base-connections = "Services\Api\ProcessMaker\Project\DataBaseConnection" - files-manager = "Services\Api\ProcessMaker\Project\FilesManager" - report-Table = "Services\Api\ProcessMaker\Project\ReportTable" - sub-process= "Services\Api\ProcessMaker\Project\SubProcess" - trigger-wizard = "Services\Api\ProcessMaker\Project\TriggerWizard" - category = "Services\Api\ProcessMaker\ProcessCategory" - -[alias: projects] - project = "Services\Api\ProcessMaker\Project" - -[alias: group] - group = "Services\Api\ProcessMaker\Group" - user = "Services\Api\ProcessMaker\Group\User" - -[alias: groups] - group = "Services\Api\ProcessMaker\Group" - -[alias: user] - user = "Services\Api\ProcessMaker\User" - -[alias: users] - user = "Services\Api\ProcessMaker\User" - -[alias: calendar] - calendar = "Services\Api\ProcessMaker\Calendar" - -[alias: calendars] - calendar = "Services\Api\ProcessMaker\Calendar" - -[alias: case] - case = "Services\Api\ProcessMaker\Case" - -[alias: cases] - case = "Services\Api\ProcessMaker\Case" - input-document = "Services\Api\ProcessMaker\Cases\InputDocument" - output-document = "Services\Api\ProcessMaker\Cases\OutputDocument" - -[alias: category] - category = "Services\Api\ProcessMaker\ProcessCategory" - -[alias: categories] - category = "Services\Api\ProcessMaker\ProcessCategory" \ No newline at end of file diff --git a/workflow/engine/src/Tests/BusinessModel/CalendarTest.php b/workflow/engine/src/Tests/BusinessModel/CalendarTest.php index 1b50d56fc..7614b2c97 100644 --- a/workflow/engine/src/Tests/BusinessModel/CalendarTest.php +++ b/workflow/engine/src/Tests/BusinessModel/CalendarTest.php @@ -14,7 +14,7 @@ class CalendarTest extends \PHPUnit_Framework_TestCase { public function testGetCalendars() { - $calendar = new \BusinessModel\Calendar(); + $calendar = new \ProcessMaker\BusinessModel\Calendar(); $arrayCalendar = $calendar->getCalendars(); diff --git a/workflow/engine/src/Tests/BusinessModel/CasesActionTest13_17.php b/workflow/engine/src/Tests/BusinessModel/CasesActionTest13_17.php index 861b7a7d3..aab2a9d87 100644 --- a/workflow/engine/src/Tests/BusinessModel/CasesActionTest13_17.php +++ b/workflow/engine/src/Tests/BusinessModel/CasesActionTest13_17.php @@ -45,7 +45,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase $idCaseDraft = PMFNewCase($proUid, $usrUid, $tasUid, array()); $this->idCaseDraft = $idCaseDraft; - $this->oCases = new \BusinessModel\Cases(); + $this->oCases = new \ProcessMaker\BusinessModel\Cases(); $listToDo = $this->oCases->getList(array('userId' => '00000000000000000000000000000001')); $this->nowCountTodo = $listToDo['total']; @@ -59,7 +59,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test error for type in first field the function * - * @covers \BusinessModel\Cases::putCancelCase + * @covers \ProcessMaker\BusinessModel\Cases::putCancelCase * @expectedException Exception * @expectedExceptionMessage Invalid value for '$app_uid' it must be a string. * @@ -74,7 +74,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test error for type in first field the function * - * @covers \BusinessModel\Cases::putCancelCase + * @covers \ProcessMaker\BusinessModel\Cases::putCancelCase * @expectedException Exception * @expectedExceptionMessage The application with $app_uid: 'IdDoesNotExists' does not exist. * @@ -89,7 +89,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test error for type in second field the function * - * @covers \BusinessModel\Cases::putCancelCase + * @covers \ProcessMaker\BusinessModel\Cases::putCancelCase * @expectedException Exception * @expectedExceptionMessage Invalid value for '$usr_uid' it must be a string. * @@ -104,7 +104,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test error for type in second field the function * - * @covers \BusinessModel\Cases::putCancelCase + * @covers \ProcessMaker\BusinessModel\Cases::putCancelCase * @expectedException Exception * @expectedExceptionMessage The user with $usr_uid: 'IdDoesNotExists' does not exist. * @@ -119,7 +119,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test error for type in third field the function * - * @covers \BusinessModel\Cases::putCancelCase + * @covers \ProcessMaker\BusinessModel\Cases::putCancelCase * @expectedException Exception * @expectedExceptionMessage Invalid value for '$del_index' it must be a integer. * @@ -134,7 +134,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test for cancel case * - * @covers \BusinessModel\Cases::putCancelCase + * @covers \ProcessMaker\BusinessModel\Cases::putCancelCase * * @author Brayan Pereyra (Cochalo) * @copyright Colosa - Bolivia @@ -142,7 +142,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase public function testPutCancelCase() { $this->oCases->putCancelCase($this->idCaseDraft, '00000000000000000000000000000001'); - $this->oCases = new \BusinessModel\Cases(); + $this->oCases = new \ProcessMaker\BusinessModel\Cases(); $listDraft = $this->oCases->getList(array('userId' => '00000000000000000000000000000001', 'action' => 'draft')); $this->assertNotEquals($this->nowCountDraft, $listDraft['total']); } @@ -150,7 +150,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test error for type in first field the function * - * @covers \BusinessModel\Cases::putPauseCase + * @covers \ProcessMaker\BusinessModel\Cases::putPauseCase * @expectedException Exception * @expectedExceptionMessage Invalid value for '$app_uid' it must be a string. * @@ -165,7 +165,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test error for type in first field the function * - * @covers \BusinessModel\Cases::putPauseCase + * @covers \ProcessMaker\BusinessModel\Cases::putPauseCase * @expectedException Exception * @expectedExceptionMessage The application with $app_uid: 'IdDoesNotExists' does not exist. * @@ -180,7 +180,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test error for type in second field the function * - * @covers \BusinessModel\Cases::putPauseCase + * @covers \ProcessMaker\BusinessModel\Cases::putPauseCase * @expectedException Exception * @expectedExceptionMessage Invalid value for '$usr_uid' it must be a string. * @@ -195,7 +195,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test error for type in second field the function * - * @covers \BusinessModel\Cases::putPauseCase + * @covers \ProcessMaker\BusinessModel\Cases::putPauseCase * @expectedException Exception * @expectedExceptionMessage The user with $usr_uid: 'IdDoesNotExists' does not exist. * @@ -210,7 +210,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test error for type in third field the function * - * @covers \BusinessModel\Cases::putPauseCase + * @covers \ProcessMaker\BusinessModel\Cases::putPauseCase * @expectedException Exception * @expectedExceptionMessage Invalid value for '$del_index' it must be a integer. * @@ -225,7 +225,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test error for type in fourth field the function * - * @covers \BusinessModel\Cases::putPauseCase + * @covers \ProcessMaker\BusinessModel\Cases::putPauseCase * @expectedException Exception * @expectedExceptionMessage The value '2014-44-44' is not a valid date for the format 'Y-m-d'. * @@ -240,7 +240,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test for cancel case * - * @covers \BusinessModel\Cases::putPauseCase + * @covers \ProcessMaker\BusinessModel\Cases::putPauseCase * * @author Brayan Pereyra (Cochalo) * @copyright Colosa - Bolivia @@ -248,7 +248,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase public function testPutPauseCase() { $this->oCases->putPauseCase($this->idCaseToDo, '00000000000000000000000000000001'); - $this->oCases = new \BusinessModel\Cases(); + $this->oCases = new \ProcessMaker\BusinessModel\Cases(); $listPaused = $this->oCases->getList(array('userId' => '00000000000000000000000000000001', 'action' => 'paused')); $this->assertNotEquals($this->nowCountPaused, $listPaused['total']); } @@ -256,7 +256,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test error for type in first field the function * - * @covers \BusinessModel\Cases::putUnpauseCase + * @covers \ProcessMaker\BusinessModel\Cases::putUnpauseCase * @expectedException Exception * @expectedExceptionMessage Invalid value for '$app_uid' it must be a string. * @@ -271,7 +271,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test error for type in first field the function * - * @covers \BusinessModel\Cases::putUnpauseCase + * @covers \ProcessMaker\BusinessModel\Cases::putUnpauseCase * @expectedException Exception * @expectedExceptionMessage The application with $app_uid: 'IdDoesNotExists' does not exist. * @@ -286,7 +286,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test error for type in second field the function * - * @covers \BusinessModel\Cases::putUnpauseCase + * @covers \ProcessMaker\BusinessModel\Cases::putUnpauseCase * @expectedException Exception * @expectedExceptionMessage Invalid value for '$usr_uid' it must be a string. * @@ -301,7 +301,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test error for type in second field the function * - * @covers \BusinessModel\Cases::putUnpauseCase + * @covers \ProcessMaker\BusinessModel\Cases::putUnpauseCase * @expectedException Exception * @expectedExceptionMessage The user with $usr_uid: 'IdDoesNotExists' does not exist. * @@ -316,7 +316,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test error for type in third field the function * - * @covers \BusinessModel\Cases::putUnpauseCase + * @covers \ProcessMaker\BusinessModel\Cases::putUnpauseCase * @expectedException Exception * @expectedExceptionMessage Invalid value for '$del_index' it must be a integer. * @@ -331,7 +331,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test for cancel case * - * @covers \BusinessModel\Cases::putUnpauseCase + * @covers \ProcessMaker\BusinessModel\Cases::putUnpauseCase * * @author Brayan Pereyra (Cochalo) * @copyright Colosa - Bolivia @@ -339,7 +339,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase public function testPutUnpauseCase() { $this->oCases->putUnpauseCase($this->idCaseToDo, '00000000000000000000000000000001'); - $this->oCases = new \BusinessModel\Cases(); + $this->oCases = new \ProcessMaker\BusinessModel\Cases(); $listPaused = $this->oCases->getList(array('userId' => '00000000000000000000000000000001', 'action' => 'paused')); $this->assertEquals($this->nowCountPaused, $listPaused['total']); } @@ -347,7 +347,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test error for type in first field the function * - * @covers \BusinessModel\Cases::deleteCase + * @covers \ProcessMaker\BusinessModel\Cases::deleteCase * @expectedException Exception * @expectedExceptionMessage Invalid value for '$app_uid' it must be a string. * @@ -362,7 +362,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test error for type in first field the function * - * @covers \BusinessModel\Cases::deleteCase + * @covers \ProcessMaker\BusinessModel\Cases::deleteCase * @expectedException Exception * @expectedExceptionMessage The application with $app_uid: 'IdDoesNotExists' does not exist. * @@ -377,7 +377,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase /** * Test for cancel case * - * @covers \BusinessModel\Cases::deleteCase + * @covers \ProcessMaker\BusinessModel\Cases::deleteCase * * @author Brayan Pereyra (Cochalo) * @copyright Colosa - Bolivia @@ -385,7 +385,7 @@ class CasesAction13_17Test extends \PHPUnit_Framework_TestCase public function testDeleteCase() { $this->oCases->deleteCase($this->idCaseToDo); - $this->oCases = new \BusinessModel\Cases(); + $this->oCases = new \ProcessMaker\BusinessModel\Cases(); $listToDo = $this->oCases->getList(array('userId' => '00000000000000000000000000000001')); $this->assertNotEquals($this->nowCountTodo, $listToDo['total']); } diff --git a/workflow/engine/src/Tests/BusinessModel/CasesTest.php b/workflow/engine/src/Tests/BusinessModel/CasesTest.php index bcaccb004..227d77c22 100644 --- a/workflow/engine/src/Tests/BusinessModel/CasesTest.php +++ b/workflow/engine/src/Tests/BusinessModel/CasesTest.php @@ -28,14 +28,14 @@ class CasesTest extends \PHPUnit_Framework_TestCase */ public function setUp() { - $this->oCases = new \BusinessModel\Cases(); + $this->oCases = new \ProcessMaker\BusinessModel\Cases(); return true; } /** * Test error for type in first field the function * - * @covers \BusinessModel\Cases::getList + * @covers \ProcessMaker\BusinessModel\Cases::getList * @expectedException Exception * @expectedExceptionMessage Invalid value for '$dataList' it must be an array. * @@ -50,7 +50,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test error for empty userId in array * - * @covers \BusinessModel\Cases::getList + * @covers \ProcessMaker\BusinessModel\Cases::getList * @expectedException Exception * @expectedExceptionMessage The user with userId: '' does not exist. * @@ -65,7 +65,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test error for not exists userId in array * - * @covers \BusinessModel\Cases::getList + * @covers \ProcessMaker\BusinessModel\Cases::getList * @expectedException Exception * @expectedExceptionMessage The user with userId: 'IdDoesNotExists' does not exist. * @@ -80,7 +80,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test error for incorrect value $action in array * - * @covers \BusinessModel\Cases::getList + * @covers \ProcessMaker\BusinessModel\Cases::getList * @expectedException Exception * @expectedExceptionMessage The value for $action is incorrect. * @@ -95,7 +95,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test error for incorrect value $process in array * - * @covers \BusinessModel\Cases::getList + * @covers \ProcessMaker\BusinessModel\Cases::getList * @expectedException Exception * @expectedExceptionMessage The process with $pro_uid: 'IdDoesNotExists' does not exist. * @@ -113,7 +113,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test error for incorrect value $process in array * - * @covers \BusinessModel\Cases::getList + * @covers \ProcessMaker\BusinessModel\Cases::getList * @expectedException Exception * @expectedExceptionMessage The category with $cat_uid: 'IdDoesNotExists' does not exist. * @@ -131,7 +131,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test error for incorrect value $process in array * - * @covers \BusinessModel\Cases::getList + * @covers \ProcessMaker\BusinessModel\Cases::getList * @expectedException Exception * @expectedExceptionMessage The user with $usr_uid: 'IdDoesNotExists' does not exist. * @@ -149,7 +149,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test error for incorrect value $process in array * - * @covers \BusinessModel\Cases::getList + * @covers \ProcessMaker\BusinessModel\Cases::getList * @expectedException Exception * @expectedExceptionMessage The value '2014-44-44' is not a valid date for the format 'Y-m-d'. * @@ -167,7 +167,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test error for incorrect value $process in array * - * @covers \BusinessModel\Cases::getList + * @covers \ProcessMaker\BusinessModel\Cases::getList * @expectedException Exception * @expectedExceptionMessage The value '2014-44-44' is not a valid date for the format 'Y-m-d'. * @@ -185,7 +185,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test get list to do not paged * - * @covers \BusinessModel\Cases::getList + * @covers \ProcessMaker\BusinessModel\Cases::getList * * @author Brayan Pereyra (Cochalo) * @copyright Colosa - Bolivia @@ -208,7 +208,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test get list to do * - * @covers \BusinessModel\Cases::getList + * @covers \ProcessMaker\BusinessModel\Cases::getList * * @author Brayan Pereyra (Cochalo) * @copyright Colosa - Bolivia @@ -231,7 +231,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test get list draft not paged * - * @covers \BusinessModel\Cases::getList + * @covers \ProcessMaker\BusinessModel\Cases::getList * * @author Brayan Pereyra (Cochalo) * @copyright Colosa - Bolivia @@ -254,7 +254,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test get list draft * - * @covers \BusinessModel\Cases::getList + * @covers \ProcessMaker\BusinessModel\Cases::getList * * @author Brayan Pereyra (Cochalo) * @copyright Colosa - Bolivia @@ -277,7 +277,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test get list participated not paged * - * @covers \BusinessModel\Cases::getList + * @covers \ProcessMaker\BusinessModel\Cases::getList * * @author Brayan Pereyra (Cochalo) * @copyright Colosa - Bolivia @@ -300,7 +300,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test get list participated * - * @covers \BusinessModel\Cases::getList + * @covers \ProcessMaker\BusinessModel\Cases::getList * * @author Brayan Pereyra (Cochalo) * @copyright Colosa - Bolivia @@ -323,7 +323,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test get list unassigned not paged * - * @covers \BusinessModel\Cases::getList + * @covers \ProcessMaker\BusinessModel\Cases::getList * * @author Brayan Pereyra (Cochalo) * @copyright Colosa - Bolivia @@ -346,7 +346,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test get list unassigned * - * @covers \BusinessModel\Cases::getList + * @covers \ProcessMaker\BusinessModel\Cases::getList * * @author Brayan Pereyra (Cochalo) * @copyright Colosa - Bolivia @@ -369,7 +369,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test get list search not paged * - * @covers \BusinessModel\Cases::getList + * @covers \ProcessMaker\BusinessModel\Cases::getList * * @author Brayan Pereyra (Cochalo) * @copyright Colosa - Bolivia @@ -396,7 +396,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test get list search * - * @covers \BusinessModel\Cases::getList + * @covers \ProcessMaker\BusinessModel\Cases::getList * * @author Brayan Pereyra (Cochalo) * @copyright Colosa - Bolivia @@ -423,7 +423,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test add Case * - * @covers \BusinessModel\Cases::addCase + * @covers \ProcessMaker\BusinessModel\Cases::addCase * * @copyright Colosa - Bolivia */ @@ -438,7 +438,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test get Task Case * - * @covers \BusinessModel\Cases::getTaskCase + * @covers \ProcessMaker\BusinessModel\Cases::getTaskCase * @depends testAddCase * @param array $aResponse * @@ -453,7 +453,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test get Case Info * - * @covers \BusinessModel\Cases::getCaseInfo + * @covers \ProcessMaker\BusinessModel\Cases::getCaseInfo * @depends testAddCase * @param array $aResponse * @@ -468,7 +468,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test put reassign case * - * @covers \BusinessModel\Cases::getCaseInfo + * @covers \ProcessMaker\BusinessModel\Cases::getCaseInfo * @depends testAddCase * @param array $aResponse * @@ -483,7 +483,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test add Case to test route case * - * @covers \BusinessModel\Cases::addCase + * @covers \ProcessMaker\BusinessModel\Cases::addCase * * @copyright Colosa - Bolivia */ @@ -498,7 +498,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test put route case * - * @covers \BusinessModel\Cases::updateRouteCase + * @covers \ProcessMaker\BusinessModel\Cases::updateRouteCase * @depends testAddCaseRouteCase * @param array $aResponseRouteCase * @@ -513,7 +513,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase /** * Test add Case impersonate * - * @covers \BusinessModel\Cases::addCaseImpersonate + * @covers \ProcessMaker\BusinessModel\Cases::addCaseImpersonate * * @copyright Colosa - Bolivia */ diff --git a/workflow/engine/src/Tests/BusinessModel/DepartmentTest.php b/workflow/engine/src/Tests/BusinessModel/DepartmentTest.php index d926483d2..a3b63a7ba 100644 --- a/workflow/engine/src/Tests/BusinessModel/DepartmentTest.php +++ b/workflow/engine/src/Tests/BusinessModel/DepartmentTest.php @@ -28,14 +28,14 @@ class DepartmentTest extends \PHPUnit_Framework_TestCase */ public function setUp() { - $this->oDepartment = new \BusinessModel\Department(); + $this->oDepartment = new \ProcessMaker\BusinessModel\Department(); return true; } /** * Test error for type in first field the function * - * @covers \BusinessModel\Department::saveDepartment + * @covers \ProcessMaker\BusinessModel\Department::saveDepartment * @expectedException Exception * @expectedExceptionMessage Invalid value for '$dep_data' it must be an array. * @@ -50,7 +50,7 @@ class DepartmentTest extends \PHPUnit_Framework_TestCase /** * Test error for type in second field the function * - * @covers \BusinessModel\Department::saveDepartment + * @covers \ProcessMaker\BusinessModel\Department::saveDepartment * @expectedException Exception * @expectedExceptionMessage Invalid value for '$create' it must be a boolean. * @@ -65,7 +65,7 @@ class DepartmentTest extends \PHPUnit_Framework_TestCase /** * Test error for empty array in first field the function * - * @covers \BusinessModel\Department::saveDepartment + * @covers \ProcessMaker\BusinessModel\Department::saveDepartment * @expectedException Exception * @expectedExceptionMessage The field '$dep_data' is empty. * @@ -80,7 +80,7 @@ class DepartmentTest extends \PHPUnit_Framework_TestCase /** * Test error for create department with nonexistent dep_parent * - * @covers \BusinessModel\Department::saveDepartment + * @covers \ProcessMaker\BusinessModel\Department::saveDepartment * @expectedException Exception * @expectedExceptionMessage The departament with dep_parent: 'testUidDepartment' does not exist. * @@ -96,7 +96,7 @@ class DepartmentTest extends \PHPUnit_Framework_TestCase /** * Test error for create department with nonexistent dep_manager * - * @covers \BusinessModel\Department::saveDepartment + * @covers \ProcessMaker\BusinessModel\Department::saveDepartment * @expectedException Exception * @expectedExceptionMessage The user with dep_manager: 'testUidUser' does not exist. * @@ -112,7 +112,7 @@ class DepartmentTest extends \PHPUnit_Framework_TestCase /** * Test error for create department with incorrect dep_status * - * @covers \BusinessModel\Department::saveDepartment + * @covers \ProcessMaker\BusinessModel\Department::saveDepartment * @expectedException Exception * @expectedExceptionMessage The departament with dep_status: 'SUPER ACTIVO' is incorrect. * @@ -128,7 +128,7 @@ class DepartmentTest extends \PHPUnit_Framework_TestCase /** * Test error for create department untitled * - * @covers \BusinessModel\Department::saveDepartment + * @covers \ProcessMaker\BusinessModel\Department::saveDepartment * @expectedException Exception * @expectedExceptionMessage The field dep_title is required. * @@ -144,7 +144,7 @@ class DepartmentTest extends \PHPUnit_Framework_TestCase /** * Save department parent * - * @covers \BusinessModel\Department::saveDepartment + * @covers \ProcessMaker\BusinessModel\Department::saveDepartment * @return array * * @author Brayan Pereyra (Cochalo) @@ -169,7 +169,7 @@ class DepartmentTest extends \PHPUnit_Framework_TestCase * * @depends testCreateDepartmentParent * @param array $dep_data, Data for parent department - * @covers \BusinessModel\Department::saveDepartment + * @covers \ProcessMaker\BusinessModel\Department::saveDepartment * @expectedException Exception * @expectedExceptionMessage The departament with dep_title: 'Departamento Padre' already exists. * @@ -185,7 +185,7 @@ class DepartmentTest extends \PHPUnit_Framework_TestCase /** * Test error for create department untitled * - * @covers \BusinessModel\Department::saveDepartment + * @covers \ProcessMaker\BusinessModel\Department::saveDepartment * @expectedException Exception * @expectedExceptionMessage The departament with dep_uid: 'testUidDepartment' does not exist. * @@ -203,7 +203,7 @@ class DepartmentTest extends \PHPUnit_Framework_TestCase * * @depends testCreateDepartmentParent * @param array $dep_data, Data for parent department - * @covers \BusinessModel\Department::saveDepartment + * @covers \ProcessMaker\BusinessModel\Department::saveDepartment * @return array * * @author Brayan Pereyra (Cochalo) @@ -235,7 +235,7 @@ class DepartmentTest extends \PHPUnit_Framework_TestCase * @depends testCreateDepartmentChild * @param array $dep_data, Data for parent department * @param array $child_data, Data for child department - * @covers \BusinessModel\Department::saveDepartment + * @covers \ProcessMaker\BusinessModel\Department::saveDepartment * @expectedException Exception * @expectedExceptionMessage The departament with dep_title: 'Departamento Padre' already exists. * @return array @@ -259,7 +259,7 @@ class DepartmentTest extends \PHPUnit_Framework_TestCase * @depends testCreateDepartmentChild * @param array $dep_data, Data for parent department * @param array $child_data, Data for child department - * @covers \BusinessModel\Department::getDepartments + * @covers \ProcessMaker\BusinessModel\Department::getDepartments * * @author Brayan Pereyra (Cochalo) * @copyright Colosa - Bolivia @@ -290,7 +290,7 @@ class DepartmentTest extends \PHPUnit_Framework_TestCase * * @depends testCreateDepartmentParent * @param array $dep_data, Data for parent department - * @covers \BusinessModel\Department::getDepartment + * @covers \ProcessMaker\BusinessModel\Department::getDepartment * * @author Brayan Pereyra (Cochalo) * @copyright Colosa - Bolivia @@ -319,7 +319,7 @@ class DepartmentTest extends \PHPUnit_Framework_TestCase * @depends testCreateDepartmentChild * @param array $dep_data, Data for parent department * @param array $child_data, Data for child department - * @covers \BusinessModel\Department::deleteDepartment + * @covers \ProcessMaker\BusinessModel\Department::deleteDepartment * @expectedException Exception * @expectedExceptionMessage Can not delete the department, it has a children department. * @@ -338,7 +338,7 @@ class DepartmentTest extends \PHPUnit_Framework_TestCase * @depends testCreateDepartmentChild * @param array $dep_data, Data for parent department * @param array $child_data, Data for child department - * @covers \BusinessModel\Department::deleteDepartment + * @covers \ProcessMaker\BusinessModel\Department::deleteDepartment * * @author Brayan Pereyra (Cochalo) * @copyright Colosa - Bolivia diff --git a/workflow/engine/src/Tests/BusinessModel/InputDocumentsCasesTest.php b/workflow/engine/src/Tests/BusinessModel/InputDocumentsCasesTest.php index 33787addd..f06d8ee5d 100644 --- a/workflow/engine/src/Tests/BusinessModel/InputDocumentsCasesTest.php +++ b/workflow/engine/src/Tests/BusinessModel/InputDocumentsCasesTest.php @@ -27,7 +27,7 @@ class InputDocumentsCasesTest extends \PHPUnit_Framework_TestCase */ public function setUp() { - $this->oInputDocument = new \BusinessModel\Cases\InputDocument(); + $this->oInputDocument = new \ProcessMaker\BusinessModel\Cases\InputDocument(); } /** @@ -57,7 +57,7 @@ class InputDocumentsCasesTest extends \PHPUnit_Framework_TestCase /** * Test get InputDocuments * - * @covers \BusinessModel\Cases\InputDocument::getCasesInputDocuments + * @covers \ProcessMaker\BusinessModel\Cases\InputDocument::getCasesInputDocuments * @depends testAddInputDocument * @param array $aResponse * @@ -72,7 +72,7 @@ class InputDocumentsCasesTest extends \PHPUnit_Framework_TestCase /** * Test get InputDocument * - * @covers \BusinessModel\Cases\InputDocument::getCasesInputDocument + * @covers \ProcessMaker\BusinessModel\Cases\InputDocument::getCasesInputDocument * @depends testAddInputDocument * @param array $aResponse * @@ -87,7 +87,7 @@ class InputDocumentsCasesTest extends \PHPUnit_Framework_TestCase /** * Test remove InputDocument * - * @covers \BusinessModel\Cases\InputDocument::removeInputDocument + * @covers \ProcessMaker\BusinessModel\Cases\InputDocument::removeInputDocument * @depends testAddInputDocument * @param array $aResponse * diff --git a/workflow/engine/src/Tests/BusinessModel/OutputDocumentsCasesTest.php b/workflow/engine/src/Tests/BusinessModel/OutputDocumentsCasesTest.php index 5d578b4dc..c48fa1512 100644 --- a/workflow/engine/src/Tests/BusinessModel/OutputDocumentsCasesTest.php +++ b/workflow/engine/src/Tests/BusinessModel/OutputDocumentsCasesTest.php @@ -27,13 +27,13 @@ class OutputDocumentsCasesTest extends \PHPUnit_Framework_TestCase */ public function setUp() { - $this->oOutputDocument = new \BusinessModel\Cases\OutputDocument(); + $this->oOutputDocument = new \ProcessMaker\BusinessModel\Cases\OutputDocument(); } /** * Test add OutputDocument * - * @covers \BusinessModel\Cases\OutputDocument::addCasesOutputDocument + * @covers \ProcessMaker\BusinessModel\Cases\OutputDocument::addCasesOutputDocument * * @copyright Colosa - Bolivia */ @@ -56,7 +56,7 @@ class OutputDocumentsCasesTest extends \PHPUnit_Framework_TestCase /** * Test get OutputDocuments * - * @covers \BusinessModel\Cases\OutputDocument::getCasesOutputDocuments + * @covers \ProcessMaker\BusinessModel\Cases\OutputDocument::getCasesOutputDocuments * @depends testAddCasesOutputDocument * @param array $aResponse * @@ -71,7 +71,7 @@ class OutputDocumentsCasesTest extends \PHPUnit_Framework_TestCase /** * Test get OutputDocument * - * @covers \BusinessModel\Cases\OutputDocument::getCasesOutputDocument + * @covers \ProcessMaker\BusinessModel\Cases\OutputDocument::getCasesOutputDocument * @depends testAddCasesOutputDocument * @param array $aResponse * @@ -86,7 +86,7 @@ class OutputDocumentsCasesTest extends \PHPUnit_Framework_TestCase /** * Test remove OutputDocument * - * @covers \BusinessModel\Cases\OutputDocument::removeOutputDocument + * @covers \ProcessMaker\BusinessModel\Cases\OutputDocument::removeOutputDocument * @depends testAddCasesOutputDocument * @param array $aResponse * diff --git a/workflow/engine/src/Tests/BusinessModel/ProcessCategoryTest.php b/workflow/engine/src/Tests/BusinessModel/ProcessCategoryTest.php index 1d36f6b2c..312bdf343 100644 --- a/workflow/engine/src/Tests/BusinessModel/ProcessCategoryTest.php +++ b/workflow/engine/src/Tests/BusinessModel/ProcessCategoryTest.php @@ -48,7 +48,7 @@ class ProcessCategoryTest extends \PHPUnit_Framework_TestCase public function testGetCategories() { - $processCategory = new \BusinessModel\ProcessCategory(); + $processCategory = new \ProcessMaker\BusinessModel\ProcessCategory(); $arrayProcessCategory = $processCategory->getCategories();