From e7bbdc8d744f5e20a5016fa245b68cf6583b97d5 Mon Sep 17 00:00:00 2001 From: MateuszKolankowski Date: Tue, 17 Feb 2026 12:24:42 +0100 Subject: [PATCH 1/4] Updated PHP versions in CI configuration with php 8.3 and 8.4 --- .github/workflows/{ci.yaml => backend-ci.yaml} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename .github/workflows/{ci.yaml => backend-ci.yaml} (95%) diff --git a/.github/workflows/ci.yaml b/.github/workflows/backend-ci.yaml similarity index 95% rename from .github/workflows/ci.yaml rename to .github/workflows/backend-ci.yaml index 8dd9c22..2840f18 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/backend-ci.yaml @@ -41,6 +41,7 @@ jobs: php: - '7.4' - '8.3' + - '8.4' steps: - uses: actions/checkout@v5 @@ -70,10 +71,8 @@ jobs: php: - '7.4' - '8.3' + - '8.4' composer_options: [ "" ] - include: - - php: '8.1' - composer_options: "--ignore-platform-req php" steps: - uses: actions/checkout@v5 From 8517fd9752043984b8a8fb3cf89c99e38cd5250e Mon Sep 17 00:00:00 2001 From: MateuszKolankowski Date: Fri, 27 Feb 2026 12:55:05 +0100 Subject: [PATCH 2/4] Normalized header casing in HTTP cache feature tests. --- features/symfony/cache.feature | 8 ++++---- features/symfony/embed.feature | 8 ++++---- features/symfony/permissions.feature | 8 ++++---- features/varnish/cache.feature | 8 ++++---- features/varnish/embed.feature | 4 ++-- features/varnish/permissions.feature | 4 ++-- features/varnish/translations.feature | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/features/symfony/cache.feature b/features/symfony/cache.feature index 6a9c732..b638a46 100644 --- a/features/symfony/cache.feature +++ b/features/symfony/cache.feature @@ -14,8 +14,8 @@ Feature: As an site administrator I want my pages to be cached using Symfony Htt | title | | And response headers contain | Header | Value | - | Cache-Control | public, s-maxage=86400 | - | X-Symfony-Cache | | + | cache-control | public, s-maxage=86400 | + | x-symfony-cache | | Examples: @@ -43,8 +43,8 @@ Feature: As an site administrator I want my pages to be cached using Symfony Htt | title | | And response headers contain | Header | Value | - | Cache-Control | public, s-maxage=86400 | - | X-Symfony-Cache | | + | cache-control | public, s-maxage=86400 | + | x-symfony-cache | | Examples: | user | password | itemName | itemNameAfterEdit | headerValue | diff --git a/features/symfony/embed.feature b/features/symfony/embed.feature index 96cc9f2..98dfcbf 100644 --- a/features/symfony/embed.feature +++ b/features/symfony/embed.feature @@ -23,8 +23,8 @@ Feature: Caching of embedded items And I should see "" And response headers contain | Header | Value | - | Cache-Control | public, s-maxage=86400 | - | X-Symfony-Cache | | + | cache-control | public, s-maxage=86400 | + | x-symfony-cache | | When I edit "" Content item in "eng-GB" | name | | | @@ -52,10 +52,10 @@ Feature: Caching of embedded items And I should see "" And response headers contain | Header | Value | - | Cache-Control | public, s-maxage=86400 | + | cache-control | public, s-maxage=86400 | And response headers match pattern | Header | Pattern | - | X-Symfony-Cache | | + | x-symfony-cache | | Examples: | embeddingItemName | embeddedItemName | expectedPattern | diff --git a/features/symfony/permissions.feature b/features/symfony/permissions.feature index 0379522..b74e47e 100644 --- a/features/symfony/permissions.feature +++ b/features/symfony/permissions.feature @@ -9,8 +9,8 @@ Feature: Cached response is different for users with different permissions And I should see "Administrator User" And response headers contain | Header | Value | - | Cache-Control | public, s-maxage=86400 | - | X-Symfony-Cache | GET /site/Users/Administrator-users/Administrator-User: fresh | + | cache-control | public, s-maxage=86400 | + | x-symfony-cache | GET /site/Users/Administrator-users/Administrator-User: fresh | When I am viewing the pages on siteaccess "site" as "Anonymous" And I visit "Users/Administrator-users/Administrator-User" on siteaccess "site" Then I should not see "Administrator User" @@ -32,8 +32,8 @@ Feature: Cached response is different for users with different permissions And I should see "Administrator User" And response headers contain | Header | Value | - | Cache-Control | public, s-maxage=86400 | - | X-Symfony-Cache | GET /site/testcontentitem: fresh | + | cache-control | public, s-maxage=86400 | + | x-symfony-cache | GET /site/testcontentitem: fresh | When I am viewing the pages on siteaccess "site" as "Anonymous" And I visit "TestContentItem" on siteaccess "site" Then I should see "TestContentItem" diff --git a/features/varnish/cache.feature b/features/varnish/cache.feature index 956a519..96d0909 100644 --- a/features/varnish/cache.feature +++ b/features/varnish/cache.feature @@ -10,14 +10,14 @@ Feature: As an site administrator I want my pages to be cached using Varnish When I visit on siteaccess "site" And response headers contain | Header | Value | - | X-Cache | MISS | + | x-cache | MISS | And I reload the page Then I see correct preview data for "Folder" content type | field | value | | title | | And response headers contain | Header | Value | - | X-Cache | HIT | + | x-cache | HIT | Examples: | user | password | itemName | @@ -37,7 +37,7 @@ Feature: As an site administrator I want my pages to be cached using Varnish | title | | And response headers contain | Header | Value | - | X-Cache | HIT | + | x-cache | HIT | When I edit "" Content item in "eng-GB" | short_name | | | @@ -52,7 +52,7 @@ Feature: As an site administrator I want my pages to be cached using Varnish | title | | And response headers contain | Header | Value | - | X-Cache | HIT | + | x-cache | HIT | Examples: | user | password | itemName | itemNameAfterEdit | diff --git a/features/varnish/embed.feature b/features/varnish/embed.feature index 0c67d2c..9bef90a 100644 --- a/features/varnish/embed.feature +++ b/features/varnish/embed.feature @@ -23,7 +23,7 @@ Feature: Caching of embedded items And I should see "" And response headers contain | Header | Value | - | X-Cache | HIT | + | x-cache | HIT | When I edit "" Content item in "eng-GB" | name | | | @@ -54,7 +54,7 @@ Feature: Caching of embedded items And I should see "" And response headers contain | Header | Value | - | X-Cache | HIT | + | x-cache | HIT | Examples: | embeddingItemName | embeddedItemName | diff --git a/features/varnish/permissions.feature b/features/varnish/permissions.feature index 8e8072b..f0717a0 100644 --- a/features/varnish/permissions.feature +++ b/features/varnish/permissions.feature @@ -8,7 +8,7 @@ Feature: Cached response is different for users with different permissions And I should see "Administrator User" And response headers contain | Header | Value | - | X-Cache | HIT | + | x-cache | HIT | When I am viewing the pages on siteaccess "site" as "Anonymous" And I visit "Users/Administrator-users/Administrator-User" on siteaccess "site" Then I should not see "Administrator User" @@ -30,7 +30,7 @@ Feature: Cached response is different for users with different permissions And I should see "Administrator User" And response headers contain | Header | Value | - | X-Cache | HIT | + | x-cache | HIT | When I am viewing the pages on siteaccess "site" as "Anonymous" And I visit "TestContentItem" on siteaccess "site" Then I should see "TestContentItem" diff --git a/features/varnish/translations.feature b/features/varnish/translations.feature index 984ae48..aae1dcd 100644 --- a/features/varnish/translations.feature +++ b/features/varnish/translations.feature @@ -13,7 +13,7 @@ Feature: As an site administrator I want my pages to be cached using Varnish | title | | And response headers contain | Header | Value | - | X-Cache | HIT | + | x-cache | HIT | When I edit "" Content item in "eng-GB" | short_name | | | @@ -28,7 +28,7 @@ Feature: As an site administrator I want my pages to be cached using Varnish | title | | And response headers contain | Header | Value | - | X-Cache | HIT | + | x-cache | HIT | Examples: | user | password | itemName | itemNameAfterEdit | From ca8ad54691d0e44e8eeddd276e2321309838a3f0 Mon Sep 17 00:00:00 2001 From: MateuszKolankowski Date: Fri, 27 Feb 2026 13:01:16 +0100 Subject: [PATCH 3/4] Expand phpspec version constraint to include ^8.0. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0adce50..c58cd55 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "ibexa/doctrine-schema": "~4.6.0@dev", "phpunit/phpunit": "^8.5", "matthiasnoback/symfony-dependency-injection-test": "^4.3", - "phpspec/phpspec": "^7.1", + "phpspec/phpspec": "^7.1 || ^8.0", "phpstan/phpstan": "^2.0", "phpstan/phpstan-phpunit": "^2.0", "phpstan/phpstan-symfony": "^2.0", From 882e152e6f14f196d5105cb58c4709a39e4d145c Mon Sep 17 00:00:00 2001 From: MateuszKolankowski Date: Fri, 27 Feb 2026 14:49:01 +0100 Subject: [PATCH 4/4] Updated REST integration tests workflow to use version 4.6. --- .github/workflows/backend-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-ci.yaml b/.github/workflows/backend-ci.yaml index 2840f18..a98618b 100644 --- a/.github/workflows/backend-ci.yaml +++ b/.github/workflows/backend-ci.yaml @@ -98,4 +98,4 @@ jobs: integration-tests: name: "REST integration tests" - uses: ibexa/rest/.github/workflows/integration-tests-callable.yaml@main + uses: ibexa/rest/.github/workflows/integration-tests-callable.yaml@4.6