From 32316ae5a210ece9b99e8b0131f83608c00779b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Parafi=C5=84ski?= Date: Wed, 19 Jan 2022 09:13:33 +0100 Subject: [PATCH 1/2] IBX-1853: Changed services names to FQCN or rebranded ones --- .../Compiler/LimitationFormMapperPass.php | 4 +- .../Compiler/LimitationValueMapperPass.php | 2 +- src/bundle/Resources/config/services.yaml | 12 +-- .../config/services/action_dispatchers.yaml | 2 +- .../Resources/config/services/autosave.yaml | 2 +- .../config/services/controllers.yaml | 46 +++++----- .../Resources/config/services/dashboard.yaml | 10 +-- .../services/fieldtype_form_mappers.yaml | 2 +- .../config/services/form_processors.yaml | 8 +- .../Resources/config/services/forms.yaml | 14 +-- .../Resources/config/services/menu.yaml | 4 +- .../config/services/modules/content_tree.yaml | 6 +- .../config/services/modules/subitems.yaml | 10 +-- .../Resources/config/services/pagination.yaml | 6 +- .../Resources/config/services/rest.yaml | 20 ++--- .../config/services/role_form_mappers.yaml | 90 +++++++++---------- .../Resources/config/services/siteaccess.yaml | 4 +- .../config/services/tabs/content_type.yaml | 2 +- .../config/services/tabs/locationview.yaml | 10 +-- .../Resources/config/services/twig.yaml | 4 +- .../config/services/ui_config/common.yaml | 14 +-- .../services/universal_discovery_widget.yaml | 4 +- .../Resources/config/services/validators.yaml | 14 +-- .../Resources/config/services/views.yaml | 32 +++---- .../preview/content_fields.html.twig | 2 +- 25 files changed, 162 insertions(+), 162 deletions(-) diff --git a/src/bundle/DependencyInjection/Compiler/LimitationFormMapperPass.php b/src/bundle/DependencyInjection/Compiler/LimitationFormMapperPass.php index 2c455364f1..a7820e4ec0 100644 --- a/src/bundle/DependencyInjection/Compiler/LimitationFormMapperPass.php +++ b/src/bundle/DependencyInjection/Compiler/LimitationFormMapperPass.php @@ -20,11 +20,11 @@ class LimitationFormMapperPass implements CompilerPassInterface public function process(ContainerBuilder $container) { - if (!$container->hasDefinition('ezplatform.content_forms.limitation_form_mapper.registry')) { + if (!$container->hasDefinition(\Ibexa\AdminUi\Limitation\LimitationFormMapperRegistry::class)) { return; } - $registry = $container->findDefinition('ezplatform.content_forms.limitation_form_mapper.registry'); + $registry = $container->findDefinition(\Ibexa\AdminUi\Limitation\LimitationFormMapperRegistry::class); $taggedServiceIds = $container->findTaggedServiceIds( self::LIMITATION_MAPPER_FORM_TAG diff --git a/src/bundle/DependencyInjection/Compiler/LimitationValueMapperPass.php b/src/bundle/DependencyInjection/Compiler/LimitationValueMapperPass.php index 53aa4fc084..b8564ce77f 100644 --- a/src/bundle/DependencyInjection/Compiler/LimitationValueMapperPass.php +++ b/src/bundle/DependencyInjection/Compiler/LimitationValueMapperPass.php @@ -16,7 +16,7 @@ */ class LimitationValueMapperPass implements CompilerPassInterface { - public const LIMITATION_VALUE_MAPPER_REGISTRY = 'ezplatform.content_forms.limitation_value_mapper.registry'; + public const LIMITATION_VALUE_MAPPER_REGISTRY = \Ibexa\AdminUi\Limitation\LimitationValueMapperRegistry::class; public const LIMITATION_VALUE_MAPPER_TAG = 'ibexa.admin_ui.limitation.mapper.value'; public function process(ContainerBuilder $container) diff --git a/src/bundle/Resources/config/services.yaml b/src/bundle/Resources/config/services.yaml index a07e71ae7f..ac8605467a 100644 --- a/src/bundle/Resources/config/services.yaml +++ b/src/bundle/Resources/config/services.yaml @@ -61,7 +61,7 @@ services: Ibexa\AdminUi\UI\Dataset\DatasetFactory: lazy: true arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' Ibexa\AdminUi\UI\Service\: resource: '../../../lib/UI/Service' @@ -89,25 +89,25 @@ services: - { name: knp_menu.voter } Ibexa\AdminUi\Form\ActionDispatcher\CreateContentOnTheFlyDispatcher: - parent: ezplatform.content_forms.action_dispatcher.base + parent: Ibexa\ContentForms\Form\ActionDispatcher\AbstractActionDispatcher autowire: true autoconfigure: false public: false Ibexa\AdminUi\Form\ActionDispatcher\CreateUserOnTheFlyDispatcher: - parent: ezplatform.content_forms.action_dispatcher.base + parent: Ibexa\ContentForms\Form\ActionDispatcher\AbstractActionDispatcher autowire: true autoconfigure: false public: false Ibexa\AdminUi\Form\ActionDispatcher\EditContentOnTheFlyDispatcher: - parent: ezplatform.content_forms.action_dispatcher.base + parent: Ibexa\ContentForms\Form\ActionDispatcher\AbstractActionDispatcher autowire: true autoconfigure: false public: false Ibexa\AdminUi\Form\ActionDispatcher\EditUserOnTheFlyDispatcher: - parent: ezplatform.content_forms.action_dispatcher.base + parent: Ibexa\ContentForms\Form\ActionDispatcher\AbstractActionDispatcher autowire: true autoconfigure: false public: false @@ -143,7 +143,7 @@ services: Ibexa\AdminUi\EventListener\SearchViewFilterParametersListener: arguments: $formFactory: '@form.factory' - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' $requestStack: '@request_stack' $siteAccessGroups: '%ezpublish.siteaccess.groups%' tags: diff --git a/src/bundle/Resources/config/services/action_dispatchers.yaml b/src/bundle/Resources/config/services/action_dispatchers.yaml index d30acfc02c..baca307178 100644 --- a/src/bundle/Resources/config/services/action_dispatchers.yaml +++ b/src/bundle/Resources/config/services/action_dispatchers.yaml @@ -5,7 +5,7 @@ services: public: false Ibexa\AdminUi\Form\ActionDispatcher\ContentTypeDispatcher: - parent: ezplatform.content_forms.action_dispatcher.base + parent: Ibexa\ContentForms\Form\ActionDispatcher\AbstractActionDispatcher autowire: true autoconfigure: false public: false diff --git a/src/bundle/Resources/config/services/autosave.yaml b/src/bundle/Resources/config/services/autosave.yaml index d782914c52..a03d200447 100644 --- a/src/bundle/Resources/config/services/autosave.yaml +++ b/src/bundle/Resources/config/services/autosave.yaml @@ -8,6 +8,6 @@ services: Ibexa\AdminUi\Form\Processor\Content\AutosaveProcessor: arguments: - $innerContentFormProcessor: '@ezplatform.content_forms.form_processor.content' + $innerContentFormProcessor: '@Ibexa\ContentForms\Form\Processor\ContentFormProcessor' tags: - { name: kernel.event_subscriber } diff --git a/src/bundle/Resources/config/services/controllers.yaml b/src/bundle/Resources/config/services/controllers.yaml index 20c182209f..a8981441b5 100644 --- a/src/bundle/Resources/config/services/controllers.yaml +++ b/src/bundle/Resources/config/services/controllers.yaml @@ -14,17 +14,17 @@ services: parent: Ibexa\Contracts\AdminUi\Controller\Controller autowire: true arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' tags: - controller.service_arguments Ibexa\Bundle\AdminUi\Controller\BulkOperation\BulkOperationController: - parent: ezpublish_rest.controller.base + parent: Ibexa\Rest\Server\Controller tags: [ 'controller.service_arguments' ] autowire: true Ibexa\Bundle\AdminUi\Controller\Content\ContentTreeController: - parent: ezpublish_rest.controller.base + parent: Ibexa\Rest\Server\Controller tags: [ 'controller.service_arguments' ] autowire: true @@ -35,8 +35,8 @@ services: autowire: true arguments: $siteaccessResolver: '@Ibexa\AdminUi\Siteaccess\NonAdminSiteaccessResolver' - $translationHelper: '@ezpublish.translation_helper' - $configResolver: '@ezpublish.config.resolver' + $translationHelper: '@Ibexa\Core\Helper\TranslationHelper' + $configResolver: '@ibexa.config.resolver' $siteAccessNameGenerator: '@Ibexa\AdminUi\Siteaccess\SiteAccessNameGenerator' tags: - controller.service_arguments @@ -45,7 +45,7 @@ services: parent: Ibexa\Contracts\AdminUi\Controller\Controller autowire: true arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' tags: - controller.service_arguments @@ -55,8 +55,8 @@ services: parent: Ibexa\Contracts\AdminUi\Controller\Controller autowire: true arguments: - $configResolver: '@ezpublish.config.resolver' - $contentActionDispatcher: '@ezplatform.content_forms.action_dispatcher.content' + $configResolver: '@ibexa.config.resolver' + $contentActionDispatcher: '@Ibexa\ContentForms\Form\ActionDispatcher\ContentDispatcher' tags: - controller.service_arguments @@ -65,7 +65,7 @@ services: autowire: true arguments: $contentTypeActionDispatcher: '@Ibexa\AdminUi\Form\ActionDispatcher\ContentTypeDispatcher' - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' tags: - controller.service_arguments @@ -73,7 +73,7 @@ services: parent: Ibexa\Contracts\AdminUi\Controller\Controller autowire: true arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' tags: - controller.service_arguments @@ -85,7 +85,7 @@ services: parent: Ibexa\Contracts\AdminUi\Controller\Controller autowire: true arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' tags: - controller.service_arguments @@ -94,13 +94,13 @@ services: Ibexa\Bundle\AdminUi\Controller\LocationController: parent: Ibexa\Contracts\AdminUi\Controller\Controller arguments: - $translationHelper: '@ezpublish.translation_helper' + $translationHelper: '@Ibexa\Core\Helper\TranslationHelper' Ibexa\Bundle\AdminUi\Controller\NotificationController: parent: Ibexa\Contracts\AdminUi\Controller\Controller autowire: true arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' tags: - controller.service_arguments @@ -108,7 +108,7 @@ services: parent: Ibexa\Contracts\AdminUi\Controller\Controller autowire: true arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' tags: - controller.service_arguments @@ -116,7 +116,7 @@ services: parent: Ibexa\Contracts\AdminUi\Controller\Controller autowire: true arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' tags: - controller.service_arguments @@ -124,7 +124,7 @@ services: parent: Ibexa\Contracts\AdminUi\Controller\Controller autowire: true arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' tags: - controller.service_arguments @@ -132,7 +132,7 @@ services: parent: Ibexa\Contracts\AdminUi\Controller\Controller autowire: true arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' tags: - controller.service_arguments @@ -140,7 +140,7 @@ services: parent: Ibexa\Contracts\AdminUi\Controller\Controller autowire: true arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' tags: - controller.service_arguments @@ -148,20 +148,20 @@ services: parent: Ibexa\Contracts\AdminUi\Controller\Controller autowire: true arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' tags: - controller.service_arguments Ibexa\Bundle\AdminUi\Controller\TranslationController: parent: Ibexa\Contracts\AdminUi\Controller\Controller arguments: - $translationHelper: '@ezpublish.translation_helper' + $translationHelper: '@Ibexa\Core\Helper\TranslationHelper' Ibexa\Bundle\AdminUi\Controller\TrashController: parent: Ibexa\Contracts\AdminUi\Controller\Controller autowire: true arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' tags: - controller.service_arguments @@ -202,11 +202,11 @@ services: Ibexa\Bundle\AdminUi\Controller\VersionController: parent: Ibexa\Contracts\AdminUi\Controller\Controller arguments: - $translationHelper: '@ezpublish.translation_helper' + $translationHelper: '@Ibexa\Core\Helper\TranslationHelper' Ibexa\Contracts\AdminUi\Controller\Controller: ~ Ibexa\Bundle\AdminUi\Controller\FieldDefinitionController: - parent: ezpublish_rest.controller.base + parent: Ibexa\Rest\Server\Controller tags: ['controller.service_arguments'] autowire: true diff --git a/src/bundle/Resources/config/services/dashboard.yaml b/src/bundle/Resources/config/services/dashboard.yaml index 5b2d49d550..4cff7fc321 100644 --- a/src/bundle/Resources/config/services/dashboard.yaml +++ b/src/bundle/Resources/config/services/dashboard.yaml @@ -3,7 +3,7 @@ services: parent: Ibexa\Contracts\AdminUi\Tab\AbstractTab public: false arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' tags: - { name: ibexa.admin_ui.tab, group: dashboard-my } @@ -44,28 +44,28 @@ services: autowire: true public: false - ezplatform.adminui.dashboard.me: + ibexa.adminui.dashboard.me: parent: Ibexa\AdminUi\Component\TwigComponent arguments: $template: '@@ezdesign/ui/dashboard/block/me.html.twig' tags: - { name: ibexa.admin_ui.component, group: 'dashboard-blocks' } - ezplatform.adminui.dashboard.all: + ibexa.adminui.dashboard.all: parent: Ibexa\AdminUi\Component\TwigComponent arguments: $template: '@@ezdesign/ui/dashboard/block/all.html.twig' tags: - { name: ibexa.admin_ui.component, group: 'dashboard-blocks' } - ezplatform.adminui.dashboard.my.tab_groups: + ibexa.adminui.dashboard.my.tab_groups: parent: Ibexa\AdminUi\Component\TabsComponent arguments: $groupIdentifier: 'dashboard-my' tags: - { name: ibexa.admin_ui.component, group: 'dashboard-my-tab-groups' } - ezplatform.adminui.dashboard.all.tab_groups: + ibexa.adminui.dashboard.all.tab_groups: parent: Ibexa\AdminUi\Component\TabsComponent arguments: $groupIdentifier: 'dashboard-everyone' diff --git a/src/bundle/Resources/config/services/fieldtype_form_mappers.yaml b/src/bundle/Resources/config/services/fieldtype_form_mappers.yaml index ca40508145..6f3bbb62a3 100644 --- a/src/bundle/Resources/config/services/fieldtype_form_mappers.yaml +++ b/src/bundle/Resources/config/services/fieldtype_form_mappers.yaml @@ -11,7 +11,7 @@ services: Ibexa\AdminUi\FieldType\Mapper\AbstractRelationFormMapper: abstract: true arguments: - $contentTypeService: '@ezpublish.api.service.content_type' + $contentTypeService: '@ibexa.api.service.content_type' Ibexa\AdminUi\FieldType\Mapper\AuthorFormMapper: tags: diff --git a/src/bundle/Resources/config/services/form_processors.yaml b/src/bundle/Resources/config/services/form_processors.yaml index 04475952ba..c9f235a54a 100644 --- a/src/bundle/Resources/config/services/form_processors.yaml +++ b/src/bundle/Resources/config/services/form_processors.yaml @@ -19,7 +19,7 @@ services: Ibexa\AdminUi\Form\Processor\Content\ContentOnTheFlyProcessor: arguments: - $innerContentFormProcessor: '@ezplatform.content_forms.form_processor.content' + $innerContentFormProcessor: '@Ibexa\ContentForms\Form\Processor\ContentFormProcessor' Ibexa\AdminUi\Form\Processor\Content\UrlRedirectProcessor: public: true @@ -37,11 +37,11 @@ services: Ibexa\AdminUi\Form\Processor\ContentType\ContentTypeFormProcessor: arguments: - - "@ezpublish.api.service.content_type" + - '@ibexa.api.service.content_type' - "@router" - "%ezplatform.content_forms.form_processor.content_type.options%" calls: - - [ setGroupsList, [ "@ezpublish.fields_groups.list" ] ] + - [ setGroupsList, [ '@Ibexa\Core\Helper\FieldsGroups\ArrayTranslatorFieldsGroupsList' ] ] Ibexa\AdminUi\Form\Processor\PreviewFormProcessor: ~ @@ -49,4 +49,4 @@ services: Ibexa\AdminUi\Form\Processor\User\UserOnTheFlyProcessor: arguments: - $innerUserUpdateFormProcessor: '@ezplatform.content_forms.form_processor.user_update' + $innerUserUpdateFormProcessor: '@Ibexa\ContentForms\Form\Processor\User\UserUpdateFormProcessor' diff --git a/src/bundle/Resources/config/services/forms.yaml b/src/bundle/Resources/config/services/forms.yaml index 3afaa94fdc..455b82ab2c 100644 --- a/src/bundle/Resources/config/services/forms.yaml +++ b/src/bundle/Resources/config/services/forms.yaml @@ -44,7 +44,7 @@ services: Ibexa\AdminUi\Form\Type\ChoiceList\Loader\ConfiguredLanguagesChoiceLoader: arguments: - $configResolver: "@ezpublish.config.resolver" + $configResolver: '@ibexa.config.resolver' Ibexa\AdminUi\Form\Type\ChoiceList\Loader\ContentCreateContentTypeChoiceLoader: ~ @@ -58,7 +58,7 @@ services: Ibexa\AdminUi\Form\Type\ChoiceList\Loader\LanguageChoiceLoader: arguments: - $configResolver: "@ezpublish.config.resolver" + $configResolver: '@ibexa.config.resolver' Ibexa\AdminUi\Form\Type\ChoiceList\Loader\SiteAccessChoiceLoader: ~ @@ -108,7 +108,7 @@ services: Ibexa\AdminUi\Form\Type\ContentType\ContentTypeCopyType: ~ Ibexa\AdminUi\Form\Type\ContentType\ContentTypeCreateType: - arguments: ["@ezpublish.api.service.content_type"] + arguments: ['@ibexa.api.service.content_type'] tags: - {name: form.type, alias: ezplatform_content_forms_contenttype_create} @@ -169,10 +169,10 @@ services: Ibexa\AdminUi\Form\Type\FieldDefinition\FieldDefinitionType: arguments: - $fieldTypeService: "@ezpublish.api.service.field_type" + $fieldTypeService: '@ibexa.api.service.field_type' $thumbnailStrategy: '@Ibexa\Core\Repository\Strategy\ContentThumbnail\Field\ContentFieldStrategy' calls: - - [setGroupsList, ["@ezpublish.fields_groups.list"]] + - [setGroupsList, ['@Ibexa\Core\Helper\FieldsGroups\ArrayTranslatorFieldsGroupsList']] tags: - { name: form.type, alias: ezplatform_content_forms_fielddefinition_update } @@ -250,8 +250,8 @@ services: Ibexa\AdminUi\Form\Type\Role\LimitationType: arguments: - - "@ezplatform.content_forms.limitation_form_mapper.registry" - - "@ezplatform.content_forms.limitation.form_mapper.null" + - '@Ibexa\AdminUi\Limitation\LimitationFormMapperRegistry' + - '@Ibexa\AdminUi\Limitation\Mapper\NullLimitationMapper' tags: - { name: form.type, alias: ezplatform_content_forms_policy_limitation_edit } diff --git a/src/bundle/Resources/config/services/menu.yaml b/src/bundle/Resources/config/services/menu.yaml index a64a5c5f99..eb93d2bf80 100644 --- a/src/bundle/Resources/config/services/menu.yaml +++ b/src/bundle/Resources/config/services/menu.yaml @@ -174,12 +174,12 @@ services: tags: - { name: kernel.event_listener, event: ezplatform_admin_ui.menu_configure.main_menu, method: moveAdminToLast, priority: -50 } - ezplatform.adminui.listener.menu.reorder_by_order_number: + ibexa.adminui.listener.menu.reorder_by_order_number: class: Ibexa\AdminUi\Menu\Listener\ReorderByOrderNumberListener tags: - { name: kernel.event_listener, event: ezplatform_admin_ui.menu_configure.main_menu, method: reorderMenuItems, priority: -50 } - ezplatform.adminui.listener.user_menu.reorder_by_order_number: + ibexa.adminui.listener.user_menu.reorder_by_order_number: class: Ibexa\AdminUi\Menu\Listener\ReorderByOrderNumberListener tags: - { name: kernel.event_listener, event: ezplatform_admin_ui.menu_configure.user_menu, method: reorderMenuItems, priority: -50 } diff --git a/src/bundle/Resources/config/services/modules/content_tree.yaml b/src/bundle/Resources/config/services/modules/content_tree.yaml index eedb33b434..1c497ee440 100644 --- a/src/bundle/Resources/config/services/modules/content_tree.yaml +++ b/src/bundle/Resources/config/services/modules/content_tree.yaml @@ -6,9 +6,9 @@ services: Ibexa\AdminUi\UI\Module\ContentTree\NodeFactory: arguments: - $contentService: '@ezpublish.api.service.content' - $translationHelper: '@ezpublish.translation_helper' - $configResolver: '@ezpublish.config.resolver' + $contentService: '@ibexa.api.service.content' + $translationHelper: '@Ibexa\Core\Helper\TranslationHelper' + $configResolver: '@ibexa.config.resolver' $maxLocationIdsInSingleAggregation: '%ibexa.admin_ui.content_tree.node_factory.max_location_ids_in_single_aggregation%' Ibexa\AdminUi\UI\Config\Provider\Module\ContentTree: diff --git a/src/bundle/Resources/config/services/modules/subitems.yaml b/src/bundle/Resources/config/services/modules/subitems.yaml index cd5acf19f1..7205d44aa2 100644 --- a/src/bundle/Resources/config/services/modules/subitems.yaml +++ b/src/bundle/Resources/config/services/modules/subitems.yaml @@ -5,7 +5,7 @@ services: public: true Ibexa\AdminUi\UI\Module\Subitems\ValueObjectVisitor\SubitemsRow: - parent: ezpublish_rest.output.value_object_visitor.base + parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor autowire: true autoconfigure: false public: true @@ -13,7 +13,7 @@ services: - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\AdminUi\UI\Module\Subitems\Values\SubitemsRow } Ibexa\AdminUi\UI\Module\Subitems\ValueObjectVisitor\SubitemsList: - parent: ezpublish_rest.output.value_object_visitor.base + parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor autowire: true autoconfigure: false public: true @@ -21,6 +21,6 @@ services: - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\AdminUi\UI\Module\Subitems\Values\SubitemsList } Ibexa\AdminUi\UI\Module\Subitems\ContentViewParameterSupplier: - $outputVisitor: '@ezpublish_rest.output.visitor.json' - $outputGenerator: '@ezpublish_rest.output.generator.json' - $contentTypeInfoListValueObjectVisitor: '@ezpublish_rest.output.value_object_visitor.ContentTypeInfoList' + $outputVisitor: '@ibexa.rest.output.visitor.json' + $outputGenerator: '@Ibexa\Rest\Output\Generator\Json' + $contentTypeInfoListValueObjectVisitor: '@Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeInfoList' diff --git a/src/bundle/Resources/config/services/pagination.yaml b/src/bundle/Resources/config/services/pagination.yaml index 12b76f5af4..202b9be205 100644 --- a/src/bundle/Resources/config/services/pagination.yaml +++ b/src/bundle/Resources/config/services/pagination.yaml @@ -1,5 +1,5 @@ services: - ez_pagination_template: + Ibexa\Bundle\AdminUi\View\Template\EzPagerfantaTemplate: class: Ibexa\Bundle\AdminUi\View\Template\EzPagerfantaTemplate arguments: - '@translator' @@ -7,7 +7,7 @@ services: Ibexa\Bundle\AdminUi\View\EzPagerfantaView: public: false arguments: - - '@ez_pagination_template' + - '@Ibexa\Bundle\AdminUi\View\Template\EzPagerfantaTemplate' tags: - { name: 'pagerfanta.view', alias: 'ez' } @@ -16,4 +16,4 @@ services: autowire: true public: false arguments: - $translationHelper: '@ezpublish.translation_helper' + $translationHelper: '@Ibexa\Core\Helper\TranslationHelper' diff --git a/src/bundle/Resources/config/services/rest.yaml b/src/bundle/Resources/config/services/rest.yaml index 57eebe68c5..bd6c90c596 100644 --- a/src/bundle/Resources/config/services/rest.yaml +++ b/src/bundle/Resources/config/services/rest.yaml @@ -1,16 +1,16 @@ services: Ibexa\AdminUi\REST\Input\Parser\BulkOperation: - parent: ezpublish_rest.input.parser + parent: Ibexa\Rest\Server\Common\Parser tags: - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.BulkOperation } Ibexa\AdminUi\REST\Input\Parser\Operation: - parent: ezpublish_rest.input.parser + parent: Ibexa\Rest\Server\Common\Parser tags: - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.Operation } Ibexa\AdminUi\REST\Output\ValueObjectVisitor\BulkOperationResponse: - parent: ezpublish_rest.output.value_object_visitor.base + parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor tags: - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\AdminUi\REST\Value\BulkOperationResponse } @@ -19,22 +19,22 @@ services: # Ibexa\AdminUi\REST\Input\Parser\ContentTree\LoadSubtreeRequestNode: - parent: ezpublish_rest.input.parser + parent: Ibexa\Rest\Server\Common\Parser tags: - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.ContentTreeLoadSubtreeRequestNode } Ibexa\AdminUi\REST\Input\Parser\ContentTree\LoadSubtreeRequest: - parent: ezpublish_rest.input.parser + parent: Ibexa\Rest\Server\Common\Parser tags: - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.ContentTreeLoadSubtreeRequest } Ibexa\AdminUi\REST\Output\ValueObjectVisitor\ContentTree\Node: - parent: ezpublish_rest.output.value_object_visitor.base + parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor tags: - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\AdminUi\REST\Value\ContentTree\Node } Ibexa\AdminUi\REST\Output\ValueObjectVisitor\ContentTree\Root: - parent: ezpublish_rest.output.value_object_visitor.base + parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor tags: - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\AdminUi\REST\Value\ContentTree\Root } @@ -42,17 +42,17 @@ services: # Content type create/edit form # Ibexa\AdminUi\REST\Input\Parser\ContentType\FieldDefinitionCreate: - parent: ezpublish_rest.input.parser + parent: Ibexa\Rest\Server\Common\Parser tags: - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.ContentTypFieldDefinitionCreate } Ibexa\AdminUi\REST\Input\Parser\ContentType\FieldDefinitionDelete: - parent: ezpublish_rest.input.parser + parent: Ibexa\Rest\Server\Common\Parser tags: - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.ContentTypeFieldDefinitionDelete } Ibexa\AdminUi\REST\Input\Parser\ContentType\FieldDefinitionReorder: - parent: ezpublish_rest.input.parser + parent: Ibexa\Rest\Server\Common\Parser tags: - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.ContentTypeFieldDefinitionReorder } diff --git a/src/bundle/Resources/config/services/role_form_mappers.yaml b/src/bundle/Resources/config/services/role_form_mappers.yaml index 3c76f7735e..b7d5db43c0 100644 --- a/src/bundle/Resources/config/services/role_form_mappers.yaml +++ b/src/bundle/Resources/config/services/role_form_mappers.yaml @@ -19,131 +19,131 @@ services: autoconfigure: true public: false - ezplatform.content_forms.limitation_form_mapper.registry: + Ibexa\AdminUi\Limitation\LimitationFormMapperRegistry: class: Ibexa\AdminUi\Limitation\LimitationFormMapperRegistry - ezplatform.content_forms.limitation_value_mapper.registry: + Ibexa\AdminUi\Limitation\LimitationValueMapperRegistry: class: Ibexa\AdminUi\Limitation\LimitationValueMapperRegistry - ezplatform.content_forms.limitation.form_mapper.multiple_selection: + Ibexa\AdminUi\Limitation\Mapper\MultipleSelectionBasedMapper: class: Ibexa\AdminUi\Limitation\Mapper\MultipleSelectionBasedMapper abstract: true calls: - [setFormTemplate, ["%ezplatform.content_forms.limitation.multiple_selection.template%"]] - ezplatform.content_forms.limitation.form_mapper.siteaccess: - parent: ezplatform.content_forms.limitation.form_mapper.multiple_selection + Ibexa\Bundle\SiteFactory\Form\DataMapper\SiteFactorySiteAccessLimitationMapper: + parent: Ibexa\AdminUi\Limitation\Mapper\MultipleSelectionBasedMapper autowire: true autoconfigure: false public: false class: "%ezplatform.content_forms.limitation.form_mapper.siteaccess.class%" arguments: - - '@ezpublish.siteaccess_service' + - '@Ibexa\Core\MVC\Symfony\SiteAccess\SiteAccessService' - '@Ibexa\AdminUi\Siteaccess\SiteAccessKeyGenerator' tags: - { name: ibexa.admin_ui.limitation.mapper.form, limitationType: SiteAccess } - { name: ibexa.admin_ui.limitation.mapper.value, limitationType: SiteAccess } - ezplatform.content_forms.limitation.form_mapper.null: + Ibexa\AdminUi\Limitation\Mapper\NullLimitationMapper: class: "%ezplatform.content_forms.limitation.form_mapper.null.class%" arguments: ["%ezplatform.content_forms.limitation.null.template%"] tags: - { name: ibexa.admin_ui.limitation.mapper.form, limitationType: "Null" } - { name: ibexa.admin_ui.limitation.mapper.value, limitationType: "Null" } - ezplatform.content_forms.limitation.form_mapper.content_type: - parent: ezplatform.content_forms.limitation.form_mapper.multiple_selection + ibexa.content_forms.limitation.form_mapper.content_type: + parent: Ibexa\AdminUi\Limitation\Mapper\MultipleSelectionBasedMapper autowire: true autoconfigure: false public: false class: "%ezplatform.content_forms.limitation.form_mapper.content_type.class%" - arguments: ["@ezpublish.api.service.content_type"] + arguments: ['@ibexa.api.service.content_type'] calls: - [setLogger, ['@?logger']] tags: - { name: ibexa.admin_ui.limitation.mapper.form, limitationType: Class } - { name: ibexa.admin_ui.limitation.mapper.value, limitationType: Class } - ezplatform.content_forms.limitation.form_mapper.parent_content_type: - parent: ezplatform.content_forms.limitation.form_mapper.multiple_selection + ibexa.content_forms.limitation.form_mapper.parent_content_type: + parent: Ibexa\AdminUi\Limitation\Mapper\MultipleSelectionBasedMapper autowire: true autoconfigure: false public: false class: "%ezplatform.content_forms.limitation.form_mapper.content_type.class%" - arguments: ["@ezpublish.api.service.content_type"] + arguments: ['@ibexa.api.service.content_type'] calls: - [setLogger, ['@?logger']] tags: - { name: ibexa.admin_ui.limitation.mapper.form, limitationType: ParentClass } - { name: ibexa.admin_ui.limitation.mapper.value, limitationType: ParentClass } - ezplatform.content_forms.limitation.form_mapper.section: - parent: ezplatform.content_forms.limitation.form_mapper.multiple_selection + ibexa.content_forms.limitation.form_mapper.section: + parent: Ibexa\AdminUi\Limitation\Mapper\MultipleSelectionBasedMapper autowire: true autoconfigure: false public: false class: "%ezplatform.content_forms.limitation.form_mapper.section.class%" - arguments: ["@ezpublish.api.service.section"] + arguments: ['@ibexa.api.service.section'] calls: - [setLogger, ['@?logger']] tags: - { name: ibexa.admin_ui.limitation.mapper.form, limitationType: Section } - { name: ibexa.admin_ui.limitation.mapper.value, limitationType: Section } - ezplatform.content_forms.limitation.form_mapper.new_section: - parent: ezplatform.content_forms.limitation.form_mapper.multiple_selection + ibexa.content_forms.limitation.form_mapper.new_section: + parent: Ibexa\AdminUi\Limitation\Mapper\MultipleSelectionBasedMapper autowire: true autoconfigure: false public: false class: "%ezplatform.content_forms.limitation.form_mapper.section.class%" - arguments: ["@ezpublish.api.service.section"] + arguments: ['@ibexa.api.service.section'] calls: - [setLogger, ['@?logger']] tags: - { name: ibexa.admin_ui.limitation.mapper.form, limitationType: NewSection } - { name: ibexa.admin_ui.limitation.mapper.value, limitationType: NewSection } - ezplatform.content_forms.limitation.form_mapper.object_state: - parent: ezplatform.content_forms.limitation.form_mapper.multiple_selection + ibexa.content_forms.limitation.form_mapper.object_state: + parent: Ibexa\AdminUi\Limitation\Mapper\MultipleSelectionBasedMapper autowire: true autoconfigure: false public: false class: "%ezplatform.content_forms.limitation.form_mapper.object_state.class%" - arguments: ["@ezpublish.api.service.object_state"] + arguments: ['@ibexa.api.service.object_state'] calls: - [setLogger, ['@?logger']] tags: - { name: ibexa.admin_ui.limitation.mapper.form, limitationType: State } - { name: ibexa.admin_ui.limitation.mapper.value, limitationType: State } - ezplatform.content_forms.limitation.form_mapper.new_object_state: - parent: ezplatform.content_forms.limitation.form_mapper.multiple_selection + ibexa.content_forms.limitation.form_mapper.new_object_state: + parent: Ibexa\AdminUi\Limitation\Mapper\MultipleSelectionBasedMapper autowire: true autoconfigure: false public: false class: "%ezplatform.content_forms.limitation.form_mapper.object_state.class%" - arguments: ["@ezpublish.api.service.object_state"] + arguments: ['@ibexa.api.service.object_state'] calls: - [setLogger, ['@?logger']] tags: - { name: ibexa.admin_ui.limitation.mapper.form, limitationType: NewState } - { name: ibexa.admin_ui.limitation.mapper.value, limitationType: NewState } - ezplatform.content_forms.limitation.form_mapper.language: - parent: ezplatform.content_forms.limitation.form_mapper.multiple_selection + Ibexa\AdminUi\Limitation\Mapper\LanguageLimitationMapper: + parent: Ibexa\AdminUi\Limitation\Mapper\MultipleSelectionBasedMapper autowire: true autoconfigure: false public: false class: "%ezplatform.content_forms.limitation.form_mapper.language.class%" - arguments: ["@ezpublish.api.service.language"] + arguments: ['@ibexa.api.service.language'] calls: - [setLogger, ['@?logger']] tags: - { name: ibexa.admin_ui.limitation.mapper.form, limitationType: Language } - { name: ibexa.admin_ui.limitation.mapper.value, limitationType: Language } - ezplatform.content_forms.limitation.form_mapper.owner: - parent: ezplatform.content_forms.limitation.form_mapper.multiple_selection + ibexa.content_forms.limitation.form_mapper.owner: + parent: Ibexa\AdminUi\Limitation\Mapper\MultipleSelectionBasedMapper autowire: true autoconfigure: false public: false @@ -153,8 +153,8 @@ services: - { name: ibexa.admin_ui.limitation.mapper.form, limitationType: Owner } - { name: ibexa.admin_ui.limitation.mapper.value, limitationType: Owner } - ezplatform.content_forms.limitation.form_mapper.parent_owner: - parent: ezplatform.content_forms.limitation.form_mapper.multiple_selection + ibexa.content_forms.limitation.form_mapper.parent_owner: + parent: Ibexa\AdminUi\Limitation\Mapper\MultipleSelectionBasedMapper autowire: true autoconfigure: false public: false @@ -164,8 +164,8 @@ services: - { name: ibexa.admin_ui.limitation.mapper.form, limitationType: ParentOwner } - { name: ibexa.admin_ui.limitation.mapper.value, limitationType: ParentOwner } - ezplatform.content_forms.limitation.form_mapper.group: - parent: ezplatform.content_forms.limitation.form_mapper.multiple_selection + ibexa.content_forms.limitation.form_mapper.group: + parent: Ibexa\AdminUi\Limitation\Mapper\MultipleSelectionBasedMapper autowire: true autoconfigure: false public: false @@ -175,8 +175,8 @@ services: - { name: ibexa.admin_ui.limitation.mapper.form, limitationType: Group } - { name: ibexa.admin_ui.limitation.mapper.value, limitationType: Group } - ezplatform.content_forms.limitation.form_mapper.parent_group: - parent: ezplatform.content_forms.limitation.form_mapper.multiple_selection + ibexa.content_forms.limitation.form_mapper.parent_group: + parent: Ibexa\AdminUi\Limitation\Mapper\MultipleSelectionBasedMapper autowire: true autoconfigure: false public: false @@ -186,8 +186,8 @@ services: - { name: ibexa.admin_ui.limitation.mapper.form, limitationType: ParentGroup } - { name: ibexa.admin_ui.limitation.mapper.value, limitationType: ParentGroup } - ezplatform.content_forms.limitation.form_mapper.parent_depth: - parent: ezplatform.content_forms.limitation.form_mapper.multiple_selection + Ibexa\AdminUi\Limitation\Mapper\ParentDepthLimitationMapper: + parent: Ibexa\AdminUi\Limitation\Mapper\MultipleSelectionBasedMapper autowire: true autoconfigure: false public: false @@ -197,16 +197,16 @@ services: - { name: ibexa.admin_ui.limitation.mapper.form, limitationType: ParentDepth } - { name: ibexa.admin_ui.limitation.mapper.value, limitationType: ParentDepth } - ezplatform.content_forms.limitation.form_mapper.udw_based: + ibexa.content_forms.limitation.form_mapper.udw_based: class: Ibexa\AdminUi\Limitation\Mapper\UDWBasedMapper arguments: - - "@ezpublish.api.service.location" - - "@ezpublish.api.service.search" + - '@ibexa.api.service.location' + - '@ibexa.api.service.search' calls: - [setFormTemplate, ["%ezplatform.content_forms.limitation.udw.template%"]] - ezplatform.content_forms.limitation.form_mapper.location: - parent: ezplatform.content_forms.limitation.form_mapper.udw_based + ibexa.content_forms.limitation.form_mapper.location: + parent: ibexa.content_forms.limitation.form_mapper.udw_based autowire: true autoconfigure: false public: false @@ -214,8 +214,8 @@ services: - { name: ibexa.admin_ui.limitation.mapper.form, limitationType: Node } - { name: ibexa.admin_ui.limitation.mapper.value, limitationType: Node } - ezplatform.content_forms.limitation.form_mapper.subtree: - parent: ezplatform.content_forms.limitation.form_mapper.udw_based + Ibexa\AdminUi\Limitation\Mapper\SubtreeLimitationMapper: + parent: ibexa.content_forms.limitation.form_mapper.udw_based autowire: true autoconfigure: false public: false diff --git a/src/bundle/Resources/config/services/siteaccess.yaml b/src/bundle/Resources/config/services/siteaccess.yaml index 98c81e168c..223cfb4202 100644 --- a/src/bundle/Resources/config/services/siteaccess.yaml +++ b/src/bundle/Resources/config/services/siteaccess.yaml @@ -13,7 +13,7 @@ services: Ibexa\AdminUi\Siteaccess\SiteaccessResolver: arguments: $siteaccessPreviewVoters: !tagged ibexa.admin_ui.site_access.preview.voter - $siteAccessService: '@ezpublish.siteaccess_service' + $siteAccessService: '@Ibexa\Core\MVC\Symfony\SiteAccess\SiteAccessService' Ibexa\AdminUi\Siteaccess\NonAdminSiteaccessResolver: arguments: @@ -21,5 +21,5 @@ services: Ibexa\AdminUi\Siteaccess\AdminSiteaccessPreviewVoter: arguments: - $repositoryConfigurationProvider: '@ezpublish.api.repository_configuration_provider' + $repositoryConfigurationProvider: '@Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider' tags: [ ibexa.admin_ui.site_access.preview.voter ] diff --git a/src/bundle/Resources/config/services/tabs/content_type.yaml b/src/bundle/Resources/config/services/tabs/content_type.yaml index 885d384341..93b7b8e2fe 100644 --- a/src/bundle/Resources/config/services/tabs/content_type.yaml +++ b/src/bundle/Resources/config/services/tabs/content_type.yaml @@ -6,7 +6,7 @@ services: tags: - { name: ibexa.admin_ui.tab, group: content-type } - ezplatform.adminui.content_type.tab_groups: + ibexa.adminui.content_type.tab_groups: parent: Ibexa\AdminUi\Component\TabsComponent arguments: $template: '@@ezdesign/ui/tab/content_type.html.twig' diff --git a/src/bundle/Resources/config/services/tabs/locationview.yaml b/src/bundle/Resources/config/services/tabs/locationview.yaml index aea7cf03d9..49c3f96669 100644 --- a/src/bundle/Resources/config/services/tabs/locationview.yaml +++ b/src/bundle/Resources/config/services/tabs/locationview.yaml @@ -9,14 +9,14 @@ services: Ibexa\AdminUi\Tab\LocationView\RolesTab: autowire: true arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' tags: - { name: ibexa.admin_ui.tab, group: location-view } Ibexa\AdminUi\Tab\LocationView\PoliciesTab: autowire: true arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' tags: - { name: ibexa.admin_ui.tab, group: location-view } @@ -24,11 +24,11 @@ services: public: true autowire: true arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' tags: - { name: ibexa.admin_ui.tab, group: location-view } - ezplatform.adminui.location_view.tab_groups: + ibexa.adminui.location_view.tab_groups: parent: Ibexa\AdminUi\Component\TabsComponent arguments: $template: '@@ezdesign/ui/tab/location_view.html.twig' @@ -39,6 +39,6 @@ services: Ibexa\AdminUi\Tab\LocationView\UrlsTab: parent: Ibexa\Contracts\AdminUi\Tab\AbstractEventDispatchingTab arguments: - $translationHelper: '@ezpublish.translation_helper' + $translationHelper: '@Ibexa\Core\Helper\TranslationHelper' tags: - { name: ibexa.admin_ui.tab, group: location-view } diff --git a/src/bundle/Resources/config/services/twig.yaml b/src/bundle/Resources/config/services/twig.yaml index a06b16ed4c..b51b4b129b 100644 --- a/src/bundle/Resources/config/services/twig.yaml +++ b/src/bundle/Resources/config/services/twig.yaml @@ -6,13 +6,13 @@ services: Ibexa\Bundle\AdminUi\Templating\Twig\FieldEditRenderingExtension: arguments: - - '@ezpublish.templating.field_block_renderer' + - '@ibexa.templating.field_block_renderer' tags: - { name: twig.extension } Ibexa\Bundle\AdminUi\Templating\Twig\FieldGroupRenderingExtension: arguments: - - '@ezpublish.fields_groups.list' + - '@Ibexa\Core\Helper\FieldsGroups\ArrayTranslatorFieldsGroupsList' tags: - { name: twig.extension } diff --git a/src/bundle/Resources/config/services/ui_config/common.yaml b/src/bundle/Resources/config/services/ui_config/common.yaml index c2aaac671a..da6d98e1bf 100644 --- a/src/bundle/Resources/config/services/ui_config/common.yaml +++ b/src/bundle/Resources/config/services/ui_config/common.yaml @@ -28,20 +28,20 @@ services: tags: - { name: ibexa.admin_ui.config.provider, key: 'sortOrderMappings' } - ezsystems.ezplatform_admin_ui.ui.config.provider.image_variations: + ibexa.adminui.ui.config.provider.image_variations: class: Ibexa\AdminUi\UI\Config\Provider\ScopeParameterBasedValue lazy: true arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' $parameterName: 'image_variations' tags: - { name: ibexa.admin_ui.config.provider, key: 'imageVariations' } - ezsystems.ezplatform_admin_ui.ui.config.provider.content_edit_form_templates: + ibexa.adminui.ui.config.provider.content_edit_form_templates: class: Ibexa\AdminUi\UI\Config\Provider\ScopeParameterBasedValue lazy: true arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' $parameterName: 'admin_ui_forms.content_edit_form_templates' tags: - { name: ibexa.admin_ui.config.provider, key: 'contentEditFormTemplates' } @@ -53,7 +53,7 @@ services: Ibexa\AdminUi\UI\Config\Provider\Languages: arguments: $siteAccesses: '%ezpublish.siteaccess.list%' - $siteAccessService: '@ezpublish.siteaccess_service' + $siteAccessService: '@Ibexa\Core\MVC\Symfony\SiteAccess\SiteAccessService' tags: - { name: ibexa.admin_ui.config.provider, key: 'languages' } @@ -108,12 +108,12 @@ services: Ibexa\AdminUi\UI\Config\Provider\Locations: arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' tags: - { name: ibexa.admin_ui.config.provider, key: 'locations' } Ibexa\AdminUi\UI\Config\Provider\IconPaths: arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' tags: - { name: ibexa.admin_ui.config.provider, key: 'iconPaths' } diff --git a/src/bundle/Resources/config/services/universal_discovery_widget.yaml b/src/bundle/Resources/config/services/universal_discovery_widget.yaml index 9a1dc48345..434d9efefc 100644 --- a/src/bundle/Resources/config/services/universal_discovery_widget.yaml +++ b/src/bundle/Resources/config/services/universal_discovery_widget.yaml @@ -17,12 +17,12 @@ services: Ibexa\AdminUi\UniversalDiscovery\Event\Subscriber\UserSelectionAllowedContentTypes: arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' tags: - { name: kernel.event_subscriber } Ibexa\AdminUi\UniversalDiscovery\UniversalDiscoveryProvider: arguments: - $visitor: '@ezpublish_rest.output.visitor.json' + $visitor: '@ibexa.rest.output.visitor.json' Ibexa\Contracts\AdminUi\UniversalDiscovery\Provider: '@Ibexa\AdminUi\UniversalDiscovery\UniversalDiscoveryProvider' diff --git a/src/bundle/Resources/config/services/validators.yaml b/src/bundle/Resources/config/services/validators.yaml index 048778ec40..5d203702ad 100644 --- a/src/bundle/Resources/config/services/validators.yaml +++ b/src/bundle/Resources/config/services/validators.yaml @@ -13,21 +13,21 @@ services: Ibexa\AdminUi\Validator\Constraints\LocationIsWithinCopySubtreeLimitValidator: arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' Ibexa\AdminUi\Validator\Constraints\UniqueContentTypeIdentifierValidator: - arguments: ["@ezpublish.api.service.content_type"] + arguments: ['@ibexa.api.service.content_type'] tags: - { name: validator.constraint_validator, alias: ezplatform.content_forms.validator.unique_content_type_identifier } - ezplatform.content_forms.validator.field_type.abstract: + Ibexa\AdminUi\Validator\Constraints\FieldTypeValidator: class: Ibexa\AdminUi\Validator\Constraints\FieldTypeValidator - arguments: ["@ezpublish.api.service.field_type"] + arguments: ['@ibexa.api.service.field_type'] abstract: true autoconfigure: false Ibexa\AdminUi\Validator\Constraints\ValidatorConfigurationValidator: - parent: ezplatform.content_forms.validator.field_type.abstract + parent: Ibexa\AdminUi\Validator\Constraints\FieldTypeValidator autowire: true autoconfigure: false public: false @@ -35,7 +35,7 @@ services: - { name: validator.constraint_validator, alias: ezplatform.content_forms.validator.validator_configuration } Ibexa\AdminUi\Validator\Constraints\FieldSettingsValidator: - parent: ezplatform.content_forms.validator.field_type.abstract + parent: Ibexa\AdminUi\Validator\Constraints\FieldTypeValidator autowire: true autoconfigure: false public: false @@ -44,7 +44,7 @@ services: Ibexa\AdminUi\Validator\Constraints\UniqueURLValidator: arguments: - - '@ezpublish.api.service.url' + - '@ibexa.api.service.url' tags: - { name: validator.constraint_validator, alias: ezplatform.content_forms.validator.unique_url } diff --git a/src/bundle/Resources/config/services/views.yaml b/src/bundle/Resources/config/services/views.yaml index 2859d5024e..34664d12b5 100644 --- a/src/bundle/Resources/config/services/views.yaml +++ b/src/bundle/Resources/config/services/views.yaml @@ -9,32 +9,32 @@ services: # Ibexa\AdminUi\View\Builder\ContentTranslateViewBuilder: arguments: - $repository: '@ezpublish.api.repository' - $viewConfigurator: '@ezpublish.view.configurator' - $viewParametersInjector: '@ezpublish.view.view_parameters.injector.dispatcher' - $contentActionDispatcher: '@ezplatform.content_forms.action_dispatcher.content' + $repository: '@ibexa.api.repository' + $viewConfigurator: '@Ibexa\Core\MVC\Symfony\View\Configurator\ViewProvider' + $viewParametersInjector: '@Ibexa\Core\MVC\Symfony\View\ParametersInjector\EventDispatcherInjector' + $contentActionDispatcher: '@Ibexa\ContentForms\Form\ActionDispatcher\ContentDispatcher' tags: - { name: ibexa.view.builder } Ibexa\AdminUi\View\Provider\ContentTranslateView\Configured: arguments: - $matcherFactory: '@ezplatform.admin_ui.view.content_translate.matcher_factory' + $matcherFactory: '@ibexa.adminui.view.content_translate.matcher_factory' tags: - { name: ibexa.view.provider, type: Ibexa\AdminUi\View\ContentTranslateView, priority: 10 } - ezplatform.admin_ui.view.content_translate.matcher_factory: + ibexa.adminui.view.content_translate.matcher_factory: class: '%ezpublish.view.matcher_factory.class%' arguments: - '@Ibexa\Bundle\Core\Matcher\ViewMatcherRegistry' - - '@ezpublish.api.repository' + - '@ibexa.api.repository' - 'Ibexa\Core\MVC\Symfony\Matcher\ContentBased' - ezpublish.content_translate.matcher_factory.dynamically_configured: + ibexa.content_translate.matcher_factory.dynamically_configured: class: Ibexa\Core\MVC\Symfony\Matcher\DynamicallyConfiguredMatcherFactoryDecorator - decorates: ezplatform.admin_ui.view.content_translate.matcher_factory + decorates: ibexa.adminui.view.content_translate.matcher_factory arguments: - $innerConfigurableMatcherFactory: '@ezpublish.content_view.matcher_factory.dynamically_configured.inner' - $configResolver: '@ezpublish.config.resolver' + $innerConfigurableMatcherFactory: '@ibexa.content_view.matcher_factory.dynamically_configured.inner' + $configResolver: '@ibexa.config.resolver' $parameterName: content_translate_view Ibexa\AdminUi\View\Filter\ContentTranslateViewFilter: @@ -43,17 +43,17 @@ services: Ibexa\AdminUi\Limitation\Templating\LimitationBlockRenderer: arguments: - $valueMapperRegistry: '@ezplatform.content_forms.limitation_value_mapper.registry' + $valueMapperRegistry: '@Ibexa\AdminUi\Limitation\LimitationValueMapperRegistry' $twig: '@twig' - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' Ibexa\AdminUi\View\Filter\AdminSearchViewFilter: decorates: Ibexa\Search\View\SearchViewFilter arguments: - $configResolver: '@ezpublish.config.resolver' + $configResolver: '@ibexa.config.resolver' $formFactory: '@Symfony\Component\Form\FormFactoryInterface' - $sectionService: '@ezpublish.api.service.section' - $contentTypeService: '@ezpublish.api.service.content_type' + $sectionService: '@ibexa.api.service.section' + $contentTypeService: '@ibexa.api.service.content_type' $siteAccessGroups: '%ezpublish.siteaccess.groups%' $innerFilter: '@Ibexa\AdminUi\View\Filter\AdminSearchViewFilter.inner' $urlGenerator: '@router' diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/preview/content_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/preview/content_fields.html.twig index ea6b2382d0..5ec95914c3 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/preview/content_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/preview/content_fields.html.twig @@ -461,7 +461,7 @@ {% if not ibexa_field_is_empty( content, field ) and parameters.available %} {% set attr = attr|merge({'class': (attr.class|default('') ~ ' ibexa-field-preview ibexa-field-preview--ezimageasset')|trim}) %}
- {{ render(controller('ez_content:viewAction', { + {{ render(controller('ibexa_content:viewAction', { contentId: field.value.destinationContentId, viewType: 'preview_ezimageasset', no_layout: true, From 4916cf499044d32c1f6d4b0277e899bc9fa29517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Parafi=C5=84ski?= Date: Thu, 20 Jan 2022 09:25:19 +0100 Subject: [PATCH 2/2] Used imports instead of FQCN --- .../Compiler/LimitationFormMapperPass.php | 5 +++-- .../Compiler/LimitationValueMapperPass.php | 3 ++- tests/lib/Menu/MainMenuBuilerTest.php | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/bundle/DependencyInjection/Compiler/LimitationFormMapperPass.php b/src/bundle/DependencyInjection/Compiler/LimitationFormMapperPass.php index a7820e4ec0..05620e3d99 100644 --- a/src/bundle/DependencyInjection/Compiler/LimitationFormMapperPass.php +++ b/src/bundle/DependencyInjection/Compiler/LimitationFormMapperPass.php @@ -6,6 +6,7 @@ */ namespace Ibexa\Bundle\AdminUi\DependencyInjection\Compiler; +use Ibexa\AdminUi\Limitation\LimitationFormMapperRegistry; use LogicException; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -20,11 +21,11 @@ class LimitationFormMapperPass implements CompilerPassInterface public function process(ContainerBuilder $container) { - if (!$container->hasDefinition(\Ibexa\AdminUi\Limitation\LimitationFormMapperRegistry::class)) { + if (!$container->hasDefinition(LimitationFormMapperRegistry::class)) { return; } - $registry = $container->findDefinition(\Ibexa\AdminUi\Limitation\LimitationFormMapperRegistry::class); + $registry = $container->findDefinition(LimitationFormMapperRegistry::class); $taggedServiceIds = $container->findTaggedServiceIds( self::LIMITATION_MAPPER_FORM_TAG diff --git a/src/bundle/DependencyInjection/Compiler/LimitationValueMapperPass.php b/src/bundle/DependencyInjection/Compiler/LimitationValueMapperPass.php index b8564ce77f..365a765ab3 100644 --- a/src/bundle/DependencyInjection/Compiler/LimitationValueMapperPass.php +++ b/src/bundle/DependencyInjection/Compiler/LimitationValueMapperPass.php @@ -6,6 +6,7 @@ */ namespace Ibexa\Bundle\AdminUi\DependencyInjection\Compiler; +use Ibexa\AdminUi\Limitation\LimitationValueMapperRegistry; use LogicException; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -16,7 +17,7 @@ */ class LimitationValueMapperPass implements CompilerPassInterface { - public const LIMITATION_VALUE_MAPPER_REGISTRY = \Ibexa\AdminUi\Limitation\LimitationValueMapperRegistry::class; + public const LIMITATION_VALUE_MAPPER_REGISTRY = LimitationValueMapperRegistry::class; public const LIMITATION_VALUE_MAPPER_TAG = 'ibexa.admin_ui.limitation.mapper.value'; public function process(ContainerBuilder $container) diff --git a/tests/lib/Menu/MainMenuBuilerTest.php b/tests/lib/Menu/MainMenuBuilerTest.php index ab51cc89bd..e8ed6ca92c 100644 --- a/tests/lib/Menu/MainMenuBuilerTest.php +++ b/tests/lib/Menu/MainMenuBuilerTest.php @@ -13,6 +13,7 @@ use Ibexa\Contracts\Core\Repository\PermissionResolver; use Ibexa\Core\MVC\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\UserInterface; +use Knp\Menu\FactoryInterface; use Knp\Menu\MenuItem; use PHPUnit\Framework\TestCase; use Symfony\Bundle\FrameworkBundle\Test\TestBrowserToken; @@ -38,7 +39,7 @@ class MainMenuBuilerTest extends TestCase protected function setUp(): void { - $knpFactory = $this->createMock(\Knp\Menu\FactoryInterface::class); + $knpFactory = $this->createMock(FactoryInterface::class); $knpFactory->method('createItem') ->willReturnCallback(static function (string $name) use ($knpFactory) { return new MenuItem($name, $knpFactory);