directory_separator optional wrong

vimeo · Feb 5, 2024 · ee7187c · ee7187c
1 parent 41ce826
commit ee7187c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php
@@ -1817,7 +1817,13 @@ private function getPluginClassForPath(Codebase $codebase, string $path, string
     public function shortenFileName(string $to): string
     {
         if (!is_file($to)) {
-            return preg_replace('/^' . preg_quote($this->base_dir . DIRECTORY_SEPARATOR, '/') . '?/', '', $to, 1);
+            // if cwd is the root directory it will be just the directory separator - trim it off first
+            return preg_replace(
+                '/^' . preg_quote(rtrim($this->base_dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR, '/') . '/',
+                '',
+                $to,
+                1,
+            );
         }
 
         $from = $this->base_dir;