Skip to content

Commit

Permalink
Merge pull request #15 from emodric/yml_deprecations
Browse files Browse the repository at this point in the history
Remove deprecated YML syntax in configuration
  • Loading branch information
bdunogier authored Dec 5, 2016
2 parents 7c5aba8 + e9f6c8f commit f52123b
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions bundle/Resources/config/default_settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
32 changes: 16 additions & 16 deletions bundle/Resources/config/fieldtype_services.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 }
2 changes: 1 addition & 1 deletion bundle/Resources/config/services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down
4 changes: 2 additions & 2 deletions bundle/Resources/config/templating.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
2 changes: 1 addition & 1 deletion lib/settings/fieldtype_external_storages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
2 changes: 1 addition & 1 deletion lib/settings/fieldtypes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
2 changes: 1 addition & 1 deletion lib/settings/indexable_fieldtypes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Original file line number Diff line number Diff line change
Expand Up @@ -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'}

0 comments on commit f52123b

Please sign in to comment.