Fix phpcbf crash in UnnecessaryNamespaceUsageSniff when class name is…

… empty, fixes #212
mayflower · Dec 15, 2024 · 20da5f6 · 20da5f6
1 parent 036ac8a
commit 20da5f6
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/MO4/Sniffs/Formatting/UnnecessaryNamespaceUsageSniff.php b/MO4/Sniffs/Formatting/UnnecessaryNamespaceUsageSniff.php
@@ -224,13 +224,18 @@ protected function getUseStatements(File $phpcsFile, int $start, int $end): arra
                 $end,
                 true
             );
-            $classNameEnd   = (int) $phpcsFile->findNext(
+            $classNameEnd   = $phpcsFile->findNext(
                 $this->classNameTokens,
                 ($classNameStart + 1),
                 $end,
                 true
             );
-            $useEnd         = $phpcsFile->findNext(
+
+            if (false === $classNameEnd) {
+                break;
+            }
+
+            $useEnd = $phpcsFile->findNext(
                 [
                     T_SEMICOLON,
                     T_COMMA,

diff --git a/MO4/Tests/Formatting/UnnecessaryNamespaceUsageUnitTest.pass.6.inc b/MO4/Tests/Formatting/UnnecessaryNamespaceUsageUnitTest.pass.6.inc
@@ -0,0 +1,15 @@
+<?php
+
+namespace T;
+
+use A;class B
+{
+  /**
+   * B's constructor
+   */
+    public function __construct()
+    {
+        $a = new A();
+        $a->b();
+    }
+}
diff --git a/MO4/Tests/Formatting/UnnecessaryNamespaceUsageUnitTest.php b/MO4/Tests/Formatting/UnnecessaryNamespaceUsageUnitTest.php
@@ -40,6 +40,7 @@ class UnnecessaryNamespaceUsageUnitTest extends AbstractMo4SniffUnitTest
         'UnnecessaryNamespaceUsageUnitTest.pass.3.inc' => [],
         'UnnecessaryNamespaceUsageUnitTest.pass.4.inc' => [],
         'UnnecessaryNamespaceUsageUnitTest.pass.5.inc' => [],
+        'UnnecessaryNamespaceUsageUnitTest.pass.6.inc' => [],
         'UnnecessaryNamespaceUsageUnitTest.fail.1.inc' => [
             17 => 1,
             19 => 1,