core/core.services.yml | 30 ++++++++++---------- core/modules/aggregator/aggregator.services.yml | 6 ++-- core/modules/block/block.services.yml | 2 +- .../config_translation.services.yml | 2 +- core/modules/field/field.services.yml | 2 +- core/modules/language/language.services.yml | 2 +- core/modules/locale/locale.services.yml | 2 +- core/modules/migrate/migrate.services.yml | 10 +++---- .../migrate_drupal/migrate_drupal.services.yml | 2 +- core/modules/rest/rest.services.yml | 4 +-- core/modules/user/user.services.yml | 2 +- 11 files changed, 32 insertions(+), 32 deletions(-) diff --git a/core/core.services.yml b/core/core.services.yml index 5613f5e..37d857b 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -39,13 +39,13 @@ services: factory_method: get factory_service: cache_factory arguments: [config] - cache.cache: + cache.default: class: Drupal\Core\Cache\CacheBackendInterface tags: - { name: cache.bin } factory_method: get factory_service: cache_factory - arguments: [cache] + arguments: [default] cache.entity: class: Drupal\Core\Cache\CacheBackendInterface tags: @@ -146,7 +146,7 @@ services: class: Drupal\Core\Path\AliasWhitelist tags: - { name: needs_destruction } - arguments: [path_alias_whitelist, '@cache.cache', '@lock', '@state', '@database'] + arguments: [path_alias_whitelist, '@cache.default', '@lock', '@state', '@database'] path.alias_manager: class: Drupal\Core\Path\AliasManager arguments: ['@path.crud', '@path.alias_whitelist', '@language_manager'] @@ -178,16 +178,16 @@ services: - { name: persist } default_plugin_manager: abstract: true - arguments: ['@container.namespaces', '@cache.cache', '@language_manager', '@module_handler'] + arguments: ['@container.namespaces', '@cache.default', '@language_manager', '@module_handler'] module_handler: class: Drupal\Core\Extension\CachedModuleHandler arguments: ['%container.modules%', '@state', '@cache.bootstrap'] theme_handler: class: Drupal\Core\Extension\ThemeHandler - arguments: ['@config.factory', '@module_handler', '@cache.cache', '@info_parser', '@config.installer', '@router.builder'] + arguments: ['@config.factory', '@module_handler', '@cache.default', '@info_parser', '@config.installer', '@router.builder'] entity.manager: class: Drupal\Core\Entity\EntityManager - arguments: ['@container.namespaces', '@service_container', '@module_handler', '@cache.cache', '@language_manager', '@string_translation'] + arguments: ['@container.namespaces', '@service_container', '@module_handler', '@cache.default', '@language_manager', '@string_translation'] tags: - { name: plugin_manager_cache_clear } entity.form_builder: @@ -195,13 +195,13 @@ services: arguments: ['@entity.manager', '@form_builder'] plugin.manager.field.field_type: class: Drupal\Core\Field\FieldTypePluginManager - arguments: ['@container.namespaces', '@cache.cache', '@language_manager', '@module_handler'] + arguments: ['@container.namespaces', '@cache.default', '@language_manager', '@module_handler'] plugin.manager.field.widget: class: Drupal\Core\Field\WidgetPluginManager - arguments: ['@container.namespaces', '@cache.cache', '@module_handler', '@language_manager', '@plugin.manager.field.field_type'] + arguments: ['@container.namespaces', '@cache.default', '@module_handler', '@language_manager', '@plugin.manager.field.field_type'] plugin.manager.field.formatter: class: Drupal\Core\Field\FormatterPluginManager - arguments: ['@container.namespaces', '@cache.cache', '@module_handler', '@language_manager', '@plugin.manager.field.field_type'] + arguments: ['@container.namespaces', '@cache.default', '@module_handler', '@language_manager', '@plugin.manager.field.field_type'] plugin.manager.archiver: class: Drupal\Core\Archiver\ArchiverManager parent: default_plugin_manager @@ -210,13 +210,13 @@ services: arguments: ['@container.namespaces'] plugin.manager.menu.local_action: class: Drupal\Core\Menu\LocalActionManager - arguments: ['@controller_resolver', '@request', '@router.route_provider', '@module_handler', '@cache.cache', '@language_manager', '@access_manager', '@current_user'] + arguments: ['@controller_resolver', '@request', '@router.route_provider', '@module_handler', '@cache.default', '@language_manager', '@access_manager', '@current_user'] plugin.manager.menu.local_task: class: Drupal\Core\Menu\LocalTaskManager - arguments: ['@controller_resolver', '@request', '@router.route_provider', '@router.builder', '@module_handler', '@cache.cache', '@language_manager', '@access_manager', '@current_user'] + arguments: ['@controller_resolver', '@request', '@router.route_provider', '@router.builder', '@module_handler', '@cache.default', '@language_manager', '@access_manager', '@current_user'] plugin.manager.menu.contextual_link: class: Drupal\Core\Menu\ContextualLinkManager - arguments: ['@controller_resolver', '@module_handler', '@cache.cache', '@language_manager', '@access_manager', '@current_user'] + arguments: ['@controller_resolver', '@module_handler', '@cache.default', '@language_manager', '@access_manager', '@current_user'] plugin.cache_clearer: class: Drupal\Core\Plugin\CachedDiscoveryClearer request: @@ -606,7 +606,7 @@ services: arguments: ['@database', '@request'] plugin.manager.mail: class: Drupal\Core\Mail\MailManager - arguments: ['@container.namespaces', '@cache.cache', '@language_manager', '@module_handler', '@config.factory'] + arguments: ['@container.namespaces', '@cache.default', '@language_manager', '@module_handler', '@config.factory'] plugin.manager.condition: class: Drupal\Core\Condition\ConditionManager parent: default_plugin_manager @@ -622,7 +622,7 @@ services: - { name: event_subscriber } image.toolkit.manager: class: Drupal\Core\ImageToolkit\ImageToolkitManager - arguments: ['@container.namespaces', '@cache.cache', '@language_manager', '@config.factory', '@module_handler'] + arguments: ['@container.namespaces', '@cache.default', '@language_manager', '@config.factory', '@module_handler'] image.factory: class: Drupal\Core\Image\ImageFactory arguments: ['@image.toolkit.manager'] @@ -701,7 +701,7 @@ services: class: Zend\Feed\Writer\Extension\WellFormedWeb\Renderer\Entry theme.registry: class: Drupal\Core\Theme\Registry - arguments: ['@cache.cache', '@lock', '@module_handler'] + arguments: ['@cache.default', '@lock', '@module_handler'] tags: - { name: needs_destruction } authentication: diff --git a/core/modules/aggregator/aggregator.services.yml b/core/modules/aggregator/aggregator.services.yml index 335ed77..eed8d20 100644 --- a/core/modules/aggregator/aggregator.services.yml +++ b/core/modules/aggregator/aggregator.services.yml @@ -1,10 +1,10 @@ services: plugin.manager.aggregator.fetcher: class: Drupal\aggregator\Plugin\AggregatorPluginManager - arguments: [fetcher, '@container.namespaces', '@cache.cache', '@language_manager', '@module_handler'] + arguments: [fetcher, '@container.namespaces', '@cache.default', '@language_manager', '@module_handler'] plugin.manager.aggregator.parser: class: Drupal\aggregator\Plugin\AggregatorPluginManager - arguments: [parser, '@container.namespaces', '@cache.cache', '@language_manager', '@module_handler'] + arguments: [parser, '@container.namespaces', '@cache.default', '@language_manager', '@module_handler'] plugin.manager.aggregator.processor: class: Drupal\aggregator\Plugin\AggregatorPluginManager - arguments: [processor, '@container.namespaces', '@cache.cache', '@language_manager', '@module_handler'] + arguments: [processor, '@container.namespaces', '@cache.default', '@language_manager', '@module_handler'] diff --git a/core/modules/block/block.services.yml b/core/modules/block/block.services.yml index f9c9b45..b0f27c1 100644 --- a/core/modules/block/block.services.yml +++ b/core/modules/block/block.services.yml @@ -1,7 +1,7 @@ services: plugin.manager.block: class: Drupal\block\Plugin\Type\BlockManager - arguments: ['@container.namespaces', '@cache.cache', '@language_manager', '@module_handler', '@string_translation'] + arguments: ['@container.namespaces', '@cache.default', '@language_manager', '@module_handler', '@string_translation'] theme.negotiator.block.admin_demo: class: Drupal\block\Theme\AdminDemoNegotiator tags: diff --git a/core/modules/config_translation/config_translation.services.yml b/core/modules/config_translation/config_translation.services.yml index 47a0bf6..f4ed510 100644 --- a/core/modules/config_translation/config_translation.services.yml +++ b/core/modules/config_translation/config_translation.services.yml @@ -20,7 +20,7 @@ services: plugin.manager.config_translation.mapper: class: Drupal\config_translation\ConfigMapperManager arguments: - - '@cache.cache' + - '@cache.default' - '@language_manager' - '@module_handler' - '@config.typed' diff --git a/core/modules/field/field.services.yml b/core/modules/field/field.services.yml index ef8b422..4fc8d29 100644 --- a/core/modules/field/field.services.yml +++ b/core/modules/field/field.services.yml @@ -1,5 +1,5 @@ services: field.info: class: Drupal\field\FieldInfo - arguments: ['@cache.cache', '@config.factory', '@module_handler', '@plugin.manager.field.field_type', '@language_manager'] + arguments: ['@cache.default', '@config.factory', '@module_handler', '@plugin.manager.field.field_type', '@language_manager'] diff --git a/core/modules/language/language.services.yml b/core/modules/language/language.services.yml index fa4f4f3..acfb3fa 100644 --- a/core/modules/language/language.services.yml +++ b/core/modules/language/language.services.yml @@ -1,7 +1,7 @@ services: plugin.manager.language_negotiation_method: class: Drupal\language\LanguageNegotiationMethodManager - arguments: ['@container.namespaces', '@cache.cache', '@module_handler'] + arguments: ['@container.namespaces', '@cache.default', '@module_handler'] language_negotiator: class: Drupal\language\LanguageNegotiator arguments: ['@language_manager', '@plugin.manager.language_negotiation_method', '@config.factory', '@settings'] diff --git a/core/modules/locale/locale.services.yml b/core/modules/locale/locale.services.yml index da26a28..75bc525 100644 --- a/core/modules/locale/locale.services.yml +++ b/core/modules/locale/locale.services.yml @@ -12,7 +12,7 @@ services: arguments: ['@database'] string_translator.locale.lookup: class: Drupal\locale\LocaleTranslation - arguments: ['@locale.storage', '@cache.cache', '@lock', '@config.factory'] + arguments: ['@locale.storage', '@cache.default', '@lock', '@config.factory'] tags: - { name: string_translator } - { name: needs_destruction } diff --git a/core/modules/migrate/migrate.services.yml b/core/modules/migrate/migrate.services.yml index 4112da5..068dde6 100644 --- a/core/modules/migrate/migrate.services.yml +++ b/core/modules/migrate/migrate.services.yml @@ -8,19 +8,19 @@ services: arguments: [migrate] plugin.manager.migrate.source: class: Drupal\migrate\Plugin\MigratePluginManager - arguments: [source, '@container.namespaces', '@cache.cache', '@language_manager', '@module_handler', 'Drupal\migrate\Annotation\MigrateSource'] + arguments: [source, '@container.namespaces', '@cache.default', '@language_manager', '@module_handler', 'Drupal\migrate\Annotation\MigrateSource'] plugin.manager.migrate.process: class: Drupal\migrate\Plugin\MigratePluginManager - arguments: [process, '@container.namespaces', '@cache.cache', '@language_manager', '@module_handler', 'Drupal\migrate\Annotation\MigrateProcessPlugin'] + arguments: [process, '@container.namespaces', '@cache.default', '@language_manager', '@module_handler', 'Drupal\migrate\Annotation\MigrateProcessPlugin'] plugin.manager.migrate.destination: class: Drupal\migrate\Plugin\MigrateDestinationPluginManager - arguments: [destination, '@container.namespaces', '@cache.cache', '@language_manager', '@module_handler', '@entity.manager'] + arguments: [destination, '@container.namespaces', '@cache.default', '@language_manager', '@module_handler', '@entity.manager'] plugin.manager.migrate.id_map: class: Drupal\migrate\Plugin\MigratePluginManager - arguments: [id_map, '@container.namespaces', '@cache.cache', '@language_manager', '@module_handler'] + arguments: [id_map, '@container.namespaces', '@cache.default', '@language_manager', '@module_handler'] plugin.manager.migrate.entity_field: class: Drupal\migrate\Plugin\MigratePluginManager - arguments: [entity_field, '@container.namespaces', '@cache.cache', '@language_manager', '@module_handler'] + arguments: [entity_field, '@container.namespaces', '@cache.default', '@language_manager', '@module_handler'] password_migrate: class: Drupal\migrate\MigratePassword arguments: ['@password_original'] diff --git a/core/modules/migrate_drupal/migrate_drupal.services.yml b/core/modules/migrate_drupal/migrate_drupal.services.yml index 8ed0b5c..10c1b86 100644 --- a/core/modules/migrate_drupal/migrate_drupal.services.yml +++ b/core/modules/migrate_drupal/migrate_drupal.services.yml @@ -1,4 +1,4 @@ services: plugin.manager.migrate.load: class: Drupal\migrate\Plugin\MigratePluginManager - arguments: [load, '@container.namespaces', '@cache.cache', '@language_manager', '@module_handler'] \ No newline at end of file + arguments: [load, '@container.namespaces', '@cache.default', '@language_manager', '@module_handler'] diff --git a/core/modules/rest/rest.services.yml b/core/modules/rest/rest.services.yml index 83aa8c0..fc42ecf 100644 --- a/core/modules/rest/rest.services.yml +++ b/core/modules/rest/rest.services.yml @@ -18,7 +18,7 @@ services: arguments: ['@rest.link_manager.type', '@rest.link_manager.relation'] rest.link_manager.type: class: Drupal\rest\LinkManager\TypeLinkManager - arguments: ['@cache.cache'] + arguments: ['@cache.default'] rest.link_manager.relation: class: Drupal\rest\LinkManager\RelationLinkManager - arguments: ['@cache.cache', '@entity.manager'] + arguments: ['@cache.default', '@entity.manager'] diff --git a/core/modules/user/user.services.yml b/core/modules/user/user.services.yml index 17229ed..33fe88a 100644 --- a/core/modules/user/user.services.yml +++ b/core/modules/user/user.services.yml @@ -42,7 +42,7 @@ services: - { name: theme_negotiator, priority: -40 } user.permissions_hash: class: Drupal\user\PermissionsHash - arguments: ['@private_key', '@cache.cache'] + arguments: ['@private_key', '@cache.default'] user.auth: class: Drupal\user\UserAuth arguments: ['@entity.manager', '@password']