From 1d25fc9d103923982e58c31c451df49b19da89ef Mon Sep 17 00:00:00 2001
From: Jacqueline Young <55022-Jacqui.Tenderwolf@users.noreply.drupalcode.org>
Date: Tue, 29 Aug 2023 17:40:34 -0600
Subject: [PATCH] Issue #3380497 by Jacqui.Tenderwolf: Use the
ModuleHandlerInterface instead of the ModuleHandle in EventCreationService
---
.../src/NotificationService.php | 8 ++++----
src/EventCreationService.php | 8 ++++----
src/Form/EventSeriesForm.php | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/modules/recurring_events_registration/src/NotificationService.php b/modules/recurring_events_registration/src/NotificationService.php
index 58ce692..3fb2215 100644
--- a/modules/recurring_events_registration/src/NotificationService.php
+++ b/modules/recurring_events_registration/src/NotificationService.php
@@ -8,7 +8,7 @@ use Drupal\Core\Logger\LoggerChannelFactoryInterface;
use Drupal\Core\Messenger\Messenger;
use Drupal\Core\Utility\Token;
use Drupal\recurring_events_registration\Entity\RegistrantInterface;
-use Drupal\Core\Extension\ModuleHandler;
+use Drupal\Core\Extension\ModuleHandlerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\Queue\QueueFactory;
@@ -55,7 +55,7 @@ class NotificationService {
/**
* The module handler service.
*
- * @var \Drupal\Core\Extension\ModuleHandler
+ * @var \Drupal\Core\Extension\ModuleHandlerInterface
*/
protected $moduleHandler;
@@ -135,14 +135,14 @@ class NotificationService {
* The messenger service.
* @param \Drupal\Core\Utility\Token $token
* The token service.
- * @param \Drupal\Core\Extension\ModuleHandler $module_handler
+ * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
* The module handler service.
* @param \Drupal\recurring_events_registration\RegistrationCreationService $creation_service
* The registration creation service.
* @param \Drupal\Core\Queue\QueueFactory $queue_factory
* The queue factory.
*/
- public function __construct(TranslationInterface $translation, ConfigFactory $config_factory, LoggerChannelFactoryInterface $logger, Messenger $messenger, Token $token, ModuleHandler $module_handler, RegistrationCreationService $creation_service, QueueFactory $queue_factory) {
+ public function __construct(TranslationInterface $translation, ConfigFactory $config_factory, LoggerChannelFactoryInterface $logger, Messenger $messenger, Token $token, ModuleHandlerInterface $module_handler, RegistrationCreationService $creation_service, QueueFactory $queue_factory) {
$this->translation = $translation;
$this->configFactory = $config_factory;
$this->loggerFactory = $logger->get('recurring_events_registration');
diff --git a/src/EventCreationService.php b/src/EventCreationService.php
index edb51d9..18eeafe 100644
--- a/src/EventCreationService.php
+++ b/src/EventCreationService.php
@@ -13,7 +13,7 @@ use Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface;
use Drupal\Core\Entity\EntityFieldManager;
use Drupal\Core\Field\FieldTypePluginManager;
use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\Extension\ModuleHandler;
+use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\KeyValueStore\KeyValueFactoryInterface;
use Drupal\recurring_events\Entity\EventInstance;
@@ -72,7 +72,7 @@ class EventCreationService {
/**
* The module handler service.
*
- * @var \Drupal\Core\Extension\ModuleHandler
+ * @var \Drupal\Core\Extension\ModuleHandlerInterface
*/
protected $moduleHandler;
@@ -105,14 +105,14 @@ class EventCreationService {
* The field type plugin manager.
* @param \Drupal\Core\Entity\EntityFieldManager $entity_field_manager
* The entity field manager.
- * @param \Drupal\Core\Extension\ModuleHandler $module_handler
+ * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
* The module handler service.
* @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
* The entity type manager service.
* @param \Drupal\Core\KeyValueStore\KeyValueFactoryInterface $key_value
* The key value storage service.
*/
- public function __construct(TranslationInterface $translation, Connection $database, LoggerChannelFactoryInterface $logger, Messenger $messenger, FieldTypePluginManager $field_type_plugin_manager, EntityFieldManager $entity_field_manager, ModuleHandler $module_handler, EntityTypeManagerInterface $entity_type_manager, KeyValueFactoryInterface $key_value) {
+ public function __construct(TranslationInterface $translation, Connection $database, LoggerChannelFactoryInterface $logger, Messenger $messenger, FieldTypePluginManager $field_type_plugin_manager, EntityFieldManager $entity_field_manager, ModuleHandlerInterface $module_handler, EntityTypeManagerInterface $entity_type_manager, KeyValueFactoryInterface $key_value) {
$this->translation = $translation;
$this->database = $database;
$this->loggerChannel = $logger->get('recurring_events');
diff --git a/src/Form/EventSeriesForm.php b/src/Form/EventSeriesForm.php
index 419e947..8356967 100644
--- a/src/Form/EventSeriesForm.php
+++ b/src/Form/EventSeriesForm.php
@@ -17,7 +17,7 @@ use Drupal\Core\Entity\EntityRepositoryInterface;
use Drupal\Component\Datetime\TimeInterface;
use Drupal\Core\Session\AccountProxyInterface;
use Drupal\Core\Config\ConfigFactory;
-use Drupal\Core\Extension\ModuleHandler;
+use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\user\UserInterface;
/**
@@ -93,7 +93,7 @@ class EventSeriesForm extends ContentEntityForm {
/**
* The module handler service.
*
- * @var \Drupal\Core\Extension\ModuleHandler
+ * @var \Drupal\Core\Extension\ModuleHandlerInterface
*/
protected $moduleHandler;
@@ -147,12 +147,12 @@ class EventSeriesForm extends ContentEntityForm {
* The time interface.
* @param \Drupal\Core\Session\AccountProxyInterface $current_user
* The current user.
- * @param \Drupal\Core\Extension\ModuleHandler $module_handler
+ * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
* The module handler service.
* @param \Drupal\Core\Config\ConfigFactory $config_factory
* The config factory.
*/
- public function __construct(EventCreationService $creation_service, EntityStorageInterface $storage, Messenger $messenger, DateFormatter $date_formatter, EntityFieldManager $entity_field_manager, FieldTypePluginManager $field_type_plugin_manager, EntityRepositoryInterface $entity_repository, EntityTypeBundleInfoInterface $entity_type_bundle_info = NULL, TimeInterface $time = NULL, AccountProxyInterface $current_user = NULL, ModuleHandler $module_handler = NULL, ConfigFactory $config_factory = NULL) {
+ public function __construct(EventCreationService $creation_service, EntityStorageInterface $storage, Messenger $messenger, DateFormatter $date_formatter, EntityFieldManager $entity_field_manager, FieldTypePluginManager $field_type_plugin_manager, EntityRepositoryInterface $entity_repository, EntityTypeBundleInfoInterface $entity_type_bundle_info = NULL, TimeInterface $time = NULL, AccountProxyInterface $current_user = NULL, ModuleHandlerInterface $module_handler = NULL, ConfigFactory $config_factory = NULL) {
$this->creationService = $creation_service;
$this->storage = $storage;
$this->messenger = $messenger;
--
GitLab