diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 1c984c92..3587b07a 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -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" diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d648e9a..63498127 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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]. @@ -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 diff --git a/composer.json b/composer.json index dd87e151..6821d01e 100644 --- a/composer.json +++ b/composer.json @@ -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": { diff --git a/composer.lock b/composer.lock index af50f464..62fe0869 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "cfbf5140e8ee7470b0568bedc2938149", + "content-hash": "a6a7871143e8358030cbaa9eb8002382", "packages": [ { "name": "nikic/php-parser",