Issue #3325557 by longwave, mondrake, kim.pepper: Enable more service...

Issue #3325557 by longwave, mondrake, kim.pepper: Enable more service autowiring by adding interface aliases to core modules

core/modules/announcements_feed/announcements_feed.services.yml

@@ -6,6 +6,7 @@ services:
   announcements_feed.fetcher:
     class: Drupal\announcements_feed\AnnounceFetcher
     arguments: ['@http_client', '@config.factory', '@keyvalue.expirable', '@logger.channel.announcements_feed', '%announcements_feed.feed_json_url%']
+  Drupal\announcements_feed\AnnounceFetcher: '@announcements_feed.fetcher'
   logger.channel.announcements_feed:
     parent: logger.channel_base
     arguments: ['announcements_feed']

core/modules/ban/ban.services.yml

@@ -4,6 +4,7 @@ services:
     arguments: ['@database']
     tags:
       - { name: backend_overridable }
+  Drupal\ban\BanIpManagerInterface: '@ban.ip_manager'
   ban.middleware:
     class: Drupal\ban\BanMiddleware
     arguments: ['@ban.ip_manager']

core/modules/big_pipe/big_pipe.services.yml

@@ -12,6 +12,7 @@ services:
   big_pipe:
     class: Drupal\big_pipe\Render\BigPipe
     arguments: ['@renderer', '@session', '@request_stack', '@http_kernel', '@event_dispatcher', '@config.factory']
+  Drupal\big_pipe\Render\BigPipe: '@big_pipe'
   html_response.attachments_processor.big_pipe:
     public: false
     class: \Drupal\big_pipe\Render\BigPipeResponseAttachmentsProcessor

core/modules/block/block.services.yml

@@ -10,3 +10,4 @@ services:
   block.repository:
     class: Drupal\block\BlockRepository
     arguments: ['@entity_type.manager', '@theme.manager', '@context.handler']
+  Drupal\block\BlockRepositoryInterface: '@block.repository'

core/modules/book/book.services.yml

@@ -7,17 +7,21 @@ services:
   book.manager:
     class: Drupal\book\BookManager
     arguments: ['@entity_type.manager', '@string_translation', '@config.factory', '@book.outline_storage', '@renderer', '@language_manager', '@entity.repository', '@book.backend_chained_cache', '@book.memory_cache']
+  Drupal\book\BookManagerInterface: '@book.manager'
   book.outline:
     class: Drupal\book\BookOutline
     arguments: ['@book.manager']
+  Drupal\book\BookOutline: '@book.outline'
   book.export:
     class: Drupal\book\BookExport
     arguments: ['@entity_type.manager', '@book.manager', '@entity.repository']
+  Drupal\book\BookExport: '@book.export'
   book.outline_storage:
     class: Drupal\book\BookOutlineStorage
     arguments: ['@database']
     tags:
       - { name: backend_overridable }
+  Drupal\book\BookOutlineStorageInterface: '@book.outline_storage'
   access_check.book.removable:
     class: Drupal\book\Access\BookNodeIsRemovableAccessCheck
     arguments: ['@book.manager']

core/modules/breakpoint/breakpoint.services.yml

@@ -4,3 +4,4 @@ services:
     arguments: ['@module_handler', '@theme_handler', '@cache.discovery', '@string_translation']
     tags:
       - { name: plugin_manager_cache_clear }
+  Drupal\breakpoint\BreakpointManagerInterface: '@breakpoint.manager'

core/modules/ckeditor5/ckeditor5.services.yml

@@ -2,6 +2,7 @@ services:
   plugin.manager.ckeditor5.plugin:
     class: Drupal\ckeditor5\Plugin\CKEditor5PluginManager
     parent: default_plugin_manager
+  Drupal\ckeditor5\Plugin\CKEditor5PluginManagerInterface: '@plugin.manager.ckeditor5.plugin'
   # @todo Remove in Drupal 11: https://www.drupal.org/project/ckeditor5/issues/3239012
   plugin.manager.ckeditor4to5upgrade.plugin:
     public: false
