Release PHP-Parser 4.0 Beta 1

Mention non-fluent helper methods.

CHANGELOG.md

@@ -3,6 +3,22 @@ Version 4.0.0-dev
 
 Nothing yet.
 
+Version 4.0.0-beta1 (2018-01-27)
+--------------------------------
+
+### Fixed
+
+* In formatting-preserving pretty printer: Fixed indentation when inserting into lists. (#466)
+
+### Added
+
+* In formatting-preserving pretty printer: Improved formatting of elements inserted into multi-line
+  arrays.
+
+### Removed
+
+* The `Autoloader` class has been removed. It is now required to use the Composer autoloader.
+
 Version 4.0.0-alpha3 (2017-12-26)
 ---------------------------------
 
@@ -92,11 +108,18 @@ Version 4.0.0-alpha1 (2017-10-18)
 * The `BuilderAbstract` class has been removed. It's functionality is moved into `BuilderHelpers`.
   However, this is an internal class and should not be used directly.
 
-Version 3.1.4-dev
+Version 3.1.5-dev
 -----------------
 
 Nothing yet.
 
+Version 3.1.4 (2018-01-25)
+--------------------------
+
+### Fixed
+
+* Fixed pretty printing of `-(-$x)` and `+(+$x)`. (#459)
+
 Version 3.1.3 (2017-12-26)
 --------------------------
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 by Nikita Popov.
+Copyright (c) 2011-2018 by Nikita Popov.
 
 Some rights reserved.
 

README.md

@@ -8,7 +8,7 @@ manipulation.
 
 [**Documentation for version 3.x**][doc_3_x] (stable; for running on PHP >= 5.5; for parsing PHP 5.2 to PHP 7.2).
 
-[Documentation for version 4.x][doc_master] (development; for running on PHP >= 7.0; for parsing PHP 5.2 to PHP 7.2).
+[Documentation for version 4.x][doc_master] (beta; for running on PHP >= 7.0; for parsing PHP 5.2 to PHP 7.2).
 
 Features
 --------
@@ -184,8 +184,6 @@ Documentation
  1. [Introduction](doc/0_Introduction.markdown)
  2. [Usage of basic components](doc/2_Usage_of_basic_components.markdown)
  3. [Other node tree representations](doc/3_Other_node_tree_representations.markdown)
- 4. [Code generation](doc/4_Code_generation.markdown)
- 5. [Frequently asked questions](doc/5_FAQ.markdown)
 
 Component documentation:
 
@@ -196,6 +194,8 @@ Component documentation:
    * Converting AST back to PHP code
    * Customizing formatting
    * Formatting-preserving code transformations
+ * [AST builders](component/AST_builders.markdown)
+   * Fluent builders for AST nodes
  * [Lexer](doc/component/Lexer.markdown)
    * Lexer options
    * Token and file positions for nodes
@@ -203,10 +203,15 @@ Component documentation:
  * [Error handling](doc/component/Error_handling.markdown)
    * Column information for errors
    * Error recovery (parsing of syntactically incorrect code)
+ * [Constant expression evaluation](component/Constant_expression_evaluation.markdown)
+   * Evaluating constant/property/etc initializers
+   * Handling errors and unsupported expressions
  * [Performance](doc/component/Performance.markdown)
    * Disabling XDebug
    * Reusing objects
    * Garbage collection impact
+ * [Frequently asked questions](component/FAQ.markdown)
+   * Parent and sibling references
 
  [doc_3_x]: https://github.com/nikic/PHP-Parser/tree/3.x/doc
  [doc_master]: https://github.com/nikic/PHP-Parser/tree/master/doc

UPGRADE-4.0.md

@@ -74,3 +74,4 @@ Because HHVM does not support PHP 7, HHVM is no longer supported.
   `Unserializer\XML`, as well as the interfaces `Serializer` and `Unserializer` no longer exist.
 * The `BuilderAbstract` class has been removed. It's functionality is moved into `BuilderHelpers`.
   However, this is an internal class and should not be used directly.
+* The `Autoloader` class has been removed in favor of relying on the Composer autoloader.

doc/0_Introduction.markdown

@@ -1,7 +1,7 @@
 Introduction
 ============
 
-This project is a PHP 5.2 to PHP 7.1 parser **written in PHP itself**.
+This project is a PHP 5.2 to PHP 7.2 parser **written in PHP itself**.
 
 What is this for?
 -----------------
@@ -26,11 +26,11 @@ programmatic PHP code analysis are incidentally PHP developers, not C developers
 What can it parse?
 ------------------
 
-The parser supports parsing PHP 5.2-5.6 and PHP 7.
+The parser supports parsing PHP 5.2-7.2.
 
 As the parser is based on the tokens returned by `token_get_all` (which is only able to lex the PHP
 version it runs on), additionally a wrapper for emulating tokens from newer versions is provided.
-This allows to parse PHP 7.1 source code running on PHP 5.5, for example. This emulation is somewhat
+This allows to parse PHP 7.2 source code running on PHP 5.5, for example. This emulation is somewhat
 hacky and not perfect, but it should work well on any sane code.
 
 What output does it produce?

doc/README.md

@@ -7,8 +7,6 @@ Guide
   1. [Introduction](0_Introduction.markdown)
   2. [Usage of basic components](2_Usage_of_basic_components.markdown)
   3. [Other node tree representations](3_Other_node_tree_representations.markdown)
-  4. [Code generation](4_Code_generation.markdown)
-  5. [Frequently asked questions](5_FAQ.markdown)
 
 Component documentation
 -----------------------
@@ -20,6 +18,8 @@ Component documentation
     * Converting AST back to PHP code
     * Customizing formatting
     * Formatting-preserving code transformations
+  * [AST builders](component/AST_builders.markdown)
+    * Fluent builders for AST nodes
   * [Lexer](component/Lexer.markdown)
     * Lexer options
     * Token and file positions for nodes
@@ -27,7 +27,12 @@ Component documentation
   * [Error handling](component/Error_handling.markdown)
     * Column information for errors
     * Error recovery (parsing of syntactically incorrect code)
+  * [Constant expression evaluation](component/Constant_expression_evaluation.markdown)
+    * Evaluating constant/property/etc initializers
+    * Handling errors and unsupported expressions
   * [Performance](component/Performance.markdown)
     * Disabling XDebug
     * Reusing objects
     * Garbage collection impact
+  * [Frequently asked questions](component/FAQ.markdown)
+    * Parent and sibling references

doc/component/AST_builders.markdown

@@ -1,9 +1,17 @@
-Code generation
+AST builders
-===============
+============
 
-It is also possible to generate code using the parser, by first creating an Abstract Syntax Tree and then using the
+When PHP-Parser is used to generate (or modify) code, by first creating an Abstract Syntax Tree and
-pretty printer to convert it to PHP code. To simplify code generation, the project comes with builders which allow
+then using the [pretty printer](Pretty_printing.markdown) to convert it to PHP code, it can often
-creating node trees using a fluid interface, instead of instantiating all nodes manually. Builders are available for
+be tedious to manually construct AST nodes. The project provides a number of utilities to simplify
+the construction of common AST nodes.
+
+Fluent builders
+---------------
+
+The library comes with a number of builders, which allow creating node trees using a fluent
+interface. Builders are created using the `BuilderFactory` and the final constructed node is
+accessed through `getNode()`. Fluent builders are available for
 the following syntactic elements:
 
  * namespaces and use statements
@@ -82,3 +90,17 @@ abstract class SomeOtherClass extends SomeClass implements A\Few, \Interfaces
     }
 }
 ```
+
+Additional helper methods
+-------------------------
+
+The `BuilderFactory` also provides a number of additional helper methods, which directly return
+nodes. The following methods are currently available:
+
+ * `val($value)`: Creates an AST node for a literal value like `42` or `[1, 2, 3]`.
+ * `args(array $args)`: Creates an array of function/method arguments, including the required `Arg`
+   wrappers. Also converts literals to AST nodes.
+ * `concat(...$exprs)`: Create a tree of `BinaryOp\Concat` nodes for the given expressions.
+
+These methods may be expanded on an as-needed basis. Please open an issue or PR if a common
+operation is missing.

doc/component/Constant_expression_evaluation.markdown

@@ -0,0 +1,115 @@
+Constant expression evaluation
+==============================
+
+Initializers for constants, properties, parameters, etc. have limited support for expressions. For
+example:
+
+```php
+<?php
+class Test {
+    const SECONDS_IN_HOUR = 60 * 60;
+    const SECONDS_IN_DAY = 24 * self::SECONDS_IN_HOUR;
+}
+```
+
+PHP-Parser supports evaluation of such constant expressions through the `ConstExprEvaluator` class:
+
+```php
+<?php
+
+use PhpParser\{ConstExprEvaluator, ConstExprEvaluationException};
+
+$evalutator = new ConstExprEvaluator();
+try {
+    $value = $evalutator->evaluateSilently($someExpr);
+} catch (ConstExprEvaluationException $e) {
+    // Either the expression contains unsupported expression types,
+    // or an error occurred during evaluation
+}
+```
+
+Error handling
+--------------
+
+The constant evaluator provides two methods, `evaluateDirectly()` and `evaluateSilently()`, which
+differ in error behavior. `evaluateDirectly()` will evaluate the expression as PHP would, including
+any generated warnings or Errors. `evaluateSilently()` will instead convert warnings and Errors into
+a `ConstExprEvaluationException`. For example:
+
+```php
+<?php
+
+use PhpParser\{ConstExprEvaluator, ConstExprEvaluationException};
+use PhpParser\Node\{Expr, Scalar};
+
+$evaluator = new ConstExprEvaluator();
+
+// 10 / 0
+$expr = new Expr\BinaryOp\Div(new Scalar\LNumber(10), new Scalar\LNumber(0));
+
+var_dump($evaluator->evaluateDirectly($expr)); // float(INF)
+// Warning: Division by zero
+
+try {
+    $evaluator->evaluateSilently($expr);
+} catch (ConstExprEvaluationException $e) {
+    var_dump($e->getPrevious()->getMessage()); // Division by zero
+}
+```
+
+For the purposes of static analysis, you will likely want to use `evaluateSilently()` and leave
+erroring expressions unevaluated.
+
+Unsupported expressions and evaluator fallback
+----------------------------------------------
+
+The constant expression evaluator supports all expression types that are permitted in constant
+expressions, apart from the following:
+
+ * `Scalar\MagicConst\*`
+ * `Expr\ConstFetch` (only null/false/true are handled)
+ * `Expr\ClassConstFetch`
+
+Handling these expression types requires non-local information, such as which global constants are
+defined. By default, the evaluator will throw a `ConstExprEvaluationException` when it encounters
+an unsupported expression type.
+
+It is possible to override this behavior and support resolution for these expression types by
+specifying an evaluation fallback function:
+
+```php
+<?php
+
+use PhpParser\{ConstExprEvaluator, ConstExprEvaluationException};
+use PhpParser\Node\Expr;
+
+$evalutator = new ConstExprEvaluator(function(Expr $expr) {
+    if ($expr instanceof Expr\ConstFetch) {
+        return fetchConstantSomehow($expr);
+    }
+    if ($expr instanceof Expr\ClassConstFetch) {
+        return fetchClassConstantSomehow($expr);
+    }
+    // etc.
+    throw new ConstExprEvaluationException(
+        "Expression of type {$expr->getType()} cannot be evaluated");
+});
+
+try {
+    $evalutator->evaluateSilently($someExpr);
+} catch (ConstExprEvaluationException $e) {
+    // Handle exception
+}
+```
+
+Implementers are advised to ensure that evaluation of indirect constant references cannot lead to
+infinite recursion. For example, the following code could lead to infinite recursion if constant
+lookup is implemented naively.
+
+```php
+<?php
+class Test {
+    const A = self::B;
+    const B = self::A;
+}
+```

doc/component/Pretty_printing.markdown

@@ -50,14 +50,13 @@ Formatting-preserving pretty printing
 
 For automated code refactoring, migration and similar, you will usually only want to modify a small
 portion of the code and leave the remainder alone. The basic pretty printer is not suitable for
-this, because it will also reformat parts of the code, which have not been modified.
+this, because it will also reformat parts of the code which have not been modified.
 
 Since PHP-Parser 4.0 an experimental formatting-preserving pretty-printing mode is available, which
 attempts to preserve the formatting of code, those AST nodes have not changed, and only reformat
 code which has been modified or newly inserted.
 
-Use of the formatting-preservation functionality currently requires some additional preparatory
+Use of the formatting-preservation functionality requires some additional preparatory steps:
-steps:
 
 ```php
 use PhpParser\{Lexer, NodeTraverser, NodeVisitor, Parser, PrettyPrinter};
