Respect dist order over dot order

phpstan · Aug 31, 2024 · c2bd894 · c2bd894
1 parent 2e27573
commit c2bd894
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Command/CommandHelper.php b/src/Command/CommandHelper.php
@@ -181,10 +181,10 @@ public static function begin(
 		if ($projectConfigFile === null) {
 			$discoverableConfigNames = [
 				'.phpstan.neon',
-				'.phpstan.neon.dist',
-				'.phpstan.dist.neon',
 				'phpstan.neon',
+				'.phpstan.neon.dist',
 				'phpstan.neon.dist',
+				'.phpstan.dist.neon',
 				'phpstan.dist.neon',
 			];
 			foreach ($discoverableConfigNames as $discoverableConfigName) {

diff --git a/tests/PHPStan/Command/test-autodiscover-priority-dist-dot-neon/.phpstan.dist.neon b/tests/PHPStan/Command/test-autodiscover-priority-dist-dot-neon/.phpstan.dist.neon
@@ -0,0 +1,4 @@
+includes:
+	- ../../../../conf/bleedingEdge.neon
+
+parameters: