composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-25 13:24:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

replace eval by iTop custom evaluation classes

Browse Source
This commit is contained in:
odain
2025-09-02 17:03:02 +02:00
parent f7b5091b39
commit 1962cd7a88
22 changed files with 357 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
setup/modulediscovery/ModuleFileParser.php
View File

@@ -75,7 +75,7 @@ class ModuleFileParser {
throw new ModuleFileReaderException("2nd parameter to SetupWebPage::AddModule not a string: " . get_class($oModuleId->value), 0, null, $sModuleFilePath);
}
$sModuleId = $this->EvaluateExpression($oModuleId->value);
$sModuleId = PhpExpressionEvaluator::GetInstance()->EvaluateExpression($oModuleId->value);
$oModuleConfigInfo = $aArgs[2];
if (false === ($oModuleConfigInfo instanceof PhpParser\Node\Arg)) {
@@ -87,7 +87,7 @@ class ModuleFileParser {
throw new ModuleFileReaderException("3rd parameter to SetupWebPage::AddModule not an array: " . get_class($oModuleConfigInfo->value), 0, null, $sModuleFilePath);
}
$aModuleConfig = $this->EvaluateExpression($oModuleConfigInfo->value);
$aModuleConfig = PhpExpressionEvaluator::GetInstance()->EvaluateExpression($oModuleConfigInfo->value);
if (! is_array($aModuleConfig)){
throw new ModuleFileReaderException("3rd parameter to SetupWebPage::AddModule not an array: " . get_class($oModuleConfigInfo->value), 0, null, $sModuleFilePath);
@@ -109,7 +109,7 @@ class ModuleFileParser {
*/
public function GetModuleInformationFromIf(string $sModuleFilePath, \PhpParser\Node\Stmt\If_ $oNode) : ?array
{
$bCondition = $this->EvaluateExpression($oNode->cond);
$bCondition = PhpExpressionEvaluator::GetInstance()->EvaluateExpression($oNode->cond);
if ($bCondition) {
foreach ($oNode->stmts as $oSubNode) {
if ($oSubNode instanceof \PhpParser\Node\Stmt\Expression) {
@@ -126,7 +126,7 @@ class ModuleFileParser {
if (! is_null($oNode->elseifs)) {
foreach ($oNode->elseifs as $oElseIfSubNode) {
/** @var \PhpParser\Node\Stmt\ElseIf_ $oElseIfSubNode */
$bCondition = $this->EvaluateExpression($oElseIfSubNode->cond);
$bCondition = PhpExpressionEvaluator::GetInstance()->EvaluateExpression($oElseIfSubNode->cond);
if ($bCondition) {
return $this->GetModuleConfigurationFromStatement($sModuleFilePath, $oElseIfSubNode->stmts);
}
@@ -153,20 +153,4 @@ class ModuleFileParser {
return null;
}
/**
* @param string $sBooleanExpr
*
* @return bool
* @throws ModuleFileReaderException
*/
public function EvaluateBooleanExpression(string $sBooleanExpr) : bool
{
return PhpExpressionEvaluator::GetInstance()->ParseAndEvaluateBooleanExpression($sBooleanExpr);
}
private function EvaluateExpression(Expr $oExpression) : mixed
{
return PhpExpressionEvaluator::GetInstance()->EvaluateExpression($oExpression);
}
}