@@ -86,6 +85,11 @@ $newStmts = $traverser->traverse($oldStmts);
 $newCode = $printer->printFormatPreserving($newStmts, $oldStmts, $oldTokens);
 ```
 
+If you make use of the name resolution functionality, you will likely want to disable the
+`replaceNames` option. This will add resolved names as attributes, instead of directlying modifying
+the AST and causing spurious changes to the pretty printed code. For more information, see the
+[name resolution documentation](Name_resolution.markdown).
+
 This functionality is experimental and not yet fully implemented. It should not provide incorrect
 code, but it may sometimes reformat more code than necessary. Open issues are tracked in
 [issue #344](https://github.com/nikic/PHP-Parser/issues/344). If you encounter problems while using

grammar/php7.y

@@ -937,7 +937,7 @@ list_expr_element:
 
 array_pair_list:
       inner_array_pair_list
-          { $$ = $1; $end = count($$)-1; if ($$[$end] === null) unset($$[$end]); }
+          { $$ = $1; $end = count($$)-1; if ($$[$end] === null) array_pop($$); }
 ;
 
 inner_array_pair_list:

lib/PhpParser/Autoloader.php

@@ -1,40 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace PhpParser;
-
-/**
- * @codeCoverageIgnore
- */
-class Autoloader
-{
-    /** @var bool Whether the autoloader has been registered. */
-    private static $registered = false;
-
-    /**
-     * Registers PhpParser\Autoloader as an SPL autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader instead of appending
-     */
-    static public function register(bool $prepend = false) {
-        if (self::$registered === true) {
-            return;
-        }
-
-        spl_autoload_register([__CLASS__, 'autoload'], true, $prepend);
-        self::$registered = true;
-    }
-
-    /**
-     * Handles autoloading of classes.
-     *
-     * @param string $class A class name.
-     */
-    static public function autoload(string $class) {
-        if (0 === strpos($class, 'PhpParser\\')) {
-            $fileName = __DIR__ . strtr(substr($class, 9), '\\', '/') . '.php';
-            if (file_exists($fileName)) {
-                require $fileName;
-            }
-        }
-    }
-}

lib/PhpParser/Builder/Use_.php

@@ -7,7 +7,8 @@ use PhpParser\BuilderHelpers;
 use PhpParser\Node;
 use PhpParser\Node\Stmt;
 
-class Use_ implements Builder {
+class Use_ implements Builder
+{
     protected $name;
     protected $type;
     protected $alias = null;

lib/PhpParser/BuilderHelpers.php

@@ -14,7 +14,8 @@ use PhpParser\Node\Stmt;
  *
  * @internal
  */
-final class BuilderHelpers {
+final class BuilderHelpers
+{
     /**
      * Normalizes a node: Converts builder objects to nodes.
      *

lib/PhpParser/ConstExprEvaluationException.php

@@ -2,4 +2,5 @@
 
 namespace PhpParser;
 
-class ConstExprEvaluationException extends \Exception {}
+class ConstExprEvaluationException extends \Exception
+{}

lib/PhpParser/ConstExprEvaluator.php

@@ -20,15 +20,12 @@ use PhpParser\Node\Scalar;
  *
  * The fallback evaluator should throw ConstExprEvaluationException for nodes it cannot evaluate.
  *
- * The evaluation is performed as PHP would perform it, and as such may generate notices, warnings
+ * The evaluation is dependent on runtime configuration in two respects: Firstly, floating
- * or Errors. For example, if the expression `1%0` is evaluated, an ArithmeticError is thrown. It is
- * left to the consumer to handle these as appropriate.
- *
- * The evaluation is also dependent on runtime configuration in two respects: Firstly, floating
  * 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;
 
     /**
@@ -48,7 +45,10 @@ class ConstExprEvaluator {
     }
 
     /**
-     * Evaluates a constant expression into a PHP value.
+     * 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
@@ -58,9 +58,49 @@ class ConstExprEvaluator {
      *
      * @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 evaluate(Expr $expr) {
+    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_

lib/PhpParser/Error.php

@@ -51,7 +51,6 @@ class Error extends \RuntimeException
         return $this->attributes['endLine'] ?? -1;
     }
 
-
     /**
      * Gets the attributes of the node/token the error occurred at.
      *
@@ -99,7 +98,7 @@ class Error extends \RuntimeException
      * @return bool
      */
     public function hasColumnInfo() : bool {
-        return isset($this->attributes['startFilePos']) && isset($this->attributes['endFilePos']);
+        return isset($this->attributes['startFilePos'], $this->attributes['endFilePos']);
     }
 
     /**

lib/PhpParser/Internal/DiffElem.php

@@ -5,7 +5,8 @@ namespace PhpParser\Internal;
 /**
  * @internal
  */
-class DiffElem {
+class DiffElem
+{
     const TYPE_KEEP = 0;
     const TYPE_REMOVE = 1;
     const TYPE_ADD = 2;

lib/PhpParser/Internal/Differ.php

@@ -10,7 +10,8 @@ namespace PhpParser\Internal;
  *
  * @internal
  */
-class Differ {
+class Differ
+{
     private $isEqual;
 
     /**

lib/PhpParser/Internal/PrintableNewAnonClassNode.php

@@ -15,7 +15,8 @@ use PhpParser\Node\Expr;
  *
  * @internal
  */
-class PrintableNewAnonClassNode extends Expr  {
+class PrintableNewAnonClassNode extends Expr
+{
     /** @var Node\Arg[] Arguments */
     public $args;
     /** @var null|Node\Name Name of extended class */

lib/PhpParser/Internal/TokenStream.php

@@ -1,13 +1,14 @@
 <?php declare(strict_types=1);
 
-namespace PhpParser;
+namespace PhpParser\Internal;
 
 /**
  * Provides operations on token streams, for use by pretty printer.
  *
  * @internal
  */
-class TokenStream {
+class TokenStream
+{
     /** @var array Tokens (in token_get_all format) */
     private $tokens;
     /** @var int[] Map from position to indentation */

lib/PhpParser/JsonDecoder.php

@@ -2,7 +2,8 @@
 
 namespace PhpParser;
 
-class JsonDecoder {
+class JsonDecoder
+{
     /** @var \ReflectionClass[] Node type to reflection class map */
     private $reflectionClassCache;
 

lib/PhpParser/Lexer/Emulative.php

@@ -2,7 +2,6 @@
 
 namespace PhpParser\Lexer;
 
-
 class Emulative extends \PhpParser\Lexer
 {
     /* No features requiring emulation have been added in PHP > 7.0 */

lib/PhpParser/NameContext.php

@@ -6,7 +6,8 @@ use PhpParser\Node\Name;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt;
 
-class NameContext {
+class NameContext
+{
     /** @var null|Name Current namespace */
     protected $namespace;
 

lib/PhpParser/Node/Arg.php

@@ -32,7 +32,7 @@ class Arg extends NodeAbstract
         return ['value', 'byRef', 'unpack'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Arg';
     }
 }

lib/PhpParser/Node/Const_.php

@@ -31,7 +31,7 @@ class Const_ extends NodeAbstract
         return ['name', 'value'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Const';
     }
 }

lib/PhpParser/Node/Expr/ArrayDimFetch.php

@@ -28,7 +28,7 @@ class ArrayDimFetch extends Expr
         return ['var', 'dim'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_ArrayDimFetch';
     }
 }

lib/PhpParser/Node/Expr/ArrayItem.php

@@ -32,7 +32,7 @@ class ArrayItem extends Expr
         return ['key', 'value', 'byRef'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_ArrayItem';
     }
 }

lib/PhpParser/Node/Expr/Array_.php

@@ -28,7 +28,7 @@ class Array_ extends Expr
         return ['items'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_Array';
     }
 }

lib/PhpParser/Node/Expr/Assign.php

@@ -28,7 +28,7 @@ class Assign extends Expr
         return ['var', 'expr'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_Assign';
     }
 }

lib/PhpParser/Node/Expr/AssignOp/BitwiseAnd.php

@@ -6,7 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class BitwiseAnd extends AssignOp
 {
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_AssignOp_BitwiseAnd';
     }
 }

lib/PhpParser/Node/Expr/AssignOp/BitwiseOr.php

@@ -6,7 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class BitwiseOr extends AssignOp
 {
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_AssignOp_BitwiseOr';
     }
 }

lib/PhpParser/Node/Expr/AssignOp/BitwiseXor.php

@@ -6,7 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class BitwiseXor extends AssignOp
 {
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_AssignOp_BitwiseXor';
     }
 }

lib/PhpParser/Node/Expr/AssignOp/Concat.php

@@ -6,7 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Concat extends AssignOp
 {
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_AssignOp_Concat';
     }
 }

lib/PhpParser/Node/Expr/AssignOp/Div.php

@@ -6,7 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Div extends AssignOp
 {
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_AssignOp_Div';
     }
 }

lib/PhpParser/Node/Expr/AssignOp/Minus.php

@@ -6,7 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Minus extends AssignOp
 {
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_AssignOp_Minus';
     }
 }

lib/PhpParser/Node/Expr/AssignOp/Mod.php

@@ -6,7 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Mod extends AssignOp
 {
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_AssignOp_Mod';
     }
 }

lib/PhpParser/Node/Expr/AssignOp/Mul.php

@@ -6,7 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Mul extends AssignOp
 {
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_AssignOp_Mul';
     }
 }

lib/PhpParser/Node/Expr/AssignOp/Plus.php

@@ -6,7 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Plus extends AssignOp
 {
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_AssignOp_Plus';
     }
 }

lib/PhpParser/Node/Expr/AssignOp/Pow.php

@@ -6,7 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Pow extends AssignOp
 {
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_AssignOp_Pow';
     }
 }

lib/PhpParser/Node/Expr/AssignOp/ShiftLeft.php

@@ -6,7 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class ShiftLeft extends AssignOp
 {
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_AssignOp_ShiftLeft';
     }
 }

lib/PhpParser/Node/Expr/AssignOp/ShiftRight.php

@@ -6,7 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class ShiftRight extends AssignOp
 {
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_AssignOp_ShiftRight';
     }
 }

lib/PhpParser/Node/Expr/AssignRef.php

@@ -28,7 +28,7 @@ class AssignRef extends Expr
         return ['var', 'expr'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_AssignRef';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/BitwiseAnd.php

@@ -10,7 +10,7 @@ class BitwiseAnd extends BinaryOp
         return '&';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_BitwiseAnd';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/BitwiseOr.php

@@ -10,7 +10,7 @@ class BitwiseOr extends BinaryOp
         return '|';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_BitwiseOr';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/BitwiseXor.php

@@ -10,7 +10,7 @@ class BitwiseXor extends BinaryOp
         return '^';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_BitwiseXor';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/BooleanAnd.php

@@ -10,7 +10,7 @@ class BooleanAnd extends BinaryOp
         return '&&';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_BooleanAnd';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/BooleanOr.php

@@ -10,7 +10,7 @@ class BooleanOr extends BinaryOp
         return '||';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_BooleanOr';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/Coalesce.php

@@ -10,7 +10,7 @@ class Coalesce extends BinaryOp
         return '??';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_Coalesce';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/Concat.php

@@ -10,7 +10,7 @@ class Concat extends BinaryOp
         return '.';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_Concat';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/Div.php

@@ -10,7 +10,7 @@ class Div extends BinaryOp
         return '/';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_Div';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/Equal.php

@@ -10,7 +10,7 @@ class Equal extends BinaryOp
         return '==';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_Equal';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/Greater.php

@@ -10,7 +10,7 @@ class Greater extends BinaryOp
         return '>';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_Greater';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/GreaterOrEqual.php

@@ -10,7 +10,7 @@ class GreaterOrEqual extends BinaryOp
         return '>=';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_GreaterOrEqual';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/Identical.php

@@ -10,7 +10,7 @@ class Identical extends BinaryOp
         return '===';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_Identical';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/LogicalAnd.php

@@ -10,7 +10,7 @@ class LogicalAnd extends BinaryOp
         return 'and';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_LogicalAnd';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/LogicalOr.php

@@ -10,7 +10,7 @@ class LogicalOr extends BinaryOp
         return 'or';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_LogicalOr';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/LogicalXor.php

@@ -10,7 +10,7 @@ class LogicalXor extends BinaryOp
         return 'xor';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_LogicalXor';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/Minus.php

@@ -10,7 +10,7 @@ class Minus extends BinaryOp
         return '-';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_Minus';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/Mod.php

@@ -10,7 +10,7 @@ class Mod extends BinaryOp
         return '%';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_Mod';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/Mul.php

@@ -10,7 +10,7 @@ class Mul extends BinaryOp
         return '*';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_Mul';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/NotEqual.php

@@ -10,7 +10,7 @@ class NotEqual extends BinaryOp
         return '!=';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_NotEqual';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/NotIdentical.php

@@ -10,7 +10,7 @@ class NotIdentical extends BinaryOp
         return '!==';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_NotIdentical';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/Plus.php

@@ -10,7 +10,7 @@ class Plus extends BinaryOp
         return '+';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_Plus';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/Pow.php

@@ -10,7 +10,7 @@ class Pow extends BinaryOp
         return '**';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_Pow';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/ShiftLeft.php

@@ -10,7 +10,7 @@ class ShiftLeft extends BinaryOp
         return '<<';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_ShiftLeft';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/ShiftRight.php

@@ -10,7 +10,7 @@ class ShiftRight extends BinaryOp
         return '>>';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_ShiftRight';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/Smaller.php

@@ -10,7 +10,7 @@ class Smaller extends BinaryOp
         return '<';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_Smaller';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/SmallerOrEqual.php

@@ -10,7 +10,7 @@ class SmallerOrEqual extends BinaryOp
         return '<=';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_SmallerOrEqual';
     }
 }

lib/PhpParser/Node/Expr/BinaryOp/Spaceship.php

@@ -10,7 +10,7 @@ class Spaceship extends BinaryOp
         return '<=>';
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BinaryOp_Spaceship';
     }
 }

lib/PhpParser/Node/Expr/BitwiseNot.php

@@ -24,7 +24,7 @@ class BitwiseNot extends Expr
         return ['expr'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BitwiseNot';
     }
 }

lib/PhpParser/Node/Expr/BooleanNot.php

@@ -24,7 +24,7 @@ class BooleanNot extends Expr
         return ['expr'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_BooleanNot';
     }
 }

lib/PhpParser/Node/Expr/Cast/Array_.php

@@ -6,7 +6,7 @@ use PhpParser\Node\Expr\Cast;
 
 class Array_ extends Cast
 {
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_Cast_Array';
     }
 }

lib/PhpParser/Node/Expr/Cast/Bool_.php

@@ -6,7 +6,7 @@ use PhpParser\Node\Expr\Cast;
 
 class Bool_ extends Cast
 {
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_Cast_Bool';
     }
 }

lib/PhpParser/Node/Expr/Cast/Double.php

@@ -6,7 +6,7 @@ use PhpParser\Node\Expr\Cast;
 
 class Double extends Cast
 {
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_Cast_Double';
     }
 }

lib/PhpParser/Node/Expr/Cast/Int_.php

@@ -6,7 +6,7 @@ use PhpParser\Node\Expr\Cast;
 
 class Int_ extends Cast
 {
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_Cast_Int';
     }
 }

lib/PhpParser/Node/Expr/Cast/Object_.php

@@ -6,7 +6,7 @@ use PhpParser\Node\Expr\Cast;
 
 class Object_ extends Cast
 {
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_Cast_Object';
     }
 }

lib/PhpParser/Node/Expr/Cast/String_.php

@@ -6,7 +6,7 @@ use PhpParser\Node\Expr\Cast;
 
 class String_ extends Cast
 {
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_Cast_String';
     }
 }

lib/PhpParser/Node/Expr/Cast/Unset_.php

@@ -6,7 +6,7 @@ use PhpParser\Node\Expr\Cast;
 
 class Unset_ extends Cast
 {
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_Cast_Unset';
     }
 }

lib/PhpParser/Node/Expr/ClassConstFetch.php

@@ -30,7 +30,7 @@ class ClassConstFetch extends Expr
         return ['class', 'name'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_ClassConstFetch';
     }
 }

lib/PhpParser/Node/Expr/Clone_.php

@@ -24,7 +24,7 @@ class Clone_ extends Expr
         return ['expr'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_Clone';
     }
 }

lib/PhpParser/Node/Expr/Closure.php

@@ -65,7 +65,7 @@ class Closure extends Expr implements FunctionLike
         return $this->stmts;
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_Closure';
     }
 }

lib/PhpParser/Node/Expr/ClosureUse.php

@@ -28,7 +28,7 @@ class ClosureUse extends Expr
         return ['var', 'byRef'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_ClosureUse';
     }
 }

lib/PhpParser/Node/Expr/ConstFetch.php

@@ -25,7 +25,7 @@ class ConstFetch extends Expr
         return ['name'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_ConstFetch';
     }
 }

lib/PhpParser/Node/Expr/Empty_.php

@@ -24,7 +24,7 @@ class Empty_ extends Expr
         return ['expr'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_Empty';
     }
 }

lib/PhpParser/Node/Expr/Error.php

@@ -25,7 +25,7 @@ class Error extends Expr
         return [];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_Error';
     }
 }

lib/PhpParser/Node/Expr/ErrorSuppress.php

@@ -24,7 +24,7 @@ class ErrorSuppress extends Expr
         return ['expr'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_ErrorSuppress';
     }
 }

lib/PhpParser/Node/Expr/Eval_.php

@@ -24,7 +24,7 @@ class Eval_ extends Expr
         return ['expr'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_Eval';
     }
 }

lib/PhpParser/Node/Expr/Exit_.php

@@ -28,7 +28,7 @@ class Exit_ extends Expr
         return ['expr'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_Exit';
     }
 }

lib/PhpParser/Node/Expr/FuncCall.php

@@ -29,7 +29,7 @@ class FuncCall extends Expr
         return ['name', 'args'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_FuncCall';
     }
 }

lib/PhpParser/Node/Expr/Include_.php

@@ -33,7 +33,7 @@ class Include_ extends Expr
         return ['expr', 'type'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_Include';
     }
 }

lib/PhpParser/Node/Expr/Instanceof_.php

@@ -29,7 +29,7 @@ class Instanceof_ extends Expr
         return ['expr', 'class'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_Instanceof';
     }
 }

lib/PhpParser/Node/Expr/Isset_.php

@@ -24,7 +24,7 @@ class Isset_ extends Expr
         return ['vars'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_Isset';
     }
 }

lib/PhpParser/Node/Expr/List_.php

@@ -24,7 +24,7 @@ class List_ extends Expr
         return ['items'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_List';
     }
 }

lib/PhpParser/Node/Expr/MethodCall.php

@@ -34,7 +34,7 @@ class MethodCall extends Expr
         return ['var', 'name', 'args'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_MethodCall';
     }
 }

lib/PhpParser/Node/Expr/New_.php

@@ -29,7 +29,7 @@ class New_ extends Expr
         return ['class', 'args'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_New';
     }
 }

lib/PhpParser/Node/Expr/PostDec.php

@@ -24,7 +24,7 @@ class PostDec extends Expr
         return ['var'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_PostDec';
     }
 }

lib/PhpParser/Node/Expr/PostInc.php

@@ -24,7 +24,7 @@ class PostInc extends Expr
         return ['var'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_PostInc';
     }
 }

lib/PhpParser/Node/Expr/PreDec.php

@@ -24,7 +24,7 @@ class PreDec extends Expr
         return ['var'];
     }
 
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_PreDec';
     }
 }

lib/PhpParser/Node/Expr/PreInc.php

@@ -24,7 +24,7 @@ class PreInc extends Expr
         return ['var'];
     }
     
-    function getType() : string {
+    public function getType() : string {
         return 'Expr_PreInc';
     }
 }