fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-3207

Browse Source 
Fix CS observations
Fix commented code
This commit is contained in:
davidcallizaya
2017-05-23 16:07:26 -04:00
parent eacb057a58
commit 08375cfce1
9 changed files with 58 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/WorkflowTestCase.php
View File

@@ -22,18 +22,6 @@ class WorkflowTestCase extends TestCase
$pdo = new PDO("mysql:host=".DB_HOST.";dbname=".DB_NAME, DB_USER,
DB_PASS);
$pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, 0);
//inmemory
/* $inmemory = false;
if ($inmemory) {
$sql = str_replace(
['ENGINE=InnoDB', 'MEDIUMTEXT'],
['ENGINE=MEMORY', 'VARCHAR(2000)'],
file_get_contents(PATH_CORE.'data/mysql/schema.sql')
);
} else {
$sql = file_get_contents(PATH_CORE.'data/mysql/schema.sql');
}
$pdo->exec($sql); */
$pdo->exec(file_get_contents(PATH_CORE.'data/mysql/schema.sql'));
$pdo->exec(file_get_contents(PATH_RBAC_CORE.'data/mysql/schema.sql'));
$pdo->exec(file_get_contents(PATH_CORE.'data/mysql/insert.sql'));

2
tests/bootstrap.php
View File