@@ -15,11 +16,13 @@ services:
       - '@logger.channel.ckeditor5'
       - '@module_handler'
       - '@current_user'
+  Drupal\ckeditor5\SmartDefaultSettings: '@ckeditor5.smart_default_settings'
   ckeditor5.stylesheets.message:
     class: Drupal\ckeditor5\CKEditor5StylesheetsMessage
     arguments:
       - '@theme_handler'
       - '@config.factory'
+  Drupal\ckeditor5\CKEditor5StylesheetsMessage: '@ckeditor5.stylesheets.message'
   ckeditor5.ckeditor5_cache_tag:
     class: Drupal\ckeditor5\EventSubscriber\CKEditor5CacheTag
     arguments: ['@cache_tags.invalidator']

core/modules/comment/comment.services.yml

@@ -8,12 +8,14 @@ services:
   comment.manager:
     class: Drupal\comment\CommentManager
     arguments: ['@entity_type.manager', '@config.factory', '@string_translation', '@module_handler', '@current_user', '@entity_field.manager', '@entity_display.repository']
+  Drupal\comment\CommentManagerInterface: '@comment.manager'
 
   comment.statistics:
     class: Drupal\comment\CommentStatistics
     arguments: ['@database', '@current_user', '@entity_type.manager', '@state', '@database.replica']
     tags:
       - { name: backend_overridable }
+  Drupal\comment\CommentStatisticsInterface: '@comment.statistics'
 
   comment.lazy_builders:
     class: Drupal\comment\CommentLazyBuilders
@@ -22,3 +24,4 @@ services:
   comment.link_builder:
     class: Drupal\comment\CommentLinkBuilder
     arguments: ['@current_user', '@comment.manager', '@module_handler', '@string_translation', '@entity_type.manager']
+  Drupal\comment\CommentLinkBuilderInterface: '@comment.link_builder'

core/modules/config_translation/config_translation.services.yml

@@ -25,3 +25,4 @@ services:
       - '@module_handler'
       - '@config.typed'
       - '@theme_handler'
+  Drupal\config_translation\ConfigMapperManagerInterface: '@plugin.manager.config_translation.mapper'

core/modules/contact/contact.services.yml

@@ -7,6 +7,7 @@ services:
   contact.mail_handler:
     class: Drupal\contact\MailHandler
     arguments: ['@plugin.manager.mail', '@language_manager', '@logger.channel.contact', '@string_translation', '@entity_type.manager']
+  Drupal\contact\MailHandlerInterface: '@contact.mail_handler'
   logger.channel.contact:
     class: Drupal\Core\Logger\LoggerChannel
     factory: ['@logger.factory', 'get']

core/modules/content_moderation/content_moderation.services.yml

@@ -2,9 +2,11 @@ services:
   content_moderation.state_transition_validation:
     class: Drupal\content_moderation\StateTransitionValidation
     arguments: ['@content_moderation.moderation_information']
+  Drupal\content_moderation\StateTransitionValidationInterface: '@content_moderation.state_transition_validation'
   content_moderation.moderation_information:
     class: Drupal\content_moderation\ModerationInformation
     arguments: ['@entity_type.manager', '@entity_type.bundle.info']
+  Drupal\content_moderation\ModerationInformationInterface: '@content_moderation.moderation_information'
   access_check.latest_revision:
     class: Drupal\content_moderation\Access\LatestRevisionCheck
     arguments: ['@content_moderation.moderation_information']

core/modules/content_translation/content_translation.services.yml

@@ -2,6 +2,7 @@ services:
   content_translation.synchronizer:
     class: Drupal\content_translation\FieldTranslationSynchronizer
     arguments: ['@entity_type.manager', '@plugin.manager.field.field_type']
