Merge branch 'master' into temp_4.5_to_master

.github/pull_request_template.md

@@ -1,8 +1,8 @@
 | Question                                  | Answer
 | ---------------------------------------- | ------------------
-| **JIRA issue**                          | EZEE-XXXXX
+| **JIRA issue**                          | IBX-XXXXX
 | **Type**                                   | feature/bug/improvement
-| **Target Ibexa version** | `v3.x` - please update `x` accordingly
+| **Target Ibexa version** | `v4.6` - please update `x` accordingly
 | **BC breaks**                          | yes/no
 | **Doc needed**                       | yes/no
 

.github/workflows/auto_tag.yml

@@ -20,7 +20,7 @@ on:
 jobs:
   preparation:
     runs-on: ubuntu-latest
-    # This should allow parallel runs in a chain, e.g. OSS->Content->Experience->Commerce
+    # This should allow parallel runs in a chain, e.g. OSS->Headless->Experience->Commerce
     # whilst allowing Satis to process
     timeout-minutes: 30
 
@@ -42,12 +42,12 @@ jobs:
       # select(.version == "${{ env.V_VERSION }}"): filters the array to only include objects where the version property is equal to the value of the environment variable V_VERSION.
 
       # No need to validate for oss version in satis
-      - name: Validate satis for content version
+      - name: Validate satis for headless version
         if: github.event.repository.name == 'experience'
         env:
           SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }}
           SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }}
-          PARENT: ibexa/content
+          PARENT: ibexa/headless
           V_VERSION: v${{ inputs.version }}
         run: |
           for EXPONENTIAL_BACKOFF in {1..10}; do
@@ -140,11 +140,11 @@ jobs:
         if: github.event.repository.name == 'oss'
         run: jq '.require["ibexa/admin-ui-assets"] |= "${{ inputs.version }}"' composer.json | sponge composer.json
       - name: Patch parent version for Content
-        if: github.event.repository.name == 'content'
+        if: github.event.repository.name == 'headless'
         run: jq '.require["ibexa/oss"] |= "${{ inputs.version }}"' composer.json | sponge composer.json
       - name: Patch parent version for Experience
         if: github.event.repository.name == 'experience'
-        run: jq '.require["ibexa/content"] |= "${{ inputs.version }}"' composer.json | sponge composer.json
+        run: jq '.require["ibexa/headless"] |= "${{ inputs.version }}"' composer.json | sponge composer.json
       - name: Patch parent version for Commerce
         if: github.event.repository.name == 'commerce'
         run: jq '.require["ibexa/experience"] |= "${{ inputs.version }}"' composer.json | sponge composer.json

.github/workflows/browser-tests.yml

@@ -19,19 +19,19 @@ on:
     pull_request: ~
 
 jobs:
-    regression-content-setup1:
-        name: "PHP 7.4/Node 14/PostgreSQL/Varnish/Redis/Multirepository"
+    regression-headless-setup1:
+        name: "PHP 7.4/Node 18/PostgreSQL/Varnish/Redis/Multirepository"
         uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
         with:
-            project-edition: "content"
+            project-edition: "headless"
             project-version: ${{ github.event.inputs.project-version }}
-            test-suite: "--profile=regression --suite=content"
-            test-setup-phase-1: "--profile=regression --suite=setup-content --tags=~@part2 --mode=standard"
-            test-setup-phase-2: "--profile=regression --suite=setup-content --tags=@part2 --mode=standard"
+            test-suite: "--profile=regression --suite=headless"
+            test-setup-phase-1: "--profile=regression --suite=setup-headless --tags=~@part2 --mode=standard"
+            test-setup-phase-2: "--profile=regression --suite=setup-headless --tags=@part2 --mode=standard"
             setup: "doc/docker/base-dev.yml:doc/docker/db-postgresql.yml:doc/docker/varnish.yml:doc/docker/redis.yml:doc/docker/selenium.yml"
             send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }}
             multirepository: true
-            php-image: "ghcr.io/ibexa/docker/php:7.4-node14"
+            php-image: "ghcr.io/ibexa/docker/php:7.4-node18"
             job-count: 2
             timeout: 90
         secrets:
@@ -42,19 +42,19 @@ jobs:
             AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }}
             AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }}
             AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
-    regression-content-setup2:
-        name: "PHP 8.0/Node 16/MySQL/Compatibility layer/Elastic"
+    regression-headless-setup2:
+        name: "PHP 8.0/Node 18/MySQL/Compatibility layer/Elastic"
         uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
         with:
-            project-edition: "content"
+            project-edition: "headless"
             project-version: ${{ github.event.inputs.project-version }}
-            test-suite: "--profile=regression --suite=content"
-            test-setup-phase-1: "--profile=regression --suite=setup-content --tags=~@part2 --mode=standard"
-            test-setup-phase-2: "--profile=regression --suite=setup-content --tags=@part2 --mode=standard"
+            test-suite: "--profile=regression --suite=headless"
+            test-setup-phase-1: "--profile=regression --suite=setup-headless --tags=~@part2 --mode=standard"
+            test-setup-phase-2: "--profile=regression --suite=setup-headless --tags=@part2 --mode=standard"
             setup: "doc/docker/base-dev.yml:doc/docker/elastic.yml:doc/docker/selenium.yml"
             send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }}
             use-compatibility-layer: true
-            php-image: "ghcr.io/ibexa/docker/php:8.0-node16"
+            php-image: "ghcr.io/ibexa/docker/php:8.0-node18"
             job-count: 2
             timeout: 90
         secrets:
@@ -65,15 +65,15 @@ jobs:
             AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }}
             AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }}
             AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
-    regression-content-setup3:
+    regression-headless-setup3:
         name: "PHP 8.2/Node 18/MySQL/Compatibility layer/Solr"
         uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
         with:
-            project-edition: "content"
+            project-edition: "headless"
             project-version: ${{ github.event.inputs.project-version }}
-            test-suite: "--profile=regression --suite=content"
-            test-setup-phase-1: "--profile=regression --suite=setup-content --tags=~@part2 --mode=standard"
-            test-setup-phase-2: "--profile=regression --suite=setup-content --tags=@part2 --mode=standard"
+            test-suite: "--profile=regression --suite=headless"
+            test-setup-phase-1: "--profile=regression --suite=setup-headless --tags=~@part2 --mode=standard"
+            test-setup-phase-2: "--profile=regression --suite=setup-headless --tags=@part2 --mode=standard"
             setup: "doc/docker/base-dev.yml:doc/docker/solr.yml:doc/docker/selenium.yml"
             send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }}
             use-compatibility-layer: true

README.md

@@ -1,18 +1,16 @@
-# Ibexa DXP Content Symfony Flex metapackage
+# Ibexa DXP Headless Symfony Flex metapackage
 
-⚠️ As of Ibexa DXP v4.6.0, Ibexa Content has been replaced by Ibexa Headless. Proceed to [ibexa/headless](https://github.com/ibexa/headless) to check out the latest version.
-
-This is a metapackage for Symfony Flex-based Ibexa DXP Content installation. 
+This is a metapackage for Symfony Flex-based Ibexa DXP Headless installation. 
 It requires a subscription.
 
 Learn more about [Ibexa DXP](https://www.ibexa.co/products).
 
 ## Installation
 
-To install the latest version of Ibexa Content, follow the [installation guide](https://doc.ibexa.co/en/latest/getting_started/install_ez_platform/).
+To install the latest version of Ibexa Headless, follow the [installation guide](https://doc.ibexa.co/en/latest/getting_started/install_ez_platform/).
 
 ## COPYRIGHT
-Copyright (C) 1999-2020 Ibexa AS (formerly eZ Systems AS). All rights reserved.
+Copyright (C) 1999-2023 Ibexa AS (formerly eZ Systems AS). All rights reserved.
 
 ## LICENSE
 This source code is available separately under the following licenses:

composer.json

@@ -1,44 +1,49 @@
 {
-    "name": "ibexa/content",
+    "name": "ibexa/headless",
     "type": "metapackage",
     "license": "proprietary",
-    "description": "A meta package for installing Ibexa DXP Content edition",
+    "description": "A meta package for installing Ibexa DXP Headless edition",
     "minimum-stability": "dev",
     "prefer-stable": true,
     "repositories": [
         {"type": "composer", "url": "https://updates.ibexa.co"}
     ],
+    "replace": {
+        "ibexa/content": "*"
+    },
     "require": {
         "php": "^7.4 || ^8.0",
-        "ibexa/oss": "~4.5.x-dev",
-        "ibexa/connect": "~4.5.x-dev",
-        "ibexa/measurement": "~4.5.x-dev",
-        "ibexa/migrations": "~4.5.x-dev",
-        "ibexa/image-editor": "~4.5.x-dev",
-        "ibexa/oauth2-client": "~4.5.x-dev",
-        "ibexa/installer": "~4.5.x-dev",
-        "ibexa/product-catalog": "~4.5.x-dev",
-        "ibexa/seo": "~4.5.x-dev",
-        "ibexa/scheduler": "~4.5.x-dev",
-        "ibexa/calendar": "~4.5.x-dev",
-        "ibexa/connector-dam": "~4.5.x-dev",
-        "ibexa/elasticsearch": "~4.5.x-dev",
-        "ibexa/fastly": "~4.5.x-dev",
-        "ibexa/icons": "~4.5.x-dev",
-        "ibexa/personalization": "~4.5.x-dev",
-        "ibexa/version-comparison": "~4.5.x-dev",
-        "ibexa/workflow": "~4.5.x-dev",
-        "ibexa/taxonomy": "~4.5.x-dev",
-        "ibexa/tree-builder": "~4.5.x-dev",
-        "ibexa/content-tree": "~4.5.x-dev",
+        "ibexa/oss": "~4.6.x-dev",
+        "ibexa/connect": "~4.6.x-dev",
+        "ibexa/measurement": "~4.6.x-dev",
+        "ibexa/migrations": "~4.6.x-dev",
+        "ibexa/image-editor": "~4.6.x-dev",
+        "ibexa/oauth2-client": "~4.6.x-dev",
+        "ibexa/installer": "~4.6.x-dev",
+        "ibexa/product-catalog": "~4.6.x-dev",
+        "ibexa/seo": "~4.6.x-dev",
+        "ibexa/scheduler": "~4.6.x-dev",
+        "ibexa/calendar": "~4.6.x-dev",
+        "ibexa/connector-dam": "~4.6.x-dev",
+        "ibexa/elasticsearch": "~4.6.x-dev",
+        "ibexa/fastly": "~4.6.x-dev",
+        "ibexa/icons": "~4.6.x-dev",
+        "ibexa/personalization": "~4.6.x-dev",
+        "ibexa/version-comparison": "~4.6.x-dev",
+        "ibexa/workflow": "~4.6.x-dev",
+        "ibexa/taxonomy": "~4.6.x-dev",
+        "ibexa/tree-builder": "~4.6.x-dev",
+        "ibexa/content-tree": "~4.6.x-dev",
+        "ibexa/image-picker": "~4.6.x-dev",
+        "ibexa/site-context": "~4.6.x-dev",
         "gregwar/captcha-bundle": "^2.1"
     },
     "require-dev": {
         "ibexa/ci-scripts": "^0.2@dev"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "4.5.x-dev"
+            "dev-master": "4.6.x-dev"
         }
     }
 }