diff --git a/core/modules/help/src/Plugin/HelpSection/HelpSectionPluginBase.php b/core/modules/help/src/Plugin/HelpSection/HelpSectionPluginBase.php index 894810f..760ec62 100644 --- a/core/modules/help/src/Plugin/HelpSection/HelpSectionPluginBase.php +++ b/core/modules/help/src/Plugin/HelpSection/HelpSectionPluginBase.php @@ -9,7 +9,6 @@ use Drupal\Core\Cache\UnchangingCacheableDependencyTrait; use Drupal\Core\Plugin\PluginBase; -use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\help\HelpSectionPluginInterface; /** @@ -19,7 +18,7 @@ * @see \Drupal\help\Annotation\HelpSection * @see \Drupal\help\HelpSectionManager */ -abstract class HelpSectionPluginBase extends PluginBase implements HelpSectionPluginInterface, ContainerFactoryPluginInterface { +abstract class HelpSectionPluginBase extends PluginBase implements HelpSectionPluginInterface { use UnchangingCacheableDependencyTrait; } diff --git a/core/modules/help/src/Plugin/HelpSection/HookHelpSection.php b/core/modules/help/src/Plugin/HelpSection/HookHelpSection.php index 9c041b3..500aa77 100644 --- a/core/modules/help/src/Plugin/HelpSection/HookHelpSection.php +++ b/core/modules/help/src/Plugin/HelpSection/HookHelpSection.php @@ -8,8 +8,8 @@ namespace Drupal\help\Plugin\HelpSection; use Drupal\Core\Extension\ModuleHandlerInterface; -use Drupal\Core\StringTranslation\TranslationInterface; use Drupal\Core\Link; +use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -21,7 +21,7 @@ * description = @Translation("Module overviews are provided by modules. Overviews available for your installed modules:"), * ) */ -class HookHelpSection extends HelpSectionPluginBase { +class HookHelpSection extends HelpSectionPluginBase implements ContainerFactoryPluginInterface { /** * The module handler. @@ -39,14 +39,11 @@ class HookHelpSection extends HelpSectionPluginBase { * The plugin_id for the plugin instance. * @param mixed $plugin_definition * The plugin implementation definition. - * @param \Drupal\Core\StringTranslation\TranslationInterface $translation - * The string_translation service. * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler * The module handler service. */ - public function __construct(array $configuration, $plugin_id, $plugin_definition, TranslationInterface $translation, ModuleHandlerInterface $module_handler) { + public function __construct(array $configuration, $plugin_id, $plugin_definition, ModuleHandlerInterface $module_handler) { parent::__construct($configuration, $plugin_id, $plugin_definition); - $this->stringTranslation = $translation; $this->moduleHandler = $module_handler; } @@ -58,7 +55,6 @@ public static function create(ContainerInterface $container, array $configuratio $configuration, $plugin_id, $plugin_definition, - $container->get('string_translation'), $container->get('module_handler') ); } diff --git a/core/modules/tour/src/Plugin/HelpSection/TourHelpSection.php b/core/modules/tour/src/Plugin/HelpSection/TourHelpSection.php index 77a694d..853d4d1 100644 --- a/core/modules/tour/src/Plugin/HelpSection/TourHelpSection.php +++ b/core/modules/tour/src/Plugin/HelpSection/TourHelpSection.php @@ -9,7 +9,7 @@ use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Link; -use Drupal\Core\StringTranslation\TranslationInterface; +use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\Url; use Drupal\help\Plugin\HelpSection\HelpSectionPluginBase; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -24,7 +24,7 @@ * permission = "access tour" * ) */ -class TourHelpSection extends HelpSectionPluginBase { +class TourHelpSection extends HelpSectionPluginBase implements ContainerFactoryPluginInterface { /** * The entity type manager. @@ -42,14 +42,11 @@ class TourHelpSection extends HelpSectionPluginBase { * The plugin_id for the plugin instance. * @param mixed $plugin_definition * The plugin implementation definition. - * @param \Drupal\Core\StringTranslation\TranslationInterface $translation - * The string_translation service. * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager * The entity manager service. */ - public function __construct(array $configuration, $plugin_id, $plugin_definition, TranslationInterface $translation, EntityTypeManagerInterface $entity_type_manager) { + public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager) { parent::__construct($configuration, $plugin_id, $plugin_definition); - $this->stringTranslation = $translation; $this->entityTypeManager = $entity_type_manager; } @@ -61,7 +58,6 @@ public static function create(ContainerInterface $container, array $configuratio $configuration, $plugin_id, $plugin_definition, - $container->get('string_translation'), $container->get('entity_type.manager') ); }