IBX-9947: Rebranded field type identifiers (#41)

barw4 · web-flow · commit 2c4bfe61434d · 2025-06-06T06:36:02.000+02:00
diff --git a/spec/GraphQL/ContentQueryFieldDefinitionMapperSpec.php b/spec/GraphQL/ContentQueryFieldDefinitionMapperSpec.php
@@ -18,7 +18,7 @@
 class ContentQueryFieldDefinitionMapperSpec extends ObjectBehavior
 {
     public const FIELD_IDENTIFIER = 'test';
-    public const FIELD_TYPE_IDENTIFIER = 'ezcontentquery';
+    public const FIELD_TYPE_IDENTIFIER = 'ibexa_content_query';
     public const RETURNED_CONTENT_TYPE_IDENTIFIER = 'folder';
     public const GRAPHQL_TYPE = 'FolderContent';
 
diff --git a/spec/QueryFieldServiceSpec.php b/spec/QueryFieldServiceSpec.php
@@ -148,7 +148,7 @@ private function getContentType(array $parameters, bool $enablePagination = true
             'fieldDefinitions' => new Values\ContentType\FieldDefinitionCollection([
                 new Values\ContentType\FieldDefinition([
                     'identifier' => self::FIELD_DEFINITION_IDENTIFIER,
-                    'fieldTypeIdentifier' => 'ezcontentquery',
+                    'fieldTypeIdentifier' => 'ibexa_content_query',
                     'fieldSettings' => [
                         'ReturnedType' => 'folder',
                         'QueryType' => self::QUERY_TYPE_IDENTIFIER,
diff --git a/src/bundle/DependencyInjection/Compiler/ConfigurableFieldDefinitionMapperPass.php b/src/bundle/DependencyInjection/Compiler/ConfigurableFieldDefinitionMapperPass.php
@@ -28,7 +28,7 @@ public function process(ContainerBuilder $container): void
         if (!is_array($parameter)) {
             return;
         }
-        $parameter['ezcontentquery'] = [
+        $parameter['ibexa_content_query'] = [
             'definition_type' => 'QueryFieldDefinition',
             'value_resolver' => 'resolver("QueryFieldValue", [field, content])',
         ];
diff --git a/src/bundle/DependencyInjection/IbexaFieldTypeQueryExtension.php b/src/bundle/DependencyInjection/IbexaFieldTypeQueryExtension.php
@@ -63,7 +63,7 @@ protected function prependTwigConfig(ContainerBuilder $container): void
     {
         $views = Yaml::parseFile(__DIR__ . '/../Resources/config/default_parameters.yaml')['parameters'];
         $twigGlobals = [
-            'ezContentQueryViews' => [
+            'ibexaContentQueryViews' => [
                 'field' => $views['ibexa.field_type.query.content.view.field'],
                 'item' => $views['ibexa.field_type.query.content.view.item'],
             ],
diff --git a/src/bundle/Resources/config/default_parameters.yaml b/src/bundle/Resources/config/default_parameters.yaml
@@ -1,4 +1,5 @@
 parameters:
     ibexa.field_type.query.content.view.field: 'content_query_field'
     ibexa.field_type.query.content.view.item: 'line'
-    ibexa.field_type.query.content.identifier: 'ezcontentquery'
+    ibexa.field_type.query.content.identifier: 'ibexa_content_query'
+    ibexa.field_type.query.content.legacy_identifier: 'ezcontentquery'
diff --git a/src/bundle/Resources/config/services/ezplatform.yaml b/src/bundle/Resources/config/services/ezplatform.yaml
@@ -10,7 +10,7 @@ services:
         autowire: true
         autoconfigure: false
         tags:
-            - { name: ibexa.field_type, alias: '%ibexa.field_type.query.content.identifier%' }
+            - { name: ibexa.field_type, alias: '%ibexa.field_type.query.content.identifier%', legacy_alias: '%ibexa.field_type.query.content.legacy_identifier%' }
         arguments:
             $queryTypeRegistry: '@Ibexa\Core\QueryType\ArrayQueryTypeRegistry'
             $identifier: '%ibexa.field_type.query.content.identifier%'
diff --git a/src/bundle/Resources/translations/ibexa_fielddefinition.en.xliff b/src/bundle/Resources/translations/ibexa_fielddefinition.en.xliff
@@ -6,15 +6,15 @@
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
     </header>
     <body>
-      <trans-unit id="63bb25b1f9154e4a451f0940afacd58edd948f45" resname="ezcontentquery.no_defined_query_types">
+      <trans-unit id="63bb25b1f9154e4a451f0940afacd58edd948f45" resname="ibexa_content_query.no_defined_query_types">
         <source>There are no query types defined</source>
         <target state="new">There are no query types defined</target>
-        <note>key: ezcontentquery.no_defined_query_types</note>
+        <note>key: ibexa_content_query.no_defined_query_types</note>
       </trans-unit>
-      <trans-unit id="95e9fc9f8e314bbd35a18372cd7888be0a1ec1e0" resname="ezcontentquery.query_type.label">
+      <trans-unit id="95e9fc9f8e314bbd35a18372cd7888be0a1ec1e0" resname="ibexa_content_query.query_type.label">
         <source>Query type:</source>
         <target state="new">Query type:</target>
-        <note>key: ezcontentquery.query_type.label</note>
+        <note>key: ibexa_content_query.query_type.label</note>
       </trans-unit>
     </body>
   </file>
diff --git a/src/bundle/Resources/translations/ibexa_fieldtypes.en.xliff b/src/bundle/Resources/translations/ibexa_fieldtypes.en.xliff
@@ -6,10 +6,10 @@
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
     </header>
     <body>
-      <trans-unit id="c4d6ec2588a701ed1c113080b07918e3452b628b" resname="ezcontentquery.name">
+      <trans-unit id="c4d6ec2588a701ed1c113080b07918e3452b628b" resname="ibexa_content_query.name">
         <source>Content query</source>
         <target state="new">Content query</target>
-        <note>key: ezcontentquery.name</note>
+        <note>key: ibexa_content_query.name</note>
       </trans-unit>
     </body>
   </file>
diff --git a/src/bundle/Resources/views/fieldtype/field_view.html.twig b/src/bundle/Resources/views/fieldtype/field_view.html.twig
@@ -1,14 +1,14 @@
 {% extends '@IbexaCore/content_fields.html.twig' %}
 
-{% block ezcontentquery_field %}
+{% block ibexa_content_query_field %}
 {{ render(controller(
     "ibexa_content::viewAction",
     {
         "content": content,
         "location": location ?? null,
         "queryFieldDefinitionIdentifier": field.fieldDefIdentifier,
-        "viewType": ezContentQueryViews['field'],
-        "itemViewType": itemViewType|default(ezContentQueryViews['item']),
+        "viewType": ibexaContentQueryViews['field'],
+        "itemViewType": itemViewType|default(ibexaContentQueryViews['item']),
         "enablePagination": parameters.enablePagination|default(false),
         "disablePagination": parameters.disablePagination|default(false),
         "itemsPerPage": parameters.itemsPerPage|default(false)
diff --git a/src/bundle/Resources/views/fieldtype/fielddefinition_edit.html.twig b/src/bundle/Resources/views/fieldtype/fielddefinition_edit.html.twig
@@ -1,4 +1,4 @@
-{% block ezcontentquery_field_definition_edit %}
+{% block ibexa_content_query_field_definition_edit %}
     <div class="query-query-type{% if group_class is not empty %} {{ group_class }}{% endif %}">
         {{- form_label(form.QueryType) -}}
         {{- form_widget(form.QueryType) -}}
diff --git a/src/bundle/Resources/views/fieldtype/fielddefinition_settings.html.html.twig b/src/bundle/Resources/views/fieldtype/fielddefinition_settings.html.html.twig
@@ -2,12 +2,12 @@
 
 {% block ezcontentquery_settings %}
     <li class="ibexa-fielddefinition-setting query-type">
-        <div class="ibexa-fielddefinition-setting-name">{{ 'ezcontentquery.query_type.label'|trans|desc("Query type:")}}</div>
+        <div class="ibexa-fielddefinition-setting-name">{{ 'ibexa_content_query.query_type.label'|trans|desc("Query type:")}}</div>
         <div class="ibexa-fielddefinition-setting-value">
             {% if fielddefinition.fieldSettings.QueryType %}
                 {{ fielddefinition.fieldSettings.QueryType }}
             {% else %}
-                <em>{{ "ezcontentquery.no_defined_query_types"|trans()|desc("There are no query types defined") }}</em>
+                <em>{{ "ibexa_content_query.no_defined_query_types"|trans()|desc("There are no query types defined") }}</em>
             {% endif %}
         </div>
     </li>
diff --git a/src/lib/FieldType/Form/QueryFieldFormType.php b/src/lib/FieldType/Form/QueryFieldFormType.php
@@ -42,6 +42,6 @@ public function getParent(): ?string
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        $builder->addModelTransformer(new FieldValueTransformer($this->fieldTypeService->getFieldType('ezcontentquery')));
+        $builder->addModelTransformer(new FieldValueTransformer($this->fieldTypeService->getFieldType('ibexa_content_query')));
     }
 }
diff --git a/src/lib/FieldType/Query/Type.php b/src/lib/FieldType/Query/Type.php
@@ -204,7 +204,7 @@ public function validateFieldSettings($fieldSettings)
     public static function getTranslationMessages(): array
     {
         return [
-            Message::create('ezcontentquery.name', 'ibexa_fieldtypes')->setDesc('Content query'),
+            Message::create('ibexa_content_query.name', 'ibexa_fieldtypes')->setDesc('Content query'),
         ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`class ContentQueryFieldDefinitionMapperSpec extends ObjectBehavior`
`19`	`19`	`{`
`20`	`20`	`public const FIELD_IDENTIFIER = 'test';`
`21`		`- public const FIELD_TYPE_IDENTIFIER = 'ezcontentquery';`
	`21`	`+ public const FIELD_TYPE_IDENTIFIER = 'ibexa_content_query';`
`22`	`22`	`public const RETURNED_CONTENT_TYPE_IDENTIFIER = 'folder';`
`23`	`23`	`public const GRAPHQL_TYPE = 'FolderContent';`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function process(ContainerBuilder $container): void`
`28`	`28`	`if (!is_array($parameter)) {`
`29`	`29`	`return;`
`30`	`30`	`}`
`31`		`- $parameter['ezcontentquery'] = [`
	`31`	`+ $parameter['ibexa_content_query'] = [`
`32`	`32`	`'definition_type' => 'QueryFieldDefinition',`
`33`	`33`	`'value_resolver' => 'resolver("QueryFieldValue", [field, content])',`
`34`	`34`	`];`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ protected function prependTwigConfig(ContainerBuilder $container): void`
`63`	`63`	`{`
`64`	`64`	`$views = Yaml::parseFile(__DIR__ . '/../Resources/config/default_parameters.yaml')['parameters'];`
`65`	`65`	`$twigGlobals = [`
`66`		`- 'ezContentQueryViews' => [`
	`66`	`+ 'ibexaContentQueryViews' => [`
`67`	`67`	`'field' => $views['ibexa.field_type.query.content.view.field'],`
`68`	`68`	`'item' => $views['ibexa.field_type.query.content.view.item'],`
`69`	`69`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% block ezcontentquery_field_definition_edit %}`
	`1`	`+{% block ibexa_content_query_field_definition_edit %}`
`2`	`2`	`<div class="query-query-type{% if group_class is not empty %} {{ group_class }}{% endif %}">`
`3`	`3`	`{{- form_label(form.QueryType) -}}`
`4`	`4`	`{{- form_widget(form.QueryType) -}}`