@@ -205,7 +205,7 @@ Bootstrap::registerClass('processMap',
Bootstrap::registerSystemClasses();
Bootstrap::initVendors();
Bootstrap::LoadSystem('monologProvider');
// including workspace shared classes -> particularlly for pmTables
// including workspace shared classes -> particularly for pmTables
set_include_path(get_include_path().PATH_SEPARATOR.PATH_WORKSPACE);
$arraySystemConfiguration = \System::getSystemConfiguration();

90
tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEventTest.php
View File

@@ -35,12 +35,11 @@ class WebEntryEventTest extends \WorkflowTestCase
}
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
* Tears down the unit test.
*/
protected function tearDown()
{
//$this->dropDB();
$this->dropDB();
$this->clearTranslations();
}
@@ -56,7 +55,7 @@ class WebEntryEventTest extends \WorkflowTestCase
$this->assertNull($entryEvents[0]['WE_CUSTOM_TITLE']);
$this->assertEquals($entryEvents[0]['WE_AUTHENTICATION'], 'ANONYMOUS');
$this->assertEquals($entryEvents[0]['WE_HIDE_INFORMATION_BAR'], '0');
$this->assertEquals($entryEvents[0]['WE_CALLBACK'], 'PROCESS_MAKER');
$this->assertEquals($entryEvents[0]['WE_CALLBACK'], 'PROCESSMAKER');
$this->assertNull($entryEvents[0]['WE_CALLBACK_URL']);
$this->assertEquals($entryEvents[0]['WE_LINK_GENERATION'], 'DEFAULT');
$this->assertNull($entryEvents[0]['WE_LINK_SKIN']);
@@ -74,7 +73,7 @@ class WebEntryEventTest extends \WorkflowTestCase
$this->assertNull($entryEvents[0]['WE_CUSTOM_TITLE']);
$this->assertEquals($entryEvents[0]['WE_AUTHENTICATION'], 'ANONYMOUS');
$this->assertEquals($entryEvents[0]['WE_HIDE_INFORMATION_BAR'], '0');
$this->assertEquals($entryEvents[0]['WE_CALLBACK'], 'PROCESS_MAKER');
$this->assertEquals($entryEvents[0]['WE_CALLBACK'], 'PROCESSMAKER');
$this->assertNull($entryEvents[0]['WE_CALLBACK_URL']);
$this->assertEquals($entryEvents[0]['WE_LINK_GENERATION'], 'DEFAULT');
$this->assertNull($entryEvents[0]['WE_LINK_SKIN']);
@@ -152,19 +151,20 @@ class WebEntryEventTest extends \WorkflowTestCase
$processUid = $this->processUid2;
$entryEvents = $this->object->getWebEntryEvents($processUid);
$this->createWebEntryEvent(
$processUid, $entryEvents,
$processUid,
$entryEvents,
[
'WEE_URL' => $this->domain."/sys".SYS_SYS."/".SYS_LANG."/".SYS_SKIN."/".$processUid."/custom.php",
'WE_TYPE' => "MULTIPLE",
'WE_CUSTOM_TITLE' => $this->customTitle,
'WE_AUTHENTICATION' => 'ANONYMOUS',
'WE_HIDE_INFORMATION_BAR' => "0",
'WE_CALLBACK' => "PROCESS_MAKER",
'WE_CALLBACK_URL' => "http://domain.localhost/callback",
'WE_LINK_GENERATION' => "ADVANCED",
'WE_LINK_SKIN' => SYS_SKIN,
'WE_LINK_LANGUAGE' => SYS_LANG,
'WE_LINK_DOMAIN' => $this->domain,
'WEE_URL' => $this->domain."/sys".SYS_SYS."/".SYS_LANG."/".SYS_SKIN."/".$processUid."/custom.php",
'WE_TYPE' => "MULTIPLE",
'WE_CUSTOM_TITLE' => $this->customTitle,
'WE_AUTHENTICATION' => 'ANONYMOUS',
'WE_HIDE_INFORMATION_BAR' => "0",
'WE_CALLBACK' => "PROCESSMAKER",
'WE_CALLBACK_URL' => "http://domain.localhost/callback",
'WE_LINK_GENERATION' => "ADVANCED",
'WE_LINK_SKIN' => SYS_SKIN,
'WE_LINK_LANGUAGE' => SYS_LANG,
'WE_LINK_DOMAIN' => $this->domain,
]
);
}
@@ -279,17 +279,17 @@ class WebEntryEventTest extends \WorkflowTestCase
$this->createWebEntryEvent(
$processUid, $entryEvents,
[
'WEE_URL' => $this->domain."/sys".SYS_SYS."/".SYS_LANG."/".SYS_SKIN."/".$processUid."/custom.php",
'WE_TYPE' => "NOT-VALID-SINGLE",
'WE_CUSTOM_TITLE' => $this->customTitle,
'WE_AUTHENTICATION' => 'NOT-VALID-ANONYMOUS',
'WE_HIDE_INFORMATION_BAR' => "0",
'WE_CALLBACK' => "NOT-VALID-PROCESS_MAKER",
'WE_CALLBACK_URL' => "http://domain.localhost/callback",
'WE_LINK_GENERATION' => "NOT-VALID-ADVANCED",
'WE_LINK_SKIN' => SYS_SKIN,
'WE_LINK_LANGUAGE' => SYS_LANG,
'WE_LINK_DOMAIN' => $this->domain,
'WEE_URL' => $this->domain."/sys".SYS_SYS."/".SYS_LANG."/".SYS_SKIN."/".$processUid."/custom.php",
'WE_TYPE' => "NOT-VALID-SINGLE",
'WE_CUSTOM_TITLE' => $this->customTitle,
'WE_AUTHENTICATION' => 'NOT-VALID-ANONYMOUS',
'WE_HIDE_INFORMATION_BAR' => "0",
'WE_CALLBACK' => "NOT-VALID-PROCESSMAKER",
'WE_CALLBACK_URL' => "http://domain.localhost/callback",
'WE_LINK_GENERATION' => "NOT-VALID-ADVANCED",
'WE_LINK_SKIN' => SYS_SKIN,
'WE_LINK_LANGUAGE' => SYS_LANG,
'WE_LINK_DOMAIN' => $this->domain,
]
);
}
@@ -365,19 +365,21 @@ class WebEntryEventTest extends \WorkflowTestCase
$this->expectException(\Exception::class);
$this->expectExceptionMessageRegExp('/(Please enter a valid value for (WE_TYPE|WE_AUTHENTICATION|WE_CALLBACK|WE_LINK_GENERATION)\s*){4,4}/');
$this->object->update($webEntryEventUid, $userUidUpdater,
[
'WEE_URL' => $this->domain."/sys".SYS_SYS."/".SYS_LANG."/".SYS_SKIN."/".$processUid."/custom.php",
'WE_TYPE' => "NOT-VALID-SINGLE",
'WE_CUSTOM_TITLE' => $this->customTitle,
'WE_AUTHENTICATION' => 'NOT-VALID-ANONYMOUS',
'WE_HIDE_INFORMATION_BAR' => "0",
'WE_CALLBACK' => "NOT-VALID-PROCESS_MAKER",
'WE_CALLBACK_URL' => "http://domain.localhost/callback",
'WE_LINK_GENERATION' => "NOT-VALID-ADVANCED",
'WE_LINK_SKIN' => SYS_SKIN,
'WE_LINK_LANGUAGE' => SYS_LANG,
'WE_LINK_DOMAIN' => $this->domain,
$this->object->update(
$webEntryEventUid,
$userUidUpdater,
[
'WEE_URL' => $this->domain."/sys".SYS_SYS."/".SYS_LANG."/".SYS_SKIN."/".$processUid."/custom.php",
'WE_TYPE' => "NOT-VALID-SINGLE",
'WE_CUSTOM_TITLE' => $this->customTitle,
'WE_AUTHENTICATION' => 'NOT-VALID-ANONYMOUS',
'WE_HIDE_INFORMATION_BAR' => "0",
'WE_CALLBACK' => "NOT-VALID-PROCESSMAKER",
'WE_CALLBACK_URL' => "http://domain.localhost/callback",
'WE_LINK_GENERATION' => "NOT-VALID-ADVANCED",
'WE_LINK_SKIN' => SYS_SKIN,
'WE_LINK_LANGUAGE' => SYS_LANG,
'WE_LINK_DOMAIN' => $this->domain,
]
);
}
@@ -394,9 +396,9 @@ class WebEntryEventTest extends \WorkflowTestCase
list($webEntry, $entryEvent) = $this->createWebEntryEvent(
$processUid, $entryEvents,
[
'WE_AUTHENTICATION' => 'LOGIN_REQUIRED',
'DYN_UID' => $entryEvents[0]['DYN_UID'],
'USR_UID' => null,
'WE_AUTHENTICATION' => 'LOGIN_REQUIRED',
'DYN_UID' => $entryEvents[0]['DYN_UID'],
'USR_UID' => null,
]
);
}

