88use PhpParser \Node ;
99use PhpParser \Node \Expr ;
1010use PhpParser \Node \Stmt ;
11+ use PhpParser \Node \Stmt \Class_ ;
1112use PhpParser \NodeVisitor ;
1213use Rector \Application \RectorRegistry ;
1314use Rector \Rector \RectorRunner ;
@@ -77,6 +78,10 @@ private function traverseNode(Node $node, File $file): void
7778
7879 $ this ->traverseNode ($ subNode , $ file );
7980
81+ // a descendant removal (e.g. an emptied method body) can make a Class_ rule
82+ // newly apply; re-offer the class once, now that its children are settled
83+ $ node ->{$ name } = $ subNode = $ this ->reRunClassRectors ($ subNode , $ file );
84+
8085 if ($ this ->stopTraversal ) {
8186 break ;
8287 }
@@ -126,6 +131,10 @@ private function traverseArray(array $nodes, File $file): array
126131 }
127132
128133 $ this ->traverseNode ($ node , $ file );
134+
135+ // re-offer a Class_ after descendant removals settle (see traverseNode)
136+ $ nodes [$ i ] = $ node = $ this ->reRunClassRectors ($ node , $ file );
137+
129138 if ($ this ->stopTraversal ) {
130139 break ;
131140 }
@@ -140,6 +149,29 @@ private function traverseArray(array $nodes, File $file): array
140149 return $ nodes ;
141150 }
142151
152+ /**
153+ * Re-run Class_ rules once, after its children are traversed, so a rule whose
154+ * precondition is only met by a descendant removal still fires in a single pass.
155+ */
156+ private function reRunClassRectors (Node $ node , File $ file ): Node
157+ {
158+ if (! $ node instanceof Class_) {
159+ return $ node ;
160+ }
161+
162+ foreach ($ this ->rectorRegistry ->forNodeAndFile ($ node , $ file ) as $ currentNodeVisitor ) {
163+ $ return = $ this ->rectorRunner ->run ($ currentNodeVisitor , $ node );
164+ if (! $ return instanceof Node) {
165+ continue ;
166+ }
167+
168+ $ this ->ensureReplacementReasonable ($ node , $ return );
169+ $ node = $ return ;
170+ }
171+
172+ return $ node ;
173+ }
174+
143175 private function ensureReplacementReasonable (Node $ old , Node $ new ): void
144176 {
145177 if ($ old instanceof Stmt) {
0 commit comments