From 873f84fca246d495d837de39db9111521097e3f8 Mon Sep 17 00:00:00 2001
From: quietone <quietone@2572884.no-reply.drupal.org>
Date: Wed, 22 Jan 2025 19:15:05 +1300
Subject: [PATCH] Issue #3488841 by mstrelan, shalini_jha, akulsaxena,
smustgrave, nicxvan: Add array return to all *_info hook implementations
---
core/.phpstan-baseline.php | 276 ------------------
core/lib/Drupal/Core/Entity/entity.api.php | 24 +-
core/lib/Drupal/Core/Extension/module.api.php | 4 +-
core/lib/Drupal/Core/File/file.api.php | 2 +-
core/lib/Drupal/Core/Utility/token.api.php | 2 +-
.../modules/comment/src/Hook/CommentHooks.php | 2 +-
.../comment/src/Hook/CommentTokensHooks.php | 2 +-
.../modules/contact/src/Hook/ContactHooks.php | 2 +-
.../src/Hook/ContactStorageTestHooks.php | 6 +-
.../src/Hook/ContentModerationHooks.php | 7 +-
.../src/Hook/ContentTranslationHooks.php | 8 +-
core/modules/field/src/Hook/FieldHooks.php | 9 +-
core/modules/language/language.api.php | 2 +-
.../src/Hook/LanguageTestHooks.php | 3 +-
.../Hook/LayoutBuilderExtraFieldTestHooks.php | 2 +-
.../src/Hook/LayoutBuilderTestHooks.php | 2 +-
.../src/Hook/LinkTestBaseFieldHooks.php | 2 +-
.../locale_test/src/Hook/LocaleTestHooks.php | 2 +-
core/modules/node/src/Hook/NodeHooks1.php | 2 +-
.../modules/node/src/Hook/NodeTokensHooks.php | 2 +-
core/modules/path/src/Hook/PathHooks.php | 3 +-
.../rest_test/src/Hook/RestTestHooks.php | 2 +-
core/modules/system/src/Hook/SystemHooks.php | 4 +-
.../system/src/Hook/SystemTokensHooks.php | 2 +-
core/modules/system/system.module | 2 +-
.../src/Hook/EntityReferenceTestHooks.php | 2 +-
.../src/Hook/EntitySchemaTestHooks.php | 9 +-
.../entity_test/src/Hook/EntityTestHooks.php | 6 +-
.../src/Hook/EntityTestExtraHooks.php | 6 +-
.../src/Hook/EntityTestUpdateHooks.php | 9 +-
.../modules/module_test/module_test.module | 2 +-
.../system_test/src/Hook/SystemTestHooks.php | 2 +-
.../taxonomy/src/Hook/TaxonomyTokensHooks.php | 2 +-
.../update_test/src/Hook/UpdateTestHooks.php | 2 +-
core/modules/user/src/Hook/UserHooks.php | 2 +-
.../modules/user/src/Hook/UserTokensHooks.php | 2 +-
.../views/src/Hook/ViewsTokensHooks.php | 2 +-
.../src/Hook/ViewsEntityTestHooks.php | 3 +-
core/modules/views/views.module | 2 +-
.../module_handler_test.module | 2 +-
.../Tests/Core/GroupIncludesTestTrait.php | 2 +-
41 files changed, 81 insertions(+), 348 deletions(-)
diff --git a/core/.phpstan-baseline.php b/core/.phpstan-baseline.php
index 060b9bf2f772..95a4b9f863f2 100644
--- a/core/.phpstan-baseline.php
+++ b/core/.phpstan-baseline.php
@@ -13561,12 +13561,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/comment/src/Form/DeleteForm.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\comment\\\\Hook\\\\CommentHooks\\:\\:entityExtraFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/comment/src/Hook/CommentHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\comment\\\\Hook\\\\CommentHooks\\:\\:entityInsert\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -13633,12 +13627,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/comment/src/Hook/CommentHooks.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\comment\\\\Hook\\\\CommentTokensHooks\\:\\:tokenInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/comment/src/Hook/CommentTokensHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\comment\\\\Plugin\\\\EntityReferenceSelection\\\\CommentSelection\\:\\:entityQueryAlter\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -15163,12 +15151,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/contact/src/Entity/Message.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\contact\\\\Hook\\\\ContactHooks\\:\\:entityExtraFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/contact/src/Hook/ContactHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\contact\\\\Hook\\\\ContactHooks\\:\\:help\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -15247,12 +15229,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/contact/src/Plugin/views/field/ContactLink.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\contact_storage_test\\\\Hook\\\\ContactStorageTestHooks\\:\\:entityBaseFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/contact/tests/modules/contact_storage_test/src/Hook/ContactStorageTestHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\Tests\\\\contact\\\\Functional\\\\ContactPersonalTest\\:\\:assertCacheContext\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -15775,36 +15751,18 @@
'count' => 1,
'path' => __DIR__ . '/modules/content_moderation/src/Form/EntityModerationForm.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\content_moderation\\\\Hook\\\\ContentModerationHooks\\:\\:entityBaseFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/content_moderation/src/Hook/ContentModerationHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\content_moderation\\\\Hook\\\\ContentModerationHooks\\:\\:entityBundleDelete\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
'count' => 1,
'path' => __DIR__ . '/modules/content_moderation/src/Hook/ContentModerationHooks.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\content_moderation\\\\Hook\\\\ContentModerationHooks\\:\\:entityBundleFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/content_moderation/src/Hook/ContentModerationHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\content_moderation\\\\Hook\\\\ContentModerationHooks\\:\\:entityDelete\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
'count' => 1,
'path' => __DIR__ . '/modules/content_moderation/src/Hook/ContentModerationHooks.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\content_moderation\\\\Hook\\\\ContentModerationHooks\\:\\:entityExtraFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/content_moderation/src/Hook/ContentModerationHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\content_moderation\\\\Hook\\\\ContentModerationHooks\\:\\:entityInsert\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -16699,18 +16657,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/content_translation/src/FieldTranslationSynchronizerInterface.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\content_translation\\\\Hook\\\\ContentTranslationHooks\\:\\:entityBaseFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/content_translation/src/Hook/ContentTranslationHooks.php',
-];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\content_translation\\\\Hook\\\\ContentTranslationHooks\\:\\:entityExtraFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/content_translation/src/Hook/ContentTranslationHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\content_translation\\\\Hook\\\\ContentTranslationHooks\\:\\:entityPresave\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -17821,18 +17767,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/field/src/Hook/FieldHooks.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\field\\\\Hook\\\\FieldHooks\\:\\:entityBundleFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/field/src/Hook/FieldHooks.php',
-];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\field\\\\Hook\\\\FieldHooks\\:\\:entityFieldStorageInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/field/src/Hook/FieldHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\field\\\\Hook\\\\FieldHooks\\:\\:fieldConfigCreate\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -23113,12 +23047,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/language/tests/language_test/src/Controller/LanguageTestController.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\language_test\\\\Hook\\\\LanguageTestHooks\\:\\:languageTypesInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/language/tests/language_test/src/Hook/LanguageTestHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\Tests\\\\language\\\\Functional\\\\ConfigurableLanguageManagerTest\\:\\:setWaitForTerminate\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -24019,12 +23947,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/layout_builder/tests/modules/layout_builder_extra_field_test/layout_builder_extra_field_test.module',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\layout_builder_extra_field_test\\\\Hook\\\\LayoutBuilderExtraFieldTestHooks\\:\\:entityExtraFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/layout_builder/tests/modules/layout_builder_extra_field_test/src/Hook/LayoutBuilderExtraFieldTestHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\layout_builder_form_block_test\\\\Plugin\\\\Block\\\\TestFormApiFormBlock\\:\\:submitForm\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -24043,12 +23965,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/layout_builder/tests/modules/layout_builder_test/layout_builder_test.module',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\layout_builder_test\\\\Hook\\\\LayoutBuilderTestHooks\\:\\:entityExtraFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/layout_builder/tests/modules/layout_builder_test/src/Hook/LayoutBuilderTestHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\layout_builder_test\\\\Hook\\\\LayoutBuilderTestHooks\\:\\:layoutBuilderEntityFormDisplayAlter\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -24739,12 +24655,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/link/src/Plugin/migrate/process/FieldLink.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\link_test_base_field\\\\Hook\\\\LinkTestBaseFieldHooks\\:\\:entityBaseFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/link/tests/modules/link_test_base_field/src/Hook/LinkTestBaseFieldHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\Tests\\\\link\\\\Functional\\\\LinkFieldTest\\:\\:assertPathAliasExists\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -25483,12 +25393,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/locale/src/StringStorageInterface.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\locale_test\\\\Hook\\\\LocaleTestHooks\\:\\:tokenInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/locale/tests/modules/locale_test/src/Hook/LocaleTestHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\Tests\\\\locale\\\\Functional\\\\LocaleExportTest\\:\\:getCustomPoFile\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -29935,12 +29839,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/node/src/Hook/NodeHooks1.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\node\\\\Hook\\\\NodeHooks1\\:\\:entityExtraFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/node/src/Hook/NodeHooks1.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\node\\\\Hook\\\\NodeHooks1\\:\\:help\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -29953,12 +29851,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/node/src/Hook/NodeHooks1.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\node\\\\Hook\\\\NodeTokensHooks\\:\\:tokenInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/node/src/Hook/NodeTokensHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\node\\\\NodeAccessControlHandler\\:\\:deleteGrants\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -31255,12 +31147,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/path/src/Form/PathFilterForm.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\path\\\\Hook\\\\PathHooks\\:\\:entityBaseFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/path/src/Hook/PathHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\path\\\\Hook\\\\PathHooks\\:\\:entityTranslationCreate\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -32191,12 +32077,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/rest/src/Routing/ResourceRoutes.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\rest_test\\\\Hook\\\\RestTestHooks\\:\\:entityBaseFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/rest/tests/modules/rest_test/src/Hook/RestTestHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\Tests\\\\rest\\\\Functional\\\\EntityResource\\\\EntityResourceTestBase\\:\\:assert406Response\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -34759,30 +34639,12 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/src/Hook/SystemHooks.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\system\\\\Hook\\\\SystemHooks\\:\\:filetransferInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/src/Hook/SystemHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\system\\\\Hook\\\\SystemHooks\\:\\:help\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
'count' => 1,
'path' => __DIR__ . '/modules/system/src/Hook/SystemHooks.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\system\\\\Hook\\\\SystemHooks\\:\\:updaterInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/src/Hook/SystemHooks.php',
-];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\system\\\\Hook\\\\SystemTokensHooks\\:\\:tokenInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/src/Hook/SystemTokensHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\system\\\\PhpStorage\\\\MockPhpStorage\\:\\:getConfiguration\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -34993,12 +34855,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/system.module',
];
-$ignoreErrors[] = [
- 'message' => '#^Function system_hook_info\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/system.module',
-];
$ignoreErrors[] = [
'message' => '#^Function system_sort_themes\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -36225,18 +36081,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/tests/modules/entity_crud_hook_test/src/Hook/EntityCrudHookTestHooks.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\entity_reference_test\\\\Hook\\\\EntityReferenceTestHooks\\:\\:entityBaseFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/entity_reference_test/src/Hook/EntityReferenceTestHooks.php',
-];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\entity_schema_test\\\\Hook\\\\EntitySchemaTestHooks\\:\\:entityBaseFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/entity_schema_test/src/Hook/EntitySchemaTestHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\entity_schema_test\\\\Hook\\\\EntitySchemaTestHooks\\:\\:entityBundleCreate\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -36249,18 +36093,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/tests/modules/entity_schema_test/src/Hook/EntitySchemaTestHooks.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\entity_schema_test\\\\Hook\\\\EntitySchemaTestHooks\\:\\:entityBundleFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/entity_schema_test/src/Hook/EntitySchemaTestHooks.php',
-];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\entity_schema_test\\\\Hook\\\\EntitySchemaTestHooks\\:\\:entityFieldStorageInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/entity_schema_test/src/Hook/EntitySchemaTestHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Function _entity_test_record_hooks\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -36405,24 +36237,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/tests/modules/entity_test/src/EntityTestViewBuilder.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\entity_test\\\\Hook\\\\EntityTestHooks\\:\\:entityBaseFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/entity_test/src/Hook/EntityTestHooks.php',
-];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\entity_test\\\\Hook\\\\EntityTestHooks\\:\\:entityBundleInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/entity_test/src/Hook/EntityTestHooks.php',
-];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\entity_test\\\\Hook\\\\EntityTestHooks\\:\\:entityExtraFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/entity_test/src/Hook/EntityTestHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\entity_test\\\\Hook\\\\EntityTestHooks\\:\\:entityInsert\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -37269,24 +37083,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/tests/modules/entity_test_bundle_class/src/Entity/EntityTestBundleClass.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\entity_test_extra\\\\Hook\\\\EntityTestExtraHooks\\:\\:entityBaseFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/entity_test_extra/src/Hook/EntityTestExtraHooks.php',
-];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\entity_test_extra\\\\Hook\\\\EntityTestExtraHooks\\:\\:entityBundleFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/entity_test_extra/src/Hook/EntityTestExtraHooks.php',
-];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\entity_test_extra\\\\Hook\\\\EntityTestExtraHooks\\:\\:entityFieldStorageInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/entity_test_extra/src/Hook/EntityTestExtraHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\entity_test_update\\\\Entity\\\\EntityTestUpdate\\:\\:preCreate\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -37335,18 +37131,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/tests/modules/entity_test_update/src/EventSubscriber/EntitySchemaSubscriber.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\entity_test_update\\\\Hook\\\\EntityTestUpdateHooks\\:\\:entityBaseFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/entity_test_update/src/Hook/EntityTestUpdateHooks.php',
-];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\entity_test_update\\\\Hook\\\\EntityTestUpdateHooks\\:\\:entityFieldStorageInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/entity_test_update/src/Hook/EntityTestUpdateHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\entity_test_update\\\\Hook\\\\EntityTestUpdateHooks\\:\\:viewPresave\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -38151,12 +37935,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/tests/modules/module_test/module_test.implementations.inc',
];
-$ignoreErrors[] = [
- 'message' => '#^Function module_test_hook_info\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/module_test/module_test.module',
-];
$ignoreErrors[] = [
'message' => '#^Function module_test_load\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -38793,12 +38571,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/tests/modules/system_test/src/Form/CopyFieldValueTestForm.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\system_test\\\\Hook\\\\SystemTestHooks\\:\\:filetransferInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/modules/system_test/src/Hook/SystemTestHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\system_test\\\\Hook\\\\SystemTestHooks\\:\\:help\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -41097,12 +40869,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/taxonomy/src/Hook/TaxonomyHooks.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\taxonomy\\\\Hook\\\\TaxonomyTokensHooks\\:\\:tokenInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/taxonomy/src/Hook/TaxonomyTokensHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\taxonomy\\\\Plugin\\\\Validation\\\\Constraint\\\\TaxonomyTermHierarchyConstraintValidator\\:\\:create\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -42255,12 +42021,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/update/src/UpdateSettingsForm.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\update_test\\\\Hook\\\\UpdateTestHooks\\:\\:filetransferInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/update/tests/modules/update_test/src/Hook/UpdateTestHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\Tests\\\\update\\\\Functional\\\\UpdateContribTest\\:\\:securityUpdateAvailabilityProvider\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -42747,12 +42507,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/user/src/Form/UserPermissionsForm.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\user\\\\Hook\\\\UserHooks\\:\\:entityExtraFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/user/src/Hook/UserHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\user\\\\Hook\\\\UserHooks\\:\\:help\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -42783,12 +42537,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/user/src/Hook/UserHooks.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\user\\\\Hook\\\\UserTokensHooks\\:\\:tokenInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/user/src/Hook/UserTokensHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\user\\\\Plugin\\\\Action\\\\AddRoleUser\\:\\:execute\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -44463,12 +44211,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/views/src/Hook/ViewsHooks.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\views\\\\Hook\\\\ViewsTokensHooks\\:\\:tokenInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/views/src/Hook/ViewsTokensHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\views\\\\ManyToOneHelper\\:\\:addFilter\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -50475,12 +50217,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/views/tests/modules/user_batch_action_test/src/Plugin/Action/BatchUserAction.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\views_entity_test\\\\Hook\\\\ViewsEntityTestHooks\\:\\:entityBaseFieldInfo\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/views/tests/modules/views_entity_test/src/Hook/ViewsEntityTestHooks.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\views_entity_test\\\\Hook\\\\ViewsEntityTestHooks\\:\\:entityLoad\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -52035,12 +51771,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/views/views.module',
];
-$ignoreErrors[] = [
- 'message' => '#^Function views_hook_info\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/views/views.module',
-];
$ignoreErrors[] = [
'message' => '#^Function views_invalidate_cache\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -59758,12 +59488,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.module',
];
-$ignoreErrors[] = [
- 'message' => '#^Function module_handler_test_hook_info\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.module',
-];
$ignoreErrors[] = [
'message' => '#^Function module_handler_test_added_hook\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
diff --git a/core/lib/Drupal/Core/Entity/entity.api.php b/core/lib/Drupal/Core/Entity/entity.api.php
index 4117858f7f16..9829d56f6e2b 100644
--- a/core/lib/Drupal/Core/Entity/entity.api.php
+++ b/core/lib/Drupal/Core/Entity/entity.api.php
@@ -887,7 +887,7 @@ function hook_entity_view_mode_info_alter(&$view_modes) {
* @see \Drupal\Core\Entity\EntityTypeBundleInfo::getBundleInfo()
* @see hook_entity_bundle_info_alter()
*/
-function hook_entity_bundle_info() {
+function hook_entity_bundle_info(): array {
$bundles['user']['user']['label'] = t('User');
return $bundles;
}
@@ -1942,17 +1942,17 @@ function hook_entity_form_display_alter(\Drupal\Core\Entity\Display\EntityFormDi
* @see \Drupal\Core\Entity\EntityDefinitionUpdateManagerInterface
* @see https://www.drupal.org/node/3034742
*/
-function hook_entity_base_field_info(\Drupal\Core\Entity\EntityTypeInterface $entity_type) {
+function hook_entity_base_field_info(\Drupal\Core\Entity\EntityTypeInterface $entity_type): array {
+ $fields = [];
if ($entity_type->id() == 'node') {
- $fields = [];
$fields['my_module_text'] = BaseFieldDefinition::create('string')
->setLabel(t('The text'))
->setDescription(t('A text property added by my_module.'))
->setComputed(TRUE)
->setClass('\Drupal\my_module\EntityComputedText');
- return $fields;
}
+ return $fields;
}
/**
@@ -2006,16 +2006,15 @@ function hook_entity_base_field_info_alter(&$fields, \Drupal\Core\Entity\EntityT
* @todo WARNING: This hook will be changed in
* https://www.drupal.org/node/2346347.
*/
-function hook_entity_bundle_field_info(\Drupal\Core\Entity\EntityTypeInterface $entity_type, $bundle, array $base_field_definitions) {
+function hook_entity_bundle_field_info(\Drupal\Core\Entity\EntityTypeInterface $entity_type, $bundle, array $base_field_definitions): array {
+ $fields = [];
// Add a property only to nodes of the 'article' bundle.
if ($entity_type->id() == 'node' && $bundle == 'article') {
- $fields = [];
$storage_definitions = my_module_entity_field_storage_info($entity_type);
$fields['my_module_bundle_field'] = FieldDefinition::createFromFieldStorageDefinition($storage_definitions['my_module_bundle_field'])
->setLabel(t('Bundle Field'));
- return $fields;
}
-
+ return $fields;
}
/**
@@ -2062,7 +2061,8 @@ function hook_entity_bundle_field_info_alter(&$fields, \Drupal\Core\Entity\Entit
* @see \Drupal\Core\Entity\EntityDefinitionUpdateManagerInterface
* @see https://www.drupal.org/node/3034742
*/
-function hook_entity_field_storage_info(\Drupal\Core\Entity\EntityTypeInterface $entity_type) {
+function hook_entity_field_storage_info(\Drupal\Core\Entity\EntityTypeInterface $entity_type): array {
+ $result = [];
if (\Drupal::entityTypeManager()->getStorage($entity_type->id()) instanceof DynamicallyFieldableEntityStorageInterface) {
// Query by filtering on the ID as this is more efficient than filtering
// on the entity_type property directly.
@@ -2071,13 +2071,11 @@ function hook_entity_field_storage_info(\Drupal\Core\Entity\EntityTypeInterface
->execute();
// Fetch all fields and key them by field name.
$field_storages = FieldStorageConfig::loadMultiple($ids);
- $result = [];
foreach ($field_storages as $field_storage) {
$result[$field_storage->getName()] = $field_storage;
}
-
- return $result;
}
+ return $result;
}
/**
@@ -2259,7 +2257,7 @@ function hook_ENTITY_TYPE_field_values_init(\Drupal\Core\Entity\FieldableEntityI
* The array structure is identical to that of the return value of
* \Drupal\Core\Entity\EntityFieldManagerInterface::getExtraFields().
*/
-function hook_entity_extra_field_info() {
+function hook_entity_extra_field_info(): array {
$extra = [];
$module_language_enabled = \Drupal::moduleHandler()->moduleExists('language');
$description = t('Node module element');
diff --git a/core/lib/Drupal/Core/Extension/module.api.php b/core/lib/Drupal/Core/Extension/module.api.php
index 29b8eebe2d53..03d78ca9617e 100644
--- a/core/lib/Drupal/Core/Extension/module.api.php
+++ b/core/lib/Drupal/Core/Extension/module.api.php
@@ -83,7 +83,7 @@
* system will determine whether a file with the name $module.$group.inc
* exists, and automatically load it when required.
*/
-function hook_hook_info() {
+function hook_hook_info(): array {
$hooks['token_info'] = [
'group' => 'tokens',
];
@@ -1025,7 +1025,7 @@ function hook_update_last_removed(): int {
* @see drupal_get_updaters()
* @see hook_updater_info_alter()
*/
-function hook_updater_info() {
+function hook_updater_info(): array {
return [
'module' => [
'class' => 'Drupal\Core\Updater\Module',
diff --git a/core/lib/Drupal/Core/File/file.api.php b/core/lib/Drupal/Core/File/file.api.php
index 5b8dd449d802..e4001b39d1c7 100644
--- a/core/lib/Drupal/Core/File/file.api.php
+++ b/core/lib/Drupal/Core/File/file.api.php
@@ -172,7 +172,7 @@ function hook_archiver_info_alter(&$info) {
* @see hook_filetransfer_info_alter()
* @see drupal_get_filetransfer_info()
*/
-function hook_filetransfer_info() {
+function hook_filetransfer_info(): array {
$info['sftp'] = [
'title' => t('SFTP (Secure FTP)'),
'class' => 'Drupal\Core\FileTransfer\SFTP',
diff --git a/core/lib/Drupal/Core/Utility/token.api.php b/core/lib/Drupal/Core/Utility/token.api.php
index 9b213686635e..b272d06ddb46 100644
--- a/core/lib/Drupal/Core/Utility/token.api.php
+++ b/core/lib/Drupal/Core/Utility/token.api.php
@@ -208,7 +208,7 @@ function hook_tokens_alter(array &$replacements, array $context, \Drupal\Core\Re
* @see hook_token_info_alter()
* @see hook_tokens()
*/
-function hook_token_info() {
+function hook_token_info(): array {
$type = [
'name' => t('Nodes'),
'description' => t('Tokens related to individual nodes.'),
diff --git a/core/modules/comment/src/Hook/CommentHooks.php b/core/modules/comment/src/Hook/CommentHooks.php
index e6da4272c6ef..d70b1e0f713f 100644
--- a/core/modules/comment/src/Hook/CommentHooks.php
+++ b/core/modules/comment/src/Hook/CommentHooks.php
@@ -71,7 +71,7 @@ public function help($route_name, RouteMatchInterface $route_match) {
* Implements hook_entity_extra_field_info().
*/
#[Hook('entity_extra_field_info')]
- public function entityExtraFieldInfo() {
+ public function entityExtraFieldInfo(): array {
$return = [];
foreach (CommentType::loadMultiple() as $comment_type) {
$return['comment'][$comment_type->id()] = [
diff --git a/core/modules/comment/src/Hook/CommentTokensHooks.php b/core/modules/comment/src/Hook/CommentTokensHooks.php
index c14d074a88f9..fc227fae3b40 100644
--- a/core/modules/comment/src/Hook/CommentTokensHooks.php
+++ b/core/modules/comment/src/Hook/CommentTokensHooks.php
@@ -18,7 +18,7 @@ class CommentTokensHooks {
* Implements hook_token_info().
*/
#[Hook('token_info')]
- public function tokenInfo() {
+ public function tokenInfo(): array {
$type = [
'name' => t('Comments'),
'description' => t('Tokens for comments posted on the site.'),
diff --git a/core/modules/contact/src/Hook/ContactHooks.php b/core/modules/contact/src/Hook/ContactHooks.php
index d05b0a58f7a5..9aaab81a707b 100644
--- a/core/modules/contact/src/Hook/ContactHooks.php
+++ b/core/modules/contact/src/Hook/ContactHooks.php
@@ -55,7 +55,7 @@ public function entityTypeAlter(array &$entity_types) : void {
* Implements hook_entity_extra_field_info().
*/
#[Hook('entity_extra_field_info')]
- public function entityExtraFieldInfo() {
+ public function entityExtraFieldInfo(): array {
$fields = [];
foreach (array_keys(\Drupal::service('entity_type.bundle.info')->getBundleInfo('contact_message')) as $bundle) {
$fields['contact_message'][$bundle]['form']['name'] = ['label' => t('Sender name'), 'description' => t('Text'), 'weight' => -50];
diff --git a/core/modules/contact/tests/modules/contact_storage_test/src/Hook/ContactStorageTestHooks.php b/core/modules/contact/tests/modules/contact_storage_test/src/Hook/ContactStorageTestHooks.php
index c33fe1ba5cee..6bb852df2f4e 100644
--- a/core/modules/contact/tests/modules/contact_storage_test/src/Hook/ContactStorageTestHooks.php
+++ b/core/modules/contact/tests/modules/contact_storage_test/src/Hook/ContactStorageTestHooks.php
@@ -19,12 +19,12 @@ class ContactStorageTestHooks {
* Implements hook_entity_base_field_info().
*/
#[Hook('entity_base_field_info')]
- public function entityBaseFieldInfo(EntityTypeInterface $entity_type) {
+ public function entityBaseFieldInfo(EntityTypeInterface $entity_type): array {
+ $fields = [];
if ($entity_type->id() == 'contact_message') {
- $fields = [];
$fields['id'] = BaseFieldDefinition::create('integer')->setLabel(t('Message ID'))->setDescription(t('The message ID.'))->setReadOnly(TRUE)->setSetting('unsigned', TRUE);
- return $fields;
}
+ return $fields;
}
/**
diff --git a/core/modules/content_moderation/src/Hook/ContentModerationHooks.php b/core/modules/content_moderation/src/Hook/ContentModerationHooks.php
index 26f2da79658c..9d8ecab3d53f 100644
--- a/core/modules/content_moderation/src/Hook/ContentModerationHooks.php
+++ b/core/modules/content_moderation/src/Hook/ContentModerationHooks.php
@@ -81,7 +81,7 @@ public function help($route_name, RouteMatchInterface $route_match) {
* Implements hook_entity_base_field_info().
*/
#[Hook('entity_base_field_info')]
- public function entityBaseFieldInfo(EntityTypeInterface $entity_type) {
+ public function entityBaseFieldInfo(EntityTypeInterface $entity_type): array {
return \Drupal::service('class_resolver')->getInstanceFromDefinition(EntityTypeInfo::class)->entityBaseFieldInfo($entity_type);
}
@@ -89,7 +89,7 @@ public function entityBaseFieldInfo(EntityTypeInterface $entity_type) {
* Implements hook_entity_bundle_field_info().
*/
#[Hook('entity_bundle_field_info')]
- public function entityBundleFieldInfo(EntityTypeInterface $entity_type, $bundle, array $base_field_definitions) {
+ public function entityBundleFieldInfo(EntityTypeInterface $entity_type, $bundle, array $base_field_definitions): array {
if (isset($base_field_definitions['moderation_state'])) {
// Add the target bundle to the moderation state field. Since each bundle
// can be attached to a different moderation workflow, adding this
@@ -98,6 +98,7 @@ public function entityBundleFieldInfo(EntityTypeInterface $entity_type, $bundle,
$base_field_definitions['moderation_state']->setTargetBundle($bundle);
return ['moderation_state' => $base_field_definitions['moderation_state']];
}
+ return [];
}
/**
@@ -176,7 +177,7 @@ public function formAlter(&$form, FormStateInterface $form_state, $form_id) : vo
* Implements hook_entity_extra_field_info().
*/
#[Hook('entity_extra_field_info')]
- public function entityExtraFieldInfo() {
+ public function entityExtraFieldInfo(): array {
return \Drupal::service('class_resolver')->getInstanceFromDefinition(EntityTypeInfo::class)->entityExtraFieldInfo();
}
diff --git a/core/modules/content_translation/src/Hook/ContentTranslationHooks.php b/core/modules/content_translation/src/Hook/ContentTranslationHooks.php
index aac0520f04c2..a85167de1587 100644
--- a/core/modules/content_translation/src/Hook/ContentTranslationHooks.php
+++ b/core/modules/content_translation/src/Hook/ContentTranslationHooks.php
@@ -238,7 +238,8 @@ public function entityBundleInfoAlter(&$bundles): void {
* Implements hook_entity_base_field_info().
*/
#[Hook('entity_base_field_info')]
- public function entityBaseFieldInfo(EntityTypeInterface $entity_type) {
+ public function entityBaseFieldInfo(EntityTypeInterface $entity_type): array {
+ $info = [];
/** @var \Drupal\content_translation\ContentTranslationManagerInterface $manager */
$manager = \Drupal::service('content_translation.manager');
$entity_type_id = $entity_type->id();
@@ -253,9 +254,10 @@ public function entityBaseFieldInfo(EntityTypeInterface $entity_type) {
// enabled for translation.
// @see https://www.drupal.org/node/2907777
if ($manager->isEnabled($entity_type_id) || array_intersect_key($definitions, $installed_storage_definitions)) {
- return $definitions;
+ $info = $definitions;
}
}
+ return $info;
}
/**
@@ -418,7 +420,7 @@ public function languageFallbackCandidatesEntityViewAlter(&$candidates, $context
* Implements hook_entity_extra_field_info().
*/
#[Hook('entity_extra_field_info')]
- public function entityExtraFieldInfo() {
+ public function entityExtraFieldInfo(): array {
$extra = [];
$bundle_info_service = \Drupal::service('entity_type.bundle.info');
foreach (\Drupal::entityTypeManager()->getDefinitions() as $entity_type => $info) {
diff --git a/core/modules/field/src/Hook/FieldHooks.php b/core/modules/field/src/Hook/FieldHooks.php
index 4fb85ff73ce8..1d98632fc084 100644
--- a/core/modules/field/src/Hook/FieldHooks.php
+++ b/core/modules/field/src/Hook/FieldHooks.php
@@ -171,7 +171,7 @@ public function cron(): void {
* Implements hook_entity_field_storage_info().
*/
#[Hook('entity_field_storage_info')]
- public function entityFieldStorageInfo(EntityTypeInterface $entity_type) {
+ public function entityFieldStorageInfo(EntityTypeInterface $entity_type): array {
if (\Drupal::entityTypeManager()->getStorage($entity_type->id()) instanceof DynamicallyFieldableEntityStorageInterface) {
// Query by filtering on the ID as this is more efficient than filtering
// on the entity_type property directly.
@@ -184,25 +184,26 @@ public function entityFieldStorageInfo(EntityTypeInterface $entity_type) {
}
return $result;
}
+ return [];
}
/**
* Implements hook_entity_bundle_field_info().
*/
#[Hook('entity_bundle_field_info')]
- public function entityBundleFieldInfo(EntityTypeInterface $entity_type, $bundle, array $base_field_definitions) {
+ public function entityBundleFieldInfo(EntityTypeInterface $entity_type, $bundle, array $base_field_definitions): array {
+ $result = [];
if (\Drupal::entityTypeManager()->getStorage($entity_type->id()) instanceof DynamicallyFieldableEntityStorageInterface) {
// Query by filtering on the ID as this is more efficient than filtering
// on the entity_type property directly.
$ids = \Drupal::entityQuery('field_config')->condition('id', $entity_type->id() . '.' . $bundle . '.', 'STARTS_WITH')->execute();
// Fetch all fields and key them by field name.
$field_configs = FieldConfig::loadMultiple($ids);
- $result = [];
foreach ($field_configs as $field_instance) {
$result[$field_instance->getName()] = $field_instance;
}
- return $result;
}
+ return $result;
}
/**
diff --git a/core/modules/language/language.api.php b/core/modules/language/language.api.php
index ff04a8e71c21..203427e41643 100644
--- a/core/modules/language/language.api.php
+++ b/core/modules/language/language.api.php
@@ -34,7 +34,7 @@
* @see hook_language_types_info_alter()
* @ingroup language_negotiation
*/
-function hook_language_types_info() {
+function hook_language_types_info(): array {
return [
'custom_language_type' => [
'name' => t('Custom language'),
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 705137ff751b..5e719a31725e 100644
--- a/core/modules/language/tests/language_test/src/Hook/LanguageTestHooks.php
+++ b/core/modules/language/tests/language_test/src/Hook/LanguageTestHooks.php
@@ -31,7 +31,7 @@ public function pageTop(): void {
* Implements hook_language_types_info().
*/
#[Hook('language_types_info')]
- public function languageTypesInfo() {
+ public function languageTypesInfo(): array {
if (\Drupal::keyValue('language_test')->get('language_types')) {
return [
'test_language_type' => [
@@ -46,6 +46,7 @@ public function languageTypesInfo() {
],
];
}
+ return [];
}
/**
diff --git a/core/modules/layout_builder/tests/modules/layout_builder_extra_field_test/src/Hook/LayoutBuilderExtraFieldTestHooks.php b/core/modules/layout_builder/tests/modules/layout_builder_extra_field_test/src/Hook/LayoutBuilderExtraFieldTestHooks.php
index 2a3ca3c22e69..51db40e91b2e 100644
--- a/core/modules/layout_builder/tests/modules/layout_builder_extra_field_test/src/Hook/LayoutBuilderExtraFieldTestHooks.php
+++ b/core/modules/layout_builder/tests/modules/layout_builder_extra_field_test/src/Hook/LayoutBuilderExtraFieldTestHooks.php
@@ -15,7 +15,7 @@ class LayoutBuilderExtraFieldTestHooks {
* Implements hook_entity_extra_field_info().
*/
#[Hook('entity_extra_field_info')]
- public function entityExtraFieldInfo() {
+ public function entityExtraFieldInfo(): array {
$extra['node']['bundle_with_section_field']['display']['layout_builder_extra_field_test'] = [
'label' => t('New Extra Field'),
'description' => t('New Extra Field description'),
diff --git a/core/modules/layout_builder/tests/modules/layout_builder_test/src/Hook/LayoutBuilderTestHooks.php b/core/modules/layout_builder/tests/modules/layout_builder_test/src/Hook/LayoutBuilderTestHooks.php
index 57c612d8ae12..af01247899d9 100644
--- a/core/modules/layout_builder/tests/modules/layout_builder_test/src/Hook/LayoutBuilderTestHooks.php
+++ b/core/modules/layout_builder/tests/modules/layout_builder_test/src/Hook/LayoutBuilderTestHooks.php
@@ -45,7 +45,7 @@ public function pluginFilterBlockLayoutBuilderAlter(array &$definitions, array $
* Implements hook_entity_extra_field_info().
*/
#[Hook('entity_extra_field_info')]
- public function entityExtraFieldInfo() {
+ public function entityExtraFieldInfo(): array {
$extra['node']['bundle_with_section_field']['display']['layout_builder_test'] = [
'label' => t('Extra label'),
'description' => t('Extra description'),
diff --git a/core/modules/link/tests/modules/link_test_base_field/src/Hook/LinkTestBaseFieldHooks.php b/core/modules/link/tests/modules/link_test_base_field/src/Hook/LinkTestBaseFieldHooks.php
index 07a890d8af6a..88759eb42638 100644
--- a/core/modules/link/tests/modules/link_test_base_field/src/Hook/LinkTestBaseFieldHooks.php
+++ b/core/modules/link/tests/modules/link_test_base_field/src/Hook/LinkTestBaseFieldHooks.php
@@ -19,7 +19,7 @@ class LinkTestBaseFieldHooks {
* Implements hook_entity_base_field_info().
*/
#[Hook('entity_base_field_info')]
- public function entityBaseFieldInfo(EntityTypeInterface $entity_type) {
+ public function entityBaseFieldInfo(EntityTypeInterface $entity_type): array {
$fields = [];
if ($entity_type->id() === 'entity_test') {
$fields['links'] = BaseFieldDefinition::create('link')->setLabel(t('Links'))->setRevisionable(TRUE)->setCardinality(FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED)->setDescription(t('Add links to the entity.'))->setRequired(FALSE)->setSettings([
diff --git a/core/modules/locale/tests/modules/locale_test/src/Hook/LocaleTestHooks.php b/core/modules/locale/tests/modules/locale_test/src/Hook/LocaleTestHooks.php
index 43166f723213..9c5931fdca42 100644
--- a/core/modules/locale/tests/modules/locale_test/src/Hook/LocaleTestHooks.php
+++ b/core/modules/locale/tests/modules/locale_test/src/Hook/LocaleTestHooks.php
@@ -174,7 +174,7 @@ public function theme() : array {
* Implements hook_token_info().
*/
#[Hook('token_info')]
- public function tokenInfo() {
+ public function tokenInfo(): array {
$info = [];
$info['types']['locale_test'] = ['name' => t('Locale test'), 'description' => t('Locale test')];
$info['tokens']['locale_test']['security_test1'] = ['type' => 'text', 'name' => t('Security test 1')];
diff --git a/core/modules/node/src/Hook/NodeHooks1.php b/core/modules/node/src/Hook/NodeHooks1.php
index 8bd4fcf9007c..d194b4b30543 100644
--- a/core/modules/node/src/Hook/NodeHooks1.php
+++ b/core/modules/node/src/Hook/NodeHooks1.php
@@ -172,7 +172,7 @@ public function localTasksAlter(&$local_tasks) : void {
* Implements hook_entity_extra_field_info().
*/
#[Hook('entity_extra_field_info')]
- public function entityExtraFieldInfo() {
+ public function entityExtraFieldInfo(): array {
$extra = [];
$description = t('Node module element');
foreach (NodeType::loadMultiple() as $bundle) {
diff --git a/core/modules/node/src/Hook/NodeTokensHooks.php b/core/modules/node/src/Hook/NodeTokensHooks.php
index 1b8dd37ddea5..63aecb49c344 100644
--- a/core/modules/node/src/Hook/NodeTokensHooks.php
+++ b/core/modules/node/src/Hook/NodeTokensHooks.php
@@ -17,7 +17,7 @@ class NodeTokensHooks {
* Implements hook_token_info().
*/
#[Hook('token_info')]
- public function tokenInfo() {
+ public function tokenInfo(): array {
$type = [
'name' => t('Nodes'),
'description' => t('Tokens related to individual content items, or "nodes".'),
diff --git a/core/modules/path/src/Hook/PathHooks.php b/core/modules/path/src/Hook/PathHooks.php
index 42b79e270c45..95e628bc9687 100644
--- a/core/modules/path/src/Hook/PathHooks.php
+++ b/core/modules/path/src/Hook/PathHooks.php
@@ -100,11 +100,12 @@ public function entityBaseFieldInfoAlter(&$fields, EntityTypeInterface $entity_t
* Implements hook_entity_base_field_info().
*/
#[Hook('entity_base_field_info')]
- public function entityBaseFieldInfo(EntityTypeInterface $entity_type) {
+ public function entityBaseFieldInfo(EntityTypeInterface $entity_type): array {
if (in_array($entity_type->id(), ['taxonomy_term', 'node', 'media'], TRUE)) {
$fields['path'] = BaseFieldDefinition::create('path')->setLabel(t('URL alias'))->setTranslatable(TRUE)->setDisplayOptions('form', ['type' => 'path', 'weight' => 30])->setDisplayConfigurable('form', TRUE)->setComputed(TRUE);
return $fields;
}
+ return [];
}
/**
diff --git a/core/modules/rest/tests/modules/rest_test/src/Hook/RestTestHooks.php b/core/modules/rest/tests/modules/rest_test/src/Hook/RestTestHooks.php
index 1a87e5a92205..2b11cc3aee90 100644
--- a/core/modules/rest/tests/modules/rest_test/src/Hook/RestTestHooks.php
+++ b/core/modules/rest/tests/modules/rest_test/src/Hook/RestTestHooks.php
@@ -66,7 +66,7 @@ public function entityFieldAccess($operation, FieldDefinitionInterface $field_de
* Implements hook_entity_base_field_info().
*/
#[Hook('entity_base_field_info')]
- public function entityBaseFieldInfo(EntityTypeInterface $entity_type) {
+ public function entityBaseFieldInfo(EntityTypeInterface $entity_type): array {
$fields = [];
$fields['rest_test_validation'] = BaseFieldDefinition::create('string')->setLabel(t('REST test validation field'))->setDescription(t('A text field with some special validations attached used for testing purposes'))->addConstraint('rest_test_validation');
return $fields;
diff --git a/core/modules/system/src/Hook/SystemHooks.php b/core/modules/system/src/Hook/SystemHooks.php
index eaf1a3ab165d..f63eabb56291 100644
--- a/core/modules/system/src/Hook/SystemHooks.php
+++ b/core/modules/system/src/Hook/SystemHooks.php
@@ -161,7 +161,7 @@ public function help($route_name, RouteMatchInterface $route_match) {
* Implements hook_updater_info().
*/
#[Hook('updater_info')]
- public function updaterInfo() {
+ public function updaterInfo(): array {
return [
'module' => [
'class' => 'Drupal\Core\Updater\Module',
@@ -180,7 +180,7 @@ public function updaterInfo() {
* Implements hook_filetransfer_info().
*/
#[Hook('filetransfer_info')]
- public function filetransferInfo() {
+ public function filetransferInfo(): array {
$backends = [];
// This is the default, will be available on most systems.
if (function_exists('ftp_connect')) {
diff --git a/core/modules/system/src/Hook/SystemTokensHooks.php b/core/modules/system/src/Hook/SystemTokensHooks.php
index e5fc25d5de16..37eae8f90605 100644
--- a/core/modules/system/src/Hook/SystemTokensHooks.php
+++ b/core/modules/system/src/Hook/SystemTokensHooks.php
@@ -16,7 +16,7 @@ class SystemTokensHooks {
* Implements hook_token_info().
*/
#[Hook('token_info')]
- public function tokenInfo() {
+ public function tokenInfo(): array {
$types['site'] = [
'name' => t("Site information"),
'description' => t("Tokens for site-wide settings and other global information."),
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 184e6ab02b5c..aac5aef781c2 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -43,7 +43,7 @@
/**
* Implements hook_hook_info().
*/
-function system_hook_info() {
+function system_hook_info(): array {
$hooks['token_info'] = [
'group' => 'tokens',
];
diff --git a/core/modules/system/tests/modules/entity_reference_test/src/Hook/EntityReferenceTestHooks.php b/core/modules/system/tests/modules/entity_reference_test/src/Hook/EntityReferenceTestHooks.php
index 2954e0257938..29e12342ce25 100644
--- a/core/modules/system/tests/modules/entity_reference_test/src/Hook/EntityReferenceTestHooks.php
+++ b/core/modules/system/tests/modules/entity_reference_test/src/Hook/EntityReferenceTestHooks.php
@@ -20,7 +20,7 @@ class EntityReferenceTestHooks {
* Implements hook_entity_base_field_info().
*/
#[Hook('entity_base_field_info')]
- public function entityBaseFieldInfo(EntityTypeInterface $entity_type) {
+ public function entityBaseFieldInfo(EntityTypeInterface $entity_type): array {
$fields = [];
if ($entity_type->id() === 'entity_test') {
$fields['user_role'] = BaseFieldDefinition::create('entity_reference')->setLabel($this->t('User role'))->setDescription($this->t('The role of the associated user.'))->setSetting('target_type', 'user_role')->setSetting('handler', 'default');
diff --git a/core/modules/system/tests/modules/entity_schema_test/src/Hook/EntitySchemaTestHooks.php b/core/modules/system/tests/modules/entity_schema_test/src/Hook/EntitySchemaTestHooks.php
index ec28bd8cb27c..91d7f16efd9d 100644
--- a/core/modules/system/tests/modules/entity_schema_test/src/Hook/EntitySchemaTestHooks.php
+++ b/core/modules/system/tests/modules/entity_schema_test/src/Hook/EntitySchemaTestHooks.php
@@ -44,7 +44,7 @@ public function entityTypeAlter(array &$entity_types) : void {
* Implements hook_entity_base_field_info().
*/
#[Hook('entity_base_field_info')]
- public function entityBaseFieldInfo(EntityTypeInterface $entity_type) {
+ public function entityBaseFieldInfo(EntityTypeInterface $entity_type): array {
if ($entity_type->id() == 'entity_test_update') {
$definitions['custom_base_field'] = BaseFieldDefinition::create('string')->setName('custom_base_field')->setLabel($this->t('A custom base field'));
if (\Drupal::state()->get('entity_schema_update')) {
@@ -54,30 +54,33 @@ public function entityBaseFieldInfo(EntityTypeInterface $entity_type) {
}
return $definitions;
}
+ return [];
}
/**
* Implements hook_entity_field_storage_info().
*/
#[Hook('entity_field_storage_info')]
- public function entityFieldStorageInfo(EntityTypeInterface $entity_type) {
+ public function entityFieldStorageInfo(EntityTypeInterface $entity_type): array {
if ($entity_type->id() == 'entity_test_update') {
$definitions['custom_bundle_field'] = FieldStorageDefinition::create('string')->setName('custom_bundle_field')->setLabel($this->t('A custom bundle field'))->setRevisionable(TRUE)->setTargetEntityTypeId($entity_type->id());
return $definitions;
}
+ return [];
}
/**
* Implements hook_entity_bundle_field_info().
*/
#[Hook('entity_bundle_field_info')]
- public function entityBundleFieldInfo(EntityTypeInterface $entity_type, $bundle) {
+ public function entityBundleFieldInfo(EntityTypeInterface $entity_type, $bundle): array {
if ($entity_type->id() == 'entity_test_update' && $bundle == 'custom') {
/** @var \Drupal\Core\Field\FieldStorageDefinitionInterface $custom_bundle_field_storage */
$custom_bundle_field_storage = $this->entityFieldStorageInfo($entity_type)['custom_bundle_field'];
$definitions[$custom_bundle_field_storage->getName()] = FieldDefinition::createFromFieldStorageDefinition($custom_bundle_field_storage);
return $definitions;
}
+ return [];
}
/**
diff --git a/core/modules/system/tests/modules/entity_test/src/Hook/EntityTestHooks.php b/core/modules/system/tests/modules/entity_test/src/Hook/EntityTestHooks.php
index 64b73958f502..c6eef6663292 100644
--- a/core/modules/system/tests/modules/entity_test/src/Hook/EntityTestHooks.php
+++ b/core/modules/system/tests/modules/entity_test/src/Hook/EntityTestHooks.php
@@ -65,7 +65,7 @@ public function entityTypeAlter(array &$entity_types) : void {
* Implements hook_entity_base_field_info().
*/
#[Hook('entity_base_field_info')]
- public function entityBaseFieldInfo(EntityTypeInterface $entity_type) {
+ public function entityBaseFieldInfo(EntityTypeInterface $entity_type): array {
$fields = [];
if ($entity_type->id() === 'entity_test' && \Drupal::state()->get('entity_test.internal_field')) {
$fields['internal_string_field'] = BaseFieldDefinition::create('string')->setLabel('Internal field')->setInternal(TRUE);
@@ -125,7 +125,7 @@ public function entityBaseFieldInfoAlter(&$fields, EntityTypeInterface $entity_t
* Implements hook_entity_bundle_info().
*/
#[Hook('entity_bundle_info')]
- public function entityBundleInfo() {
+ public function entityBundleInfo(): array {
$bundles = [];
$entity_types = \Drupal::entityTypeManager()->getDefinitions();
foreach ($entity_types as $entity_type_id => $entity_type) {
@@ -208,7 +208,7 @@ public function entityTestViewModeAlter(string &$view_mode, EntityInterface $ent
* Implements hook_entity_extra_field_info().
*/
#[Hook('entity_extra_field_info')]
- public function entityExtraFieldInfo() {
+ public function entityExtraFieldInfo(): array {
$extra['entity_test']['bundle_with_extra_fields'] = [
'display' => [
// Note: those extra fields do not currently display anything, they are
diff --git a/core/modules/system/tests/modules/entity_test_extra/src/Hook/EntityTestExtraHooks.php b/core/modules/system/tests/modules/entity_test_extra/src/Hook/EntityTestExtraHooks.php
index 595b21c7b167..48ddf69c7e46 100644
--- a/core/modules/system/tests/modules/entity_test_extra/src/Hook/EntityTestExtraHooks.php
+++ b/core/modules/system/tests/modules/entity_test_extra/src/Hook/EntityTestExtraHooks.php
@@ -16,7 +16,7 @@ class EntityTestExtraHooks {
* Implements hook_entity_base_field_info().
*/
#[Hook('entity_base_field_info')]
- public function entityBaseFieldInfo(EntityTypeInterface $entity_type) {
+ public function entityBaseFieldInfo(EntityTypeInterface $entity_type): array {
return \Drupal::state()->get($entity_type->id() . '.additional_base_field_definitions', []);
}
@@ -24,7 +24,7 @@ public function entityBaseFieldInfo(EntityTypeInterface $entity_type) {
* Implements hook_entity_field_storage_info().
*/
#[Hook('entity_field_storage_info')]
- public function entityFieldStorageInfo(EntityTypeInterface $entity_type) {
+ public function entityFieldStorageInfo(EntityTypeInterface $entity_type): array {
return \Drupal::state()->get($entity_type->id() . '.additional_field_storage_definitions', []);
}
@@ -32,7 +32,7 @@ public function entityFieldStorageInfo(EntityTypeInterface $entity_type) {
* Implements hook_entity_bundle_field_info().
*/
#[Hook('entity_bundle_field_info')]
- public function entityBundleFieldInfo(EntityTypeInterface $entity_type, $bundle, array $base_field_definitions) {
+ public function entityBundleFieldInfo(EntityTypeInterface $entity_type, $bundle, array $base_field_definitions): array {
return \Drupal::state()->get($entity_type->id() . '.' . $bundle . '.additional_bundle_field_definitions', []);
}
diff --git a/core/modules/system/tests/modules/entity_test_update/src/Hook/EntityTestUpdateHooks.php b/core/modules/system/tests/modules/entity_test_update/src/Hook/EntityTestUpdateHooks.php
index 587a66021329..dbe7e518f711 100644
--- a/core/modules/system/tests/modules/entity_test_update/src/Hook/EntityTestUpdateHooks.php
+++ b/core/modules/system/tests/modules/entity_test_update/src/Hook/EntityTestUpdateHooks.php
@@ -19,25 +19,26 @@ class EntityTestUpdateHooks {
* Implements hook_entity_base_field_info().
*/
#[Hook('entity_base_field_info')]
- public function entityBaseFieldInfo(EntityTypeInterface $entity_type) {
+ public function entityBaseFieldInfo(EntityTypeInterface $entity_type): array {
// Add a base field that will be used to test that fields added through
// hook_entity_base_field_info() are handled correctly during a schema
// conversion (e.g. from non-revisionable to revisionable).
+ $fields = [];
if ($entity_type->id() == 'entity_test_update') {
- $fields = [];
$fields['test_entity_base_field_info'] = BaseFieldDefinition::create('string')->setLabel(new TranslatableMarkup('Field added by hook_entity_base_field_info()'))->setTranslatable(TRUE)->setRevisionable(TRUE);
- return $fields;
}
+ return $fields;
}
/**
* Implements hook_entity_field_storage_info().
*/
#[Hook('entity_field_storage_info')]
- public function entityFieldStorageInfo(EntityTypeInterface $entity_type) {
+ public function entityFieldStorageInfo(EntityTypeInterface $entity_type): array {
if ($entity_type->id() == 'entity_test_update') {
return \Drupal::state()->get('entity_test_update.additional_field_storage_definitions', []);
}
+ return [];
}
/**
diff --git a/core/modules/system/tests/modules/module_test/module_test.module b/core/modules/system/tests/modules/module_test/module_test.module
index 6215067f9858..eb8af1a7dc90 100644
--- a/core/modules/system/tests/modules/module_test/module_test.module
+++ b/core/modules/system/tests/modules/module_test/module_test.module
@@ -61,7 +61,7 @@ function module_test_system_info_alter(&$info, Extension $file, $type): void {
/**
* Implements hook_hook_info().
*/
-function module_test_hook_info() {
+function module_test_hook_info(): array {
$hooks['test_hook'] = [
'group' => 'file',
];
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 7b21b5c1067f..0909f0c38e7f 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
@@ -115,7 +115,7 @@ public function pageAttachments(array &$page): void {
* Implements hook_filetransfer_info().
*/
#[Hook('filetransfer_info')]
- public function filetransferInfo() {
+ public function filetransferInfo(): array {
return [
'system_test' => [
'title' => $this->t('System Test FileTransfer'),
diff --git a/core/modules/taxonomy/src/Hook/TaxonomyTokensHooks.php b/core/modules/taxonomy/src/Hook/TaxonomyTokensHooks.php
index d1d06885d57e..63809355c635 100644
--- a/core/modules/taxonomy/src/Hook/TaxonomyTokensHooks.php
+++ b/core/modules/taxonomy/src/Hook/TaxonomyTokensHooks.php
@@ -17,7 +17,7 @@ class TaxonomyTokensHooks {
* Implements hook_token_info().
*/
#[Hook('token_info')]
- public function tokenInfo() {
+ public function tokenInfo(): array {
$types['term'] = [
'name' => t("Taxonomy terms"),
'description' => t("Tokens related to taxonomy terms."),
diff --git a/core/modules/update/tests/modules/update_test/src/Hook/UpdateTestHooks.php b/core/modules/update/tests/modules/update_test/src/Hook/UpdateTestHooks.php
index 9980388e83dd..e96240cf5a17 100644
--- a/core/modules/update/tests/modules/update_test/src/Hook/UpdateTestHooks.php
+++ b/core/modules/update/tests/modules/update_test/src/Hook/UpdateTestHooks.php
@@ -66,7 +66,7 @@ public function updateStatusAlter(&$projects): void {
* Implements hook_filetransfer_info().
*/
#[Hook('filetransfer_info')]
- public function filetransferInfo() {
+ public function filetransferInfo(): array {
// Define a test file transfer method, to ensure that there will always be at
// least one method available in the user interface (regardless of the
// environment in which the update manager tests are run).
diff --git a/core/modules/user/src/Hook/UserHooks.php b/core/modules/user/src/Hook/UserHooks.php
index 806dfd63217d..f1ea1baa5966 100644
--- a/core/modules/user/src/Hook/UserHooks.php
+++ b/core/modules/user/src/Hook/UserHooks.php
@@ -124,7 +124,7 @@ public function jsSettingsAlter(&$settings, AttachedAssetsInterface $assets): vo
* Implements hook_entity_extra_field_info().
*/
#[Hook('entity_extra_field_info')]
- public function entityExtraFieldInfo() {
+ public function entityExtraFieldInfo(): array {
$fields['user']['user']['form']['account'] = [
'label' => t('User name and password'),
'description' => t('User module account form elements.'),
diff --git a/core/modules/user/src/Hook/UserTokensHooks.php b/core/modules/user/src/Hook/UserTokensHooks.php
index 98130749fea5..1ecfc63b5935 100644
--- a/core/modules/user/src/Hook/UserTokensHooks.php
+++ b/core/modules/user/src/Hook/UserTokensHooks.php
@@ -16,7 +16,7 @@ class UserTokensHooks {
* Implements hook_token_info().
*/
#[Hook('token_info')]
- public function tokenInfo() {
+ public function tokenInfo(): array {
$types['user'] = [
'name' => t('Users'),
'description' => t('Tokens related to individual user accounts.'),
diff --git a/core/modules/views/src/Hook/ViewsTokensHooks.php b/core/modules/views/src/Hook/ViewsTokensHooks.php
index bea378daedc4..e19541844400 100644
--- a/core/modules/views/src/Hook/ViewsTokensHooks.php
+++ b/core/modules/views/src/Hook/ViewsTokensHooks.php
@@ -14,7 +14,7 @@ class ViewsTokensHooks {
* Implements hook_token_info().
*/
#[Hook('token_info')]
- public function tokenInfo() {
+ public function tokenInfo(): array {
$info['types']['view'] = [
'name' => t('View', [], [
'context' => 'View entity type',
diff --git a/core/modules/views/tests/modules/views_entity_test/src/Hook/ViewsEntityTestHooks.php b/core/modules/views/tests/modules/views_entity_test/src/Hook/ViewsEntityTestHooks.php
index 539a873cee58..603f4a10d7dd 100644
--- a/core/modules/views/tests/modules/views_entity_test/src/Hook/ViewsEntityTestHooks.php
+++ b/core/modules/views/tests/modules/views_entity_test/src/Hook/ViewsEntityTestHooks.php
@@ -22,11 +22,12 @@ class ViewsEntityTestHooks {
* Implements hook_entity_base_field_info().
*/
#[Hook('entity_base_field_info')]
- public function entityBaseFieldInfo(EntityTypeInterface $entity_type) {
+ public function entityBaseFieldInfo(EntityTypeInterface $entity_type): array {
if ($entity_type->id() == 'entity_test') {
$definitions['test_text_access'] = BaseFieldDefinition::create('string')->setLabel(t('Test access'))->setTranslatable(FALSE)->setSetting('max_length', 64)->setDisplayOptions('form', ['type' => 'string_textfield', 'weight' => 10]);
return $definitions;
}
+ return [];
}
/**
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 6da21984f90f..8e80ae5589df 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -245,7 +245,7 @@ function &views_get_current_view() {
/**
* Implements hook_hook_info().
*/
-function views_hook_info() {
+function views_hook_info(): array {
$hooks = [];
$hooks += array_fill_keys([
diff --git a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.module b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.module
index f6d036a7d697..4b4ff15fe670 100644
--- a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.module
+++ b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.module
@@ -10,7 +10,7 @@
/**
* Implements hook_hook_info().
*/
-function module_handler_test_hook_info() {
+function module_handler_test_hook_info(): array {
return [
'hook' => ['group' => 'hook'],
];
diff --git a/core/tests/Drupal/Tests/Core/GroupIncludesTestTrait.php b/core/tests/Drupal/Tests/Core/GroupIncludesTestTrait.php
index 807ae036e695..8047c1412c13 100644
--- a/core/tests/Drupal/Tests/Core/GroupIncludesTestTrait.php
+++ b/core/tests/Drupal/Tests/Core/GroupIncludesTestTrait.php
@@ -26,7 +26,7 @@ public static function setupGroupIncludes(): array {
file_put_contents('vfs://drupal_root/test_module.module', <<<'EOD'
<?php
-function test_module_hook_info() {
+function test_module_hook_info(): array {
$hooks['token_info'] = [
'group' => 'tokens',
];
--
GitLab