IBX-8418: Remove draft when trashing its parent or ancestor location

.github/workflows/ci.yaml

@@ -10,13 +10,13 @@ on:
 jobs:
     cs-fix:
         name: Run code style check
-        runs-on: "ubuntu-20.04"
+        runs-on: "ubuntu-22.04"
         strategy:
             matrix:
                 php:
-                    - '8.0'
+                    - '8.3'
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
 
             - name: Setup PHP Action
               uses: shivammathur/setup-php@v2
@@ -26,28 +26,26 @@ jobs:
                   extensions: 'pdo_sqlite, gd'
                   tools: cs2pr
 
-            - uses: "ramsey/composer-install@v1"
+            - uses: ramsey/composer-install@v3
               with:
-                  dependency-versions: "highest"
+                  dependency-versions: highest
 
             - name: Run code style check
               run: composer run-script check-cs -- --format=checkstyle | cs2pr
 
     tests:
         name: Unit tests & SQLite integration tests
-        runs-on: "ubuntu-20.04"
+        runs-on: "ubuntu-22.04"
         timeout-minutes: 15
 
         strategy:
             fail-fast: false
             matrix:
                 php:
-                    - '7.4'
-                    - '8.0'
-                    - '8.1'
+                    - '8.3'
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
 
             - name: Setup PHP Action
               uses: shivammathur/setup-php@v2
@@ -57,9 +55,9 @@ jobs:
                   extensions: pdo_sqlite, gd
                   tools: cs2pr
 
-            - uses: "ramsey/composer-install@v1"
+            - uses: ramsey/composer-install@v3
               with:
-                  dependency-versions: "highest"
+                  dependency-versions: highest
 
             - name: Setup problem matchers for PHPUnit
               run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
@@ -90,19 +88,17 @@ jobs:
                     --health-timeout 5s
                     --health-retries 5
                     --tmpfs /var/lib/postgres
-        runs-on: "ubuntu-20.04"
+        runs-on: "ubuntu-22.04"
         timeout-minutes: 60
 
         strategy:
             fail-fast: false
             matrix:
                 php:
-                    - '7.4'
-                    - '8.0'
-                    - '8.1'
+                    - '8.3'
 
         steps:
-            -   uses: actions/checkout@v2
+            -   uses: actions/checkout@v4
 
             -   name: Setup PHP Action
                 uses: shivammathur/setup-php@v2
@@ -112,9 +108,9 @@ jobs:
                     extensions: pdo_pgsql, gd
                     tools: cs2pr
 
-            -   uses: "ramsey/composer-install@v1"
+            -   uses: ramsey/composer-install@v3
                 with:
-                    dependency-versions: "highest"
+                    dependency-versions: highest
 
             -   name: Setup problem matchers for PHPUnit
                 run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
@@ -145,19 +141,17 @@ jobs:
                     --health-timeout=5s
                     --health-retries=5
                     --tmpfs=/var/lib/mysql
-        runs-on: "ubuntu-20.04"
+        runs-on: "ubuntu-22.04"
         timeout-minutes: 60
 
         strategy:
             fail-fast: false
             matrix:
                 php:
-                    - '7.4'
-                    - '8.0'
-                    - '8.1'
+                    - '8.3'
 
         steps:
-            -   uses: actions/checkout@v2
+            -   uses: actions/checkout@v4
 
             -   name: Setup PHP Action
                 uses: shivammathur/setup-php@v2
@@ -167,9 +161,9 @@ jobs:
                     extensions: pdo_mysql, gd, redis
                     tools: cs2pr
 
-            -   uses: "ramsey/composer-install@v1"
+            -   uses: ramsey/composer-install@v3
                 with:
-                    dependency-versions: "highest"
+                    dependency-versions: highest
 
             -   name: Setup problem matchers for PHPUnit
                 run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
@@ -182,7 +176,7 @@ jobs:
 
     solr-integration:
         name: "Solr integration tests"
-        runs-on: "ubuntu-20.04"
+        runs-on: "ubuntu-22.04"
         timeout-minutes: 30
         permissions:
             packages: read
@@ -207,11 +201,9 @@ jobs:
             fail-fast: false
             matrix:
                 php:
-                    - '7.4'
-                    - '8.0'
-                    - '8.1'
+                    - '8.3'
         steps:   
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
               with:
                   fetch-depth: 0
 
@@ -226,9 +218,9 @@ jobs:
                 VERSION=$(jq -r '.extra | ."branch-alias" | ."dev-main"' < composer.json)
                 composer require --no-update "ibexa/solr:$VERSION"
 
-            - uses: "ramsey/composer-install@v1"
+            - uses: ramsey/composer-install@v3
               with:
