move PhpParser/Evaluation classes in a specific namespave + composer dumpautoload

This commit is contained in:
odain
2025-09-02 19:19:56 +02:00
parent 1962cd7a88
commit ac2b787e09
33 changed files with 92 additions and 42 deletions

View File

@@ -14,7 +14,10 @@ if (PHP_VERSION_ID < 50600) {
echo $err;
}
}
throw new RuntimeException($err);
trigger_error(
$err,
E_USER_ERROR
);
}
require_once __DIR__ . '/composer/autoload_real.php';

View File

@@ -469,6 +469,31 @@ return array(
'Combodo\\iTop\\Form\\Validator\\NotEmptyExtKeyValidator' => $baseDir . '/sources/Form/Validator/NotEmptyExtKeyValidator.php',
'Combodo\\iTop\\Form\\Validator\\SelectObjectValidator' => $baseDir . '/sources/Form/Validator/SelectObjectValidator.php',
'Combodo\\iTop\\Kernel' => $baseDir . '/sources/Kernel.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\ArrayDimFetchEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/ArrayDimFetchEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\ArrayEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/ArrayEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\BinaryOpEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/BinaryOpEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\BitwiseAndEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/BitwiseAndEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\BitwiseOrEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/BitwiseOrEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\BooleanAndEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/BooleanAndEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\BooleanNotEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/BooleanNotEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\BooleanOrEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/BooleanOrEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\ClassConstFetchEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/ClassConstFetchEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\ConcatEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/ConcatEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\ConstFetchEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/ConstFetchEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\EqualEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/EqualEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\FuncCallEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/FuncCallEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\GreaterEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/GreaterEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\GreaterOrEqualEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/GreaterOrEqualEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\MulEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/MulEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\NotEqualEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/NotEqualEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\PhpExpressionEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\SmallerEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/SmallerEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\SmallerOrEqualEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/SmallerOrEqualEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\StaticCallEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/StaticCallEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\StaticPropertyFetchEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/StaticPropertyFetchEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\UnaryMinusEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/UnaryMinusEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\VariableEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/VariableEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\iExprEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/iExprEvaluator.php',
'Combodo\\iTop\\Renderer\\BlockRenderer' => $baseDir . '/sources/Renderer/BlockRenderer.php',
'Combodo\\iTop\\Renderer\\Bootstrap\\BsFieldRendererMappings' => $baseDir . '/sources/Renderer/Bootstrap/BsFieldRendererMappings.php',
'Combodo\\iTop\\Renderer\\Bootstrap\\BsFormRenderer' => $baseDir . '/sources/Renderer/Bootstrap/BsFormRenderer.php',

View File

@@ -56,7 +56,7 @@ return array(
'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
'Pelago\\Emogrifier\\' => array($vendorDir . '/pelago/emogrifier/src'),
'League\\OAuth2\\Client\\' => array($vendorDir . '/league/oauth2-google/src', $vendorDir . '/league/oauth2-client/src'),
'League\\OAuth2\\Client\\' => array($vendorDir . '/league/oauth2-client/src', $vendorDir . '/league/oauth2-google/src'),
'Laminas\\Validator\\' => array($vendorDir . '/laminas/laminas-validator/src'),
'Laminas\\Stdlib\\' => array($vendorDir . '/laminas/laminas-stdlib/src'),
'Laminas\\ServiceManager\\' => array($vendorDir . '/laminas/laminas-servicemanager/src'),

View File

@@ -317,8 +317,8 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
),
'League\\OAuth2\\Client\\' =>
array (
0 => __DIR__ . '/..' . '/league/oauth2-google/src',
1 => __DIR__ . '/..' . '/league/oauth2-client/src',
0 => __DIR__ . '/..' . '/league/oauth2-client/src',
1 => __DIR__ . '/..' . '/league/oauth2-google/src',
),
'Laminas\\Validator\\' =>
array (
@@ -847,6 +847,31 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
'Combodo\\iTop\\Form\\Validator\\NotEmptyExtKeyValidator' => __DIR__ . '/../..' . '/sources/Form/Validator/NotEmptyExtKeyValidator.php',
'Combodo\\iTop\\Form\\Validator\\SelectObjectValidator' => __DIR__ . '/../..' . '/sources/Form/Validator/SelectObjectValidator.php',
'Combodo\\iTop\\Kernel' => __DIR__ . '/../..' . '/sources/Kernel.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\ArrayDimFetchEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/ArrayDimFetchEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\ArrayEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/ArrayEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\BinaryOpEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/BinaryOpEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\BitwiseAndEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/BitwiseAndEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\BitwiseOrEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/BitwiseOrEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\BooleanAndEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/BooleanAndEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\BooleanNotEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/BooleanNotEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\BooleanOrEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/BooleanOrEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\ClassConstFetchEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/ClassConstFetchEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\ConcatEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/ConcatEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\ConstFetchEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/ConstFetchEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\EqualEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/EqualEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\FuncCallEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/FuncCallEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\GreaterEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/GreaterEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\GreaterOrEqualEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/GreaterOrEqualEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\MulEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/MulEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\NotEqualEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/NotEqualEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\PhpExpressionEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\SmallerEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/SmallerEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\SmallerOrEqualEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/SmallerOrEqualEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\StaticCallEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/StaticCallEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\StaticPropertyFetchEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/StaticPropertyFetchEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\UnaryMinusEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/UnaryMinusEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\VariableEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/VariableEvaluator.php',
'Combodo\\iTop\\PhpParser\\Evaluation\\iExprEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/iExprEvaluator.php',
'Combodo\\iTop\\Renderer\\BlockRenderer' => __DIR__ . '/../..' . '/sources/Renderer/BlockRenderer.php',
'Combodo\\iTop\\Renderer\\Bootstrap\\BsFieldRendererMappings' => __DIR__ . '/../..' . '/sources/Renderer/Bootstrap/BsFieldRendererMappings.php',
'Combodo\\iTop\\Renderer\\Bootstrap\\BsFormRenderer' => __DIR__ . '/../..' . '/sources/Renderer/Bootstrap/BsFormRenderer.php',

View File

@@ -36,7 +36,8 @@ if ($issues) {
echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
}
}
throw new \RuntimeException(
'Composer detected issues in your platform: ' . implode(' ', $issues)
trigger_error(
'Composer detected issues in your platform: ' . implode(' ', $issues),
E_USER_ERROR
);
}

View File

@@ -1,11 +1,10 @@
<?php
use evaluation\expression\PhpExpressionEvaluator;
use PhpParser\Node\Expr;
use Combodo\iTop\PhpParser\Evaluation\PhpExpressionEvaluator;
use PhpParser\Node\Expr\Assign;
use PhpParser\ParserFactory;
require_once APPROOT . 'sources/PhpParser/Evaluation/PhpExpressionEvaluator.php';
require_once __DIR__ . "/evaluation/expression/PhpExpressionEvaluator.php";
class ModuleFileParser {
private static ModuleFileParser $oInstance;

View File

@@ -1,8 +1,5 @@
<?php
use PhpParser\ParserFactory;
use PhpParser\Node\Expr\Assign;
require_once __DIR__ . '/ModuleFileParser.php';
require_once __DIR__ . '/ModuleFileReaderException.php';

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\ArrayDimFetch;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use ModuleFileReaderException;
use PhpParser\Node\Expr;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\BinaryOp;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr\BinaryOp\BitwiseAnd;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr\BinaryOp\BitwiseOr;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr\BinaryOp\BooleanAnd;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\BooleanNot;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr\BinaryOp\BooleanOr;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\ClassConstFetch;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr\BinaryOp\Concat;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\ConstFetch;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr\BinaryOp\Equal;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use ModuleFileReaderException;
use PhpParser\Node\Expr;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr\BinaryOp\Greater;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr\BinaryOp\GreaterOrEqual;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr\BinaryOp\Mul;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr\BinaryOp\NotEqual;

View File

@@ -1,8 +1,8 @@
<?php
#Combodo\\iTop\\
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;
use ModuleFileParser;
use PhpParser\Node\Expr;
require_once __DIR__ . '/iExprEvaluator.php';
@@ -22,7 +22,7 @@ class PhpExpressionEvaluator {
foreach (glob(__DIR__ . "/**Evaluator.php") as $sFile){
require_once $sFile;
$sNamespace = 'evaluation\\expression\\';
$sNamespace = 'Combodo\\iTop\PhpParser\\Evaluation\\';
$sClass = $sNamespace. str_replace(".php", "", basename($sFile));
$oReflectionClass = new \ReflectionClass($sClass);
if ($oReflectionClass->isInstantiable()
@@ -69,7 +69,7 @@ class PhpExpressionEvaluator {
$sExpr;
PHP;
try{
$aNodes = \ModuleFileParser::GetInstance()->ParsePhpCode($sPhpContent);
$aNodes = ModuleFileParser::GetInstance()->ParsePhpCode($sPhpContent);
$oExpr = $aNodes[0];
return $this->EvaluateExpression($oExpr->expr);

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr\BinaryOp\Smaller;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr\BinaryOp\SmallerOrEqual;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use ModuleFileReaderException;
use PhpParser\Node\Expr;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\StaticPropertyFetch;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\BinaryOp;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\ClassConstFetch;

View File

@@ -1,6 +1,6 @@
<?php
namespace evaluation\expression;
namespace Combodo\iTop\PhpParser\Evaluation;;
use PhpParser\Node\Expr;

View File

@@ -1,9 +1,9 @@
<?php
namespace Combodo\iTop\Test\UnitTest\Setup\ModuleDiscovery;
namespace Combodo\iTop\Test\UnitTest\Sources\PhpParser\Evaluation;
use Combodo\iTop\PhpParser\Evaluation\PhpExpressionEvaluator;
use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
use evaluation\expression\PhpExpressionEvaluator;
class PhpExpressionEvaluatorTest extends ItopDataTestCase {
public static $STATIC_PROPERTY = 123;