nextcloud / fulltextsearch_elasticsearch

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp.php

Indentation +28 added lines, -28 removed lines

@@ -6,35 +6,35 @@
 
 abstract class BinaryOp extends Expr
 {
-    /** @var Expr The left hand side expression */
-    public $left;
-    /** @var Expr The right hand side expression */
-    public $right;
+	/** @var Expr The left hand side expression */
+	public $left;
+	/** @var Expr The right hand side expression */
+	public $right;
 
-    /**
-     * Constructs a binary operator node.
-     *
-     * @param Expr  $left       The left hand side expression
-     * @param Expr  $right      The right hand side expression
-     * @param array $attributes Additional attributes
-     */
-    public function __construct(Expr $left, Expr $right, array $attributes = []) {
-        $this->attributes = $attributes;
-        $this->left = $left;
-        $this->right = $right;
-    }
+	/**
+	 * Constructs a binary operator node.
+	 *
+	 * @param Expr  $left       The left hand side expression
+	 * @param Expr  $right      The right hand side expression
+	 * @param array $attributes Additional attributes
+	 */
+	public function __construct(Expr $left, Expr $right, array $attributes = []) {
+		$this->attributes = $attributes;
+		$this->left = $left;
+		$this->right = $right;
+	}
 
-    public function getSubNodeNames() : array {
-        return ['left', 'right'];
-    }
+	public function getSubNodeNames() : array {
+		return ['left', 'right'];
+	}
 
-    /**
-     * Get the operator sigil for this binary operation.
-     *
-     * In the case there are multiple possible sigils for an operator, this method does not
-     * necessarily return the one used in the parsed code.
-     *
-     * @return string
-     */
-    abstract public function getOperatorSigil() : string;
+	/**
+	 * Get the operator sigil for this binary operation.
+	 *
+	 * In the case there are multiple possible sigils for an operator, this method does not
+	 * necessarily return the one used in the parsed code.
+	 *
+	 * @return string
+	 */
+	abstract public function getOperatorSigil() : string;
 }

Braces +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
 
 use PhpParser\Node\Expr;
 
