Skip to content

Commit

Permalink
IBX-1853: Changed services names to FQCN or rebranded ones
Browse files Browse the repository at this point in the history
  • Loading branch information
ViniTou committed Jan 19, 2022
1 parent bce53cd commit c0ba8f5
Show file tree
Hide file tree
Showing 25 changed files with 162 additions and 162 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,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);

foreach ($container->findTaggedServiceIds('ez.limitation.formMapper') as $id => $attributes) {
foreach ($attributes as $attribute) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 'ez.limitation.valueMapper';

public function process(ContainerBuilder $container)
Expand Down
12 changes: 6 additions & 6 deletions src/bundle/Resources/config/services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/bundle/Resources/config/services/autosave.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
46 changes: 23 additions & 23 deletions src/bundle/Resources/config/services/controllers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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

Expand All @@ -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

Expand All @@ -65,15 +65,15 @@ services:
autowire: true
arguments:
$contentTypeActionDispatcher: '@Ibexa\AdminUi\Form\ActionDispatcher\ContentTypeDispatcher'
$configResolver: '@ezpublish.config.resolver'
$configResolver: '@ibexa.config.resolver'
tags:
- controller.service_arguments

Ibexa\Bundle\AdminUi\Controller\ContentTypeGroupController:
parent: Ibexa\Contracts\AdminUi\Controller\Controller
autowire: true
arguments:
$configResolver: '@ezpublish.config.resolver'
$configResolver: '@ibexa.config.resolver'
tags:
- controller.service_arguments

Expand All @@ -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

Expand All @@ -94,74 +94,74 @@ 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

Ibexa\Bundle\AdminUi\Controller\ObjectStateController:
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\ObjectStateGroupController:
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\PolicyController:
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\RoleAssignmentController:
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\RoleController:
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\SectionController:
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

Expand Down Expand Up @@ -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
10 changes: 5 additions & 5 deletions src/bundle/Resources/config/services/dashboard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
parent: Ibexa\Contracts\AdminUi\Tab\AbstractTab
public: false
arguments:
$configResolver: '@ezpublish.config.resolver'
$configResolver: '@ibexa.config.resolver'
tags:
- { name: ezplatform.tab, group: dashboard-my }

Expand Down Expand Up @@ -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: ezplatform.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: ezplatform.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: ezplatform.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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions src/bundle/Resources/config/services/form_processors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -37,16 +37,16 @@ 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: ~

Ibexa\AdminUi\Form\Processor\TranslationFormProcessor: ~

Ibexa\AdminUi\Form\Processor\User\UserOnTheFlyProcessor:
arguments:
$innerUserUpdateFormProcessor: '@ezplatform.content_forms.form_processor.user_update'
$innerUserUpdateFormProcessor: '@Ibexa\ContentForms\Form\Processor\User\UserUpdateFormProcessor'
14 changes: 7 additions & 7 deletions src/bundle/Resources/config/services/forms.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ~

Expand All @@ -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: ~

Expand Down Expand Up @@ -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}

Expand Down Expand Up @@ -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 }

Expand Down Expand Up @@ -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 }

Expand Down
Loading

0 comments on commit c0ba8f5

Please sign in to comment.