From 794a9afe3ea320f6d30bcc90153cf19c438b55d0 Mon Sep 17 00:00:00 2001 From: odain Date: Tue, 2 Sep 2025 19:23:34 +0200 Subject: [PATCH] fix broken setup --- setup/modulediscovery.class.inc.php | 4 +++- setup/runtimeenv.class.inc.php | 4 +++- setup/wizardsteps.class.inc.php | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/setup/modulediscovery.class.inc.php b/setup/modulediscovery.class.inc.php index bf9af1973..1021c93b2 100644 --- a/setup/modulediscovery.class.inc.php +++ b/setup/modulediscovery.class.inc.php @@ -19,6 +19,8 @@ * */ +use Combodo\iTop\PhpParser\Evaluation\PhpExpressionEvaluator; + require_once(APPROOT.'setup/modulediscovery/ModuleFileReader.php'); class MissingDependencyException extends CoreException @@ -391,7 +393,7 @@ class ModuleDiscovery { $sBooleanExpr = str_replace(array_keys($aReplacements), array_values($aReplacements), $sDepString); try{ - $bResult = \evaluation\expression\PhpExpressionEvaluator::GetInstance()->ParseAndEvaluateBooleanExpression($sBooleanExpr); + $bResult = PhpExpressionEvaluator::GetInstance()->ParseAndEvaluateBooleanExpression($sBooleanExpr); } catch(ModuleFileReaderException $e){ //logged already echo "Failed to parse the boolean Expression = '$sBooleanExpr'
"; diff --git a/setup/runtimeenv.class.inc.php b/setup/runtimeenv.class.inc.php index 45f52dacd..7cf0129b3 100644 --- a/setup/runtimeenv.class.inc.php +++ b/setup/runtimeenv.class.inc.php @@ -24,6 +24,8 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ +use Combodo\iTop\PhpParser\Evaluation\PhpExpressionEvaluator; + require_once APPROOT."setup/modulediscovery.class.inc.php"; require_once APPROOT.'setup/modelfactory.class.inc.php'; require_once APPROOT.'setup/compiler.class.inc.php'; @@ -459,7 +461,7 @@ class RunTimeEnvironment { SetupInfo::SetSelectedModules($aRet); try{ - $bSelected = \evaluation\expression\PhpExpressionEvaluator::GetInstance()->ParseAndEvaluateBooleanExpression($oModule->GetAutoSelect()); + $bSelected = PhpExpressionEvaluator::GetInstance()->ParseAndEvaluateBooleanExpression($oModule->GetAutoSelect()); if ($bSelected) { $aRet[$oModule->GetName()] = $oModule; // store the Id of the selected module diff --git a/setup/wizardsteps.class.inc.php b/setup/wizardsteps.class.inc.php index a64156851..b99111d46 100644 --- a/setup/wizardsteps.class.inc.php +++ b/setup/wizardsteps.class.inc.php @@ -40,6 +40,7 @@ */ use Combodo\iTop\Application\WebPage\WebPage; +use Combodo\iTop\PhpParser\Evaluation\PhpExpressionEvaluator; require_once(APPROOT.'setup/setuputils.class.inc.php'); require_once(APPROOT.'setup/parameters.class.inc.php'); @@ -1787,7 +1788,7 @@ EOF // Check the module selection try { SetupInfo::SetSelectedModules($aModules); - $bSelected = \evaluation\expression\PhpExpressionEvaluator::GetInstance()->ParseAndEvaluateBooleanExpression($aInfo['auto_select']); + $bSelected = PhpExpressionEvaluator::GetInstance()->ParseAndEvaluateBooleanExpression($aInfo['auto_select']); } catch (ModuleFileReaderException $e) { //logged already @@ -1865,7 +1866,7 @@ EOF try { SetupInfo::SetSelectedModules($aModules); - $bSelected = \evaluation\expression\PhpExpressionEvaluator::GetInstance()->ParseAndEvaluateBooleanExpression($aModule['auto_select']); + $bSelected = PhpExpressionEvaluator::GetInstance()->ParseAndEvaluateBooleanExpression($aModule['auto_select']); if ($bSelected) { $aModules[$sModuleId] = true; // store the Id of the selected module