-                  dependency-versions: "highest"
+                  dependency-versions: highest
 
             - name: Run integration test suite
               run: composer test-integration-solr

.github/workflows/gha-docker-solr.yaml

@@ -15,7 +15,7 @@ env:
 
 jobs:
     build-and-publish:
-        runs-on: "ubuntu-20.04"
+        runs-on: "ubuntu-22.04"
         permissions:
             packages: write
         services:
@@ -42,17 +42,17 @@ jobs:
             - name: Setup PHP Action
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: 7.4
+                  php-version: 8.3
                   coverage: none
 
             - name: Add solr dependency
               run: |
                 VERSION=$(jq -r '.extra | ."branch-alias" | ."dev-main"' < composer.json)
                 composer require --no-update "ibexa/solr:$VERSION"
 
-            - uses: "ramsey/composer-install@v2"
+            - uses: ramsey/composer-install@v3
               with:
-                  dependency-versions: "highest"
+                  dependency-versions: highest
 
             - name: Run integration test suite
               run: composer test-integration-solr
@@ -71,4 +71,3 @@ jobs:
 
             - name: Push image
               run: docker push "$IMAGE_NAME"
-

composer.json

@@ -12,6 +12,7 @@
         "ext-fileinfo": "*",
         "ext-intl": "*",
         "ext-json": "*",
+        "ext-libxml": "*",
         "ext-mbstring": "*",
         "ext-PDO": "*",
         "ext-SPL": "*",
@@ -38,7 +39,7 @@
         "symfony/expression-language": "^5.3.0",
         "symfony/validator": "^5.3.0",
         "symfony/var-dumper": "^5.3.0",
-        "ibexa/doctrine-schema": "~4.6.0@dev",
+        "ibexa/doctrine-schema": "~5.0.0@dev",
         "symfony-cmf/routing": "^2.3",
         "guzzlehttp/guzzle": "^6.5",
         "php-http/guzzle6-adapter": "^2.0",
@@ -98,20 +99,7 @@
             "Ibexa\\Core\\": "src/lib",
             "Ibexa\\Tests\\Core\\": "tests/lib",
             "Ibexa\\Tests\\Integration\\Core\\": "tests/integration/Core",
-            "Ibexa\\Tests\\Bundle\\Core\\": "tests/bundle/Core",
-            "eZ\\Publish\\API\\Repository\\Tests\\": "src/contracts/Test/Repository",
-            "eZ\\Publish\\SPI\\Tests\\": "src/contracts/Test",
-            "eZ\\Publish\\API\\": "src/contracts",
-            "eZ\\Publish\\SPI\\": "src/contracts",
-            "eZ\\Publish\\Core\\": "src/lib",
-            "eZ\\Bundle\\EzPublishCoreBundle\\": "src/bundle/Core",
-            "eZ\\Bundle\\EzPublishDebugBundle\\": "src/bundle/Debug",
-            "eZ\\Bundle\\EzPublishIOBundle\\": "src/bundle/IO",
-            "eZ\\Bundle\\EzPublishLegacySearchEngineBundle\\": "src/bundle/LegacySearchEngine",
-            "eZ\\Bundle\\EzPublishCoreBundle\\Tests\\": "tests/bundle/Core",
-            "eZ\\Publish\\Core\\MVC\\Symfony\\Templating\\Tests\\": "tests/lib/MVC/Symfony/Templating",
-            "eZ\\Publish\\Core\\Persistence\\Legacy\\Tests\\": "tests/lib/Persistence/Legacy",
-            "EzSystems\\PlatformInstallerBundle\\": "src/bundle/RepositoryInstaller"
+            "Ibexa\\Tests\\Bundle\\Core\\": "tests/bundle/Core"
         }
     },
     "autoload-dev": {
@@ -158,7 +146,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "4.6.x-dev"
+            "dev-main": "5.0.x-dev"
         }
     }
 }

docker/solr/Dockerfile

@@ -7,6 +7,9 @@ RUN git clone --depth=1 https://github.com/ibexa/solr.git solr
 RUN ./solr/bin/generate-solr-config.sh --destination-dir=config --solr-version=8.6.3
 
 FROM solr:8.6.3
+LABEL org.opencontainers.image.source=https://github.com/ibexa/core/blob/main/docker/solr/Dockerfile
+LABEL org.opencontainers.image.description="Configured Ibexa Solr Bundle image, created by 'Build and publish Solr Docker image' GHA workflow"
+LABEL org.opencontainers.image.licenses=GPL-2.0-only
 USER root
 RUN rm -rf server/solr/configsets/_default/conf/*
 USER solr