From fdbf4ac9915ed2ea1047b988f2f748e61c90fc86 Mon Sep 17 00:00:00 2001 From: Anatoly Pashin Date: Wed, 9 Feb 2022 15:28:21 +1000 Subject: [PATCH] Autodiscover `phpstan.dist.neon` as a config file --- src/Command/CommandHelper.php | 2 +- tests/PHPStan/Command/AnalyseCommandTest.php | 8 ++++++++ .../test-autodiscover-dist-dot-neon/phpstan.dist.neon | 4 ++++ .../phpstan.dist.neon | 4 ++++ .../test-autodiscover-priority-dist-dot-neon/phpstan.neon | 4 ++++ 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 tests/PHPStan/Command/test-autodiscover-dist-dot-neon/phpstan.dist.neon create mode 100644 tests/PHPStan/Command/test-autodiscover-priority-dist-dot-neon/phpstan.dist.neon create mode 100644 tests/PHPStan/Command/test-autodiscover-priority-dist-dot-neon/phpstan.neon diff --git a/src/Command/CommandHelper.php b/src/Command/CommandHelper.php index 8866bce435..7218fc1cd7 100644 --- 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 index d0d8e74bdd..68abcd2875 100644 --- 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 new file mode 100644 index 0000000000..f242b77eeb --- /dev/null +++ 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 new file mode 100644 index 0000000000..f242b77eeb --- /dev/null +++ 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 new file mode 100644 index 0000000000..f242b77eeb --- /dev/null +++ b/tests/PHPStan/Command/test-autodiscover-priority-dist-dot-neon/phpstan.neon @@ -0,0 +1,4 @@ +includes: + - ../../../../conf/bleedingEdge.neon + +parameters: