From d1321817e4a465e3d4aedb5cf97ca2f2caf53b34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Niedzielski?= <pawel.niedzielski@ibexa.co>
Date: Wed, 9 Sep 2026 14:51:58 +0200
Subject: [PATCH 1/3] Build integration test schema through SchemaBuilderEvent

ibexa/test-core#43 rebuilds DatabaseSchemaHook on SchemaBuilderInterface::buildSchema()
instead of importing raw schema.yaml files, so the test kernel now has to register
DoctrineSchemaBundle (which provides SchemaBuilderInterface) and
IbexaRepositoryInstallerBundle (which holds core's own BuildSchemaSubscriber).
---
 tests/integration/IbexaTestKernel.php         |  2 --
 tests/integration/Resources/services.php      | 23 -------------
 tests/integration/UserSchemaFilesProvider.php | 33 -------------------
 3 files changed, 58 deletions(-)
 delete mode 100644 tests/integration/Resources/services.php
 delete mode 100644 tests/integration/UserSchemaFilesProvider.php

diff --git a/tests/integration/IbexaTestKernel.php b/tests/integration/IbexaTestKernel.php
index 5286809b..47558a6d 100644
--- a/tests/integration/IbexaTestKernel.php
+++ b/tests/integration/IbexaTestKernel.php
@@ -45,8 +45,6 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         parent::registerContainerConfiguration($loader);
 
-        $loader->load(__DIR__ . '/Resources/services.php');
-
         $loader->load(static function (ContainerBuilder $container): void {
             $container->setParameter('locale_fallback', 'en');
 
diff --git a/tests/integration/Resources/services.php b/tests/integration/Resources/services.php
deleted file mode 100644
index b9aec848..00000000
--- a/tests/integration/Resources/services.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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);
-
-namespace Symfony\Component\DependencyInjection\Loader\Configurator;
-
-use Ibexa\Contracts\Test\Core\Bootstrapper\DefaultSchemaFilesProvider;
-use Ibexa\Contracts\Test\Core\Bootstrapper\SchemaFilesProviderInterface;
-use Ibexa\Tests\Integration\User\UserSchemaFilesProvider;
-
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $containerConfigurator->services()
-        ->set(UserSchemaFilesProvider::class)
-        ->args([
-            service(DefaultSchemaFilesProvider::class),
-            service('kernel'),
-        ])
-        ->tag(SchemaFilesProviderInterface::TAG, ['priority' => 200]);
-};
diff --git a/tests/integration/UserSchemaFilesProvider.php b/tests/integration/UserSchemaFilesProvider.php
deleted file mode 100644
index cd24392d..00000000
--- a/tests/integration/UserSchemaFilesProvider.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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);
-
-namespace Ibexa\Tests\Integration\User;
-
-use Ibexa\Contracts\Test\Core\Bootstrapper\DefaultSchemaFilesProvider;
-use Ibexa\Contracts\Test\Core\Bootstrapper\SchemaFilesProviderInterface;
-use Symfony\Component\HttpKernel\KernelInterface;
-
-final class UserSchemaFilesProvider implements SchemaFilesProviderInterface
-{
-    private DefaultSchemaFilesProvider $defaultProvider;
-
-    private KernelInterface $kernel;
-
-    public function __construct(DefaultSchemaFilesProvider $defaultProvider, KernelInterface $kernel)
-    {
-        $this->defaultProvider = $defaultProvider;
-        $this->kernel = $kernel;
-    }
-
-    public function getSchemaFiles(): iterable
-    {
-        yield from $this->defaultProvider->getSchemaFiles();
-
-        yield $this->kernel->locateResource('@IbexaUserBundle/Resources/config/storage/schema.yaml');
-    }
-}

From 9772ba47a5eec1adafca7bbdcb75d79177edd882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Niedzielski?= <pawel.niedzielski@ibexa.co>
Date: Wed, 9 Sep 2026 14:51:58 +0200
Subject: [PATCH 2/3] TEMPORARY: Added dependencies.json to test against
 ibexa/test-core#43

Points CI at the branch that rebuilds DatabaseSchemaHook, so this PR's tests can run
before that PR merges. Must be removed before merging.
---
 dependencies.json | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 dependencies.json

diff --git a/dependencies.json b/dependencies.json
new file mode 100644
index 00000000..1c53db31
--- /dev/null
+++ b/dependencies.json
@@ -0,0 +1,11 @@
+{
+    "recipesEndpoint": "",
+    "packages": [
+        {
+            "requirement": "dev-database-schema-hook-schema-builder as 4.6.x-dev",
+            "repositoryUrl": "https://github.com/ibexa/test-core.git",
+            "package": "ibexa/test-core",
+            "shouldBeAddedAsVCS": false
+        }
+    ]
+}

From 4e1b286b3d5f536e31e58b73c6aa16d67c969ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Niedzielski?=
 <pawel.tadeusz.niedzielski@gmail.com>
Date: Thu, 10 Sep 2026 14:09:15 +0200
Subject: [PATCH 3/3] Removed temporary dependencies.json

ibexa/test-core is merged, so CI resolves it normally again.
---
 dependencies.json | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 dependencies.json

diff --git a/dependencies.json b/dependencies.json
deleted file mode 100644
index 1c53db31..00000000
--- a/dependencies.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "recipesEndpoint": "",
-    "packages": [
-        {
-            "requirement": "dev-database-schema-hook-schema-builder as 4.6.x-dev",
-            "repositoryUrl": "https://github.com/ibexa/test-core.git",
-            "package": "ibexa/test-core",
-            "shouldBeAddedAsVCS": false
-        }
-    ]
-}