diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 2f089fc9..6d590cc2 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -553,14 +553,14 @@ jobs: key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-phpunit-${{ matrix.phpunit-version }}-${{ hashFiles('composer.lock') }}" restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-phpunit-${{ matrix.phpunit-version }}-" - - name: "Remove platform configuration with composer" - 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 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" + - name: "Require phpunit/phpunit:^${{ matrix.phpunit-version }}" if: "matrix.dependencies != 'locked'" run: "composer require phpunit/phpunit:^${{ matrix.phpunit-version }} --ansi --no-interaction --no-progress --update-with-all-dependencies"