From 9c747cd0f8fd817e4ad1e74bd64a305d6fbddf17 Mon Sep 17 00:00:00 2001
From: quietone <quietone@2572884.no-reply.drupal.org>
Date: Thu, 28 Nov 2024 11:40:50 +1300
Subject: [PATCH] Issue #3489776 by mstrelan, nicxvan: Add void return to all
pageAttachments, pageTop and pageBottom hook implementations
---
core/.phpstan-baseline.php | 120 ------------------
core/lib/Drupal/Core/Render/theme.api.php | 8 +-
.../big_pipe/src/Hook/BigPipeHooks.php | 2 +-
.../src/Hook/BigPipeTestHooks.php | 2 +-
core/modules/block/src/Hook/BlockHooks.php | 2 +-
.../src/Hook/ContentTranslationHooks.php | 2 +-
.../contextual/src/Hook/ContextualHooks.php | 2 +-
.../src/Hook/LanguageTestHooks.php | 2 +-
.../navigation/src/Hook/NavigationHooks.php | 2 +-
core/modules/node/src/Hook/NodeHooks1.php | 2 +-
.../src/Hook/SettingsTrayTestCssHooks.php | 2 +-
core/modules/system/src/Hook/SystemHooks.php | 2 +-
.../common_test/src/Hook/CommonTestHooks.php | 2 +-
.../Hook/CssDisableTransitionsTestHooks.php | 2 +-
.../Hook/JsTestingAjaxRequestTestHooks.php | 2 +-
.../src/Hook/JsTestingLogTestHooks.php | 2 +-
.../src/Hook/OffCanvasTestHooks.php | 2 +-
.../SessionExistsCacheContextTestHooks.php | 2 +-
.../system_test/src/Hook/SystemTestHooks.php | 2 +-
.../theme_test/src/Hook/ThemeTestHooks.php | 2 +-
.../modules/toolbar/src/Hook/ToolbarHooks.php | 2 +-
core/modules/update/src/Hook/UpdateHooks.php | 2 +-
22 files changed, 24 insertions(+), 144 deletions(-)
diff --git a/core/.phpstan-baseline.php b/core/.phpstan-baseline.php
index 200a35d73fb4..6b0899a63413 100644
--- a/core/.phpstan-baseline.php
+++ b/core/.phpstan-baseline.php
@@ -11530,12 +11530,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/big_pipe/src/Hook/BigPipeHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\big_pipe\\\\Hook\\\\BigPipeHooks\\:\\:pageAttachments\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/big_pipe/src/Hook/BigPipeHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\big_pipe\\\\Render\\\\BigPipe\\:\\:performPostSendTasks\\(\\) has no return type specified\\.$#',
@@ -11644,12 +11638,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/big_pipe/tests/modules/big_pipe_test/src/Form/BigPipeTestForm.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\big_pipe_test\\\\Hook\\\\BigPipeTestHooks\\:\\:pageTop\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/big_pipe/tests/modules/big_pipe_test/src/Hook/BigPipeTestHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\Tests\\\\big_pipe\\\\Unit\\\\Render\\\\BigPipeResponseAttachmentsProcessorTest\\:\\:attachmentsProvider\\(\\) has no return type specified\\.$#',
@@ -11836,12 +11824,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/block/src/Hook/BlockHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\block\\\\Hook\\\\BlockHooks\\:\\:pageTop\\(\\) 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\\:\\:rebuild\\(\\) has no return type specified\\.$#',
@@ -16774,12 +16756,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/content_translation/src/Hook/ContentTranslationHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\content_translation\\\\Hook\\\\ContentTranslationHooks\\:\\:pageAttachments\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/content_translation/src/Hook/ContentTranslationHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\content_translation\\\\Plugin\\\\Validation\\\\Constraint\\\\ContentTranslationSynchronizedFieldsConstraintValidator\\:\\:create\\(\\) has no return type specified\\.$#',
@@ -17122,12 +17098,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/contextual/src/Hook/ContextualHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\contextual\\\\Hook\\\\ContextualHooks\\:\\:pageAttachments\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/contextual/src/Hook/ContextualHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\contextual\\\\Hook\\\\ContextualHooks\\:\\:toolbar\\(\\) has no return type specified\\.$#',
@@ -23428,12 +23398,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\\:\\:pageTop\\(\\) 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\\.$#',
@@ -30108,12 +30072,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/navigation/src/Hook/NavigationHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\navigation\\\\Hook\\\\NavigationHooks\\:\\:pageTop\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/navigation/src/Hook/NavigationHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\navigation\\\\NavigationContentLinks\\:\\:create\\(\\) has no return type specified\\.$#',
@@ -30486,12 +30444,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/node/src/Hook/NodeHooks1.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\node\\\\Hook\\\\NodeHooks1\\:\\:pageTop\\(\\) 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\\:\\:ranking\\(\\) has no return type specified\\.$#',
@@ -34170,12 +34122,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/settings_tray/tests/modules/settings_tray_test/src/Plugin/Block/ValidationErrorBlock.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\settings_tray_test_css\\\\Hook\\\\SettingsTrayTestCssHooks\\:\\:pageAttachments\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/settings_tray/tests/modules/settings_tray_test_css/src/Hook/SettingsTrayTestCssHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\Tests\\\\settings_tray\\\\FunctionalJavascript\\\\SettingsTrayBlockFormTest\\:\\:getBlockTests\\(\\) has no return type specified\\.$#',
@@ -35382,12 +35328,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/src/Hook/SystemHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\system\\\\Hook\\\\SystemHooks\\:\\:pageTop\\(\\) 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\\.$#',
@@ -36300,12 +36240,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/tests/modules/common_test/src/Hook/CommonTestHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\common_test\\\\Hook\\\\CommonTestHooks\\:\\:pageAttachments\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/common_test/src/Hook/CommonTestHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\condition_test\\\\FormController\\:\\:submitForm\\(\\) has no return type specified\\.$#',
@@ -36384,12 +36318,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/tests/modules/cron_queue_test/src/Plugin/QueueWorker/CronQueueTestSuspendQueue.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\css_disable_transitions_test\\\\Hook\\\\CssDisableTransitionsTestHooks\\:\\:pageAttachments\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/css_disable_transitions_test/src/Hook/CssDisableTransitionsTestHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\database_test\\\\Form\\\\DatabaseTestForm\\:\\:submitForm\\(\\) has no return type specified\\.$#',
@@ -38834,18 +38762,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/tests/modules/js_interaction_test/src/Controller/JSInteractionTestForm.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\js_testing_ajax_request_test\\\\Hook\\\\JsTestingAjaxRequestTestHooks\\:\\:pageAttachments\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/js_testing_ajax_request_test/src/Hook/JsTestingAjaxRequestTestHooks.php',
-];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\js_testing_log_test\\\\Hook\\\\JsTestingLogTestHooks\\:\\:pageAttachments\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/js_testing_log_test/src/Hook/JsTestingLogTestHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\jswebassert_test\\\\Controller\\\\TestController\\:\\:page\\(\\) has no return type specified\\.$#',
@@ -39054,12 +38970,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/tests/modules/new_dependency_test/src/SetterInjection.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\off_canvas_test\\\\Hook\\\\OffCanvasTestHooks\\:\\:pageAttachments\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/off_canvas_test/src/Hook/OffCanvasTestHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\pager_test\\\\Controller\\\\PagerTestController\\:\\:multiplePagers\\(\\) has no return type specified\\.$#',
@@ -39549,12 +39459,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/tests/modules/services_defaults_test/src/TestService.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\session_exists_cache_context_test\\\\Hook\\\\SessionExistsCacheContextTestHooks\\:\\:pageTop\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/session_exists_cache_context_test/src/Hook/SessionExistsCacheContextTestHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\session_test\\\\Controller\\\\SessionTestController\\:\\:triggerWriteException\\(\\) has no return type specified\\.$#',
@@ -39717,12 +39621,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\\:\\:pageAttachments\\(\\) 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\\.$#',
@@ -39831,12 +39729,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\theme_test\\\\Hook\\\\ThemeTestHooks\\:\\:pageBottom\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/theme_test/src/Hook/ThemeTestHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\theme_test\\\\ThemeTestController\\:\\:generalSuggestionAlter\\(\\) has no return type specified\\.$#',
@@ -43311,12 +43203,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/toolbar/src/Hook/ToolbarHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\toolbar\\\\Hook\\\\ToolbarHooks\\:\\:pageTop\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/toolbar/src/Hook/ToolbarHooks.php',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Method Drupal\\\\toolbar\\\\Hook\\\\ToolbarHooks\\:\\:toolbar\\(\\) has no return type specified\\.$#',
@@ -43431,12 +43317,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/update/src/Hook/UpdateHooks.php',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Method Drupal\\\\update\\\\Hook\\\\UpdateHooks\\:\\:pageTop\\(\\) 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\\.$#',
diff --git a/core/lib/Drupal/Core/Render/theme.api.php b/core/lib/Drupal/Core/Render/theme.api.php
index 274e92ba5b53..7926d15fdcc1 100644
--- a/core/lib/Drupal/Core/Render/theme.api.php
+++ b/core/lib/Drupal/Core/Render/theme.api.php
@@ -1093,7 +1093,7 @@ function hook_css_alter(&$css, \Drupal\Core\Asset\AttachedAssetsInterface $asset
*
* @see hook_page_attachments_alter()
*/
-function hook_page_attachments(array &$attachments) {
+function hook_page_attachments(array &$attachments): void {
// Unconditionally attach an asset to the page.
$attachments['#attached']['library'][] = 'core/drupalSettings';
@@ -1119,7 +1119,7 @@ function hook_page_attachments(array &$attachments) {
*
* @see hook_page_attachments()
*/
-function hook_page_attachments_alter(array &$attachments) {
+function hook_page_attachments_alter(array &$attachments): void {
// Conditionally remove an asset.
if (in_array('core/jquery', $attachments['#attached']['library'])) {
$index = array_search('core/jquery', $attachments['#attached']['library']);
@@ -1133,7 +1133,7 @@ function hook_page_attachments_alter(array &$attachments) {
* @param array $page_top
* A renderable array representing the top of the page.
*/
-function hook_page_top(array &$page_top) {
+function hook_page_top(array &$page_top): void {
$page_top['my_module'] = ['#markup' => 'This is the top.'];
}
@@ -1143,7 +1143,7 @@ function hook_page_top(array &$page_top) {
* @param array $page_bottom
* A renderable array representing the bottom of the page.
*/
-function hook_page_bottom(array &$page_bottom) {
+function hook_page_bottom(array &$page_bottom): void {
$page_bottom['my_module'] = ['#markup' => 'This is the bottom.'];
}
diff --git a/core/modules/big_pipe/src/Hook/BigPipeHooks.php b/core/modules/big_pipe/src/Hook/BigPipeHooks.php
index 370bfb899cca..72451b09c877 100644
--- a/core/modules/big_pipe/src/Hook/BigPipeHooks.php
+++ b/core/modules/big_pipe/src/Hook/BigPipeHooks.php
@@ -38,7 +38,7 @@ public function help($route_name, RouteMatchInterface $route_match) {
* @see \Drupal\big_pipe\Controller\BigPipeController::setNoJsCookie()
*/
#[Hook('page_attachments')]
- public function pageAttachments(array &$page) {
+ public function pageAttachments(array &$page): void {
// Routes that don't use BigPipe also don't need no-JS detection.
if (\Drupal::routeMatch()->getRouteObject()->getOption('_no_big_pipe')) {
return;
diff --git a/core/modules/big_pipe/tests/modules/big_pipe_test/src/Hook/BigPipeTestHooks.php b/core/modules/big_pipe/tests/modules/big_pipe_test/src/Hook/BigPipeTestHooks.php
index 691ef5837c32..3a935fae6380 100644
--- a/core/modules/big_pipe/tests/modules/big_pipe_test/src/Hook/BigPipeTestHooks.php
+++ b/core/modules/big_pipe/tests/modules/big_pipe_test/src/Hook/BigPipeTestHooks.php
@@ -15,7 +15,7 @@ class BigPipeTestHooks {
* Implements hook_page_top().
*/
#[Hook('page_top')]
- public function pageTop(array &$page_top) {
+ public function pageTop(array &$page_top): void {
// Ensure this hook is invoked on every page load.
$page_top['#cache']['max-age'] = 0;
$request = \Drupal::request();
diff --git a/core/modules/block/src/Hook/BlockHooks.php b/core/modules/block/src/Hook/BlockHooks.php
index 4ded5e2660bf..32eb48c323ba 100644
--- a/core/modules/block/src/Hook/BlockHooks.php
+++ b/core/modules/block/src/Hook/BlockHooks.php
@@ -65,7 +65,7 @@ public function theme() : array {
* Implements hook_page_top().
*/
#[Hook('page_top')]
- public function pageTop(array &$page_top) {
+ public function pageTop(array &$page_top): void {
if (\Drupal::routeMatch()->getRouteName() === 'block.admin_demo') {
$theme = \Drupal::theme()->getActiveTheme()->getName();
$page_top['backlink'] = [
diff --git a/core/modules/content_translation/src/Hook/ContentTranslationHooks.php b/core/modules/content_translation/src/Hook/ContentTranslationHooks.php
index 5307ebf4d571..89e82dda8db3 100644
--- a/core/modules/content_translation/src/Hook/ContentTranslationHooks.php
+++ b/core/modules/content_translation/src/Hook/ContentTranslationHooks.php
@@ -505,7 +505,7 @@ public function formLanguageContentSettingsFormAlter(array &$form, FormStateInte
* Implements hook_page_attachments().
*/
#[Hook('page_attachments')]
- public function pageAttachments(&$page) {
+ public function pageAttachments(&$page): void {
$cache = CacheableMetadata::createFromRenderArray($page);
$route_match = \Drupal::routeMatch();
// If the current route has no parameters, return.
diff --git a/core/modules/contextual/src/Hook/ContextualHooks.php b/core/modules/contextual/src/Hook/ContextualHooks.php
index f266c4227b4c..bd1ddbf6c042 100644
--- a/core/modules/contextual/src/Hook/ContextualHooks.php
+++ b/core/modules/contextual/src/Hook/ContextualHooks.php
@@ -61,7 +61,7 @@ public function toolbar() {
* @see contextual_preprocess()
*/
#[Hook('page_attachments')]
- public function pageAttachments(array &$page) {
+ public function pageAttachments(array &$page): void {
if (!\Drupal::currentUser()->hasPermission('access contextual links')) {
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 3ea440db7042..0288acc76cb9 100644
--- a/core/modules/language/tests/language_test/src/Hook/LanguageTestHooks.php
+++ b/core/modules/language/tests/language_test/src/Hook/LanguageTestHooks.php
@@ -18,7 +18,7 @@ class LanguageTestHooks {
* Implements hook_page_top().
*/
#[Hook('page_top')]
- public function pageTop() {
+ public function pageTop(): void {
if (\Drupal::moduleHandler()->moduleExists('language')) {
language_test_store_language_negotiation();
\Drupal::messenger()->addStatus(t('Language negotiation method: @name', [
diff --git a/core/modules/navigation/src/Hook/NavigationHooks.php b/core/modules/navigation/src/Hook/NavigationHooks.php
index a52f4fab4a1f..e444209e24b5 100644
--- a/core/modules/navigation/src/Hook/NavigationHooks.php
+++ b/core/modules/navigation/src/Hook/NavigationHooks.php
@@ -44,7 +44,7 @@ public function help($route_name, RouteMatchInterface $route_match) {
* Implements hook_page_top().
*/
#[Hook('page_top')]
- public function pageTop(array &$page_top) {
+ public function pageTop(array &$page_top): void {
if (!\Drupal::currentUser()->hasPermission('access navigation')) {
return;
}
diff --git a/core/modules/node/src/Hook/NodeHooks1.php b/core/modules/node/src/Hook/NodeHooks1.php
index 073090e03066..663d16fd7cd5 100644
--- a/core/modules/node/src/Hook/NodeHooks1.php
+++ b/core/modules/node/src/Hook/NodeHooks1.php
@@ -266,7 +266,7 @@ public function userPredelete($account) {
* Implements hook_page_top().
*/
#[Hook('page_top')]
- public function pageTop(array &$page_top) {
+ public function pageTop(array &$page_top): void {
// Add 'Back to content editing' link on preview page.
$route_match = \Drupal::routeMatch();
if ($route_match->getRouteName() == 'entity.node.preview') {
diff --git a/core/modules/settings_tray/tests/modules/settings_tray_test_css/src/Hook/SettingsTrayTestCssHooks.php b/core/modules/settings_tray/tests/modules/settings_tray_test_css/src/Hook/SettingsTrayTestCssHooks.php
index 277d7e3b6ec0..46e85149e0fd 100644
--- a/core/modules/settings_tray/tests/modules/settings_tray_test_css/src/Hook/SettingsTrayTestCssHooks.php
+++ b/core/modules/settings_tray/tests/modules/settings_tray_test_css/src/Hook/SettingsTrayTestCssHooks.php
@@ -15,7 +15,7 @@ class SettingsTrayTestCssHooks {
* Implements hook_page_attachments().
*/
#[Hook('page_attachments')]
- public function pageAttachments(array &$attachments) {
+ public function pageAttachments(array &$attachments): void {
// Unconditionally attach an asset to the page.
$attachments['#attached']['library'][] = 'settings_tray_test_css/drupal.css_fix';
}
diff --git a/core/modules/system/src/Hook/SystemHooks.php b/core/modules/system/src/Hook/SystemHooks.php
index bc37a1f50fea..90307fae353a 100644
--- a/core/modules/system/src/Hook/SystemHooks.php
+++ b/core/modules/system/src/Hook/SystemHooks.php
@@ -439,7 +439,7 @@ public function themeRegistryAlter(array &$theme_registry): void {
* Implements hook_page_top().
*/
#[Hook('page_top')]
- public function pageTop() {
+ public function pageTop(): void {
/** @var \Drupal\Core\Routing\AdminContext $admin_context */
$admin_context = \Drupal::service('router.admin_context');
if ($admin_context->isAdminRoute() && \Drupal::currentUser()->hasPermission('administer site configuration')) {
diff --git a/core/modules/system/tests/modules/common_test/src/Hook/CommonTestHooks.php b/core/modules/system/tests/modules/common_test/src/Hook/CommonTestHooks.php
index 7df7924d82ed..7ba457eaf87b 100644
--- a/core/modules/system/tests/modules/common_test/src/Hook/CommonTestHooks.php
+++ b/core/modules/system/tests/modules/common_test/src/Hook/CommonTestHooks.php
@@ -124,7 +124,7 @@ public function cron(): void {
* @see \Drupal\system\Tests\Common\PageRenderTest::assertPageRenderHookExceptions()
*/
#[Hook('page_attachments')]
- public function pageAttachments(array &$page) {
+ public function pageAttachments(array &$page): void {
$page['#attached']['library'][] = 'core/foo';
$page['#attached']['library'][] = 'core/bar';
$page['#cache']['tags'] = ['example'];
diff --git a/core/modules/system/tests/modules/css_disable_transitions_test/src/Hook/CssDisableTransitionsTestHooks.php b/core/modules/system/tests/modules/css_disable_transitions_test/src/Hook/CssDisableTransitionsTestHooks.php
index a48fe1d4e899..fe3920b57a05 100644
--- a/core/modules/system/tests/modules/css_disable_transitions_test/src/Hook/CssDisableTransitionsTestHooks.php
+++ b/core/modules/system/tests/modules/css_disable_transitions_test/src/Hook/CssDisableTransitionsTestHooks.php
@@ -15,7 +15,7 @@ class CssDisableTransitionsTestHooks {
* Implements hook_page_attachments().
*/
#[Hook('page_attachments')]
- public function pageAttachments(array &$attachments) {
+ public function pageAttachments(array &$attachments): void {
// Unconditionally attach an asset to the page.
$attachments['#attached']['library'][] = 'css_disable_transitions_test/testing.css_disable_transitions_test';
}
diff --git a/core/modules/system/tests/modules/js_testing_ajax_request_test/src/Hook/JsTestingAjaxRequestTestHooks.php b/core/modules/system/tests/modules/js_testing_ajax_request_test/src/Hook/JsTestingAjaxRequestTestHooks.php
index f7bf260b4783..6b8f73e09ddc 100644
--- a/core/modules/system/tests/modules/js_testing_ajax_request_test/src/Hook/JsTestingAjaxRequestTestHooks.php
+++ b/core/modules/system/tests/modules/js_testing_ajax_request_test/src/Hook/JsTestingAjaxRequestTestHooks.php
@@ -15,7 +15,7 @@ class JsTestingAjaxRequestTestHooks {
* Implements hook_page_attachments().
*/
#[Hook('page_attachments')]
- public function pageAttachments(array &$attachments) {
+ public function pageAttachments(array &$attachments): void {
// Unconditionally attach an asset to the page.
$attachments['#attached']['library'][] = 'js_testing_ajax_request_test/track_ajax_requests';
}
diff --git a/core/modules/system/tests/modules/js_testing_log_test/src/Hook/JsTestingLogTestHooks.php b/core/modules/system/tests/modules/js_testing_log_test/src/Hook/JsTestingLogTestHooks.php
index 2e5b51b26ce0..cd0291c0a21f 100644
--- a/core/modules/system/tests/modules/js_testing_log_test/src/Hook/JsTestingLogTestHooks.php
+++ b/core/modules/system/tests/modules/js_testing_log_test/src/Hook/JsTestingLogTestHooks.php
@@ -15,7 +15,7 @@ class JsTestingLogTestHooks {
* Implements hook_page_attachments().
*/
#[Hook('page_attachments')]
- public function pageAttachments(array &$attachments) {
+ public function pageAttachments(array &$attachments): void {
// Unconditionally attach an asset to the page.
$attachments['#attached']['library'][] = 'js_testing_log_test/deprecation_log';
}
diff --git a/core/modules/system/tests/modules/off_canvas_test/src/Hook/OffCanvasTestHooks.php b/core/modules/system/tests/modules/off_canvas_test/src/Hook/OffCanvasTestHooks.php
index 56de094eb9e8..4fa7c429ebd7 100644
--- a/core/modules/system/tests/modules/off_canvas_test/src/Hook/OffCanvasTestHooks.php
+++ b/core/modules/system/tests/modules/off_canvas_test/src/Hook/OffCanvasTestHooks.php
@@ -15,7 +15,7 @@ class OffCanvasTestHooks {
* Implements hook_page_attachments().
*/
#[Hook('page_attachments')]
- public function pageAttachments(array &$attachments) {
+ public function pageAttachments(array &$attachments): void {
// This library wraps around the Drupal.offCanvas.resetSize() method and adds
// a special data-resize-done attribute to help functional JavaScript tests
// use the off-canvas area when it is fully loaded and ready to be interacted
diff --git a/core/modules/system/tests/modules/session_exists_cache_context_test/src/Hook/SessionExistsCacheContextTestHooks.php b/core/modules/system/tests/modules/session_exists_cache_context_test/src/Hook/SessionExistsCacheContextTestHooks.php
index efd440564ae4..37ffcf270b5e 100644
--- a/core/modules/system/tests/modules/session_exists_cache_context_test/src/Hook/SessionExistsCacheContextTestHooks.php
+++ b/core/modules/system/tests/modules/session_exists_cache_context_test/src/Hook/SessionExistsCacheContextTestHooks.php
@@ -15,7 +15,7 @@ class SessionExistsCacheContextTestHooks {
* Implements hook_page_top().
*/
#[Hook('page_top')]
- public function pageTop(array &$page_top) {
+ public function pageTop(array &$page_top): void {
// Ensure this hook is invoked on every page load.
$page_top['#cache']['max-age'] = 0;
$request = \Drupal::request();
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 1f9cb30c4a37..805f612f2ec7 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
@@ -99,7 +99,7 @@ public function systemInfoAlter(&$info, Extension $file, $type): void {
* Implements hook_page_attachments().
*/
#[Hook('page_attachments')]
- public function pageAttachments(array &$page) {
+ public function pageAttachments(array &$page): void {
// Used by FrontPageTestCase to get the results of
// \Drupal::service('path.matcher')->isFrontPage().
$frontpage = \Drupal::state()->get('system_test.front_page_output', 0);
diff --git a/core/modules/system/tests/modules/theme_test/src/Hook/ThemeTestHooks.php b/core/modules/system/tests/modules/theme_test/src/Hook/ThemeTestHooks.php
index 5ab56d543d58..25578bb0124f 100644
--- a/core/modules/system/tests/modules/theme_test/src/Hook/ThemeTestHooks.php
+++ b/core/modules/system/tests/modules/theme_test/src/Hook/ThemeTestHooks.php
@@ -68,7 +68,7 @@ public function themeRegistryAlter(&$registry): void {
* Implements hook_page_bottom().
*/
#[Hook('page_bottom')]
- public function pageBottom(array &$page_bottom) {
+ public function pageBottom(array &$page_bottom): void {
$page_bottom['theme_test_page_bottom'] = ['#markup' => 'theme test page bottom markup'];
}
diff --git a/core/modules/toolbar/src/Hook/ToolbarHooks.php b/core/modules/toolbar/src/Hook/ToolbarHooks.php
index 883b733cd334..09553d0bb971 100644
--- a/core/modules/toolbar/src/Hook/ToolbarHooks.php
+++ b/core/modules/toolbar/src/Hook/ToolbarHooks.php
@@ -55,7 +55,7 @@ public function theme($existing, $type, $theme, $path) : array {
* Add admin toolbar to the top of the page automatically.
*/
#[Hook('page_top')]
- public function pageTop(array &$page_top) {
+ public function pageTop(array &$page_top): void {
$page_top['toolbar'] = [
'#type' => 'toolbar',
'#access' => \Drupal::currentUser()->hasPermission('access toolbar'),
diff --git a/core/modules/update/src/Hook/UpdateHooks.php b/core/modules/update/src/Hook/UpdateHooks.php
index 71fc5c6ea742..ff4e75054b1e 100644
--- a/core/modules/update/src/Hook/UpdateHooks.php
+++ b/core/modules/update/src/Hook/UpdateHooks.php
@@ -63,7 +63,7 @@ public function help($route_name, RouteMatchInterface $route_match) {
* Implements hook_page_top().
*/
#[Hook('page_top')]
- public function pageTop() {
+ public function pageTop(): void {
/** @var \Drupal\Core\Routing\AdminContext $admin_context */
$admin_context = \Drupal::service('router.admin_context');
$route_match = \Drupal::routeMatch();
--
GitLab