From 2ff499f55a8ca2c0af71d0a27b16f862bf6aeb2b Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Wed, 8 Oct 2025 11:15:33 +0200
Subject: [PATCH 1/3] add ContaintsStmts interface to mark stmt classes with
 nested stmts inside

---
 lib/PhpParser/Node/ContainsStmts.php   | 11 +++++++++++
 lib/PhpParser/Node/Expr/Closure.php    |  2 +-
 lib/PhpParser/Node/Stmt/Block.php      |  3 ++-
 lib/PhpParser/Node/Stmt/Case_.php      |  2 +-
 lib/PhpParser/Node/Stmt/Catch_.php     |  2 +-
 lib/PhpParser/Node/Stmt/Do_.php        |  2 +-
 lib/PhpParser/Node/Stmt/ElseIf_.php    |  2 +-
 lib/PhpParser/Node/Stmt/Else_.php      |  2 +-
 lib/PhpParser/Node/Stmt/Finally_.php   |  2 +-
 lib/PhpParser/Node/Stmt/For_.php       |  2 +-
 lib/PhpParser/Node/Stmt/Foreach_.php   |  2 +-
 lib/PhpParser/Node/Stmt/Function_.php  |  2 +-
 lib/PhpParser/Node/Stmt/If_.php        |  2 +-
 lib/PhpParser/Node/Stmt/Namespace_.php |  2 +-
 lib/PhpParser/Node/Stmt/TryCatch.php   |  2 +-
 lib/PhpParser/Node/Stmt/While_.php     |  2 +-
 16 files changed, 27 insertions(+), 15 deletions(-)
 create mode 100644 lib/PhpParser/Node/ContainsStmts.php

diff --git a/lib/PhpParser/Node/ContainsStmts.php b/lib/PhpParser/Node/ContainsStmts.php
new file mode 100644
index 0000000000..8e553f56b4
--- /dev/null
+++ b/lib/PhpParser/Node/ContainsStmts.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpParser\Node;
+
+/**
+ * @property-read Stmt[] $stmts
+ */
+interface ContainsStmts extends \PhpParser\Node {
+}
diff --git a/lib/PhpParser/Node/Expr/Closure.php b/lib/PhpParser/Node/Expr/Closure.php
index 0680446f34..e4ae9ef91a 100644
--- a/lib/PhpParser/Node/Expr/Closure.php
+++ b/lib/PhpParser/Node/Expr/Closure.php
@@ -7,7 +7,7 @@
 use PhpParser\Node\Expr;
 use PhpParser\Node\FunctionLike;
 
