diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php b/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php index 949597353..80b153d0f 100644 --- a/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php +++ b/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php @@ -401,17 +401,17 @@ class WorkflowBpmn extends Project\Workflow $rsCriteria = \BpmnFlowPeer::doSelectRS($criteria); $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC); - $gatwayParentUid = ""; + $gatewayParentUid = ""; if ($rsCriteria->next()) { $row = $rsCriteria->getRow(); - $gatwayParentUid = $row["GAT_UID"]; + $gatewayParentUid = $row["GAT_UID"]; } else { throw new \Exception(\G::LoadTranslation("ID_ROUTE_PARENT_DOES_NOT_EXIST_FOR_ROUTE_SECJOIN")); } - $arrayGatewayData = $this->bp->getGateway2($gatwayParentUid); + $arrayGatewayData = $this->bp->getGateway2($gatewayParentUid); $gatewayParentType = $arrayGatewayData["GAT_TYPE"]; diff --git a/workflow/engine/src/ProcessMaker/Project/Bpmn.php b/workflow/engine/src/ProcessMaker/Project/Bpmn.php index ab610a6bc..83b1b5ec0 100644 --- a/workflow/engine/src/ProcessMaker/Project/Bpmn.php +++ b/workflow/engine/src/ProcessMaker/Project/Bpmn.php @@ -559,7 +559,7 @@ class Bpmn extends Handler return $gateway; } - public function getGateway2($gatwayUid) + public function getGateway2($gatewayUid) { try { $criteria = new Criteria("workflow"); @@ -567,7 +567,7 @@ class Bpmn extends Handler $criteria->addSelectColumn(GatewayPeer::TABLE_NAME . ".*"); $criteria->addSelectColumn(BoundPeer::TABLE_NAME . ".*"); $criteria->addJoin(GatewayPeer::GAT_UID, BoundPeer::ELEMENT_UID, Criteria::LEFT_JOIN); - $criteria->add(GatewayPeer::GAT_UID, $gatwayUid, Criteria::EQUAL); + $criteria->add(GatewayPeer::GAT_UID, $gatewayUid, Criteria::EQUAL); $rsCriteria = GatewayPeer::doSelectRS($criteria); $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC); @@ -1059,12 +1059,12 @@ class Bpmn extends Handler $this->update(array("PRJ_STATUS" => $status)); } - public function getGatewayByDirectionActivityAndFlow($gatwayDirection, $activityUid) + public function getGatewayByDirectionActivityAndFlow($gatewayDirection, $activityUid) { try { $criteria = new Criteria("workflow"); - if ($gatwayDirection == "DIVERGING") { + if ($gatewayDirection == "DIVERGING") { $criteria->addSelectColumn(FlowPeer::FLO_ELEMENT_DEST . " AS GAT_UID"); $criteria->add(FlowPeer::FLO_ELEMENT_ORIGIN, $activityUid, Criteria::EQUAL); @@ -1085,16 +1085,16 @@ class Bpmn extends Handler $rsCriteria = FlowPeer::doSelectRS($criteria); $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC); - $gatwayUid = ""; + $gatewayUid = ""; if ($rsCriteria->next()) { $row = $rsCriteria->getRow(); - $gatwayUid = $row["GAT_UID"]; + $gatewayUid = $row["GAT_UID"]; } //Return - return $this->getGateway2($gatwayUid); + return $this->getGateway2($gatewayUid); } catch (\Exception $e) { throw $e; }