From d6e749054418f0e0ee771572a7e1e016ee6d2e74 Mon Sep 17 00:00:00 2001 From: Grzegorz Sadowski Date: Thu, 18 Jul 2024 14:20:15 +0200 Subject: [PATCH 1/2] Bump up PHP to 8.1 --- .github/workflows/build.yml | 4 ---- composer.json | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6450ea4..f9449a3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,10 +18,6 @@ jobs: fail-fast: false matrix: include: - - - php: 8.0 - symfony: ^5.4 - twig: 3.* - php: 8.1 symfony: ^6.0 diff --git a/composer.json b/composer.json index 70018c4..96d550c 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ } ], "require": { - "php": "^8.0", + "php": "^8.1", "symfony/asset": "^5.4 || ^6.0 || ^7.0", "symfony/config": "^5.4 || ^6.0 || ^7.0", "symfony/console": "^5.4 || ^6.0 || ^7.0", From 249877e4c7497e4096fbe4655129dbb10b7addc5 Mon Sep 17 00:00:00 2001 From: Grzegorz Sadowski Date: Thu, 18 Jul 2024 14:26:03 +0200 Subject: [PATCH 2/2] Bump up Symfony 6 to 6.4 --- .github/workflows/build.yml | 19 +++++++------------ composer.json | 30 +++++++++++++++--------------- 2 files changed, 22 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f9449a3..ea50352 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,19 +17,14 @@ jobs: strategy: fail-fast: false matrix: - include: - - - php: 8.1 - symfony: ^6.0 - twig: 3.* - - - php: 8.2 - symfony: ^7.0 - twig: 3.* + php: [ "8.1", "8.2", "8.3" ] + symfony: [ "^5.4", "^6.4", "^7.0" ] + twig: [ "3.*" ] + + exclude: - - php: 8.3 - symfony: ^7.0 - twig: 3.* + php: "8.1" + symfony: "^7.0" steps: - diff --git a/composer.json b/composer.json index 96d550c..7d6beff 100644 --- a/composer.json +++ b/composer.json @@ -24,19 +24,19 @@ ], "require": { "php": "^8.1", - "symfony/asset": "^5.4 || ^6.0 || ^7.0", - "symfony/config": "^5.4 || ^6.0 || ^7.0", - "symfony/console": "^5.4 || ^6.0 || ^7.0", - "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0", - "symfony/filesystem": "^5.4 || ^6.0 || ^7.0", - "symfony/finder": "^5.4 || ^6.0 || ^7.0", - "symfony/form": "^4.4 || ^5.4 || ^6.0 || ^7.0", - "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0", - "symfony/http-foundation": "^5.4 || ^6.0 || ^7.0", - "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0", - "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0", + "symfony/asset": "^5.4 || ^6.4 || ^7.0", + "symfony/config": "^5.4 || ^6.4 || ^7.0", + "symfony/console": "^5.4 || ^6.4 || ^7.0", + "symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0", + "symfony/filesystem": "^5.4 || ^6.4 || ^7.0", + "symfony/finder": "^5.4 || ^6.4 || ^7.0", + "symfony/form": "^4.4 || ^5.4 || ^6.4 || ^7.0", + "symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0", + "symfony/http-foundation": "^5.4 || ^6.4 || ^7.0", + "symfony/http-kernel": "^5.4 || ^6.4 || ^7.0", + "symfony/options-resolver": "^5.4 || ^6.4 || ^7.0", "symfony/service-contracts": "^1.1 || ^2.0 || ^3.0", - "symfony/translation": "^5.4 || ^6.0 || ^7.0", + "symfony/translation": "^5.4 || ^6.4 || ^7.0", "symfony/translation-contracts": "^1.1 || ^2.0 || ^3.0" }, "require-dev": { @@ -46,9 +46,9 @@ "phpspec/phpspec": "^7.0", "phpunit/phpunit": "^9.4", "sylius-labs/coding-standard": "^4.0.2", - "symfony/browser-kit": "^5.4 || ^6.0 || ^7.0", - "symfony/security-csrf": "^5.4 || ^6.0 || ^7.0", - "symfony/twig-bundle": "^5.4 || ^6.0 || ^7.0", + "symfony/browser-kit": "^5.4 || ^6.4 || ^7.0", + "symfony/security-csrf": "^5.4 || ^6.4 || ^7.0", + "symfony/twig-bundle": "^5.4 || ^6.4 || ^7.0", "twig/twig": "^2.0 || ^3.0", "vimeo/psalm": "5.20.0", "rector/rector": "^1.0"