+  Drupal\content_translation\FieldTranslationSynchronizerInterface: '@content_translation.synchronizer'
 
   content_translation.subscriber:
     class: Drupal\content_translation\Routing\ContentTranslationRouteSubscriber
@@ -30,3 +31,5 @@ services:
   content_translation.manager:
     class: Drupal\content_translation\ContentTranslationManager
     arguments: ['@entity_type.manager', '@entity_type.bundle.info']
+  Drupal\content_translation\ContentTranslationManagerInterface: '@content_translation.manager'
+  Drupal\content_translation\BundleTranslationSettingsInterface: '@content_translation.manager'

core/modules/file/file.services.yml

@@ -7,6 +7,8 @@ services:
   file.upload_handler:
     class: Drupal\file\Upload\FileUploadHandler
     arguments: [ '@file_system', '@entity_type.manager', '@stream_wrapper_manager', '@event_dispatcher', '@file.mime_type.guesser', '@current_user', '@request_stack', '@file.repository' ]
+  Drupal\file\Upload\FileUploadHandler: '@file.upload_handler'
   file.repository:
     class: Drupal\file\FileRepository
     arguments: [ '@file_system', '@stream_wrapper_manager', '@entity_type.manager', '@module_handler', '@file.usage', '@current_user' ]
+  Drupal\file\FileRepositoryInterface: '@file.repository'

core/modules/forum/forum.services.yml

@@ -4,6 +4,7 @@ services:
     arguments: ['@config.factory', '@entity_type.manager', '@database', '@string_translation', '@comment.manager', '@entity_field.manager']
     tags:
       - { name: backend_overridable }
+  Drupal\forum\ForumManagerInterface: '@forum_manager'
   forum.breadcrumb.node:
     class: Drupal\forum\Breadcrumb\ForumNodeBreadcrumbBuilder
     arguments: ['@entity_type.manager', '@config.factory', '@forum_manager', '@string_translation']
@@ -19,6 +20,7 @@ services:
     arguments: ['@database']
     tags:
       - { name: backend_overridable }
+  Drupal\forum\ForumIndexStorageInterface: '@forum.index_storage'
 
   forum.uninstall_validator:
     class: Drupal\forum\ForumUninstallValidator

core/modules/help_topics/help_topics.services.yml

@@ -8,6 +8,7 @@ services:
   plugin.manager.help_topic:
     class: Drupal\help_topics\HelpTopicPluginManager
     arguments: ['@module_handler', '@theme_handler', '@cache.discovery', '%app.root%']
+  Drupal\help_topics\HelpTopicPluginManagerInterface: '@plugin.manager.help_topic'
   help.twig.loader:
     class: Drupal\help_topics\HelpTopicTwigLoader
     arguments: ['%app.root%', '@module_handler', '@theme_handler']

core/modules/jsonapi/jsonapi.services.yml

@@ -84,6 +84,7 @@ services:
   jsonapi.resource_type.repository:
     class: Drupal\jsonapi\ResourceType\ResourceTypeRepository
     arguments: ['@entity_type.manager', '@entity_type.bundle.info', '@entity_field.manager', '@cache.jsonapi_resource_types', '@event_dispatcher']
+  Drupal\jsonapi\ResourceType\ResourceTypeRepositoryInterface: '@jsonapi.resource_type.repository'
   jsonapi.route_enhancer:
     class: Drupal\jsonapi\Routing\RouteEnhancer
     tags:
@@ -91,11 +92,13 @@ services:
   jsonapi.field_resolver:
     class: Drupal\jsonapi\Context\FieldResolver
     arguments: ['@entity_type.manager', '@entity_field.manager', '@entity_type.bundle.info', '@jsonapi.resource_type.repository', '@module_handler', '@current_user']
+  Drupal\jsonapi\Context\FieldResolver: '@jsonapi.field_resolver'
   jsonapi.include_resolver:
     class: Drupal\jsonapi\IncludeResolver
     arguments:
       - '@entity_type.manager'
       - '@jsonapi.entity_access_checker'
