Merge pull request #11031 from HypeMC/check-for-psalm.dist.xml-as-well

vimeo · Sep 7, 2024 · 3c13a5b · 3c13a5b
2 parents c2bdb40 + 85e75c4
commit 3c13a5b
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php
@@ -129,7 +129,11 @@
  */
 class Config
 {
-    private const DEFAULT_FILE_NAME = 'psalm.xml';
+    private const DEFAULT_FILE_NAMES = [
+        'psalm.xml',
+        'psalm.xml.dist',
+        'psalm.dist.xml',
+    ];
     public const CONFIG_NAMESPACE = 'https://getpsalm.org/schema/config';
     public const REPORT_INFO = 'info';
     public const REPORT_ERROR = 'error';
@@ -773,10 +777,10 @@ public static function locateConfigFile(string $path): ?string
         }
 
         do {
-            $maybe_path = $dir_path . DIRECTORY_SEPARATOR . self::DEFAULT_FILE_NAME;
-
-            if (file_exists($maybe_path) || file_exists($maybe_path .= '.dist')) {
-                return $maybe_path;
+            foreach (self::DEFAULT_FILE_NAMES as $defaultFileName) {
+                if (file_exists($maybe_path = $dir_path . DIRECTORY_SEPARATOR . $defaultFileName)) {
+                    return $maybe_path;
+                }
             }
 
             $dir_path = dirname($dir_path);