Merged in bugfix/PMC-1403 (pull request #7141)

PMC-1403 Targeting a 'switch' control structure with a 'continue' statement is strongly discouraged and will throw a warning as of PHP 7.3.

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Roly
2019-11-28 15:08:51 +00:00
committed by Julio Cesar Laura Avendaño

View File

@@ -729,6 +729,7 @@ class ProcessMap
$urlEdit = ''; $urlEdit = '';
$linkEditValue = ''; $linkEditValue = '';
$shouldItContinue = false;
switch ($aRow['STEP_TYPE_OBJ']) { switch ($aRow['STEP_TYPE_OBJ']) {
case 'DYNAFORM': case 'DYNAFORM':
$oDynaform = new Dynaform(); $oDynaform = new Dynaform();
@@ -748,7 +749,8 @@ class ProcessMap
$oInputDocument = new InputDocument(); $oInputDocument = new InputDocument();
$aFields = $oInputDocument->getByUid($aRow['STEP_UID_OBJ']); $aFields = $oInputDocument->getByUid($aRow['STEP_UID_OBJ']);
if ($aFields === false) { if ($aFields === false) {
continue; $shouldItContinue = true;
break;
} }
$sTitle = $aFields['INP_DOC_TITLE']; $sTitle = $aFields['INP_DOC_TITLE'];
break; break;
@@ -757,7 +759,8 @@ class ProcessMap
$aFields = $oOutputDocument->getByUid($aRow['STEP_UID_OBJ']); $aFields = $oOutputDocument->getByUid($aRow['STEP_UID_OBJ']);
if ($aFields === false) { if ($aFields === false) {
continue; $shouldItContinue = true;
break;
} }
$sTitle = $aFields['OUT_DOC_TITLE']; $sTitle = $aFields['OUT_DOC_TITLE'];
break; break;
@@ -777,6 +780,9 @@ class ProcessMap
} }
break; break;
} }
if ($shouldItContinue === true) {
continue;
}
$aSteps[] = array('STEP_TITLE' => $sTitle, 'STEP_UID' => $aRow['STEP_UID'], 'STEP_TYPE_OBJ' => $aRow['STEP_TYPE_OBJ'], 'STEP_MODE' => $aRow['STEP_MODE'], 'STEP_CONDITION' => $aRow['STEP_CONDITION'], 'STEP_POSITION' => $aRow['STEP_POSITION'], 'urlEdit' => $urlEdit, 'linkEditValue' => $linkEditValue, 'PRO_UID' => $aRow['PRO_UID'] $aSteps[] = array('STEP_TITLE' => $sTitle, 'STEP_UID' => $aRow['STEP_UID'], 'STEP_TYPE_OBJ' => $aRow['STEP_TYPE_OBJ'], 'STEP_MODE' => $aRow['STEP_MODE'], 'STEP_CONDITION' => $aRow['STEP_CONDITION'], 'STEP_POSITION' => $aRow['STEP_POSITION'], 'urlEdit' => $urlEdit, 'linkEditValue' => $linkEditValue, 'PRO_UID' => $aRow['PRO_UID']
); );