diff --git a/core/lib/Drupal/Core/Extension/ModuleInstaller.php b/core/lib/Drupal/Core/Extension/ModuleInstaller.php index ebb79d6..0d9b648 100644 --- a/core/lib/Drupal/Core/Extension/ModuleInstaller.php +++ b/core/lib/Drupal/Core/Extension/ModuleInstaller.php @@ -223,10 +223,8 @@ public function install(array $module_list, $enable_dependencies = TRUE) { $version = max(max($versions), $version); } - /** @var \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher */ - $event_dispatcher = $this->kernel->getContainer()->get('event_dispatcher'); $event = new ModuleEvent($module); - $event_dispatcher->dispatch(ModuleEvents::MODULE_INSTALLED, $event); + $this->eventDispatcher->dispatch(ModuleEvents::MODULE_INSTALLED, $event); // Install default configuration of the module. $config_installer = \Drupal::service('config.installer'); @@ -368,10 +366,8 @@ public function uninstall(array $module_list, $uninstall_dependents = TRUE) { // Remove all configuration belonging to the module. \Drupal::service('config.manager')->uninstall('module', $module); - /** @var \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher */ - $event_dispatcher = $this->kernel->getContainer()->get('event_dispatcher'); $event = new ModuleEvent($module); - $event_dispatcher->dispatch(ModuleEvents::MODULE_UNINSTALLED, $event); + $this->eventDispatcher->dispatch(ModuleEvents::MODULE_UNINSTALLED, $event); // Remove the schema. drupal_uninstall_schema($module);