Skip to content

Commit

Permalink
Do CS checking on 8.1 again for now while dependencies conflict on la…
Browse files Browse the repository at this point in the history
…ter stuff
  • Loading branch information
dvdoug committed Feb 3, 2024
1 parent 2bb340e commit f736d03
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
run: composer require --no-update "phpunit/php-code-coverage:${{ matrix.php-code-coverage-version }}"

- name: Remove PHP-CS-Fixer if not called
if: matrix.php-version != '8.2' || matrix.symfony-version != '^6.0' || matrix.dependencies != 'highest'
if: matrix.php-version != '8.1' || matrix.symfony-version != '^6.0' || matrix.dependencies != 'highest'
run: composer remove --dev --no-update "friendsofphp/php-cs-fixer";

- name: Install dependencies (low)
Expand Down Expand Up @@ -152,5 +152,5 @@ jobs:
fi;
- name: Check code style
if: matrix.php-version == '8.2' && matrix.symfony-version == '^6.0' && matrix.dependencies == 'highest'
if: matrix.php-version == '8.1' && matrix.symfony-version == '^6.0' && matrix.dependencies == 'highest'
run: vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --allow-risky=yes
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}
],
"require": {
"php": "^7.4 || ^8.0",
"php": "^8.1",
"composer-runtime-api": "^2.0",
"behat/behat": "^3.10",
"composer/semver": "^3.0",
Expand All @@ -23,7 +23,7 @@
"symfony/event-dispatcher": "^5.0||^6.0||^7.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.38.0",
"friendsofphp/php-cs-fixer": "^3.49.0",
"phpunit/phpunit": "^10.1||^11.0",
"symfony/filesystem": "^5.0||^6.0||^7.0"
},
Expand Down

0 comments on commit f736d03

Please sign in to comment.