Merge branch '5.21.x' into 5.x

vimeo · Feb 1, 2024 · 0082207 · 0082207
2 parents 4fdfbac + 8c473e2
commit 0082207
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Cli/Psalm.php b/src/Psalm/Internal/Cli/Psalm.php
@@ -1067,7 +1067,8 @@ private static function initBaseline(
         if ($paths_to_check !== null) {
             $filtered_issue_baseline = [];
             foreach ($paths_to_check as $path_to_check) {
-                $path_to_check = substr($path_to_check, strlen($config->base_dir));
+                // +1 to remove the initial slash from $path_to_check
+                $path_to_check = substr($path_to_check, strlen($config->base_dir) + 1);
                 if (isset($issue_baseline[$path_to_check])) {
                     $filtered_issue_baseline[$path_to_check] = $issue_baseline[$path_to_check];
                 }