Skip to content

Commit

Permalink
Pick a single version of php-cs-fixer
Browse files Browse the repository at this point in the history
  • Loading branch information
richardm-stripe committed Dec 1, 2021
1 parent f2fd990 commit 199b124
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
# with all the versions we support and run unit tests for. We need to temporarily remove it
# from composer.json here, else composer install will fail due the version incompatibility.
- name: Trim dependency
run: composer remove --dev phpstan/phpstan
run: composer remove --dev phpstan/phpstan && composer remove --dev friendsofphp/php-cs-fixer

- name: Validate composer.json and composer.lock
run: composer validate
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"phpunit/phpunit": "^5.7 || ^9.0",
"php-coveralls/php-coveralls": "^2.1",
"squizlabs/php_codesniffer": "^3.3",
"friendsofphp/php-cs-fixer": "3.2.1 || 2.17.1",
"friendsofphp/php-cs-fixer": "3.2.1",
"phpstan/phpstan": "^1.2"
},
"autoload": {
Expand Down

0 comments on commit 199b124

Please sign in to comment.