From d0eacbf35be9ecb966d95bb0742b2666db82e21a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20L=C3=B8vgaard?= Date: Fri, 8 Dec 2023 09:23:58 +0100 Subject: [PATCH 1/4] Allow Symfony 7 --- .github/workflows/build.yaml | 11 +++++++++-- composer.json | 22 +++++++++++----------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 47aae81..f45322a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -57,6 +57,7 @@ jobs: - "8.2" dependencies: + - "lowest" - "highest" symfony: @@ -64,6 +65,8 @@ jobs: - "~6.1.0" - "~6.2.0" - "~6.3.0" + - "~6.4.0" + - "~7.0.0" steps: - name: "Checkout" @@ -109,7 +112,9 @@ jobs: - "~6.1.0" - "~6.2.0" - "~6.3.0" - + - "~6.4.0" + - "~7.0.0" + steps: - name: "Checkout" uses: "actions/checkout@v3" @@ -151,7 +156,9 @@ jobs: - "~6.1.0" - "~6.2.0" - "~6.3.0" - + - "~6.4.0" + - "~7.0.0" + steps: - name: "Checkout" uses: "actions/checkout@v3" diff --git a/composer.json b/composer.json index 73c7b65..a006bb4 100644 --- a/composer.json +++ b/composer.json @@ -15,26 +15,26 @@ "setono/editorjs-bundle": "^1.0", "setono/editorjs-php": "^1.0", "setono/html-element": "^1.0@alpha", - "symfony/config": "^6.0", - "symfony/dependency-injection": "^6.0", - "symfony/filesystem": "^6.0", - "symfony/form": "^6.0", - "symfony/http-foundation": "^6.0", - "symfony/http-kernel": "^6.0", - "symfony/mime": "^6.0", - "symfony/routing": "^6.0", - "symfony/string": "^6.0", + "symfony/config": "^6.0 || ^7.0", + "symfony/dependency-injection": "^6.0 || ^7.0", + "symfony/filesystem": "^6.0 || ^7.0", + "symfony/form": "^6.0 || ^7.0", + "symfony/http-foundation": "^6.0 || ^7.0", + "symfony/http-kernel": "^6.0 || ^7.0", + "symfony/mime": "^6.0 || ^7.0", + "symfony/routing": "^6.0 || ^7.0", + "symfony/string": "^6.0 || ^7.0", "twig/twig": "^3.7", "webmozart/assert": "^1.11" }, "require-dev": { - "matthiasnoback/symfony-dependency-injection-test": "^4.3.1", + "matthiasnoback/symfony-dependency-injection-test": "^4.3.1 || ^5.0", "nyholm/symfony-bundle-test": "^2.0", "phpspec/prophecy-phpunit": "^2.0.2", "phpunit/phpunit": "^9.6.10", "psalm/plugin-phpunit": "^0.18.4", "psalm/plugin-symfony": "^5.0.3", - "setono/code-quality-pack": "^2.4" + "setono/code-quality-pack": "^2.6" }, "prefer-stable": true, "autoload": { From 46f4c42bdd031a6d7eb9d5672af56643fa34ccb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20L=C3=B8vgaard?= Date: Fri, 8 Dec 2023 09:27:46 +0100 Subject: [PATCH 2/4] Exclude PHP 8.1 on SF7 --- .github/workflows/build.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f45322a..6004a3b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -66,7 +66,11 @@ jobs: - "~6.2.0" - "~6.3.0" - "~6.4.0" - - "~7.0.0" + - "~7.0.0" + + exclude: + - php-version: "8.1" + symfony: "~7.0.0" steps: - name: "Checkout" @@ -114,6 +118,10 @@ jobs: - "~6.3.0" - "~6.4.0" - "~7.0.0" + + exclude: + - php-version: "8.1" + symfony: "~7.0.0" steps: - name: "Checkout" @@ -158,6 +166,10 @@ jobs: - "~6.3.0" - "~6.4.0" - "~7.0.0" + + exclude: + - php-version: "8.1" + symfony: "~7.0.0" steps: - name: "Checkout" From 98156f2cd6afacd34c7a8d1a72596e242601f56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20L=C3=B8vgaard?= Date: Fri, 8 Dec 2023 09:36:38 +0100 Subject: [PATCH 3/4] Add lowest check --- .github/workflows/build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6004a3b..7c13902 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -109,6 +109,7 @@ jobs: - "8.2" dependencies: + - "lowest" - "highest" symfony: @@ -157,6 +158,7 @@ jobs: - "8.2" dependencies: + - "lowest" - "highest" symfony: From eec533df3c2a303a43121a1b9195a81c7048d9d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20L=C3=B8vgaard?= Date: Fri, 8 Dec 2023 09:44:43 +0100 Subject: [PATCH 4/4] Remove require-dev section in dependency analysis --- .github/workflows/build.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7c13902..7767969 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -84,6 +84,9 @@ jobs: php-version: "${{ matrix.php-version }}" tools: "composer-require-checker, composer-unused, flex" + - name: "Remove require-dev section in composer.json" + run: "composer config --unset require-dev" + - name: "Install composer dependencies" uses: "ramsey/composer-install@v2" with: