From 8dadaf0af0d3b92a2282a1c5bcb1305a97e135d8 Mon Sep 17 00:00:00 2001 From: Jerome Jutteau Date: Fri, 26 Aug 2022 09:34:15 +0200 Subject: [PATCH 1/1] [BUGFIX] Fix Linter Update to php-cs-fixer which supports php >7.4 and >8.1. Removed unsupported versions closes #320 Signed-off-by: Jerome Jutteau --- .gitlab-ci.yml | 39 +++++++-------------------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cddf940..0d2d9c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ # Select docker image from https://hub.docker.com/_/php/ -image: php:7.3 +image: php:8.1 # Select what we should cache cache: @@ -17,44 +17,19 @@ before_script: - curl -sS https://getcomposer.org/installer | php # Create composer.json file manually, since this is a project without any non-dev dependencies yet - php composer.phar require --dev php-parallel-lint/php-parallel-lint - - php composer.phar require --dev friendsofphp/php-cs-fixer + - php composer.phar require --dev friendsofphp/php-cs-fixer:3.10.0 # Install all project dependencies - php composer.phar install # Run tests -test_app_phpdefaultversion: +job_lint_app_81: + image: php:8.1 script: - ./vendor/bin/parallel-lint --exclude vendor . - - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --diff --using-cache=no --rules=@PSR2 + - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --using-cache=no --rules=@PSR2 -job_lint_app_phpnextversion: +job_lint_app_74: image: php:7.4 script: - ./vendor/bin/parallel-lint --exclude vendor . - - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --diff --using-cache=no --rules=@PSR2 - allow_failure: true - -# Run same tests with older supported versions -test_app_php72: - image: php:7.2 - script: - - ./vendor/bin/parallel-lint --exclude vendor . - - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --diff --using-cache=no --rules=@PSR2 - -test_app_php71: - image: php:7.1 - script: - - ./vendor/bin/parallel-lint --exclude vendor . - - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --diff --using-cache=no --rules=@PSR2 - -test_app_php70: - image: php:7.0 - script: - - ./vendor/bin/parallel-lint --exclude vendor . - - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --diff --using-cache=no --rules=@PSR2 - -test_app_php56: - image: php:5.6 - script: - - ./vendor/bin/parallel-lint --exclude vendor . - - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --diff --using-cache=no --rules=@PSR2 + - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --using-cache=no --rules=@PSR2 -- 2.34.1