add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors

TomasVotruba · TomasVotruba · commit b39f51051f4e · 2022-09-25T16:20:04.000+02:00
diff --git a/lib/PhpParser/Internal/PrintableNewAnonClassNode.php b/lib/PhpParser/Internal/PrintableNewAnonClassNode.php
@@ -15,7 +15,12 @@
  *
  * @internal
  */
+<<<<<<< HEAD
 class PrintableNewAnonClassNode extends Expr {
+=======
+class PrintableNewAnonClassNode extends Expr implements Node\StmtsIterable
+{
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
     /** @var Node\AttributeGroup[] PHP attribute groups */
     public $attrGroups;
     /** @var Node\Arg[] Arguments */
diff --git a/lib/PhpParser/Node/Expr/Closure.php b/lib/PhpParser/Node/Expr/Closure.php
@@ -7,7 +7,12 @@
 use PhpParser\Node\Expr;
 use PhpParser\Node\FunctionLike;
 
+<<<<<<< HEAD
 class Closure extends Expr implements FunctionLike {
+=======
+class Closure extends Expr implements FunctionLike, Node\StmtsIterable
+{
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
     /** @var bool Whether the closure is static */
     public $static;
     /** @var bool Whether to return by reference */
diff --git a/lib/PhpParser/Node/Stmt/Case_.php b/lib/PhpParser/Node/Stmt/Case_.php
@@ -4,7 +4,12 @@
 
 use PhpParser\Node;
 
+<<<<<<< HEAD
 class Case_ extends Node\Stmt {
+=======
+class Case_ extends Node\Stmt implements Node\StmtsIterable
+{
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
     /** @var null|Node\Expr Condition (null for default) */
     public $cond;
     /** @var Node\Stmt[] Statements */
@@ -27,7 +32,11 @@ public function getSubNodeNames(): array {
         return ['cond', 'stmts'];
     }
 
+<<<<<<< HEAD
     public function getType(): string {
+=======
+    public function getType() : string {
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
         return 'Stmt_Case';
     }
 }
diff --git a/lib/PhpParser/Node/Stmt/Catch_.php b/lib/PhpParser/Node/Stmt/Catch_.php
@@ -5,7 +5,12 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 
+<<<<<<< HEAD
 class Catch_ extends Node\Stmt {
+=======
+class Catch_ extends Node\Stmt implements Node\StmtsIterable
+{
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
     /** @var Node\Name[] Types of exceptions to catch */
     public $types;
     /** @var Expr\Variable|null Variable for exception */
diff --git a/lib/PhpParser/Node/Stmt/ClassMethod.php b/lib/PhpParser/Node/Stmt/ClassMethod.php
@@ -6,7 +6,12 @@
 use PhpParser\Node;
 use PhpParser\Node\FunctionLike;
 
+<<<<<<< HEAD
 class ClassMethod extends Node\Stmt implements FunctionLike {
+=======
+class ClassMethod extends Node\Stmt implements FunctionLike, Node\StmtsIterable
+{
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
     /** @var int Flags */
     public $flags;
     /** @var bool Whether to return by reference */
@@ -17,7 +22,7 @@ class ClassMethod extends Node\Stmt implements FunctionLike {
     public $params;
     /** @var null|Node\Identifier|Node\Name|Node\ComplexType Return type */
     public $returnType;
-    /** @var Node\Stmt[]|null Statements */
+    /** @var Node\Stmt[] Statements */
     public $stmts;
     /** @var Node\AttributeGroup[] PHP attribute groups */
     public $attrGroups;
diff --git a/lib/PhpParser/Node/Stmt/Do_.php b/lib/PhpParser/Node/Stmt/Do_.php
@@ -4,7 +4,12 @@
 
 use PhpParser\Node;
 
+<<<<<<< HEAD
 class Do_ extends Node\Stmt {
+=======
+class Do_ extends Node\Stmt implements Node\StmtsIterable
+{
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
     /** @var Node\Stmt[] Statements */
     public $stmts;
     /** @var Node\Expr Condition */
@@ -27,7 +32,11 @@ public function getSubNodeNames(): array {
         return ['stmts', 'cond'];
     }
 
+<<<<<<< HEAD
     public function getType(): string {
+=======
+    public function getType() : string {
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
         return 'Stmt_Do';
     }
 }
diff --git a/lib/PhpParser/Node/Stmt/ElseIf_.php b/lib/PhpParser/Node/Stmt/ElseIf_.php
@@ -4,7 +4,12 @@
 
 use PhpParser\Node;
 
+<<<<<<< HEAD
 class ElseIf_ extends Node\Stmt {
+=======
+class ElseIf_ extends Node\Stmt implements Node\StmtsIterable
+{
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
     /** @var Node\Expr Condition */
     public $cond;
     /** @var Node\Stmt[] Statements */
@@ -27,7 +32,11 @@ public function getSubNodeNames(): array {
         return ['cond', 'stmts'];
     }
 
+<<<<<<< HEAD
     public function getType(): string {
+=======
+    public function getType() : string {
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
         return 'Stmt_ElseIf';
     }
 }
diff --git a/lib/PhpParser/Node/Stmt/Else_.php b/lib/PhpParser/Node/Stmt/Else_.php
@@ -4,7 +4,12 @@
 
 use PhpParser\Node;
 
+<<<<<<< HEAD
 class Else_ extends Node\Stmt {
+=======
+class Else_ extends Node\Stmt implements Node\StmtsIterable
+{
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
     /** @var Node\Stmt[] Statements */
     public $stmts;
 
@@ -23,7 +28,11 @@ public function getSubNodeNames(): array {
         return ['stmts'];
     }
 
+<<<<<<< HEAD
     public function getType(): string {
+=======
+    public function getType() : string {
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
         return 'Stmt_Else';
     }
 }
diff --git a/lib/PhpParser/Node/Stmt/Finally_.php b/lib/PhpParser/Node/Stmt/Finally_.php
@@ -4,7 +4,12 @@
 
 use PhpParser\Node;
 
+<<<<<<< HEAD
 class Finally_ extends Node\Stmt {
+=======
+class Finally_ extends Node\Stmt implements Node\StmtsIterable
+{
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
     /** @var Node\Stmt[] Statements */
     public $stmts;
 
@@ -23,7 +28,11 @@ public function getSubNodeNames(): array {
         return ['stmts'];
     }
 
+<<<<<<< HEAD
     public function getType(): string {
+=======
+    public function getType() : string {
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
         return 'Stmt_Finally';
     }
 }
diff --git a/lib/PhpParser/Node/Stmt/For_.php b/lib/PhpParser/Node/Stmt/For_.php
@@ -4,7 +4,12 @@
 
 use PhpParser\Node;
 
+<<<<<<< HEAD
 class For_ extends Node\Stmt {
+=======
+class For_ extends Node\Stmt implements Node\StmtsIterable
+{
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
     /** @var Node\Expr[] Init expressions */
     public $init;
     /** @var Node\Expr[] Loop conditions */
@@ -36,7 +41,11 @@ public function getSubNodeNames(): array {
         return ['init', 'cond', 'loop', 'stmts'];
     }
 
+<<<<<<< HEAD
     public function getType(): string {
+=======
+    public function getType() : string {
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
         return 'Stmt_For';
     }
 }
diff --git a/lib/PhpParser/Node/Stmt/Foreach_.php b/lib/PhpParser/Node/Stmt/Foreach_.php
@@ -4,7 +4,12 @@
 
 use PhpParser\Node;
 
+<<<<<<< HEAD
 class Foreach_ extends Node\Stmt {
+=======
+class Foreach_ extends Node\Stmt implements Node\StmtsIterable
+{
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
     /** @var Node\Expr Expression to iterate */
     public $expr;
     /** @var null|Node\Expr Variable to assign key to */
@@ -40,7 +45,11 @@ public function getSubNodeNames(): array {
         return ['expr', 'keyVar', 'byRef', 'valueVar', 'stmts'];
     }
 
+<<<<<<< HEAD
     public function getType(): string {
+=======
+    public function getType() : string {
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
         return 'Stmt_Foreach';
     }
 }
diff --git a/lib/PhpParser/Node/Stmt/Function_.php b/lib/PhpParser/Node/Stmt/Function_.php
@@ -5,7 +5,12 @@
 use PhpParser\Node;
 use PhpParser\Node\FunctionLike;
 
+<<<<<<< HEAD
 class Function_ extends Node\Stmt implements FunctionLike {
+=======
+class Function_ extends Node\Stmt implements FunctionLike, Node\StmtsIterable
+{
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
     /** @var bool Whether function returns by reference */
     public $byRef;
     /** @var Node\Identifier Name */
diff --git a/lib/PhpParser/Node/Stmt/If_.php b/lib/PhpParser/Node/Stmt/If_.php
@@ -4,7 +4,12 @@
 
 use PhpParser\Node;
 
+<<<<<<< HEAD
 class If_ extends Node\Stmt {
+=======
+class If_ extends Node\Stmt implements Node\StmtsIterable
+{
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
     /** @var Node\Expr Condition expression */
     public $cond;
     /** @var Node\Stmt[] Statements */
@@ -36,7 +41,11 @@ public function getSubNodeNames(): array {
         return ['cond', 'stmts', 'elseifs', 'else'];
     }
 
+<<<<<<< HEAD
     public function getType(): string {
+=======
+    public function getType() : string {
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
         return 'Stmt_If';
     }
 }
diff --git a/lib/PhpParser/Node/Stmt/Namespace_.php b/lib/PhpParser/Node/Stmt/Namespace_.php
@@ -4,7 +4,12 @@
 
 use PhpParser\Node;
 
+<<<<<<< HEAD
 class Namespace_ extends Node\Stmt {
+=======
+class Namespace_ extends Node\Stmt implements Node\StmtsIterable
+{
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
     /* For use in the "kind" attribute */
     public const KIND_SEMICOLON = 1;
     public const KIND_BRACED = 2;
@@ -31,7 +36,11 @@ public function getSubNodeNames(): array {
         return ['name', 'stmts'];
     }
 
+<<<<<<< HEAD
     public function getType(): string {
+=======
+    public function getType() : string {
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
         return 'Stmt_Namespace';
     }
 }
diff --git a/lib/PhpParser/Node/Stmt/TryCatch.php b/lib/PhpParser/Node/Stmt/TryCatch.php
@@ -4,7 +4,12 @@
 
 use PhpParser\Node;
 
+<<<<<<< HEAD
 class TryCatch extends Node\Stmt {
+=======
+class TryCatch extends Node\Stmt implements Node\StmtsIterable
+{
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
     /** @var Node\Stmt[] Statements */
     public $stmts;
     /** @var Catch_[] Catches */
diff --git a/lib/PhpParser/Node/Stmt/While_.php b/lib/PhpParser/Node/Stmt/While_.php
@@ -4,7 +4,12 @@
 
 use PhpParser\Node;
 
+<<<<<<< HEAD
 class While_ extends Node\Stmt {
+=======
+class While_ extends Node\Stmt implements Node\StmtsIterable
+{
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
     /** @var Node\Expr Condition */
     public $cond;
     /** @var Node\Stmt[] Statements */
@@ -27,7 +32,11 @@ public function getSubNodeNames(): array {
         return ['cond', 'stmts'];
     }
 
+<<<<<<< HEAD
     public function getType(): string {
+=======
+    public function getType() : string {
+>>>>>>> 920aae4f (add StmtsIterable interface to mark nodes that contain iterable stmts to improve hooking in node visitors)
         return 'Stmt_While';
     }
 }
diff --git a/lib/PhpParser/Node/StmtsIterable.php b/lib/PhpParser/Node/StmtsIterable.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpParser\Node;
+
+use PhpParser\Node;
+
+/**
+ * @property Stmt[] $stmts
+ */
+interface StmtsIterable extends Node
+{
+}
