N°4789 - Parse datamodel module.xxx.php files instead of interpreting them (#746) - namespacing ModuleFileReader classes

This commit is contained in:
odain
2025-09-16 15:38:30 +02:00
parent fae2bcc6e9
commit c0c9ea9287
13 changed files with 63 additions and 29 deletions

View File

@@ -2,8 +2,9 @@
namespace Combodo\iTop\Test\UnitTest\Setup\ModuleDiscovery;
use Combodo\iTop\Setup\ModuleDiscovery\ModuleFileReaderException;
use Combodo\iTop\Setup\ModuleDiscovery\ModuleFileReader;
use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
use ModuleFileReader;
class ModuleFileReaderTest extends ItopDataTestCase
{
@@ -59,7 +60,7 @@ class ModuleFileReaderTest extends ItopDataTestCase
{
$sModuleFilePath = __DIR__.'/resources/module.__MODULE__.php';
$this->expectException(\ModuleFileReaderException::class);
$this->expectException(ModuleFileReaderException::class);
$this->expectExceptionMessage("Syntax error, unexpected T_CONSTANT_ENCAPSED_STRING, expecting ',' or ']' or ')' on line 31");
ModuleFileReader::GetInstance()->ReadModuleFileInformation($sModuleFilePath);

View File

@@ -162,7 +162,7 @@ class PhpExpressionEvaluatorTest extends ItopDataTestCase {
global $oEvaluationFakeClass;
$oEvaluationFakeClass = new EvaluationFakeClass();
$this->expectException(\ModuleFileReaderException::class);
$this->expectException(ModuleFileReaderException::class);
$oPhpExpressionEvaluator = new PhpExpressionEvaluator();
$oPhpExpressionEvaluator->ParseAndEvaluateExpression($sExpression);
}
@@ -172,7 +172,7 @@ class PhpExpressionEvaluatorTest extends ItopDataTestCase {
* @param string $sBooleanExpr
*
* @return mixed
* @throws \ModuleFileReaderException
* @throws ModuleFileReaderException
*/
private function UnprotectedComputeExpression(string $sExpr) : mixed
{