⬆️ Upgrade lib : nikic/php-parser

We were on v3 that is no longer maintained and compatibility is annonced for PHP 7.2.
v4 is active and supports PHP up to 8.0
No problem to update as this is only used in the config editor (\Combodo\iTop\Config\Validator\iTopConfigAstValidator)

lib/nikic/php-parser/lib/PhpParser/Node/Arg.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node;
 
@@ -6,6 +6,8 @@ use PhpParser\NodeAbstract;
 
 class Arg extends NodeAbstract
 {
+    /** @var Identifier|null Parameter name (for named parameters) */
+    public $name;
     /** @var Expr Value to pass */
     public $value;
     /** @var bool Whether to pass by ref */
@@ -20,15 +22,24 @@ class Arg extends NodeAbstract
      * @param bool  $byRef      Whether to pass by ref
      * @param bool  $unpack     Whether to unpack the argument
      * @param array $attributes Additional attributes
+     * @param Identifier|null $name Parameter name (for named parameters)
      */
-    public function __construct(Expr $value, $byRef = false, $unpack = false, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(
+        Expr $value, bool $byRef = false, bool $unpack = false, array $attributes = [],
+        Identifier $name = null
+    ) {
+        $this->attributes = $attributes;
+        $this->name = $name;
         $this->value = $value;
         $this->byRef = $byRef;
         $this->unpack = $unpack;
     }
 
-    public function getSubNodeNames() {
-        return array('value', 'byRef', 'unpack');
+    public function getSubNodeNames() : array {
+        return ['name', 'value', 'byRef', 'unpack'];
+    }
+    
+    public function getType() : string {
+        return 'Arg';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Attribute.php

@@ -0,0 +1,34 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node;
+
+use PhpParser\Node;
+use PhpParser\NodeAbstract;
+
+class Attribute extends NodeAbstract
+{
+    /** @var Name Attribute name */
+    public $name;
+
+    /** @var Arg[] Attribute arguments */
+    public $args;
+
+    /**
+     * @param Node\Name $name       Attribute name
+     * @param Arg[]     $args       Attribute arguments
+     * @param array     $attributes Additional node attributes
+     */
+    public function __construct(Name $name, array $args = [], array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->name = $name;
+        $this->args = $args;
+    }
+
+    public function getSubNodeNames() : array {
+        return ['name', 'args'];
+    }
+
+    public function getType() : string {
+        return 'Attribute';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/AttributeGroup.php

@@ -0,0 +1,29 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node;
+
+use PhpParser\Node;
+use PhpParser\NodeAbstract;
+
+class AttributeGroup extends NodeAbstract
+{
+    /** @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;
+    }
+
+    public function getSubNodeNames() : array {
+        return ['attrs'];
+    }
+
+    public function getType() : string {
+        return 'AttributeGroup';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Const_.php

@@ -1,12 +1,15 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node;
 
 use PhpParser\NodeAbstract;
 
+/**
+ * @property Name $namespacedName Namespaced name (for global constants, if using NameResolver)
+ */
 class Const_ extends NodeAbstract
 {
-    /** @var string Name */
+    /** @var Identifier Name */
     public $name;
     /** @var Expr Value */
     public $value;
@@ -14,17 +17,21 @@ class Const_ extends NodeAbstract
     /**
      * Constructs a const node for use in class const and const statements.
      *
-     * @param string  $name       Name
-     * @param Expr    $value      Value
-     * @param array   $attributes Additional attributes
+     * @param string|Identifier $name       Name
+     * @param Expr              $value      Value
+     * @param array             $attributes Additional attributes
      */
-    public function __construct($name, Expr $value, array $attributes = array()) {
-        parent::__construct($attributes);
-        $this->name = $name;
+    public function __construct($name, Expr $value, array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->name = \is_string($name) ? new Identifier($name) : $name;
         $this->value = $value;
     }
 
-    public function getSubNodeNames() {
-        return array('name', 'value');
+    public function getSubNodeNames() : array {
+        return ['name', 'value'];
+    }
+    
+    public function getType() : string {
+        return 'Const';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node;
 
@@ -6,4 +6,4 @@ use PhpParser\NodeAbstract;
 
 abstract class Expr extends NodeAbstract
 {
-}
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayDimFetch.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -18,13 +18,17 @@ class ArrayDimFetch extends Expr
      * @param null|Expr $dim        Array index / dim
      * @param array     $attributes Additional attributes
      */
-    public function __construct(Expr $var, Expr $dim = null, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $var, Expr $dim = null, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
         $this->dim = $dim;
     }
 
-    public function getSubNodeNames() {
-        return array('var', 'dim');
+    public function getSubNodeNames() : array {
+        return ['var', 'dim'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_ArrayDimFetch';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -12,6 +12,8 @@ class ArrayItem extends Expr
     public $value;
     /** @var bool Whether to assign by reference */
     public $byRef;
+    /** @var bool Whether to unpack the argument */
+    public $unpack;
 
     /**
      * Constructs an array item node.
@@ -21,14 +23,19 @@ class ArrayItem extends Expr
      * @param bool      $byRef      Whether to assign by reference
      * @param array     $attributes Additional attributes
      */
-    public function __construct(Expr $value, Expr $key = null, $byRef = false, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $value, Expr $key = null, bool $byRef = false, array $attributes = [], bool $unpack = false) {
+        $this->attributes = $attributes;
         $this->key = $key;
         $this->value = $value;
         $this->byRef = $byRef;
+        $this->unpack = $unpack;
     }
 
-    public function getSubNodeNames() {
-        return array('key', 'value', 'byRef');
+    public function getSubNodeNames() : array {
+        return ['key', 'value', 'byRef', 'unpack'];
+    }
+
+    public function getType() : string {
+        return 'Expr_ArrayItem';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Array_.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -10,21 +10,25 @@ class Array_ extends Expr
     const KIND_LONG = 1;  // array() syntax
     const KIND_SHORT = 2; // [] syntax
 
-    /** @var ArrayItem[] Items */
+    /** @var (ArrayItem|null)[] Items */
     public $items;
 
     /**
      * Constructs an array node.
      *
-     * @param ArrayItem[] $items      Items of the array
+     * @param (ArrayItem|null)[] $items      Items of the array
      * @param array       $attributes Additional attributes
      */
-    public function __construct(array $items = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $items = [], array $attributes = []) {
+        $this->attributes = $attributes;
         $this->items = $items;
     }
 
-    public function getSubNodeNames() {
-        return array('items');
+    public function getSubNodeNames() : array {
+        return ['items'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Array';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrowFunction.php

@@ -0,0 +1,79 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node\Expr;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr;
+use PhpParser\Node\FunctionLike;
+
+class ArrowFunction extends Expr implements FunctionLike
+{
+    /** @var bool */
+    public $static;
+
+    /** @var bool */
+    public $byRef;
+
+    /** @var Node\Param[] */
+    public $params = [];
+
+    /** @var null|Node\Identifier|Node\Name|Node\NullableType|Node\UnionType */
+    public $returnType;
+
+    /** @var Expr */
+    public $expr;
+    /** @var Node\AttributeGroup[] */
+    public $attrGroups;
+
+    /**
+     * @param array $subNodes   Array of the following optional subnodes:
+     *                          'static'     => false   : Whether the closure is static
+     *                          'byRef'      => false   : Whether to return by reference
+     *                          'params'     => array() : Parameters
+     *                          'returnType' => null    : Return type
+     *                          'expr'       => Expr    : Expression body
+     *                          'attrGroups' => array() : PHP attribute groups
+     * @param array $attributes Additional attributes
+     */
+    public function __construct(array $subNodes = [], array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->static = $subNodes['static'] ?? false;
+        $this->byRef = $subNodes['byRef'] ?? false;
+        $this->params = $subNodes['params'] ?? [];
+        $returnType = $subNodes['returnType'] ?? null;
+        $this->returnType = \is_string($returnType) ? new Node\Identifier($returnType) : $returnType;
+        $this->expr = $subNodes['expr'] ?? null;
+        $this->attrGroups = $subNodes['attrGroups'] ?? [];
+    }
+
+    public function getSubNodeNames() : array {
+        return ['attrGroups', 'static', 'byRef', 'params', 'returnType', 'expr'];
+    }
+
+    public function returnsByRef() : bool {
+        return $this->byRef;
+    }
+
+    public function getParams() : array {
+        return $this->params;
+    }
+
+    public function getReturnType() {
+        return $this->returnType;
+    }
+
+    public function getAttrGroups() : array {
+        return $this->attrGroups;
+    }
+
+    /**
+     * @return Node\Stmt\Return_[]
+     */
+    public function getStmts() : array {
+        return [new Node\Stmt\Return_($this->expr)];
+    }
+
+    public function getType() : string {
+        return 'Expr_ArrowFunction';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Assign.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -18,13 +18,17 @@ class Assign extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $var, Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $var, Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('var', 'expr');
+    public function getSubNodeNames() : array {
+        return ['var', 'expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Assign';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -18,13 +18,13 @@ abstract class AssignOp extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $var, Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $var, Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('var', 'expr');
+    public function getSubNodeNames() : array {
+        return ['var', 'expr'];
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseAnd.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class BitwiseAnd extends AssignOp
 {
-}
+    public function getType() : string {
+        return 'Expr_AssignOp_BitwiseAnd';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseOr.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class BitwiseOr extends AssignOp
 {
-}
+    public function getType() : string {
+        return 'Expr_AssignOp_BitwiseOr';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseXor.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class BitwiseXor extends AssignOp
 {
-}
+    public function getType() : string {
+        return 'Expr_AssignOp_BitwiseXor';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Coalesce.php

@@ -0,0 +1,12 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node\Expr\AssignOp;
+
+use PhpParser\Node\Expr\AssignOp;
+
+class Coalesce extends AssignOp
+{
+    public function getType() : string {
+        return 'Expr_AssignOp_Coalesce';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Concat.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Concat extends AssignOp
 {
-}
+    public function getType() : string {
+        return 'Expr_AssignOp_Concat';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Div.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Div extends AssignOp
 {
-}
+    public function getType() : string {
+        return 'Expr_AssignOp_Div';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Minus.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Minus extends AssignOp
 {
-}
+    public function getType() : string {
+        return 'Expr_AssignOp_Minus';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Mod.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Mod extends AssignOp
 {
-}
+    public function getType() : string {
+        return 'Expr_AssignOp_Mod';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Mul.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Mul extends AssignOp
 {
-}
+    public function getType() : string {
+        return 'Expr_AssignOp_Mul';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Plus.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Plus extends AssignOp
 {
-}
+    public function getType() : string {
+        return 'Expr_AssignOp_Plus';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Pow.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Pow extends AssignOp
 {
-}
+    public function getType() : string {
+        return 'Expr_AssignOp_Pow';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/ShiftLeft.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class ShiftLeft extends AssignOp
 {
-}
+    public function getType() : string {
+        return 'Expr_AssignOp_ShiftLeft';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/ShiftRight.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class ShiftRight extends AssignOp
 {
-}
+    public function getType() : string {
+        return 'Expr_AssignOp_ShiftRight';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignRef.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -18,13 +18,17 @@ class AssignRef extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $var, Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $var, Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('var', 'expr');
+    public function getSubNodeNames() : array {
+        return ['var', 'expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_AssignRef';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -12,19 +12,29 @@ abstract class BinaryOp extends Expr
     public $right;
 
     /**
-     * Constructs a bitwise and node.
+     * 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 = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $left, Expr $right, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->left = $left;
         $this->right = $right;
     }
 
-    public function getSubNodeNames() {
-        return array('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;
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseAnd.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class BitwiseAnd extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '&';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_BitwiseAnd';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseOr.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class BitwiseOr extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '|';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_BitwiseOr';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseXor.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class BitwiseXor extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '^';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_BitwiseXor';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BooleanAnd.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class BooleanAnd extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '&&';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_BooleanAnd';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BooleanOr.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class BooleanOr extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '||';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_BooleanOr';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Coalesce.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Coalesce extends BinaryOp
 {
+    public function getOperatorSigil() : string {
+        return '??';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Coalesce';
+    }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Concat.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Concat extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '.';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Concat';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Div.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Div extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '/';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Div';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Equal.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Equal extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '==';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Equal';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Greater.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Greater extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '>';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Greater';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/GreaterOrEqual.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class GreaterOrEqual extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '>=';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_GreaterOrEqual';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Identical.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Identical extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '===';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Identical';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalAnd.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class LogicalAnd extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return 'and';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_LogicalAnd';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalOr.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class LogicalOr extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return 'or';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_LogicalOr';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalXor.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class LogicalXor extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return 'xor';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_LogicalXor';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Minus.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Minus extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '-';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Minus';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Mod.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Mod extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '%';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Mod';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Mul.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Mul extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '*';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Mul';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/NotEqual.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class NotEqual extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '!=';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_NotEqual';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/NotIdentical.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class NotIdentical extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '!==';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_NotIdentical';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Plus.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Plus extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '+';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Plus';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Pow.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Pow extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '**';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Pow';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/ShiftLeft.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class ShiftLeft extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '<<';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_ShiftLeft';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/ShiftRight.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class ShiftRight extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '>>';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_ShiftRight';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Smaller.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Smaller extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '<';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Smaller';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/SmallerOrEqual.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class SmallerOrEqual extends BinaryOp
 {
-}
+    public function getOperatorSigil() : string {
+        return '<=';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_SmallerOrEqual';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Spaceship.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Spaceship extends BinaryOp
 {
+    public function getOperatorSigil() : string {
+        return '<=>';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Spaceship';
+    }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BitwiseNot.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class BitwiseNot extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_BitwiseNot';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/BooleanNot.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class BooleanNot extends Expr
      * @param Expr $expr       Expression
      * @param array               $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_BooleanNot';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,12 @@ abstract class Cast extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Array_.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\Cast;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\Cast;
 
 class Array_ extends Cast
 {
-}
+    public function getType() : string {
+        return 'Expr_Cast_Array';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Bool_.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\Cast;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\Cast;
 
 class Bool_ extends Cast
 {
+    public function getType() : string {
+        return 'Expr_Cast_Bool';
+    }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Double.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\Cast;
 
@@ -6,4 +6,12 @@ use PhpParser\Node\Expr\Cast;
 
 class Double extends Cast
 {
+    // For use in "kind" attribute
+    const KIND_DOUBLE = 1; // "double" syntax
+    const KIND_FLOAT = 2;  // "float" syntax
+    const KIND_REAL = 3; // "real" syntax
+
+    public function getType() : string {
+        return 'Expr_Cast_Double';
+    }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Int_.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\Cast;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\Cast;
 
 class Int_ extends Cast
 {
+    public function getType() : string {
+        return 'Expr_Cast_Int';
+    }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Object_.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\Cast;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\Cast;
 
 class Object_ extends Cast
 {
+    public function getType() : string {
+        return 'Expr_Cast_Object';
+    }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/String_.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\Cast;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\Cast;
 
 class String_ extends Cast
 {
+    public function getType() : string {
+        return 'Expr_Cast_String';
+    }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Unset_.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\Cast;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\Cast;
 
 class Unset_ extends Cast
 {
-}
+    public function getType() : string {
+        return 'Expr_Cast_Unset';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/ClassConstFetch.php

@@ -1,31 +1,36 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
 use PhpParser\Node\Expr;
+use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
 
 class ClassConstFetch extends Expr
 {
     /** @var Name|Expr Class name */
     public $class;
-    /** @var string|Error Constant name */
+    /** @var Identifier|Error Constant name */
     public $name;
 
     /**
      * Constructs a class const fetch node.
      *
-     * @param Name|Expr    $class      Class name
-     * @param string|Error $name       Constant name
-     * @param array        $attributes Additional attributes
+     * @param Name|Expr               $class      Class name
+     * @param string|Identifier|Error $name       Constant name
+     * @param array                   $attributes Additional attributes
      */
-    public function __construct($class, $name, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct($class, $name, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->class = $class;
-        $this->name = $name;
+        $this->name = \is_string($name) ? new Identifier($name) : $name;
     }
 
-    public function getSubNodeNames() {
-        return array('class', 'name');
+    public function getSubNodeNames() : array {
+        return ['class', 'name'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_ClassConstFetch';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Clone_.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class Clone_ extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Clone';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Closure.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -16,10 +16,12 @@ class Closure extends Expr implements FunctionLike
     public $params;
     /** @var ClosureUse[] use()s */
     public $uses;
-    /** @var null|string|Node\Name|Node\NullableType Return type */
+    /** @var null|Node\Identifier|Node\Name|Node\NullableType|Node\UnionType Return type */
     public $returnType;
-    /** @var Node[] Statements */
+    /** @var Node\Stmt[] Statements */
     public $stmts;
+    /** @var Node\AttributeGroup[] PHP attribute groups */
+    public $attrGroups;
 
     /**
      * Constructs a lambda function node.
@@ -31,27 +33,30 @@ class Closure extends Expr implements FunctionLike
      *                          'uses'       => array(): use()s
      *                          'returnType' => null   : Return type
      *                          'stmts'      => array(): Statements
+     *                          'attrGroups' => array(): PHP attributes groups
      * @param array $attributes Additional attributes
      */
-    public function __construct(array $subNodes = array(), array $attributes = array()) {
-        parent::__construct($attributes);
-        $this->static = isset($subNodes['static']) ? $subNodes['static'] : false;
-        $this->byRef = isset($subNodes['byRef']) ? $subNodes['byRef'] : false;
-        $this->params = isset($subNodes['params']) ? $subNodes['params'] : array();
-        $this->uses = isset($subNodes['uses']) ? $subNodes['uses'] : array();
-        $this->returnType = isset($subNodes['returnType']) ? $subNodes['returnType'] : null;
-        $this->stmts = isset($subNodes['stmts']) ? $subNodes['stmts'] : array();
+    public function __construct(array $subNodes = [], array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->static = $subNodes['static'] ?? false;
+        $this->byRef = $subNodes['byRef'] ?? false;
+        $this->params = $subNodes['params'] ?? [];
+        $this->uses = $subNodes['uses'] ?? [];
+        $returnType = $subNodes['returnType'] ?? null;
+        $this->returnType = \is_string($returnType) ? new Node\Identifier($returnType) : $returnType;
+        $this->stmts = $subNodes['stmts'] ?? [];
+        $this->attrGroups = $subNodes['attrGroups'] ?? [];
     }
 
-    public function getSubNodeNames() {
-        return array('static', 'byRef', 'params', 'uses', 'returnType', 'stmts');
+    public function getSubNodeNames() : array {
+        return ['attrGroups', 'static', 'byRef', 'params', 'uses', 'returnType', 'stmts'];
     }
 
-    public function returnsByRef() {
+    public function returnsByRef() : bool {
         return $this->byRef;
     }
 
-    public function getParams() {
+    public function getParams() : array {
         return $this->params;
     }
 
@@ -59,7 +64,16 @@ class Closure extends Expr implements FunctionLike
         return $this->returnType;
     }
 
-    public function getStmts() {
+    /** @return Node\Stmt[] */
+    public function getStmts() : array {
         return $this->stmts;
     }
+
+    public function getAttrGroups() : array {
+        return $this->attrGroups;
+    }
+
+    public function getType() : string {
+        return 'Expr_Closure';
+    }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/ClosureUse.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -6,7 +6,7 @@ use PhpParser\Node\Expr;
 
 class ClosureUse extends Expr
 {
-    /** @var string Name of variable */
+    /** @var Expr\Variable Variable to use */
     public $var;
     /** @var bool Whether to use by reference */
     public $byRef;
@@ -14,17 +14,21 @@ class ClosureUse extends Expr
     /**
      * Constructs a closure use node.
      *
-     * @param string      $var        Name of variable
-     * @param bool        $byRef      Whether to use by reference
-     * @param array       $attributes Additional attributes
+     * @param Expr\Variable $var        Variable to use
+     * @param bool          $byRef      Whether to use by reference
+     * @param array         $attributes Additional attributes
      */
-    public function __construct($var, $byRef = false, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr\Variable $var, bool $byRef = false, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
         $this->byRef = $byRef;
     }
 
-    public function getSubNodeNames() {
-        return array('var', 'byRef');
+    public function getSubNodeNames() : array {
+        return ['var', 'byRef'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_ClosureUse';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/ConstFetch.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -16,12 +16,16 @@ class ConstFetch extends Expr
      * @param Name  $name       Constant name
      * @param array $attributes Additional attributes
      */
-    public function __construct(Name $name, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Name $name, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->name = $name;
     }
 
-    public function getSubNodeNames() {
-        return array('name');
+    public function getSubNodeNames() : array {
+        return ['name'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_ConstFetch';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Empty_.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class Empty_ extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Empty';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Error.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -17,11 +17,15 @@ class Error extends Expr
      *
      * @param array $attributes Additional attributes
      */
-    public function __construct(array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $attributes = []) {
+        $this->attributes = $attributes;
     }
 
-    public function getSubNodeNames() {
-        return array();
+    public function getSubNodeNames() : array {
+        return [];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Error';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/ErrorSuppress.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class ErrorSuppress extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_ErrorSuppress';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Eval_.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class Eval_ extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Eval';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Exit_.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -19,12 +19,16 @@ class Exit_ extends Expr
      * @param null|Expr $expr       Expression
      * @param array                    $attributes Additional attributes
      */
-    public function __construct(Expr $expr = null, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr = null, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Exit';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/FuncCall.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -16,16 +16,20 @@ class FuncCall extends Expr
      * Constructs a function call node.
      *
      * @param Node\Name|Expr $name       Function name
-     * @param Node\Arg[]                    $args       Arguments
-     * @param array                                   $attributes Additional attributes
+     * @param Node\Arg[]     $args       Arguments
+     * @param array          $attributes Additional attributes
      */
-    public function __construct($name, array $args = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct($name, array $args = [], array $attributes = []) {
+        $this->attributes = $attributes;
         $this->name = $name;
         $this->args = $args;
     }
 
-    public function getSubNodeNames() {
-        return array('name', 'args');
+    public function getSubNodeNames() : array {
+        return ['name', 'args'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_FuncCall';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Include_.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -23,13 +23,17 @@ class Include_ extends Expr
      * @param int   $type       Type of include
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $expr, $type, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, int $type, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
         $this->type = $type;
     }
 
-    public function getSubNodeNames() {
-        return array('expr', 'type');
+    public function getSubNodeNames() : array {
+        return ['expr', 'type'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Include';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Instanceof_.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -19,13 +19,17 @@ class Instanceof_ extends Expr
      * @param Name|Expr $class      Class name
      * @param array     $attributes Additional attributes
      */
-    public function __construct(Expr $expr, $class, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, $class, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
         $this->class = $class;
     }
 
-    public function getSubNodeNames() {
-        return array('expr', 'class');
+    public function getSubNodeNames() : array {
+        return ['expr', 'class'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Instanceof';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Isset_.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class Isset_ extends Expr
      * @param Expr[] $vars       Variables
      * @param array  $attributes Additional attributes
      */
-    public function __construct(array $vars, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $vars, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->vars = $vars;
     }
 
-    public function getSubNodeNames() {
-        return array('vars');
+    public function getSubNodeNames() : array {
+        return ['vars'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Isset';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/List_.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -6,21 +6,25 @@ use PhpParser\Node\Expr;
 
 class List_ extends Expr
 {
-    /** @var ArrayItem[] List of items to assign to */
+    /** @var (ArrayItem|null)[] List of items to assign to */
     public $items;
 
     /**
      * Constructs a list() destructuring node.
      *
-     * @param ArrayItem[] $items      List of items to assign to
-     * @param array       $attributes Additional attributes
+     * @param (ArrayItem|null)[] $items      List of items to assign to
+     * @param array              $attributes Additional attributes
      */
-    public function __construct(array $items, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $items, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->items = $items;
     }
 
-    public function getSubNodeNames() {
-        return array('items');
+    public function getSubNodeNames() : array {
+        return ['items'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_List';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Match_.php

@@ -0,0 +1,31 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node\Expr;
+
+use PhpParser\Node;
+use PhpParser\Node\MatchArm;
+
+class Match_ extends Node\Expr
+{
+    /** @var Node\Expr */
+    public $cond;
+    /** @var MatchArm[] */
+    public $arms;
+
+    /**
+     * @param MatchArm[] $arms
+     */
+    public function __construct(Node\Expr $cond, array $arms = [], array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->cond = $cond;
+        $this->arms = $arms;
+    }
+
+    public function getSubNodeNames() : array {
+        return ['cond', 'arms'];
+    }
+
+    public function getType() : string {
+        return 'Expr_Match';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/MethodCall.php

@@ -1,15 +1,16 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr;
+use PhpParser\Node\Identifier;
 
 class MethodCall extends Expr
 {
     /** @var Expr Variable holding object */
     public $var;
-    /** @var string|Expr Method name */
+    /** @var Identifier|Expr Method name */
     public $name;
     /** @var Arg[] Arguments */
     public $args;
@@ -17,19 +18,23 @@ class MethodCall extends Expr
     /**
      * Constructs a function call node.
      *
-     * @param Expr        $var        Variable holding object
-     * @param string|Expr $name       Method name
-     * @param Arg[]       $args       Arguments
-     * @param array       $attributes Additional attributes
+     * @param Expr                   $var        Variable holding object
+     * @param string|Identifier|Expr $name       Method name
+     * @param Arg[]                  $args       Arguments
+     * @param array                  $attributes Additional attributes
      */
-    public function __construct(Expr $var, $name, array $args = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $var, $name, array $args = [], array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
-        $this->name = $name;
+        $this->name = \is_string($name) ? new Identifier($name) : $name;
         $this->args = $args;
     }
 
-    public function getSubNodeNames() {
-        return array('var', 'name', 'args');
+    public function getSubNodeNames() : array {
+        return ['var', 'name', 'args'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_MethodCall';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/New_.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -19,13 +19,17 @@ class New_ extends Expr
      * @param Node\Arg[]                      $args       Arguments
      * @param array                           $attributes Additional attributes
      */
-    public function __construct($class, array $args = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct($class, array $args = [], array $attributes = []) {
+        $this->attributes = $attributes;
         $this->class = $class;
         $this->args = $args;
     }
 
-    public function getSubNodeNames() {
-        return array('class', 'args');
+    public function getSubNodeNames() : array {
+        return ['class', 'args'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_New';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafeMethodCall.php

@@ -0,0 +1,40 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node\Expr;
+
+use PhpParser\Node\Arg;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Identifier;
+
+class NullsafeMethodCall extends Expr
+{
+    /** @var Expr Variable holding object */
+    public $var;
+    /** @var Identifier|Expr Method name */
+    public $name;
+    /** @var Arg[] Arguments */
+    public $args;
+
+    /**
+     * Constructs a nullsafe method call node.
+     *
+     * @param Expr                   $var        Variable holding object
+     * @param string|Identifier|Expr $name       Method name
+     * @param Arg[]                  $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 getType() : string {
+        return 'Expr_NullsafeMethodCall';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafePropertyFetch.php

@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node\Expr;
+
+use PhpParser\Node\Expr;
+use PhpParser\Node\Identifier;
+
+class NullsafePropertyFetch extends Expr
+{
+    /** @var Expr Variable holding object */
+    public $var;
+    /** @var Identifier|Expr Property name */
+    public $name;
+
+    /**
+     * Constructs a nullsafe property fetch node.
+     *
+     * @param Expr                   $var        Variable holding object
+     * @param string|Identifier|Expr $name       Property name
+     * @param array                  $attributes Additional attributes
+     */
+    public function __construct(Expr $var, $name, array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->var = $var;
+        $this->name = \is_string($name) ? new Identifier($name) : $name;
+    }
+
+    public function getSubNodeNames() : array {
+        return ['var', 'name'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_NullsafePropertyFetch';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/PostDec.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class PostDec extends Expr
      * @param Expr  $var        Variable
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $var, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $var, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
     }
 
-    public function getSubNodeNames() {
-        return array('var');
+    public function getSubNodeNames() : array {
+        return ['var'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_PostDec';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/PostInc.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class PostInc extends Expr
      * @param Expr  $var        Variable
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $var, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $var, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
     }
 
-    public function getSubNodeNames() {
-        return array('var');
+    public function getSubNodeNames() : array {
+        return ['var'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_PostInc';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/PreDec.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class PreDec extends Expr
      * @param Expr  $var        Variable
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $var, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $var, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
     }
 
-    public function getSubNodeNames() {
-        return array('var');
+    public function getSubNodeNames() : array {
+        return ['var'];
+    }
+
+    public function getType() : string {
+        return 'Expr_PreDec';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/PreInc.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class PreInc extends Expr
      * @param Expr  $var        Variable
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $var, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $var, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
     }
 
-    public function getSubNodeNames() {
-        return array('var');
+    public function getSubNodeNames() : array {
+        return ['var'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_PreInc';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Print_.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class Print_ extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Print';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/PropertyFetch.php

@@ -1,30 +1,35 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
 use PhpParser\Node\Expr;
+use PhpParser\Node\Identifier;
 
 class PropertyFetch extends Expr
 {
     /** @var Expr Variable holding object */
     public $var;
-    /** @var string|Expr Property name */
+    /** @var Identifier|Expr Property name */
     public $name;
 
     /**
      * Constructs a function call node.
      *
-     * @param Expr        $var        Variable holding object
-     * @param string|Expr $name       Property name
-     * @param array       $attributes Additional attributes
+     * @param Expr                   $var        Variable holding object
+     * @param string|Identifier|Expr $name       Property name
+     * @param array                  $attributes Additional attributes
      */
-    public function __construct(Expr $var, $name, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $var, $name, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
-        $this->name = $name;
+        $this->name = \is_string($name) ? new Identifier($name) : $name;
     }
 
-    public function getSubNodeNames() {
-        return array('var', 'name');
+    public function getSubNodeNames() : array {
+        return ['var', 'name'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_PropertyFetch';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/ShellExec.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class ShellExec extends Expr
      * @param array $parts      Encapsed string array
      * @param array $attributes Additional attributes
      */
-    public function __construct(array $parts, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $parts, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->parts = $parts;
     }
 
-    public function getSubNodeNames() {
-        return array('parts');
+    public function getSubNodeNames() : array {
+        return ['parts'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_ShellExec';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php

@@ -1,15 +1,16 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr;
+use PhpParser\Node\Identifier;
 
 class StaticCall extends Expr
 {
     /** @var Node\Name|Expr Class name */
     public $class;
-    /** @var string|Expr Method name */
+    /** @var Identifier|Expr Method name */
     public $name;
     /** @var Node\Arg[] Arguments */
     public $args;
@@ -17,19 +18,23 @@ class StaticCall extends Expr
     /**
      * Constructs a static method call node.
      *
-     * @param Node\Name|Expr $class      Class name
-     * @param string|Expr    $name       Method name
-     * @param Node\Arg[]     $args       Arguments
-     * @param array          $attributes Additional attributes
+     * @param Node\Name|Expr         $class      Class name
+     * @param string|Identifier|Expr $name       Method name
+     * @param Node\Arg[]             $args       Arguments
+     * @param array                  $attributes Additional attributes
      */
-    public function __construct($class, $name, array $args = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct($class, $name, array $args = [], array $attributes = []) {
+        $this->attributes = $attributes;
         $this->class = $class;
-        $this->name = $name;
+        $this->name = \is_string($name) ? new Identifier($name) : $name;
         $this->args = $args;
     }
 
-    public function getSubNodeNames() {
-        return array('class', 'name', 'args');
+    public function getSubNodeNames() : array {
+        return ['class', 'name', 'args'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_StaticCall';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/StaticPropertyFetch.php

@@ -1,31 +1,36 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Name;
+use PhpParser\Node\VarLikeIdentifier;
 
 class StaticPropertyFetch extends Expr
 {
     /** @var Name|Expr Class name */
     public $class;
-    /** @var string|Expr Property name */
+    /** @var VarLikeIdentifier|Expr Property name */
     public $name;
 
     /**
      * Constructs a static property fetch node.
      *
-     * @param Name|Expr   $class      Class name
-     * @param string|Expr $name       Property name
-     * @param array       $attributes Additional attributes
+     * @param Name|Expr                     $class      Class name
+     * @param string|VarLikeIdentifier|Expr $name       Property name
+     * @param array                         $attributes Additional attributes
      */
-    public function __construct($class, $name, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct($class, $name, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->class = $class;
-        $this->name = $name;
+        $this->name = \is_string($name) ? new VarLikeIdentifier($name) : $name;
     }
 
-    public function getSubNodeNames() {
-        return array('class', 'name');
+    public function getSubNodeNames() : array {
+        return ['class', 'name'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_StaticPropertyFetch';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Ternary.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -21,14 +21,18 @@ class Ternary extends Expr
      * @param Expr      $else       Expression for false
      * @param array                    $attributes Additional attributes
      */
-    public function __construct(Expr $cond, $if, Expr $else, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $cond, $if, Expr $else, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->cond = $cond;
         $this->if = $if;
         $this->else = $else;
     }
 
-    public function getSubNodeNames() {
-        return array('cond', 'if', 'else');
+    public function getSubNodeNames() : array {
+        return ['cond', 'if', 'else'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Ternary';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Throw_.php

@@ -0,0 +1,30 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node\Expr;
+
+use PhpParser\Node;
+
+class Throw_ extends Node\Expr
+{
+    /** @var Node\Expr Expression */
+    public $expr;
+
+    /**
+     * Constructs a throw expression node.
+     *
+     * @param Node\Expr $expr       Expression
+     * @param array     $attributes Additional attributes
+     */
+    public function __construct(Node\Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->expr = $expr;
+    }
+
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+
+    public function getType() : string {
+        return 'Expr_Throw';
+    }
+}

lib/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryMinus.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class UnaryMinus extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_UnaryMinus';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryPlus.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class UnaryPlus extends Expr
      * @param Expr $expr       Expression
      * @param array               $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_UnaryPlus';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Variable.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class Variable extends Expr
      * @param string|Expr $name       Name
      * @param array                      $attributes Additional attributes
      */
-    public function __construct($name, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct($name, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->name = $name;
     }
 
-    public function getSubNodeNames() {
-        return array('name');
+    public function getSubNodeNames() : array {
+        return ['name'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Variable';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/YieldFrom.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class YieldFrom extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_YieldFrom';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -18,13 +18,17 @@ class Yield_ extends Expr
      * @param null|Expr $key        Key expression
      * @param array     $attributes Additional attributes
      */
-    public function __construct(Expr $value = null, Expr $key = null, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $value = null, Expr $key = null, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->key = $key;
         $this->value = $value;
     }
 
-    public function getSubNodeNames() {
-        return array('key', 'value');
+    public function getSubNodeNames() : array {
+        return ['key', 'value'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Yield';
     }
 }

lib/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node;
 
@@ -11,26 +11,33 @@ interface FunctionLike extends Node
      *
      * @return bool
      */
-    public function returnsByRef();
+    public function returnsByRef() : bool;
 
     /**
      * List of parameters
      *
-     * @return Node\Param[]
+     * @return Param[]
      */
-    public function getParams();
+    public function getParams() : array;
 
     /**
      * Get the declared return type or null
-     * 
-     * @return null|string|Node\Name|Node\NullableType
+     *
+     * @return null|Identifier|Name|NullableType|UnionType
      */
     public function getReturnType();
 
     /**
      * The function body
      *
-     * @return Node\Stmt[]
+     * @return Stmt[]|null
      */
     public function getStmts();
+
+    /**
+     * Get PHP attribute groups.
+     *
+     * @return AttributeGroup[]
+     */
+    public function getAttrGroups() : array;
 }