2
workflow/engine/classes/model/map/WebEntryMapBuilder.php
View File

@@ -113,7 +113,7 @@ class WebEntryMapBuilder
$tMap->addValidator('WE_AUTHENTICATION', 'validValues', 'propel.validator.ValidValuesValidator', 'ANONYMOUS|LOGIN_REQUIRED', 'Please enter a valid value for WE_AUTHENTICATION');
$tMap->addValidator('WE_CALLBACK', 'validValues', 'propel.validator.ValidValuesValidator', 'PROCESS_MAKER|CUSTOM|CUSTOM_CLEAR', 'Please enter a valid value for WE_CALLBACK');
$tMap->addValidator('WE_CALLBACK', 'validValues', 'propel.validator.ValidValuesValidator', 'PROCESSMAKER|CUSTOM|CUSTOM_CLEAR', 'Please enter a valid value for WE_CALLBACK');
$tMap->addValidator('WE_LINK_GENERATION', 'validValues', 'propel.validator.ValidValuesValidator', 'DEFAULT|ADVANCED', 'Please enter a valid value for WE_LINK_GENERATION');

4
workflow/engine/classes/model/om/BaseWebEntry.php
View File

@@ -127,7 +127,7 @@ abstract class BaseWebEntry extends BaseObject implements Persistent
* The value for the we_callback field.
* @var string
*/
protected $we_callback = 'PROCESS_MAKER';
protected $we_callback = 'PROCESSMAKER';
/**
* The value for the we_callback_url field.
@@ -832,7 +832,7 @@ abstract class BaseWebEntry extends BaseObject implements Persistent
$v = (string) $v;
}
if ($this->we_callback !== $v || $v === 'PROCESS_MAKER') {
if ($this->we_callback !== $v || $v === 'PROCESSMAKER') {
$this->we_callback = $v;
$this->modifiedColumns[] = WebEntryPeer::WE_CALLBACK;
}

5
workflow/engine/config/schema.xml
View File

@@ -3344,11 +3344,10 @@
<column name="WE_UPDATE_DATE" type="TIMESTAMP" />
<!-- PROD-181: Web Entry 2.0 -->
<column name="WE_TYPE" type="VARCHAR" size="8" required="true" default="SINGLE"/>
<!-- <column name="WE_MULTIPLE_UID" type="VARCHAR" size="32" /> -->
<column name="WE_CUSTOM_TITLE" type="LONGVARCHAR" />
<column name="WE_AUTHENTICATION" type="VARCHAR" size="14" required="true" default="ANONYMOUS"/>
<column name="WE_HIDE_INFORMATION_BAR" type="BOOLEAN" default="0"/>
<column name="WE_CALLBACK" type="VARCHAR" size="13" required="true" default="PROCESS_MAKER"/>
<column name="WE_CALLBACK" type="VARCHAR" size="13" required="true" default="PROCESSMAKER"/>
<column name="WE_CALLBACK_URL" type="LONGVARCHAR" />
<column name="WE_LINK_GENERATION" type="VARCHAR" size="8" required="true" default="DEFAULT" />
<column name="WE_LINK_SKIN" type="VARCHAR" size="255" />
@@ -3361,7 +3360,7 @@
<rule name="validValues" value="ANONYMOUS|LOGIN_REQUIRED" message="Please enter a valid value for WE_AUTHENTICATION" />
</validator>
<validator column="WE_CALLBACK">
<rule name="validValues" value="PROCESS_MAKER|CUSTOM|CUSTOM_CLEAR" message="Please enter a valid value for WE_CALLBACK" />
<rule name="validValues" value="PROCESSMAKER|CUSTOM|CUSTOM_CLEAR" message="Please enter a valid value for WE_CALLBACK" />
</validator>
<validator column="WE_LINK_GENERATION">
<rule name="validValues" value="DEFAULT|ADVANCED" message="Please enter a valid value for WE_LINK_GENERATION" />

2
workflow/engine/data/mysql/schema.sql
View File

@@ -1665,7 +1665,7 @@ CREATE TABLE `WEB_ENTRY`
`WE_CUSTOM_TITLE` MEDIUMTEXT,
`WE_AUTHENTICATION` VARCHAR(14) default 'ANONYMOUS' NOT NULL,
`WE_HIDE_INFORMATION_BAR` INTEGER default 0,
`WE_CALLBACK` VARCHAR(13) default 'PROCESS_MAKER' NOT NULL,
`WE_CALLBACK` VARCHAR(13) default 'PROCESSMAKER' NOT NULL,
`WE_CALLBACK_URL` MEDIUMTEXT,
`WE_LINK_GENERATION` VARCHAR(8) default 'DEFAULT' NOT NULL,
`WE_LINK_SKIN` VARCHAR(255),

2
workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
View File

@@ -386,7 +386,7 @@ class WebEntry
$dynaForm = new \Dynaform();
if(!empty($arrayWebEntryData["DYN_UID"])) {
if (!empty($arrayWebEntryData["DYN_UID"])) {
$arrayDynaFormData = $dynaForm->Load($arrayWebEntryData["DYN_UID"]);
}

10
workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEvent.php
View File

@@ -390,11 +390,11 @@ class WebEntryEvent
$result = $workflow->addRoute($this->webEntryEventWebEntryTaskUid, $activityUid, "SEQUENTIAL");
//WebEntry
if(isset($arrayData['WE_LINK_GENERATION']) && $arrayData['WE_LINK_GENERATION']==='ADVANCED') {
if (isset($arrayData['WE_LINK_GENERATION']) && $arrayData['WE_LINK_GENERATION']==='ADVANCED') {
$arrayData['WE_DATA'] = isset($arrayData['WEE_URL'])?$arrayData['WEE_URL']:null;
}
$data0 = [];
foreach($arrayData as $k => $v) {
foreach ($arrayData as $k => $v) {
$exists = array_search($k, [
'WE_DATA',
'WE_TYPE',
@@ -408,7 +408,7 @@ class WebEntryEvent
'WE_LINK_LANGUAGE',
'WE_LINK_DOMAIN',
]);
if($exists!==false) {
if ($exists !== false) {
$data0[$k] = $v;
}
}
@@ -750,7 +750,7 @@ class WebEntryEvent
'WE_LINK_DOMAIN' => 'WE_LINK_DOMAIN',
'WE_DATA' => 'WEE_URL',
];
foreach($webEntryMap as $k => $v) {
foreach ($webEntryMap as $k => $v) {
if (array_key_exists($v, $arrayData)) {
$arrayDataAux[$k] = $arrayData[$v];
}
@@ -878,7 +878,6 @@ class WebEntryEvent
$criteria->addSelectColumn(\WebEntryPeer::WE_DATA . " AS WEE_WE_URL");
$criteria->addSelectColumn(\WebEntryPeer::WE_CUSTOM_TITLE);
$criteria->addSelectColumn(\WebEntryPeer::WE_TYPE);
//$criteria->addSelectColumn(\WebEntryPeer::WE_MULTIPLE_UID);
$criteria->addSelectColumn(\WebEntryPeer::WE_AUTHENTICATION);
$criteria->addSelectColumn(\WebEntryPeer::WE_HIDE_INFORMATION_BAR);
$criteria->addSelectColumn(\WebEntryPeer::WE_CALLBACK);
@@ -927,7 +926,6 @@ class WebEntryEvent
$this->getFieldNameByFormatFieldName("WEE_URL") => $record["WEE_WE_URL"]."",
$this->getFieldNameByFormatFieldName("WE_TYPE") => $record["WE_TYPE"],
$this->getFieldNameByFormatFieldName("WE_CUSTOM_TITLE") => $record["WE_CUSTOM_TITLE"],
//$this->getFieldNameByFormatFieldName("WE_MULTIPLE_UID") => $record["WE_MULTIPLE_UID"],
$this->getFieldNameByFormatFieldName("WE_AUTHENTICATION") => $record["WE_AUTHENTICATION"],
$this->getFieldNameByFormatFieldName("WE_HIDE_INFORMATION_BAR") => $record["WE_HIDE_INFORMATION_BAR"],
$this->getFieldNameByFormatFieldName("WE_CALLBACK") => $record["WE_CALLBACK"],