diff --git a/.github/workflows/__shared-ci.yml b/.github/workflows/__shared-ci.yml index 1cc1704..098178b 100644 --- a/.github/workflows/__shared-ci.yml +++ b/.github/workflows/__shared-ci.yml @@ -11,6 +11,7 @@ jobs: - php-versions: "8.1" - php-versions: "8.2" - php-versions: "8.3" + - php-versions: "8.4" stable: true runs-on: ubuntu-latest @@ -54,6 +55,8 @@ jobs: - name: 👕 Lint if: matrix.stable run: composer php-cs-fixer -- --format=checkstyle | tools/vendor/bin/cs2pr + env: + PHP_CS_FIXER_IGNORE_ENV: ${{ matrix.php-versions == '8.4' && '1' || '' }} - name: 🔬 Rector id: rector diff --git a/Makefile b/Makefile index a5655a5..084f3eb 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PHP_VERSION=8.3 +PHP_VERSION=8.4 PROJECT_NAME=$(shell basename $(CURDIR)) UID=$(shell id -u) GID=$(shell id -g) @@ -50,7 +50,7 @@ ci: ## Execute CI scripts for given PHP version ## Run PHP for given version define run-php - @docker run -it --rm -v ${PWD}:${PWD} -w ${PWD} "${IMAGE}" $(1) + @docker run -it --rm -v ${PWD}:${PWD} -e PHP_CS_FIXER_IGNORE_ENV=$(if $(filter 8.4,$(PHP_VERSION)),1,) -w ${PWD} "${IMAGE}" $(1) endef ############################# diff --git a/composer.json b/composer.json index 7384c7b..2f4df91 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "issues": "https://github.com/neilime/php-css-lint/issues" }, "require": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0", + "php": "^8.1", "ext-json": "*" }, "require-dev": {