From 49c6558efb8bdf6f8c25afa2ce6f719c92bca453 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Tue, 12 Nov 2024 15:47:16 +0100 Subject: [PATCH 1/6] [Composer] Dropped PHP < 8.3 support --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f09dd31..037829b 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "ibexa-dxp" ], "require": { - "php": "^7.4 || ^8.0", + "php": ">=8.3", "doctrine/dbal": "^2.13.0", "symfony/framework-bundle": "^5.4", "symfony/mime": "^5.4", From a65b9f70e0d78885b884d0ad33052412694b454d Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Tue, 12 Nov 2024 15:48:06 +0100 Subject: [PATCH 2/6] [CI] Dropped PHP < 8.3 jobs --- .github/workflows/ci.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d566479..d19f22a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,7 +15,7 @@ jobs: strategy: matrix: php: - - '8.0' + - '8.3' steps: - uses: actions/checkout@v3 @@ -43,10 +43,7 @@ jobs: fail-fast: false matrix: php: - - '7.4' - - '8.0' - - '8.1' - - '8.2' + - '8.3' steps: - uses: actions/checkout@v3 From 026ef3ba8007cdd71c1b7ec3460f82ee8fed8418 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Tue, 12 Nov 2024 15:50:17 +0100 Subject: [PATCH 3/6] [Composer] Bumped symfony-related packages requirements to ^6.4 --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 037829b..ca483b8 100644 --- a/composer.json +++ b/composer.json @@ -8,12 +8,12 @@ "require": { "php": ">=8.3", "doctrine/dbal": "^2.13.0", - "symfony/framework-bundle": "^5.4", - "symfony/mime": "^5.4", - "symfony/proxy-manager-bridge": "^5.4", - "symfony/translation": "^5.4", - "symfony/validator": "^5.4", - "symfony/yaml": "^5.4" + "symfony/framework-bundle": "^6.4", + "symfony/mime": "^6.4", + "symfony/proxy-manager-bridge": "^6.4", + "symfony/translation": "^6.4", + "symfony/validator": "^6.4", + "symfony/yaml": "^6.4" }, "require-dev": { "phpunit/phpunit": "^9", From 7d53754391366bf1dfd7c73ad6f323f0ba695c30 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Tue, 12 Nov 2024 15:53:57 +0100 Subject: [PATCH 4/6] [CS] Fixed outstanding CS issues --- src/contracts/IbexaTestCore.php | 1 + src/contracts/IbexaTestCoreInterface.php | 1 + 2 files changed, 2 insertions(+) diff --git a/src/contracts/IbexaTestCore.php b/src/contracts/IbexaTestCore.php index 8d08b5e..421810a 100644 --- a/src/contracts/IbexaTestCore.php +++ b/src/contracts/IbexaTestCore.php @@ -92,6 +92,7 @@ public function getFixtures(): iterable /** * @template T of object + * * @phpstan-param class-string $className * * @return T diff --git a/src/contracts/IbexaTestCoreInterface.php b/src/contracts/IbexaTestCoreInterface.php index 12d3a68..c11afea 100644 --- a/src/contracts/IbexaTestCoreInterface.php +++ b/src/contracts/IbexaTestCoreInterface.php @@ -43,6 +43,7 @@ public function getFixtures(): iterable; /** * @template T of object + * * @phpstan-param class-string $className * * @return T From d783016773c1590fbfc15a4db0b737dba7c9ed86 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Tue, 12 Nov 2024 16:54:54 +0100 Subject: [PATCH 5/6] Updated semantic configuration for Symfony 6 --- src/contracts/Resources/config/framework.yaml | 2 +- src/contracts/Resources/config/security.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/contracts/Resources/config/framework.yaml b/src/contracts/Resources/config/framework.yaml index f8b8e99..348740b 100644 --- a/src/contracts/Resources/config/framework.yaml +++ b/src/contracts/Resources/config/framework.yaml @@ -5,7 +5,7 @@ parameters: framework: test: true session: - storage_id: session.storage.mock_file + storage_factory_id: session.storage.factory.mock_file cache: app: cache.adapter.array router: diff --git a/src/contracts/Resources/config/security.yaml b/src/contracts/Resources/config/security.yaml index abb4fa3..9f7a878 100644 --- a/src/contracts/Resources/config/security.yaml +++ b/src/contracts/Resources/config/security.yaml @@ -5,4 +5,3 @@ security: firewalls: main: - anonymous: ~ From ffdc00c42c7444c7a0e6ae64a068d6cc566f92d9 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Thu, 14 Nov 2024 12:39:54 +0100 Subject: [PATCH 6/6] [CI] Bumped actions' versions Co-Authored-By: Konrad Oboza --- .github/workflows/ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d19f22a..a78c3e3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,7 +17,7 @@ jobs: php: - '8.3' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup PHP Action uses: shivammathur/setup-php@v2 @@ -27,7 +27,7 @@ jobs: extensions: 'pdo_sqlite, gd' tools: cs2pr - - uses: ramsey/composer-install@v2 + - uses: ramsey/composer-install@v3 with: dependency-versions: highest @@ -46,7 +46,7 @@ jobs: - '8.3' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup PHP Action uses: shivammathur/setup-php@v2 @@ -56,7 +56,7 @@ jobs: extensions: pdo_sqlite, gd tools: cs2pr - - uses: ramsey/composer-install@v2 + - uses: ramsey/composer-install@v3 with: dependency-versions: highest