Skip to content

Commit

Permalink
Merge pull request #735 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 Feb 7, 2024
2 parents 533d966 + 316c2e8 commit cd4f474
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,9 @@ jobs:
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"

- name: "Remove incompatible dependencies with composer"
run: "composer remove psalm/plugin-phpunit vimeo/psalm --ansi --dev --no-interaction --no-progress"

- name: "Remove platform configuration with composer"
if: "matrix.dependencies != 'locked'"
run: "composer config platform.php --ansi --unset"
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

For a full diff see [`2.1.0...main`][2.1.0...main].

### Changed

- Allowed installation of `nikic/php-parser:^5.0.0` ([#735]), by [@localheinz]

## [`2.1.0`][2.1.0]

For a full diff see [`2.0.0...2.1.0`][2.0.0...2.1.0].
Expand Down Expand Up @@ -490,6 +494,7 @@ For a full diff see [`362c7ea...0.1.0`][362c7ea...0.1.0].
[#542]: https://github.com/ergebnis/phpstan-rules/pull/542
[#543]: https://github.com/ergebnis/phpstan-rules/pull/543
[#567]: https://github.com/ergebnis/phpstan-rules/pull/567
[#735]: https://github.com/ergebnis/phpstan-rules/pull/735
[@enumag]: https://github.com/enumag
[@ergebnis]: https://github.com/ergebnis
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"ext-mbstring": "*",
"nikic/php-parser": "^4.2.3",
"nikic/php-parser": "^4.2.3 || ^5.0.0",
"phpstan/phpstan": "^1.10.21"
},
"require-dev": {
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 cd4f474

Please sign in to comment.