diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index b71e3ca..3b54c28 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -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/install@1.9.0" with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 35e3050..639052c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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] @@ -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 diff --git a/composer.json b/composer.json index 88edd28..d6fef54 100644 --- a/composer.json +++ b/composer.json @@ -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" diff --git a/composer.lock b/composer.lock index ade0215..6b49a5e 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": "f49c23471f40057137dea7072a67e1f6", + "content-hash": "bcc0fc32d24ac8409ea9744acd89dd99", "packages": [ { "name": "danielstjules/stringy",