rebase

Author: TomasVotruba

lib/PhpParser/Internal/PrintableNewAnonClassNode.php

@@ -15,12 +15,7 @@
  *
  * @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 */

lib/PhpParser/Node/Expr/Closure.php

@@ -7,12 +7,7 @@
 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)
+class Closure extends Expr implements FunctionLike, Node\StmtsIterable {
     /** @var bool Whether the closure is static */
     public $static;
     /** @var bool Whether to return by reference */

lib/PhpParser/Node/Stmt/Case_.php

@@ -4,12 +4,7 @@
 
 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)
+class Case_ extends Node\Stmt implements Node\StmtsIterable {
     /** @var null|Node\Expr Condition (null for default) */
     public $cond;
     /** @var Node\Stmt[] Statements */
@@ -32,11 +27,7 @@ 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';
     }
 }

lib/PhpParser/Node/Stmt/Catch_.php

@@ -5,12 +5,7 @@
 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)
+class Catch_ extends Node\Stmt implements Node\StmtsIterable {
     /** @var Node\Name[] Types of exceptions to catch */
     public $types;
     /** @var Expr\Variable|null Variable for exception */

lib/PhpParser/Node/Stmt/ClassMethod.php

@@ -6,12 +6,7 @@
 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 */
@@ -22,7 +17,7 @@ class ClassMethod extends Node\Stmt implements FunctionLike, Node\StmtsIterable
     public $params;
     /** @var null|Node\Identifier|Node\Name|Node\ComplexType Return type */
     public $returnType;
-    /** @var Node\Stmt[] Statements */
+    /** @var Node\Stmt[]|null Statements */
     public $stmts;
     /** @var Node\AttributeGroup[] PHP attribute groups */
     public $attrGroups;

lib/PhpParser/Node/Stmt/Do_.php

@@ -4,12 +4,7 @@
 
 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)
+class Do_ extends Node\Stmt implements Node\StmtsIterable {
     /** @var Node\Stmt[] Statements */
     public $stmts;
     /** @var Node\Expr Condition */
@@ -32,11 +27,7 @@ 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';
     }
 }

lib/PhpParser/Node/Stmt/ElseIf_.php

@@ -4,12 +4,7 @@
 
 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)
+class ElseIf_ extends Node\Stmt implements Node\StmtsIterable {
     /** @var Node\Expr Condition */
     public $cond;
     /** @var Node\Stmt[] Statements */
@@ -32,11 +27,7 @@ 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';
     }
 }

lib/PhpParser/Node/Stmt/Else_.php

@@ -4,12 +4,7 @@
 
 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)
+class Else_ extends Node\Stmt implements Node\StmtsIterable {
     /** @var Node\Stmt[] Statements */
     public $stmts;
 
@@ -28,11 +23,7 @@ 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';
     }
 }

lib/PhpParser/Node/Stmt/Finally_.php

@@ -4,12 +4,7 @@
 
 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)
+class Finally_ extends Node\Stmt implements Node\StmtsIterable {
     /** @var Node\Stmt[] Statements */
     public $stmts;
 
@@ -28,11 +23,7 @@ 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';
     }
 }

lib/PhpParser/Node/Stmt/For_.php

@@ -4,12 +4,7 @@
 
 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)
+class For_ extends Node\Stmt implements Node\StmtsIterable {
     /** @var Node\Expr[] Init expressions */
     public $init;
     /** @var Node\Expr[] Loop conditions */
@@ -41,11 +36,7 @@ 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';
     }
 }