+  Drupal\jsonapi\IncludeResolver: '@jsonapi.include_resolver'
   paramconverter.jsonapi.entity_uuid:
     parent: paramconverter.entity
     class: Drupal\jsonapi\ParamConverter\EntityUuidConverter
@@ -158,6 +161,7 @@ services:
     calls:
       # This is a temporary measure. JSON:API should not need to be aware of the Content Moderation module.
       - [setLatestRevisionCheck, ['@?access_check.latest_revision']] # This is only injected when the service is available.
+  Drupal\jsonapi\Access\EntityAccessChecker: '@jsonapi.entity_access_checker'
   access_check.jsonapi.relationship_route_access:
     class: Drupal\jsonapi\Access\RelationshipRouteAccessCheck
     arguments: ['@jsonapi.entity_access_checker']
@@ -186,6 +190,7 @@ services:
       - '@jsonapi.serializer'
       - '@datetime.time'
       - '@current_user'
+  Drupal\jsonapi\Controller\EntityResource: '@jsonapi.entity_resource'
   jsonapi.file_upload:
     class: Drupal\jsonapi\Controller\FileUpload
     arguments:
@@ -193,6 +198,7 @@ services:
       - '@entity_field.manager'
       - '@jsonapi.file.uploader.field'
       - '@http_kernel'
+  Drupal\jsonapi\Controller\FileUpload: '@jsonapi.file_upload'
 
   # Event subscribers.
   jsonapi.custom_query_parameter_names_validator.subscriber:
@@ -223,6 +229,7 @@ services:
     public: false
     tags:
       - { name: service_collector, tag: jsonapi_version_negotiator, call: addVersionNegotiator }
+  Drupal\jsonapi\Revisions\VersionNegotiator: '@jsonapi.version_negotiator'
   jsonapi.version_negotiator.default:
     arguments: ['@entity_type.manager']
     public: false
@@ -250,3 +257,4 @@ services:
     class: Drupal\jsonapi\Controller\TemporaryJsonapiFileFieldUploader
     public: false
     arguments: ['@logger.channel.file', '@file_system', '@file.mime_type.guesser', '@token', '@lock', '@config.factory']
+  Drupal\jsonapi\Controller\TemporaryJsonapiFileFieldUploader: '@jsonapi.file.uploader.field'

core/modules/language/language.services.yml

@@ -7,6 +7,7 @@ services:
     arguments: ['@language_manager', '@plugin.manager.language_negotiation_method', '@config.factory', '@settings', '@request_stack']
     calls:
       - [initLanguageManager]
+  Drupal\language\LanguageNegotiatorInterface: '@language_negotiator'
   language.config_subscriber:
     class: Drupal\language\EventSubscriber\ConfigSubscriber
     arguments: ['@language_manager', '@language.default', '@config.factory', '@language_negotiator']
@@ -18,6 +19,8 @@ services:
     tags:
       - { name: config.factory.override, priority: -254 }
       - { name: event_subscriber }
+  Drupal\language\Config\LanguageConfigFactoryOverrideInterface: '@language.config_factory_override'
+  Drupal\Core\Config\ConfigFactoryOverrideInterface: '@language.config_factory_override'
   language_converter:
     class: Drupal\language\LanguageConverter
     arguments: ['@language_manager']

core/modules/layout_builder/layout_builder.services.yml

@@ -2,6 +2,7 @@ services:
   layout_builder.tempstore_repository:
     class: Drupal\layout_builder\LayoutTempstoreRepository
     arguments: ['@tempstore.shared']
+  Drupal\layout_builder\LayoutTempstoreRepositoryInterface: '@layout_builder.tempstore_repository'
   access_check.entity.layout_builder_access:
     class: Drupal\layout_builder\Access\LayoutBuilderAccessCheck
     tags:
@@ -10,6 +11,7 @@ services:
     class: Drupal\layout_builder\SectionStorage\SectionStorageManager
     parent: default_plugin_manager
     arguments: ['@context.handler']
