From 431e39f858f0ef6f348d7ca2c3617dd826a9bd73 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Tue, 1 Feb 2022 11:45:23 +0100 Subject: [PATCH] IBX-1696: Rebranded Container parameters and Config Resolver namespaces --- .../config/ezpublish_default_settings.yaml | 14 +++++++------- src/bundle/Resources/config/fieldtypes.yaml | 2 +- src/bundle/Resources/config/services.yaml | 2 +- .../MultipleCountryValueTransformer.php | 2 +- .../SingleCountryValueTransformer.php | 2 +- .../MultipleCountryValueTransformerTest.php | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/bundle/Resources/config/ezpublish_default_settings.yaml b/src/bundle/Resources/config/ezpublish_default_settings.yaml index e0fad955..02d27754 100644 --- a/src/bundle/Resources/config/ezpublish_default_settings.yaml +++ b/src/bundle/Resources/config/ezpublish_default_settings.yaml @@ -1,10 +1,10 @@ parameters: - ezsettings.default.content_edit.templates.edit: '@@IbexaContentForms/Content/content_edit.html.twig' - ezsettings.default.content_edit.templates.create: '@@IbexaContentForms/Content/content_edit.html.twig' - ezsettings.default.content_edit.templates.create_draft: '@@IbexaContentForms/Content/content_create_draft.html.twig' + ibexa.site_access.config.default.content_edit.templates.edit: '@@IbexaContentForms/Content/content_edit.html.twig' + ibexa.site_access.config.default.content_edit.templates.create: '@@IbexaContentForms/Content/content_edit.html.twig' + ibexa.site_access.config.default.content_edit.templates.create_draft: '@@IbexaContentForms/Content/content_create_draft.html.twig' - ezsettings.default.user_edit.templates.update: '@@IbexaContentForms/Content/content_edit.html.twig' - ezsettings.default.user_edit.templates.create: '@@IbexaContentForms/Content/content_edit.html.twig' + ibexa.site_access.config.default.user_edit.templates.update: '@@IbexaContentForms/Content/content_edit.html.twig' + ibexa.site_access.config.default.user_edit.templates.create: '@@IbexaContentForms/Content/content_edit.html.twig' - ezsettings.default.content_edit_view: {} - ezsettings.default.content_create_view: {} + ibexa.site_access.config.default.content_edit_view: {} + ibexa.site_access.config.default.content_create_view: {} diff --git a/src/bundle/Resources/config/fieldtypes.yaml b/src/bundle/Resources/config/fieldtypes.yaml index 9a87d9cd..ae7d335c 100644 --- a/src/bundle/Resources/config/fieldtypes.yaml +++ b/src/bundle/Resources/config/fieldtypes.yaml @@ -17,7 +17,7 @@ services: Ibexa\ContentForms\Form\Type\FieldType\CountryFieldType: arguments: - $countriesInfo: '%ezpublish.fieldType.ezcountry.data%' + $countriesInfo: '%ibexa.field_type.country.data%' # # FormMappers diff --git a/src/bundle/Resources/config/services.yaml b/src/bundle/Resources/config/services.yaml index e4b84a93..f3e1f743 100644 --- a/src/bundle/Resources/config/services.yaml +++ b/src/bundle/Resources/config/services.yaml @@ -5,7 +5,7 @@ imports: parameters: - ezplatform.content_forms.user_content_type_identifier: "user" + ibexa.content_forms.user_content_type_identifier: "user" services: Ibexa\ContentForms\FieldType\FieldTypeFormMapperDispatcher: ~ diff --git a/src/lib/FieldType/DataTransformer/MultipleCountryValueTransformer.php b/src/lib/FieldType/DataTransformer/MultipleCountryValueTransformer.php index 185c1f51..1352f88d 100644 --- a/src/lib/FieldType/DataTransformer/MultipleCountryValueTransformer.php +++ b/src/lib/FieldType/DataTransformer/MultipleCountryValueTransformer.php @@ -18,7 +18,7 @@ class MultipleCountryValueTransformer implements DataTransformerInterface { /** - * @var array Array of countries from ezpublish.fieldType.ezcountry.data + * @var array Array of countries from "ibexa.field_type.country.data" */ protected $countriesInfo; diff --git a/src/lib/FieldType/DataTransformer/SingleCountryValueTransformer.php b/src/lib/FieldType/DataTransformer/SingleCountryValueTransformer.php index 86853fc4..76838dfe 100644 --- a/src/lib/FieldType/DataTransformer/SingleCountryValueTransformer.php +++ b/src/lib/FieldType/DataTransformer/SingleCountryValueTransformer.php @@ -19,7 +19,7 @@ class SingleCountryValueTransformer implements DataTransformerInterface { /** - * @var array Array of countries from ezpublish.fieldType.ezcountry.data + * @var array Array of countries from "ibexa.field_type.country.data" */ protected $countriesInfo; diff --git a/tests/lib/FieldType/DataTransformer/MultipleCountryValueTransformerTest.php b/tests/lib/FieldType/DataTransformer/MultipleCountryValueTransformerTest.php index 43ec42c0..bbe080e3 100644 --- a/tests/lib/FieldType/DataTransformer/MultipleCountryValueTransformerTest.php +++ b/tests/lib/FieldType/DataTransformer/MultipleCountryValueTransformerTest.php @@ -15,7 +15,7 @@ class MultipleCountryValueTransformerTest extends TestCase { /** - * @var array Array of countries from ezpublish.fieldType.ezcountry.data + * @var array Array of countries from "ibexa.field_type.country.data" */ protected $countriesInfo = [ 'AF' => ['Name' => 'Afghanistan', 'Alpha2' => 'AF', 'Alpha3' => 'AFG', 'IDC' => '93'],