From 4b20786cd6de0aa2608a6b24950e144930a441ff Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Fri, 11 May 2018 14:30:50 -0400 Subject: [PATCH] HOR-4547: incompatible data type --- thirdparty/phing/ProjectComponent.php | 2 +- thirdparty/phing/types/Mapper.php | 2 +- workflow/engine/classes/model/AppAssignSelfServiceValue.php | 2 +- workflow/engine/classes/model/Language.php | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/thirdparty/phing/ProjectComponent.php b/thirdparty/phing/ProjectComponent.php index d8fc751e7..f85bad05f 100644 --- a/thirdparty/phing/ProjectComponent.php +++ b/thirdparty/phing/ProjectComponent.php @@ -44,7 +44,7 @@ abstract class ProjectComponent { * @param object The reference to the current project * @access public */ - function setProject($project) { + function setProject(Project $project) { $this->project = $project; } diff --git a/thirdparty/phing/types/Mapper.php b/thirdparty/phing/types/Mapper.php index a84d246e5..cbf9b4600 100644 --- a/thirdparty/phing/types/Mapper.php +++ b/thirdparty/phing/types/Mapper.php @@ -134,7 +134,7 @@ class Mapper extends DataType { * * You must not set any other attribute if you make it a reference. */ - function setRefid($r) { + function setRefid(Reference $r) { if ($this->type !== null || $this->from !== null || $this->to !== null) { throw DataType::tooManyAttributes(); } diff --git a/workflow/engine/classes/model/AppAssignSelfServiceValue.php b/workflow/engine/classes/model/AppAssignSelfServiceValue.php index e5e41f4a7..a2c48430c 100644 --- a/workflow/engine/classes/model/AppAssignSelfServiceValue.php +++ b/workflow/engine/classes/model/AppAssignSelfServiceValue.php @@ -10,7 +10,7 @@ class AppAssignSelfServiceValue extends BaseAppAssignSelfServiceValue * * return void */ - public function create($applicationUid, $delIndex, array $arrayData, $dataVariable) + public function create($applicationUid, $delIndex, array $arrayData, $dataVariable = []) { try { $cnn = Propel::getConnection(AppAssignSelfServiceValuePeer::DATABASE_NAME); diff --git a/workflow/engine/classes/model/Language.php b/workflow/engine/classes/model/Language.php index 1785e8759..e0457eddc 100644 --- a/workflow/engine/classes/model/Language.php +++ b/workflow/engine/classes/model/Language.php @@ -571,7 +571,8 @@ class Language extends BaseLanguage $buildhash = file_get_contents($buildhash); $michelangeloFE = PATH_HTML . "lib/js"; - $pathFileMafe = array_pop(glob($michelangeloFE . '/' . '*' . $buildhash . '*', GLOB_BRACE)); + $array = glob($michelangeloFE . '/' . '*' . $buildhash . '*', GLOB_BRACE); + $pathFileMafe = array_pop($array); if (file_exists($pathFileMafe) && is_readable($pathFileMafe)) { $labels = self::readLabelsDirectory($pathFileMafe, true); }