diff --git a/core/lib/Drupal/Core/EventSubscriber/ModuleInstallerEntitySubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ModuleInstallerEntitySubscriber.php index 596352b9..7d454d6 100644 --- a/core/lib/Drupal/Core/EventSubscriber/ModuleInstallerEntitySubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/ModuleInstallerEntitySubscriber.php @@ -57,13 +57,13 @@ protected function getEntityDefinitionUpdateManager() { } /** - * Gets the entity definition update manager. + * Gets the entity field manager. * * The manager is retrieved dynamically, because the container is rebuilt * after module installation. * * @return \Drupal\Core\Entity\EntityFieldManagerInterface - * The entity definition update manager. + * The entity field manager. */ protected function getEntityFieldManager() { return $this->kernel->getContainer()->get('entity_field.manager'); @@ -89,13 +89,13 @@ protected function getEntityTypeManager() { * The module event. */ public function onModuleInstall(ModuleEvent $event) { - $module = $event->getModule(); + $module = $event->getModuleName(); // Notify interested components that this module's entity types and // field storage definitions are new. For example, a SQL-based storage // handler can use this as an opportunity to create the necessary // database tables. foreach ($this->getEntityTypeManager()->getDefinitions() as $entity_type) { - if ($entity_type->getProvider() == $module) { + if ($entity_type->getProvider() === $module) { $this->getEntityDefinitionUpdateManager()->installEntityType($entity_type); } elseif ($entity_type->entityClassImplements(FieldableEntityInterface::class)) { @@ -103,7 +103,7 @@ public function onModuleInstall(ModuleEvent $event) { // entity types. Field definitions for any entity type defined by // the module are handled in the if branch. foreach ($this->getEntityFieldManager()->getFieldStorageDefinitions($entity_type->id()) as $storage_definition) { - if ($storage_definition->getProvider() == $module) { + if ($storage_definition->getProvider() === $module) { // If the module being installed is also defining a storage key // for the entity type, the entity schema may not exist yet. It // will be created later in that case. @@ -126,12 +126,12 @@ public function onModuleInstall(ModuleEvent $event) { * The module event. */ public function onModuleUninstall(ModuleEvent $event) { - $module = $event->getModule(); + $module = $event->getModuleName(); // Notify interested components that this module's entity types are being // deleted. For example, a SQL-based storage handler can use this as an // opportunity to drop the corresponding database tables. foreach ($this->getEntityTypeManager()->getDefinitions() as $entity_type) { - if ($entity_type->getProvider() == $module) { + if ($entity_type->getProvider() === $module) { $this->getEntityDefinitionUpdateManager()->uninstallEntityType($entity_type); } elseif ($entity_type->entityClassImplements(FieldableEntityInterface::class)) { @@ -139,7 +139,7 @@ public function onModuleUninstall(ModuleEvent $event) { // existing entity types. This will add them to the deleted fields // repository so their data will be purged on cron. foreach ($this->getEntityFieldManager()->getFieldStorageDefinitions($entity_type->id()) as $storage_definition) { - if ($storage_definition->getProvider() == $module) { + if ($storage_definition->getProvider() === $module) { $this->getEntityDefinitionUpdateManager()->uninstallFieldStorageDefinition($storage_definition); } } diff --git a/core/lib/Drupal/Core/Extension/ModuleEvent.php b/core/lib/Drupal/Core/Extension/ModuleEvent.php index 472f46c..2cd40e5 100644 --- a/core/lib/Drupal/Core/Extension/ModuleEvent.php +++ b/core/lib/Drupal/Core/Extension/ModuleEvent.php @@ -32,7 +32,7 @@ public function __construct($module) { * * @return string */ - public function getModule() { + public function getModuleName() { return $this->module; } diff --git a/core/lib/Drupal/Core/Extension/ModuleEvents.php b/core/lib/Drupal/Core/Extension/ModuleEvents.php index 4ff7592..4253076 100644 --- a/core/lib/Drupal/Core/Extension/ModuleEvents.php +++ b/core/lib/Drupal/Core/Extension/ModuleEvents.php @@ -6,11 +6,25 @@ /** * This event is fired when modules are installed. + * + * @Event + * + * @see \Drupal\Core\EventSubscriber\ModuleInstallerEntitySubscriber + * @see \Drupal\Core\Extension\ModuleInstaller + * + * @var string */ const MODULE_INSTALLED = 'core.modules.installed'; /** * This event is fired when modules are uninstalled. + * + * @Event + * + * @see \Drupal\Core\EventSubscriber\ModuleInstallerEntitySubscriber + * @see \Drupal\Core\Extension\ModuleInstaller + * + * @var string */ const MODULE_UNINSTALLED = 'core.modules.uninstalled';