IBX-11778,IBX-12358: Merged branch '5.0' into 6.0

.github/workflows/backend-ci.yaml

@@ -1,9 +1,8 @@
-name: CI
+name: Backend CI
 
 on:
   push:
     branches:
-      - main
       - '[0-9]+.[0-9]+'
   pull_request: ~
   workflow_dispatch:
@@ -29,43 +28,17 @@ jobs:
 
       - uses: ibexa/gh-workflows/actions/composer-install@main
         with:
+            php-version: ${{ matrix.php }}
             gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }}
             gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
             satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }}
             satis-network-token: ${{ secrets.SATIS_NETWORK_TOKEN }}
 
       - name: Run code style check
-        run: composer run-script check-cs -- --format=checkstyle | cs2pr
-
-  rector:
-    name: Run rector
-    runs-on: "ubuntu-26.04"
-    strategy:
-      matrix:
-        php:
-          - '8.4'
-    steps:
-      -   uses: actions/checkout@v7
-
-      -   name: Setup PHP Action
-          uses: shivammathur/setup-php@v2
-          with:
-            php-version: ${{ matrix.php }}
-            coverage: none
-            extensions: 'pdo_sqlite, gd'
-            tools: cs2pr
-
-      -   uses: actions/checkout@v7
-
-      -   uses: ibexa/gh-workflows/actions/composer-install@main
-          with:
-              gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }}
-              gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
-              satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }}
-              satis-network-token: ${{ secrets.SATIS_NETWORK_TOKEN }}
-
-      - name: Run rector
-        run: vendor/bin/rector process --dry-run --ansi
+        shell: bash
+        run: |
+          set -euo pipefail
+          composer run-script check-cs -- --format=checkstyle | cs2pr
 
   deptrac:
     name: Deptrac
@@ -80,6 +53,7 @@ jobs:
 
       - uses: ibexa/gh-workflows/actions/composer-install@main
         with:
+            php-version: ${{ matrix.php }}
             gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }}
             gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
             satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }}
@@ -106,6 +80,7 @@ jobs:
 
       - uses: ibexa/gh-workflows/actions/composer-install@main
         with:
+            php-version: ${{ matrix.php }}
             gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }}
             gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
             satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }}
@@ -154,6 +129,7 @@ jobs:
 
       -   uses: ibexa/gh-workflows/actions/composer-install@main
           with:
+              php-version: ${{ matrix.php }}
               gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }}
               gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
               satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }}
@@ -206,6 +182,7 @@ jobs:
 
       -   uses: ibexa/gh-workflows/actions/composer-install@main
           with:
+              php-version: ${{ matrix.php }}
               gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }}
               gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
               satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }}
@@ -226,7 +203,7 @@ jobs:
     name: Notify Slack
     needs: [cs-fix, tests, integration-tests-postgres, integration-tests-mysql]
     if: always() && github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-26.04
+    runs-on: "ubuntu-26.04"
     steps:
       - name: Determine overall result
         id: result
@@ -250,7 +227,7 @@ jobs:
 
       - name: Send Slack notification
         if: steps.result.outputs.state == 'failure' || inputs.send-success-notification
-        uses: slackapi/slack-github-action@45a88b9581bfab2566dc881e2cd66d334e621e2c # v3.0.3
+        uses: slackapi/slack-github-action@dcb1066f776dd043e64d0e8ba94ca15cc7e1875d # v4.0.0
         with:
           webhook: ${{ secrets.SLACK_PHP_BACKEND_CI_WEBHOOK_URL }}
           webhook-type: incoming-webhook

.github/workflows/browser-tests.yaml

@@ -3,7 +3,6 @@ name: Browser tests
 on:
     push:
         branches:
-            - main
             - '[0-9]+.[0-9]+'
     pull_request: ~
 

.github/workflows/frontend-ci.yaml

@@ -11,7 +11,6 @@ on:
             - "**.tsx"
             - "**.scss"
         branches:
-            - main
             - '[0-9]+.[0-9]+'
     pull_request:
         paths:
@@ -31,12 +30,13 @@ jobs:
 
         steps:
             - uses: actions/checkout@v7
