From 507176bd23784e7fda86a45f264cafb6f3040a4d Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Thu, 11 May 2023 08:53:44 +0200 Subject: [PATCH] Allow execution of cs-fixer with PHP 8.2 --- .github/workflows/ci.yaml | 2 +- Documentation/Changelog/2.6.0.rst | 28 ++++++++++++++++++++++++++++ shell.nix | 4 ++-- 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 Documentation/Changelog/2.6.0.rst diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 765c337..95eb832 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -95,7 +95,7 @@ jobs: run: composer install --prefer-dist --no-progress - name: Coding Guideline - run: ./vendor/bin/php-cs-fixer fix --dry-run --diff + run: PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --dry-run --diff tests-mysql: runs-on: ubuntu-latest diff --git a/Documentation/Changelog/2.6.0.rst b/Documentation/Changelog/2.6.0.rst new file mode 100644 index 0000000..b28039b --- /dev/null +++ b/Documentation/Changelog/2.6.0.rst @@ -0,0 +1,28 @@ +2.6.0 +===== + +Breaking +-------- + +Nothing + +Features +-------- + +Nothing + +Fixes +----- + +Nothing + +Tasks +----- + +* Ignore PHP version when executing cs fixer. + As cs fixer officially does not seem to support PHP 8.2 yet. + +Deprecation +----------- + +Nothing diff --git a/shell.nix b/shell.nix index 33f1b27..0bfc038 100644 --- a/shell.nix +++ b/shell.nix @@ -55,7 +55,7 @@ let php ]; text = '' - ./vendor/bin/php-cs-fixer fix --dry-run --diff + PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --dry-run --diff ''; }; projectCglFix = pkgs.writeShellApplication { @@ -64,7 +64,7 @@ let php ]; text = '' - ./vendor/bin/php-cs-fixer fix --diff + PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --diff ''; };