diff --git a/lib/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php b/lib/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php
index 74fcc2fb8..c99d0f82d 100644
--- a/lib/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php
+++ b/lib/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php
@@ -3,10 +3,7 @@
 namespace PhpParser;
 
 use PhpParser\Node\Expr;
-use PhpParser\Node\Identifier;
-use PhpParser\Node\Name;
 use PhpParser\Node\Scalar;
-use Exception;
 
 use function array_merge;
 
@@ -30,531 +27,209 @@ use function array_merge;
  * affected by the LC_NUMERIC locale.
  */
 class ConstExprEvaluator {
-    /** @var callable|null */
-    private $fallbackEvaluator;
-
-	/** @var array $functionsWhiteList */
-    private $functionsWhiteList;
-
-	/** @var array $staticCallsWhitelist */
-	private $staticCallsWhitelist;
-
-    /**
-     * Create a constant expression evaluator.
-     *
-     * The provided fallback evaluator is invoked whenever a subexpression cannot be evaluated. See
-     * class doc comment for more information.
-     *
-     * @param callable|null $fallbackEvaluator To call if subexpression cannot be evaluated
-     */
-    public function __construct(?callable $fallbackEvaluator = null) {
-        $this->fallbackEvaluator = $fallbackEvaluator ?? function (Expr $expr) {
-            throw new ConstExprEvaluationException(
-                "Expression of type {$expr->getType()} cannot be evaluated"
-            );
-        };
-
-		$this->functionsWhiteList = [];
-		$this->staticCallsWhitelist = [];
-    }
-
-	public function setFunctionsWhitelist(array $functionsWhiteList): void
-	{
-		$this->functionsWhiteList = $functionsWhiteList;
-	}
-
-	public function setStaticCallsWhitelist(array $staticCallsWhitelist): void
-	{
-		$this->staticCallsWhitelist = $staticCallsWhitelist;
-    }
-
-    /**
-     * Silently evaluates a constant expression into a PHP value.
-     *
-     * Thrown Errors, warnings or notices will be converted into a ConstExprEvaluationException.
-     * The original source of the exception is available through getPrevious().
-     *
-     * If some part of the expression cannot be evaluated, the fallback evaluator passed to the
-     * constructor will be invoked. By default, if no fallback is provided, an exception of type
-     * ConstExprEvaluationException is thrown.
-     *
-     * See class doc comment for caveats and limitations.
-     *
-     * @param Expr $expr Constant expression to evaluate
-     * @return mixed Result of evaluation
-     *
-     * @throws ConstExprEvaluationException if the expression cannot be evaluated or an error occurred
-     */
-    public function evaluateSilently(Expr $expr) {
-        set_error_handler(function ($num, $str, $file, $line) {
-            throw new \ErrorException($str, 0, $num, $file, $line);
-        });
-
-        try {
-            return $this->evaluate($expr);
-        } catch (\Throwable $e) {
-            if (!$e instanceof ConstExprEvaluationException) {
-                $e = new ConstExprEvaluationException(
-                    "An error occurred during constant expression evaluation", 0, $e);
-            }
-            throw $e;
-        } finally {
-            restore_error_handler();
-        }
-    }
-
-    /**
-     * Directly evaluates a constant expression into a PHP value.
-     *
-     * May generate Error exceptions, warnings or notices. Use evaluateSilently() to convert these
-     * into a ConstExprEvaluationException.
-     *
-     * If some part of the expression cannot be evaluated, the fallback evaluator passed to the
-     * constructor will be invoked. By default, if no fallback is provided, an exception of type
-     * ConstExprEvaluationException is thrown.
-     *
-     * See class doc comment for caveats and limitations.
-     *
-     * @param Expr $expr Constant expression to evaluate
-     * @return mixed Result of evaluation
-     *
-     * @throws ConstExprEvaluationException if the expression cannot be evaluated
-     */
-    public function evaluateDirectly(Expr $expr) {
-        return $this->evaluate($expr);
-    }
-
-    /** @return mixed */
-    private function evaluate(Expr $expr) {
-        if ($expr instanceof Scalar\Int_
-            || $expr instanceof Scalar\Float_
-            || $expr instanceof Scalar\String_
-        ) {
-            return $expr->value;
-        }
-
-        if ($expr instanceof Expr\Array_) {
-            return $this->evaluateArray($expr);
-        }
-
-	    if ($expr instanceof Expr\Variable) {
-		    return $this->evaluateVariable($expr);
-	    }
-
-        // Unary operators
-        if ($expr instanceof Expr\UnaryPlus) {
-            return +$this->evaluate($expr->expr);
-        }
-        if ($expr instanceof Expr\UnaryMinus) {
-            return -$this->evaluate($expr->expr);
-        }
-        if ($expr instanceof Expr\BooleanNot) {
-            return !$this->evaluate($expr->expr);
-        }
-        if ($expr instanceof Expr\BitwiseNot) {
-            return ~$this->evaluate($expr->expr);
-        }
-
-        if ($expr instanceof Expr\BinaryOp) {
-            return $this->evaluateBinaryOp($expr);
-        }
-
-        if ($expr instanceof Expr\Ternary) {
-            return $this->evaluateTernary($expr);
-        }
-
-        if ($expr instanceof Expr\ArrayDimFetch && null !== $expr->dim) {
-            return $this->evaluate($expr->var)[$this->evaluate($expr->dim)];
-        }
-
-        if ($expr instanceof Expr\ConstFetch) {
-            return $this->evaluateConstFetch($expr);
-        }
-
-	    if ($expr instanceof Expr\Isset_) {
-		    return $this->evaluateIsset($expr);
-	    }
-
-	    if ($expr instanceof Expr\ClassConstFetch) {
-		    return $this->evaluateClassConstFetch($expr);
-	    }
-
-	    if ($expr instanceof Expr\Cast) {
-		    return $this->evaluateCast($expr);
-	    }
-
-	    if ($expr instanceof Expr\StaticPropertyFetch) {
-		    return $this->evaluateStaticPropertyFetch($expr);
-	    }
-
-	    if ($expr instanceof Expr\FuncCall) {
-		    return $this->evaluateFuncCall($expr);
-	    }
-
-	    if ($expr instanceof Expr\StaticCall) {
-		    return $this->evaluateStaticCall($expr);
-	    }
-
-	    if ($expr instanceof Expr\NullsafePropertyFetch||$expr instanceof Expr\PropertyFetch) {
-		    return $this->evaluatePropertyFetch($expr);
-	    }
-
-	    if ($expr instanceof Expr\NullsafeMethodCall||$expr instanceof Expr\MethodCall) {
-		    return $this->evaluateMethodCall($expr);
-	    }
-        return ($this->fallbackEvaluator)($expr);
-    }
-
-    private function evaluateArray(Expr\Array_ $expr): array {
-        $array = [];
-        foreach ($expr->items as $item) {
-            if (null !== $item->key) {
-                $array[$this->evaluate($item->key)] = $this->evaluate($item->value);
-            } elseif ($item->unpack) {
-                $array = array_merge($array, $this->evaluate($item->value));
-            } else {
-                $array[] = $this->evaluate($item->value);
-            }
-        }
-        return $array;
-    }
-
-    /** @return mixed */
-    private function evaluateTernary(Expr\Ternary $expr) {
-        if (null === $expr->if) {
-            return $this->evaluate($expr->cond) ?: $this->evaluate($expr->else);
-        }
-
-        return $this->evaluate($expr->cond)
-            ? $this->evaluate($expr->if)
-            : $this->evaluate($expr->else);
-    }
-
-    /** @return mixed */
-    private function evaluateBinaryOp(Expr\BinaryOp $expr) {
-	    if ($expr instanceof Expr\BinaryOp\Coalesce) {
-		    try {
-			    $var = $this->evaluate($expr->left);
-			    return $var ?? $this->evaluate($expr->right);
-		    } catch(\Throwable $t){
-			    //handle when isset($expr->left->var)===false
-				return $this->evaluate($expr->right);
-            }
-        }
-
-        // The evaluate() calls are repeated in each branch, because some of the operators are
-        // short-circuiting and evaluating the RHS in advance may be illegal in that case
-        $l = $expr->left;
-        $r = $expr->right;
-        switch ($expr->getOperatorSigil()) {
-            case '&':   return $this->evaluate($l) &   $this->evaluate($r);
-            case '|':   return $this->evaluate($l) |   $this->evaluate($r);
-            case '^':   return $this->evaluate($l) ^   $this->evaluate($r);
-            case '&&':  return $this->evaluate($l) &&  $this->evaluate($r);
-            case '||':  return $this->evaluate($l) ||  $this->evaluate($r);
-            case '??':  return $this->evaluate($l) ??  $this->evaluate($r);
-            case '.':   return $this->evaluate($l) .   $this->evaluate($r);
-            case '/':   return $this->evaluate($l) /   $this->evaluate($r);
-            case '==':  return $this->evaluate($l) ==  $this->evaluate($r);
-            case '>':   return $this->evaluate($l) >   $this->evaluate($r);
-            case '>=':  return $this->evaluate($l) >=  $this->evaluate($r);
-            case '===': return $this->evaluate($l) === $this->evaluate($r);
-            case 'and': return $this->evaluate($l) and $this->evaluate($r);
-            case 'or':  return $this->evaluate($l) or  $this->evaluate($r);
-            case 'xor': return $this->evaluate($l) xor $this->evaluate($r);
-            case '-':   return $this->evaluate($l) -   $this->evaluate($r);
-            case '%':   return $this->evaluate($l) %   $this->evaluate($r);
-            case '*':   return $this->evaluate($l) *   $this->evaluate($r);
-            case '!=':  return $this->evaluate($l) !=  $this->evaluate($r);
-            case '!==': return $this->evaluate($l) !== $this->evaluate($r);
-            case '+':   return $this->evaluate($l) +   $this->evaluate($r);
-            case '**':  return $this->evaluate($l) **  $this->evaluate($r);
-            case '<<':  return $this->evaluate($l) <<  $this->evaluate($r);
-            case '>>':  return $this->evaluate($l) >>  $this->evaluate($r);
-            case '<':   return $this->evaluate($l) <   $this->evaluate($r);
-            case '<=':  return $this->evaluate($l) <=  $this->evaluate($r);
-            case '<=>': return $this->evaluate($l) <=> $this->evaluate($r);
-            case '|>':
-                $lval = $this->evaluate($l);
-                return $this->evaluate($r)($lval);
-        }
-
-        throw new \Exception('Should not happen');
-    }
-
-    /** @return mixed */
-    private function evaluateConstFetch(Expr\ConstFetch $expr) {
-	    try {
-			$name = $expr->name;
-			if(! is_string($name)){
-				//PHP_VERSION_ID usecase
-				$name = $name->name;
-	        }
-
-		    if (defined($name)){
-			    return constant($name);
-		    }
-		} catch(\Throwable $t){}
-
-        return ($this->fallbackEvaluator)($expr);
-    }
-
-	/** @return mixed */
-	private function evaluateIsset(Expr\Isset_ $expr) {
-		try {
-			foreach ($expr->vars as $var){
-				$var = $this->evaluate($var);
-				if (! isset($var)){
-					return false;
-				}
-			}
-
-			return true;
-		} catch(\Throwable $t){
-			return false;
-		}
-	}
-
-	/** @return mixed */
-	private function evaluateClassConstFetch(Expr\ClassConstFetch $expr) {
-		try {
-			$classname = $expr->class->name;
-			$property = $expr->name->name;
-
-			if ('class' === $property){
-				return $classname;
-			}
-
-			if (class_exists($classname)){
-				$class = new \ReflectionClass($classname);
-				if (array_key_exists($property, $class->getConstants())) {
-					$oReflectionConstant = $class->getReflectionConstant($property);
-					if ($oReflectionConstant->isPublic()){
-						return $class->getConstant($property);
-					}
-				}
-			}
-		} catch(\Throwable $t){}
-
-		return ($this->fallbackEvaluator)($expr);
-	}
-
-	/** @return mixed */
-	private function evaluateCast(Expr\Cast $expr) {
-		try {
-			$subexpr = $this->evaluate($expr->expr);
-			$type = get_class($expr);
-			switch ($type){
-				case Expr\Cast\Array_::class:
-					return (array) $subexpr;
-
-				case Expr\Cast\Bool_::class:
-					return (bool) $subexpr;
-
-				case Expr\Cast\Double::class:
-					switch ($expr->getAttribute("kind")){
-						case Expr\Cast\Double::KIND_DOUBLE:
-							return (double) $subexpr;
-
-						case Expr\Cast\Double::KIND_FLOAT:
-						case Expr\Cast\Double::KIND_REAL:
-							return (float) $subexpr;
-					}
-
-					break;
-
-				case Expr\Cast\Int_::class:
-					return (int) $subexpr;
-
-				case Expr\Cast\Object_::class:
-					return (object) $subexpr;
-
-				case Expr\Cast\String_::class:
-					return (string) $subexpr;
-			}
-		} catch(\Throwable $t){
-		}
-
-		return ($this->fallbackEvaluator)($expr);
-	}
-
-	/** @return mixed */
-	private function evaluateStaticPropertyFetch(Expr\StaticPropertyFetch $expr)
-	{
-		try {
-			$classname = $expr->class->name;
-			if ($expr->name instanceof Identifier){
-				$property = $expr->name->name;
-			} else {
-				$property = $this->evaluate($expr->name);
-			}
-
-			if (class_exists($classname)){
-				$class = new \ReflectionClass($classname);
-				if (array_key_exists($property, $class->getStaticProperties())) {
-					$oReflectionProperty = $class->getProperty($property);
-					if ($oReflectionProperty->isPublic()){
-						return $class->getStaticPropertyValue($property);
-					}
-				}
-			}
-		}
-		catch (\Throwable $t) {}
-
-		return ($this->fallbackEvaluator)($expr);
-	}
-
-	/** @return mixed */
-	private function evaluateFuncCall(Expr\FuncCall $expr)
-	{
-		try {
-			$name = $expr->name;
-			if ($name instanceof Name){
-				$function = $name->name;
-			} else {
-				$function = $this->evaluate($name);
-			}
-
-			if (! in_array($function, $this->functionsWhiteList)){
-				throw new Exception("FuncCall $function not supported");
-			}
-
-			$args=[];
-			foreach ($expr->args as $arg){
-				/** @var \PhpParser\Node\Arg $arg */
-				$args[]=$arg->value->value;
-			}
-
-			$reflection_function = new \ReflectionFunction($function);
-			return $reflection_function->invoke(...$args);
-		}
-		catch (\Throwable $t) {}
-
-		return ($this->fallbackEvaluator)($expr);
-	}
-
-	/** @return mixed */
-	private function evaluateVariable(Expr\Variable $expr)
-	{
-		try {
-			$name = $expr->name;
-			if (array_key_exists($name, get_defined_vars())) {
-				return $$name;
-			}
-
-			if (array_key_exists($name, $GLOBALS)) {
-				global $$name;
-				return $$name;
-			}
-		} catch (\Throwable $t) {
-		}
-
-		return ($this->fallbackEvaluator)($expr);
-	}
-
-	/** @return mixed */
-	private function evaluateStaticCall(Expr\StaticCall $expr)
-	{
-		try {
-			$class = $expr->class->name;
-			if ($expr->name instanceof Identifier){
-				$method = $expr->name->name;
-			} else {
-				$method = $this->evaluate($expr->name);
-			}
-
-			$static_call_description = "$class::$method";
-			if (! in_array($static_call_description, $this->staticCallsWhitelist)){
-				throw new Exception("StaticCall $static_call_description not supported");
-			}
-
-			$args=[];
-			foreach ($expr->args as $arg){
-				/** @var \PhpParser\Node\Arg $arg */
-				$args[]=$arg->value->value;
-			}
-
-			$class = new \ReflectionClass($class);
-			$method = $class->getMethod($method);
-			if ($method->isPublic()){
-				return $method->invokeArgs(null, $args);
-			}
-		} catch (\Throwable $t) {}
-
-		return ($this->fallbackEvaluator)($expr);
+	/** @var callable|null */
+	private $fallbackEvaluator;
+
+	/**
+	 * Create a constant expression evaluator.
+	 *
+	 * The provided fallback evaluator is invoked whenever a subexpression cannot be evaluated. See
+	 * class doc comment for more information.
+	 *
+	 * @param callable|null $fallbackEvaluator To call if subexpression cannot be evaluated
+	 */
+	public function __construct(?callable $fallbackEvaluator = null) {
+		$this->fallbackEvaluator = $fallbackEvaluator ?? function (Expr $expr) {
+			throw new ConstExprEvaluationException(
+				"Expression of type {$expr->getType()} cannot be evaluated"
+			);
+		};
 	}
 
 	/**
-	 * @param \PhpParser\Node\Expr\NullsafePropertyFetch|\PhpParser\Node\Expr\PropertyFetch $expr
+	 * Silently evaluates a constant expression into a PHP value.
 	 *
-	 * @return mixed
+	 * Thrown Errors, warnings or notices will be converted into a ConstExprEvaluationException.
+	 * The original source of the exception is available through getPrevious().
+	 *
+	 * If some part of the expression cannot be evaluated, the fallback evaluator passed to the
+	 * constructor will be invoked. By default, if no fallback is provided, an exception of type
+	 * ConstExprEvaluationException is thrown.
+	 *
+	 * See class doc comment for caveats and limitations.
+	 *
+	 * @param Expr $expr Constant expression to evaluate
+	 * @return mixed Result of evaluation
+	 *
+	 * @throws ConstExprEvaluationException if the expression cannot be evaluated or an error occurred
 	 */
-	private function evaluatePropertyFetch($expr)
-	{
+	public function evaluateSilently(Expr $expr) {
+		set_error_handler(function ($num, $str, $file, $line) {
+			throw new \ErrorException($str, 0, $num, $file, $line);
+		});
+
 		try {
-			$var = $this->evaluate($expr->var);
-		} catch (\Throwable $t) {
-			$var = null;
+			return $this->evaluate($expr);
+		} catch (\Throwable $e) {
+			if (!$e instanceof ConstExprEvaluationException) {
+				$e = new ConstExprEvaluationException(
+					"An error occurred during constant expression evaluation", 0, $e);
+			}
+			throw $e;
+		} finally {
+			restore_error_handler();
+		}
+	}
+
+	/**
+	 * Directly evaluates a constant expression into a PHP value.
+	 *
+	 * May generate Error exceptions, warnings or notices. Use evaluateSilently() to convert these
+	 * into a ConstExprEvaluationException.
+	 *
+	 * If some part of the expression cannot be evaluated, the fallback evaluator passed to the
+	 * constructor will be invoked. By default, if no fallback is provided, an exception of type
+	 * ConstExprEvaluationException is thrown.
+	 *
+	 * See class doc comment for caveats and limitations.
+	 *
+	 * @param Expr $expr Constant expression to evaluate
+	 * @return mixed Result of evaluation
+	 *
+	 * @throws ConstExprEvaluationException if the expression cannot be evaluated
+	 */
+	public function evaluateDirectly(Expr $expr) {
+		return $this->evaluate($expr);
+	}
+
+	/** @return mixed */
+	private function evaluate(Expr $expr) {
+		if ($expr instanceof Scalar\Int_
+			|| $expr instanceof Scalar\Float_
+			|| $expr instanceof Scalar\String_
+		) {
+			return $expr->value;
 		}
 
-		if (! is_null($var)) {
-			try {
-				if ($expr->name instanceof Identifier) {
-					$name = $expr->name->name;
-				} else {
-					$name = $this->evaluate($expr->name);
-				}
+		if ($expr instanceof Expr\Array_) {
+			return $this->evaluateArray($expr);
+		}
 
-				$reflectionClass = new \ReflectionClass(get_class($var));
-				$property = $reflectionClass->getProperty($name);
-				if ($property->isPublic()) {
-					return $property->getValue($var);
-				}
-			}
-			catch (\Throwable $t) {}
-		} else if ($expr instanceof Expr\NullsafePropertyFetch){
-			return null;
+		// Unary operators
+		if ($expr instanceof Expr\UnaryPlus) {
+			return +$this->evaluate($expr->expr);
+		}
+		if ($expr instanceof Expr\UnaryMinus) {
+			return -$this->evaluate($expr->expr);
+		}
+		if ($expr instanceof Expr\BooleanNot) {
+			return !$this->evaluate($expr->expr);
+		}
+		if ($expr instanceof Expr\BitwiseNot) {
+			return ~$this->evaluate($expr->expr);
+		}
+
+		if ($expr instanceof Expr\BinaryOp) {
+			return $this->evaluateBinaryOp($expr);
+		}
+
+		if ($expr instanceof Expr\Ternary) {
+			return $this->evaluateTernary($expr);
+		}
+
+		if ($expr instanceof Expr\ArrayDimFetch && null !== $expr->dim) {
+			return $this->evaluate($expr->var)[$this->evaluate($expr->dim)];
+		}
+
+		if ($expr instanceof Expr\ConstFetch) {
+			return $this->evaluateConstFetch($expr);
 		}
 
 		return ($this->fallbackEvaluator)($expr);
 	}
 
-	/**
-	 * @param \PhpParser\Node\Expr\MethodCall|\PhpParser\Node\Expr\NullsafeMethodCall $expr
-	 *
-	 * @return mixed
-	 */
-	private function evaluateMethodCall($expr)
-	{
-		try {
-			$var = $this->evaluate($expr->var);
-		} catch (\Throwable $t) {
-			$var = null;
+	private function evaluateArray(Expr\Array_ $expr): array {
+		$array = [];
+		foreach ($expr->items as $item) {
+			if (null !== $item->key) {
+				$array[$this->evaluate($item->key)] = $this->evaluate($item->value);
+			} elseif ($item->unpack) {
+				$array = array_merge($array, $this->evaluate($item->value));
+			} else {
+				$array[] = $this->evaluate($item->value);
+			}
+		}
+		return $array;
+	}
+
+	/** @return mixed */
+	private function evaluateTernary(Expr\Ternary $expr) {
+		if (null === $expr->if) {
+			return $this->evaluate($expr->cond) ?: $this->evaluate($expr->else);
 		}
 
-		if (! is_null($var)) {
-			try {
-				$args = [];
-				foreach ($expr->args as $arg) {
-				/** @var \PhpParser\Node\Arg $arg */
-					$args[] = $arg->value->value;
-			}
+		return $this->evaluate($expr->cond)
+			? $this->evaluate($expr->if)
+			: $this->evaluate($expr->else);
+	}
 
-			if ($expr->name instanceof Identifier) {
-				$name = $expr->name->name;
-			} else {
-				$name = $this->evaluate($expr->name);
-			}
+	/** @return mixed */
+	private function evaluateBinaryOp(Expr\BinaryOp $expr) {
+		if ($expr instanceof Expr\BinaryOp\Coalesce
+			&& $expr->left instanceof Expr\ArrayDimFetch
+		) {
+			// This needs to be special cased to respect BP_VAR_IS fetch semantics
+			return $this->evaluate($expr->left->var)[$this->evaluate($expr->left->dim)]
+				?? $this->evaluate($expr->right);
+		}
 
-			$reflectionClass = new \ReflectionClass(get_class($var));
-			$method = $reflectionClass->getMethod($name);
-				if ($method->isPublic()) {
-					return $method->invokeArgs($var, $args);
-				}
-			}
-			catch (\Throwable $t) {}
-		} else if ($expr instanceof Expr\NullsafeMethodCall){
-			return null;
+		// The evaluate() calls are repeated in each branch, because some of the operators are
+		// short-circuiting and evaluating the RHS in advance may be illegal in that case
+		$l = $expr->left;
+		$r = $expr->right;
+		switch ($expr->getOperatorSigil()) {
+			case '&':   return $this->evaluate($l) &   $this->evaluate($r);
+			case '|':   return $this->evaluate($l) |   $this->evaluate($r);
+			case '^':   return $this->evaluate($l) ^   $this->evaluate($r);
+			case '&&':  return $this->evaluate($l) &&  $this->evaluate($r);
+			case '||':  return $this->evaluate($l) ||  $this->evaluate($r);
+			case '??':  return $this->evaluate($l) ??  $this->evaluate($r);
+			case '.':   return $this->evaluate($l) .   $this->evaluate($r);
+			case '/':   return $this->evaluate($l) /   $this->evaluate($r);
+			case '==':  return $this->evaluate($l) ==  $this->evaluate($r);
+			case '>':   return $this->evaluate($l) >   $this->evaluate($r);
+			case '>=':  return $this->evaluate($l) >=  $this->evaluate($r);
+			case '===': return $this->evaluate($l) === $this->evaluate($r);
+			case 'and': return $this->evaluate($l) and $this->evaluate($r);
+			case 'or':  return $this->evaluate($l) or  $this->evaluate($r);
+			case 'xor': return $this->evaluate($l) xor $this->evaluate($r);
+			case '-':   return $this->evaluate($l) -   $this->evaluate($r);
+			case '%':   return $this->evaluate($l) %   $this->evaluate($r);
+			case '*':   return $this->evaluate($l) *   $this->evaluate($r);
+			case '!=':  return $this->evaluate($l) !=  $this->evaluate($r);
+			case '!==': return $this->evaluate($l) !== $this->evaluate($r);
+			case '+':   return $this->evaluate($l) +   $this->evaluate($r);
+			case '**':  return $this->evaluate($l) **  $this->evaluate($r);
+			case '<<':  return $this->evaluate($l) <<  $this->evaluate($r);
+			case '>>':  return $this->evaluate($l) >>  $this->evaluate($r);
+			case '<':   return $this->evaluate($l) <   $this->evaluate($r);
+			case '<=':  return $this->evaluate($l) <=  $this->evaluate($r);
+			case '<=>': return $this->evaluate($l) <=> $this->evaluate($r);
+			case '|>':
+				$lval = $this->evaluate($l);
+				return $this->evaluate($r)($lval);
+		}
+
+		throw new \Exception('Should not happen');
+	}
+
+	/** @return mixed */
+	private function evaluateConstFetch(Expr\ConstFetch $expr) {
+		$name = $expr->name->toLowerString();
+		switch ($name) {
+			case 'null': return null;
+			case 'false': return false;
+			case 'true': return true;
 		}
 
 		return ($this->fallbackEvaluator)($expr);
diff --git a/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php b/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php
index 4b870c31d..1d36bb8b7 100644
--- a/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php
+++ b/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php
@@ -12,7 +12,7 @@ class PhpExpressionEvaluator {
 
 	/** @var iExprEvaluator[] $aPhpParserEvaluators */
 	private static array $aPhpParserEvaluators;
-	private int $iMode=self::ITOP_ALGO;
+	private int $iMode=self::LIB_AND_FALLBACK;
 
 	protected function __construct() {
 	}
@@ -79,8 +79,6 @@ class PhpExpressionEvaluator {
 			$oConstExprEvaluator = new ConstExprEvaluator([$this, "EvaluateExpressionLocally"]);
 		}
 
-		$oConstExprEvaluator->setFunctionsWhitelist(FuncCallEvaluator::WHITELIST);
-		$oConstExprEvaluator->setStaticcallsWhitelist(StaticCallEvaluator::WHITELIST);
 		return $oConstExprEvaluator->evaluateDirectly($oExpression);
 	}
 
diff --git a/tests/php-unit-tests/unitary-tests/setup/modulediscovery/ModuleFileReaderTest.php b/tests/php-unit-tests/unitary-tests/setup/modulediscovery/ModuleFileReaderTest.php
index 7b0c52b93..6b74b2c35 100644
--- a/tests/php-unit-tests/unitary-tests/setup/modulediscovery/ModuleFileReaderTest.php
+++ b/tests/php-unit-tests/unitary-tests/setup/modulediscovery/ModuleFileReaderTest.php
@@ -16,7 +16,7 @@ class ModuleFileReaderTest extends ItopDataTestCase
 
 	public function testReadModuleFileInformationUnsafe()
 	{
-		$sModuleFilePath = __DIR__.'/resources/module.itop-full-itil.php';
+		$sModuleFilePath = __DIR__.'/resources/all/module.itop-full-itil.php';
 		$aRes = ModuleFileReader::GetInstance()->ReadModuleFileInformationUnsafe($sModuleFilePath);
 
 		$this->assertCount(3, $aRes);
@@ -27,52 +27,23 @@ class ModuleFileReaderTest extends ItopDataTestCase
 		$this->assertEquals('Bridge - Request management ITIL + Incident management ITIL', $aRes[2]['label'] ?? null);
 	}
 
-	public function testAllReadModuleFileConfiguration()
-	{
-		$_SERVER=[
-			'SERVER_NAME' => 'titi'
-		];
-
-		$aErrors=[];
-		foreach (glob(__DIR__.'/resources/all_designer/*.php') as $sModuleFilePath){
-			//var_dump($sModuleFilePath);
-			try{
-				$aRes = ModuleFileReader::GetInstance()->ReadModuleFileInformation($sModuleFilePath);
-			} catch(\Exception $e){
-				$aErrors[]=basename($sModuleFilePath);
-				continue;
-			}
-
-			$aExpected = ModuleFileReader::GetInstance()->ReadModuleFileInformationUnsafe($sModuleFilePath);
-
-			if ($aExpected !== $aRes){
-				$aErrors[]=basename($sModuleFilePath);
-				continue;
-			}
-			//break;
-			//$this->assertEquals($aExpected, $aRes, $sModuleFilePath);
-		}
-
-		$this->assertEquals([], $aErrors, var_export($aErrors, true));
-	}
-
 	public static function ReadModuleFileConfigurationFileNameProvider()
 	{
-		return [
-			'nominal case : module.itop-full-itil.php' => ['module.itop-full-itil.php'],
-			'constant as value of a dict entry: module.authent-ldap.php' => ['module.authent-ldap.php'],
-			'int operation evaluation required: email-synchro' => ['module.combodo-email-synchro.php'],
-			'module.itop-admin-delegation-profiles-bridge-for-combodo-email-synchro.php' => ['module.itop-admin-delegation-profiles-bridge-for-combodo-email-synchro.php'],
-			'unknown class name to evaluation as installer: module.itop-global-requests-mgmt.php' => ['module.itop-global-requests-mgmt.php'],
-		];
+		$aUsecases=[];
+		foreach (glob(__DIR__.'/resources/all/*.php') as $sModuleFilePath){
+			$aUsecases[basename($sModuleFilePath)]=[$sModuleFilePath];
+		}
+		return $aUsecases;
 	}
 
 	/**
 	 * @dataProvider ReadModuleFileConfigurationFileNameProvider
 	 */
-	public function testReadModuleFileConfigurationVsLegacyMethod(string $sModuleBasename)
+	public function testReadModuleFileConfigurationVsLegacyMethod(string $sModuleFilePath)
 	{
-		$sModuleFilePath = __DIR__."/resources/$sModuleBasename";
+		$_SERVER=[
+			'SERVER_NAME' => 'titi'
+		];
 		$aRes = ModuleFileReader::GetInstance()->ReadModuleFileInformation($sModuleFilePath);
 		$aExpected = ModuleFileReader::GetInstance()->ReadModuleFileInformationUnsafe($sModuleFilePath);
 
@@ -92,8 +63,7 @@ class ModuleFileReaderTest extends ItopDataTestCase
 	 * @throws \ModuleFileReaderException
 	 */
 	public function testReadModuleFileConfiguration_BadlyWrittenDependencies(){
-		//$sModuleFilePath = __DIR__."/resources/module.combodo-make-it-vip.php";
-		$sModuleFilePath = __DIR__."/resources/module.itop-admin-delegation-profiles.php";
+		$sModuleFilePath = __DIR__."/resources/all/module.itop-admin-delegation-profiles.php";
 		$aRes = ModuleFileReader::GetInstance()->ReadModuleFileInformation($sModuleFilePath);
 		$aExpected = ModuleFileReader::GetInstance()->ReadModuleFileInformationUnsafe($sModuleFilePath);
 
@@ -243,7 +213,7 @@ PHP;
 	public function testGetAndCheckModuleInstallerClass()
 	{
 		$sModuleInstallerClass = "TicketsInstaller" . uniqid();
-		$sPHpCode = file_get_contents(__DIR__.'/resources/module.itop-tickets.php');
+		$sPHpCode = file_get_contents(__DIR__.'/resources/all/module.itop-tickets.php');
 		$sPHpCode = str_replace("TicketsInstaller", $sModuleInstallerClass, $sPHpCode);
 		$this->sTempModuleFilePath = tempnam(__DIR__, "test");
 		file_put_contents($this->sTempModuleFilePath, $sPHpCode);
diff --git a/tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/module.authent-ldap.php b/tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/all/module.authent-ldap.php
similarity index 100%
rename from tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/module.authent-ldap.php
rename to tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/all/module.authent-ldap.php
diff --git a/tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/module.combodo-email-synchro.php b/tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/all/module.combodo-email-synchro.php
similarity index 100%
rename from tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/module.combodo-email-synchro.php
rename to tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/all/module.combodo-email-synchro.php
diff --git a/tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/module.itop-admin-delegation-profiles-bridge-for-combodo-email-synchro.php b/tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/all/module.itop-admin-delegation-profiles-bridge-for-combodo-email-synchro.php
similarity index 100%
rename from tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/module.itop-admin-delegation-profiles-bridge-for-combodo-email-synchro.php
rename to tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/all/module.itop-admin-delegation-profiles-bridge-for-combodo-email-synchro.php
diff --git a/tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/module.itop-admin-delegation-profiles.php b/tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/all/module.itop-admin-delegation-profiles.php
similarity index 100%
rename from tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/module.itop-admin-delegation-profiles.php
rename to tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/all/module.itop-admin-delegation-profiles.php
diff --git a/tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/module.itop-full-itil.php b/tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/all/module.itop-full-itil.php
similarity index 100%
rename from tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/module.itop-full-itil.php
rename to tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/all/module.itop-full-itil.php
diff --git a/tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/module.itop-global-requests-mgmt.php b/tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/all/module.itop-global-requests-mgmt.php
similarity index 100%
rename from tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/module.itop-global-requests-mgmt.php
rename to tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/all/module.itop-global-requests-mgmt.php
diff --git a/tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/module.itop-tickets.php b/tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/all/module.itop-tickets.php
similarity index 100%
rename from tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/module.itop-tickets.php
rename to tests/php-unit-tests/unitary-tests/setup/modulediscovery/resources/all/module.itop-tickets.php
diff --git a/tests/php-unit-tests/unitary-tests/sources/PhpParser/Evaluation/PhpExpressionEvaluatorTest.php b/tests/php-unit-tests/unitary-tests/sources/PhpParser/Evaluation/PhpExpressionEvaluatorTest.php
index 1e722dc8f..d305e80e9 100644
--- a/tests/php-unit-tests/unitary-tests/sources/PhpParser/Evaluation/PhpExpressionEvaluatorTest.php
+++ b/tests/php-unit-tests/unitary-tests/sources/PhpParser/Evaluation/PhpExpressionEvaluatorTest.php
@@ -119,14 +119,6 @@ class PhpExpressionEvaluatorTest extends ItopDataTestCase {
 		$this->evaluateExpressionWithMode($sExpression, $forced_expected, PhpExpressionEvaluator::LIB_AND_FALLBACK);
 	}
 
-	/**
-	 * @dataProvider EvaluateExpressionProvider
-	 */
-	public function testEvaluateExpressionWithLibOnly($sExpression, $forced_expected="NOTPROVIDED")
-	{
-		$this->evaluateExpressionWithMode($sExpression, $forced_expected, PhpExpressionEvaluator::LIB_ONLY);
-	}
-
 	public function evaluateExpressionWithMode($sExpression, $forced_expected, $iMode)
 	{
 		global $oGlobalNonNullVar;