Skip to content

Commit

Permalink
Merge pull request #65 from ergebnis/feature/php-parser
Browse files Browse the repository at this point in the history
Enhancement: Allow installation of `nikic/php-parser:^5.0.0`
  • Loading branch information
localheinz authored Jan 23, 2024
2 parents 96e3b84 + 56b0a77 commit 23c5675
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,10 @@ jobs:
if: "matrix.dependencies != 'locked'"
run: "composer config platform.php --ansi --unset"

- name: "Remove incompatible dependencies with composer"
if: "matrix.dependencies != 'locked'"
run: "composer remove ergebnis/php-cs-fixer-config infection/infection psalm/plugin-phpunit vimeo/psalm --ansi --dev --no-interaction --no-progress"

- name: "Install ${{ matrix.dependencies }} dependencies with composer"
uses: "ergebnis/.github/actions/composer/[email protected]"
with:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ For a full diff see [`0.3.0...main`][0.3.0...main].
### Changed

- Required `rector/rector:~0.19.2` ([#64]), by [@localheinz]
- Allowed installation of `nikic/php-parser:^5.0.0` ([#65]), by [@localheinz]

## [`0.3.0`][0.3.0]

Expand Down Expand Up @@ -56,5 +57,6 @@ For a full diff see [`fd198f0...0.1.0`][fd198f0...0.1.0].
[#36]: https://github.com/ergebnis/rector-rules/pull/36
[#37]: https://github.com/ergebnis/rector-rules/pull/37
[#64]: https://github.com/ergebnis/rector-rules/pull/64
[#65]: https://github.com/ergebnis/rector-rules/pull/65

[@localheinz]: https://github.com/localheinz
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"require": {
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
"nikic/php-parser": "^4.17.1",
"nikic/php-parser": "^4.17.1 || ^5.0.0",
"phpstan/phpstan": "^1.10.36",
"rector/rector": "~0.19.2",
"symplify/rule-doc-generator-contracts": "^9.3.26"
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 23c5675

Please sign in to comment.