From 2003cb63fc8fec04cca67abb5ee23fa2f395ebe8 Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Thu, 19 Dec 2024 10:44:06 +1000
Subject: [PATCH] Issue #3489519 by mstrelan, smustgrave, quietone: Add void
return to module and theme install/uninstall hook implementations
---
core/.phpstan-baseline.php | 198 ------------------
core/lib/Drupal/Core/Extension/module.api.php | 8 +-
core/lib/Drupal/Core/Render/theme.api.php | 4 +-
core/modules/block/src/Hook/BlockHooks.php | 2 +-
.../breakpoint/src/Hook/BreakpointHooks.php | 4 +-
.../src/Hook/ConfigTranslationHooks.php | 4 +-
core/modules/help/src/Hook/HelpHooks.php | 8 +-
.../modules/jsonapi/src/Hook/JsonapiHooks.php | 2 +-
.../language/src/Hook/LanguageHooks.php | 2 +-
.../src/Hook/LanguageTestHooks.php | 2 +-
core/modules/locale/src/Hook/LocaleHooks.php | 8 +-
.../src/Hook/LocaleTestTranslateHooks.php | 2 +-
core/modules/node/src/Hook/NodeHooks1.php | 4 +-
.../shortcut/src/Hook/ShortcutHooks.php | 2 +-
core/modules/system/src/Hook/SystemHooks.php | 2 +-
.../src/Hook/RouterInstallerTestHooks.php | 2 +-
.../system_test/src/Hook/SystemTestHooks.php | 8 +-
core/modules/update/src/Hook/UpdateHooks.php | 8 +-
core/modules/user/src/Hook/UserHooks.php | 2 +-
.../workspaces/src/Hook/WorkspacesHooks.php | 2 +-
.../src/Hook/DemoUmamiContentHooks.php | 2 +-
21 files changed, 39 insertions(+), 237 deletions(-)
diff --git a/core/.phpstan-baseline.php b/core/.phpstan-baseline.php
index 9968def98e34..06f0c6b5dd7c 100644
--- a/core/.phpstan-baseline.php
+++ b/core/.phpstan-baseline.php
@@ -11770,12 +11770,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/block/src/Hook/BlockHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\block\\\\Hook\\\\BlockHooks\\:\\:modulesInstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/block/src/Hook/BlockHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\block\\\\Hook\\\\BlockHooks\\:\\:userRoleDelete\\(\\) has no return type specified\\.$#',
@@ -12520,18 +12514,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/breakpoint/src/Hook/BreakpointHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\breakpoint\\\\Hook\\\\BreakpointHooks\\:\\:themesInstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/breakpoint/src/Hook/BreakpointHooks.php',
-];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\breakpoint\\\\Hook\\\\BreakpointHooks\\:\\:themesUninstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/breakpoint/src/Hook/BreakpointHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Function _update_ckeditor5_html_filter\\(\\) has no return type specified\\.$#',
@@ -14890,18 +14872,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/config_translation/src/Hook/ConfigTranslationHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\config_translation\\\\Hook\\\\ConfigTranslationHooks\\:\\:themesInstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/config_translation/src/Hook/ConfigTranslationHooks.php',
-];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\config_translation\\\\Hook\\\\ConfigTranslationHooks\\:\\:themesUninstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/config_translation/src/Hook/ConfigTranslationHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\config_translation\\\\Routing\\\\RouteSubscriber\\:\\:alterRoutes\\(\\) has no return type specified\\.$#',
@@ -20716,30 +20686,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/help/src/Hook/HelpHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\help\\\\Hook\\\\HelpHooks\\:\\:modulesInstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/help/src/Hook/HelpHooks.php',
-];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\help\\\\Hook\\\\HelpHooks\\:\\:modulesUninstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/help/src/Hook/HelpHooks.php',
-];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\help\\\\Hook\\\\HelpHooks\\:\\:themesInstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/help/src/Hook/HelpHooks.php',
-];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\help\\\\Hook\\\\HelpHooks\\:\\:themesUninstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/help/src/Hook/HelpHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\help\\\\Plugin\\\\Search\\\\HelpSearch\\:\\:indexClear\\(\\) has no return type specified\\.$#',
@@ -21940,12 +21886,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/jsonapi/src/Hook/JsonapiHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\jsonapi\\\\Hook\\\\JsonapiHooks\\:\\:modulesInstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/jsonapi/src/Hook/JsonapiHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\jsonapi\\\\JsonApiResource\\\\Data\\:\\:getTotalCount\\(\\) has no return type specified\\.$#',
@@ -22954,12 +22894,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/language/src/Hook/LanguageHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\language\\\\Hook\\\\LanguageHooks\\:\\:modulesInstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/language/src/Hook/LanguageHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\language\\\\HttpKernel\\\\PathProcessorLanguage\\:\\:initConfigSubscriber\\(\\) has no return type specified\\.$#',
@@ -23182,12 +23116,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/language/tests/language_test/src/Hook/LanguageTestHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\language_test\\\\Hook\\\\LanguageTestHooks\\:\\:modulePreinstall\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/language/tests/language_test/src/Hook/LanguageTestHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\Tests\\\\language\\\\Functional\\\\ConfigurableLanguageManagerTest\\:\\:setWaitForTerminate\\(\\) has no return type specified\\.$#',
@@ -25258,30 +25186,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/locale/src/Hook/LocaleHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\locale\\\\Hook\\\\LocaleHooks\\:\\:modulePreuninstall\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/locale/src/Hook/LocaleHooks.php',
-];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\locale\\\\Hook\\\\LocaleHooks\\:\\:modulesInstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/locale/src/Hook/LocaleHooks.php',
-];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\locale\\\\Hook\\\\LocaleHooks\\:\\:themesInstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/locale/src/Hook/LocaleHooks.php',
-];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\locale\\\\Hook\\\\LocaleHooks\\:\\:themesUninstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/locale/src/Hook/LocaleHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\locale\\\\LocaleConfigManager\\:\\:deleteLanguageTranslations\\(\\) has no return type specified\\.$#',
@@ -25618,12 +25522,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/locale/tests/modules/locale_test/src/Hook/LocaleTestHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\locale_test_translate\\\\Hook\\\\LocaleTestTranslateHooks\\:\\:modulesInstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/locale/tests/modules/locale_test_translate/src/Hook/LocaleTestTranslateHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\Tests\\\\locale\\\\Functional\\\\LocaleExportTest\\:\\:getCustomPoFile\\(\\) has no return type specified\\.$#',
@@ -30180,18 +30078,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/node/src/Hook/NodeHooks1.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\node\\\\Hook\\\\NodeHooks1\\:\\:modulesInstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/node/src/Hook/NodeHooks1.php',
-];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\node\\\\Hook\\\\NodeHooks1\\:\\:modulesUninstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/node/src/Hook/NodeHooks1.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\node\\\\Hook\\\\NodeHooks1\\:\\:nodeAccess\\(\\) has no return type specified\\.$#',
@@ -33954,12 +33840,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/shortcut/src/Hook/ShortcutHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\shortcut\\\\Hook\\\\ShortcutHooks\\:\\:themesInstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/shortcut/src/Hook/ShortcutHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\shortcut\\\\Hook\\\\ShortcutHooks\\:\\:toolbar\\(\\) has no return type specified\\.$#',
@@ -35010,12 +34890,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/src/Hook/SystemHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\system\\\\Hook\\\\SystemHooks\\:\\:modulesUninstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/src/Hook/SystemHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\system\\\\Hook\\\\SystemHooks\\:\\:updaterInfo\\(\\) has no return type specified\\.$#',
@@ -38817,12 +38691,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/tests/modules/requirements1_test/requirements1_test.install',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\router_installer_test\\\\Hook\\\\RouterInstallerTestHooks\\:\\:modulesInstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/router_installer_test/src/Hook/RouterInstallerTestHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\router_test\\\\RouteTestSubscriber\\:\\:alterRoutes\\(\\) has no return type specified\\.$#',
@@ -39159,30 +39027,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/tests/modules/system_test/src/Hook/SystemTestHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\system_test\\\\Hook\\\\SystemTestHooks\\:\\:modulePreinstall\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/system_test/src/Hook/SystemTestHooks.php',
-];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\system_test\\\\Hook\\\\SystemTestHooks\\:\\:modulePreuninstall\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/system_test/src/Hook/SystemTestHooks.php',
-];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\system_test\\\\Hook\\\\SystemTestHooks\\:\\:modulesInstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/system_test/src/Hook/SystemTestHooks.php',
-];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\system_test\\\\Hook\\\\SystemTestHooks\\:\\:modulesUninstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/system_test/src/Hook/SystemTestHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\system_test\\\\MockFileTransfer\\:\\:getSettingsForm\\(\\) has no return type specified\\.$#',
@@ -42627,30 +42471,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/update/src/Hook/UpdateHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\update\\\\Hook\\\\UpdateHooks\\:\\:modulesInstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/update/src/Hook/UpdateHooks.php',
-];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\update\\\\Hook\\\\UpdateHooks\\:\\:modulesUninstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/update/src/Hook/UpdateHooks.php',
-];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\update\\\\Hook\\\\UpdateHooks\\:\\:themesInstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/update/src/Hook/UpdateHooks.php',
-];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\update\\\\Hook\\\\UpdateHooks\\:\\:themesUninstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/update/src/Hook/UpdateHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\update\\\\Hook\\\\UpdateHooks\\:\\:verifyUpdateArchive\\(\\) has no return type specified\\.$#',
@@ -43257,12 +43077,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/user/src/Hook/UserHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\user\\\\Hook\\\\UserHooks\\:\\:modulesUninstalled\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/user/src/Hook/UserHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\user\\\\Hook\\\\UserHooks\\:\\:toolbar\\(\\) has no return type specified\\.$#',
@@ -54159,12 +53973,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/workspaces/src/Hook/WorkspacesHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\workspaces\\\\Hook\\\\WorkspacesHooks\\:\\:modulePreinstall\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/workspaces/src/Hook/WorkspacesHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\workspaces\\\\Negotiator\\\\SessionWorkspaceNegotiator\\:\\:getActiveWorkspace\\(\\) has no return type specified\\.$#',
@@ -55287,12 +55095,6 @@
'count' => 1,
'path' => __DIR__ . '/profiles/demo_umami/demo_umami.profile',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\demo_umami_content\\\\Hook\\\\DemoUmamiContentHooks\\:\\:modulePreinstall\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/profiles/demo_umami/modules/demo_umami_content/src/Hook/DemoUmamiContentHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\demo_umami_content\\\\InstallHelper\\:\\:create\\(\\) has no return type specified\\.$#',
diff --git a/core/lib/Drupal/Core/Extension/module.api.php b/core/lib/Drupal/Core/Extension/module.api.php
index d84ee28f8b6a..2b28db0eccae 100644
--- a/core/lib/Drupal/Core/Extension/module.api.php
+++ b/core/lib/Drupal/Core/Extension/module.api.php
@@ -173,7 +173,7 @@ function hook_system_info_alter(array &$info, \Drupal\Core\Extension\Extension $
* should be made earlier and exported so during import there's no need to
* do them again.
*/
-function hook_module_preinstall($module, bool $is_syncing) {
+function hook_module_preinstall($module, bool $is_syncing): void {
my_module_cache_clear();
}
@@ -201,7 +201,7 @@ function hook_module_preinstall($module, bool $is_syncing) {
* @see \Drupal\Core\Extension\ModuleInstaller::install()
* @see hook_install()
*/
-function hook_modules_installed($modules, $is_syncing) {
+function hook_modules_installed($modules, $is_syncing): void {
if (in_array('lousy_module', $modules)) {
\Drupal::state()->set('my_module.lousy_module_compatibility', TRUE);
}
@@ -272,7 +272,7 @@ function hook_install($is_syncing): void {
* should be made earlier and exported so during import there's no need to
* do them again.
*/
-function hook_module_preuninstall($module, bool $is_syncing) {
+function hook_module_preuninstall($module, bool $is_syncing): void {
my_module_cache_clear();
}
@@ -297,7 +297,7 @@ function hook_module_preuninstall($module, bool $is_syncing) {
*
* @see hook_uninstall()
*/
-function hook_modules_uninstalled($modules, $is_syncing) {
+function hook_modules_uninstalled($modules, $is_syncing): void {
if (in_array('lousy_module', $modules)) {
\Drupal::state()->delete('my_module.lousy_module_compatibility');
}
diff --git a/core/lib/Drupal/Core/Render/theme.api.php b/core/lib/Drupal/Core/Render/theme.api.php
index 904393c0e0e5..a242b7b000be 100644
--- a/core/lib/Drupal/Core/Render/theme.api.php
+++ b/core/lib/Drupal/Core/Render/theme.api.php
@@ -773,7 +773,7 @@ function hook_theme_suggestions_HOOK_alter(array &$suggestions, array &$variable
*
* @see \Drupal\Core\Extension\ThemeInstallerInterface::install()
*/
-function hook_themes_installed($theme_list) {
+function hook_themes_installed($theme_list): void {
foreach ($theme_list as $theme) {
block_theme_initialize($theme);
}
@@ -787,7 +787,7 @@ function hook_themes_installed($theme_list) {
*
* @see \Drupal\Core\Extension\ThemeInstallerInterface::uninstall()
*/
-function hook_themes_uninstalled(array $themes) {
+function hook_themes_uninstalled(array $themes): void {
// Remove some state entries depending on the theme.
foreach ($themes as $theme) {
\Drupal::state()->delete('example.' . $theme);
diff --git a/core/modules/block/src/Hook/BlockHooks.php b/core/modules/block/src/Hook/BlockHooks.php
index ca3f935c8dcc..86c467d7de6f 100644
--- a/core/modules/block/src/Hook/BlockHooks.php
+++ b/core/modules/block/src/Hook/BlockHooks.php
@@ -95,7 +95,7 @@ public function pageTop(array &$page_top): void {
* @see block_themes_installed()
*/
#[Hook('modules_installed')]
- public function modulesInstalled($modules) {
+ public function modulesInstalled($modules): void {
// block_themes_installed() does not call block_theme_initialize() during site
// installation because block configuration can be optional or provided by the
// profile. Now, when the profile is installed, this configuration exists,
diff --git a/core/modules/breakpoint/src/Hook/BreakpointHooks.php b/core/modules/breakpoint/src/Hook/BreakpointHooks.php
index 4c6e8fa8f9ae..d503d3339f43 100644
--- a/core/modules/breakpoint/src/Hook/BreakpointHooks.php
+++ b/core/modules/breakpoint/src/Hook/BreakpointHooks.php
@@ -44,7 +44,7 @@ public function help($route_name, RouteMatchInterface $route_match) {
* Implements hook_themes_installed().
*/
#[Hook('themes_installed')]
- public function themesInstalled($theme_list) {
+ public function themesInstalled($theme_list): void {
\Drupal::service('breakpoint.manager')->clearCachedDefinitions();
}
@@ -52,7 +52,7 @@ public function themesInstalled($theme_list) {
* Implements hook_themes_uninstalled().
*/
#[Hook('themes_uninstalled')]
- public function themesUninstalled($theme_list) {
+ public function themesUninstalled($theme_list): void {
\Drupal::service('breakpoint.manager')->clearCachedDefinitions();
}
diff --git a/core/modules/config_translation/src/Hook/ConfigTranslationHooks.php b/core/modules/config_translation/src/Hook/ConfigTranslationHooks.php
index d459b8fde907..1ba644cbca0f 100644
--- a/core/modules/config_translation/src/Hook/ConfigTranslationHooks.php
+++ b/core/modules/config_translation/src/Hook/ConfigTranslationHooks.php
@@ -78,7 +78,7 @@ public function theme() : array {
* Implements hook_themes_installed().
*/
#[Hook('themes_installed')]
- public function themesInstalled() {
+ public function themesInstalled(): void {
// Themes can provide *.config_translation.yml declarations.
// @todo Make ThemeHandler trigger an event instead and make
// ConfigMapperManager plugin manager subscribe to it.
@@ -90,7 +90,7 @@ public function themesInstalled() {
* Implements hook_themes_uninstalled().
*/
#[Hook('themes_uninstalled')]
- public function themesUninstalled() {
+ public function themesUninstalled(): void {
// Themes can provide *.config_translation.yml declarations.
// @todo Make ThemeHandler trigger an event instead and make
// ConfigMapperManager plugin manager subscribe to it.
diff --git a/core/modules/help/src/Hook/HelpHooks.php b/core/modules/help/src/Hook/HelpHooks.php
index f47cd80e7ec8..0e92396aad3b 100644
--- a/core/modules/help/src/Hook/HelpHooks.php
+++ b/core/modules/help/src/Hook/HelpHooks.php
@@ -122,7 +122,7 @@ public function blockViewHelpBlockAlter(array &$build, BlockPluginInterface $blo
* Implements hook_modules_uninstalled().
*/
#[Hook('modules_uninstalled')]
- public function modulesUninstalled(array $modules) {
+ public function modulesUninstalled(array $modules): void {
_help_search_update($modules);
}
@@ -130,7 +130,7 @@ public function modulesUninstalled(array $modules) {
* Implements hook_themes_uninstalled().
*/
#[Hook('themes_uninstalled')]
- public function themesUninstalled(array $themes) {
+ public function themesUninstalled(array $themes): void {
\Drupal::service('plugin.cache_clearer')->clearCachedDefinitions();
_help_search_update();
}
@@ -139,7 +139,7 @@ public function themesUninstalled(array $themes) {
* Implements hook_modules_installed().
*/
#[Hook('modules_installed')]
- public function modulesInstalled(array $modules, $is_syncing) {
+ public function modulesInstalled(array $modules, $is_syncing): void {
_help_search_update();
}
@@ -147,7 +147,7 @@ public function modulesInstalled(array $modules, $is_syncing) {
* Implements hook_themes_installed().
*/
#[Hook('themes_installed')]
- public function themesInstalled(array $themes) {
+ public function themesInstalled(array $themes): void {
\Drupal::service('plugin.cache_clearer')->clearCachedDefinitions();
_help_search_update();
}
diff --git a/core/modules/jsonapi/src/Hook/JsonapiHooks.php b/core/modules/jsonapi/src/Hook/JsonapiHooks.php
index 0956eed10723..1372a656e910 100644
--- a/core/modules/jsonapi/src/Hook/JsonapiHooks.php
+++ b/core/modules/jsonapi/src/Hook/JsonapiHooks.php
@@ -47,7 +47,7 @@ public function help($route_name, RouteMatchInterface $route_match) {
* Implements hook_modules_installed().
*/
#[Hook('modules_installed')]
- public function modulesInstalled($modules) {
+ public function modulesInstalled($modules): void {
$potential_conflicts = ['content_translation', 'config_translation', 'language'];
if (!empty(array_intersect($modules, $potential_conflicts))) {
\Drupal::messenger()->addWarning(t('Some multilingual features currently do not work well with JSON:API. See the <a href=":jsonapi-docs">JSON:API multilingual support documentation</a> for more information on the current status of multilingual support.', [':jsonapi-docs' => 'https://www.drupal.org/docs/8/modules/jsonapi/translations']));
diff --git a/core/modules/language/src/Hook/LanguageHooks.php b/core/modules/language/src/Hook/LanguageHooks.php
index 2eb6b79649dd..efee95af2d2d 100644
--- a/core/modules/language/src/Hook/LanguageHooks.php
+++ b/core/modules/language/src/Hook/LanguageHooks.php
@@ -224,7 +224,7 @@ public function entityBundleDelete($entity_type_id, $bundle) {
*/
#[Hook('modules_installed')]
#[Hook('modules_uninstalled')]
- public function modulesInstalled($modules, $is_syncing) {
+ public function modulesInstalled($modules, $is_syncing): void {
if ($is_syncing) {
return;
}
diff --git a/core/modules/language/tests/language_test/src/Hook/LanguageTestHooks.php b/core/modules/language/tests/language_test/src/Hook/LanguageTestHooks.php
index 15dfe806ee65..3a25b1608ea6 100644
--- a/core/modules/language/tests/language_test/src/Hook/LanguageTestHooks.php
+++ b/core/modules/language/tests/language_test/src/Hook/LanguageTestHooks.php
@@ -102,7 +102,7 @@ public function languageFallbackCandidatesTestAlter(array &$candidates, array $c
* Implements hook_module_preinstall().
*/
#[Hook('module_preinstall')]
- public function modulePreinstall() {
+ public function modulePreinstall(): void {
\Drupal::state()->set('language_test.language_count_preinstall', count(\Drupal::languageManager()->getLanguages()));
}
diff --git a/core/modules/locale/src/Hook/LocaleHooks.php b/core/modules/locale/src/Hook/LocaleHooks.php
index 5176f41d2bf9..382d6c27384f 100644
--- a/core/modules/locale/src/Hook/LocaleHooks.php
+++ b/core/modules/locale/src/Hook/LocaleHooks.php
@@ -158,7 +158,7 @@ public function configurableLanguageDelete(ConfigurableLanguageInterface $langua
* Implements hook_modules_installed().
*/
#[Hook('modules_installed')]
- public function modulesInstalled($modules) {
+ public function modulesInstalled($modules): void {
$components['module'] = $modules;
locale_system_update($components);
}
@@ -167,7 +167,7 @@ public function modulesInstalled($modules) {
* Implements hook_module_preuninstall().
*/
#[Hook('module_preuninstall')]
- public function modulePreuninstall($module) {
+ public function modulePreuninstall($module): void {
$components['module'] = [$module];
locale_system_remove($components);
}
@@ -176,7 +176,7 @@ public function modulePreuninstall($module) {
* Implements hook_themes_installed().
*/
#[Hook('themes_installed')]
- public function themesInstalled($themes) {
+ public function themesInstalled($themes): void {
$components['theme'] = $themes;
locale_system_update($components);
}
@@ -185,7 +185,7 @@ public function themesInstalled($themes) {
* Implements hook_themes_uninstalled().
*/
#[Hook('themes_uninstalled')]
- public function themesUninstalled($themes) {
+ public function themesUninstalled($themes): void {
$components['theme'] = $themes;
locale_system_remove($components);
}
diff --git a/core/modules/locale/tests/modules/locale_test_translate/src/Hook/LocaleTestTranslateHooks.php b/core/modules/locale/tests/modules/locale_test_translate/src/Hook/LocaleTestTranslateHooks.php
index 582e995c8175..0a9693796574 100644
--- a/core/modules/locale/tests/modules/locale_test_translate/src/Hook/LocaleTestTranslateHooks.php
+++ b/core/modules/locale/tests/modules/locale_test_translate/src/Hook/LocaleTestTranslateHooks.php
@@ -33,7 +33,7 @@ public function systemInfoAlter(&$info, Extension $file, $type): void {
* @see \Drupal\Tests\locale\Functional\LocaleConfigTranslationImportTest::testConfigTranslationWithForeignLanguageDefault
*/
#[Hook('modules_installed')]
- public function modulesInstalled($modules, $is_syncing) {
+ public function modulesInstalled($modules, $is_syncing): void {
// Ensure that writing to configuration during install does not cause
// \Drupal\locale\LocaleConfigSubscriber to create incorrect translations due
// the configuration langcode and data being out-of-sync.
diff --git a/core/modules/node/src/Hook/NodeHooks1.php b/core/modules/node/src/Hook/NodeHooks1.php
index 663d16fd7cd5..1e74645a45d6 100644
--- a/core/modules/node/src/Hook/NodeHooks1.php
+++ b/core/modules/node/src/Hook/NodeHooks1.php
@@ -469,7 +469,7 @@ public function queryNodeAccessAlter(AlterableInterface $query): void {
* Implements hook_modules_installed().
*/
#[Hook('modules_installed')]
- public function modulesInstalled(array $modules) {
+ public function modulesInstalled(array $modules): void {
// Check if any of the newly enabled modules require the node_access table to
// be rebuilt.
if (!node_access_needs_rebuild() && \Drupal::moduleHandler()->hasImplementations('node_grants', $modules)) {
@@ -481,7 +481,7 @@ public function modulesInstalled(array $modules) {
* Implements hook_modules_uninstalled().
*/
#[Hook('modules_uninstalled')]
- public function modulesUninstalled($modules) {
+ public function modulesUninstalled($modules): void {
// Check whether any of the disabled modules implemented hook_node_grants(),
// in which case the node access table needs to be rebuilt.
foreach ($modules as $module) {
diff --git a/core/modules/shortcut/src/Hook/ShortcutHooks.php b/core/modules/shortcut/src/Hook/ShortcutHooks.php
index d74b4978b2d7..1b26c760dfaf 100644
--- a/core/modules/shortcut/src/Hook/ShortcutHooks.php
+++ b/core/modules/shortcut/src/Hook/ShortcutHooks.php
@@ -115,7 +115,7 @@ public function toolbar() {
* Implements hook_themes_installed().
*/
#[Hook('themes_installed')]
- public function themesInstalled($theme_list) {
+ public function themesInstalled($theme_list): void {
// Theme settings are not configuration entities and cannot depend on modules
// so to set a module-specific setting, we need to set it with logic.
if (in_array('claro', $theme_list, TRUE)) {
diff --git a/core/modules/system/src/Hook/SystemHooks.php b/core/modules/system/src/Hook/SystemHooks.php
index 7d8f25714bb3..eaf1a3ab165d 100644
--- a/core/modules/system/src/Hook/SystemHooks.php
+++ b/core/modules/system/src/Hook/SystemHooks.php
@@ -393,7 +393,7 @@ public function elementInfoAlter(&$type): void {
* Implements hook_modules_uninstalled().
*/
#[Hook('modules_uninstalled')]
- public function modulesUninstalled($modules) {
+ public function modulesUninstalled($modules): void {
// @todo Remove this when modules are able to maintain their revision metadata
// keys.
// @see https://www.drupal.org/project/drupal/issues/3074333
diff --git a/core/modules/system/tests/modules/router_installer_test/src/Hook/RouterInstallerTestHooks.php b/core/modules/system/tests/modules/router_installer_test/src/Hook/RouterInstallerTestHooks.php
index 644f1ada58a8..5c37eb6a9bb3 100644
--- a/core/modules/system/tests/modules/router_installer_test/src/Hook/RouterInstallerTestHooks.php
+++ b/core/modules/system/tests/modules/router_installer_test/src/Hook/RouterInstallerTestHooks.php
@@ -16,7 +16,7 @@ class RouterInstallerTestHooks {
* Implements hook_modules_installed().
*/
#[Hook('modules_installed')]
- public function modulesInstalled($modules) {
+ public function modulesInstalled($modules): void {
if (in_array('router_installer_test', $modules, TRUE)) {
// Ensure a URL can be generated for routes provided by the module during
// installation.
diff --git a/core/modules/system/tests/modules/system_test/src/Hook/SystemTestHooks.php b/core/modules/system/tests/modules/system_test/src/Hook/SystemTestHooks.php
index 805f612f2ec7..355ac85fc6c2 100644
--- a/core/modules/system/tests/modules/system_test/src/Hook/SystemTestHooks.php
+++ b/core/modules/system/tests/modules/system_test/src/Hook/SystemTestHooks.php
@@ -31,7 +31,7 @@ public function help($route_name, RouteMatchInterface $route_match) {
* Implements hook_modules_installed().
*/
#[Hook('modules_installed')]
- public function modulesInstalled($modules) {
+ public function modulesInstalled($modules): void {
if (\Drupal::state()->get('system_test.verbose_module_hooks')) {
foreach ($modules as $module) {
\Drupal::messenger()->addStatus(t('hook_modules_installed fired for @module', ['@module' => $module]));
@@ -43,7 +43,7 @@ public function modulesInstalled($modules) {
* Implements hook_modules_uninstalled().
*/
#[Hook('modules_uninstalled')]
- public function modulesUninstalled($modules, $is_syncing) {
+ public function modulesUninstalled($modules, $is_syncing): void {
if (\Drupal::state()->get('system_test.verbose_module_hooks')) {
foreach ($modules as $module) {
\Drupal::messenger()->addStatus(t('hook_modules_uninstalled fired for @module', ['@module' => $module]));
@@ -126,7 +126,7 @@ public function filetransferInfo() {
* Implements hook_module_preinstall().
*/
#[Hook('module_preinstall')]
- public function modulePreinstall($module, bool $is_syncing) {
+ public function modulePreinstall($module, bool $is_syncing): void {
\Drupal::messenger()->addStatus('system_test_preinstall_module called');
\Drupal::state()->set('system_test_preinstall_module', $module);
// Save the config.installer isSyncing() value to state to check that it is
@@ -141,7 +141,7 @@ public function modulePreinstall($module, bool $is_syncing) {
* Implements hook_module_preuninstall().
*/
#[Hook('module_preuninstall')]
- public function modulePreuninstall($module, bool $is_syncing) {
+ public function modulePreuninstall($module, bool $is_syncing): void {
\Drupal::state()->set('system_test_preuninstall_module', $module);
// Save the config.installer isSyncing() value to state to check that it is
// correctly set when uninstalling module during config import.
diff --git a/core/modules/update/src/Hook/UpdateHooks.php b/core/modules/update/src/Hook/UpdateHooks.php
index 2ef8804e2970..2aa608c291cc 100644
--- a/core/modules/update/src/Hook/UpdateHooks.php
+++ b/core/modules/update/src/Hook/UpdateHooks.php
@@ -200,7 +200,7 @@ public function cron(): void {
* If themes are installed, we invalidate the information of available updates.
*/
#[Hook('themes_installed')]
- public function themesInstalled($themes) {
+ public function themesInstalled($themes): void {
// Clear all update module data.
update_storage_clear();
}
@@ -211,7 +211,7 @@ public function themesInstalled($themes) {
* If themes are uninstalled, we invalidate the information of available updates.
*/
#[Hook('themes_uninstalled')]
- public function themesUninstalled($themes) {
+ public function themesUninstalled($themes): void {
// Clear all update module data.
update_storage_clear();
}
@@ -222,7 +222,7 @@ public function themesUninstalled($themes) {
* If modules are installed, we invalidate the information of available updates.
*/
#[Hook('modules_installed')]
- public function modulesInstalled($modules) {
+ public function modulesInstalled($modules): void {
// Clear all update module data.
update_storage_clear();
}
@@ -233,7 +233,7 @@ public function modulesInstalled($modules) {
* If modules are uninstalled, we invalidate the information of available updates.
*/
#[Hook('modules_uninstalled')]
- public function modulesUninstalled($modules) {
+ public function modulesUninstalled($modules): void {
// Clear all update module data.
update_storage_clear();
}
diff --git a/core/modules/user/src/Hook/UserHooks.php b/core/modules/user/src/Hook/UserHooks.php
index d02acaa95482..18af03f81a7c 100644
--- a/core/modules/user/src/Hook/UserHooks.php
+++ b/core/modules/user/src/Hook/UserHooks.php
@@ -347,7 +347,7 @@ public function elementInfoAlter(array &$types): void {
* Implements hook_modules_uninstalled().
*/
#[Hook('modules_uninstalled')]
- public function modulesUninstalled($modules) {
+ public function modulesUninstalled($modules): void {
// Remove any potentially orphan module data stored for users.
\Drupal::service('user.data')->delete($modules);
}
diff --git a/core/modules/workspaces/src/Hook/WorkspacesHooks.php b/core/modules/workspaces/src/Hook/WorkspacesHooks.php
index 656ede3453ce..80ec7a6e0bbf 100644
--- a/core/modules/workspaces/src/Hook/WorkspacesHooks.php
+++ b/core/modules/workspaces/src/Hook/WorkspacesHooks.php
@@ -42,7 +42,7 @@ public function help($route_name, RouteMatchInterface $route_match) {
* Implements hook_module_preinstall().
*/
#[Hook('module_preinstall')]
- public function modulePreinstall($module) {
+ public function modulePreinstall($module): void {
if ($module !== 'workspaces') {
return;
}
diff --git a/core/profiles/demo_umami/modules/demo_umami_content/src/Hook/DemoUmamiContentHooks.php b/core/profiles/demo_umami/modules/demo_umami_content/src/Hook/DemoUmamiContentHooks.php
index 33b903ff276a..e4a185d686cf 100644
--- a/core/profiles/demo_umami/modules/demo_umami_content/src/Hook/DemoUmamiContentHooks.php
+++ b/core/profiles/demo_umami/modules/demo_umami_content/src/Hook/DemoUmamiContentHooks.php
@@ -16,7 +16,7 @@ class DemoUmamiContentHooks {
* Implements hook_module_preinstall().
*/
#[Hook('module_preinstall')]
- public function modulePreinstall($module) {
+ public function modulePreinstall($module): void {
if ($module === 'demo_umami_content' && !\Drupal::service('config.installer')->isSyncing()) {
// Run before importing config so blocks are created with the correct
// dependencies.
--
GitLab