bug fix

imanghafoori1 · Jun 8, 2024 · d550c38 · d550c38
1 parent d237f79
commit d550c38
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/Features/Psr4/CheckPsr4Printer.php b/src/Features/Psr4/CheckPsr4Printer.php
@@ -74,7 +74,7 @@ public static function fixedNamespace($file, $wrong, $correct, $class, $lineNumb
         $key = 'badNamespace';
         $printer = ErrorPrinter::singleton();
 
-        $errorData = '  Namespace of class "'.$class.'" fixed to: '.$printer->color("$correct");
+        $errorData = '  Namespace of class "'.$class.'" fixed to: '.$printer->color($correct);
 
         $printer->addPendingError($path, $lineNumber, $key, $errorData, '');
     }

diff --git a/src/Features/Psr4/NamespaceFixer.php b/src/Features/Psr4/NamespaceFixer.php
@@ -27,6 +27,9 @@ public static function fix(PhpFileDescriptor $file, $incorrectNamespace, $correc
             while ($tokens[$i] !== ';') {
                 $i++;
             }
+            while (! isset($tokens[$i][2])) {
+                $i++;
+            }
             $file->insertNewLine(PHP_EOL.$newline, $tokens[$i][2] + 1);
         }
     }

diff --git a/src/Features/Psr4/Psr4Errors.php b/src/Features/Psr4/Psr4Errors.php
@@ -32,11 +32,7 @@ private static function handleError($error)
         if ($error['type'] === 'namespace') {
             self::askAndFixNamespace($error);
         } elseif ($error['type'] === 'filename') {
-            CheckPsr4Printer::wrongFileName(
-                $error['relativePath'],
-                $error['class'],
-                $error['fileName']
-            );
+            self::wrongFileName($error);
         }
     }
 
@@ -67,4 +63,13 @@ private static function askAndFixNamespace($error)
             $error['correctNamespace']
         );
     }
+
+    private static function wrongFileName($error)
+    {
+        CheckPsr4Printer::wrongFileName(
+            $error['relativePath'],
+            $error['class'],
+            $error['fileName']
+        );
+    }
 }