From b74b87e48095b88b6918249bf7e515a3ada18770 Mon Sep 17 00:00:00 2001 From: Jeff Widman Date: Mon, 12 Sep 2022 16:05:28 -0700 Subject: [PATCH] Rename `phpstan.neon` -> `phpstan.dist.neon` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Per https://phpstan.org/config-reference#config-file: > The usual practice is to have `phpstan.neon.dist` or `phpstan.dist.neon` > under version control, and allow the user to override certain settings > in their environment (on their own computer or on a continuous > integration server) by creating `phpstan.neon` that’s present in > `.gitignore` file. I picked `phpstan.dist.neon` for consistency with `.php-cs-fixer.dist.php` config (#5691). I didn't add the file to `.gitignore` because I actually want to know if there starts being a new file under that name and see it in git... --- composer/helpers/v1/build | 2 +- composer/helpers/v1/{phpstan.neon => phpstan.dist.neon} | 0 composer/helpers/v2/build | 2 +- composer/helpers/v2/{phpstan.neon => phpstan.dist.neon} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename composer/helpers/v1/{phpstan.neon => phpstan.dist.neon} (100%) rename composer/helpers/v2/{phpstan.neon => phpstan.dist.neon} (100%) diff --git a/composer/helpers/v1/build b/composer/helpers/v1/build index a529673173e9..480829b8914b 100755 --- a/composer/helpers/v1/build +++ b/composer/helpers/v1/build @@ -17,7 +17,7 @@ cp -r \ "$helpers_dir/.php_cs" \ "$helpers_dir/composer.json" \ "$helpers_dir/composer.lock" \ - "$helpers_dir/phpstan.neon" \ + "$helpers_dir/phpstan.dist.neon" \ "$install_dir" cd "$install_dir" diff --git a/composer/helpers/v1/phpstan.neon b/composer/helpers/v1/phpstan.dist.neon similarity index 100% rename from composer/helpers/v1/phpstan.neon rename to composer/helpers/v1/phpstan.dist.neon diff --git a/composer/helpers/v2/build b/composer/helpers/v2/build index 3e90a091630d..cfa4a10a4bb6 100755 --- a/composer/helpers/v2/build +++ b/composer/helpers/v2/build @@ -17,7 +17,7 @@ cp -r \ "$helpers_dir/.php-cs-fixer.php" \ "$helpers_dir/composer.json" \ "$helpers_dir/composer.lock" \ - "$helpers_dir/phpstan.neon" \ + "$helpers_dir/phpstan.dist.neon" \ "$install_dir" cd "$install_dir" diff --git a/composer/helpers/v2/phpstan.neon b/composer/helpers/v2/phpstan.dist.neon similarity index 100% rename from composer/helpers/v2/phpstan.neon rename to composer/helpers/v2/phpstan.dist.neon