From cecb992b71abc55adec64c82358c3e3c77a356c6 Mon Sep 17 00:00:00 2001
From: catch <6915-catch@users.noreply.drupalcode.org>
Date: Fri, 19 Jul 2024 22:32:38 +0900
Subject: [PATCH] Issue #3458427 by mstrelan: Add array return typehints to
protected test helper methods
---
.../basic_auth/tests/src/Traits/BasicAuthTestTrait.php | 2 +-
.../tests/src/FunctionalJavascript/BlockFilterTest.php | 2 +-
.../tests/src/Functional/BlockContentCacheTagsTest.php | 4 ++--
.../tests/src/FunctionalJavascript/ImageTest.php | 2 +-
.../ckeditor5/tests/src/Unit/LanguagePluginTest.php | 2 +-
.../tests/src/Functional/CommentCacheTagsTest.php | 6 +++---
.../tests/src/Functional/CommentTranslationUITest.php | 2 +-
.../tests/src/Functional/ContactPersonalTest.php | 2 +-
.../tests/src/Kernel/ContentModerationSyncingTest.php | 2 +-
.../src/Functional/ContentTestTranslationUITest.php | 2 +-
.../src/Functional/ContentTranslationSyncImageTest.php | 2 +-
.../src/Functional/ContentTranslationWorkflowsTest.php | 4 ++--
core/modules/dblog/tests/src/Functional/DbLogTest.php | 4 ++--
.../tests/src/Kernel/Views/ViewsIntegrationTest.php | 2 +-
.../editor/tests/src/Functional/EditorAdminTest.php | 2 +-
.../editor/tests/src/Functional/EditorLoadingTest.php | 2 +-
.../EntityReference/EntityReferenceIntegrationTest.php | 2 +-
.../tests/src/Kernel/FieldDefinitionIntegrityTest.php | 2 +-
.../tests/src/Functional/FieldLayoutTest.php | 2 +-
.../tests/src/FunctionalJavascript/FieldLayoutTest.php | 2 +-
.../tests/src/Functional/ManageDisplayTest.php | 2 +-
.../src/Kernel/Migrate/d7/MigrateFileGetIdsTest.php | 2 +-
.../tests/src/Kernel/Migrate/d7/MigrateFileTest.php | 2 +-
.../src/Kernel/Migrate/d7/MigratePrivateFileTest.php | 2 +-
.../tests/src/Functional/ImageFieldValidateTest.php | 2 +-
.../jsonapi/tests/src/Functional/ActionTest.php | 4 ++--
.../tests/src/Functional/BaseFieldOverrideTest.php | 4 ++--
.../jsonapi/tests/src/Functional/BlockContentTest.php | 4 ++--
.../tests/src/Functional/BlockContentTypeTest.php | 4 ++--
.../modules/jsonapi/tests/src/Functional/BlockTest.php | 8 ++++----
.../jsonapi/tests/src/Functional/CommentTest.php | 6 +++---
.../jsonapi/tests/src/Functional/CommentTypeTest.php | 4 ++--
.../jsonapi/tests/src/Functional/ConfigTestTest.php | 4 ++--
.../tests/src/Functional/ConfigurableLanguageTest.php | 4 ++--
.../jsonapi/tests/src/Functional/ContactFormTest.php | 4 ++--
.../src/Functional/ContentLanguageSettingsTest.php | 4 ++--
.../jsonapi/tests/src/Functional/DateFormatTest.php | 4 ++--
.../jsonapi/tests/src/Functional/EditorTest.php | 4 ++--
.../tests/src/Functional/EntityFormDisplayTest.php | 4 ++--
.../tests/src/Functional/EntityFormModeTest.php | 4 ++--
.../src/Functional/EntityTestComputedFieldTest.php | 6 +++---
.../tests/src/Functional/EntityTestMapFieldTest.php | 6 +++---
.../jsonapi/tests/src/Functional/EntityTestTest.php | 6 +++---
.../tests/src/Functional/EntityViewDisplayTest.php | 4 ++--
.../tests/src/Functional/EntityViewModeTest.php | 4 ++--
.../jsonapi/tests/src/Functional/FieldConfigTest.php | 4 ++--
.../tests/src/Functional/FieldStorageConfigTest.php | 4 ++--
core/modules/jsonapi/tests/src/Functional/FileTest.php | 4 ++--
.../jsonapi/tests/src/Functional/FileUploadTest.php | 4 ++--
.../jsonapi/tests/src/Functional/FilterFormatTest.php | 4 ++--
.../jsonapi/tests/src/Functional/ImageStyleTest.php | 4 ++--
.../modules/jsonapi/tests/src/Functional/MediaTest.php | 6 +++---
.../jsonapi/tests/src/Functional/MediaTypeTest.php | 4 ++--
.../tests/src/Functional/MenuLinkContentTest.php | 4 ++--
core/modules/jsonapi/tests/src/Functional/MenuTest.php | 4 ++--
.../jsonapi/tests/src/Functional/MessageTest.php | 2 +-
core/modules/jsonapi/tests/src/Functional/NodeTest.php | 6 +++---
.../jsonapi/tests/src/Functional/NodeTypeTest.php | 4 ++--
.../jsonapi/tests/src/Functional/PathAliasTest.php | 4 ++--
.../tests/src/Functional/ResourceResponseTestTrait.php | 10 +++++-----
.../tests/src/Functional/ResponsiveImageStyleTest.php | 4 ++--
.../tests/src/Functional/RestResourceConfigTest.php | 4 ++--
core/modules/jsonapi/tests/src/Functional/RoleTest.php | 4 ++--
.../jsonapi/tests/src/Functional/SearchPageTest.php | 4 ++--
.../jsonapi/tests/src/Functional/ShortcutSetTest.php | 4 ++--
.../jsonapi/tests/src/Functional/ShortcutTest.php | 4 ++--
core/modules/jsonapi/tests/src/Functional/TermTest.php | 4 ++--
core/modules/jsonapi/tests/src/Functional/UserTest.php | 4 ++--
core/modules/jsonapi/tests/src/Functional/ViewTest.php | 4 ++--
.../jsonapi/tests/src/Functional/VocabularyTest.php | 4 ++--
.../jsonapi/tests/src/Functional/WorkflowTest.php | 4 ++--
.../jsonapi/tests/src/Kernel/Query/FilterTest.php | 2 +-
.../Jsonapi/LayoutBuilderEntityViewDisplayTest.php | 2 +-
.../tests/src/FunctionalJavascript/BlockFilterTest.php | 2 +-
.../tests/src/Kernel/SectionListTraitTest.php | 2 +-
.../tests/src/Kernel/LinkItemUrlValidationTest.php | 2 +-
.../locale/tests/src/Kernel/LocaleStringTest.php | 2 +-
.../media/tests/src/Functional/MediaCacheTagsTest.php | 4 ++--
.../tests/src/Functional/MediaTranslationUITest.php | 6 +++---
.../Functional/MenuLinkContentTranslationUITest.php | 4 ++--
.../migrate/tests/src/Unit/MigrateSqlIdMapTest.php | 4 ++--
.../Kernel/Plugin/migrate/DestinationCategoryTest.php | 4 ++--
.../Kernel/Plugin/migrate/source/ContentEntityTest.php | 2 +-
.../tests/src/Kernel/d7/FollowUpMigrationsTest.php | 2 +-
.../src/Traits/CreateTestContentEntitiesTrait.php | 2 +-
.../tests/src/Traits/NodeMigrateTypeTestTrait.php | 2 +-
.../tests/src/Unit/FieldDiscoveryTest.php | 2 +-
.../tests/src/Unit/MigrateFieldPluginManagerTest.php | 2 +-
.../tests/src/Functional/CredentialFormTest.php | 10 +++++-----
.../tests/src/Functional/SourceProviderTest.php | 8 ++++----
.../tests/src/Functional/d6/IdConflictTest.php | 8 ++++----
.../src/Functional/d6/MultilingualReviewPageTest.php | 4 ++--
.../src/Functional/d6/NoMultilingualReviewPageTest.php | 6 +++---
.../tests/src/Functional/d6/NodeClassicTest.php | 8 ++++----
.../tests/src/Functional/d6/Upgrade6Test.php | 6 +++---
.../d6/Upgrade6TestWithContentModeration.php | 2 +-
.../tests/src/Functional/d7/DoubleSlashTest.php | 8 ++++----
.../tests/src/Functional/d7/FilePathTest.php | 8 ++++----
.../tests/src/Functional/d7/IdConflictTest.php | 8 ++++----
.../src/Functional/d7/MultilingualReviewPageTest.php | 4 ++--
.../src/Functional/d7/NoMultilingualReviewPageTest.php | 6 +++---
.../tests/src/Functional/d7/Upgrade7Test.php | 6 +++---
.../d7/Upgrade7TestWithContentModeration.php | 2 +-
.../mysql/tests/src/Kernel/mysql/DbDumpTest.php | 4 ++--
.../tests/src/Kernel/SystemMenuNavigationBlockTest.php | 2 +-
.../node/tests/src/Functional/NodeCacheTagsTest.php | 6 +++---
.../node/tests/src/Functional/NodeCreationTest.php | 2 +-
.../tests/src/Functional/NodeTranslationUITest.php | 6 +++---
.../src/Kernel/Migrate/d6/MigrateNodeCompleteTest.php | 6 +++---
.../src/Kernel/Migrate/d7/MigrateNodeCompleteTest.php | 8 ++++----
.../src/Kernel/Migrate/d7/MigrateNodeRevisionTest.php | 2 +-
.../tests/src/Kernel/Migrate/d7/MigrateNodeTest.php | 2 +-
.../page_cache/tests/src/Functional/PageCacheTest.php | 2 +-
.../tests/src/Unit/Field/PathFieldDefinitionTest.php | 2 +-
.../src/Functional/BasicAuthResourceTestTrait.php | 2 +-
.../XmlEntityNormalizationQuirksTrait.php | 2 +-
.../src/Functional/XmlNormalizationQuirksTrait.php | 2 +-
.../EventSubscriber/ResourceResponseSubscriberTest.php | 2 +-
.../src/FunctionalJavascript/SettingsTrayTestBase.php | 2 +-
.../tests/src/Functional/ShortcutTranslationUITest.php | 2 +-
.../Cache/AssertPageCacheContextsAndTagsTrait.php | 2 +-
.../tests/src/Functional/Form/ElementsLabelsTest.php | 2 +-
.../src/Functional/Form/ElementsTableSelectTest.php | 2 +-
.../src/Functional/Menu/AssertBreadcrumbTrait.php | 2 +-
.../taxonomy/tests/src/Functional/TermParentsTest.php | 2 +-
.../modules/taxonomy/tests/src/Functional/TermTest.php | 2 +-
.../tests/src/Functional/TermTranslationUITest.php | 2 +-
.../src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php | 2 +-
.../user/tests/src/Functional/UserCacheTagsTest.php | 2 +-
.../tests/src/Functional/UserRegistrationRestTest.php | 2 +-
.../tests/src/Functional/UserTranslationUITest.php | 2 +-
.../tests/src/Functional/Handler/FieldWebTest.php | 2 +-
.../Plugin/views/Handler/FilterTest.php | 2 +-
.../ViewsEntitySchemaSubscriberIntegrationTest.php | 2 +-
.../views/tests/src/Kernel/FieldApiDataTest.php | 2 +-
.../Kernel/Handler/FilterBooleanOperatorStringTest.php | 2 +-
.../src/Kernel/Handler/FilterBooleanOperatorTest.php | 2 +-
.../tests/src/Kernel/Handler/FilterEqualityTest.php | 2 +-
.../tests/src/Kernel/Handler/FilterInOperatorTest.php | 2 +-
.../tests/src/Kernel/Handler/FilterNumericTest.php | 2 +-
.../tests/src/Kernel/Handler/FilterStringTest.php | 2 +-
.../views/tests/src/Kernel/Handler/SortDateTest.php | 2 +-
core/modules/views/tests/src/Kernel/ModuleTest.php | 2 +-
.../src/Unit/Controller/ViewAjaxControllerTest.php | 2 +-
.../src/Unit/EventSubscriber/RouteSubscriberTest.php | 2 +-
.../src/Unit/Plugin/display/PathPluginBaseTest.php | 2 +-
.../views/tests/src/Unit/ViewExecutableTest.php | 2 +-
.../tests/src/Functional/RearrangeFieldsTest.php | 2 +-
.../src/FunctionalJavascript/ViewsListingTest.php | 2 +-
.../tests/src/Kernel/WorkspaceIntegrationTest.php | 2 +-
core/tests/Drupal/KernelTests/AssertContentTrait.php | 2 +-
.../Core/Cache/EndOfTransactionQueriesTest.php | 2 +-
.../KernelTests/Core/Config/ConfigDependencyTest.php | 2 +-
.../KernelTests/Core/Entity/EntityRepositoryTest.php | 2 +-
.../KernelTests/Core/Theme/ThemeInstallerTest.php | 4 ++--
core/tests/Drupal/KernelTests/KernelTestBase.php | 2 +-
core/tests/Drupal/Tests/ApiRequestTrait.php | 2 +-
.../Component/DependencyInjection/ContainerTest.php | 2 +-
.../DependencyInjection/Dumper/PhpArrayDumperTest.php | 2 +-
.../Drupal/Tests/Component/DrupalComponentTest.php | 2 +-
core/tests/Drupal/Tests/Component/Graph/GraphTest.php | 2 +-
.../Drupal/Tests/Component/Utility/UserAgentTest.php | 4 ++--
.../tests/Drupal/Tests/Composer/Generator/Fixtures.php | 4 ++--
.../Plugin/Scaffold/Functional/ScaffoldTest.php | 2 +-
.../Core/Cache/Context/CacheContextsManagerTest.php | 2 +-
.../Core/Entity/Sql/SqlContentEntityStorageTest.php | 2 +-
.../Tests/Core/Extension/ExtensionDiscoveryTest.php | 2 +-
.../Drupal/Tests/Core/Extension/ExtensionListTest.php | 2 +-
.../Drupal/Tests/Core/Menu/LocalTaskManagerTest.php | 6 +++---
.../Core/Plugin/Context/LazyContextRepositoryTest.php | 2 +-
.../Tests/Core/Plugin/Discovery/HookDiscoveryTest.php | 4 ++--
.../Tests/Core/Render/RendererPlaceholdersTest.php | 4 ++--
.../Drupal/Tests/Core/Render/RendererRecursionTest.php | 2 +-
core/tests/Drupal/Tests/XdebugRequestTrait.php | 2 +-
174 files changed, 290 insertions(+), 290 deletions(-)
diff --git a/core/modules/basic_auth/tests/src/Traits/BasicAuthTestTrait.php b/core/modules/basic_auth/tests/src/Traits/BasicAuthTestTrait.php
index c7494b46137f..f49698fad300 100644
--- a/core/modules/basic_auth/tests/src/Traits/BasicAuthTestTrait.php
+++ b/core/modules/basic_auth/tests/src/Traits/BasicAuthTestTrait.php
@@ -39,7 +39,7 @@ protected function basicAuthGet($path, $username, $password, array $options = []
* @return array
* An array of raw request headers as used by curl_setopt().
*/
- protected function getBasicAuthHeaders($username, $password) {
+ protected function getBasicAuthHeaders($username, $password): array {
// Set up Curl to use basic authentication with the test user's credentials.
return ['Authorization' => 'Basic ' . base64_encode("$username:$password")];
}
diff --git a/core/modules/block/tests/src/FunctionalJavascript/BlockFilterTest.php b/core/modules/block/tests/src/FunctionalJavascript/BlockFilterTest.php
index bf511af086e1..8914669d72c0 100644
--- a/core/modules/block/tests/src/FunctionalJavascript/BlockFilterTest.php
+++ b/core/modules/block/tests/src/FunctionalJavascript/BlockFilterTest.php
@@ -90,7 +90,7 @@ public function testBlockFilter(): void {
*
* @return \Behat\Mink\Element\NodeElement[]
*/
- protected function filterVisibleElements(array $elements) {
+ protected function filterVisibleElements(array $elements): array {
$elements = array_filter($elements, function (NodeElement $element) {
return $element->isVisible();
});
diff --git a/core/modules/block_content/tests/src/Functional/BlockContentCacheTagsTest.php b/core/modules/block_content/tests/src/Functional/BlockContentCacheTagsTest.php
index b8a01bca98fd..2822b2d7092d 100644
--- a/core/modules/block_content/tests/src/Functional/BlockContentCacheTagsTest.php
+++ b/core/modules/block_content/tests/src/Functional/BlockContentCacheTagsTest.php
@@ -59,7 +59,7 @@ protected function createEntity() {
*
* @see \Drupal\block_content\BlockContentAccessControlHandler::checkAccess()
*/
- protected function getAccessCacheContextsForEntity(EntityInterface $entity) {
+ protected function getAccessCacheContextsForEntity(EntityInterface $entity): array {
return [];
}
@@ -68,7 +68,7 @@ protected function getAccessCacheContextsForEntity(EntityInterface $entity) {
*
* Each comment must have a comment body, which always has a text format.
*/
- protected function getAdditionalCacheTagsForEntity(EntityInterface $entity) {
+ protected function getAdditionalCacheTagsForEntity(EntityInterface $entity): array {
return ['config:filter.format.plain_text'];
}
diff --git a/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageTest.php b/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageTest.php
index 5dd5caf183cf..d57d0e0120fb 100644
--- a/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageTest.php
+++ b/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageTest.php
@@ -114,7 +114,7 @@ function (ConstraintViolation $v) {
*
* @return string[]
*/
- protected function imageAttributes() {
+ protected function imageAttributes(): array {
return [
'data-entity-type' => 'file',
'data-entity-uuid' => $this->file->uuid(),
diff --git a/core/modules/ckeditor5/tests/src/Unit/LanguagePluginTest.php b/core/modules/ckeditor5/tests/src/Unit/LanguagePluginTest.php
index de73ca706f09..77145285aefa 100644
--- a/core/modules/ckeditor5/tests/src/Unit/LanguagePluginTest.php
+++ b/core/modules/ckeditor5/tests/src/Unit/LanguagePluginTest.php
@@ -102,7 +102,7 @@ public static function providerGetDynamicPluginConfig(): array {
* @return array
* The expected output of the dynamic plugin configuration.
*/
- protected static function buildExpectedDynamicConfig(array $language_list) {
+ protected static function buildExpectedDynamicConfig(array $language_list): array {
$expected_language_config = [];
foreach ($language_list as $language_code => $language_list_item) {
$item = [
diff --git a/core/modules/comment/tests/src/Functional/CommentCacheTagsTest.php b/core/modules/comment/tests/src/Functional/CommentCacheTagsTest.php
index 71f75312f72a..32f265dc7592 100644
--- a/core/modules/comment/tests/src/Functional/CommentCacheTagsTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentCacheTagsTest.php
@@ -145,7 +145,7 @@ public function testCommentEntity(): void {
/**
* {@inheritdoc}
*/
- protected function getAdditionalCacheContextsForEntity(EntityInterface $entity) {
+ protected function getAdditionalCacheContextsForEntity(EntityInterface $entity): array {
return [];
}
@@ -154,7 +154,7 @@ protected function getAdditionalCacheContextsForEntity(EntityInterface $entity)
*
* Each comment must have a comment body, which always has a text format.
*/
- protected function getAdditionalCacheTagsForEntity(EntityInterface $entity) {
+ protected function getAdditionalCacheTagsForEntity(EntityInterface $entity): array {
/** @var \Drupal\comment\CommentInterface $entity */
return [
'config:filter.format.plain_text',
@@ -166,7 +166,7 @@ protected function getAdditionalCacheTagsForEntity(EntityInterface $entity) {
/**
* {@inheritdoc}
*/
- protected function getDefaultCacheContexts() {
+ protected function getDefaultCacheContexts(): array {
return [
'languages:' . LanguageInterface::TYPE_INTERFACE,
'theme',
diff --git a/core/modules/comment/tests/src/Functional/CommentTranslationUITest.php b/core/modules/comment/tests/src/Functional/CommentTranslationUITest.php
index b1e575d4b547..3ae48556957c 100644
--- a/core/modules/comment/tests/src/Functional/CommentTranslationUITest.php
+++ b/core/modules/comment/tests/src/Functional/CommentTranslationUITest.php
@@ -96,7 +96,7 @@ public function setupBundle() {
/**
* {@inheritdoc}
*/
- protected function getTranslatorPermissions() {
+ protected function getTranslatorPermissions(): array {
return array_merge(parent::getTranslatorPermissions(), ['post comments', 'administer comments', 'access comments']);
}
diff --git a/core/modules/contact/tests/src/Functional/ContactPersonalTest.php b/core/modules/contact/tests/src/Functional/ContactPersonalTest.php
index 2a4616b728b5..be485238a72f 100644
--- a/core/modules/contact/tests/src/Functional/ContactPersonalTest.php
+++ b/core/modules/contact/tests/src/Functional/ContactPersonalTest.php
@@ -345,7 +345,7 @@ protected function checkContactAccess($response, $contact_value = NULL) {
* @return array
* An array with the form fields being used.
*/
- protected function submitPersonalContact(AccountInterface $account, array $message = [], bool $user_copy = FALSE) {
+ protected function submitPersonalContact(AccountInterface $account, array $message = [], bool $user_copy = FALSE): array {
$message += [
'subject[0][value]' => $this->randomMachineName(16) . '< " =+ >',
'message[0][value]' => $this->randomMachineName(64) . '< " =+ >',
diff --git a/core/modules/content_moderation/tests/src/Kernel/ContentModerationSyncingTest.php b/core/modules/content_moderation/tests/src/Kernel/ContentModerationSyncingTest.php
index 8204273393a6..61f7945e4eff 100644
--- a/core/modules/content_moderation/tests/src/Kernel/ContentModerationSyncingTest.php
+++ b/core/modules/content_moderation/tests/src/Kernel/ContentModerationSyncingTest.php
@@ -191,7 +191,7 @@ public function testStateChangedPreviousRevisionDuringSync(): void {
* @return array
* An array of revision names.
*/
- protected function getAllRevisionNames(EntityTestMulRevPub $entity) {
+ protected function getAllRevisionNames(EntityTestMulRevPub $entity): array {
/** @var \Drupal\Core\Entity\RevisionableStorageInterface $storage */
$storage = $this->container->get('entity_type.manager')->getStorage('entity_test_mulrevpub');
return array_map(function ($revision_id) use ($storage) {
diff --git a/core/modules/content_translation/tests/src/Functional/ContentTestTranslationUITest.php b/core/modules/content_translation/tests/src/Functional/ContentTestTranslationUITest.php
index 3e58a92211d5..e34ba4156b4c 100644
--- a/core/modules/content_translation/tests/src/Functional/ContentTestTranslationUITest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTestTranslationUITest.php
@@ -56,7 +56,7 @@ protected function setUp(): void {
/**
* {@inheritdoc}
*/
- protected function getTranslatorPermissions() {
+ protected function getTranslatorPermissions(): array {
return array_merge(parent::getTranslatorPermissions(), ['administer entity_test content', 'view test entity']);
}
diff --git a/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php
index 61d2edcdc6d2..ee1826ceb267 100644
--- a/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php
@@ -97,7 +97,7 @@ protected function setupTestFields() {
/**
* {@inheritdoc}
*/
- protected function getEditorPermissions() {
+ protected function getEditorPermissions(): array {
// Every entity-type-specific test needs to define these.
return ['administer entity_test_mul fields', 'administer languages', 'administer content translation'];
}
diff --git a/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php
index ae49210101b6..46bcdd3f6555 100644
--- a/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php
@@ -128,7 +128,7 @@ protected function setupUsers() {
/**
* Returns an array of permissions needed for the entity owner.
*/
- protected function getEntityOwnerPermissions() {
+ protected function getEntityOwnerPermissions(): array {
return ['edit own entity_test content', 'translate editable entities', 'view test entity', 'view test entity translations', 'view unpublished test entity translations'];
}
@@ -147,7 +147,7 @@ protected function getTranslatorPermissions() {
/**
* {@inheritdoc}
*/
- protected function getEditorPermissions() {
+ protected function getEditorPermissions(): array {
return ['administer entity_test content', 'view test entity', 'view test entity translations'];
}
diff --git a/core/modules/dblog/tests/src/Functional/DbLogTest.php b/core/modules/dblog/tests/src/Functional/DbLogTest.php
index 2dba2c1fafdb..e1b4d5b1311b 100644
--- a/core/modules/dblog/tests/src/Functional/DbLogTest.php
+++ b/core/modules/dblog/tests/src/Functional/DbLogTest.php
@@ -735,7 +735,7 @@ public function testFilter(): void {
* - message: (string) The message for this database log event.
* - user: (string) The user associated with this database log event.
*/
- protected function getLogEntries() {
+ protected function getLogEntries(): array {
$entries = [];
if ($table = $this->getLogsEntriesTable()) {
foreach ($table as $row) {
@@ -770,7 +770,7 @@ protected function getLogsEntriesTable() {
* @return array
* The count of each type keyed by the key of the $types array.
*/
- protected function getTypeCount(array $types) {
+ protected function getTypeCount(array $types): array {
$entries = $this->getLogEntries();
$count = array_fill(0, count($types), 0);
foreach ($entries as $entry) {
diff --git a/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php b/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php
index ee75d0738b22..9dc194581ab5 100644
--- a/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php
+++ b/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php
@@ -178,7 +178,7 @@ public function testFiltering(): void {
* @return array
* An array of data used to create the log entries.
*/
- protected function createLogEntries() {
+ protected function createLogEntries(): array {
$entries = [];
// Setup a watchdog entry without tokens.
$entries[] = [
diff --git a/core/modules/editor/tests/src/Functional/EditorAdminTest.php b/core/modules/editor/tests/src/Functional/EditorAdminTest.php
index 8a7091281877..1511e086df73 100644
--- a/core/modules/editor/tests/src/Functional/EditorAdminTest.php
+++ b/core/modules/editor/tests/src/Functional/EditorAdminTest.php
@@ -211,7 +211,7 @@ protected function enableUnicornEditor() {
* @return array
* Returns an edit array containing the values to be posted.
*/
- protected function selectUnicornEditor() {
+ protected function selectUnicornEditor(): array {
// Verify the <select> when a text editor is available.
$select = $this->assertSession()->selectExists('editor[editor]');
$this->assertFalse($select->hasAttribute('disabled'));
diff --git a/core/modules/editor/tests/src/Functional/EditorLoadingTest.php b/core/modules/editor/tests/src/Functional/EditorLoadingTest.php
index 49bbfee754ec..66749303674e 100644
--- a/core/modules/editor/tests/src/Functional/EditorLoadingTest.php
+++ b/core/modules/editor/tests/src/Functional/EditorLoadingTest.php
@@ -304,7 +304,7 @@ public function testSupportedElementTypes(): void {
$this->assertNotSame('edit-field-text-0-value', $select->getAttribute('data-editor-for'));
}
- protected function getThingsToCheck($field_name, $type = 'textarea') {
+ protected function getThingsToCheck($field_name, $type = 'textarea'): array {
$settings = $this->getDrupalSettings();
return [
// JavaScript settings.
diff --git a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceIntegrationTest.php b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceIntegrationTest.php
index ce2f385a8b4a..5ebcf8ade1b0 100644
--- a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceIntegrationTest.php
+++ b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceIntegrationTest.php
@@ -222,7 +222,7 @@ protected function assertFieldValues(string $entity_name, array $referenced_enti
* @return array
* An array of entity objects.
*/
- protected function getTestEntities() {
+ protected function getTestEntities(): array {
$storage = \Drupal::entityTypeManager()->getStorage('config_test');
$config_entity_1 = $storage->create(['id' => $this->randomMachineName(), 'label' => $this->randomMachineName()]);
$config_entity_1->save();
diff --git a/core/modules/field/tests/src/Kernel/FieldDefinitionIntegrityTest.php b/core/modules/field/tests/src/Kernel/FieldDefinitionIntegrityTest.php
index c453aba24bfe..1273fc2cbc43 100644
--- a/core/modules/field/tests/src/Kernel/FieldDefinitionIntegrityTest.php
+++ b/core/modules/field/tests/src/Kernel/FieldDefinitionIntegrityTest.php
@@ -171,7 +171,7 @@ protected function checkDisplayOption($entity_type_id, $field_id, BaseFieldDefin
* - containing the required $subdirectory
* and all modules required by any of these modules.
*/
- protected function modulesWithSubdirectory($subdirectory) {
+ protected function modulesWithSubdirectory($subdirectory): array {
$modules = \Drupal::service('extension.list.module')->getList();
$modules = array_filter($modules, function (Extension $module) use ($subdirectory) {
// Filter contrib, hidden, already enabled modules and modules in the
diff --git a/core/modules/field_layout/tests/src/Functional/FieldLayoutTest.php b/core/modules/field_layout/tests/src/Functional/FieldLayoutTest.php
index ad0eea1df505..7ccf92290e8a 100644
--- a/core/modules/field_layout/tests/src/Functional/FieldLayoutTest.php
+++ b/core/modules/field_layout/tests/src/Functional/FieldLayoutTest.php
@@ -91,7 +91,7 @@ public function testRegionChanges(): void {
* @return string[]
* An array of region titles.
*/
- protected function getRegionTitles() {
+ protected function getRegionTitles(): array {
$region_titles = [];
$region_title_elements = $this->getSession()->getPage()->findAll('css', '.region-title td');
/** @var \Behat\Mink\Element\NodeElement[] $region_title_elements */
diff --git a/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php b/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php
index 485e0375d103..d6ef689ad5aa 100644
--- a/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php
+++ b/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php
@@ -292,7 +292,7 @@ public function testChangingFormatterAndRegion(): void {
* @return string[]
* An array of region titles.
*/
- protected function getRegionTitles() {
+ protected function getRegionTitles(): array {
$region_titles = [];
$region_title_elements = $this->getSession()->getPage()->findAll('css', '.region-title td');
/** @var \Behat\Mink\Element\NodeElement[] $region_title_elements */
diff --git a/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php b/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
index b70b7639cbd9..34d1108e20f4 100644
--- a/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
+++ b/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
@@ -401,7 +401,7 @@ protected function assertFieldSelectOptions(string $name, array $expected_option
* @return array
* An array of option values as strings.
*/
- protected function getAllOptionsList(NodeElement $element) {
+ protected function getAllOptionsList(NodeElement $element): array {
$options = [];
// Add all options items.
foreach ($element->option as $option) {
diff --git a/core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileGetIdsTest.php b/core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileGetIdsTest.php
index 13a4bfa5b765..b58104832f00 100644
--- a/core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileGetIdsTest.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileGetIdsTest.php
@@ -19,7 +19,7 @@ class MigrateFileGetIdsTest extends MigrateFileTest {
/**
* {@inheritdoc}
*/
- protected function getFileMigrationInfo() {
+ protected function getFileMigrationInfo(): array {
$migration_info = parent::getFileMigrationInfo();
$migration_info['plugin_id'] = 'd7_file_used';
return $migration_info;
diff --git a/core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileTest.php b/core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileTest.php
index 0bd4363247d7..a11d83dfadfd 100644
--- a/core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileTest.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileTest.php
@@ -32,7 +32,7 @@ protected function setUp(): void {
/**
* {@inheritdoc}
*/
- protected function getFileMigrationInfo() {
+ protected function getFileMigrationInfo(): array {
return [
'path' => 'public://sites/default/files/cube.jpeg',
'size' => 3620,
diff --git a/core/modules/file/tests/src/Kernel/Migrate/d7/MigratePrivateFileTest.php b/core/modules/file/tests/src/Kernel/Migrate/d7/MigratePrivateFileTest.php
index 259c2e171e6a..e148eb5c63c3 100644
--- a/core/modules/file/tests/src/Kernel/Migrate/d7/MigratePrivateFileTest.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d7/MigratePrivateFileTest.php
@@ -33,7 +33,7 @@ protected function setUp(): void {
/**
* {@inheritdoc}
*/
- protected function getFileMigrationInfo() {
+ protected function getFileMigrationInfo(): array {
return [
'path' => 'private://sites/default/private/Babylon5.txt',
'size' => 3,
diff --git a/core/modules/image/tests/src/Functional/ImageFieldValidateTest.php b/core/modules/image/tests/src/Functional/ImageFieldValidateTest.php
index 32c97382d5f2..b3ecbefaf5ba 100644
--- a/core/modules/image/tests/src/Functional/ImageFieldValidateTest.php
+++ b/core/modules/image/tests/src/Functional/ImageFieldValidateTest.php
@@ -274,7 +274,7 @@ public static function providerTestEmpty() {
*
* @return array
*/
- protected function getFieldSettings($min_resolution, $max_resolution) {
+ protected function getFieldSettings($min_resolution, $max_resolution): array {
return [
'max_resolution' => $max_resolution['width'] . 'x' . $max_resolution['height'],
'min_resolution' => $min_resolution['width'] . 'x' . $min_resolution['height'],
diff --git a/core/modules/jsonapi/tests/src/Functional/ActionTest.php b/core/modules/jsonapi/tests/src/Functional/ActionTest.php
index a2bbb75b7a42..a62481be20e2 100644
--- a/core/modules/jsonapi/tests/src/Functional/ActionTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/ActionTest.php
@@ -71,7 +71,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/action/action/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -113,7 +113,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/BaseFieldOverrideTest.php b/core/modules/jsonapi/tests/src/Functional/BaseFieldOverrideTest.php
index 5ec1d014bfbe..08ed9b77f934 100644
--- a/core/modules/jsonapi/tests/src/Functional/BaseFieldOverrideTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/BaseFieldOverrideTest.php
@@ -74,7 +74,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/base_field_override/base_field_override/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -125,7 +125,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/BlockContentTest.php b/core/modules/jsonapi/tests/src/Functional/BlockContentTest.php
index 125c9120bca7..d79501e45910 100644
--- a/core/modules/jsonapi/tests/src/Functional/BlockContentTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/BlockContentTest.php
@@ -131,7 +131,7 @@ public function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$base_url = Url::fromUri('base:/jsonapi/block_content/basic/' . $this->entity->uuid())->setAbsolute();
$self_url = clone $base_url;
$version_identifier = 'id:' . $this->entity->getRevisionId();
@@ -202,7 +202,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
return [
'data' => [
'type' => 'block_content--basic',
diff --git a/core/modules/jsonapi/tests/src/Functional/BlockContentTypeTest.php b/core/modules/jsonapi/tests/src/Functional/BlockContentTypeTest.php
index 1f2055701c9d..ca694f77a689 100644
--- a/core/modules/jsonapi/tests/src/Functional/BlockContentTypeTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/BlockContentTypeTest.php
@@ -68,7 +68,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/block_content_type/block_content_type/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -104,7 +104,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/BlockTest.php b/core/modules/jsonapi/tests/src/Functional/BlockTest.php
index 5efb77ef42e6..6b945bebbcbd 100644
--- a/core/modules/jsonapi/tests/src/Functional/BlockTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/BlockTest.php
@@ -88,7 +88,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/block/block/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -137,7 +137,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update once https://www.drupal.org/node/2300677 is fixed.
return [];
}
@@ -145,7 +145,7 @@ protected function getPostDocument() {
/**
* {@inheritdoc}
*/
- protected function getExpectedCacheContexts(?array $sparse_fieldset = NULL) {
+ protected function getExpectedCacheContexts(?array $sparse_fieldset = NULL): array {
// @see ::createEntity()
return array_values(array_diff(parent::getExpectedCacheContexts(), ['user.permissions']));
}
@@ -153,7 +153,7 @@ protected function getExpectedCacheContexts(?array $sparse_fieldset = NULL) {
/**
* {@inheritdoc}
*/
- protected function getExpectedCacheTags(?array $sparse_fieldset = NULL) {
+ protected function getExpectedCacheTags(?array $sparse_fieldset = NULL): array {
// Because the 'user.permissions' cache context is missing, the cache tag
// for the anonymous user role is never added automatically.
return array_values(array_diff(parent::getExpectedCacheTags(), ['config:user.role.anonymous']));
diff --git a/core/modules/jsonapi/tests/src/Functional/CommentTest.php b/core/modules/jsonapi/tests/src/Functional/CommentTest.php
index da7d6a7d8224..b873d5b7f862 100644
--- a/core/modules/jsonapi/tests/src/Functional/CommentTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/CommentTest.php
@@ -145,7 +145,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/comment/comment/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
$author = User::load($this->entity->getOwnerId());
return [
@@ -240,7 +240,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
return [
'data' => [
'type' => 'comment--comment',
@@ -415,7 +415,7 @@ protected static function entityAccess(EntityInterface $entity, $operation, Acco
/**
* {@inheritdoc}
*/
- protected static function getIncludePermissions() {
+ protected static function getIncludePermissions(): array {
return [
'type' => ['administer comment types'],
'uid' => ['access user profiles'],
diff --git a/core/modules/jsonapi/tests/src/Functional/CommentTypeTest.php b/core/modules/jsonapi/tests/src/Functional/CommentTypeTest.php
index caf2a7417575..24e42d3e666b 100644
--- a/core/modules/jsonapi/tests/src/Functional/CommentTypeTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/CommentTypeTest.php
@@ -69,7 +69,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/comment_type/comment_type/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -105,7 +105,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/ConfigTestTest.php b/core/modules/jsonapi/tests/src/Functional/ConfigTestTest.php
index 4e57cadc587b..bd24386fc495 100644
--- a/core/modules/jsonapi/tests/src/Functional/ConfigTestTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/ConfigTestTest.php
@@ -78,7 +78,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/config_test/config_test/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -117,7 +117,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/ConfigurableLanguageTest.php b/core/modules/jsonapi/tests/src/Functional/ConfigurableLanguageTest.php
index 9e170ba2c5be..3a9052790537 100644
--- a/core/modules/jsonapi/tests/src/Functional/ConfigurableLanguageTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/ConfigurableLanguageTest.php
@@ -68,7 +68,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/configurable_language/configurable_language/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -105,7 +105,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/ContactFormTest.php b/core/modules/jsonapi/tests/src/Functional/ContactFormTest.php
index 3ea342b1e412..f805124440f2 100644
--- a/core/modules/jsonapi/tests/src/Functional/ContactFormTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/ContactFormTest.php
@@ -71,7 +71,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/contact_form/contact_form/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -113,7 +113,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/ContentLanguageSettingsTest.php b/core/modules/jsonapi/tests/src/Functional/ContentLanguageSettingsTest.php
index b19337290a92..4d25f03fa86b 100644
--- a/core/modules/jsonapi/tests/src/Functional/ContentLanguageSettingsTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/ContentLanguageSettingsTest.php
@@ -76,7 +76,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/language_content_settings/language_content_settings/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -117,7 +117,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/DateFormatTest.php b/core/modules/jsonapi/tests/src/Functional/DateFormatTest.php
index fd8f297ff597..74962427124f 100644
--- a/core/modules/jsonapi/tests/src/Functional/DateFormatTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/DateFormatTest.php
@@ -73,7 +73,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/date_format/date_format/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -109,7 +109,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/EditorTest.php b/core/modules/jsonapi/tests/src/Functional/EditorTest.php
index 8cd036b12ca9..4a0e1a1cf082 100644
--- a/core/modules/jsonapi/tests/src/Functional/EditorTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/EditorTest.php
@@ -101,7 +101,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/editor/editor/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -160,7 +160,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/EntityFormDisplayTest.php b/core/modules/jsonapi/tests/src/Functional/EntityFormDisplayTest.php
index 863b9599b99c..f0fd9421fa56 100644
--- a/core/modules/jsonapi/tests/src/Functional/EntityFormDisplayTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/EntityFormDisplayTest.php
@@ -75,7 +75,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/entity_form_display/entity_form_display/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -174,7 +174,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/EntityFormModeTest.php b/core/modules/jsonapi/tests/src/Functional/EntityFormModeTest.php
index 4f9633bc2cde..b48a9386029c 100644
--- a/core/modules/jsonapi/tests/src/Functional/EntityFormModeTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/EntityFormModeTest.php
@@ -68,7 +68,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/entity_form_mode/entity_form_mode/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -109,7 +109,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/EntityTestComputedFieldTest.php b/core/modules/jsonapi/tests/src/Functional/EntityTestComputedFieldTest.php
index 23e6de945168..90c2b98e80aa 100644
--- a/core/modules/jsonapi/tests/src/Functional/EntityTestComputedFieldTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/EntityTestComputedFieldTest.php
@@ -89,7 +89,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/entity_test_computed_field/entity_test_computed_field/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
$author = User::load(0);
return [
@@ -147,7 +147,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
return [
'data' => [
'type' => 'entity_test_computed_field--entity_test_computed_field',
@@ -161,7 +161,7 @@ protected function getPostDocument() {
/**
* {@inheritdoc}
*/
- protected function getSparseFieldSets() {
+ protected function getSparseFieldSets(): array {
// EntityTest's owner field name is `user_id`, not `uid`, which breaks
// nested sparse fieldset tests.
return array_diff_key(parent::getSparseFieldSets(), array_flip([
diff --git a/core/modules/jsonapi/tests/src/Functional/EntityTestMapFieldTest.php b/core/modules/jsonapi/tests/src/Functional/EntityTestMapFieldTest.php
index 2a19ee33aed5..92f938389867 100644
--- a/core/modules/jsonapi/tests/src/Functional/EntityTestMapFieldTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/EntityTestMapFieldTest.php
@@ -90,7 +90,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/entity_test_map_field/entity_test_map_field/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
$author = User::load(0);
return [
@@ -140,7 +140,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
return [
'data' => [
'type' => 'entity_test_map_field--entity_test_map_field',
@@ -162,7 +162,7 @@ protected function getExpectedUnauthorizedAccessMessage($method) {
/**
* {@inheritdoc}
*/
- protected function getSparseFieldSets() {
+ protected function getSparseFieldSets(): array {
// EntityTestMapField's owner field name is `user_id`, not `uid`, which
// breaks nested sparse fieldset tests.
return array_diff_key(parent::getSparseFieldSets(), array_flip([
diff --git a/core/modules/jsonapi/tests/src/Functional/EntityTestTest.php b/core/modules/jsonapi/tests/src/Functional/EntityTestTest.php
index b8073afc16a4..1b32552c1bac 100644
--- a/core/modules/jsonapi/tests/src/Functional/EntityTestTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/EntityTestTest.php
@@ -101,7 +101,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/entity_test/entity_test/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
$author = User::load(0);
return [
@@ -152,7 +152,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
return [
'data' => [
'type' => 'entity_test--entity_test',
@@ -182,7 +182,7 @@ protected function getExpectedUnauthorizedAccessMessage($method) {
/**
* {@inheritdoc}
*/
- protected function getSparseFieldSets() {
+ protected function getSparseFieldSets(): array {
// EntityTest's owner field name is `user_id`, not `uid`, which breaks
// nested sparse fieldset tests.
return array_diff_key(parent::getSparseFieldSets(), array_flip([
diff --git a/core/modules/jsonapi/tests/src/Functional/EntityViewDisplayTest.php b/core/modules/jsonapi/tests/src/Functional/EntityViewDisplayTest.php
index 6504f72d1d2f..53ad8f4aa148 100644
--- a/core/modules/jsonapi/tests/src/Functional/EntityViewDisplayTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/EntityViewDisplayTest.php
@@ -75,7 +75,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/entity_view_display/entity_view_display/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -127,7 +127,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/EntityViewModeTest.php b/core/modules/jsonapi/tests/src/Functional/EntityViewModeTest.php
index 4f0ff14c1418..06ee4b0ca828 100644
--- a/core/modules/jsonapi/tests/src/Functional/EntityViewModeTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/EntityViewModeTest.php
@@ -68,7 +68,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/entity_view_mode/entity_view_mode/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -109,7 +109,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/FieldConfigTest.php b/core/modules/jsonapi/tests/src/Functional/FieldConfigTest.php
index 85f7e3063ef6..32d5aa626cf1 100644
--- a/core/modules/jsonapi/tests/src/Functional/FieldConfigTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/FieldConfigTest.php
@@ -82,7 +82,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/field_config/field_config/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -134,7 +134,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/FieldStorageConfigTest.php b/core/modules/jsonapi/tests/src/Functional/FieldStorageConfigTest.php
index aab7213e45cb..329ffdd5efbd 100644
--- a/core/modules/jsonapi/tests/src/Functional/FieldStorageConfigTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/FieldStorageConfigTest.php
@@ -65,7 +65,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/field_storage_config/field_storage_config/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -113,7 +113,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/FileTest.php b/core/modules/jsonapi/tests/src/Functional/FileTest.php
index 899bcbdc78fe..de66fde26819 100644
--- a/core/modules/jsonapi/tests/src/Functional/FileTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/FileTest.php
@@ -133,7 +133,7 @@ protected function createAnotherEntity($key) {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/file/file/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -189,7 +189,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
return [
'data' => [
'type' => 'file--file',
diff --git a/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php b/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php
index 36f972ebc120..b40e2b2b9c9d 100644
--- a/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php
@@ -339,7 +339,7 @@ public function testPostFileUploadAndUseInSingleRequest(): void {
* @see ::testPostFileUpload()
* @see \Drupal\Tests\jsonapi\Functional\EntityTestTest::getPostDocument()
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
return [
'data' => [
'type' => 'entity_test--entity_test',
@@ -751,7 +751,7 @@ protected function getExpectedUnauthorizedAccessMessage($method) {
* @return array
* A JSON:API response document.
*/
- protected function getExpectedDocument($fid = 1, $expected_filename = 'example.txt', $expected_as_filename = FALSE, $expected_status = FALSE) {
+ protected function getExpectedDocument($fid = 1, $expected_filename = 'example.txt', $expected_as_filename = FALSE, $expected_status = FALSE): array {
$author = User::load($this->account->id());
$file = File::load($fid);
$this->assertInstanceOf(File::class, $file);
diff --git a/core/modules/jsonapi/tests/src/Functional/FilterFormatTest.php b/core/modules/jsonapi/tests/src/Functional/FilterFormatTest.php
index 6e99f69a874a..315dd5ee0a2e 100644
--- a/core/modules/jsonapi/tests/src/Functional/FilterFormatTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/FilterFormatTest.php
@@ -73,7 +73,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/filter_format/filter_format/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -121,7 +121,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/ImageStyleTest.php b/core/modules/jsonapi/tests/src/Functional/ImageStyleTest.php
index 49e74c0ed640..e62f8b93780e 100644
--- a/core/modules/jsonapi/tests/src/Functional/ImageStyleTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/ImageStyleTest.php
@@ -85,7 +85,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/image_style/image_style/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -131,7 +131,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/MediaTest.php b/core/modules/jsonapi/tests/src/Functional/MediaTest.php
index e733e773bc4e..ba2758167099 100644
--- a/core/modules/jsonapi/tests/src/Functional/MediaTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/MediaTest.php
@@ -153,7 +153,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$file = File::load(1);
$thumbnail = File::load(3);
$author = User::load($this->entity->getOwnerId());
@@ -294,7 +294,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
$file = File::load(2);
return [
'data' => [
@@ -344,7 +344,7 @@ protected function getExpectedUnauthorizedAccessMessage($method) {
/**
* {@inheritdoc}
*/
- protected function getEditorialPermissions() {
+ protected function getEditorialPermissions(): array {
return array_merge(parent::getEditorialPermissions(), ['view any unpublished content']);
}
diff --git a/core/modules/jsonapi/tests/src/Functional/MediaTypeTest.php b/core/modules/jsonapi/tests/src/Functional/MediaTypeTest.php
index 8f8e65ea9143..fa1fed7f2f35 100644
--- a/core/modules/jsonapi/tests/src/Functional/MediaTypeTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/MediaTypeTest.php
@@ -69,7 +69,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/media_type/media_type/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -111,7 +111,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/MenuLinkContentTest.php b/core/modules/jsonapi/tests/src/Functional/MenuLinkContentTest.php
index 93b3d8306800..23c83be15002 100644
--- a/core/modules/jsonapi/tests/src/Functional/MenuLinkContentTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/MenuLinkContentTest.php
@@ -87,7 +87,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$base_url = Url::fromUri('base:/jsonapi/menu_link_content/menu_link_content/' . $this->entity->uuid())->setAbsolute();
$self_url = clone $base_url;
$version_identifier = 'id:' . $this->entity->getRevisionId();
@@ -157,7 +157,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
return [
'data' => [
'type' => 'menu_link_content--menu_link_content',
diff --git a/core/modules/jsonapi/tests/src/Functional/MenuTest.php b/core/modules/jsonapi/tests/src/Functional/MenuTest.php
index 334549cb45f1..53134cc1e5a0 100644
--- a/core/modules/jsonapi/tests/src/Functional/MenuTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/MenuTest.php
@@ -71,7 +71,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/menu/menu/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -107,7 +107,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/MessageTest.php b/core/modules/jsonapi/tests/src/Functional/MessageTest.php
index ed23715b0735..bf6d140abd67 100644
--- a/core/modules/jsonapi/tests/src/Functional/MessageTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/MessageTest.php
@@ -96,7 +96,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
return [
'data' => [
'type' => 'contact_message--camelids',
diff --git a/core/modules/jsonapi/tests/src/Functional/NodeTest.php b/core/modules/jsonapi/tests/src/Functional/NodeTest.php
index fa1d5828cddc..a154b62aeb7c 100644
--- a/core/modules/jsonapi/tests/src/Functional/NodeTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/NodeTest.php
@@ -143,7 +143,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$author = User::load($this->entity->getOwnerId());
$base_url = Url::fromUri('base:/jsonapi/node/camelids/' . $this->entity->uuid())->setAbsolute();
$self_url = clone $base_url;
@@ -248,7 +248,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
return [
'data' => [
'type' => 'node--camelids',
@@ -417,7 +417,7 @@ protected function assertNormalizedFieldsAreCached(array $field_names): void {
/**
* {@inheritdoc}
*/
- protected static function getIncludePermissions() {
+ protected static function getIncludePermissions(): array {
return [
'uid.node_type' => ['administer users'],
'uid.roles' => ['administer permissions'],
diff --git a/core/modules/jsonapi/tests/src/Functional/NodeTypeTest.php b/core/modules/jsonapi/tests/src/Functional/NodeTypeTest.php
index 858ed98d65f9..d4ee2d3d423e 100644
--- a/core/modules/jsonapi/tests/src/Functional/NodeTypeTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/NodeTypeTest.php
@@ -68,7 +68,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/node_type/node_type/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -107,7 +107,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/PathAliasTest.php b/core/modules/jsonapi/tests/src/Functional/PathAliasTest.php
index a2f8cad98569..454fe66f91a1 100644
--- a/core/modules/jsonapi/tests/src/Functional/PathAliasTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/PathAliasTest.php
@@ -76,7 +76,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$base_url = Url::fromUri('base:/jsonapi/path_alias/path_alias/' . $this->entity->uuid())->setAbsolute();
$self_url = clone $base_url;
$version_identifier = 'id:' . $this->entity->getRevisionId();
@@ -114,7 +114,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
return [
'data' => [
'type' => static::$resourceTypeName,
diff --git a/core/modules/jsonapi/tests/src/Functional/ResourceResponseTestTrait.php b/core/modules/jsonapi/tests/src/Functional/ResourceResponseTestTrait.php
index 2f73786a5e7b..cff7df2cbd83 100644
--- a/core/modules/jsonapi/tests/src/Functional/ResourceResponseTestTrait.php
+++ b/core/modules/jsonapi/tests/src/Functional/ResourceResponseTestTrait.php
@@ -218,7 +218,7 @@ protected function getExpectedIncludedResourceResponse(array $include_paths, arr
* @return \Drupal\jsonapi\ResourceResponse[]
* The ResourceResponses.
*/
- protected static function toResourceResponses(array $responses) {
+ protected static function toResourceResponses(array $responses): array {
return array_map([self::class, 'toResourceResponse'], $responses);
}
@@ -260,7 +260,7 @@ protected static function toResourceResponse(ResponseInterface $response) {
* @return array
* A resource identifier for the given entity.
*/
- protected static function toResourceIdentifier(EntityInterface $entity) {
+ protected static function toResourceIdentifier(EntityInterface $entity): array {
return [
'type' => $entity->getEntityTypeId() . '--' . $entity->bundle(),
'id' => $entity->uuid(),
@@ -346,7 +346,7 @@ protected static function getLinkPaths(array $relationship_field_names, $type) {
* @return array
* The extracted links, keyed by the original associated key name.
*/
- protected static function extractLinks(array $link_paths, array $document) {
+ protected static function extractLinks(array $link_paths, array $document): array {
return array_map(function ($link_path) use ($document) {
$link = array_reduce(
explode('.', $link_path),
@@ -366,7 +366,7 @@ protected static function extractLinks(array $link_paths, array $document) {
* @return string[]
* The resource links.
*/
- protected static function getResourceLinks(array $resource_identifiers) {
+ protected static function getResourceLinks(array $resource_identifiers): array {
return array_map([static::class, 'getResourceLink'], $resource_identifiers);
}
@@ -585,7 +585,7 @@ protected static function addOmittedObject(array &$document, array $omitted) {
* @return array
* A new omitted object.
*/
- protected static function errorsToOmittedObject(array $errors) {
+ protected static function errorsToOmittedObject(array $errors): array {
$omitted = [
'detail' => 'Some resources have been omitted because of insufficient authorization.',
'links' => [
diff --git a/core/modules/jsonapi/tests/src/Functional/ResponsiveImageStyleTest.php b/core/modules/jsonapi/tests/src/Functional/ResponsiveImageStyleTest.php
index 67a29cd3dcfe..e9df2f0ebf3c 100644
--- a/core/modules/jsonapi/tests/src/Functional/ResponsiveImageStyleTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/ResponsiveImageStyleTest.php
@@ -82,7 +82,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/responsive_image_style/responsive_image_style/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -143,7 +143,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/RestResourceConfigTest.php b/core/modules/jsonapi/tests/src/Functional/RestResourceConfigTest.php
index 8d314e0aaed8..c759f9c8d095 100644
--- a/core/modules/jsonapi/tests/src/Functional/RestResourceConfigTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/RestResourceConfigTest.php
@@ -76,7 +76,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/rest_resource_config/rest_resource_config/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -127,7 +127,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/RoleTest.php b/core/modules/jsonapi/tests/src/Functional/RoleTest.php
index 6f404f417d9b..7ec3de9ada11 100644
--- a/core/modules/jsonapi/tests/src/Functional/RoleTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/RoleTest.php
@@ -65,7 +65,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/user_role/user_role/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -102,7 +102,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/SearchPageTest.php b/core/modules/jsonapi/tests/src/Functional/SearchPageTest.php
index cf2ad730e42a..b20bd988a9c0 100644
--- a/core/modules/jsonapi/tests/src/Functional/SearchPageTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/SearchPageTest.php
@@ -78,7 +78,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/search_page/search_page/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -122,7 +122,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/ShortcutSetTest.php b/core/modules/jsonapi/tests/src/Functional/ShortcutSetTest.php
index b9a07aa5ad3e..b3b6d9e88a27 100644
--- a/core/modules/jsonapi/tests/src/Functional/ShortcutSetTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/ShortcutSetTest.php
@@ -90,7 +90,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/shortcut_set/shortcut_set/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -124,7 +124,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/ShortcutTest.php b/core/modules/jsonapi/tests/src/Functional/ShortcutTest.php
index adaff9b9eba7..e5e9aed44366 100644
--- a/core/modules/jsonapi/tests/src/Functional/ShortcutTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/ShortcutTest.php
@@ -81,7 +81,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/shortcut/default/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -135,7 +135,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
return [
'data' => [
'type' => 'shortcut--default',
diff --git a/core/modules/jsonapi/tests/src/Functional/TermTest.php b/core/modules/jsonapi/tests/src/Functional/TermTest.php
index 2e8348f21567..c8db2faf4190 100644
--- a/core/modules/jsonapi/tests/src/Functional/TermTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/TermTest.php
@@ -126,7 +126,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$base_url = Url::fromUri('base:/jsonapi/taxonomy_term/camelids/' . $this->entity->uuid())->setAbsolute();
$self_url = clone $base_url;
$version_identifier = 'id:' . $this->entity->getRevisionId();
@@ -347,7 +347,7 @@ protected function getExpectedGetRelationshipDocumentData($relationship_field_na
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
return [
'data' => [
'type' => 'taxonomy_term--camelids',
diff --git a/core/modules/jsonapi/tests/src/Functional/UserTest.php b/core/modules/jsonapi/tests/src/Functional/UserTest.php
index 7231798f6f98..18f527d2c95f 100644
--- a/core/modules/jsonapi/tests/src/Functional/UserTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/UserTest.php
@@ -137,7 +137,7 @@ public function testDeleteIndividual(): void {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/user/user/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -184,7 +184,7 @@ protected function getExpectedCacheContexts(?array $sparse_fieldset = NULL) {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
return [
'data' => [
'type' => 'user--user',
diff --git a/core/modules/jsonapi/tests/src/Functional/ViewTest.php b/core/modules/jsonapi/tests/src/Functional/ViewTest.php
index f1754d6201ac..27c8e5f89a6c 100644
--- a/core/modules/jsonapi/tests/src/Functional/ViewTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/ViewTest.php
@@ -64,7 +64,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/view/view/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -122,7 +122,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/VocabularyTest.php b/core/modules/jsonapi/tests/src/Functional/VocabularyTest.php
index 538905b6e69b..e8aeaabd46b8 100644
--- a/core/modules/jsonapi/tests/src/Functional/VocabularyTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/VocabularyTest.php
@@ -65,7 +65,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/taxonomy_vocabulary/taxonomy_vocabulary/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -102,7 +102,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Functional/WorkflowTest.php b/core/modules/jsonapi/tests/src/Functional/WorkflowTest.php
index 1fdedc9bb33b..215e56e0f7ea 100644
--- a/core/modules/jsonapi/tests/src/Functional/WorkflowTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/WorkflowTest.php
@@ -73,7 +73,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$self_url = Url::fromUri('base:/jsonapi/workflow/workflow/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
return [
'jsonapi' => [
@@ -127,7 +127,7 @@ protected function getExpectedDocument() {
/**
* {@inheritdoc}
*/
- protected function getPostDocument() {
+ protected function getPostDocument(): array {
// @todo Update in https://www.drupal.org/node/2300677.
return [];
}
diff --git a/core/modules/jsonapi/tests/src/Kernel/Query/FilterTest.php b/core/modules/jsonapi/tests/src/Kernel/Query/FilterTest.php
index 099b30ccc03c..19ce97ffeb5f 100644
--- a/core/modules/jsonapi/tests/src/Kernel/Query/FilterTest.php
+++ b/core/modules/jsonapi/tests/src/Kernel/Query/FilterTest.php
@@ -195,7 +195,7 @@ public function testQueryCondition(): void {
/**
* Simply provides test data to keep the actual test method tidy.
*/
- protected function queryConditionData() {
+ protected function queryConditionData(): array {
// ((RED or CIRCLE) or (YELLOW and SQUARE))
$query = $this->nodeStorage->getQuery()->accessCheck(FALSE);
diff --git a/core/modules/layout_builder/tests/src/Functional/Jsonapi/LayoutBuilderEntityViewDisplayTest.php b/core/modules/layout_builder/tests/src/Functional/Jsonapi/LayoutBuilderEntityViewDisplayTest.php
index f4d013797ba4..254f4e3c9cf8 100644
--- a/core/modules/layout_builder/tests/src/Functional/Jsonapi/LayoutBuilderEntityViewDisplayTest.php
+++ b/core/modules/layout_builder/tests/src/Functional/Jsonapi/LayoutBuilderEntityViewDisplayTest.php
@@ -42,7 +42,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getExpectedDocument() {
+ protected function getExpectedDocument(): array {
$document = parent::getExpectedDocument();
array_unshift($document['data']['attributes']['dependencies']['module'], 'layout_builder');
$document['data']['attributes']['hidden'][OverridesSectionStorage::FIELD_NAME] = TRUE;
diff --git a/core/modules/layout_builder/tests/src/FunctionalJavascript/BlockFilterTest.php b/core/modules/layout_builder/tests/src/FunctionalJavascript/BlockFilterTest.php
index c80d34226107..92d95a84908e 100644
--- a/core/modules/layout_builder/tests/src/FunctionalJavascript/BlockFilterTest.php
+++ b/core/modules/layout_builder/tests/src/FunctionalJavascript/BlockFilterTest.php
@@ -155,7 +155,7 @@ public function testBlockFilter(): void {
* @return \Behat\Mink\Element\NodeElement[]
* An array of visible node elements.
*/
- protected function filterVisibleElements(array $elements) {
+ protected function filterVisibleElements(array $elements): array {
return array_filter($elements, function (NodeElement $element) {
return $element->isVisible();
});
diff --git a/core/modules/layout_builder/tests/src/Kernel/SectionListTraitTest.php b/core/modules/layout_builder/tests/src/Kernel/SectionListTraitTest.php
index fcaa4c688707..d2cc87f8ffe4 100644
--- a/core/modules/layout_builder/tests/src/Kernel/SectionListTraitTest.php
+++ b/core/modules/layout_builder/tests/src/Kernel/SectionListTraitTest.php
@@ -61,7 +61,7 @@ public function __construct(array $sections) {
/**
* {@inheritdoc}
*/
- protected function setSections(array $sections) {
+ protected function setSections(array $sections): array {
$this->sections = array_values($sections);
return $sections;
}
diff --git a/core/modules/link/tests/src/Kernel/LinkItemUrlValidationTest.php b/core/modules/link/tests/src/Kernel/LinkItemUrlValidationTest.php
index 2b7f0da2b22b..939b143c633e 100644
--- a/core/modules/link/tests/src/Kernel/LinkItemUrlValidationTest.php
+++ b/core/modules/link/tests/src/Kernel/LinkItemUrlValidationTest.php
@@ -53,7 +53,7 @@ public function testExternalLinkValidation(): void {
* The first element of the array is the link value to test. The second
* value is an array of expected violation messages.
*/
- protected function getTestLinks() {
+ protected function getTestLinks(): array {
$violation_0 = "The path '%s' is invalid.";
$violation_1 = 'This value should be of the correct primitive type.';
return [
diff --git a/core/modules/locale/tests/src/Kernel/LocaleStringTest.php b/core/modules/locale/tests/src/Kernel/LocaleStringTest.php
index 0c26efa016ef..01a5b66f5283 100644
--- a/core/modules/locale/tests/src/Kernel/LocaleStringTest.php
+++ b/core/modules/locale/tests/src/Kernel/LocaleStringTest.php
@@ -211,7 +211,7 @@ protected function buildSourceString(array $values = []) {
* @return array
* Translation list.
*/
- protected function createAllTranslations(StringInterface $source, array $values = []) {
+ protected function createAllTranslations(StringInterface $source, array $values = []): array {
$list = [];
/** @var \Drupal\Core\Language\LanguageManagerInterface $language_manager */
$language_manager = $this->container->get('language_manager');
diff --git a/core/modules/media/tests/src/Functional/MediaCacheTagsTest.php b/core/modules/media/tests/src/Functional/MediaCacheTagsTest.php
index a771a9096837..5fdbf7651bec 100644
--- a/core/modules/media/tests/src/Functional/MediaCacheTagsTest.php
+++ b/core/modules/media/tests/src/Functional/MediaCacheTagsTest.php
@@ -63,14 +63,14 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getAdditionalCacheContextsForEntity(EntityInterface $media) {
+ protected function getAdditionalCacheContextsForEntity(EntityInterface $media): array {
return ['timezone'];
}
/**
* {@inheritdoc}
*/
- protected function getAdditionalCacheTagsForEntity(EntityInterface $media) {
+ protected function getAdditionalCacheTagsForEntity(EntityInterface $media): array {
// Each media item must have an author and a thumbnail.
return [
'user:' . $media->getOwnerId(),
diff --git a/core/modules/media/tests/src/Functional/MediaTranslationUITest.php b/core/modules/media/tests/src/Functional/MediaTranslationUITest.php
index 84be60ba6273..6606db11737e 100644
--- a/core/modules/media/tests/src/Functional/MediaTranslationUITest.php
+++ b/core/modules/media/tests/src/Functional/MediaTranslationUITest.php
@@ -67,7 +67,7 @@ public function setupBundle() {
/**
* {@inheritdoc}
*/
- protected function getTranslatorPermissions() {
+ protected function getTranslatorPermissions(): array {
return array_merge(parent::getTranslatorPermissions(), [
'administer media',
'edit any test media',
@@ -77,14 +77,14 @@ protected function getTranslatorPermissions() {
/**
* {@inheritdoc}
*/
- protected function getEditorPermissions() {
+ protected function getEditorPermissions(): array {
return ['administer media', 'create test media'];
}
/**
* {@inheritdoc}
*/
- protected function getAdministratorPermissions() {
+ protected function getAdministratorPermissions(): array {
return array_merge(parent::getAdministratorPermissions(), [
'access administration pages',
'administer media types',
diff --git a/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php b/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
index fd2f3ff9429f..e8f5c1c66618 100644
--- a/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
+++ b/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
@@ -49,14 +49,14 @@ protected function setUp(): void {
/**
* {@inheritdoc}
*/
- protected function getTranslatorPermissions() {
+ protected function getTranslatorPermissions(): array {
return array_merge(parent::getTranslatorPermissions(), ['administer menu']);
}
/**
* {@inheritdoc}
*/
- protected function getAdministratorPermissions() {
+ protected function getAdministratorPermissions(): array {
return array_merge(parent::getAdministratorPermissions(), ['administer themes', 'view the administration theme']);
}
diff --git a/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
index 555db5589233..7b326fe9125d 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
@@ -134,7 +134,7 @@ protected function getIdMap() {
* - rollback_action
* - hash
*/
- protected function idMapDefaults() {
+ protected function idMapDefaults(): array {
$defaults = [
'source_row_status' => MigrateIdMapInterface::STATUS_IMPORTED,
'rollback_action' => MigrateIdMapInterface::ROLLBACK_DELETE,
@@ -1045,7 +1045,7 @@ public function testIterators(): void {
* @return array
* The contents of an ID map.
*/
- private function getIdMapContents() {
+ private function getIdMapContents(): array {
$result = $this->database
->select('migrate_map_sql_idmap_test', 't')
->fields('t')
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/DestinationCategoryTest.php b/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/DestinationCategoryTest.php
index b1f6d9e8af99..82d7fe8da270 100644
--- a/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/DestinationCategoryTest.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/DestinationCategoryTest.php
@@ -98,7 +98,7 @@ protected function assertCategories(array $migrations): void {
* @return array
* The configuration class names.
*/
- protected function getConfigurationClasses() {
+ protected function getConfigurationClasses(): array {
return [
Config::class,
EntityConfigBase::class,
@@ -117,7 +117,7 @@ protected function getConfigurationClasses() {
* @return array
* The content class names.
*/
- protected function getContentClasses() {
+ protected function getContentClasses(): array {
return [
EntityContentBase::class,
BlockedIp::class,
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/ContentEntityTest.php b/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/ContentEntityTest.php
index c4cdaa3596b6..7bbcf590ae2c 100644
--- a/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/ContentEntityTest.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/ContentEntityTest.php
@@ -459,7 +459,7 @@ public static function migrationConfigurationProvider() {
* @return array
* The definition.
*/
- protected function migrationDefinition($plugin_id, array $configuration = []) {
+ protected function migrationDefinition($plugin_id, array $configuration = []): array {
return [
'source' => [
'plugin' => $plugin_id,
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/d7/FollowUpMigrationsTest.php b/core/modules/migrate_drupal/tests/src/Kernel/d7/FollowUpMigrationsTest.php
index 9494cb640235..151b7fae2477 100644
--- a/core/modules/migrate_drupal/tests/src/Kernel/d7/FollowUpMigrationsTest.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/d7/FollowUpMigrationsTest.php
@@ -58,7 +58,7 @@ protected function setUp(): void {
/**
* {@inheritdoc}
*/
- protected function getFileMigrationInfo() {
+ protected function getFileMigrationInfo(): array {
return [
'path' => 'public://sites/default/files/cube.jpeg',
'size' => 3620,
diff --git a/core/modules/migrate_drupal/tests/src/Traits/CreateTestContentEntitiesTrait.php b/core/modules/migrate_drupal/tests/src/Traits/CreateTestContentEntitiesTrait.php
index 1f792f450e7f..05485fcfe643 100644
--- a/core/modules/migrate_drupal/tests/src/Traits/CreateTestContentEntitiesTrait.php
+++ b/core/modules/migrate_drupal/tests/src/Traits/CreateTestContentEntitiesTrait.php
@@ -14,7 +14,7 @@ trait CreateTestContentEntitiesTrait {
*
* @return array
*/
- protected function getRequiredModules() {
+ protected function getRequiredModules(): array {
return [
'block_content',
'comment',
diff --git a/core/modules/migrate_drupal/tests/src/Traits/NodeMigrateTypeTestTrait.php b/core/modules/migrate_drupal/tests/src/Traits/NodeMigrateTypeTestTrait.php
index dbe1d8bbc481..f4974190f5fe 100644
--- a/core/modules/migrate_drupal/tests/src/Traits/NodeMigrateTypeTestTrait.php
+++ b/core/modules/migrate_drupal/tests/src/Traits/NodeMigrateTypeTestTrait.php
@@ -30,7 +30,7 @@ trait NodeMigrateTypeTestTrait {
* An associative array with the total number of complete and classic
* node migrate_map tables.
*/
- protected function nodeMigrateMapTableCount($version) {
+ protected function nodeMigrateMapTableCount($version): array {
$results = [];
$bases = ['node', 'node_complete'];
$tables = \Drupal::database()->schema()
diff --git a/core/modules/migrate_drupal/tests/src/Unit/FieldDiscoveryTest.php b/core/modules/migrate_drupal/tests/src/Unit/FieldDiscoveryTest.php
index a51b8a03cbf3..25dd5ff4b5b2 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/FieldDiscoveryTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/FieldDiscoveryTest.php
@@ -270,7 +270,7 @@ public static function getCoreVersionData() {
/**
* Returns dummy data to test the field getters.
*/
- protected function getAllFieldData() {
+ protected function getAllFieldData(): array {
return [
'node' => [
'content_type_1' => [
diff --git a/core/modules/migrate_drupal/tests/src/Unit/MigrateFieldPluginManagerTest.php b/core/modules/migrate_drupal/tests/src/Unit/MigrateFieldPluginManagerTest.php
index 30cdf4134f5e..daecf9d78a0d 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/MigrateFieldPluginManagerTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/MigrateFieldPluginManagerTest.php
@@ -112,7 +112,7 @@ public static function weightsData() {
* @return array
* The test plugin data.
*/
- protected function pluginFixtureData() {
+ protected function pluginFixtureData(): array {
return [
// Represents a deprecated core field plugin that applied to field_1
// and field_2 for Drupal 6.
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/CredentialFormTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/CredentialFormTest.php
index 7d7950911b90..b9fa3c71c9da 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/CredentialFormTest.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/CredentialFormTest.php
@@ -110,28 +110,28 @@ protected function getSourceBasePath() {
/**
* {@inheritdoc}
*/
- protected function getAvailablePaths() {
+ protected function getAvailablePaths(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getEntityCounts() {
+ protected function getEntityCounts(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getEntityCountsIncremental() {
+ protected function getEntityCountsIncremental(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getMissingPaths() {
+ protected function getMissingPaths(): array {
return [];
}
@@ -146,7 +146,7 @@ protected function getMissingPaths() {
*
* @see \Drupal\migrate_drupal_ui\Form\CredentialForm
*/
- protected function getDestinationSiteCredentials() {
+ protected function getDestinationSiteCredentials(): array {
$connection_options = \Drupal::database()->getConnectionOptions();
$version = $this->getLegacyDrupalVersion($this->sourceDatabase);
$driver = $connection_options['driver'];
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/SourceProviderTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/SourceProviderTest.php
index b82af20b89fd..ec2bc9ec8c86 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/SourceProviderTest.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/SourceProviderTest.php
@@ -78,28 +78,28 @@ protected function getSourceBasePath() {
/**
* {@inheritdoc}
*/
- protected function getAvailablePaths() {
+ protected function getAvailablePaths(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getEntityCounts() {
+ protected function getEntityCounts(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getEntityCountsIncremental() {
+ protected function getEntityCountsIncremental(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getMissingPaths() {
+ protected function getMissingPaths(): array {
return [];
}
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php
index 8904bc3e1d05..22555cfa42be 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php
@@ -42,28 +42,28 @@ protected function getSourceBasePath() {
/**
* {@inheritdoc}
*/
- protected function getEntityCounts() {
+ protected function getEntityCounts(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getEntityCountsIncremental() {
+ protected function getEntityCountsIncremental(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getAvailablePaths() {
+ protected function getAvailablePaths(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getMissingPaths() {
+ protected function getMissingPaths(): array {
return [];
}
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php
index 6ebd7622b7f8..2042762b1e04 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php
@@ -54,7 +54,7 @@ protected function getSourceBasePath() {
/**
* {@inheritdoc}
*/
- protected function getAvailablePaths() {
+ protected function getAvailablePaths(): array {
return [
'Block translation',
'Blog',
@@ -137,7 +137,7 @@ protected function getAvailablePaths() {
/**
* {@inheritdoc}
*/
- protected function getMissingPaths() {
+ protected function getMissingPaths(): array {
return [
'Aggregator',
'Book',
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualReviewPageTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualReviewPageTest.php
index d89c94c28eeb..f06a359977e9 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualReviewPageTest.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualReviewPageTest.php
@@ -50,7 +50,7 @@ protected function getSourceBasePath() {
/**
* {@inheritdoc}
*/
- protected function getAvailablePaths() {
+ protected function getAvailablePaths(): array {
return [
'Blog',
'Blog API',
@@ -123,14 +123,14 @@ protected function getAvailablePaths() {
/**
* {@inheritdoc}
*/
- protected function getIncompletePaths() {
+ protected function getIncompletePaths(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getMissingPaths() {
+ protected function getMissingPaths(): array {
return [
'Aggregator',
// Block is set not_finished in migrate_state_not_finished_test.
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NodeClassicTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NodeClassicTest.php
index 1e2284a242a6..d8a3c455abb4 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NodeClassicTest.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NodeClassicTest.php
@@ -49,28 +49,28 @@ protected function getSourceBasePath() {
/**
* {@inheritdoc}
*/
- protected function getEntityCounts() {
+ protected function getEntityCounts(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getEntityCountsIncremental() {
+ protected function getEntityCountsIncremental(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getAvailablePaths() {
+ protected function getAvailablePaths(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getMissingPaths() {
+ protected function getMissingPaths(): array {
return [];
}
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
index c2cabe175d0f..9cd0cab57fc8 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
@@ -71,7 +71,7 @@ protected function getSourceBasePath() {
/**
* {@inheritdoc}
*/
- protected function getEntityCounts() {
+ protected function getEntityCounts(): array {
return [
'block' => 37,
'block_content' => 2,
@@ -133,7 +133,7 @@ protected function getEntityCountsIncremental() {
/**
* {@inheritdoc}
*/
- protected function getAvailablePaths() {
+ protected function getAvailablePaths(): array {
return [
'Block',
'Block translation',
@@ -186,7 +186,7 @@ protected function getAvailablePaths() {
/**
* {@inheritdoc}
*/
- protected function getMissingPaths() {
+ protected function getMissingPaths(): array {
return [
'Aggregator',
'Book',
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6TestWithContentModeration.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6TestWithContentModeration.php
index 6e0d9018218c..0df1bcd19b4d 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6TestWithContentModeration.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6TestWithContentModeration.php
@@ -54,7 +54,7 @@ protected function setUp(): void {
/**
* {@inheritdoc}
*/
- protected function getEntityCounts() {
+ protected function getEntityCounts(): array {
$entity_counts = parent::getEntityCounts() + [
'content_moderation_state' => 17,
'workflow' => 1,
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/DoubleSlashTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/DoubleSlashTest.php
index 940869b3aecb..d59c1af7c7e7 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/DoubleSlashTest.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/DoubleSlashTest.php
@@ -89,28 +89,28 @@ protected function getSourceBasePath() {
/**
* {@inheritdoc}
*/
- protected function getEntityCounts() {
+ protected function getEntityCounts(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getEntityCountsIncremental() {
+ protected function getEntityCountsIncremental(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getAvailablePaths() {
+ protected function getAvailablePaths(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getMissingPaths() {
+ protected function getMissingPaths(): array {
return [];
}
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/FilePathTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/FilePathTest.php
index b00490702e14..e2d3128c5a35 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/FilePathTest.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/FilePathTest.php
@@ -289,28 +289,28 @@ public function getManagedFiles() {
/**
* {@inheritdoc}
*/
- protected function getEntityCounts() {
+ protected function getEntityCounts(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getEntityCountsIncremental() {
+ protected function getEntityCountsIncremental(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getAvailablePaths() {
+ protected function getAvailablePaths(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getMissingPaths() {
+ protected function getMissingPaths(): array {
return [];
}
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/IdConflictTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/IdConflictTest.php
index 38bd909f9928..cc3947c53100 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/IdConflictTest.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/IdConflictTest.php
@@ -42,28 +42,28 @@ protected function getSourceBasePath() {
/**
* {@inheritdoc}
*/
- protected function getEntityCounts() {
+ protected function getEntityCounts(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getEntityCountsIncremental() {
+ protected function getEntityCountsIncremental(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getAvailablePaths() {
+ protected function getAvailablePaths(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getMissingPaths() {
+ protected function getMissingPaths(): array {
return [];
}
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php
index 5d798f3d5580..8aeeba939c8f 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php
@@ -51,7 +51,7 @@ protected function getSourceBasePath() {
/**
* {@inheritdoc}
*/
- protected function getAvailablePaths() {
+ protected function getAvailablePaths(): array {
return [
'Block languages',
'Blog',
@@ -138,7 +138,7 @@ protected function getAvailablePaths() {
/**
* {@inheritdoc}
*/
- protected function getMissingPaths() {
+ protected function getMissingPaths(): array {
return [
// Action is set not_finished in migrate_state_not_finished_test.
'Aggregator',
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualReviewPageTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualReviewPageTest.php
index dd0ac5aa1e69..c90f8227eaa8 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualReviewPageTest.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualReviewPageTest.php
@@ -48,7 +48,7 @@ protected function getSourceBasePath() {
/**
* {@inheritdoc}
*/
- protected function getAvailablePaths() {
+ protected function getAvailablePaths(): array {
return [
'Block',
'Block languages',
@@ -139,14 +139,14 @@ protected function getAvailablePaths() {
/**
* {@inheritdoc}
*/
- protected function getIncompletePaths() {
+ protected function getIncompletePaths(): array {
return [];
}
/**
* {@inheritdoc}
*/
- protected function getMissingPaths() {
+ protected function getMissingPaths(): array {
return [
'Aggregator',
'Book',
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
index fb81cd8e3e29..275b342178f6 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
@@ -74,7 +74,7 @@ protected function getSourceBasePath() {
/**
* {@inheritdoc}
*/
- protected function getEntityCounts() {
+ protected function getEntityCounts(): array {
return [
'block' => 27,
'block_content' => 1,
@@ -136,7 +136,7 @@ protected function getEntityCountsIncremental() {
/**
* {@inheritdoc}
*/
- protected function getAvailablePaths() {
+ protected function getAvailablePaths(): array {
return [
'Block languages',
'Block',
@@ -200,7 +200,7 @@ protected function getAvailablePaths() {
/**
* {@inheritdoc}
*/
- protected function getMissingPaths() {
+ protected function getMissingPaths(): array {
return [
'Aggregator',
'Book',
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7TestWithContentModeration.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7TestWithContentModeration.php
index 4b626ac476a0..4607f88ca3a2 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7TestWithContentModeration.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7TestWithContentModeration.php
@@ -54,7 +54,7 @@ protected function setUp(): void {
/**
* {@inheritdoc}
*/
- protected function getEntityCounts() {
+ protected function getEntityCounts(): array {
$entity_counts = parent::getEntityCounts() + [
'content_moderation_state' => 5,
'workflow' => 1,
diff --git a/core/modules/mysql/tests/src/Kernel/mysql/DbDumpTest.php b/core/modules/mysql/tests/src/Kernel/mysql/DbDumpTest.php
index 5ce39f6aa635..73e200b8952d 100644
--- a/core/modules/mysql/tests/src/Kernel/mysql/DbDumpTest.php
+++ b/core/modules/mysql/tests/src/Kernel/mysql/DbDumpTest.php
@@ -223,7 +223,7 @@ public function testScriptLoad(): void {
* @return array
* Array keyed by field name, with the values being the field type.
*/
- protected function getTableSchema($table) {
+ protected function getTableSchema($table): array {
// Verify the field type on the data column in the cache table.
// @todo this is MySQL specific.
$query = Database::getConnection()->query("SHOW COLUMNS FROM {" . $table . "}");
@@ -244,7 +244,7 @@ protected function getTableSchema($table) {
* The 'primary key', 'unique keys', and 'indexes' portion of the Drupal
* table schema.
*/
- protected function getTableIndexes($table) {
+ protected function getTableIndexes($table): array {
$query = Database::getConnection()->query("SHOW INDEX FROM {" . $table . "}");
$definition = [];
while ($row = $query->fetchAssoc()) {
diff --git a/core/modules/navigation/tests/src/Kernel/SystemMenuNavigationBlockTest.php b/core/modules/navigation/tests/src/Kernel/SystemMenuNavigationBlockTest.php
index ff8ff5240047..74700eba60df 100644
--- a/core/modules/navigation/tests/src/Kernel/SystemMenuNavigationBlockTest.php
+++ b/core/modules/navigation/tests/src/Kernel/SystemMenuNavigationBlockTest.php
@@ -290,7 +290,7 @@ public function testConfigLevelDepth(): void {
* @return array
* The "menu link ID tree" representation of the given render array.
*/
- protected function convertBuiltMenuToIdTree(array $build) {
+ protected function convertBuiltMenuToIdTree(array $build): array {
$level = [];
foreach (Element::children($build) as $id) {
$level[$id] = [];
diff --git a/core/modules/node/tests/src/Functional/NodeCacheTagsTest.php b/core/modules/node/tests/src/Functional/NodeCacheTagsTest.php
index 3dc7dc12bb5f..64a21d136ecf 100644
--- a/core/modules/node/tests/src/Functional/NodeCacheTagsTest.php
+++ b/core/modules/node/tests/src/Functional/NodeCacheTagsTest.php
@@ -48,7 +48,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getAdditionalCacheContextsForEntity(EntityInterface $entity) {
+ protected function getAdditionalCacheContextsForEntity(EntityInterface $entity): array {
return ['timezone'];
}
@@ -57,14 +57,14 @@ protected function getAdditionalCacheContextsForEntity(EntityInterface $entity)
*
* Each node must have an author.
*/
- protected function getAdditionalCacheTagsForEntity(EntityInterface $node) {
+ protected function getAdditionalCacheTagsForEntity(EntityInterface $node): array {
return ['user:' . $node->getOwnerId(), 'user_view'];
}
/**
* {@inheritdoc}
*/
- protected function getAdditionalCacheContextsForEntityListing() {
+ protected function getAdditionalCacheContextsForEntityListing(): array {
return ['user.node_grants:view'];
}
diff --git a/core/modules/node/tests/src/Functional/NodeCreationTest.php b/core/modules/node/tests/src/Functional/NodeCreationTest.php
index bcf7cb57d5ba..89ce3089c165 100644
--- a/core/modules/node/tests/src/Functional/NodeCreationTest.php
+++ b/core/modules/node/tests/src/Functional/NodeCreationTest.php
@@ -317,7 +317,7 @@ public function testNodeAddWithoutContentTypes(): void {
* Array containing the IDs of the log records with the rollback exception
* message.
*/
- protected static function getWatchdogIdsForTestExceptionRollback() {
+ protected static function getWatchdogIdsForTestExceptionRollback(): array {
// PostgreSQL doesn't support bytea LIKE queries, so we need to unserialize
// first to check for the rollback exception message.
$matches = [];
diff --git a/core/modules/node/tests/src/Functional/NodeTranslationUITest.php b/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
index af730fbd343c..47b359da747b 100644
--- a/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
+++ b/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
@@ -132,21 +132,21 @@ public function testPublishedStatusNoFields(): void {
/**
* {@inheritdoc}
*/
- protected function getTranslatorPermissions() {
+ protected function getTranslatorPermissions(): array {
return array_merge(parent::getTranslatorPermissions(), ['administer nodes', "edit any $this->bundle content"]);
}
/**
* {@inheritdoc}
*/
- protected function getEditorPermissions() {
+ protected function getEditorPermissions(): array {
return ['administer nodes', 'create article content'];
}
/**
* {@inheritdoc}
*/
- protected function getAdministratorPermissions() {
+ protected function getAdministratorPermissions(): array {
return array_merge(parent::getAdministratorPermissions(), ['access administration pages', 'administer content types', 'administer node fields', 'access content overview', 'bypass node access', 'administer languages', 'administer themes', 'view the administration theme']);
}
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeCompleteTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeCompleteTest.php
index de19dbd782f5..b423169c23cf 100644
--- a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeCompleteTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeCompleteTest.php
@@ -118,7 +118,7 @@ protected function assertRevision(array $revision, array $data): void {
* @return array
* The expected table rows.
*/
- protected function expectedNodeFieldDataTable() {
+ protected function expectedNodeFieldDataTable(): array {
return [
0 =>
[
@@ -525,7 +525,7 @@ protected function expectedNodeFieldDataTable() {
* @return array
* The table.
*/
- protected function expectedNodeFieldRevisionTable() {
+ protected function expectedNodeFieldRevisionTable(): array {
return [
0 =>
[
@@ -1046,7 +1046,7 @@ protected function expectedNodeFieldRevisionTable() {
* @return array
* Selected properties and fields on the revision.
*/
- protected function expectedRevisionEntityData() {
+ protected function expectedRevisionEntityData(): array {
return [
$revision_data = [
// Node 1, revision 1, und.
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeCompleteTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeCompleteTest.php
index 22e0d43bd85b..463371ccff48 100644
--- a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeCompleteTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeCompleteTest.php
@@ -87,7 +87,7 @@ protected function setUp(): void {
/**
* {@inheritdoc}
*/
- protected function getFileMigrationInfo() {
+ protected function getFileMigrationInfo(): array {
return [
'path' => 'public://sites/default/files/cube.jpeg',
'size' => 3620,
@@ -221,7 +221,7 @@ protected function assertRevision(array $revision, array $data): void {
* @return array
* The expected table rows.
*/
- protected function expectedNodeFieldDataTable() {
+ protected function expectedNodeFieldDataTable(): array {
return [
0 =>
[
@@ -466,7 +466,7 @@ protected function expectedNodeFieldDataTable() {
* @return array
* The table.
*/
- protected function expectedNodeFieldRevisionTable() {
+ protected function expectedNodeFieldRevisionTable(): array {
return [
0 =>
[
@@ -1004,7 +1004,7 @@ protected function expectedNodeFieldRevisionTable() {
* @return array
* Selected properties and fields on the revision.
*/
- protected function expectedRevisionEntityData() {
+ protected function expectedRevisionEntityData(): array {
return [
$revision_data = [
// Node 1, revision 1, en.
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeRevisionTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeRevisionTest.php
index dbc7cda1e209..2f026efd6cb0 100644
--- a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeRevisionTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeRevisionTest.php
@@ -76,7 +76,7 @@ protected function setUp(): void {
/**
* {@inheritdoc}
*/
- protected function getFileMigrationInfo() {
+ protected function getFileMigrationInfo(): array {
return [
'path' => 'public://sites/default/files/cube.jpeg',
'size' => 3620,
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
index 08ee83d79f96..c0f2d4da853b 100644
--- a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
@@ -73,7 +73,7 @@ protected function setUp(): void {
/**
* {@inheritdoc}
*/
- protected function getFileMigrationInfo() {
+ protected function getFileMigrationInfo(): array {
return [
'path' => 'public://sites/default/files/cube.jpeg',
'size' => 3620,
diff --git a/core/modules/page_cache/tests/src/Functional/PageCacheTest.php b/core/modules/page_cache/tests/src/Functional/PageCacheTest.php
index 6d12f1b09c85..2601b3b146a2 100644
--- a/core/modules/page_cache/tests/src/Functional/PageCacheTest.php
+++ b/core/modules/page_cache/tests/src/Functional/PageCacheTest.php
@@ -611,7 +611,7 @@ public function testNoUrlNormalization(): void {
* @return array
* Array of headers.
*/
- protected function getHeaders($url) {
+ protected function getHeaders($url): array {
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_HEADER, TRUE);
diff --git a/core/modules/path/tests/src/Unit/Field/PathFieldDefinitionTest.php b/core/modules/path/tests/src/Unit/Field/PathFieldDefinitionTest.php
index 9b4c3f61d2c4..6e14d600d943 100644
--- a/core/modules/path/tests/src/Unit/Field/PathFieldDefinitionTest.php
+++ b/core/modules/path/tests/src/Unit/Field/PathFieldDefinitionTest.php
@@ -22,7 +22,7 @@ protected function getPluginId() {
/**
* {@inheritdoc}
*/
- protected function getModuleAndPath() {
+ protected function getModuleAndPath(): array {
return ['path', dirname(__DIR__, 4)];
}
diff --git a/core/modules/rest/tests/src/Functional/BasicAuthResourceTestTrait.php b/core/modules/rest/tests/src/Functional/BasicAuthResourceTestTrait.php
index 73d984107917..589febbe1f02 100644
--- a/core/modules/rest/tests/src/Functional/BasicAuthResourceTestTrait.php
+++ b/core/modules/rest/tests/src/Functional/BasicAuthResourceTestTrait.php
@@ -22,7 +22,7 @@ trait BasicAuthResourceTestTrait {
/**
* {@inheritdoc}
*/
- protected function getAuthenticationRequestOptions($method) {
+ protected function getAuthenticationRequestOptions($method): array {
return [
'headers' => [
'Authorization' => 'Basic ' . base64_encode($this->account->name->value . ':' . $this->account->passRaw),
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/XmlEntityNormalizationQuirksTrait.php b/core/modules/rest/tests/src/Functional/EntityResource/XmlEntityNormalizationQuirksTrait.php
index fd8b92d82824..3700dbe0ce8b 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/XmlEntityNormalizationQuirksTrait.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/XmlEntityNormalizationQuirksTrait.php
@@ -67,7 +67,7 @@ protected function getExpectedNormalizedEntity() {
*
* @see \Symfony\Component\Serializer\Encoder\XmlEncoder
*/
- protected function applyXmlFieldDecodingQuirks(array $normalization) {
+ protected function applyXmlFieldDecodingQuirks(array $normalization): array {
foreach ($this->entity->getFields(TRUE) as $field_name => $field) {
// Not every field is accessible.
if (!isset($normalization[$field_name])) {
diff --git a/core/modules/rest/tests/src/Functional/XmlNormalizationQuirksTrait.php b/core/modules/rest/tests/src/Functional/XmlNormalizationQuirksTrait.php
index c1a7c68a2cd8..e591fc5c1b41 100644
--- a/core/modules/rest/tests/src/Functional/XmlNormalizationQuirksTrait.php
+++ b/core/modules/rest/tests/src/Functional/XmlNormalizationQuirksTrait.php
@@ -25,7 +25,7 @@ trait XmlNormalizationQuirksTrait {
*
* @see \Symfony\Component\Serializer\Encoder\XmlEncoder
*/
- protected function applyXmlDecodingQuirks(array $normalization) {
+ protected function applyXmlDecodingQuirks(array $normalization): array {
foreach ($normalization as $key => $value) {
if ($value === [] || $value === NULL) {
$normalization[$key] = '';
diff --git a/core/modules/rest/tests/src/Unit/EventSubscriber/ResourceResponseSubscriberTest.php b/core/modules/rest/tests/src/Unit/EventSubscriber/ResourceResponseSubscriberTest.php
index fd7abd2198cd..8fa7fea35777 100644
--- a/core/modules/rest/tests/src/Unit/EventSubscriber/ResourceResponseSubscriberTest.php
+++ b/core/modules/rest/tests/src/Unit/EventSubscriber/ResourceResponseSubscriberTest.php
@@ -411,7 +411,7 @@ protected function getFunctioningResourceResponseSubscriber(RouteMatchInterface
* @return array
* An array of route requirements.
*/
- protected function generateRouteRequirements(array $supported_response_formats, array $supported_request_formats) {
+ protected function generateRouteRequirements(array $supported_response_formats, array $supported_request_formats): array {
$route_requirements = [
'_format' => implode('|', $supported_response_formats),
];
diff --git a/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayTestBase.php b/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayTestBase.php
index ae13a0fdf399..c03f73b077f0 100644
--- a/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayTestBase.php
+++ b/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayTestBase.php
@@ -156,7 +156,7 @@ protected function assertOffCanvasBlockFormIsValid() {
/**
* {@inheritdoc}
*/
- protected static function getTestThemes() {
+ protected static function getTestThemes(): array {
// Remove 'claro' theme. Settings Tray "Edit Mode" will not work with this
// theme because it removes all contextual links.
return array_filter(parent::getTestThemes(), function ($theme) {
diff --git a/core/modules/shortcut/tests/src/Functional/ShortcutTranslationUITest.php b/core/modules/shortcut/tests/src/Functional/ShortcutTranslationUITest.php
index 01f5a3d80135..125a3eec8694 100644
--- a/core/modules/shortcut/tests/src/Functional/ShortcutTranslationUITest.php
+++ b/core/modules/shortcut/tests/src/Functional/ShortcutTranslationUITest.php
@@ -51,7 +51,7 @@ protected function setUp(): void {
/**
* {@inheritdoc}
*/
- protected function getTranslatorPermissions() {
+ protected function getTranslatorPermissions(): array {
return array_merge(parent::getTranslatorPermissions(), ['access shortcuts', 'administer shortcuts', 'access toolbar']);
}
diff --git a/core/modules/system/tests/src/Functional/Cache/AssertPageCacheContextsAndTagsTrait.php b/core/modules/system/tests/src/Functional/Cache/AssertPageCacheContextsAndTagsTrait.php
index e776707e8c23..d2cb0f1966f4 100644
--- a/core/modules/system/tests/src/Functional/Cache/AssertPageCacheContextsAndTagsTrait.php
+++ b/core/modules/system/tests/src/Functional/Cache/AssertPageCacheContextsAndTagsTrait.php
@@ -32,7 +32,7 @@ protected function enablePageCaching() {
* @return string[]
* The header value, potentially exploded by spaces.
*/
- protected function getCacheHeaderValues($header_name) {
+ protected function getCacheHeaderValues($header_name): array {
$header_value = $this->getSession()->getResponseHeader($header_name);
return empty($header_value) ? [] : explode(' ', $header_value);
}
diff --git a/core/modules/system/tests/src/Functional/Form/ElementsLabelsTest.php b/core/modules/system/tests/src/Functional/Form/ElementsLabelsTest.php
index c63a03050d1d..82d49785f50a 100644
--- a/core/modules/system/tests/src/Functional/Form/ElementsLabelsTest.php
+++ b/core/modules/system/tests/src/Functional/Form/ElementsLabelsTest.php
@@ -152,7 +152,7 @@ public function testFormsInThemeLessEnvironments(): void {
/**
* Return a form with element with not all properties defined.
*/
- protected function getFormWithLimitedProperties() {
+ protected function getFormWithLimitedProperties(): array {
$form = [];
$form['fieldset'] = [
diff --git a/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php b/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php
index 864183d0ab70..159d36153d4c 100644
--- a/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php
+++ b/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php
@@ -212,7 +212,7 @@ public function testMultipleFalseOptionChecker(): void {
* @internal param $form_element A form element to test.
* A form element to test.
*/
- private function formSubmitHelper($form, $edit) {
+ private function formSubmitHelper($form, $edit): array {
$form_id = $this->randomMachineName();
$form_state = new FormState();
diff --git a/core/modules/system/tests/src/Functional/Menu/AssertBreadcrumbTrait.php b/core/modules/system/tests/src/Functional/Menu/AssertBreadcrumbTrait.php
index 9616864d3767..1039c86f46dd 100644
--- a/core/modules/system/tests/src/Functional/Menu/AssertBreadcrumbTrait.php
+++ b/core/modules/system/tests/src/Functional/Menu/AssertBreadcrumbTrait.php
@@ -110,7 +110,7 @@ protected function assertBreadcrumbParts($trail) {
/**
* Returns the breadcrumb contents of the current page in the internal browser.
*/
- protected function getBreadcrumbParts() {
+ protected function getBreadcrumbParts(): array {
$parts = [];
$elements = $this->xpath('//nav[@aria-labelledby="system-breadcrumb"]//ol/li/a');
if (!empty($elements)) {
diff --git a/core/modules/taxonomy/tests/src/Functional/TermParentsTest.php b/core/modules/taxonomy/tests/src/Functional/TermParentsTest.php
index c37d4486b47e..bce865a4a98c 100644
--- a/core/modules/taxonomy/tests/src/Functional/TermParentsTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TermParentsTest.php
@@ -195,7 +195,7 @@ public function testEditingParentsWithDisabledFormElement(): void {
* @return \Drupal\taxonomy\TermInterface[]
* A list of terms created for testing.
*/
- protected function doTestEditingSingleParent() {
+ protected function doTestEditingSingleParent(): array {
$terms = [];
// Create two terms without any parents.
diff --git a/core/modules/taxonomy/tests/src/Functional/TermTest.php b/core/modules/taxonomy/tests/src/Functional/TermTest.php
index 70aea5a79ca1..f3abdb53272b 100644
--- a/core/modules/taxonomy/tests/src/Functional/TermTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TermTest.php
@@ -605,7 +605,7 @@ private function reloadTermByName(string $name): TermInterface {
* @return array
* A sorted array of tids and 0 if the root is a parent.
*/
- private function getParentTids($term) {
+ private function getParentTids($term): array {
$parent_tids = [];
foreach ($term->get('parent') as $item) {
$parent_tids[] = (int) $item->target_id;
diff --git a/core/modules/taxonomy/tests/src/Functional/TermTranslationUITest.php b/core/modules/taxonomy/tests/src/Functional/TermTranslationUITest.php
index ff06aeef9738..f6e43a14dd31 100644
--- a/core/modules/taxonomy/tests/src/Functional/TermTranslationUITest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TermTranslationUITest.php
@@ -75,7 +75,7 @@ protected function setupBundle() {
/**
* {@inheritdoc}
*/
- protected function getTranslatorPermissions() {
+ protected function getTranslatorPermissions(): array {
return array_merge(parent::getTranslatorPermissions(), ['administer taxonomy']);
}
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php
index 657c520e2f76..30f7521aa667 100644
--- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php
@@ -207,7 +207,7 @@ public function testTaxonomyTerms(): void {
* @return array
* List of parent term IDs.
*/
- protected function getParentIDs($tid) {
+ protected function getParentIDs($tid): array {
return array_keys(\Drupal::entityTypeManager()->getStorage('taxonomy_term')->loadParents($tid));
}
diff --git a/core/modules/user/tests/src/Functional/UserCacheTagsTest.php b/core/modules/user/tests/src/Functional/UserCacheTagsTest.php
index 32a7b99e657a..cc6c0dec0136 100644
--- a/core/modules/user/tests/src/Functional/UserCacheTagsTest.php
+++ b/core/modules/user/tests/src/Functional/UserCacheTagsTest.php
@@ -56,7 +56,7 @@ protected function createEntity() {
/**
* {@inheritdoc}
*/
- protected function getAdditionalCacheTagsForEntityListing() {
+ protected function getAdditionalCacheTagsForEntityListing(): array {
return ['user:0', 'user:1'];
}
diff --git a/core/modules/user/tests/src/Functional/UserRegistrationRestTest.php b/core/modules/user/tests/src/Functional/UserRegistrationRestTest.php
index 651d9d2a7fd2..49e46b8031b9 100644
--- a/core/modules/user/tests/src/Functional/UserRegistrationRestTest.php
+++ b/core/modules/user/tests/src/Functional/UserRegistrationRestTest.php
@@ -156,7 +156,7 @@ public function testRegisterUser(): void {
* @return array
* Return the request body.
*/
- protected function createRequestBody($name, $include_password = TRUE, $include_email = TRUE) {
+ protected function createRequestBody($name, $include_password = TRUE, $include_email = TRUE): array {
$request_body = [
'langcode' => [['value' => 'en']],
'name' => [['value' => $name]],
diff --git a/core/modules/user/tests/src/Functional/UserTranslationUITest.php b/core/modules/user/tests/src/Functional/UserTranslationUITest.php
index 1a388b931302..b523704b61e3 100644
--- a/core/modules/user/tests/src/Functional/UserTranslationUITest.php
+++ b/core/modules/user/tests/src/Functional/UserTranslationUITest.php
@@ -64,7 +64,7 @@ protected function setUp(): void {
/**
* {@inheritdoc}
*/
- protected function getTranslatorPermissions() {
+ protected function getTranslatorPermissions(): array {
return array_merge(parent::getTranslatorPermissions(), ['administer users']);
}
diff --git a/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php b/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
index b76fdf15c8eb..187db2b00c98 100644
--- a/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
@@ -127,7 +127,7 @@ public function testClickSortingDistinct(): void {
* @return array
* A list of beatle ids.
*/
- protected function clickSortLoadIdsFromOutput() {
+ protected function clickSortLoadIdsFromOutput(): array {
$fields = $this->xpath("//td[contains(@class, 'views-field-id')]");
$ids = [];
foreach ($fields as $field) {
diff --git a/core/modules/views/tests/src/FunctionalJavascript/Plugin/views/Handler/FilterTest.php b/core/modules/views/tests/src/FunctionalJavascript/Plugin/views/Handler/FilterTest.php
index 38bd96fc6515..4a574d30853d 100644
--- a/core/modules/views/tests/src/FunctionalJavascript/Plugin/views/Handler/FilterTest.php
+++ b/core/modules/views/tests/src/FunctionalJavascript/Plugin/views/Handler/FilterTest.php
@@ -103,7 +103,7 @@ public function testAddingFilter(): void {
* @return \Behat\Mink\Element\NodeElement[]
* The filtered elements.
*/
- protected function filterVisibleElements($elements) {
+ protected function filterVisibleElements($elements): array {
$elements = array_filter($elements, function ($element) {
return $element->isVisible();
});
diff --git a/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php b/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php
index fd8008d48a48..85134be56569 100644
--- a/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php
+++ b/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php
@@ -538,7 +538,7 @@ public function testBrokenView(): void {
* @return array
* An array with the view as first item, and the display as second.
*/
- protected function getUpdatedViewAndDisplay($revision = FALSE) {
+ protected function getUpdatedViewAndDisplay($revision = FALSE): array {
$entity_storage = $this->entityTypeManager->getStorage('view');
/** @var \Drupal\views\Entity\View $view */
$view = $entity_storage->load($revision ? 'test_view_entity_test_revision' : 'test_view_entity_test');
diff --git a/core/modules/views/tests/src/Kernel/FieldApiDataTest.php b/core/modules/views/tests/src/Kernel/FieldApiDataTest.php
index c4c6baecd9d1..e0ea1b9a55cb 100644
--- a/core/modules/views/tests/src/Kernel/FieldApiDataTest.php
+++ b/core/modules/views/tests/src/Kernel/FieldApiDataTest.php
@@ -193,7 +193,7 @@ public function testViewsData(): void {
* @return array
* Views data.
*/
- protected function getViewsData($field_storage_key = 'field_string') {
+ protected function getViewsData($field_storage_key = 'field_string'): array {
$views_data = $this->container->get('views.views_data');
$data = [];
diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorStringTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorStringTest.php
index a7096a9a4bb7..725b1fa11fe5 100644
--- a/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorStringTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorStringTest.php
@@ -178,7 +178,7 @@ public function testFilterGroupedExposed(): void {
* @return array
* Returns the filter configuration for exposed filters.
*/
- protected function getGroupedExposedFilters() {
+ protected function getGroupedExposedFilters(): array {
$filters = [
'status' => [
'id' => 'status',
diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorTest.php
index 208b0270c16e..138e0b013702 100644
--- a/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorTest.php
@@ -173,7 +173,7 @@ public function testFilterGroupedExposed(): void {
*
* @return array
*/
- protected function getGroupedExposedFilters() {
+ protected function getGroupedExposedFilters(): array {
$filters = [
'status' => [
'id' => 'status',
diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterEqualityTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterEqualityTest.php
index 0f054f6f2ad1..94c6db047bae 100644
--- a/core/modules/views/tests/src/Kernel/Handler/FilterEqualityTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/FilterEqualityTest.php
@@ -146,7 +146,7 @@ public function testEqualGroupedNotExposed(): void {
$this->assertIdenticalResultset($view, $resultset, $this->columnMap);
}
- protected function getGroupedExposedFilters() {
+ protected function getGroupedExposedFilters(): array {
$filters = [
'name' => [
'id' => 'name',
diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterInOperatorTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterInOperatorTest.php
index 8b71ceb34ae0..9676a2c65cfb 100644
--- a/core/modules/views/tests/src/Kernel/Handler/FilterInOperatorTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/FilterInOperatorTest.php
@@ -199,7 +199,7 @@ public function testFilterGroupedChangedIdentifier(): void {
$this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
}
- protected function getGroupedExposedFilters() {
+ protected function getGroupedExposedFilters(): array {
$filters = [
'age' => [
'id' => 'age',
diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php
index fe54c210401d..4ac73995ac5d 100644
--- a/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php
@@ -527,7 +527,7 @@ public function testAllowEmpty(): void {
$this->assertTrue(isset($age_operators['not empty']));
}
- protected function getGroupedExposedFilters() {
+ protected function getGroupedExposedFilters(): array {
$filters = [
'age' => [
'id' => 'age',
diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php
index 3472046018c0..83b566b5366a 100644
--- a/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php
@@ -848,7 +848,7 @@ public function testFilterStringNotRegularExpression(): void {
$this->assertIdenticalResultset($view, $resultset, $this->columnMap);
}
- protected function getGroupedExposedFilters() {
+ protected function getGroupedExposedFilters(): array {
$filters = [
'name' => [
'id' => 'name',
diff --git a/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php b/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php
index dfd60cd724ef..7e0ea0216214 100644
--- a/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php
@@ -22,7 +22,7 @@ class SortDateTest extends ViewsKernelTestBase {
*/
public static $testViews = ['test_view'];
- protected function expectedResultSet($granularity, $reverse = TRUE) {
+ protected function expectedResultSet($granularity, $reverse = TRUE): array {
$expected = [];
if (!$reverse) {
switch ($granularity) {
diff --git a/core/modules/views/tests/src/Kernel/ModuleTest.php b/core/modules/views/tests/src/Kernel/ModuleTest.php
index 67aa927f2bfc..8cd6ff47816d 100644
--- a/core/modules/views/tests/src/Kernel/ModuleTest.php
+++ b/core/modules/views/tests/src/Kernel/ModuleTest.php
@@ -324,7 +324,7 @@ public function testViewsPreview(): void {
* @return array
* A formatted options array that matches the expected output.
*/
- protected function formatViewOptions(array $views = []) {
+ protected function formatViewOptions(array $views = []): array {
$expected_options = [];
foreach ($views as $view) {
foreach ($view->get('display') as $display) {
diff --git a/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php b/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
index 129613f892be..ce904683b91c 100644
--- a/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
+++ b/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
@@ -376,7 +376,7 @@ public function testAjaxViewWithPager(): void {
* @return array
* A pair of view storage entity and executable.
*/
- protected function setupValidMocks($use_ajax = self::USE_AJAX) {
+ protected function setupValidMocks($use_ajax = self::USE_AJAX): array {
$view = $this->getMockBuilder('Drupal\views\Entity\View')
->disableOriginalConstructor()
->getMock();
diff --git a/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php b/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
index 6d9801e66915..7cd391c654d0 100644
--- a/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
+++ b/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
@@ -145,7 +145,7 @@ public function testOnAlterRoutes(): void {
* @return \Drupal\views\Plugin\views\display\DisplayRouterInterface[]|\PHPUnit\Framework\MockObject\MockObject[]
* An array of two mocked view displays.
*/
- protected function setupMocks() {
+ protected function setupMocks(): array {
$executable = $this->getMockBuilder('Drupal\views\ViewExecutable')
->disableOriginalConstructor()
->getMock();
diff --git a/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php b/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php
index f6b12ea391e6..77a9c45861ea 100644
--- a/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php
@@ -557,7 +557,7 @@ public function testGetRouteName(): void {
/**
* Returns some mocked view entity, view executable, and access plugin.
*/
- protected function setupViewExecutableAccessPlugin() {
+ protected function setupViewExecutableAccessPlugin(): array {
$view_entity = $this->getMockBuilder('Drupal\views\Entity\View')
->disableOriginalConstructor()
->getMock();
diff --git a/core/modules/views/tests/src/Unit/ViewExecutableTest.php b/core/modules/views/tests/src/Unit/ViewExecutableTest.php
index c971c6450c4d..aef51ee0278e 100644
--- a/core/modules/views/tests/src/Unit/ViewExecutableTest.php
+++ b/core/modules/views/tests/src/Unit/ViewExecutableTest.php
@@ -544,7 +544,7 @@ public static function providerAttachDisplays() {
* @return array
* Returns the view executable and default display.
*/
- protected function setupBaseViewAndDisplay() {
+ protected function setupBaseViewAndDisplay(): array {
$config = [
'id' => 'test_view',
'tag' => 'OnE, TWO, and three',
diff --git a/core/modules/views_ui/tests/src/Functional/RearrangeFieldsTest.php b/core/modules/views_ui/tests/src/Functional/RearrangeFieldsTest.php
index 5edc08b04ced..ed38b0a720a1 100644
--- a/core/modules/views_ui/tests/src/Functional/RearrangeFieldsTest.php
+++ b/core/modules/views_ui/tests/src/Functional/RearrangeFieldsTest.php
@@ -29,7 +29,7 @@ class RearrangeFieldsTest extends UITestBase {
/**
* Gets the fields from the View.
*/
- protected function getViewFields($view_name = 'test_view', $display_id = 'default') {
+ protected function getViewFields($view_name = 'test_view', $display_id = 'default'): array {
$view = Views::getView($view_name);
$view->setDisplay($display_id);
$fields = [];
diff --git a/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsListingTest.php b/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsListingTest.php
index 7355e16c023b..418712b023dc 100644
--- a/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsListingTest.php
+++ b/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsListingTest.php
@@ -139,7 +139,7 @@ public function testFilterViewsListing(): void {
*
* @return array
*/
- protected function filterVisibleElements($elements) {
+ protected function filterVisibleElements($elements): array {
$elements = array_filter($elements, function ($element) {
return $element->isVisible();
});
diff --git a/core/modules/workspaces/tests/src/Kernel/WorkspaceIntegrationTest.php b/core/modules/workspaces/tests/src/Kernel/WorkspaceIntegrationTest.php
index 71deeb74f821..1c832c78c366 100644
--- a/core/modules/workspaces/tests/src/Kernel/WorkspaceIntegrationTest.php
+++ b/core/modules/workspaces/tests/src/Kernel/WorkspaceIntegrationTest.php
@@ -1032,7 +1032,7 @@ protected function assertEntityQuery(array $expected_values, string $entity_type
* An array where all the entity IDs and revision IDs are merged inside each
* expected values array.
*/
- protected function flattenExpectedValues(array $expected, $entity_type_id) {
+ protected function flattenExpectedValues(array $expected, $entity_type_id): array {
$flattened = [];
$entity_keys = $this->entityTypeManager->getDefinition($entity_type_id)->getKeys();
diff --git a/core/tests/Drupal/KernelTests/AssertContentTrait.php b/core/tests/Drupal/KernelTests/AssertContentTrait.php
index 5231284529dd..5ac79b9100c4 100644
--- a/core/tests/Drupal/KernelTests/AssertContentTrait.php
+++ b/core/tests/Drupal/KernelTests/AssertContentTrait.php
@@ -243,7 +243,7 @@ protected function cssSelect($selector) {
* @return \SimpleXmlElement[]
* Option elements in select.
*/
- protected function getAllOptions(\SimpleXMLElement $element) {
+ protected function getAllOptions(\SimpleXMLElement $element): array {
$options = [];
// Add all options items.
foreach ($element->option as $option) {
diff --git a/core/tests/Drupal/KernelTests/Core/Cache/EndOfTransactionQueriesTest.php b/core/tests/Drupal/KernelTests/Core/Cache/EndOfTransactionQueriesTest.php
index 81b7099a1cad..18fbd69e85ed 100644
--- a/core/tests/Drupal/KernelTests/Core/Cache/EndOfTransactionQueriesTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Cache/EndOfTransactionQueriesTest.php
@@ -158,7 +158,7 @@ public function testEntitySaveRollback(): void {
* @return string[]
* Filtered statement list.
*/
- protected function getStatementsForTable(array $statements, $table_name) {
+ protected function getStatementsForTable(array $statements, $table_name): array {
return array_filter($statements, function ($statement) use ($table_name) {
return $this->isStatementRelatedToTable($statement, $table_name);
});
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php
index 15dd093d763e..2188fe0de478 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php
@@ -649,7 +649,7 @@ public function testContentEntityDelete(): void {
* @return array
* An array with values of entity_type_id:ID
*/
- protected function getDependentIds(array $dependents) {
+ protected function getDependentIds(array $dependents): array {
$dependent_ids = [];
foreach ($dependents as $dependent) {
$dependent_ids[] = $dependent->getEntityTypeId() . ':' . $dependent->id();
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityRepositoryTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityRepositoryTest.php
index b54ccc4deb07..99118165d807 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityRepositoryTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityRepositoryTest.php
@@ -316,7 +316,7 @@ protected function assertEntityType(?object $entity, string $expected_entity_typ
* @return \Drupal\Core\Plugin\Context\ContextInterface[]
* An array of contexts.
*/
- protected function getLanguageContexts($langcode) {
+ protected function getLanguageContexts($langcode): array {
return ['langcode' => $langcode];
}
diff --git a/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php b/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php
index 69ef57c8cdb2..52feadc5fdb2 100644
--- a/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php
@@ -478,7 +478,7 @@ protected function extensionConfig() {
*
* @return \Drupal\Core\Extension\ModuleHandlerInterface
*/
- protected function moduleHandler() {
+ protected function moduleHandler(): ?object {
return $this->container->get('module_handler');
}
@@ -487,7 +487,7 @@ protected function moduleHandler() {
*
* @return \Drupal\Core\Extension\ModuleInstallerInterface
*/
- protected function moduleInstaller() {
+ protected function moduleInstaller(): ?object {
return $this->container->get('module_installer');
}
diff --git a/core/tests/Drupal/KernelTests/KernelTestBase.php b/core/tests/Drupal/KernelTests/KernelTestBase.php
index c10ca038928a..e4dda0668904 100644
--- a/core/tests/Drupal/KernelTests/KernelTestBase.php
+++ b/core/tests/Drupal/KernelTests/KernelTestBase.php
@@ -509,7 +509,7 @@ protected function initFileCache() {
* @see \Drupal\Tests\KernelTestBase::enableModules()
* @see \Drupal\Core\Extension\ModuleHandler::add()
*/
- private function getExtensionsForModules(array $modules) {
+ private function getExtensionsForModules(array $modules): array {
$extensions = [];
$discovery = new ExtensionDiscovery($this->root);
$discovery->setProfileDirectories([]);
diff --git a/core/tests/Drupal/Tests/ApiRequestTrait.php b/core/tests/Drupal/Tests/ApiRequestTrait.php
index 12db34c52b55..e1b219a2c3eb 100644
--- a/core/tests/Drupal/Tests/ApiRequestTrait.php
+++ b/core/tests/Drupal/Tests/ApiRequestTrait.php
@@ -62,7 +62,7 @@ protected function makeApiRequest($method, Url $url, array $request_options) {
* @return array
* Request options updated with the Xdebug cookie if present.
*/
- protected function decorateWithXdebugCookie(array $request_options) {
+ protected function decorateWithXdebugCookie(array $request_options): array {
$session = $this->getSession();
$driver = $session->getDriver();
if ($driver instanceof BrowserKitDriver) {
diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
index 79fcaad7d749..446a59c207f4 100644
--- a/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
+++ b/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
@@ -735,7 +735,7 @@ public function testReset(): void {
* @return array
* Associated array with parameters and services.
*/
- protected function getMockContainerDefinition() {
+ protected function getMockContainerDefinition(): array {
$fake_service = new \stdClass();
$parameters = [];
$parameters['some_parameter_class'] = get_class($fake_service);
diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/PhpArrayDumperTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/PhpArrayDumperTest.php
index 1005b57deea0..6474e9aa8119 100644
--- a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/PhpArrayDumperTest.php
+++ b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/PhpArrayDumperTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void {
/**
* {@inheritdoc}
*/
- protected static function serializeDefinition(array $service_definition) {
+ protected static function serializeDefinition(array $service_definition): array {
return $service_definition;
}
diff --git a/core/tests/Drupal/Tests/Component/DrupalComponentTest.php b/core/tests/Drupal/Tests/Component/DrupalComponentTest.php
index c43a24939090..e6260eead05d 100644
--- a/core/tests/Drupal/Tests/Component/DrupalComponentTest.php
+++ b/core/tests/Drupal/Tests/Component/DrupalComponentTest.php
@@ -73,7 +73,7 @@ public static function getComponents(): array {
* @return array
* An array of class paths.
*/
- protected function findPhpClasses($dir) {
+ protected function findPhpClasses($dir): array {
$classes = [];
foreach (new \DirectoryIterator($dir) as $file) {
if ($file->isDir() && !$file->isDot()) {
diff --git a/core/tests/Drupal/Tests/Component/Graph/GraphTest.php b/core/tests/Drupal/Tests/Component/Graph/GraphTest.php
index ccfd520b1274..2c50ca43f667 100644
--- a/core/tests/Drupal/Tests/Component/Graph/GraphTest.php
+++ b/core/tests/Drupal/Tests/Component/Graph/GraphTest.php
@@ -90,7 +90,7 @@ public function testDepthFirstSearch(): void {
* @return array
* The normalized version of a graph.
*/
- protected function normalizeGraph($graph) {
+ protected function normalizeGraph($graph): array {
$normalized_graph = [];
foreach ($graph as $vertex => $edges) {
// Create vertex even if it hasn't any edges.
diff --git a/core/tests/Drupal/Tests/Component/Utility/UserAgentTest.php b/core/tests/Drupal/Tests/Component/Utility/UserAgentTest.php
index b14d43273792..601b31956968 100644
--- a/core/tests/Drupal/Tests/Component/Utility/UserAgentTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/UserAgentTest.php
@@ -25,7 +25,7 @@ class UserAgentTest extends TestCase {
* @return array
* Language codes, ordered by priority.
*/
- protected function getLanguages() {
+ protected function getLanguages(): array {
return [
// In our test case, 'en' has priority over 'en-US'.
'en',
@@ -53,7 +53,7 @@ protected function getLanguages() {
* @return array
* Language mappings.
*/
- protected function getMappings() {
+ protected function getMappings(): array {
return [
'no' => 'nb',
'pt' => 'pt-pt',
diff --git a/core/tests/Drupal/Tests/Composer/Generator/Fixtures.php b/core/tests/Drupal/Tests/Composer/Generator/Fixtures.php
index 87e940507f2e..7638790051d2 100644
--- a/core/tests/Drupal/Tests/Composer/Generator/Fixtures.php
+++ b/core/tests/Drupal/Tests/Composer/Generator/Fixtures.php
@@ -27,7 +27,7 @@ public function drupalCoreComposerFixture() {
* @return array
* composer.json fixture data.
*/
- protected function composerJson() {
+ protected function composerJson(): array {
return [
'name' => 'drupal/project-fixture',
'description' => 'A fixture for testing the metapackage generator.',
@@ -52,7 +52,7 @@ protected function composerJson() {
* @return array
* composer.lock fixture data.
*/
- protected function composerLock() {
+ protected function composerLock(): array {
return [
'_readme' =>
[
diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldTest.php
index 951bca662645..79077da9ce3c 100644
--- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldTest.php
+++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldTest.php
@@ -284,7 +284,7 @@ public static function scaffoldAppendTestValues(): array {
* @param bool $is_link
* Whether or not symlinking should be used.
*/
- protected static function scaffoldAppendTestValuesToPermute($is_link) {
+ protected static function scaffoldAppendTestValuesToPermute($is_link): array {
return [
[
'drupal-drupal-test-append',
diff --git a/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php b/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php
index afc6999420d9..042c27490440 100644
--- a/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php
@@ -170,7 +170,7 @@ public function testAvailableContextLabels(): void {
$this->assertEquals($expected, $labels);
}
- protected function getContextsFixture() {
+ protected function getContextsFixture(): array {
return ['foo', 'baz'];
}
diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php
index e27a27dbed72..3b36cdb3a345 100644
--- a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php
@@ -1126,7 +1126,7 @@ public function testCreate(): void {
* @return \Drupal\Tests\Core\Field\TestBaseFieldDefinitionInterface[]|\PHPUnit\Framework\MockObject\MockObject[]
* An array of mock base field definitions.
*/
- protected function mockFieldDefinitions(array $field_names, $methods = []) {
+ protected function mockFieldDefinitions(array $field_names, $methods = []): array {
$field_definitions = [];
$definition = $this->createMock('Drupal\Tests\Core\Field\TestBaseFieldDefinitionInterface');
diff --git a/core/tests/Drupal/Tests/Core/Extension/ExtensionDiscoveryTest.php b/core/tests/Drupal/Tests/Core/Extension/ExtensionDiscoveryTest.php
index ff9d1a7d0505..eeedcf4f92be 100644
--- a/core/tests/Drupal/Tests/Core/Extension/ExtensionDiscoveryTest.php
+++ b/core/tests/Drupal/Tests/Core/Extension/ExtensionDiscoveryTest.php
@@ -121,7 +121,7 @@ public function testExtensionDiscoveryTypeComment(): void {
* Format: $[$type][$name] = $yml_file
* E.g. $['module']['system'] = 'system.info.yml'
*/
- protected function populateFilesystemStructure(array &$filesystem_structure) {
+ protected function populateFilesystemStructure(array &$filesystem_structure): array {
$info_by_file = [
'core/profiles/standard/standard.info.yml' => [
'type' => 'profile',
diff --git a/core/tests/Drupal/Tests/Core/Extension/ExtensionListTest.php b/core/tests/Drupal/Tests/Core/Extension/ExtensionListTest.php
index bdacfc99a14d..d0142c9035fd 100644
--- a/core/tests/Drupal/Tests/Core/Extension/ExtensionListTest.php
+++ b/core/tests/Drupal/Tests/Core/Extension/ExtensionListTest.php
@@ -311,7 +311,7 @@ protected function setupTestExtensionList(array $extension_names = ['test_name']
return $test_extension_list;
}
- protected function getMocks() {
+ protected function getMocks(): array {
$cache = $this->prophesize(CacheBackendInterface::class);
$info_parser = $this->prophesize(InfoParserInterface::class);
$module_handler = $this->prophesize(ModuleHandlerInterface::class);
diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php b/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php
index 582faf10d554..8b19d2f0b28e 100644
--- a/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php
@@ -268,7 +268,7 @@ protected function setupLocalTaskManager() {
* @return array
* An array of plugin definition keyed by plugin ID.
*/
- protected function getLocalTaskFixtures() {
+ protected function getLocalTaskFixtures(): array {
$definitions = [];
$definitions['menu_local_task_test_tasks_settings'] = [
'route_name' => 'menu_local_task_test_tasks_settings',
@@ -343,7 +343,7 @@ protected function setupFactory($mock_plugin) {
* @return array
* The expected result, keyed by local task level.
*/
- protected function getLocalTasksForRouteResult($mock_plugin) {
+ protected function getLocalTasksForRouteResult($mock_plugin): array {
$result = [
0 => [
'menu_local_task_test_tasks_settings' => $mock_plugin,
@@ -363,7 +363,7 @@ protected function getLocalTasksForRouteResult($mock_plugin) {
*
* @return array
*/
- protected function getLocalTasksCache() {
+ protected function getLocalTasksCache(): array {
$local_task_fixtures = $this->getLocalTaskFixtures();
$local_tasks = [
'base_routes' => [
diff --git a/core/tests/Drupal/Tests/Core/Plugin/Context/LazyContextRepositoryTest.php b/core/tests/Drupal/Tests/Core/Plugin/Context/LazyContextRepositoryTest.php
index da4130d7611f..9f6f97742c15 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/Context/LazyContextRepositoryTest.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/Context/LazyContextRepositoryTest.php
@@ -127,7 +127,7 @@ public function testGetAvailableContexts(): void {
* @return array
* An array of set up contexts.
*/
- protected function setupContextAndProvider($service_id, array $unqualified_context_ids, array $expected_unqualified_context_ids = []) {
+ protected function setupContextAndProvider($service_id, array $unqualified_context_ids, array $expected_unqualified_context_ids = []): array {
$contexts = [];
for ($i = 0; $i < count($unqualified_context_ids); $i++) {
$contexts[] = new Context(new ContextDefinition('example'));
diff --git a/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php b/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php
index 8b60c5215a58..be4d182bcfe0 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php
@@ -115,14 +115,14 @@ public function testGetDefinitionWithUnknownID(): void {
$this->hookDiscovery->getDefinition('test_non_existent', TRUE);
}
- protected function hookDiscoveryTestTestPlugin() {
+ protected function hookDiscoveryTestTestPlugin(): array {
return [
'test_id_1' => ['class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Apple'],
'test_id_2' => ['class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Orange'],
];
}
- protected function hookDiscoveryTest2TestPlugin() {
+ protected function hookDiscoveryTest2TestPlugin(): array {
return [
'test_id_3' => ['class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Cherry'],
];
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php b/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
index 273eceb81b13..6a2a73fb241a 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
@@ -530,7 +530,7 @@ public static function providerPlaceholders(): array {
* - A render array containing a placeholder.
* - The context used for that #lazy_builder callback.
*/
- protected function generatePlaceholderElement() {
+ protected function generatePlaceholderElement(): array {
$args = [static::randomContextValue()];
$test_element = [];
$test_element['#attached']['drupalSettings']['foo'] = 'bar';
@@ -1106,7 +1106,7 @@ public function generatePlaceholderWithLazyBuilderPreview(): array {
* @return array
* The generated render array for testing.
*/
- protected function generatePlaceholdersWithChildrenTestElement(array $args_1, array $args_2, array $args_3) {
+ protected function generatePlaceholdersWithChildrenTestElement(array $args_1, array $args_2, array $args_3): array {
$test_element = [
'#type' => 'details',
'#cache' => [
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererRecursionTest.php b/core/tests/Drupal/Tests/Core/Render/RendererRecursionTest.php
index 98afe1484c82..29b0c7b183e9 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererRecursionTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererRecursionTest.php
@@ -10,7 +10,7 @@
*/
class RendererRecursionTest extends RendererTestBase {
- protected function setUpRenderRecursionComplexElements() {
+ protected function setUpRenderRecursionComplexElements(): array {
$complex_child_markup = '<p>Imagine this is a render array for an entity.</p>';
$parent_markup = '<p>Rendered!</p>';
diff --git a/core/tests/Drupal/Tests/XdebugRequestTrait.php b/core/tests/Drupal/Tests/XdebugRequestTrait.php
index 555140b947c1..23b76027b82e 100644
--- a/core/tests/Drupal/Tests/XdebugRequestTrait.php
+++ b/core/tests/Drupal/Tests/XdebugRequestTrait.php
@@ -25,7 +25,7 @@ trait XdebugRequestTrait {
* @return array
* The extracted cookies.
*/
- protected function extractCookiesFromRequest(Request $request) {
+ protected function extractCookiesFromRequest(Request $request): array {
$cookie_params = $request->cookies;
$cookies = [];
if ($cookie_params->has('XDEBUG_SESSION')) {
--
GitLab