-abstract class BinaryOp extends Expr
-{
+abstract class BinaryOp extends Expr {
     /** @var Expr The left hand side expression */
     public $left;
     /** @var Expr The right hand side expression */

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ErrorSuppress.php

Indentation +18 added lines, -18 removed lines

@@ -6,25 +6,25 @@
 
 class ErrorSuppress extends Expr
 {
-    /** @var Expr Expression */
-    public $expr;
+	/** @var Expr Expression */
+	public $expr;
 
-    /**
-     * Constructs an error suppress node.
-     *
-     * @param Expr  $expr       Expression
-     * @param array $attributes Additional attributes
-     */
-    public function __construct(Expr $expr, array $attributes = []) {
-        $this->attributes = $attributes;
-        $this->expr = $expr;
-    }
+	/**
+	 * Constructs an error suppress node.
+	 *
+	 * @param Expr  $expr       Expression
+	 * @param array $attributes Additional attributes
+	 */
+	public function __construct(Expr $expr, array $attributes = []) {
+		$this->attributes = $attributes;
+		$this->expr = $expr;
+	}
 
-    public function getSubNodeNames() : array {
-        return ['expr'];
-    }
+	public function getSubNodeNames() : array {
+		return ['expr'];
+	}
     
-    public function getType() : string {
-        return 'Expr_ErrorSuppress';
-    }
+	public function getType() : string {
+		return 'Expr_ErrorSuppress';
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
 
 use PhpParser\Node\Expr;
 
-class ErrorSuppress extends Expr
-{
+class ErrorSuppress extends Expr {
     /** @var Expr Expression */
     public $expr;
 

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafeMethodCall.php

Indentation +29 added lines, -29 removed lines

@@ -9,37 +9,37 @@
 
 class NullsafeMethodCall extends CallLike
 {
-    /** @var Expr Variable holding object */
-    public $var;
-    /** @var Identifier|Expr Method name */
-    public $name;
-    /** @var array<Arg|VariadicPlaceholder> Arguments */
-    public $args;
+	/** @var Expr Variable holding object */
+	public $var;
+	/** @var Identifier|Expr Method name */
+	public $name;
+	/** @var array<Arg|VariadicPlaceholder> Arguments */
+	public $args;
 
-    /**
-     * Constructs a nullsafe method call node.
-     *
-     * @param Expr                           $var        Variable holding object
-     * @param string|Identifier|Expr         $name       Method name
-     * @param array<Arg|VariadicPlaceholder> $args       Arguments
-     * @param array                          $attributes Additional attributes
-     */
-    public function __construct(Expr $var, $name, array $args = [], array $attributes = []) {
-        $this->attributes = $attributes;
-        $this->var = $var;
-        $this->name = \is_string($name) ? new Identifier($name) : $name;
-        $this->args = $args;
-    }
+	/**
+	 * Constructs a nullsafe method call node.
+	 *
+	 * @param Expr                           $var        Variable holding object
+	 * @param string|Identifier|Expr         $name       Method name
+	 * @param array<Arg|VariadicPlaceholder> $args       Arguments
+	 * @param array                          $attributes Additional attributes
+	 */
+	public function __construct(Expr $var, $name, array $args = [], array $attributes = []) {
+		$this->attributes = $attributes;
+		$this->var = $var;
+		$this->name = \is_string($name) ? new Identifier($name) : $name;
+		$this->args = $args;
+	}
 
-    public function getSubNodeNames() : array {
-        return ['var', 'name', 'args'];
-    }
+	public function getSubNodeNames() : array {
+		return ['var', 'name', 'args'];
+	}
     
-    public function getType() : string {
-        return 'Expr_NullsafeMethodCall';
-    }
+	public function getType() : string {
+		return 'Expr_NullsafeMethodCall';
+	}
 
-    public function getRawArgs(): array {
-        return $this->args;
-    }
+	public function getRawArgs(): array {
+		return $this->args;
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
 use PhpParser\Node\Identifier;
 use PhpParser\Node\VariadicPlaceholder;
 
-class NullsafeMethodCall extends CallLike
-{
+class NullsafeMethodCall extends CallLike {
     /** @var Expr Variable holding object */
     public $var;
     /** @var Identifier|Expr Method name */

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Isset_.php

Indentation +18 added lines, -18 removed lines

@@ -6,25 +6,25 @@
 
 class Isset_ extends Expr
 {
-    /** @var Expr[] Variables */
-    public $vars;
+	/** @var Expr[] Variables */
+	public $vars;
 
-    /**
-     * Constructs an array node.
-     *
-     * @param Expr[] $vars       Variables
-     * @param array  $attributes Additional attributes
-     */
-    public function __construct(array $vars, array $attributes = []) {
-        $this->attributes = $attributes;
-        $this->vars = $vars;
-    }
+	/**
+	 * Constructs an array node.
+	 *
+	 * @param Expr[] $vars       Variables
+	 * @param array  $attributes Additional attributes
+	 */
+	public function __construct(array $vars, array $attributes = []) {
+		$this->attributes = $attributes;
+		$this->vars = $vars;
+	}
 
-    public function getSubNodeNames() : array {
-        return ['vars'];
-    }
+	public function getSubNodeNames() : array {
+		return ['vars'];
+	}
     
-    public function getType() : string {
-        return 'Expr_Isset';
-    }
+	public function getType() : string {
+		return 'Expr_Isset';
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
 
 use PhpParser\Node\Expr;
 
-class Isset_ extends Expr
-{
+class Isset_ extends Expr {
     /** @var Expr[] Variables */
     public $vars;
 

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/Node/Identifier.php

Indentation +55 added lines, -55 removed lines

@@ -9,67 +9,67 @@
  */
 class Identifier extends NodeAbstract
 {
-    /** @var string Identifier as string */
-    public $name;
+	/** @var string Identifier as string */
+	public $name;
 
-    private static $specialClassNames = [
-        'self'   => true,
-        'parent' => true,
-        'static' => true,
-    ];
+	private static $specialClassNames = [
+		'self'   => true,
+		'parent' => true,
+		'static' => true,
+	];
 
-    /**
-     * Constructs an identifier node.
-     *
-     * @param string $name       Identifier as string
-     * @param array  $attributes Additional attributes
-     */
-    public function __construct(string $name, array $attributes = []) {
-        $this->attributes = $attributes;
-        $this->name = $name;
-    }
+	/**
+	 * Constructs an identifier node.
+	 *
+	 * @param string $name       Identifier as string
+	 * @param array  $attributes Additional attributes
+	 */
+	public function __construct(string $name, array $attributes = []) {
+		$this->attributes = $attributes;
+		$this->name = $name;
+	}
 
-    public function getSubNodeNames() : array {
-        return ['name'];
-    }
+	public function getSubNodeNames() : array {
+		return ['name'];
+	}
 
-    /**
-     * Get identifier as string.
-     *
-     * @return string Identifier as string.
-     */
-    public function toString() : string {
-        return $this->name;
-    }
+	/**
+	 * Get identifier as string.
+	 *
+	 * @return string Identifier as string.
+	 */
+	public function toString() : string {
+		return $this->name;
+	}
 
-    /**
-     * Get lowercased identifier as string.
-     *
-     * @return string Lowercased identifier as string
-     */
-    public function toLowerString() : string {
-        return strtolower($this->name);
-    }
+	/**
+	 * Get lowercased identifier as string.
+	 *
+	 * @return string Lowercased identifier as string
+	 */
+	public function toLowerString() : string {
+		return strtolower($this->name);
+	}
 
-    /**
-     * Checks whether the identifier is a special class name (self, parent or static).
-     *
-     * @return bool Whether identifier is a special class name
-     */
-    public function isSpecialClassName() : bool {
-        return isset(self::$specialClassNames[strtolower($this->name)]);
-    }
+	/**
+	 * Checks whether the identifier is a special class name (self, parent or static).
+	 *
+	 * @return bool Whether identifier is a special class name
+	 */
+	public function isSpecialClassName() : bool {
+		return isset(self::$specialClassNames[strtolower($this->name)]);
+	}
 
-    /**
-     * Get identifier as string.
-     *
-     * @return string Identifier as string
-     */
-    public function __toString() : string {
-        return $this->name;
-    }
+	/**
+	 * Get identifier as string.
+	 *
+	 * @return string Identifier as string
+	 */
+	public function __toString() : string {
+		return $this->name;
+	}
     
-    public function getType() : string {
-        return 'Identifier';
-    }
+	public function getType() : string {
+		return 'Identifier';
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
 /**
  * Represents a non-namespaced name. Namespaced names are represented using Name nodes.
  */
-class Identifier extends NodeAbstract
-{
+class Identifier extends NodeAbstract {
     /** @var string Identifier as string */
     public $name;
 

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/Node/Name/FullyQualified.php

Indentation +38 added lines, -38 removed lines

@@ -4,47 +4,47 @@
 
 class FullyQualified extends \PhpParser\Node\Name
 {
-    /**
-     * Checks whether the name is unqualified. (E.g. Name)
-     *
-     * @return bool Whether the name is unqualified
-     */
-    public function isUnqualified() : bool {
-        return false;
-    }
+	/**
+	 * Checks whether the name is unqualified. (E.g. Name)
+	 *
+	 * @return bool Whether the name is unqualified
+	 */
+	public function isUnqualified() : bool {
+		return false;
+	}
 
-    /**
-     * Checks whether the name is qualified. (E.g. Name\Name)
-     *
-     * @return bool Whether the name is qualified
-     */
-    public function isQualified() : bool {
-        return false;
-    }
+	/**
+	 * Checks whether the name is qualified. (E.g. Name\Name)
+	 *
+	 * @return bool Whether the name is qualified
+	 */
+	public function isQualified() : bool {
+		return false;
+	}
 
-    /**
-     * Checks whether the name is fully qualified. (E.g. \Name)
-     *
-     * @return bool Whether the name is fully qualified
-     */
-    public function isFullyQualified() : bool {
-        return true;
-    }
+	/**
+	 * Checks whether the name is fully qualified. (E.g. \Name)
+	 *
+	 * @return bool Whether the name is fully qualified
+	 */
+	public function isFullyQualified() : bool {
+		return true;
+	}
 
-    /**
-     * Checks whether the name is explicitly relative to the current namespace. (E.g. namespace\Name)
-     *
-     * @return bool Whether the name is relative
-     */
-    public function isRelative() : bool {
-        return false;
-    }
+	/**
+	 * Checks whether the name is explicitly relative to the current namespace. (E.g. namespace\Name)
+	 *
+	 * @return bool Whether the name is relative
+	 */
+	public function isRelative() : bool {
+		return false;
+	}
 
-    public function toCodeString() : string {
-        return '\\' . $this->toString();
-    }
+	public function toCodeString() : string {
+		return '\\' . $this->toString();
+	}
     
-    public function getType() : string {
-        return 'Name_FullyQualified';
-    }
+	public function getType() : string {
+		return 'Name_FullyQualified';
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     }
 
     public function toCodeString() : string {
-        return '\\' . $this->toString();
+        return '\\'.$this->toString();
     }
     
     public function getType() : string {

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/Node/Name/Relative.php

Indentation +38 added lines, -38 removed lines

@@ -4,47 +4,47 @@
 
 class Relative extends \PhpParser\Node\Name
 {
-    /**
-     * Checks whether the name is unqualified. (E.g. Name)
-     *
-     * @return bool Whether the name is unqualified
-     */
-    public function isUnqualified() : bool {
-        return false;
-    }
+	/**
+	 * Checks whether the name is unqualified. (E.g. Name)
+	 *
+	 * @return bool Whether the name is unqualified
+	 */
+	public function isUnqualified() : bool {
+		return false;
+	}
 
-    /**
-     * Checks whether the name is qualified. (E.g. Name\Name)
-     *
-     * @return bool Whether the name is qualified
-     */
-    public function isQualified() : bool {
-        return false;
-    }
+	/**
+	 * Checks whether the name is qualified. (E.g. Name\Name)
+	 *
+	 * @return bool Whether the name is qualified
+	 */
+	public function isQualified() : bool {
+		return false;
+	}
 
-    /**
-     * Checks whether the name is fully qualified. (E.g. \Name)
-     *
-     * @return bool Whether the name is fully qualified
-     */
-    public function isFullyQualified() : bool {
-        return false;
-    }
+	/**
+	 * Checks whether the name is fully qualified. (E.g. \Name)
+	 *
+	 * @return bool Whether the name is fully qualified
+	 */
+	public function isFullyQualified() : bool {
+		return false;
+	}
 
-    /**
-     * Checks whether the name is explicitly relative to the current namespace. (E.g. namespace\Name)
-     *
-     * @return bool Whether the name is relative
-     */
-    public function isRelative() : bool {
-        return true;
-    }
+	/**
+	 * Checks whether the name is explicitly relative to the current namespace. (E.g. namespace\Name)
+	 *
+	 * @return bool Whether the name is relative
+	 */
+	public function isRelative() : bool {
+		return true;
+	}
 
-    public function toCodeString() : string {
-        return 'namespace\\' . $this->toString();
-    }
+	public function toCodeString() : string {
+		return 'namespace\\' . $this->toString();
+	}
     
-    public function getType() : string {
-        return 'Name_Relative';
-    }
+	public function getType() : string {
+		return 'Name_Relative';
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     }
 
     public function toCodeString() : string {
-        return 'namespace\\' . $this->toString();
+        return 'namespace\\'.$this->toString();
     }
     
     public function getType() : string {

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/Node/AttributeGroup.php

Indentation +16 added lines, -16 removed lines

@@ -7,23 +7,23 @@
 
 class AttributeGroup extends NodeAbstract
 {
-    /** @var Attribute[] Attributes */
-    public $attrs;
+	/** @var Attribute[] Attributes */
+	public $attrs;
 
-    /**
-     * @param Attribute[] $attrs PHP attributes
-     * @param array $attributes Additional node attributes
-     */
-    public function __construct(array $attrs, array $attributes = []) {
-        $this->attributes = $attributes;
-        $this->attrs = $attrs;
-    }
+	/**
+	 * @param Attribute[] $attrs PHP attributes
+	 * @param array $attributes Additional node attributes
+	 */
+	public function __construct(array $attrs, array $attributes = []) {
+		$this->attributes = $attributes;
+		$this->attrs = $attrs;
+	}
 
-    public function getSubNodeNames() : array {
-        return ['attrs'];
-    }
+	public function getSubNodeNames() : array {
+		return ['attrs'];
+	}
 
-    public function getType() : string {
-        return 'AttributeGroup';
-    }
+	public function getType() : string {
+		return 'AttributeGroup';
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -5,8 +5,7 @@
 use PhpParser\Node;
 use PhpParser\NodeAbstract;
 
-class AttributeGroup extends NodeAbstract
-{
+class AttributeGroup extends NodeAbstract {
     /** @var Attribute[] Attributes */
     public $attrs;
 

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php

Indentation +199 added lines, -199 removed lines

@@ -27,203 +27,203 @@
  */
 class ConstExprEvaluator
 {
-    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"
-            );
-        };
-    }
-
-    /**
-     * 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);
-    }
-
-    private function evaluate(Expr $expr) {
-        if ($expr instanceof Scalar\LNumber
-            || $expr instanceof Scalar\DNumber
-            || $expr instanceof Scalar\String_
-        ) {
-            return $expr->value;
-        }
-
-        if ($expr instanceof Expr\Array_) {
-            return $this->evaluateArray($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);
-        }
-
-        return ($this->fallbackEvaluator)($expr);
-    }
-
-    private function evaluateArray(Expr\Array_ $expr) {
-        $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;
-    }
-
-    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);
-    }
-
-    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);
-        }
-
-        // 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);
-        }
-
-        throw new \Exception('Should not happen');
-    }
-
-    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);
-    }
+	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"
+			);
+		};
+	}
+
+	/**
+	 * 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);
+	}
+
+	private function evaluate(Expr $expr) {
+		if ($expr instanceof Scalar\LNumber
+			|| $expr instanceof Scalar\DNumber
+			|| $expr instanceof Scalar\String_
+		) {
+			return $expr->value;
+		}
+
+		if ($expr instanceof Expr\Array_) {
+			return $this->evaluateArray($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);
+		}
+
+		return ($this->fallbackEvaluator)($expr);
+	}
+
+	private function evaluateArray(Expr\Array_ $expr) {
+		$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;
+	}
+
+	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);
+	}
+
+	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);
+		}
+
+		// 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);
+		}
+
+		throw new \Exception('Should not happen');
+	}
+
+	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);
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -184,32 +184,32 @@
         $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 '|':   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 '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 '<<':  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);
         }
 

Braces +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
  * point to string conversions are affected by the precision ini setting. Secondly, they are also
  * affected by the LC_NUMERIC locale.
  */
-class ConstExprEvaluator
-{
+class ConstExprEvaluator {
     private $fallbackEvaluator;
 
     /**