-class Closure extends Expr implements FunctionLike {
+class Closure extends Expr implements FunctionLike, Node\ContainsStmts {
     /** @var bool Whether the closure is static */
     public bool $static;
     /** @var bool Whether to return by reference */
diff --git a/lib/PhpParser/Node/Stmt/Block.php b/lib/PhpParser/Node/Stmt/Block.php
index 073df2086f..80484ce396 100644
--- a/lib/PhpParser/Node/Stmt/Block.php
+++ b/lib/PhpParser/Node/Stmt/Block.php
@@ -2,9 +2,10 @@
 
 namespace PhpParser\Node\Stmt;
 
+use PhpParser\Node\ContainsStmts;
 use PhpParser\Node\Stmt;
 
-class Block extends Stmt {
+class Block extends Stmt implements ContainsStmts {
     /** @var Stmt[] Statements */
     public array $stmts;
 
diff --git a/lib/PhpParser/Node/Stmt/Case_.php b/lib/PhpParser/Node/Stmt/Case_.php
index a06ca1832e..c4e743829e 100644
--- a/lib/PhpParser/Node/Stmt/Case_.php
+++ b/lib/PhpParser/Node/Stmt/Case_.php
@@ -4,7 +4,7 @@
 
 use PhpParser\Node;
 
-class Case_ extends Node\Stmt {
+class Case_ extends Node\Stmt implements Node\ContainsStmts {
     /** @var null|Node\Expr Condition (null for default) */
     public ?Node\Expr $cond;
     /** @var Node\Stmt[] Statements */
diff --git a/lib/PhpParser/Node/Stmt/Catch_.php b/lib/PhpParser/Node/Stmt/Catch_.php
index e8d39c9cce..d5248572fa 100644
--- a/lib/PhpParser/Node/Stmt/Catch_.php
+++ b/lib/PhpParser/Node/Stmt/Catch_.php
@@ -5,7 +5,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 
-class Catch_ extends Node\Stmt {
+class Catch_ extends Node\Stmt implements Node\ContainsStmts {
     /** @var Node\Name[] Types of exceptions to catch */
     public array $types;
     /** @var Expr\Variable|null Variable for exception */
diff --git a/lib/PhpParser/Node/Stmt/Do_.php b/lib/PhpParser/Node/Stmt/Do_.php
index 6124442881..4940008b70 100644
--- a/lib/PhpParser/Node/Stmt/Do_.php
+++ b/lib/PhpParser/Node/Stmt/Do_.php
@@ -4,7 +4,7 @@
 
 use PhpParser\Node;
 
-class Do_ extends Node\Stmt {
+class Do_ extends Node\Stmt implements Node\ContainsStmts {
     /** @var Node\Stmt[] Statements */
     public array $stmts;
     /** @var Node\Expr Condition */
diff --git a/lib/PhpParser/Node/Stmt/ElseIf_.php b/lib/PhpParser/Node/Stmt/ElseIf_.php
index b26d59ce5f..a07756f51f 100644
--- a/lib/PhpParser/Node/Stmt/ElseIf_.php
+++ b/lib/PhpParser/Node/Stmt/ElseIf_.php
@@ -4,7 +4,7 @@
 
 use PhpParser\Node;
 
-class ElseIf_ extends Node\Stmt {
+class ElseIf_ extends Node\Stmt implements Node\ContainsStmts {
     /** @var Node\Expr Condition */
     public Node\Expr $cond;
     /** @var Node\Stmt[] Statements */
diff --git a/lib/PhpParser/Node/Stmt/Else_.php b/lib/PhpParser/Node/Stmt/Else_.php
index 3d2b066ec9..de7cd1a978 100644
--- a/lib/PhpParser/Node/Stmt/Else_.php
+++ b/lib/PhpParser/Node/Stmt/Else_.php
@@ -4,7 +4,7 @@
 
 use PhpParser\Node;
 
-class Else_ extends Node\Stmt {
+class Else_ extends Node\Stmt implements Node\ContainsStmts {
     /** @var Node\Stmt[] Statements */
     public array $stmts;
 
diff --git a/lib/PhpParser/Node/Stmt/Finally_.php b/lib/PhpParser/Node/Stmt/Finally_.php
index 69ecf25373..934b74ce15 100644
--- a/lib/PhpParser/Node/Stmt/Finally_.php
+++ b/lib/PhpParser/Node/Stmt/Finally_.php
@@ -4,7 +4,7 @@
 
 use PhpParser\Node;
 
-class Finally_ extends Node\Stmt {
+class Finally_ extends Node\Stmt implements Node\ContainsStmts {
     /** @var Node\Stmt[] Statements */
     public array $stmts;
 
diff --git a/lib/PhpParser/Node/Stmt/For_.php b/lib/PhpParser/Node/Stmt/For_.php
index 6f2fbb9e3a..65901028e9 100644
--- a/lib/PhpParser/Node/Stmt/For_.php
+++ b/lib/PhpParser/Node/Stmt/For_.php
@@ -4,7 +4,7 @@
 
 use PhpParser\Node;
 
-class For_ extends Node\Stmt {
+class For_ extends Node\Stmt implements Node\ContainsStmts {
     /** @var Node\Expr[] Init expressions */
     public array $init;
     /** @var Node\Expr[] Loop conditions */
diff --git a/lib/PhpParser/Node/Stmt/Foreach_.php b/lib/PhpParser/Node/Stmt/Foreach_.php
index c5d9a8b132..c5eaca7533 100644
--- a/lib/PhpParser/Node/Stmt/Foreach_.php
+++ b/lib/PhpParser/Node/Stmt/Foreach_.php
@@ -4,7 +4,7 @@
 
 use PhpParser\Node;
 
-class Foreach_ extends Node\Stmt {
+class Foreach_ extends Node\Stmt implements Node\ContainsStmts {
     /** @var Node\Expr Expression to iterate */
     public Node\Expr $expr;
     /** @var null|Node\Expr Variable to assign key to */
diff --git a/lib/PhpParser/Node/Stmt/Function_.php b/lib/PhpParser/Node/Stmt/Function_.php
index 2111bab749..fa08f43083 100644
--- a/lib/PhpParser/Node/Stmt/Function_.php
+++ b/lib/PhpParser/Node/Stmt/Function_.php
@@ -5,7 +5,7 @@
 use PhpParser\Node;
 use PhpParser\Node\FunctionLike;
 
-class Function_ extends Node\Stmt implements FunctionLike {
+class Function_ extends Node\Stmt implements FunctionLike, Node\ContainsStmts {
     /** @var bool Whether function returns by reference */
     public bool $byRef;
     /** @var Node\Identifier Name */
diff --git a/lib/PhpParser/Node/Stmt/If_.php b/lib/PhpParser/Node/Stmt/If_.php
index 544390ff5e..9342b853ea 100644
--- a/lib/PhpParser/Node/Stmt/If_.php
+++ b/lib/PhpParser/Node/Stmt/If_.php
@@ -4,7 +4,7 @@
 
 use PhpParser\Node;
 
-class If_ extends Node\Stmt {
+class If_ extends Node\Stmt implements Node\ContainsStmts {
     /** @var Node\Expr Condition expression */
     public Node\Expr $cond;
     /** @var Node\Stmt[] Statements */
diff --git a/lib/PhpParser/Node/Stmt/Namespace_.php b/lib/PhpParser/Node/Stmt/Namespace_.php
index f5b59ad6e3..084ee30e47 100644
--- a/lib/PhpParser/Node/Stmt/Namespace_.php
+++ b/lib/PhpParser/Node/Stmt/Namespace_.php
@@ -4,7 +4,7 @@
 
 use PhpParser\Node;
 
-class Namespace_ extends Node\Stmt {
+class Namespace_ extends Node\Stmt implements Node\ContainsStmts {
     /* For use in the "kind" attribute */
     public const KIND_SEMICOLON = 1;
     public const KIND_BRACED = 2;
diff --git a/lib/PhpParser/Node/Stmt/TryCatch.php b/lib/PhpParser/Node/Stmt/TryCatch.php
index 6414c46c94..9ce0ccf443 100644
--- a/lib/PhpParser/Node/Stmt/TryCatch.php
+++ b/lib/PhpParser/Node/Stmt/TryCatch.php
@@ -4,7 +4,7 @@
 
 use PhpParser\Node;
 
-class TryCatch extends Node\Stmt {
+class TryCatch extends Node\Stmt implements Node\ContainsStmts {
     /** @var Node\Stmt[] Statements */
     public array $stmts;
     /** @var Catch_[] Catches */
diff --git a/lib/PhpParser/Node/Stmt/While_.php b/lib/PhpParser/Node/Stmt/While_.php
index 2f7aed2343..5861471b6a 100644
--- a/lib/PhpParser/Node/Stmt/While_.php
+++ b/lib/PhpParser/Node/Stmt/While_.php
@@ -4,7 +4,7 @@
 
 use PhpParser\Node;
 
-class While_ extends Node\Stmt {
+class While_ extends Node\Stmt implements Node\ContainsStmts {
     /** @var Node\Expr Condition */
     public Node\Expr $cond;
     /** @var Node\Stmt[] Statements */

From 0af497fe485add965e35ec74a408d992a3de5511 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Wed, 22 Oct 2025 11:57:38 +0200
Subject: [PATCH 2/3] add @property to ContaintsStmts, to allow working with
 public property

---
 lib/PhpParser/Node/ContainsStmts.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/PhpParser/Node/ContainsStmts.php b/lib/PhpParser/Node/ContainsStmts.php
index 8e553f56b4..937b24592c 100644
--- a/lib/PhpParser/Node/ContainsStmts.php
+++ b/lib/PhpParser/Node/ContainsStmts.php
@@ -5,7 +5,7 @@
 namespace PhpParser\Node;
 
 /**
- * @property-read Stmt[] $stmts
+ * @property Stmt[]|null $stmts
  */
 interface ContainsStmts extends \PhpParser\Node {
 }

From a2c1f503e9b6858cd5b406f49272511245607f3b Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Mon, 27 Oct 2025 00:48:42 +0100
Subject: [PATCH 3/3] add to class method as well

---
 lib/PhpParser/Node/Stmt/ClassMethod.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/PhpParser/Node/Stmt/ClassMethod.php b/lib/PhpParser/Node/Stmt/ClassMethod.php
index 59c0519ea6..40bc966335 100644
--- a/lib/PhpParser/Node/Stmt/ClassMethod.php
+++ b/lib/PhpParser/Node/Stmt/ClassMethod.php
@@ -6,7 +6,7 @@
 use PhpParser\Node;
 use PhpParser\Node\FunctionLike;
 
-class ClassMethod extends Node\Stmt implements FunctionLike {
+class ClassMethod extends Node\Stmt implements FunctionLike, Node\ContainsStmts {
     /** @var int Flags */
     public int $flags;
     /** @var bool Whether to return by reference */