From 8633590b2b4d071136017f61187e11fe249fb5b5 Mon Sep 17 00:00:00 2001 From: David ALLIX Date: Wed, 3 Jan 2024 12:16:15 +0100 Subject: [PATCH] Fix --- .github/workflows/ci.yml | 13 ++++++------- composer.json | 1 - 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7c3e4ba..4a2bfff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,6 @@ on: ["push", "pull_request"] env: COMPOSER_ALLOW_SUPERUSER: '1' - SYMFONY_PHPUNIT_VERSION: 9.6 SYMFONY_DEPRECATIONS_HELPER: max[self]=0 jobs: @@ -28,7 +27,7 @@ jobs: - uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-8.3-highest-${{ hashFiles('**/composer.lock') }} + key: ${{ runner.os }}-composer-8.3-highest-${{ hashFiles('**/composer.json') }} restore-keys: | ${{ runner.os }}-composer-8.3-highest - name: Validate Composer @@ -59,11 +58,11 @@ jobs: - 'highest' include: - php: '8.1' - phpunit-version: 9.6 + phpunit-version: 10 - php: '8.2' - phpunit-version: 9.6 + phpunit-version: 10 - php: '8.3' - phpunit-version: 9.6 + phpunit-version: 10 fail-fast: false steps: - name: Checkout @@ -77,7 +76,7 @@ jobs: - uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }} + key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.dependencies }}-${{ hashFiles('**/composer.json') }} restore-keys: | ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.dependencies }} - name: Install lowest dependencies with Composer @@ -116,7 +115,7 @@ jobs: - uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-8.3-highest-${{ hashFiles('**/composer.lock') }} + key: ${{ runner.os }}-composer-8.3-highest-${{ hashFiles('**/composer.json') }} restore-keys: | ${{ runner.os }}-composer-8.3-highest - name: Install highest dependencies with Composer diff --git a/composer.json b/composer.json index 757d7f3..c2a9858 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,6 @@ "friendsofphp/php-cs-fixer": "^3.45", "kubawerlos/php-cs-fixer-custom-fixers": "^3.18", "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^9.6", "rector/rector": "^0.18", "symfony/cache": "^5.4.30|^6.3.10|^7.0", "symfony/phpunit-bridge": "^5.4.30|^6.3.10|^7.0",