-            - uses: actions/setup-node@v6
+            - uses: actions/setup-node@v7
               with:
                   node-version: '24'
             - uses: ibexa/gh-workflows/actions/setup-composer-root-version@main
             - uses: ibexa/gh-workflows/actions/composer-install@main
               with:
+                  php-version: '8.4'
                   gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }}
                   gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
                   satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }}

.github/workflows/rector.yaml

@@ -0,0 +1,17 @@
+name: Rector PHP
+on:
+    push:
+        branches:
+            - '[0-9]+.[0-9]+'
+    pull_request: ~
+jobs:
+    rector:
+        name: Run rector
+        uses: ibexa/gh-workflows/.github/workflows/rector.yml@main
+        with:
+            php-version: '8.3'
+        secrets:
+            AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }}
+            AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
+            SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }}
+            SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }}

tests/integration/AdminUiIbexaTestKernel.php

@@ -17,6 +17,7 @@
 use Ibexa\Bundle\Notifications\IbexaNotificationsBundle;
 use Ibexa\Bundle\Rest\IbexaRestBundle;
 use Ibexa\Bundle\Search\IbexaSearchBundle;
+use Ibexa\Bundle\Test\Core\IbexaTestCoreBundle;
 use Ibexa\Bundle\Test\Rest\IbexaTestRestBundle;
 use Ibexa\Bundle\Translations\IbexaTranslationsBundle;
 use Ibexa\Bundle\TwigComponents\IbexaTwigComponentsBundle;
@@ -43,6 +44,9 @@ public function registerBundles(): iterable
     {
         yield from parent::registerBundles();
 
+        // required by Bootstrapper: provides HooksExecutorInterface and the built-in hooks
+        yield new IbexaTestCoreBundle();
+
         yield new HautelookTemplatedUriBundle();
         yield new KnpMenuBundle();
         yield new WebpackEncoreBundle();

tests/integration/bootstrap.php

@@ -6,48 +6,17 @@
  */
 declare(strict_types=1);
 
-use Ibexa\Contracts\Core\Test\Persistence\Fixture\FixtureImporter;
-use Ibexa\Tests\Core\Repository\LegacySchemaImporter;
-use Ibexa\Tests\Integration\AdminUi\AdminUiIbexaTestKernel;
-use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Component\Console\Input\ArrayInput;
+use Ibexa\Contracts\Test\Core\Bootstrapper\Bootstrapper;
 
 $packageRoot = dirname(__DIR__, 2);
 require_once $packageRoot . '/vendor/autoload.php';
 
 chdir($packageRoot);
 
-$kernel = new AdminUiIbexaTestKernel('test', true);
-$kernel->boot();
-
-$application = new Application($kernel);
-$application->setAutoExit(false);
-
-$databaseUrl = getenv('DATABASE_URL');
-if ($databaseUrl !== false && 'sqlite' !== substr($databaseUrl, 0, 6)) {
-    $application->run(new ArrayInput([
-        'command' => 'doctrine:database:drop',
-        '--if-exists' => '1',
-        '--force' => '1',
-        '--quiet' => true,
-    ]));
-}
-
-$application->run(new ArrayInput([
-    'command' => 'doctrine:database:create',
-    '--quiet' => true,
-]));
-
-/** @var \Psr\Container\ContainerInterface $testContainer */
-$testContainer = $kernel->getContainer()->get('test.service_container');
-
-$schemaImporter = $testContainer->get(LegacySchemaImporter::class);
-foreach ($kernel->getSchemaFiles() as $file) {
-    $schemaImporter->importSchema($file);
-}
-
-$fixtureImporter = $testContainer->get(FixtureImporter::class);
-foreach ($kernel->getFixtures() as $fixture) {
-    $fixtureImporter->import($fixture);
-}
-$kernel->shutdown();
+(new Bootstrapper())->bootstrap(null, [
+    Bootstrapper::class => [
+        // this package's tests never ran doctrine:schema:update, and Bootstrapper enables it by
+        // default; keep it off so the bootstrap stays equivalent
+        Bootstrapper::OPTION_SCHEMA_UPDATE => false,
+    ],
+]);