From 7cff3052fc615ed0e134ea923e901d35bcfbcc4f Mon Sep 17 00:00:00 2001
From: Dawid Parafinski <dawid.parafinski@ibexa.co>
Date: Wed, 23 Sep 2026 08:43:30 +0200
Subject: [PATCH 1/6] IBX-12046: Removed the service definition of the
 non-existent Search\DateIntervalType form type

---
 src/bundle/Resources/config/services/forms.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/bundle/Resources/config/services/forms.yaml b/src/bundle/Resources/config/services/forms.yaml
index d7f1dcdc11..afc220c3fa 100644
--- a/src/bundle/Resources/config/services/forms.yaml
+++ b/src/bundle/Resources/config/services/forms.yaml
@@ -282,8 +282,6 @@ services:
 
     Ibexa\AdminUi\Form\Type\RoleAssignment\RoleAssignmentType: ~
 
-    Ibexa\AdminUi\Form\Type\Search\DateIntervalType: ~
-
     Ibexa\AdminUi\Form\Type\Search\SearchType:
         arguments:
             $baseType: '@Ibexa\Bundle\Search\Form\Type\SearchType'

From 2d558f091581fca243c548dd61acbc00e3cf5a27 Mon Sep 17 00:00:00 2001
From: Dawid Parafinski <dawid.parafinski@ibexa.co>
Date: Wed, 23 Sep 2026 10:01:31 +0200
Subject: [PATCH 2/6] IBX-12046: Regenerated the deprecation baseline

---
 phpunit.integration.baseline.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phpunit.integration.baseline.xml b/phpunit.integration.baseline.xml
index 4c1460102f..cca0fda512 100644
--- a/phpunit.integration.baseline.xml
+++ b/phpunit.integration.baseline.xml
@@ -9,7 +9,6 @@
    <issue><![CDATA[Since symfony/twig-component-bundle 2.13: Not setting the "twig_component.anonymous_template_directory" config option is deprecated. It will default to "components" in 3.0.]]></issue>
    <issue><![CDATA[Since symfony/ux-twig-component 2.13: Not setting the "twig_component.defaults" config option is deprecated. Check the documentation for an example configuration.]]></issue>
    <issue><![CDATA[Since symfony/dependency-injection 7.4: Service id "Ibexa\Rest\Server\Common\Parser" looks like a FQCN but no corresponding class or interface exists. To resolve this ambiguity, please rename this service to a non-FQCN (e.g. using dots), or create the missing class or interface.]]></issue>
-   <issue><![CDATA[Since symfony/dependency-injection 7.4: Service id "Ibexa\AdminUi\Form\Type\Search\DateIntervalType" looks like a FQCN but no corresponding class or interface exists. To resolve this ambiguity, please rename this service to a non-FQCN (e.g. using dots), or create the missing class or interface.]]></issue>
    <issue><![CDATA[Since symfony/config 7.4: Setting a default value to a required node is deprecated. Remove the default value from the node "min_query_length" or make it optional.]]></issue>
    <issue><![CDATA[Since symfony/config 7.4: Setting a default value to a required node is deprecated. Remove the default value from the node "result_limit" or make it optional.]]></issue>
    <issue><![CDATA[Since symfony/framework-bundle 7.3: Not setting the "property_info.with_constructor_extractor" option explicitly is deprecated because its default value will change in version 8.0.]]></issue>

From 2aba97f4d8938a3623743cb9a690d294e5ea0831 Mon Sep 17 00:00:00 2001
From: Dawid Parafinski <dawid.parafinski@ibexa.co>
Date: Wed, 23 Sep 2026 10:40:09 +0200
Subject: [PATCH 3/6] IBX-12046: Moved the Twig use and macro tags to the
 template root

---
 .../tab/url/modal_add_custom_url.html.twig    | 20 +++++++++----------
 .../themes/admin/ui/form_fields.html.twig     |  2 --
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig
index 8826b4aac0..44d5cd689c 100644
--- a/src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig
@@ -1,5 +1,14 @@
 {% trans_default_domain 'ibexa_content_url' %}
 
