Merge pull request #10452 from theodorejb/patch-1

Fix remaining POSIX-only absolute path detection
vimeo · Dec 7, 2023 · 93c7a8f · 93c7a8f
2 parents b87427f + b5ee6e0
commit 93c7a8f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 24 deletions.
diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php
@@ -1315,7 +1315,7 @@ private static function fromXmlAndPaths(
                 }
 
                 // we need an absolute path for checks
-                if ($path[0] !== '/' && DIRECTORY_SEPARATOR === '/') {
+                if (Path::isRelative($path)) {
                     $prospective_path = $base_dir . DIRECTORY_SEPARATOR . $path;
                 } else {
                     $prospective_path = $path;

diff --git a/src/Psalm/Config/FileFilter.php b/src/Psalm/Config/FileFilter.php
@@ -247,7 +247,7 @@ public static function loadFromArray(
             foreach ($config['file'] as $file) {
                 $file_path = (string) ($file['name'] ?? '');
 
-                if ($file_path[0] === '/' && DIRECTORY_SEPARATOR === '/') {
+                if (Path::isAbsolute($file_path)) {
                     /** @var non-empty-string */
                     $prospective_file_path = $file_path;
                 } else {

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/IncludeAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/IncludeAnalyzer.php
@@ -20,6 +20,7 @@
 use Psalm\IssueBuffer;
 use Psalm\Plugin\EventHandler\Event\AddRemoveTaintsEvent;
 use Psalm\Type\TaintKind;
+use Symfony\Component\Filesystem\Path;
 
 use function constant;
 use function defined;
@@ -93,13 +94,7 @@ public static function analyze(
             $include_path = self::resolveIncludePath($path_to_file, dirname($statements_analyzer->getFilePath()));
             $path_to_file = $include_path ?: $path_to_file;
 
-            if (DIRECTORY_SEPARATOR === '/') {
-                $is_path_relative = $path_to_file[0] !== DIRECTORY_SEPARATOR;
-            } else {
-                $is_path_relative = !preg_match('~^[A-Z]:\\\\~i', $path_to_file);
-            }
-
-            if ($is_path_relative) {
+            if (Path::isRelative($path_to_file)) {
                 $path_to_file = $config->base_dir . DIRECTORY_SEPARATOR . $path_to_file;
             }
         } else {
@@ -285,13 +280,7 @@ public static function getPathTo(
         string $file_name,
         Config $config
     ): ?string {
-        if (DIRECTORY_SEPARATOR === '/') {
-            $is_path_relative = $file_name[0] !== DIRECTORY_SEPARATOR;
-        } else {
-            $is_path_relative = !preg_match('~^[A-Z]:\\\\~i', $file_name);
-        }
-
-        if ($is_path_relative) {
+        if (Path::isRelative($file_name)) {
             $file_name = $config->base_dir . DIRECTORY_SEPARATOR . $file_name;
         }
 

diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/ExpressionScanner.php b/src/Psalm/Internal/PhpVisitor/Reflector/ExpressionScanner.php
@@ -20,13 +20,13 @@
 use Psalm\Storage\FileStorage;
 use Psalm\Storage\FunctionLikeStorage;
 use Psalm\Type;
+use Symfony\Component\Filesystem\Path;
 
 use function assert;
 use function defined;
 use function dirname;
 use function explode;
 use function in_array;
-use function preg_match;
 use function strpos;
 use function strtolower;
 use function substr;
@@ -316,13 +316,7 @@ public static function visitInclude(
             $include_path = IncludeAnalyzer::resolveIncludePath($path_to_file, dirname($file_storage->file_path));
             $path_to_file = $include_path ?: $path_to_file;
 
-            if (DIRECTORY_SEPARATOR === '/') {
-                $is_path_relative = $path_to_file[0] !== DIRECTORY_SEPARATOR;
-            } else {
-                $is_path_relative = !preg_match('~^[A-Z]:\\\\~i', $path_to_file);
-            }
-
-            if ($is_path_relative) {
+            if (Path::isRelative($path_to_file)) {
                 $path_to_file = $config->base_dir . DIRECTORY_SEPARATOR . $path_to_file;
             }
         } else {