From e9f6c8feb83df87adf89b16663b263d5728cbf66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edi=20Modri=C4=87?= Date: Thu, 1 Dec 2016 14:27:20 +0100 Subject: [PATCH] Remove deprecated YML syntax in configuration --- bundle/Resources/config/default_settings.yml | 4 +-- .../Resources/config/fieldtype_services.yml | 32 +++++++++---------- bundle/Resources/config/services.yml | 2 +- bundle/Resources/config/templating.yml | 4 +-- lib/settings/fieldtype_external_storages.yml | 2 +- lib/settings/fieldtypes.yml | 2 +- lib/settings/indexable_fieldtypes.yml | 2 +- .../legacy/external_storage_gateways.yml | 4 +-- .../legacy/field_value_converters.yml | 2 +- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/bundle/Resources/config/default_settings.yml b/bundle/Resources/config/default_settings.yml index cbd62c26..769500f0 100644 --- a/bundle/Resources/config/default_settings.yml +++ b/bundle/Resources/config/default_settings.yml @@ -3,8 +3,8 @@ parameters: # Built-in stylesheets are treated as custom for the sake of extensibility. ezsettings.default.fieldtypes.ezxml.custom_xsl: - - path: %kernel.root_dir%/../vendor/ezsystems/ezplatform-xmltext-fieldtype/lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Html5_core.xsl + path: "%kernel.root_dir%/../vendor/ezsystems/ezplatform-xmltext-fieldtype/lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Html5_core.xsl" priority: 0 - - path: %kernel.root_dir%/../vendor/ezsystems/ezplatform-xmltext-fieldtype/lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Html5_custom.xsl + path: "%kernel.root_dir%/../vendor/ezsystems/ezplatform-xmltext-fieldtype/lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Html5_custom.xsl" priority: 0 diff --git a/bundle/Resources/config/fieldtype_services.yml b/bundle/Resources/config/fieldtype_services.yml index dde2494f..71c859c1 100644 --- a/bundle/Resources/config/fieldtype_services.yml +++ b/bundle/Resources/config/fieldtype_services.yml @@ -1,6 +1,6 @@ parameters: ezpublish.fieldType.ezxmltext.converter.html5.class: EzSystems\EzPlatformXmlTextFieldTypeBundle\Converter\Html5 - ezpublish.fieldType.ezxmltext.converter.html5.resources: %kernel.root_dir%/../vendor/ezsystems/ezplatform-xmltext-fieldtype/lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Html5.xsl + ezpublish.fieldType.ezxmltext.converter.html5.resources: "%kernel.root_dir%/../vendor/ezsystems/ezplatform-xmltext-fieldtype/lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Html5.xsl" ezpublish.fieldType.ezxmltext.converter.embedToHtml5.class: eZ\Publish\Core\FieldType\XmlText\Converter\EmbedToHtml5 ezpublish.fieldType.ezxmlText.converter.embedToHtml5.excludedAttributes: [view, node_id, object_id] ezpublish.fieldType.ezxmltext.converter.ezLinkToHtml5.class: eZ\Publish\Core\FieldType\XmlText\Converter\EzLinkToHtml5 @@ -9,37 +9,37 @@ parameters: services: ezpublish.fieldType.ezxmltext.converter.html5: - class: %ezpublish.fieldType.ezxmltext.converter.html5.class% + class: "%ezpublish.fieldType.ezxmltext.converter.html5.class%" arguments: - - %ezpublish.fieldType.ezxmltext.converter.html5.resources% - - @ezpublish.config.resolver + - "%ezpublish.fieldType.ezxmltext.converter.html5.resources%" + - "@ezpublish.config.resolver" ezpublish.fieldType.ezxmltext.converter.expanding: - class: %ezpublish.fieldType.ezxmltext.converter.expanding.class% + class: "%ezpublish.fieldType.ezxmltext.converter.expanding.class%" tags: - { name: ezpublish.ezxml.converter, priority: 32 } ezpublish.fieldType.ezxmltext.converter.embedLinking: - class: %ezpublish.fieldType.ezxmltext.converter.embedLinking.class% + class: "%ezpublish.fieldType.ezxmltext.converter.embedLinking.class%" tags: - { name: ezpublish.ezxml.converter, priority: 24 } ezpublish.fieldType.ezxmltext.converter.ezLinkToHtml5: - class: %ezpublish.fieldType.ezxmltext.converter.ezLinkToHtml5.class% + class: "%ezpublish.fieldType.ezxmltext.converter.ezLinkToHtml5.class%" arguments: - - @ezpublish.api.service.location - - @ezpublish.api.service.content - - @ezpublish.urlalias_router - - @?logger + - "@ezpublish.api.service.location" + - "@ezpublish.api.service.content" + - "@ezpublish.urlalias_router" + - "@?logger" tags: - { name: ezpublish.ezxml.converter, priority: 16 } ezpublish.fieldType.ezxmltext.converter.embedToHtml5: - class: %ezpublish.fieldType.ezxmltext.converter.embedToHtml5.class% + class: "%ezpublish.fieldType.ezxmltext.converter.embedToHtml5.class%" arguments: - - @fragment.handler - - @ezpublish.api.repository - - %ezpublish.fieldType.ezxmlText.converter.embedToHtml5.excludedAttributes% - - @?logger + - "@fragment.handler" + - "@ezpublish.api.repository" + - "%ezpublish.fieldType.ezxmlText.converter.embedToHtml5.excludedAttributes%" + - "@?logger" tags: - { name: ezpublish.ezxml.converter, priority: 8 } diff --git a/bundle/Resources/config/services.yml b/bundle/Resources/config/services.yml index b014d498..6c809458 100644 --- a/bundle/Resources/config/services.yml +++ b/bundle/Resources/config/services.yml @@ -3,7 +3,7 @@ parameters: services: ezpublish_rest.field_type_processor.ezxmltext: - class: %ezpublish_rest.field_type_processor.ezxmltext.class% + class: "%ezpublish_rest.field_type_processor.ezxmltext.class%" tags: - { name: ezpublish_rest.field_type_processor, alias: ezxmltext } diff --git a/bundle/Resources/config/templating.yml b/bundle/Resources/config/templating.yml index de428f2f..2b3b16c7 100644 --- a/bundle/Resources/config/templating.yml +++ b/bundle/Resources/config/templating.yml @@ -3,7 +3,7 @@ parameters: services: ezpublish.twig.extension.xml_text: - class: %ezpublish.twig.extension.xml_text.class% - arguments: [@ezpublish.fieldtype.ezxmltext.converter.html5] + class: "%ezpublish.twig.extension.xml_text.class%" + arguments: ["@ezpublish.fieldtype.ezxmltext.converter.html5"] tags: - { name: twig.extension } diff --git a/lib/settings/fieldtype_external_storages.yml b/lib/settings/fieldtype_external_storages.yml index 7fe8ce14..89724269 100644 --- a/lib/settings/fieldtype_external_storages.yml +++ b/lib/settings/fieldtype_external_storages.yml @@ -3,6 +3,6 @@ parameters: services: ezpublish.fieldType.ezxmltext.externalStorage: - class: %ezpublish.fieldType.ezxmltext.externalStorage.class% + class: "%ezpublish.fieldType.ezxmltext.externalStorage.class%" tags: - {name: ezpublish.fieldType.externalStorageHandler, alias: ezxmltext} diff --git a/lib/settings/fieldtypes.yml b/lib/settings/fieldtypes.yml index a3414f9f..4936ee2f 100644 --- a/lib/settings/fieldtypes.yml +++ b/lib/settings/fieldtypes.yml @@ -3,7 +3,7 @@ parameters: services: ezpublish.fieldType.ezxmltext: - class: %ezpublish.fieldType.ezxmltext.class% + class: "%ezpublish.fieldType.ezxmltext.class%" parent: ezpublish.fieldType tags: - {name: ezpublish.fieldType, alias: ezxmltext} diff --git a/lib/settings/indexable_fieldtypes.yml b/lib/settings/indexable_fieldtypes.yml index 0d312bee..ac0a1b1c 100644 --- a/lib/settings/indexable_fieldtypes.yml +++ b/lib/settings/indexable_fieldtypes.yml @@ -3,6 +3,6 @@ parameters: services: ezpublish.fieldType.indexable.ezxmltext: - class: %ezpublish.fieldType.indexable.ezxmltext.class% + class: "%ezpublish.fieldType.indexable.ezxmltext.class%" tags: - {name: ezpublish.fieldType.indexable, alias: ezxmltext} diff --git a/lib/settings/storage_engines/legacy/external_storage_gateways.yml b/lib/settings/storage_engines/legacy/external_storage_gateways.yml index 1bb591d5..59e91b52 100644 --- a/lib/settings/storage_engines/legacy/external_storage_gateways.yml +++ b/lib/settings/storage_engines/legacy/external_storage_gateways.yml @@ -3,7 +3,7 @@ parameters: services: ezpublish.fieldType.ezxmltext.storage_gateway: - class: %ezpublish.fieldType.ezxmltext.storage_gateway.class% - arguments: [@ezpublish.fieldType.ezurl.storage_gateway] + class: "%ezpublish.fieldType.ezxmltext.storage_gateway.class%" + arguments: ["@ezpublish.fieldType.ezurl.storage_gateway"] tags: - {name: ezpublish.fieldType.externalStorageHandler.gateway, alias: ezxmltext, identifier: LegacyStorage} diff --git a/lib/settings/storage_engines/legacy/field_value_converters.yml b/lib/settings/storage_engines/legacy/field_value_converters.yml index 9a8e53d5..68117590 100644 --- a/lib/settings/storage_engines/legacy/field_value_converters.yml +++ b/lib/settings/storage_engines/legacy/field_value_converters.yml @@ -5,6 +5,6 @@ services: # Note: converter services tagged with 'ezpublish.storageEngine.legacy.converter' are # registered to this one using compilation pass and factory ezpublish.fieldType.ezxmltext.converter: - class: %ezpublish.fieldType.ezxmltext.converter.class% + class: "%ezpublish.fieldType.ezxmltext.converter.class%" tags: - {name: ezpublish.storageEngine.legacy.converter, alias: ezxmltext, lazy: true, callback: '::create'}