From edf16e4d0a57fbbacfcbd419b55b0d57b8081277 Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Tue, 26 Nov 2019 08:35:43 -0400 Subject: [PATCH] PMC-1395 Fatal error: Declaration of remove() --- gulliver/system/class.headPublisher.php | 2 +- .../engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gulliver/system/class.headPublisher.php b/gulliver/system/class.headPublisher.php index b153f05a7..0317f4359 100644 --- a/gulliver/system/class.headPublisher.php +++ b/gulliver/system/class.headPublisher.php @@ -758,7 +758,7 @@ class headPublisher $sjson = $oServerConf->getProperty($keyState); if ($sjson !== "") { $json = G::json_decode($sjson); - if ((is_array($json) || is_object($json)) && sizeof($json)){ + if (is_iterable($json)) { foreach ($json as $key => $value) { $views[$key] = $value; } diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php b/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php index 3971d6926..517c5924d 100644 --- a/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php +++ b/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php @@ -87,9 +87,9 @@ class WorkflowBpmn extends Project\Workflow return parent::getList($start, $limit, $filter, $changeCaseTo); } - public function remove() + public function remove($flagRemoveCases = true, $onlyDiagram = false) { - parent::remove(); + parent::remove($flagRemoveCases, $onlyDiagram); $this->bp->remove(); }