From 74778581f15d43822539be8c6d23dd10178a3b94 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Thu, 30 Jan 2025 12:32:59 -0400 Subject: [PATCH 1/2] FOUR-21688 Wrong argument when starting a new case --- ProcessMaker/Repositories/TokenRepository.php | 4 ++-- package-lock.json | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ProcessMaker/Repositories/TokenRepository.php b/ProcessMaker/Repositories/TokenRepository.php index 5f6368c3a4..b970f5b1c1 100644 --- a/ProcessMaker/Repositories/TokenRepository.php +++ b/ProcessMaker/Repositories/TokenRepository.php @@ -242,10 +242,10 @@ private function getDueVariable(ActivityInterface $activity, TokenInterface $tok $mustache = new Mustache_Engine(); $mustacheDueVariable = $mustache->render($dueVariable, $instanceData); - return is_numeric($mustacheDueVariable) ? $mustacheDueVariable : '72'; + return is_numeric($mustacheDueVariable) ? $mustacheDueVariable : 72; } - return $activity->getProperty('dueIn', '72'); + return (int) $activity->getProperty('dueIn', '72'); } /** diff --git a/package-lock.json b/package-lock.json index 21e6a71224..2e2f4b4be0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13893,7 +13893,7 @@ "resolved": "https://registry.npmjs.org/isomorphic.js/-/isomorphic.js-0.2.5.tgz", "integrity": "sha512-PIeMbHqMt4DnUP3MA/Flc0HElYjMXArsw1qwJZcm9sqR8mq3l8NYizFMty0pWwE/tzIGH3EKK5+jes5mAr85yw==", "funding": { - "type": "GitHub Sponsors \u2764", + "type": "GitHub Sponsors ❤", "url": "https://github.com/sponsors/dmonad" } }, @@ -15038,7 +15038,7 @@ "node": ">=16" }, "funding": { - "type": "GitHub Sponsors \u2764", + "type": "GitHub Sponsors ❤", "url": "https://github.com/sponsors/dmonad" } }, @@ -23279,7 +23279,7 @@ "lib0": "^0.2.31" }, "funding": { - "type": "GitHub Sponsors \u2764", + "type": "GitHub Sponsors ❤", "url": "https://github.com/sponsors/dmonad" }, "peerDependencies": { @@ -23298,7 +23298,7 @@ "npm": ">=8.0.0" }, "funding": { - "type": "GitHub Sponsors \u2764", + "type": "GitHub Sponsors ❤", "url": "https://github.com/sponsors/dmonad" }, "peerDependencies": { @@ -23323,7 +23323,7 @@ "npm": ">=8.0.0" }, "funding": { - "type": "GitHub Sponsors \u2764", + "type": "GitHub Sponsors ❤", "url": "https://github.com/sponsors/dmonad" }, "optionalDependencies": { @@ -23561,7 +23561,7 @@ "npm": ">=8.0.0" }, "funding": { - "type": "GitHub Sponsors \u2764", + "type": "GitHub Sponsors ❤", "url": "https://github.com/sponsors/dmonad" } }, From 59016f782e88c1b350c074c5cf9222bb714acf37 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Thu, 30 Jan 2025 12:41:57 -0400 Subject: [PATCH 2/2] FOUR-21688 Revert unnecessary changes in package-lock.json --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2e2f4b4be0..21e6a71224 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13893,7 +13893,7 @@ "resolved": "https://registry.npmjs.org/isomorphic.js/-/isomorphic.js-0.2.5.tgz", "integrity": "sha512-PIeMbHqMt4DnUP3MA/Flc0HElYjMXArsw1qwJZcm9sqR8mq3l8NYizFMty0pWwE/tzIGH3EKK5+jes5mAr85yw==", "funding": { - "type": "GitHub Sponsors ❤", + "type": "GitHub Sponsors \u2764", "url": "https://github.com/sponsors/dmonad" } }, @@ -15038,7 +15038,7 @@ "node": ">=16" }, "funding": { - "type": "GitHub Sponsors ❤", + "type": "GitHub Sponsors \u2764", "url": "https://github.com/sponsors/dmonad" } }, @@ -23279,7 +23279,7 @@ "lib0": "^0.2.31" }, "funding": { - "type": "GitHub Sponsors ❤", + "type": "GitHub Sponsors \u2764", "url": "https://github.com/sponsors/dmonad" }, "peerDependencies": { @@ -23298,7 +23298,7 @@ "npm": ">=8.0.0" }, "funding": { - "type": "GitHub Sponsors ❤", + "type": "GitHub Sponsors \u2764", "url": "https://github.com/sponsors/dmonad" }, "peerDependencies": { @@ -23323,7 +23323,7 @@ "npm": ">=8.0.0" }, "funding": { - "type": "GitHub Sponsors ❤", + "type": "GitHub Sponsors \u2764", "url": "https://github.com/sponsors/dmonad" }, "optionalDependencies": { @@ -23561,7 +23561,7 @@ "npm": ">=8.0.0" }, "funding": { - "type": "GitHub Sponsors ❤", + "type": "GitHub Sponsors \u2764", "url": "https://github.com/sponsors/dmonad" } },