+{% macro info_text(message, modifier = '') %}
+    <div class="ibexa-custom-url-from__info-text{{ modifier ? ' ibexa-custom-url-from__info-text--' ~ modifier : '' }}">
+        <svg class="ibexa-icon ibexa-icon--small">
+            <use xlink:href="{{ ibexa_icon_path('system-information') }}"></use>
+        </svg>
+        {{ message }}
+    </div>
+{% endmacro %}
+
 {% embed '@ibexadesign/ui/component/modal/modal.html.twig' with {
     title: 'tab.urls.add.title'|trans|desc('Create a new URL alias'),
     class: 'ibexa-modal--custom-url-alias',
@@ -13,16 +22,7 @@
         {{ form_start(form, {'action': path('ibexa.custom_url.add')}) }}
     {% endblock %}
     {% block body_content %}
-        {% macro info_text(message, modifier = '') %}
-            <div class="ibexa-custom-url-from__info-text{{ modifier ? ' ibexa-custom-url-from__info-text--' ~ modifier : '' }}">
-                <svg class="ibexa-icon ibexa-icon--small">
-                    <use xlink:href="{{ ibexa_icon_path('system-information') }}"></use>
-                </svg>
-                {{ message }}
-            </div>
-        {% endmacro %}
-
-        {% import _self as component %}
+        {% import '@ibexadesign/content/tab/url/modal_add_custom_url.html.twig' as component %}
 
         <div class="ibexa-custom-url-from">
             <div class="ibexa-custom-url-from__item">
diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
index aa1a4125f0..fc780bab12 100644
--- a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
@@ -556,8 +556,6 @@
 {%- endblock %}
 
 {% block content_type_meta_field_definition_enabled_row -%}
-    {% use '@ibexadesign/ui/form_fields/toggle_widget_ds.html.twig' %}
-
     <div class="ibexa-content-type-edit__form-field ibexa-form-field form-group">
         {{ block('form_label') }}
         {{ block('toggle_widget') }}

From ae17686de84d47cbd880303f11dc6294ef6880f4 Mon Sep 17 00:00:00 2001
From: Dawid Parafinski <dawid.parafinski@ibexa.co>
Date: Wed, 23 Sep 2026 10:40:09 +0200
Subject: [PATCH 4/6] IBX-12046: Rendered the edit header info bar extras with
 ibexa_twig_component_group

---
 .../Resources/views/themes/admin/ui/edit_header.html.twig       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/edit_header.html.twig b/src/bundle/Resources/views/themes/admin/ui/edit_header.html.twig
index 80be5b256c..2ce9a311b6 100644
--- a/src/bundle/Resources/views/themes/admin/ui/edit_header.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/edit_header.html.twig
@@ -28,7 +28,7 @@
                 {% endif %}
 
                 {% block after_action_name %}
-                    {{ ibexa_render_component_group('content-form-edit-header-info-bar-extras', {}) }}
+                    {{ ibexa_twig_component_group('content-form-edit-header-info-bar-extras', {}) }}
                 {% endblock %}
             </div>
         </div>

From fa225b5fedac03f97609f2da61d003c26282aed6 Mon Sep 17 00:00:00 2001
From: Dawid Parafinski <dawid.parafinski@ibexa.co>
Date: Wed, 23 Sep 2026 10:40:37 +0200
Subject: [PATCH 5/6] IBX-12046: Removed the fixed template deprecations from
 the baseline

---
 phpunit.integration.baseline.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/phpunit.integration.baseline.xml b/phpunit.integration.baseline.xml
index cca0fda512..269257a9c9 100644
--- a/phpunit.integration.baseline.xml
+++ b/phpunit.integration.baseline.xml
@@ -18,9 +18,6 @@
    <issue><![CDATA[Since ibexa/core 5.0: Since ibexa/core 5.0: The "Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider" service is deprecated and will be removed in 6.0. Use Ibexa\Contracts\Core\Container\ApiLoader\RepositoryConfigurationProviderInterface instead]]></issue>
    <issue><![CDATA[Since ibexa/core 5.0: Since ibexa/core 5.0: The "Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider" service is deprecated and will be removed in 6.0. Use Ibexa\Contracts\Core\Container\ApiLoader\RepositoryConfigurationProviderInterface instead]]></issue>
    <issue><![CDATA[Since ibexa/core 5.0: Since ibexa/core 5.0: The "Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider" service is deprecated and will be removed in 6.0. Use Ibexa\Contracts\Core\Container\ApiLoader\RepositoryConfigurationProviderInterface instead]]></issue>
-   <issue><![CDATA[Since twig/twig 3.28: Using the "use" tag outside the root of a template is deprecated in /home/runner/work/admin-ui/admin-ui/src/bundle/DependencyInjection/../../../src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig at line 551.]]></issue>
-   <issue><![CDATA[Since ibexa/admin-ui 4.6.19: Twig Function "ibexa_render_component_group" is deprecated; use "ibexa_twig_component_group" instead in /home/runner/work/admin-ui/admin-ui/src/bundle/DependencyInjection/../../../src/bundle/Resources/views/themes/admin/ui/edit_header.html.twig at line 31.]]></issue>
-   <issue><![CDATA[Since twig/twig 3.28: Using the "macro" tag outside the root of a template is deprecated in /home/runner/work/admin-ui/admin-ui/src/bundle/DependencyInjection/../../../src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig at line 16.]]></issue>
   </line>
  </file>
  <file path="vendor/ibexa/core/src/bundle/Core/DependencyInjection/Compiler/SlugConverterConfigurationPass.php">

From ca5f650a907562910e66ed9eb07b5943c0480600 Mon Sep 17 00:00:00 2001
From: Dawid Parafinski <dawid.parafinski@ibexa.co>
Date: Wed, 23 Sep 2026 10:52:38 +0200
Subject: [PATCH 6/6] IBX-12046: Moved the custom URL info text macro to a
 dedicated macros template

---
 .../themes/admin/content/tab/url/macros.html.twig     |  8 ++++++++
 .../content/tab/url/modal_add_custom_url.html.twig    | 11 +----------
 2 files changed, 9 insertions(+), 10 deletions(-)
 create mode 100644 src/bundle/Resources/views/themes/admin/content/tab/url/macros.html.twig

diff --git a/src/bundle/Resources/views/themes/admin/content/tab/url/macros.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/url/macros.html.twig
new file mode 100644
index 0000000000..8313b942c9
--- /dev/null
+++ b/src/bundle/Resources/views/themes/admin/content/tab/url/macros.html.twig
@@ -0,0 +1,8 @@
+{% macro info_text(message, modifier = '') %}
+    <div class="ibexa-custom-url-from__info-text{{ modifier ? ' ibexa-custom-url-from__info-text--' ~ modifier : '' }}">
+        <svg class="ibexa-icon ibexa-icon--small">
+            <use xlink:href="{{ ibexa_icon_path('system-information') }}"></use>
+        </svg>
+        {{ message }}
+    </div>
+{% endmacro %}
diff --git a/src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig
index 44d5cd689c..9564e5628e 100644
--- a/src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig
@@ -1,14 +1,5 @@
 {% trans_default_domain 'ibexa_content_url' %}
 
-{% macro info_text(message, modifier = '') %}
-    <div class="ibexa-custom-url-from__info-text{{ modifier ? ' ibexa-custom-url-from__info-text--' ~ modifier : '' }}">
-        <svg class="ibexa-icon ibexa-icon--small">
-            <use xlink:href="{{ ibexa_icon_path('system-information') }}"></use>
-        </svg>
-        {{ message }}
-    </div>
-{% endmacro %}
-
 {% embed '@ibexadesign/ui/component/modal/modal.html.twig' with {
     title: 'tab.urls.add.title'|trans|desc('Create a new URL alias'),
     class: 'ibexa-modal--custom-url-alias',
@@ -22,7 +13,7 @@
         {{ form_start(form, {'action': path('ibexa.custom_url.add')}) }}
     {% endblock %}
     {% block body_content %}
-        {% import '@ibexadesign/content/tab/url/modal_add_custom_url.html.twig' as component %}
+        {% import '@ibexadesign/content/tab/url/macros.html.twig' as component %}
 
         <div class="ibexa-custom-url-from">
             <div class="ibexa-custom-url-from__item">