Autodiscover phpstan.dist.neon as a config file

phpstan · Feb 9, 2022 · 7206452 · 7206452
1 parent 4dd6b69
commit 7206452
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 1 deletion.
diff --git a/src/Command/CommandHelper.php b/src/Command/CommandHelper.php
@@ -158,7 +158,7 @@ public static function begin(
 			})($autoloadFile);
 		}
 		if ($projectConfigFile === null) {
-			foreach (['phpstan.neon', 'phpstan.neon.dist'] as $discoverableConfigName) {
+			foreach (['phpstan.neon', 'phpstan.neon.dist', 'phpstan.dist.neon'] as $discoverableConfigName) {
 				$discoverableConfigFile = $currentWorkingDirectory . DIRECTORY_SEPARATOR . $discoverableConfigName;
 				if (is_file($discoverableConfigFile)) {
 					$projectConfigFile = $discoverableConfigFile;

diff --git a/tests/PHPStan/Command/AnalyseCommandTest.php b/tests/PHPStan/Command/AnalyseCommandTest.php
@@ -72,10 +72,18 @@ public static function autoDiscoveryPathsProvider(): array
 				__DIR__ . '/test-autodiscover-dist',
 				__DIR__ . DIRECTORY_SEPARATOR . 'test-autodiscover-dist' . DIRECTORY_SEPARATOR . 'phpstan.neon.dist',
 			],
+			[
+				__DIR__ . '/test-autodiscover-dist-dot-neon',
+				__DIR__ . DIRECTORY_SEPARATOR . 'test-autodiscover-dist-dot-neon' . DIRECTORY_SEPARATOR . 'phpstan.dist.neon',
+			],
 			[
 				__DIR__ . '/test-autodiscover-priority',
 				__DIR__ . DIRECTORY_SEPARATOR . 'test-autodiscover-priority' . DIRECTORY_SEPARATOR . 'phpstan.neon',
 			],
+			[
+				__DIR__ . '/test-autodiscover-priority-dist-dot-neon',
+				__DIR__ . DIRECTORY_SEPARATOR . 'test-autodiscover-priority-dist-dot-neon' . DIRECTORY_SEPARATOR . 'phpstan.neon',
+			],
 		];
 	}
 

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