+  Drupal\layout_builder\SectionStorage\SectionStorageManagerInterface: '@plugin.manager.layout_builder.section_storage'
   layout_builder.routes:
     class: Drupal\layout_builder\Routing\LayoutBuilderRoutes
     arguments: ['@plugin.manager.layout_builder.section_storage']
@@ -38,6 +40,7 @@ services:
   layout_builder.sample_entity_generator:
     class: Drupal\layout_builder\Entity\LayoutBuilderSampleEntityGenerator
     arguments: ['@tempstore.shared', '@entity_type.manager']
+  Drupal\layout_builder\Entity\SampleEntityGeneratorInterface: '@layout_builder.sample_entity_generator'
   layout_builder.render_block_component_subscriber:
     class: Drupal\layout_builder\EventSubscriber\BlockComponentRenderArray
     arguments: ['@current_user']
@@ -49,6 +52,7 @@ services:
   inline_block.usage:
     class: Drupal\layout_builder\InlineBlockUsage
     arguments: ['@database']
+  Drupal\layout_builder\InlineBlockUsageInterface: '@inline_block.usage'
   layout_builder.controller.entity_form:
     # Override the entity form controller to handle the entity layout_builder
     # operation.
@@ -56,6 +60,7 @@ services:
     class: Drupal\layout_builder\Controller\LayoutBuilderHtmlEntityFormController
     public: false
     arguments: ['@layout_builder.controller.entity_form.inner']
+  Drupal\layout_builder\Controller\LayoutBuilderHtmlEntityFormController: '@layout_builder.controller.entity_form'
   layout_builder.element.prepare_layout:
     class: Drupal\layout_builder\EventSubscriber\PrepareLayout
     arguments: ['@layout_builder.tempstore_repository', '@messenger']

core/modules/layout_discovery/layout_discovery.services.yml

@@ -2,6 +2,8 @@ services:
   plugin.manager.core.layout:
     class: Drupal\Core\Layout\LayoutPluginManager
     arguments: ['@container.namespaces', '@cache.discovery', '@module_handler', '@theme_handler']
+  Drupal\Core\Layout\LayoutPluginManagerInterface: '@plugin.manager.core.layout'
   layout.icon_builder:
     class: Drupal\Core\Layout\Icon\SvgIconBuilder
     shared: false
+  Drupal\Core\Layout\Icon\IconBuilderInterface: '@layout.icon_builder'

core/modules/locale/locale.services.yml

@@ -3,20 +3,25 @@ services:
     class: Drupal\locale\LocaleDefaultConfigStorage
     arguments: ['@config.storage', '@language_manager', '%install_profile%']
     public: false
+  Drupal\locale\LocaleDefaultConfigStorage: '@locale.default.config.storage'
   locale.config_manager:
     class: Drupal\locale\LocaleConfigManager
     arguments: ['@config.storage', '@locale.storage', '@config.factory', '@config.typed', '@language_manager', '@locale.default.config.storage', '@config.manager']
+  Drupal\locale\LocaleConfigManager: '@locale.config_manager'
   locale.storage:
     class: Drupal\locale\StringDatabaseStorage
     arguments: ['@database']
     tags:
       - { name: backend_overridable }
+  Drupal\locale\StringStorageInterface: '@locale.storage'
   locale.project:
     class: Drupal\locale\LocaleProjectStorage
     arguments: ['@keyvalue']
+  Drupal\locale\LocaleProjectStorageInterface: '@locale.project'
   locale.plural.formula:
     class: Drupal\locale\PluralFormula
     arguments: ['@language_manager', '@state']
+  Drupal\locale\PluralFormulaInterface: '@locale.plural.formula'
   string_translator.locale.lookup:
     class: Drupal\locale\LocaleTranslation
     arguments: ['@locale.storage', '@cache.default', '@lock', '@config.factory', '@language_manager', '@request_stack']