From 2c7b826956d6c4f9d87926d368890477b819ce0d Mon Sep 17 00:00:00 2001 From: Bartek Wajda Date: Wed, 19 Nov 2025 14:05:11 +0100 Subject: [PATCH 1/2] [CI]: Fixed merge-up of IBX-10936 --- src/lib/ContentType/ContentTypeFieldsByExpressionService.php | 2 -- tests/integration/Resources/ibexa.yaml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/ContentType/ContentTypeFieldsByExpressionService.php b/src/lib/ContentType/ContentTypeFieldsByExpressionService.php index d1b22a1dd8..1cc6689bb9 100644 --- a/src/lib/ContentType/ContentTypeFieldsByExpressionService.php +++ b/src/lib/ContentType/ContentTypeFieldsByExpressionService.php @@ -10,12 +10,10 @@ use Ibexa\AdminUi\Util\ContentTypeFieldsExtractorInterface; use Ibexa\Contracts\AdminUi\ContentType\ContentTypeFieldsByExpressionServiceInterface; -use Ibexa\Contracts\Core\Persistence\Content\Language\Handler as ContentLanguageHandler; use Ibexa\Contracts\Core\Persistence\Content\Type\Handler as ContentTypeHandler; use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition; use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; -use Ibexa\Core\FieldType\FieldTypeRegistry; use Ibexa\Core\Repository\Mapper\ContentTypeDomainMapper; final readonly class ContentTypeFieldsByExpressionService implements ContentTypeFieldsByExpressionServiceInterface diff --git a/tests/integration/Resources/ibexa.yaml b/tests/integration/Resources/ibexa.yaml index e51e5c011a..bb34fb52e6 100644 --- a/tests/integration/Resources/ibexa.yaml +++ b/tests/integration/Resources/ibexa.yaml @@ -4,5 +4,5 @@ ibexa: languages: [ eng-GB, ger-DE ] content_type_field_type_groups: configurations: - vectorizable_fields: [ezstring, eztext] - datetime_fields: [ezdatetime] + vectorizable_fields: [ibexa_string, ibexa_text] + datetime_fields: [ibexa_datetime] From 00859bb1c4e31e70e991343246e76a5e5be24996 Mon Sep 17 00:00:00 2001 From: Bartek Wajda Date: Wed, 19 Nov 2025 14:16:47 +0100 Subject: [PATCH 2/2] [CI]: Fixup --- .../Service/ContentTypeFieldsByExpressionServiceTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/Service/ContentTypeFieldsByExpressionServiceTest.php b/tests/integration/Service/ContentTypeFieldsByExpressionServiceTest.php index 6d9e0dd3b3..78eb83a318 100644 --- a/tests/integration/Service/ContentTypeFieldsByExpressionServiceTest.php +++ b/tests/integration/Service/ContentTypeFieldsByExpressionServiceTest.php @@ -50,7 +50,7 @@ public function testExtractWithConfiguration(): void 'vectorizable_fields', ); - $expectedFieldTypes = ['ezstring', 'eztext']; + $expectedFieldTypes = ['ibexa_string', 'ibexa_text']; foreach ($extractedFieldDefinitions as $fieldDefinition) { self::assertContains($fieldDefinition->fieldTypeIdentifier, $expectedFieldTypes);