Merge branch '4.6' into temp_2.3_to_4.6

.github/pull_request_template.md

@@ -1,8 +1,8 @@
 | Question           | Answer
 | ------------------ | ------------------
-| **JIRA issue**     | [EZP-XXXXX](https://jira.ez.no/browse/EZP-XXXXX)
+| **JIRA issue**     | [IBX-XXXXX](https://issues.ibexa.co/browse/IBX-XXXXX)
 | **Type**           | Bug/Improvement/Feature/Misc
-| **Target version** | latest stable `0.8` for bug fixes, `master` for new features
+| **Target version** | latest stable `4.0` for bug fixes, `main` for new features
 | **BC breaks**      | yes/no
 | **Doc needed**     | yes/no
 

.github/workflows/browser-tests.yaml

@@ -13,7 +13,6 @@ jobs:
         uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
         with:
             project-edition: 'oss'
-            project-version: '^3.3.x-dev'
             test-suite: '--mode=standard --profile=httpCache --suite=symfonycache'
             test-setup-phase-1:  '--mode=standard --profile=httpCache --suite=setup-symfony-cache'
             test-setup-phase-2: '--mode=standard --profile=httpCache --suite=setup'
@@ -24,7 +23,6 @@ jobs:
         uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
         with:
             project-edition: 'oss'
-            project-version: '^3.3.x-dev'
             setup: "doc/docker/base-dev.yml:doc/docker/varnish.yml:doc/docker/selenium.yml"
             test-suite:  '--mode=standard --profile=httpCache --suite=varnish6'
             test-setup-phase-1: '--mode=standard --profile=httpCache --suite=setup'
@@ -35,7 +33,6 @@ jobs:
         uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
         with:
             project-edition: 'oss'
-            project-version: '^3.3.x-dev'
             setup: "doc/docker/base-dev.yml:doc/docker/varnish7.yml:doc/docker/selenium.yml"
             test-suite:  '--mode=standard --profile=httpCache --suite=varnish7'
             test-setup-phase-1: '--mode=standard --profile=httpCache --suite=setup'
@@ -46,7 +43,6 @@ jobs:
         uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
         with:
             project-edition: 'oss'
-            project-version: '^3.3.x-dev'
             setup: "doc/docker/base-dev.yml:doc/docker/varnish.yml:doc/docker/selenium.yml"
             test-suite:  '--mode=standard --profile=httpCache --suite=varnish6-translation-aware'
             test-setup-phase-1: '--mode=standard --profile=httpCache --suite=setup-translation-aware'
@@ -58,7 +54,6 @@ jobs:
         uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
         with:
             project-edition: 'oss'
-            project-version: '^3.3.x-dev'
             setup: "doc/docker/base-dev.yml:doc/docker/varnish7.yml:doc/docker/selenium.yml"
             test-suite:  '--mode=standard --profile=httpCache --suite=varnish7-translation-aware'
             test-setup-phase-1: '--mode=standard --profile=httpCache --suite=setup-translation-aware'
@@ -70,7 +65,6 @@ jobs:
         uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
         with:
             project-edition: 'oss'
-            project-version: '^3.3.x-dev'
             setup: "doc/docker/base-dev.yml:doc/docker/varnish.yml:doc/docker/selenium.yml"
             test-suite:  '--mode=standard --profile=httpCache --suite=varnish6'
             test-setup-phase-1: '--mode=standard --profile=httpCache --suite=setup-token'
@@ -82,7 +76,6 @@ jobs:
         uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
         with:
             project-edition: 'oss'
-            project-version: '^3.3.x-dev'
             setup: "doc/docker/base-dev.yml:doc/docker/varnish7.yml:doc/docker/selenium.yml"
             test-suite:  '--mode=standard --profile=httpCache --suite=varnish7'
             test-setup-phase-1: '--mode=standard --profile=httpCache --suite=setup-token'

.github/workflows/ci.yaml

@@ -3,7 +3,7 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - main
       - '[0-9]+.[0-9]+'
   pull_request: ~
 
@@ -42,7 +42,6 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - '7.3'
           - '7.4'
           - '8.0'
         composer_options: [ "" ]
@@ -74,4 +73,4 @@ jobs:
 
   integration-tests:
       name: "REST integration tests"
-      uses: ezsystems/ezplatform-rest/.github/workflows/integration-tests-callable.yaml@1.3
+      uses: ibexa/rest/.github/workflows/integration-tests-callable.yaml@main

.gitignore

@@ -1,3 +1,4 @@
 /vendor/
 composer.lock
 .php_cs.cache
+.php-cs-fixer.cache

.php-cs-fixer.php

@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+use Ibexa\CodeStyle\PhpCsFixer\InternalConfigFactory;
+
+$configFactory = new InternalConfigFactory();
+$configFactory->withRules([
+    'declare_strict_types' => false,
+]);
+
+return $configFactory
+    ->buildConfig()
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in([
+                __DIR__ . '/src',
+                __DIR__ . '/tests',
+            ])
+            ->files()->name('*.php')
+    );

COPYRIGHT

@@ -1,4 +1,4 @@
-Copyright (C) 1999-2021 Ibexa AS (formerly eZ Systems AS). All rights reserved.
+Copyright (C) 1999-2024 Ibexa AS (formerly eZ Systems AS). All rights reserved.
 
 This source code is available separately under the following licenses:
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 1999-2021 Ibexa AS (formerly eZ Systems AS). All rights reserved.
+Copyright (C) 1999-2024 Ibexa AS (formerly eZ Systems AS). All rights reserved.
 
 This source code is available separately under the following licenses:
 

README.md

@@ -8,7 +8,7 @@ This package contains the advanced caching features to provide HTTP cache handli
 
 ## COPYRIGHT
 
-Copyright (C) 1999-2021 Ibexa AS (formerly eZ Systems AS). All rights reserved.
+Copyright (C) 1999-2024 Ibexa AS (formerly eZ Systems AS). All rights reserved.
 
 ## LICENSE
 

behat_suites.yml

@@ -2,98 +2,98 @@ httpCache:
     suites:
         symfonycache:
             paths:
-                - '%paths.base%/vendor/ezsystems/ezplatform-http-cache/features/symfony'
+                - '%paths.base%/vendor/ibexa/http-cache/features/symfony'
             contexts:
-                - EzSystems\Behat\API\Context\TestContext
-                - EzSystems\Behat\API\Context\ContentTypeContext
-                - EzSystems\Behat\API\Context\ContentContext
-                - EzSystems\Behat\Core\Context\TimeContext
-                - EzSystems\Behat\Core\Context\ConfigurationContext
+                - Ibexa\Behat\API\Context\TestContext
+                - Ibexa\Behat\API\Context\ContentTypeContext
+                - Ibexa\Behat\API\Context\ContentContext
+                - Ibexa\Behat\Core\Context\TimeContext
+                - Ibexa\Behat\Core\Context\ConfigurationContext
                 - Ibexa\Behat\Browser\Context\BrowserContext
                 - Ibexa\Behat\Browser\Context\AuthenticationContext
                 - Behat\MinkExtension\Context\MinkContext
                 - Ibexa\Behat\Browser\Context\ContentPreviewContext
         varnish6:
             paths:
-                - '%paths.base%/vendor/ezsystems/ezplatform-http-cache/features/varnish'
+                - '%paths.base%/vendor/ibexa/http-cache/features/varnish'
             filters:
                 tags: '@varnish6&&~@translationAware' 
             contexts:
-                - EzSystems\Behat\API\Context\TestContext
-                - EzSystems\Behat\API\Context\ContentTypeContext
-                - EzSystems\Behat\Core\Context\TimeContext
-                - EzSystems\Behat\Core\Context\ConfigurationContext
-                - EzSystems\Behat\API\Context\ContentContext
+                - Ibexa\Behat\API\Context\TestContext
+                - Ibexa\Behat\API\Context\ContentTypeContext
+                - Ibexa\Behat\Core\Context\TimeContext
+                - Ibexa\Behat\Core\Context\ConfigurationContext
+                - Ibexa\Behat\API\Context\ContentContext
                 - Ibexa\Behat\Browser\Context\BrowserContext
                 - Ibexa\Behat\Browser\Context\AuthenticationContext
                 - Behat\MinkExtension\Context\MinkContext
                 - Ibexa\Behat\Browser\Context\ContentPreviewContext
         varnish6-translation-aware:
             paths:
-                - '%paths.base%/vendor/ezsystems/ezplatform-http-cache/features/varnish'
+                - '%paths.base%/vendor/ibexa/http-cache/features/varnish'
             filters:
                 tags: '@varnish6&&~@translationNotAware' 
             contexts:
-                - EzSystems\Behat\API\Context\TestContext
-                - EzSystems\Behat\API\Context\ContentTypeContext
-                - EzSystems\Behat\Core\Context\TimeContext
-                - EzSystems\Behat\Core\Context\ConfigurationContext
-                - EzSystems\Behat\API\Context\ContentContext
+                - Ibexa\Behat\API\Context\TestContext
+                - Ibexa\Behat\API\Context\ContentTypeContext
+                - Ibexa\Behat\Core\Context\TimeContext
+                - Ibexa\Behat\Core\Context\ConfigurationContext
+                - Ibexa\Behat\API\Context\ContentContext
                 - Ibexa\Behat\Browser\Context\BrowserContext
                 - Ibexa\Behat\Browser\Context\AuthenticationContext
                 - Behat\MinkExtension\Context\MinkContext
                 - Ibexa\Behat\Browser\Context\ContentPreviewContext
         varnish7:
             paths:
-                - '%paths.base%/vendor/ezsystems/ezplatform-http-cache/features/varnish'
+                - '%paths.base%/vendor/ibexa/http-cache/features/varnish'
             filters:
                 tags: '@varnish7&&~@translationAware' 
             contexts:
-                - EzSystems\Behat\API\Context\TestContext
-                - EzSystems\Behat\API\Context\ContentTypeContext
-                - EzSystems\Behat\Core\Context\TimeContext
-                - EzSystems\Behat\Core\Context\ConfigurationContext
-                - EzSystems\Behat\API\Context\ContentContext
+                - Ibexa\Behat\API\Context\TestContext
+                - Ibexa\Behat\API\Context\ContentTypeContext
+                - Ibexa\Behat\Core\Context\TimeContext
+                - Ibexa\Behat\Core\Context\ConfigurationContext
+                - Ibexa\Behat\API\Context\ContentContext
                 - Ibexa\Behat\Browser\Context\BrowserContext
                 - Ibexa\Behat\Browser\Context\AuthenticationContext
                 - Behat\MinkExtension\Context\MinkContext
                 - Ibexa\Behat\Browser\Context\ContentPreviewContext
         varnish7-translation-aware:
             paths:
-                - '%paths.base%/vendor/ezsystems/ezplatform-http-cache/features/varnish'
+                - '%paths.base%/vendor/ibexa/http-cache/features/varnish'
             filters:
                 tags: '@varnish7&&~@translationNotAware' 
             contexts:
-                - EzSystems\Behat\API\Context\TestContext
-                - EzSystems\Behat\API\Context\ContentTypeContext
-                - EzSystems\Behat\Core\Context\TimeContext
-                - EzSystems\Behat\Core\Context\ConfigurationContext
-                - EzSystems\Behat\API\Context\ContentContext
+                - Ibexa\Behat\API\Context\TestContext
+                - Ibexa\Behat\API\Context\ContentTypeContext
+                - Ibexa\Behat\Core\Context\TimeContext
+                - Ibexa\Behat\Core\Context\ConfigurationContext
+                - Ibexa\Behat\API\Context\ContentContext
                 - Ibexa\Behat\Browser\Context\BrowserContext
                 - Ibexa\Behat\Browser\Context\AuthenticationContext
                 - Behat\MinkExtension\Context\MinkContext
                 - Ibexa\Behat\Browser\Context\ContentPreviewContext
         setup:
             paths:
-                - '%paths.base%/vendor/ezsystems/ezplatform-http-cache/features/setup/setup.feature'
+                - '%paths.base%/vendor/ibexa/http-cache/features/setup/setup.feature'
             contexts:
-                - EzSystems\Behat\API\Context\TestContext
-                - EzSystems\Behat\API\Context\ContentTypeContext
-                - EzSystems\Behat\Core\Context\ConfigurationContext
-                - EzSystems\Behat\API\Context\ContentContext
-                - EzSystems\Behat\API\Context\LanguageContext
+                - Ibexa\Behat\API\Context\TestContext
+                - Ibexa\Behat\API\Context\ContentTypeContext
+                - Ibexa\Behat\Core\Context\ConfigurationContext
+                - Ibexa\Behat\API\Context\ContentContext
+                - Ibexa\Behat\API\Context\LanguageContext
         setup-token:
             paths:
-                - '%paths.base%/vendor/ezsystems/ezplatform-http-cache/features/setup/invalidateToken.feature'
+                - '%paths.base%/vendor/ibexa/http-cache/features/setup/invalidateToken.feature'
             contexts:
-                - EzSystems\Behat\Core\Context\ConfigurationContext
+                - Ibexa\Behat\Core\Context\ConfigurationContext
         setup-symfony-cache:
             paths:
-                - '%paths.base%/vendor/ezsystems/ezplatform-http-cache/features/setup/symfonyCache.feature'
+                - '%paths.base%/vendor/ibexa/http-cache/features/setup/symfonyCache.feature'
             contexts:
-                - EzSystems\Behat\Core\Context\FileContext
+                - Ibexa\Behat\Core\Context\FileContext
         setup-translation-aware:
             paths:
-                - '%paths.base%/vendor/ezsystems/ezplatform-http-cache/features/setup/translationAware.feature'
+                - '%paths.base%/vendor/ibexa/http-cache/features/setup/translationAware.feature'
             contexts:
-                - EzSystems\Behat\Core\Context\ConfigurationContext
+                - Ibexa\Behat\Core\Context\ConfigurationContext

bootstrap.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 require_once __DIR__ . '/vendor/autoload.php';

composer.json

@@ -1,18 +1,21 @@
 {
-    "name": "ezsystems/ezplatform-http-cache",
-    "description": "HTTP cache handling for eZ Platform.",
-    "type": "ezplatform-bundle",
+    "name": "ibexa/http-cache",
+    "description": "HTTP cache handling for Ibexa DXP.",
+    "type": "ibexa-bundle",
     "license": "GPL-2.0-only",
+    "replace": {
+        "ezsystems/ezplatform-http-cache": "*"
+    },
     "authors": [
         {
             "name": "eZ Systems",
-            "email": "dev-team@ez.no"
+            "email": "dev-team@ibexa.co"
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
-        "ezsystems/ezplatform-kernel": "^1.3@dev",
-        "ezsystems/ezplatform-rest": "^1.0@dev",
+        "php": "^7.4 || ^8.0",
+        "ibexa/core": "~4.6.x-dev",
+        "ibexa/rest": "~4.6.0@dev",
         "friendsofsymfony/http-cache-bundle": "^2.8",
         "friendsofsymfony/http-cache": "^2.9",
         "symfony/http-foundation": "^5.0",
@@ -27,29 +30,32 @@
         "toflar/psr6-symfony-http-cache-store": "^2.2 || ^3.0"
     },
     "require-dev": {
-        "ibexa/ci-scripts": "^0.1@dev",
-        "ezsystems/doctrine-dbal-schema": "^1.0@dev",
+        "ibexa/ci-scripts": "^0.2@dev",
+        "ibexa/doctrine-schema": "~4.6.0@dev",
         "phpunit/phpunit": "^8.5",
         "matthiasnoback/symfony-dependency-injection-test": "^4.3",
         "phpspec/phpspec": "^7.1",
-        "ezsystems/ezplatform-code-style": "^0.1.0",
-        "friendsofphp/php-cs-fixer": "^2.16.0",
+        "ibexa/code-style": "^1.0",
+        "friendsofphp/php-cs-fixer": "^3.0",
         "symfony/phpunit-bridge": "^5.1"
     },
     "autoload": {
         "psr-4": {
-            "EzSystems\\PlatformHttpCacheBundle\\": "src",
-            "EzSystems\\PlatformHttpCacheBundle\\Tests\\": "tests",
-            "Ibexa\\HttpCache\\": "src"
+            "Ibexa\\HttpCache\\": "src/lib/",
+            "Ibexa\\Bundle\\HttpCache\\": "src/bundle/",
+            "Ibexa\\Contracts\\HttpCache\\": "src/contracts/",
+            "EzSystems\\PlatformHttpCacheBundle\\": "src/bundle/"
         }
     },
     "autoload-dev": {
-        "autoload-dev": {
-            "Ibexa\\Tests\\Bundle\\HttpCache\\": "tests/bundle/"
+        "psr-4": {
+            "Ibexa\\Tests\\HttpCache\\": "tests/lib/",
+            "Ibexa\\Tests\\Bundle\\HttpCache\\": "tests/bundle/",
+            "EzSystems\\PlatformHttpCacheBundle\\Tests\\": "tests"
         }
     },
     "scripts": {
-        "fix-cs": "php-cs-fixer fix -v --show-progress=estimating",
+        "fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots",
         "unit": "phpunit -c phpunit.xml",
         "spec": "phpspec run --format=pretty",
         "check-cs": "@fix-cs --dry-run",
@@ -60,7 +66,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.3.x-dev"
+            "dev-main": "4.6.x-dev"
         }
     }
 }