From 2d9800207e82066aeb144793d8e22d60a0091a3b Mon Sep 17 00:00:00 2001 From: Jeroeny Date: Tue, 23 Nov 2021 15:49:09 +0100 Subject: [PATCH 1/4] composer dependency: symfony/options-resolver allow ^6.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 091a1d9..924394e 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "psr/http-client": "^1.0", "psr/http-factory": "^1.0", "psr/http-message": "^1.0", - "symfony/options-resolver": "^2.6 || ^3.4.20 || ~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0", + "symfony/options-resolver": "^2.6 || ^3.4.20 || ~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", "symfony/polyfill-php80": "^1.17" }, "require-dev": { From f4bc00ed8166791f2591e951192984a115379038 Mon Sep 17 00:00:00 2001 From: Jeroeny Date: Tue, 23 Nov 2021 18:16:06 +0100 Subject: [PATCH 2/4] add symfony 5 and 6 to build matrix --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e8eabc3..e6c6a68 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -66,7 +66,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - symfony: ['2', '3', '4'] + symfony: ['2', '3', '4', '5', '6'] steps: - name: Checkout code From dfdd9d215e051f6234e39b9bfe0eecc2cfb76c39 Mon Sep 17 00:00:00 2001 From: Jeroeny Date: Wed, 24 Nov 2021 13:40:48 +0100 Subject: [PATCH 3/4] use flex to lock symfony version --- .github/workflows/tests.yml | 5 ++--- .gitignore | 2 ++ composer.json | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e6c6a68..be2aed2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -66,7 +66,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - symfony: ['2', '3', '4', '5', '6'] + symfony: ['4', '5', '6'] steps: - name: Checkout code @@ -85,8 +85,7 @@ jobs: - name: Install dependencies run: | - composer require dunglas/symfony-lock:v${{ matrix.symfony }} --no-interaction --no-update - composer update --prefer-dist --no-interaction --prefer-stable --prefer-lowest --no-progress + SYMFONY_REQUIRE=${{ matrix.symfony }} composer update --prefer-dist --no-interaction --prefer-stable --prefer-lowest --no-progress - name: Execute tests run: composer test diff --git a/.gitignore b/.gitignore index bfae00b..1cb59e9 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ /phpunit.xml /phpstan.neon /vendor/ + +.phpunit.result.cache diff --git a/composer.json b/composer.json index 924394e..eb5cb4c 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "psr/http-client": "^1.0", "psr/http-factory": "^1.0", "psr/http-message": "^1.0", - "symfony/options-resolver": "^2.6 || ^3.4.20 || ~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", + "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", "symfony/polyfill-php80": "^1.17" }, "require-dev": { From e88978a72166d32ea1aeb2409f8e214f0e63fe92 Mon Sep 17 00:00:00 2001 From: Jeroeny Date: Wed, 24 Nov 2021 16:38:21 +0100 Subject: [PATCH 4/4] use flex to lock symfony version --- .github/workflows/tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index be2aed2..41475b0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -85,7 +85,9 @@ jobs: - name: Install dependencies run: | - SYMFONY_REQUIRE=${{ matrix.symfony }} composer update --prefer-dist --no-interaction --prefer-stable --prefer-lowest --no-progress + composer require --no-update --no-interaction --no-progress symfony/flex + composer config extra.symfony.require ${{ matrix.symfony}} + composer update --prefer-dist --no-interaction --prefer-stable --prefer-lowest --no-progress - name: Execute tests run: composer test