From 305a0d41494217363328825b375cce4af36004cd Mon Sep 17 00:00:00 2001
From: kkmuffme <11071985+kkmuffme@users.noreply.github.com>
Date: Thu, 1 Feb 2024 08:10:57 +0100
Subject: [PATCH] Fix additional places where base_dir was broken due to
 missing separator

Improves upon https://github.com/vimeo/psalm/pull/10542 and https://github.com/vimeo/psalm/pull/10628
---
 src/Psalm/Config.php | 10 +++++-----
 tests/TestConfig.php |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php
index e6f05540b55..f54b0fe39d2 100644
--- a/src/Psalm/Config.php
+++ b/src/Psalm/Config.php
@@ -1445,7 +1445,7 @@ private static function fromXmlAndPaths(
                 if (!$file_path) {
                     throw new ConfigException(
                         'Cannot resolve stubfile path '
-                            . rtrim($config->base_dir, DIRECTORY_SEPARATOR)
+                            . $config->base_dir
                             . DIRECTORY_SEPARATOR
                             . $stub_file['name'],
                     );
@@ -1582,11 +1582,11 @@ public function safeSetCustomErrorLevel(string $issue_key, string $error_level):
     private function loadFileExtensions(SimpleXMLElement $extensions): void
     {
         foreach ($extensions as $extension) {
-            $extension_name = preg_replace('/^\.?/', '', (string)$extension['name'], 1);
+            $extension_name = preg_replace('/^\.?/', '', (string) $extension['name'], 1);
             $this->file_extensions[] = $extension_name;
 
             if (isset($extension['scanner'])) {
-                $path = $this->base_dir . (string)$extension['scanner'];
+                $path = $this->base_dir . DIRECTORY_SEPARATOR . (string) $extension['scanner'];
 
                 if (!file_exists($path)) {
                     throw new ConfigException('Error parsing config: cannot find file ' . $path);
@@ -1596,7 +1596,7 @@ private function loadFileExtensions(SimpleXMLElement $extensions): void
             }
 
             if (isset($extension['checker'])) {
-                $path = $this->base_dir . (string)$extension['checker'];
+                $path = $this->base_dir . DIRECTORY_SEPARATOR . (string) $extension['checker'];
 
                 if (!file_exists($path)) {
                     throw new ConfigException('Error parsing config: cannot find file ' . $path);
@@ -1817,7 +1817,7 @@ 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, '/') . '/', '', $to, 1);
+            return preg_replace('/^' . preg_quote($this->base_dir . DIRECTORY_SEPARATOR, '/') . '?/', '', $to, 1);
         }
 
         $from = $this->base_dir;
diff --git a/tests/TestConfig.php b/tests/TestConfig.php
index dc72087410f..c66baa8eb4a 100644
--- a/tests/TestConfig.php
+++ b/tests/TestConfig.php
@@ -28,7 +28,7 @@ public function __construct()
         $this->level = 1;
         $this->cache_directory = null;
 
-        $this->base_dir = getcwd() . DIRECTORY_SEPARATOR;
+        $this->base_dir = getcwd();
 
         if (!self::$cached_project_files) {
             self::$cached_project_files = ProjectFileFilter::loadFromXMLElement(