Remove Stmt\Throw

This was a backwards-compatibility shim for Expr\Throw.
nikic · Sep 25, 2023 · b4183c2 · b4183c2
1 parent a1ccf57
commit b4183c2
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 69 deletions.
diff --git a/grammar/php.y b/grammar/php.y
@@ -386,16 +386,7 @@ non_empty_statement:
         $$ = Stmt\InlineHTML[$1];
         $$->setAttribute('hasLeadingNewline', $this->inlineHtmlHasLeadingNewline(#1));
     }
-    | expr semi {
-        $e = $1;
-        if ($e instanceof Expr\Throw_) {
-            // For backwards-compatibility reasons, convert throw in statement position into
-            // Stmt\Throw_ rather than Stmt\Expression(Expr\Throw_).
-            $$ = Stmt\Throw_[$e->expr];
-        } else {
-            $$ = Stmt\Expression[$e];
-        }
-    }
+    | expr semi                                             { $$ = Stmt\Expression[$1]; }
     | T_UNSET '(' variables_list ')' semi                   { $$ = Stmt\Unset_[$3]; }
     | T_FOREACH '(' expr T_AS foreach_variable ')' foreach_statement
           { $$ = Stmt\Foreach_[$3, $5[0], ['keyVar' => null, 'byRef' => $5[1], 'stmts' => $7]]; }

diff --git a/lib/PhpParser/Node/Stmt/Throw_.php b/lib/PhpParser/Node/Stmt/Throw_.php
diff --git a/lib/PhpParser/Parser/Php7.php b/lib/PhpParser/Parser/Php7.php
@@ -1473,16 +1473,7 @@ protected function initReduceCallbacks(): void {
 
             },
             172 => function ($stackPos) {
-
-        $e = $this->semStack[$stackPos-(2-1)];
-        if ($e instanceof Expr\Throw_) {
-            // For backwards-compatibility reasons, convert throw in statement position into
-            // Stmt\Throw_ rather than Stmt\Expression(Expr\Throw_).
-            $this->semValue = new Stmt\Throw_($e->expr, $this->getAttributes($this->tokenStartStack[$stackPos-(2-1)], $this->tokenEndStack[$stackPos]));
-        } else {
-            $this->semValue = new Stmt\Expression($e, $this->getAttributes($this->tokenStartStack[$stackPos-(2-1)], $this->tokenEndStack[$stackPos]));
-        }
-
+                 $this->semValue = new Stmt\Expression($this->semStack[$stackPos-(2-1)], $this->getAttributes($this->tokenStartStack[$stackPos-(2-1)], $this->tokenEndStack[$stackPos]));
             },
             173 => function ($stackPos) {
                  $this->semValue = new Stmt\Unset_($this->semStack[$stackPos-(5-3)], $this->getAttributes($this->tokenStartStack[$stackPos-(5-1)], $this->tokenEndStack[$stackPos]));

diff --git a/lib/PhpParser/Parser/Php8.php b/lib/PhpParser/Parser/Php8.php
@@ -1491,16 +1491,7 @@ protected function initReduceCallbacks(): void {
 
             },
             172 => function ($stackPos) {
-
-        $e = $this->semStack[$stackPos-(2-1)];
-        if ($e instanceof Expr\Throw_) {
-            // For backwards-compatibility reasons, convert throw in statement position into
-            // Stmt\Throw_ rather than Stmt\Expression(Expr\Throw_).
-            $this->semValue = new Stmt\Throw_($e->expr, $this->getAttributes($this->tokenStartStack[$stackPos-(2-1)], $this->tokenEndStack[$stackPos]));
-        } else {
-            $this->semValue = new Stmt\Expression($e, $this->getAttributes($this->tokenStartStack[$stackPos-(2-1)], $this->tokenEndStack[$stackPos]));
-        }
-
+                 $this->semValue = new Stmt\Expression($this->semStack[$stackPos-(2-1)], $this->getAttributes($this->tokenStartStack[$stackPos-(2-1)], $this->tokenEndStack[$stackPos]));
             },
             173 => function ($stackPos) {
                  $this->semValue = new Stmt\Unset_($this->semStack[$stackPos-(5-3)], $this->getAttributes($this->tokenStartStack[$stackPos-(5-1)], $this->tokenEndStack[$stackPos]));

diff --git a/lib/PhpParser/PrettyPrinter/Standard.php b/lib/PhpParser/PrettyPrinter/Standard.php
@@ -960,10 +960,6 @@ protected function pStmt_Return(Stmt\Return_ $node): string {
         return 'return' . (null !== $node->expr ? ' ' . $this->p($node->expr) : '') . ';';
     }
 
-    protected function pStmt_Throw(Stmt\Throw_ $node): string {
-        return 'throw ' . $this->p($node->expr) . ';';
-    }
-
     protected function pStmt_Label(Stmt\Label $node): string {
         return $node->name . ':';
     }

diff --git a/test/code/parser/errorHandling/recovery.test b/test/code/parser/errorHandling/recovery.test
@@ -525,9 +525,11 @@ array(
                     )
                 )
             )
-            12: Stmt_Throw(
-                expr: Expr_Variable(
-                    name: x
+            12: Stmt_Expression(
+                expr: Expr_Throw(
+                    expr: Expr_Variable(
+                        name: x
+                    )
                 )
             )
             13: Stmt_Goto(

diff --git a/test/code/parser/stmt/controlFlow.test b/test/code/parser/stmt/controlFlow.test
@@ -41,9 +41,11 @@ array(
             name: a
         )
     )
-    6: Stmt_Throw(
-        expr: Expr_Variable(
-            name: e
+    6: Stmt_Expression(
+        expr: Expr_Throw(
+            expr: Expr_Variable(
+                name: e
+            )
         )
     )
     7: Stmt_Label(