phpunit/code/preprocessor/namespace_ending_comment_unbracketed.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace NamespaceEndingComment;
+
+const VALUE = 42;
+
+function value(): int
+{
+    return VALUE;
+}
+
+// unbracketed namespace trailing comment

phpunit/src/PreprocessorTest.php

@@ -321,6 +321,25 @@ class PreprocessorTest extends TestCase
         $this->assertSame('App\\VERSION', $constants['_const_var_App__VERSION']->name);
     }
 
+    public function testNamespaceEndingCommentWithUnbracketedSyntaxIsIgnored(): void
+    {
+        global $translator;
+        $file = __DIR__ . '/../code/preprocessor/namespace_ending_comment_unbracketed.php';
+        $previousTranslator = $translator ?? null;
+        $translator = $this->compiler;
+
+        try {
+            $this->compiler->addFiles([$file]);
+            $this->compiler->prepareFile($file);
+            $this->compiler->convertFile($file);
+        } finally {
+            $translator = $previousTranslator;
+        }
+
+        $constants = $this->getProperty('constants');
+        $this->assertArrayHasKey('_const_var_NamespaceEndingComment__VALUE', $constants);
+    }
+
     public function testSortFilesUsesImplementsAndTraitDependencies(): void
     {
         $classFile = realpath(__DIR__ . '/../code/preprocessor/deps_class_implements.php');

src/Preprocessor.php

@@ -321,6 +321,8 @@ class Preprocessor extends CompilerBase
                 case 'Stmt_Interface':
                     $this->parseInterface($v2);
                     break;
+                case 'Stmt_Nop':
+                    break;
                 default:
                     $this->foundStrayCode($v2);
                     break;

src/Translator.php

@@ -2514,6 +2514,8 @@ CODE;
                 case 'Stmt_Interface':
                     $this->validateInterfaceOverrideAttributes($v2);
                     break;
+                case 'Stmt_Nop':
+                    break;
                 default:
                     abort($v2);
                     break;

tests/compiler/namespace/namespace-ending-comment.phpt

@@ -0,0 +1,22 @@
+--TEST--
+A namespace block ending with a comment must not be treated as stray code
+--FILE--
+<?php
+
+declare(strict_types=1);
+
+namespace Test {
+    /* named namespace trailing block comment */
+}
+
+namespace {
+    function main()
+    {
+        var_dump('done');
+    }
+
+    // global namespace trailing line comment
+}
+?>
+--EXPECT--
+string(4) "done"