fernando/luos
1
0
Fork 0
Code Releases Activity

Refactoring of classes that where in workflow/engine/src , now all of them have a unique parent namespace \ProcessMaker

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2014-04-02 16:51:28 -04:00
parent 59769103fb
commit 4d59bc2d5a
43 changed files with 264 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
framework/src/Maveriks/WebApplication.php
View File

@@ -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)) {

8
workflow/engine/controllers/designer.php
View File

@@ -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(

8
workflow/engine/src/BusinessModel/Calendar.php → workflow/engine/src/ProcessMaker/BusinessModel/Calendar.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
class Calendar
{
@@ -267,7 +267,7 @@ class Calendar
unset($arrayData["CAL_UID"]);
//Verify data
$process = new \BusinessModel\Process();
$process = new \ProcessMaker\BusinessModel\Process();
$process->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);

8
workflow/engine/src/BusinessModel/CaseScheduler.php → workflow/engine/src/ProcessMaker/BusinessModel/CaseScheduler.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
use \G;
@@ -245,7 +245,7 @@ class CaseScheduler
public function addCaseScheduler($sProcessUID, $aData, $userUID)
{
try {
require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes". PATH_SEP . "model" . PATH_SEP . "CaseScheduler.php");
require_once(PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "CaseScheduler.php");
$aData['sch_repeat_stop_if_running'] = '0';
$aData['case_sh_plugin_uid'] = null;
$aData = array_change_key_case($aData, CASE_UPPER);
@@ -530,7 +530,7 @@ class CaseScheduler
public function updateCaseScheduler($sProcessUID, $aData, $userUID, $sSchUID = '')
{
try {
require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes". PATH_SEP . "model" . PATH_SEP . "CaseScheduler.php");
require_once(PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "CaseScheduler.php");
$aData = array_change_key_case($aData, CASE_UPPER);
if (empty( $aData )) {
die( 'The information sended is empty!' );
@@ -827,7 +827,7 @@ class CaseScheduler
public function deleteCaseScheduler($sSchUID)
{
try {
require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes". PATH_SEP . "model" . PATH_SEP . "CaseScheduler.php");
require_once(PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "CaseScheduler.php");
$oCaseScheduler = new \CaseScheduler();
if (!isset($sSchUID)) {
return;

2
workflow/engine/src/BusinessModel/CaseTracker.php → workflow/engine/src/ProcessMaker/BusinessModel/CaseTracker.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
class CaseTracker
{

6
workflow/engine/src/BusinessModel/CaseTrackerObject.php → workflow/engine/src/ProcessMaker/BusinessModel/CaseTrackerObject.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
class CaseTrackerObject
{
@@ -81,7 +81,7 @@ class CaseTrackerObject
throw (new \Exception(str_replace(array("{0}"), array(strtolower("CTO_UID_OBJ")), "The \"{0}\" attribute is not defined")));
}
$step = new \BusinessModel\Step();
$step = new \ProcessMaker\BusinessModel\Step();
$msg = $step->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"]);

2
workflow/engine/src/BusinessModel/Cases.php → workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
use \G;
use \UsersPeer;

6
workflow/engine/src/BusinessModel/Cases/InputDocument.php → workflow/engine/src/ProcessMaker/BusinessModel/Cases/InputDocument.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel\Cases;
namespace ProcessMaker\BusinessModel\Cases;
class InputDocument
{
@@ -21,7 +21,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;
@@ -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;

12
workflow/engine/src/BusinessModel/Cases/OutputDocument.php → workflow/engine/src/ProcessMaker/BusinessModel/Cases/OutputDocument.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel\Cases;
namespace ProcessMaker\BusinessModel\Cases;
class OutputDocument
{
@@ -19,7 +19,7 @@ class OutputDocument
$fields = $oCase->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();

2
workflow/engine/src/BusinessModel/DataBaseConnection.php → workflow/engine/src/ProcessMaker/BusinessModel/DataBaseConnection.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
use \G;
use \DbSource;

2
workflow/engine/src/BusinessModel/Department.php → workflow/engine/src/ProcessMaker/BusinessModel/Department.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
use \G;
use \UsersPeer;

10
workflow/engine/src/BusinessModel/DynaForm.php → workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
class DynaForm
{
@@ -358,7 +358,7 @@ class DynaForm
unset($arrayData["PMTABLE"]);
//Verify data
$process = new \BusinessModel\Process();
$process = new \ProcessMaker\BusinessModel\Process();
$process->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"]);

2
workflow/engine/src/BusinessModel/Event.php → workflow/engine/src/ProcessMaker/BusinessModel/Event.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
/**
* @author Brayan Pereyra (Cochalo) <brayan@colosa.com>

2
workflow/engine/src/BusinessModel/FilesManager.php → workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
use \G;

10
workflow/engine/src/BusinessModel/Group.php → workflow/engine/src/ProcessMaker/BusinessModel/Group.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
class Group
{
@@ -189,7 +189,7 @@ class Group
unset($arrayData["GRP_UID"]);
//Verify data
$process = new \BusinessModel\Process();
$process = new \ProcessMaker\BusinessModel\Process();
$process->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"]);

10
workflow/engine/src/BusinessModel/Group/User.php → workflow/engine/src/ProcessMaker/BusinessModel/Group/User.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel\Group;
namespace ProcessMaker\BusinessModel\Group;
class User
{
@@ -144,8 +144,8 @@ class User
unset($arrayData["GRP_UID"]);
//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"]);
@@ -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"]);

6
workflow/engine/src/BusinessModel/InputDocument.php → workflow/engine/src/ProcessMaker/BusinessModel/InputDocument.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
class InputDocument
{
@@ -209,7 +209,7 @@ class InputDocument
unset($arrayData["INP_DOC_UID"]);
//Verify data
$process = new \BusinessModel\Process();
$process = new \ProcessMaker\BusinessModel\Process();
$process->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);

8
workflow/engine/src/BusinessModel/OutputDocument.php → workflow/engine/src/ProcessMaker/BusinessModel/OutputDocument.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
use \G;
@@ -239,7 +239,7 @@ class OutputDocument
}
}
try {
require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "OutputDocument.php");
require_once(PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "OutputDocument.php");
$aData = array_change_key_case($aData, CASE_UPPER);
$aData['PRO_UID'] = $sProcessUID;
//Verify data
@@ -350,9 +350,9 @@ class OutputDocument
public function deleteOutputDocument($sProcessUID, $sOutputDocumentUID)
{
try {
require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "OutputDocument.php");
require_once(PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "OutputDocument.php");
require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "ObjectPermission.php");
require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Step.php");
require_once(PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Step.php");
\G::LoadClass( 'processMap' );
$oOutputDocument = new \OutputDocument();
$fields = $oOutputDocument->load( $sOutputDocumentUID );

22
workflow/engine/src/BusinessModel/Process.php → workflow/engine/src/ProcessMaker/BusinessModel/Process.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
use G;
use Criteria;
@@ -520,7 +520,7 @@ class Process
}
if (isset($arrayData["PRO_CALENDAR"]) && $arrayData["PRO_CALENDAR"] . "" != "") {
$calendar = new \BusinessModel\Calendar();
$calendar = new \ProcessMaker\BusinessModel\Calendar();
$calendar->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);

4
workflow/engine/src/BusinessModel/ProcessCategory.php → workflow/engine/src/ProcessMaker/BusinessModel/ProcessCategory.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
class ProcessCategory
{
@@ -145,7 +145,7 @@ class ProcessCategory
$arrayProcessCategory = array();
//Verify data
$process = new \BusinessModel\Process();
$process = new \ProcessMaker\BusinessModel\Process();
$process->throwExceptionIfDataNotMetPagerVarDefinition(array("start" => $start, "limit" => $limit), $this->arrayFieldNameForException);

2
workflow/engine/src/BusinessModel/ProcessPermissions.php → workflow/engine/src/ProcessMaker/BusinessModel/ProcessPermissions.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
use \G;
use \Cases;

2
workflow/engine/src/BusinessModel/ProcessSupervisor.php → workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
use \G;

2
workflow/engine/src/BusinessModel/ProjectUser.php → workflow/engine/src/ProcessMaker/BusinessModel/ProjectUser.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
use \G;

10
workflow/engine/src/BusinessModel/Step.php → workflow/engine/src/ProcessMaker/BusinessModel/Step.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
class Step
{
@@ -498,7 +498,7 @@ class Step
try {
$arrayStep = array();
$step = new \BusinessModel\Step();
$step = new \ProcessMaker\BusinessModel\Step();
$step->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();

8
workflow/engine/src/BusinessModel/Step/Trigger.php → workflow/engine/src/ProcessMaker/BusinessModel/Step/Trigger.php
View File

@@ -1,7 +1,7 @@
<?php
namespace BusinessModel\Step;
namespace ProcessMaker\BusinessModel\Step;
use \BusinessModel\Step;
use \ProcessMaker\BusinessModel\Step;
class Trigger
{
@@ -330,7 +330,7 @@ class Trigger
}
//Get data
$trigger = new \BusinessModel\Trigger();
$trigger = new \ProcessMaker\BusinessModel\Trigger();
$criteria = $trigger->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') {

2
workflow/engine/src/BusinessModel/Subprocess.php → workflow/engine/src/ProcessMaker/BusinessModel/Subprocess.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
use \G;
use \SubProcessPeer;

2
workflow/engine/src/BusinessModel/Table.php → workflow/engine/src/ProcessMaker/BusinessModel/Table.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
use \G;
use \AdditionalTables;

4
workflow/engine/src/BusinessModel/Task.php → workflow/engine/src/ProcessMaker/BusinessModel/Task.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
use \G;
use \ProcessMaker\Util;
@@ -636,7 +636,7 @@ class Task
try {
$arrayStep = array();
$step = new \BusinessModel\Step();
$step = new \ProcessMaker\BusinessModel\Step();
$step->setFormatFieldNameInUppercase($this->formatFieldNameInUppercase);
$step->setArrayParamException($this->arrayParamException);

2
workflow/engine/src/BusinessModel/Trigger.php → workflow/engine/src/ProcessMaker/BusinessModel/Trigger.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
class Trigger
{

16
workflow/engine/src/BusinessModel/TriggerWizard.php → workflow/engine/src/ProcessMaker/BusinessModel/TriggerWizard.php
View File

@@ -1,5 +1,5 @@
<?php
namespace BusinessModel;
namespace ProcessMaker\BusinessModel;
class TriggerWizard
{
@@ -165,7 +165,7 @@ class TriggerWizard
//Verify data
$this->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);

Some files were not shown because too many files have changed in this diff Show More