diff --git a/core/modules/block/tests/src/Functional/Rest/BlockResourceTestBase.php b/core/modules/block/tests/src/Functional/Rest/BlockResourceTestBase.php
index dd0e131391d3a7b001f3f3ed2e83a546c1bcf202..47ef41b446eb460cea8ed94cda6116a83f616a46 100644
--- a/core/modules/block/tests/src/Functional/Rest/BlockResourceTestBase.php
+++ b/core/modules/block/tests/src/Functional/Rest/BlockResourceTestBase.php
@@ -109,6 +109,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeResourceTestBase.php b/core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeResourceTestBase.php
index 7592a1368a6b04ad10566ac69f7e339951845188..f41577634d251f5303f42f21fd711e1c4b7ed011 100644
--- a/core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeResourceTestBase.php
+++ b/core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeResourceTestBase.php
@@ -66,6 +66,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
}
diff --git a/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php b/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
index 106e832b45e5712aedfbeb16dba4d8d25597947f..9820d25534054fa6f69d363f179f599dd5350a8b 100644
--- a/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
@@ -179,9 +179,7 @@ public function postComment(EntityInterface $entity, $comment, $subject = '', $c
$this->assertArrayHasKey(1, $match);
}
- if (isset($match[1])) {
- return Comment::load($match[1]);
- }
+ return Comment::load($match[1]);
}
/**
diff --git a/core/modules/comment/tests/src/Functional/Rest/CommentResourceTestBase.php b/core/modules/comment/tests/src/Functional/Rest/CommentResourceTestBase.php
index aef51880de8883b8ed4971c4f7fcd5a253bc1a8d..67c3bd12dd54ab844f8a1e875579ee5a77edbc04 100644
--- a/core/modules/comment/tests/src/Functional/Rest/CommentResourceTestBase.php
+++ b/core/modules/comment/tests/src/Functional/Rest/CommentResourceTestBase.php
@@ -317,16 +317,17 @@ public function testPostDxWithoutCriticalBaseFields() {
*/
protected function getExpectedUnauthorizedAccessMessage($method) {
switch ($method) {
- case 'GET';
+ case 'GET':
return "The 'access comments' permission is required and the comment must be published.";
- case 'POST';
+ case 'POST':
return "The 'post comments' permission is required.";
- case 'PATCH';
+ case 'PATCH':
return "The 'edit own comments' permission is required, the user must be the comment author, and the comment must be published.";
case 'DELETE':
+ default:
// \Drupal\comment\CommentAccessControlHandler::checkAccess() does not
// specify a reason for not allowing a comment to be deleted.
return '';
diff --git a/core/modules/comment/tests/src/Functional/Rest/CommentTypeResourceTestBase.php b/core/modules/comment/tests/src/Functional/Rest/CommentTypeResourceTestBase.php
index b3479156d42088d9b1c12a4515cfeb0f347f9463..7862f0cec0b1db048f43bc917b3d9570ebd15731 100644
--- a/core/modules/comment/tests/src/Functional/Rest/CommentTypeResourceTestBase.php
+++ b/core/modules/comment/tests/src/Functional/Rest/CommentTypeResourceTestBase.php
@@ -72,6 +72,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
}
diff --git a/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestResourceTestBase.php b/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestResourceTestBase.php
index ef9a7701a9fd6049b84b1b53aea562b03604f327..8f9751993383b38f636aec4415fb6c45f414acc8 100644
--- a/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestResourceTestBase.php
+++ b/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestResourceTestBase.php
@@ -68,6 +68,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/contact/tests/src/Functional/Rest/ContactFormResourceTestBase.php b/core/modules/contact/tests/src/Functional/Rest/ContactFormResourceTestBase.php
index 43d4ec5bd157fc855205e7f0e666396cd8cf0c6d..ea30b901251018f589f303252deb169de1797192 100644
--- a/core/modules/contact/tests/src/Functional/Rest/ContactFormResourceTestBase.php
+++ b/core/modules/contact/tests/src/Functional/Rest/ContactFormResourceTestBase.php
@@ -85,6 +85,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/editor/tests/src/Functional/Rest/EditorResourceTestBase.php b/core/modules/editor/tests/src/Functional/Rest/EditorResourceTestBase.php
index dc40d05b4618936f436723852309d85905f27b58..2612c7215ffbeec2e5734f4df590d18de24bc23b 100644
--- a/core/modules/editor/tests/src/Functional/Rest/EditorResourceTestBase.php
+++ b/core/modules/editor/tests/src/Functional/Rest/EditorResourceTestBase.php
@@ -122,6 +122,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/field/tests/src/Functional/Rest/FieldConfigResourceTestBase.php b/core/modules/field/tests/src/Functional/Rest/FieldConfigResourceTestBase.php
index 7728cd2c7226f8d2d91566c9b1bd4d5e3390981b..025b820df1751421637c6f932b38c3e92f251fc1 100644
--- a/core/modules/field/tests/src/Functional/Rest/FieldConfigResourceTestBase.php
+++ b/core/modules/field/tests/src/Functional/Rest/FieldConfigResourceTestBase.php
@@ -94,6 +94,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/field/tests/src/Functional/Rest/FieldStorageConfigResourceTestBase.php b/core/modules/field/tests/src/Functional/Rest/FieldStorageConfigResourceTestBase.php
index fed650e093b31ad8d364f4aa1352d9b56cb2b6ab..c623edb5a728747a61c4103884949ed2e79fd3e4 100644
--- a/core/modules/field/tests/src/Functional/Rest/FieldStorageConfigResourceTestBase.php
+++ b/core/modules/field/tests/src/Functional/Rest/FieldStorageConfigResourceTestBase.php
@@ -73,6 +73,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/filter/tests/src/Functional/Rest/FilterFormatResourceTestBase.php b/core/modules/filter/tests/src/Functional/Rest/FilterFormatResourceTestBase.php
index 611dca559e0d37621960db99a5387320a555114e..95db23e65adce6f2627c65ee52afa4b4e3882c4d 100644
--- a/core/modules/filter/tests/src/Functional/Rest/FilterFormatResourceTestBase.php
+++ b/core/modules/filter/tests/src/Functional/Rest/FilterFormatResourceTestBase.php
@@ -83,6 +83,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
}
diff --git a/core/modules/image/tests/src/Functional/Rest/ImageStyleResourceTestBase.php b/core/modules/image/tests/src/Functional/Rest/ImageStyleResourceTestBase.php
index ec348d0a807f5e62464d664bf4105451289d81ec..fdad4a2e9b6cd0b23f574e8382003f498159a877 100644
--- a/core/modules/image/tests/src/Functional/Rest/ImageStyleResourceTestBase.php
+++ b/core/modules/image/tests/src/Functional/Rest/ImageStyleResourceTestBase.php
@@ -99,6 +99,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/jsonapi/tests/src/Functional/ActionTest.php b/core/modules/jsonapi/tests/src/Functional/ActionTest.php
index 1495e9aaca197d0b6f8b52fa8c3a0d46307ec5d7..ba0b527c4c1779f37ae594f2f160632228507f14 100644
--- a/core/modules/jsonapi/tests/src/Functional/ActionTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/ActionTest.php
@@ -112,6 +112,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @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 756db12545e16f2238d7e4b386c30383bcbc5413..083603090ae28006710c66325e4f3015535748f5 100644
--- a/core/modules/jsonapi/tests/src/Functional/BaseFieldOverrideTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/BaseFieldOverrideTest.php
@@ -123,6 +123,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/jsonapi/tests/src/Functional/BlockContentTypeTest.php b/core/modules/jsonapi/tests/src/Functional/BlockContentTypeTest.php
index 8db3069331faf41b5206fdfd1b29f37f503639b4..77aa86470ee5b15be7c527d62a4d6c39ec29f933 100644
--- a/core/modules/jsonapi/tests/src/Functional/BlockContentTypeTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/BlockContentTypeTest.php
@@ -103,6 +103,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @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 16c5213f3d4e3478ccabbdc66e4a80cf76a3f551..41911a900c3d831676d93660693f71c6ccd9f5e1 100644
--- a/core/modules/jsonapi/tests/src/Functional/BlockTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/BlockTest.php
@@ -136,6 +136,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @todo Update once https://www.drupal.org/node/2300677 is fixed.
+ return [];
}
/**
diff --git a/core/modules/jsonapi/tests/src/Functional/CommentTypeTest.php b/core/modules/jsonapi/tests/src/Functional/CommentTypeTest.php
index 1179c81122579af2ce335ad6cddc03901b5c9758..e3654b49e9d2906f94f0273e900134a01c57e2b6 100644
--- a/core/modules/jsonapi/tests/src/Functional/CommentTypeTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/CommentTypeTest.php
@@ -104,6 +104,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @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 c4dc049eef07c63939040850a33f97a4a4715840..df19a11b85f7759dde9cc8258e68789074b389d9 100644
--- a/core/modules/jsonapi/tests/src/Functional/ConfigTestTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/ConfigTestTest.php
@@ -116,6 +116,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @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 97dd34593bdc958ff41f153a4552cf52f20b3b0d..ad2c26177992cb7e0b31ab7bf6cc8aa94f501a1b 100644
--- a/core/modules/jsonapi/tests/src/Functional/ConfigurableLanguageTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/ConfigurableLanguageTest.php
@@ -105,6 +105,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @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 1e90a94fcb7362a2c8bde7f15e30530963232ddd..b91d4b7d5acb6c4378eae76a14ebe99cd74e42c2 100644
--- a/core/modules/jsonapi/tests/src/Functional/ContactFormTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/ContactFormTest.php
@@ -112,6 +112,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @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 e80d50fc5ff81bde16a0581f0e550889c9f046f9..608254907627c4d8120dd8944fbea07dc78a0f99 100644
--- a/core/modules/jsonapi/tests/src/Functional/ContentLanguageSettingsTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/ContentLanguageSettingsTest.php
@@ -116,6 +116,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @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 4381a24ffc357f455dc31b9077aa95a97873c0bd..42e673c526b7f4a87abcbfb6c562201561e4bf34 100644
--- a/core/modules/jsonapi/tests/src/Functional/DateFormatTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/DateFormatTest.php
@@ -108,6 +108,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @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 b1c4a8afff37e654dc33093f1594e5dd17485c11..8dc45e7e784ba37574ad0e07b0f390dbcbba3a24 100644
--- a/core/modules/jsonapi/tests/src/Functional/EditorTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/EditorTest.php
@@ -156,6 +156,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @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 2cbe0d412432c0416b2b301cc1804cb476badb38..b4162427f706eb5e4aa00749fd241a0b3ec97bcd 100644
--- a/core/modules/jsonapi/tests/src/Functional/EntityFormDisplayTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/EntityFormDisplayTest.php
@@ -173,6 +173,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @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 5e012df6221fb64ce40755cfa222920bdc5cc58b..91804ab36490a6f97fc5d05ad54ec9ab9f59802c 100644
--- a/core/modules/jsonapi/tests/src/Functional/EntityFormModeTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/EntityFormModeTest.php
@@ -106,6 +106,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
}
diff --git a/core/modules/jsonapi/tests/src/Functional/EntityViewDisplayTest.php b/core/modules/jsonapi/tests/src/Functional/EntityViewDisplayTest.php
index 89aade958ee1968c912eefa60e3727238af8efe7..6a96388a8f139ca2465a60ec29474e2a63585603 100644
--- a/core/modules/jsonapi/tests/src/Functional/EntityViewDisplayTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/EntityViewDisplayTest.php
@@ -127,6 +127,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @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 e33fc3a9d5831853778611ae491c47590afd5a19..27bf64d45c2101e59146a75bc266bc2adc9ca6ec 100644
--- a/core/modules/jsonapi/tests/src/Functional/EntityViewModeTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/EntityViewModeTest.php
@@ -106,6 +106,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @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 88a78698ba06d1b8c9e6f91ea91cc022a6337731..eb81f50912dcc1dd69247119fe9dd416d986511f 100644
--- a/core/modules/jsonapi/tests/src/Functional/FieldConfigTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/FieldConfigTest.php
@@ -133,6 +133,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @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 0a788410438b81f3bb4741415a01aaaf02095e57..d7f770803aecfb3627b5afc5a19cd3613dc7c326 100644
--- a/core/modules/jsonapi/tests/src/Functional/FieldStorageConfigTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/FieldStorageConfigTest.php
@@ -112,6 +112,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php b/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php
index 16ed1621a7591c3697acb960b3cc8a6838a3d79c..0dcfb3e68d4e9e1d15d599ea8a3401d70df83f41 100644
--- a/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php
@@ -5,6 +5,7 @@
use Drupal\Component\Render\PlainTextOutput;
use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Cache\CacheableMetadata;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\Core\Url;
use Drupal\entity_test\Entity\EntityTest;
@@ -775,6 +776,7 @@ protected function getExpectedUnauthorizedAccessMessage($method) {
case 'PATCH':
return "The current user is not permitted to upload a file for this field. The 'administer entity_test content' permission is required.";
}
+ return '';
}
/**
@@ -927,6 +929,7 @@ protected function assertResponseData(array $expected, ResponseInterface $respon
protected function getExpectedUnauthorizedAccessCacheability() {
// There is cacheability metadata to check as file uploads only allows POST
// requests, which will not return cacheable responses.
+ return new CacheableMetadata();
}
}
diff --git a/core/modules/jsonapi/tests/src/Functional/FilterFormatTest.php b/core/modules/jsonapi/tests/src/Functional/FilterFormatTest.php
index 66cb157c3c7e02f71b0fbf247dfa71e97019d325..c40e249d6880e4b30b741e6918646f4be1f05aef 100644
--- a/core/modules/jsonapi/tests/src/Functional/FilterFormatTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/FilterFormatTest.php
@@ -120,6 +120,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @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 4180a6ef21cbceba35e918f4a0b2b0bfe2fadd3b..1bafcf55bd76f114afbb799b79244608e31ff1b9 100644
--- a/core/modules/jsonapi/tests/src/Functional/ImageStyleTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/ImageStyleTest.php
@@ -130,6 +130,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
}
diff --git a/core/modules/jsonapi/tests/src/Functional/MediaTypeTest.php b/core/modules/jsonapi/tests/src/Functional/MediaTypeTest.php
index 5e02fa47fda971313201876cefd5caaed1ea7f39..cd26f4af3d0d0ce5779abade64f112d38186b4e3 100644
--- a/core/modules/jsonapi/tests/src/Functional/MediaTypeTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/MediaTypeTest.php
@@ -110,6 +110,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
}
diff --git a/core/modules/jsonapi/tests/src/Functional/MenuTest.php b/core/modules/jsonapi/tests/src/Functional/MenuTest.php
index fb22eecee5c0994623e9e31bb727370b395eb4b4..c367ab61795931e4c80c034c44eccb6b7f91b1b9 100644
--- a/core/modules/jsonapi/tests/src/Functional/MenuTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/MenuTest.php
@@ -106,6 +106,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
}
diff --git a/core/modules/jsonapi/tests/src/Functional/NodeTest.php b/core/modules/jsonapi/tests/src/Functional/NodeTest.php
index 6e3d99a76236453976edf4dd7316f1d986527a8f..ec45b2d0b4efab5e49688979a2279f2b309c5160 100644
--- a/core/modules/jsonapi/tests/src/Functional/NodeTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/NodeTest.php
@@ -265,6 +265,7 @@ protected function getExpectedUnauthorizedAccessMessage($method) {
case 'DELETE':
return "The 'access content' permission is required.";
}
+ return '';
}
/**
diff --git a/core/modules/jsonapi/tests/src/Functional/NodeTypeTest.php b/core/modules/jsonapi/tests/src/Functional/NodeTypeTest.php
index 42890aa208e360054d10e24e3fdf19f258b0a7b1..ea93316bbd12620f95455026760e05a7be2673da 100644
--- a/core/modules/jsonapi/tests/src/Functional/NodeTypeTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/NodeTypeTest.php
@@ -106,6 +106,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/jsonapi/tests/src/Functional/RdfMappingTest.php b/core/modules/jsonapi/tests/src/Functional/RdfMappingTest.php
index f820095ff26a35ae80acb329f5c2ebb70e618974..61e0f378ee1e5b6b80faf4ee4ab2b1fc470a1488 100644
--- a/core/modules/jsonapi/tests/src/Functional/RdfMappingTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/RdfMappingTest.php
@@ -148,6 +148,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
}
diff --git a/core/modules/jsonapi/tests/src/Functional/ResponsiveImageStyleTest.php b/core/modules/jsonapi/tests/src/Functional/ResponsiveImageStyleTest.php
index 86e4c38480202d18914650a2c27310cac1d74afc..32b14bd961127b7495ed915b6ef00588ccd3e418 100644
--- a/core/modules/jsonapi/tests/src/Functional/ResponsiveImageStyleTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/ResponsiveImageStyleTest.php
@@ -142,6 +142,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
}
diff --git a/core/modules/jsonapi/tests/src/Functional/RestJsonApiUnsupported.php b/core/modules/jsonapi/tests/src/Functional/RestJsonApiUnsupported.php
index d58bc02b2f70b304397fd0d95021b16014b60e6e..afabfeefb99109c03430c07ddba39764e9d19684 100644
--- a/core/modules/jsonapi/tests/src/Functional/RestJsonApiUnsupported.php
+++ b/core/modules/jsonapi/tests/src/Functional/RestJsonApiUnsupported.php
@@ -2,6 +2,7 @@
namespace Drupal\Tests\jsonapi\Functional;
+use Drupal\Core\Cache\CacheableMetadata;
use Drupal\Core\Url;
use Drupal\node\Entity\Node;
use Drupal\node\Entity\NodeType;
@@ -117,11 +118,15 @@ protected function assertNormalizationEdgeCases($method, Url $url, array $reques
/**
* {@inheritdoc}
*/
- protected function getExpectedUnauthorizedAccessMessage($method) {}
+ protected function getExpectedUnauthorizedAccessMessage($method) {
+ return '';
+ }
/**
* {@inheritdoc}
*/
- protected function getExpectedUnauthorizedAccessCacheability() {}
+ protected function getExpectedUnauthorizedAccessCacheability() {
+ return (new CacheableMetadata());
+ }
}
diff --git a/core/modules/jsonapi/tests/src/Functional/RestResourceConfigTest.php b/core/modules/jsonapi/tests/src/Functional/RestResourceConfigTest.php
index c900db5a903e7c7bab1e9fc9e28682f054cdcbe5..5dbeeff934ef5164c529318161c5cb88756e34cd 100644
--- a/core/modules/jsonapi/tests/src/Functional/RestResourceConfigTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/RestResourceConfigTest.php
@@ -126,6 +126,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @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 e82b53e9f4fd7010463230c98441cbb9758e128f..a5116132252bd508451105e9f1e11aacbfd35a5d 100644
--- a/core/modules/jsonapi/tests/src/Functional/RoleTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/RoleTest.php
@@ -101,6 +101,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @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 fc4ffaa49be435b0bc8f5c02b9f16a4042d068fe..ea1e4a00871c6d27adecded459cf05447cefa5c7 100644
--- a/core/modules/jsonapi/tests/src/Functional/SearchPageTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/SearchPageTest.php
@@ -119,6 +119,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @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 a5e080b8d2a980d4285662e329ca71e88bd65fdb..657cd1c3c9ee4b0f024b2bd1aad1d1e30ca51ba4 100644
--- a/core/modules/jsonapi/tests/src/Functional/ShortcutSetTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/ShortcutSetTest.php
@@ -123,6 +123,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
}
diff --git a/core/modules/jsonapi/tests/src/Functional/TourTest.php b/core/modules/jsonapi/tests/src/Functional/TourTest.php
index 9a3a1d24270ab40df0ff35854418c1a0e02a2dc3..138616099022124b765a62d33655a7e20389740a 100644
--- a/core/modules/jsonapi/tests/src/Functional/TourTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/TourTest.php
@@ -131,6 +131,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/jsonapi/tests/src/Functional/ViewTest.php b/core/modules/jsonapi/tests/src/Functional/ViewTest.php
index a94c3c7194e5e274d55496c83bbaabf675381add..a4c105aae9f266eeeeda3ce0dd59d608aa4d1607 100644
--- a/core/modules/jsonapi/tests/src/Functional/ViewTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/ViewTest.php
@@ -121,6 +121,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @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 49e548dcf1630ac0d0635920ad322678389b6641..cf86bb3e77b006fcd096a9d21ab3f03505488ffa 100644
--- a/core/modules/jsonapi/tests/src/Functional/VocabularyTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/VocabularyTest.php
@@ -100,6 +100,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @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 94cda92d29e155f6a662137bb7c6a4a7a224ce31..7a2a00a8e03dc0dd871b9634f657393145a4f625 100644
--- a/core/modules/jsonapi/tests/src/Functional/WorkflowTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/WorkflowTest.php
@@ -126,6 +126,7 @@ protected function getExpectedDocument() {
*/
protected function getPostDocument() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
}
diff --git a/core/modules/language/tests/src/Functional/Rest/ConfigurableLanguageResourceTestBase.php b/core/modules/language/tests/src/Functional/Rest/ConfigurableLanguageResourceTestBase.php
index 933202a12225eb069846e6bbc73f1e2de7fc520b..02a976c7406acf8d4b781f228b260ca8de068f23 100644
--- a/core/modules/language/tests/src/Functional/Rest/ConfigurableLanguageResourceTestBase.php
+++ b/core/modules/language/tests/src/Functional/Rest/ConfigurableLanguageResourceTestBase.php
@@ -73,6 +73,7 @@ protected function getExpectedCacheContexts() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/language/tests/src/Functional/Rest/ContentLanguageSettingsResourceTestBase.php b/core/modules/language/tests/src/Functional/Rest/ContentLanguageSettingsResourceTestBase.php
index 3eafb0be0744ba6af947f830e684bfff2cbe7334..30683f0a14a635f632e70d4acac428c250ab216c 100644
--- a/core/modules/language/tests/src/Functional/Rest/ContentLanguageSettingsResourceTestBase.php
+++ b/core/modules/language/tests/src/Functional/Rest/ContentLanguageSettingsResourceTestBase.php
@@ -77,6 +77,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/layout_builder/tests/modules/layout_builder_test/src/Plugin/SectionStorage/TestStateBasedSectionStorage.php b/core/modules/layout_builder/tests/modules/layout_builder_test/src/Plugin/SectionStorage/TestStateBasedSectionStorage.php
index d51cdc72c09d88664825a7d853c300d364da3aec..378975db6b30b8952ca4665de12bc7f4f163b6a0 100644
--- a/core/modules/layout_builder/tests/modules/layout_builder_test/src/Plugin/SectionStorage/TestStateBasedSectionStorage.php
+++ b/core/modules/layout_builder/tests/modules/layout_builder_test/src/Plugin/SectionStorage/TestStateBasedSectionStorage.php
@@ -43,56 +43,77 @@ public function isApplicable(RefinableCacheableDependencyInterface $cacheability
/**
* {@inheritdoc}
*/
- public function access($operation, AccountInterface $account = NULL, $return_as_object = FALSE) {}
+ public function access($operation, AccountInterface $account = NULL, $return_as_object = FALSE) {
+ throw new \RuntimeException(__METHOD__ . " not implemented for " . __CLASS__);
+ }
/**
* {@inheritdoc}
*/
- protected function getSectionList() {}
+ protected function getSectionList() {
+ throw new \RuntimeException(__METHOD__ . " not implemented for " . __CLASS__);
+ }
/**
* {@inheritdoc}
*/
- public function getStorageId() {}
+ public function getStorageId() {
+ throw new \RuntimeException(__METHOD__ . " not implemented for " . __CLASS__);
+ }
/**
* {@inheritdoc}
*/
- public function getSectionListFromId($id) {}
+ public function getSectionListFromId($id) {
+ throw new \RuntimeException(__METHOD__ . " not implemented for " . __CLASS__);
+ }
/**
* {@inheritdoc}
*/
- public function buildRoutes(RouteCollection $collection) {}
+ public function buildRoutes(RouteCollection $collection) {
+ }
/**
* {@inheritdoc}
*/
- public function getRedirectUrl() {}
+ public function getRedirectUrl() {
+ throw new \RuntimeException(__METHOD__ . " not implemented for " . __CLASS__);
+ }
/**
* {@inheritdoc}
*/
- public function getLayoutBuilderUrl($rel = 'view') {}
+ public function getLayoutBuilderUrl($rel = 'view') {
+ throw new \RuntimeException(__METHOD__ . " not implemented for " . __CLASS__);
+ }
/**
* {@inheritdoc}
*/
- public function extractIdFromRoute($value, $definition, $name, array $defaults) {}
+ public function extractIdFromRoute($value, $definition, $name, array $defaults) {
+ throw new \RuntimeException(__METHOD__ . " not implemented for " . __CLASS__);
+ }
/**
* {@inheritdoc}
*/
- public function deriveContextsFromRoute($value, $definition, $name, array $defaults) {}
+ public function deriveContextsFromRoute($value, $definition, $name, array $defaults) {
+ throw new \RuntimeException(__METHOD__ . " not implemented for " . __CLASS__);
+ }
/**
* {@inheritdoc}
*/
- public function label() {}
+ public function label() {
+ throw new \RuntimeException(__METHOD__ . " not implemented for " . __CLASS__);
+ }
/**
* {@inheritdoc}
*/
- public function save() {}
+ public function save() {
+ throw new \RuntimeException(__METHOD__ . " not implemented for " . __CLASS__);
+ }
}
diff --git a/core/modules/layout_builder/tests/src/Functional/Rest/LayoutRestTestBase.php b/core/modules/layout_builder/tests/src/Functional/Rest/LayoutRestTestBase.php
index 377084483683673c66459c2b98c00191976f1a37..071dc05065f42343faa1aec46f0c081192d47c61 100644
--- a/core/modules/layout_builder/tests/src/Functional/Rest/LayoutRestTestBase.php
+++ b/core/modules/layout_builder/tests/src/Functional/Rest/LayoutRestTestBase.php
@@ -3,6 +3,7 @@
namespace Drupal\Tests\layout_builder\Functional\Rest;
use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Cache\CacheableMetadata;
use Drupal\Core\Url;
use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
use Drupal\Tests\rest\Functional\ResourceTestBase;
@@ -131,7 +132,9 @@ protected function assertAuthenticationEdgeCases($method, Url $url, array $reque
/**
* {@inheritdoc}
*/
- protected function getExpectedUnauthorizedAccessCacheability() {}
+ protected function getExpectedUnauthorizedAccessCacheability() {
+ return (new CacheableMetadata());
+ }
/**
* Gets the decoded contents.
diff --git a/core/modules/media/tests/src/Functional/Rest/MediaTypeResourceTestBase.php b/core/modules/media/tests/src/Functional/Rest/MediaTypeResourceTestBase.php
index c935962fb5cf2691ed911cf56919676568a00c3e..c74909e6f1abed340ae728a4a515fc10db47e62f 100644
--- a/core/modules/media/tests/src/Functional/Rest/MediaTypeResourceTestBase.php
+++ b/core/modules/media/tests/src/Functional/Rest/MediaTypeResourceTestBase.php
@@ -73,6 +73,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
}
diff --git a/core/modules/migrate/tests/src/Kernel/SqlBaseTest.php b/core/modules/migrate/tests/src/Kernel/SqlBaseTest.php
index 71eaef1a4e66a32d725ec4f4e00a1b7598c0133e..1661aece762f180d818d9e5db951f6ce2ae687ef 100644
--- a/core/modules/migrate/tests/src/Kernel/SqlBaseTest.php
+++ b/core/modules/migrate/tests/src/Kernel/SqlBaseTest.php
@@ -225,12 +225,16 @@ public function setConfiguration($config) {
/**
* {@inheritdoc}
*/
- public function getIds() {}
+ public function getIds() {
+ return [];
+ }
/**
* {@inheritdoc}
*/
- public function fields() {}
+ public function fields() {
+ throw new \RuntimeException(__METHOD__ . " not implemented for " . __CLASS__);
+ }
/**
* {@inheritdoc}
diff --git a/core/modules/migrate/tests/src/Unit/SqlBaseTest.php b/core/modules/migrate/tests/src/Unit/SqlBaseTest.php
index aa843c4ea2890fa492f6ebd0c5813dacf9bf3630..749d9937f04b54dbd89405f10affd47d1018268e 100644
--- a/core/modules/migrate/tests/src/Unit/SqlBaseTest.php
+++ b/core/modules/migrate/tests/src/Unit/SqlBaseTest.php
@@ -220,12 +220,16 @@ public function setIds($ids) {
/**
* {@inheritdoc}
*/
- public function fields() {}
+ public function fields() {
+ throw new \RuntimeException(__METHOD__ . " not implemented for " . __CLASS__);
+ }
/**
* {@inheritdoc}
*/
- public function query() {}
+ public function query() {
+ throw new \RuntimeException(__METHOD__ . " not implemented for " . __CLASS__);
+ }
/**
* {@inheritdoc}
diff --git a/core/modules/migrate/tests/src/Unit/TestMigrateExecutable.php b/core/modules/migrate/tests/src/Unit/TestMigrateExecutable.php
index 312472d7341c575118e7a413ebc8c241d1fa3cfc..ecd56ca9c8448a7854628c04fe1b60fd8b6703f0 100644
--- a/core/modules/migrate/tests/src/Unit/TestMigrateExecutable.php
+++ b/core/modules/migrate/tests/src/Unit/TestMigrateExecutable.php
@@ -32,6 +32,7 @@ class TestMigrateExecutable extends MigrateExecutable {
*/
public function setStringTranslation(TranslationInterface $string_translation) {
$this->stringTranslation = $string_translation;
+ return $this;
}
/**
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/DrupalSqlBaseTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/DrupalSqlBaseTest.php
index 8792b10223bc33e8037366c2e4f3370c9ba200a4..a4ed2628eea5bbfe3cf6eac0828fbdc0b4b7c4e8 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/DrupalSqlBaseTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/DrupalSqlBaseTest.php
@@ -184,6 +184,7 @@ public function fields() {
* {@inheritdoc}
*/
public function query() {
+ throw new \RuntimeException(__METHOD__ . " not implemented for " . __CLASS__);
}
/**
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 7e9412f25d9bd812344e306dd28243512a2ce5ae..e03d0f7f39e7f9483819f48b0c65572a4029365f 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
@@ -44,24 +44,28 @@ protected function getSourceBasePath() {
* {@inheritdoc}
*/
protected function getEntityCounts() {
+ return [];
}
/**
* {@inheritdoc}
*/
protected function getEntityCountsIncremental() {
+ return [];
}
/**
* {@inheritdoc}
*/
protected function getAvailablePaths() {
+ return [];
}
/**
* {@inheritdoc}
*/
protected function getMissingPaths() {
+ return [];
}
/**
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 6cea7ef5a44ec844cd62bd580160e3cd601f7801..723659894640365752a13588f592d5f494097e5e 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
@@ -51,24 +51,28 @@ protected function getSourceBasePath() {
* {@inheritdoc}
*/
protected function getEntityCounts() {
+ return [];
}
/**
* {@inheritdoc}
*/
protected function getEntityCountsIncremental() {
+ return [];
}
/**
* {@inheritdoc}
*/
protected function getAvailablePaths() {
+ return [];
}
/**
* {@inheritdoc}
*/
protected function getMissingPaths() {
+ 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 5f8652e8d20c847592e2ac0ee9a35994058035f2..6ccb1f97ff0cebc558d29b0b35a8a9374ff4b835 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
@@ -287,30 +287,35 @@ public function getManagedFiles() {
* {@inheritdoc}
*/
protected function getEntityCounts() {
+ return [];
}
/**
* {@inheritdoc}
*/
protected function getEntityCountsIncremental() {
+ return [];
}
/**
* {@inheritdoc}
*/
protected function getAvailablePaths() {
+ return [];
}
/**
* {@inheritdoc}
*/
protected function getMissingPaths() {
+ return [];
}
/**
* {@inheritdoc}
*/
protected function getSourceBasePath() {
+ 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 961e24dcfc3d5cee445e92c743a3d0ff03f3bb1c..892e4df6c29bfa809ff2f336e6dc9ad0e8d0dad7 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
@@ -44,24 +44,28 @@ protected function getSourceBasePath() {
* {@inheritdoc}
*/
protected function getEntityCounts() {
+ return [];
}
/**
* {@inheritdoc}
*/
protected function getEntityCountsIncremental() {
+ return [];
}
/**
* {@inheritdoc}
*/
protected function getAvailablePaths() {
+ return [];
}
/**
* {@inheritdoc}
*/
protected function getMissingPaths() {
+ return [];
}
/**
diff --git a/core/modules/node/tests/src/Functional/Rest/NodeTypeResourceTestBase.php b/core/modules/node/tests/src/Functional/Rest/NodeTypeResourceTestBase.php
index b65a2b0433a82ee2ee1c191791f8dc6c0937d06b..9b3e21cc86281b90c87139076feb55f4467f9526 100644
--- a/core/modules/node/tests/src/Functional/Rest/NodeTypeResourceTestBase.php
+++ b/core/modules/node/tests/src/Functional/Rest/NodeTypeResourceTestBase.php
@@ -74,6 +74,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/rdf/tests/src/Functional/Rest/RdfMappingResourceTestBase.php b/core/modules/rdf/tests/src/Functional/Rest/RdfMappingResourceTestBase.php
index 45d3b3ef402988e1ca184e256dfb7c0649a04e73..3a7e26bd341a7e0e22e06253cf96cbf3c7635b72 100644
--- a/core/modules/rdf/tests/src/Functional/Rest/RdfMappingResourceTestBase.php
+++ b/core/modules/rdf/tests/src/Functional/Rest/RdfMappingResourceTestBase.php
@@ -111,6 +111,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/responsive_image/tests/src/Functional/Rest/ResponsiveImageStyleResourceTestBase.php b/core/modules/responsive_image/tests/src/Functional/Rest/ResponsiveImageStyleResourceTestBase.php
index 1e115fd8bc1406f074c9f8ee4d6bf26574e6d9e9..7b0c7f0752a0e061316218dfb04e1e1d4b6d626d 100644
--- a/core/modules/responsive_image/tests/src/Functional/Rest/ResponsiveImageStyleResourceTestBase.php
+++ b/core/modules/responsive_image/tests/src/Functional/Rest/ResponsiveImageStyleResourceTestBase.php
@@ -117,6 +117,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/rest/tests/src/Functional/FileUploadResourceTestBase.php b/core/modules/rest/tests/src/Functional/FileUploadResourceTestBase.php
index c5381d5cdcdb20490647ce33dfa6d99ebbddf283..d95f4cd97cc9956e9a7dc5722f3c5e509ea98ff6 100644
--- a/core/modules/rest/tests/src/Functional/FileUploadResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/FileUploadResourceTestBase.php
@@ -4,6 +4,7 @@
use Drupal\Component\Render\PlainTextOutput;
use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Cache\CacheableMetadata;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\Core\Url;
use Drupal\entity_test\Entity\EntityTest;
@@ -819,6 +820,7 @@ protected function assertResponseData(array $expected, ResponseInterface $respon
protected function getExpectedUnauthorizedAccessCacheability() {
// There is cacheability metadata to check as file uploads only allows POST
// requests, which will not return cacheable responses.
+ return new CacheableMetadata();
}
}
diff --git a/core/modules/rest/tests/src/Functional/ResourceTestBase.php b/core/modules/rest/tests/src/Functional/ResourceTestBase.php
index ce509970d5458bb2e4890915b4748d785608d26f..575bf976dcba46f1ab3ebb4911a2821bc4ce51a1 100644
--- a/core/modules/rest/tests/src/Functional/ResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/ResourceTestBase.php
@@ -501,6 +501,8 @@ protected static function recursiveKSort(array &$array) {
static::recursiveKSort($value);
}
}
+
+ return $array;
}
}
diff --git a/core/modules/rest/tests/src/Functional/Rest/RestResourceConfigResourceTestBase.php b/core/modules/rest/tests/src/Functional/Rest/RestResourceConfigResourceTestBase.php
index 45e94739509e4d25cf7a6962af9880ced740d75f..f63cd257da207f9217afb5d2e2c57b871fed5133 100644
--- a/core/modules/rest/tests/src/Functional/Rest/RestResourceConfigResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/Rest/RestResourceConfigResourceTestBase.php
@@ -89,6 +89,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/search/tests/src/Functional/Rest/SearchPageResourceTestBase.php b/core/modules/search/tests/src/Functional/Rest/SearchPageResourceTestBase.php
index b9f00855a7268f27b20d2a06344e9d55fb1b4078..5555e0211d049cfa8baecca3d0d924002a1a0532 100644
--- a/core/modules/search/tests/src/Functional/Rest/SearchPageResourceTestBase.php
+++ b/core/modules/search/tests/src/Functional/Rest/SearchPageResourceTestBase.php
@@ -80,6 +80,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/shortcut/tests/src/Functional/Rest/ShortcutSetResourceTestBase.php b/core/modules/shortcut/tests/src/Functional/Rest/ShortcutSetResourceTestBase.php
index e019984eb3ed2b845c690c79e8bff20b2c1e36f2..5efce2740a0de224bf693c1cb1ec43c7e2c6d834 100644
--- a/core/modules/shortcut/tests/src/Functional/Rest/ShortcutSetResourceTestBase.php
+++ b/core/modules/shortcut/tests/src/Functional/Rest/ShortcutSetResourceTestBase.php
@@ -83,6 +83,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestBundleResourceTestBase.php b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestBundleResourceTestBase.php
index 26ed9224573d31fa0f3801e9afdb5bc4a308a358..87ff2589940df7aa8e335cbce93240d822a10e65 100644
--- a/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestBundleResourceTestBase.php
+++ b/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestBundleResourceTestBase.php
@@ -68,6 +68,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
}
diff --git a/core/modules/system/tests/src/Functional/Form/StubForm.php b/core/modules/system/tests/src/Functional/Form/StubForm.php
index 9e20c365ba83f4d8cae376d31a21fdd47cadf5cc..4c30673d825f87caa513154114c8892fe8b1d069 100644
--- a/core/modules/system/tests/src/Functional/Form/StubForm.php
+++ b/core/modules/system/tests/src/Functional/Form/StubForm.php
@@ -43,7 +43,7 @@ public function __construct($form_id, $form) {
* {@inheritdoc}
*/
public function getFormId() {
- $this->formId;
+ return $this->formId;
}
/**
diff --git a/core/modules/system/tests/src/Functional/Rest/ActionResourceTestBase.php b/core/modules/system/tests/src/Functional/Rest/ActionResourceTestBase.php
index 36a3222a96619b96ffff6aaf0634b764736494a5..b53be1b7b4f632c7152f6b478de661caa3ca0fc8 100644
--- a/core/modules/system/tests/src/Functional/Rest/ActionResourceTestBase.php
+++ b/core/modules/system/tests/src/Functional/Rest/ActionResourceTestBase.php
@@ -75,6 +75,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
}
diff --git a/core/modules/system/tests/src/Functional/Rest/MenuResourceTestBase.php b/core/modules/system/tests/src/Functional/Rest/MenuResourceTestBase.php
index d378086e865b90e1ffd2a1b79d21355500e833fc..a30f442648d01ffd536f5142be6dbe18622f17a6 100644
--- a/core/modules/system/tests/src/Functional/Rest/MenuResourceTestBase.php
+++ b/core/modules/system/tests/src/Functional/Rest/MenuResourceTestBase.php
@@ -64,6 +64,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php b/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
index 6a6081f94c1c14f5a3d3338513da51106a16fc26..d80787e5dedb904a7124e4db264a4ab3335fa59b 100644
--- a/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
+++ b/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
@@ -415,6 +415,7 @@ class TestPathBasedBreadcrumbBuilder extends PathBasedBreadcrumbBuilder {
public function setStringTranslation(TranslationInterface $string_translation) {
$this->stringTranslation = $string_translation;
+ return $this;
}
public function setLinkGenerator(LinkGeneratorInterface $link_generator) {
diff --git a/core/modules/taxonomy/tests/src/Functional/Rest/VocabularyResourceTestBase.php b/core/modules/taxonomy/tests/src/Functional/Rest/VocabularyResourceTestBase.php
index 0693daf166a47f078cd2e33a429d191b33854058..de8e7a580407058ff3c7ec3121d2c71e50e05b13 100644
--- a/core/modules/taxonomy/tests/src/Functional/Rest/VocabularyResourceTestBase.php
+++ b/core/modules/taxonomy/tests/src/Functional/Rest/VocabularyResourceTestBase.php
@@ -63,6 +63,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/tour/tests/src/Functional/Rest/TourResourceTestBase.php b/core/modules/tour/tests/src/Functional/Rest/TourResourceTestBase.php
index 40bfced3dd6c8d3b81c97f861a333e08212fb478..813505a304ed5983d034a90868ff2ac2a038429f 100644
--- a/core/modules/tour/tests/src/Functional/Rest/TourResourceTestBase.php
+++ b/core/modules/tour/tests/src/Functional/Rest/TourResourceTestBase.php
@@ -94,6 +94,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/modules/user/tests/src/Functional/Rest/RoleResourceTestBase.php b/core/modules/user/tests/src/Functional/Rest/RoleResourceTestBase.php
index bb090a103e85fd3c7c1f8ce06c1382e4e005318b..0c12f123ce555c961907134e2a3834c49db23f12 100644
--- a/core/modules/user/tests/src/Functional/Rest/RoleResourceTestBase.php
+++ b/core/modules/user/tests/src/Functional/Rest/RoleResourceTestBase.php
@@ -64,6 +64,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
}
diff --git a/core/modules/user/tests/src/Functional/UserRegistrationRestTest.php b/core/modules/user/tests/src/Functional/UserRegistrationRestTest.php
index c09aa289ee8430018173485580f8aae91b923613..401afc3a3a1799859b2f15328a468a50b0fbb25c 100644
--- a/core/modules/user/tests/src/Functional/UserRegistrationRestTest.php
+++ b/core/modules/user/tests/src/Functional/UserRegistrationRestTest.php
@@ -2,6 +2,7 @@
namespace Drupal\Tests\user\Functional;
+use Drupal\Core\Cache\CacheableMetadata;
use Drupal\Core\Test\AssertMailTrait;
use Drupal\Core\Url;
use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
@@ -248,11 +249,15 @@ protected function assertNormalizationEdgeCases($method, Url $url, array $reques
/**
* {@inheritdoc}
*/
- protected function getExpectedUnauthorizedAccessMessage($method) {}
+ protected function getExpectedUnauthorizedAccessMessage($method) {
+ return '';
+ }
/**
* {@inheritdoc}
*/
- protected function getExpectedUnauthorizedAccessCacheability() {}
+ protected function getExpectedUnauthorizedAccessCacheability() {
+ return new CacheableMetadata();
+ }
}
diff --git a/core/modules/views/src/Tests/ViewResultAssertionTrait.php b/core/modules/views/src/Tests/ViewResultAssertionTrait.php
index 09a373d406ef0457f08a9c33e37fd8f7633518c7..a98c18e647173aefcd50bd2182367687873a964e 100644
--- a/core/modules/views/src/Tests/ViewResultAssertionTrait.php
+++ b/core/modules/views/src/Tests/ViewResultAssertionTrait.php
@@ -27,12 +27,9 @@ trait ViewResultAssertionTrait {
* @param string $message
* (optional) A custom message to display with the assertion. Defaults to
* 'Identical result set.'
- *
- * @return bool
- * TRUE if the assertion succeeded, or FALSE otherwise.
*/
- protected function assertIdenticalResultset($view, $expected_result, $column_map = [], $message = NULL) {
- return $this->assertIdenticalResultsetHelper($view, $expected_result, $column_map, 'assertIdentical', $message);
+ protected function assertIdenticalResultset($view, $expected_result, $column_map = [], $message = NULL): void {
+ $this->assertIdenticalResultsetHelper($view, $expected_result, $column_map, 'assertIdentical', $message);
}
/**
@@ -50,12 +47,9 @@ protected function assertIdenticalResultset($view, $expected_result, $column_map
* @param string $message
* (optional) A custom message to display with the assertion. Defaults to
* 'Non-identical result set.'
- *
- * @return bool
- * TRUE if the assertion succeeded, or FALSE otherwise.
*/
- protected function assertNotIdenticalResultset($view, $expected_result, $column_map = [], $message = NULL) {
- return $this->assertIdenticalResultsetHelper($view, $expected_result, $column_map, 'assertNotIdentical', $message);
+ protected function assertNotIdenticalResultset($view, $expected_result, $column_map = [], $message = NULL): void {
+ $this->assertIdenticalResultsetHelper($view, $expected_result, $column_map, 'assertNotIdentical', $message);
}
/**
@@ -76,11 +70,8 @@ protected function assertNotIdenticalResultset($view, $expected_result, $column_
* 'assertNotIdentical').
* @param string $message
* (optional) The message to display with the assertion.
- *
- * @return bool
- * TRUE if the assertion succeeded.
*/
- protected function assertIdenticalResultsetHelper($view, $expected_result, $column_map, $assert_method, $message = NULL) {
+ protected function assertIdenticalResultsetHelper($view, $expected_result, $column_map, $assert_method, $message = NULL): void {
// Convert $view->result to an array of arrays.
$result = [];
foreach ($view->result as $key => $value) {
@@ -142,11 +133,11 @@ protected function assertIdenticalResultsetHelper($view, $expected_result, $colu
switch ($assert_method) {
case 'assertIdentical':
$this->assertSame($expected_result, $result, $message);
- return TRUE;
+ break;
case 'assertNotIdentical':
$this->assertNotSame($expected_result, $result, $message);
- return TRUE;
+ break;
}
}
diff --git a/core/modules/views/tests/src/Functional/Rest/ViewResourceTestBase.php b/core/modules/views/tests/src/Functional/Rest/ViewResourceTestBase.php
index 6c5c5d9376a91d611ac73eee9da5437b75396879..27ae6226901842f9e4a78bd9e7ee13f315f07723 100644
--- a/core/modules/views/tests/src/Functional/Rest/ViewResourceTestBase.php
+++ b/core/modules/views/tests/src/Functional/Rest/ViewResourceTestBase.php
@@ -84,6 +84,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
}
diff --git a/core/modules/workflows/tests/src/Functional/Rest/WorkflowResourceTestBase.php b/core/modules/workflows/tests/src/Functional/Rest/WorkflowResourceTestBase.php
index a9317f1e1f8f58fb21100e9a4bc3a727e082a6ed..a192a419d91c3aa6a50279a9b4c05681e6901258 100644
--- a/core/modules/workflows/tests/src/Functional/Rest/WorkflowResourceTestBase.php
+++ b/core/modules/workflows/tests/src/Functional/Rest/WorkflowResourceTestBase.php
@@ -102,6 +102,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
}
diff --git a/core/tests/Drupal/FunctionalTests/Rest/BaseFieldOverrideResourceTestBase.php b/core/tests/Drupal/FunctionalTests/Rest/BaseFieldOverrideResourceTestBase.php
index 8e729b90fc8061c80b66c91b1fb33740a625232a..4bd2f5aa1b6c3f618671b84dc6c6bdfd78047b8c 100644
--- a/core/tests/Drupal/FunctionalTests/Rest/BaseFieldOverrideResourceTestBase.php
+++ b/core/tests/Drupal/FunctionalTests/Rest/BaseFieldOverrideResourceTestBase.php
@@ -86,6 +86,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/tests/Drupal/FunctionalTests/Rest/DateFormatResourceTestBase.php b/core/tests/Drupal/FunctionalTests/Rest/DateFormatResourceTestBase.php
index 73fb238d2f21fc5e22fdfe72b526e4a98ac6658b..0ae1c2fb3c418d0d45a337231a18963b614b3fee 100644
--- a/core/tests/Drupal/FunctionalTests/Rest/DateFormatResourceTestBase.php
+++ b/core/tests/Drupal/FunctionalTests/Rest/DateFormatResourceTestBase.php
@@ -71,6 +71,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
}
diff --git a/core/tests/Drupal/FunctionalTests/Rest/EntityFormDisplayResourceTestBase.php b/core/tests/Drupal/FunctionalTests/Rest/EntityFormDisplayResourceTestBase.php
index 44f2e6ab22a18d281c587cff4a61d48f9c0fbf34..65c925320e23eb0e8709b7ac04c7e403e6226cac 100644
--- a/core/tests/Drupal/FunctionalTests/Rest/EntityFormDisplayResourceTestBase.php
+++ b/core/tests/Drupal/FunctionalTests/Rest/EntityFormDisplayResourceTestBase.php
@@ -137,6 +137,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/tests/Drupal/FunctionalTests/Rest/EntityFormModeResourceTestBase.php b/core/tests/Drupal/FunctionalTests/Rest/EntityFormModeResourceTestBase.php
index cb367bcde733dcc1b9983e5a0f58fdf3034bd926..93d734a7d8e10437eb253fdd0795409c7513e777 100644
--- a/core/tests/Drupal/FunctionalTests/Rest/EntityFormModeResourceTestBase.php
+++ b/core/tests/Drupal/FunctionalTests/Rest/EntityFormModeResourceTestBase.php
@@ -69,6 +69,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
}
diff --git a/core/tests/Drupal/FunctionalTests/Rest/EntityViewDisplayResourceTestBase.php b/core/tests/Drupal/FunctionalTests/Rest/EntityViewDisplayResourceTestBase.php
index cea9928f5344aa28a83f1fa944f45b521ac13e77..51e1f2a8eba96c4ecfe594dc4201b59eccf2b22d 100644
--- a/core/tests/Drupal/FunctionalTests/Rest/EntityViewDisplayResourceTestBase.php
+++ b/core/tests/Drupal/FunctionalTests/Rest/EntityViewDisplayResourceTestBase.php
@@ -95,6 +95,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
/**
diff --git a/core/tests/Drupal/FunctionalTests/Rest/EntityViewModeResourceTestBase.php b/core/tests/Drupal/FunctionalTests/Rest/EntityViewModeResourceTestBase.php
index 35777e02c74b96569f260a8f3cbdc9d19970d044..86876e5b6f4e0b906e88bc9649a8d6a34aeec859 100644
--- a/core/tests/Drupal/FunctionalTests/Rest/EntityViewModeResourceTestBase.php
+++ b/core/tests/Drupal/FunctionalTests/Rest/EntityViewModeResourceTestBase.php
@@ -69,6 +69,7 @@ protected function getExpectedNormalizedEntity() {
*/
protected function getNormalizedPostEntity() {
// @todo Update in https://www.drupal.org/node/2300677.
+ return [];
}
}
diff --git a/core/tests/Drupal/KernelTests/AssertContentTrait.php b/core/tests/Drupal/KernelTests/AssertContentTrait.php
index f8a99a0ce477d75369be6dd680f0403e7c42c7ce..16270477835968188a628b12dfff080920b7bd54 100644
--- a/core/tests/Drupal/KernelTests/AssertContentTrait.php
+++ b/core/tests/Drupal/KernelTests/AssertContentTrait.php
@@ -429,11 +429,8 @@ protected function assertNoLinkByHrefInMainRegion($href, $message = '', $group =
* in test output. Use 'Debug' to indicate this is debugging output. Do not
* translate this string. Defaults to 'Other'; most tests do not override
* this default.
- *
- * @return bool
- * TRUE on pass, FALSE on fail.
*/
- protected function assertRaw($raw, $message = '', $group = 'Other') {
+ protected function assertRaw($raw, $message = '', $group = 'Other'): void {
if (!$message) {
$message = 'Raw "' . Html::escape($raw) . '" found';
}
@@ -457,11 +454,8 @@ protected function assertRaw($raw, $message = '', $group = 'Other') {
* in test output. Use 'Debug' to indicate this is debugging output. Do not
* translate this string. Defaults to 'Other'; most tests do not override
* this default.
- *
- * @return bool
- * TRUE on pass, FALSE on fail.
*/
- protected function assertNoRaw($raw, $message = '', $group = 'Other') {
+ protected function assertNoRaw($raw, $message = '', $group = 'Other'): void {
if (!$message) {
$message = 'Raw "' . Html::escape($raw) . '" not found';
}
@@ -485,11 +479,8 @@ protected function assertNoRaw($raw, $message = '', $group = 'Other') {
* in test output. Use 'Debug' to indicate this is debugging output. Do not
* translate this string. Defaults to 'Other'; most tests do not override
* this default.
- *
- * @return bool
- * TRUE on pass, FALSE on fail.
*/
- protected function assertEscaped($raw, $message = '', $group = 'Other') {
+ protected function assertEscaped($raw, $message = '', $group = 'Other'): void {
if (!$message) {
$message = 'Escaped "' . Html::escape($raw) . '" found';
}
@@ -514,11 +505,8 @@ protected function assertEscaped($raw, $message = '', $group = 'Other') {
* in test output. Use 'Debug' to indicate this is debugging output. Do not
* translate this string. Defaults to 'Other'; most tests do not override
* this default.
- *
- * @return bool
- * TRUE on pass, FALSE on fail.
*/
- protected function assertNoEscaped($raw, $message = '', $group = 'Other') {
+ protected function assertNoEscaped($raw, $message = '', $group = 'Other'): void {
if (!$message) {
$message = 'Escaped "' . Html::escape($raw) . '" not found';
}
@@ -544,13 +532,10 @@ protected function assertNoEscaped($raw, $message = '', $group = 'Other') {
* translate this string. Defaults to 'Other'; most tests do not override
* this default.
*
- * @return bool
- * TRUE on pass, FALSE on fail.
- *
* @see \Drupal\simpletest\AssertContentTrait::assertRaw()
*/
- protected function assertText($text, $message = '', $group = 'Other') {
- return $this->assertTextHelper($text, $message, $group, FALSE);
+ protected function assertText($text, $message = '', $group = 'Other'): void {
+ $this->assertTextHelper($text, $message, $group, FALSE);
}
/**
@@ -572,13 +557,10 @@ protected function assertText($text, $message = '', $group = 'Other') {
* translate this string. Defaults to 'Other'; most tests do not override
* this default.
*
- * @return bool
- * TRUE on pass, FALSE on fail.
- *
* @see \Drupal\simpletest\AssertContentTrait::assertNoRaw()
*/
- protected function assertNoText($text, $message = '', $group = 'Other') {
- return $this->assertTextHelper($text, $message, $group, TRUE);
+ protected function assertNoText($text, $message = '', $group = 'Other'): void {
+ $this->assertTextHelper($text, $message, $group, TRUE);
}
/**
@@ -601,11 +583,8 @@ protected function assertNoText($text, $message = '', $group = 'Other') {
* @param bool $not_exists
* (optional) TRUE if this text should not exist, FALSE if it should.
* Defaults to TRUE.
- *
- * @return bool
- * TRUE on pass, FALSE on fail.
*/
- protected function assertTextHelper($text, $message = '', $group = 'Other', $not_exists = TRUE) {
+ protected function assertTextHelper($text, $message = '', $group = 'Other', $not_exists = TRUE): void {
if (!$message) {
$message = !$not_exists ? new FormattableMarkup('"@text" found', ['@text' => $text]) : new FormattableMarkup('"@text" not found', ['@text' => $text]);
}
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
index 4b66ca8c394838c3f1912babb59b73ae794bf6f9..829d2dfa9a0011b67c275e2eead9f87c0a532760 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
@@ -515,12 +515,14 @@ class BasicForm extends FormBase {
* {@inheritdoc}
*/
public function getFormId() {
+ return '';
}
/**
* {@inheritdoc}
*/
public function buildForm(array $form, FormStateInterface $form_state, EntityInterface $entity_test = NULL) {
+ return [];
}
/**
@@ -540,12 +542,14 @@ class BasicFormNoUpcasting extends FormBase {
* {@inheritdoc}
*/
public function getFormId() {
+ return '';
}
/**
* {@inheritdoc}
*/
public function buildForm(array $form, FormStateInterface $form_state, $entity_test = NULL) {
+ return [];
}
/**
@@ -562,12 +566,14 @@ class BasicFormNoContainerInjectionInterface implements FormInterface {
* {@inheritdoc}
*/
public function getFormId() {
+ return '';
}
/**
* {@inheritdoc}
*/
public function buildForm(array $form, FormStateInterface $form_state, EntityInterface $entity_test = NULL) {
+ return [];
}
/**
diff --git a/core/tests/Drupal/Tests/Core/Entity/FieldDefinitionTest.php b/core/tests/Drupal/Tests/Core/Entity/FieldDefinitionTest.php
index 7f1e27289de0df02e240f4439fa126b2f920de8f..a857c6f25348a18bda27ef915b264a49d80fdc44 100644
--- a/core/tests/Drupal/Tests/Core/Entity/FieldDefinitionTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/FieldDefinitionTest.php
@@ -385,6 +385,7 @@ protected function initializeFieldUsingFactory($factory_name) {
$definition->setFieldStorageDefinition($this->storageDefinition);
return $definition;
}
+ throw new \InvalidArgumentException("Invalid factory name '$factory_name' passed to " . __METHOD__);
}
}
diff --git a/core/tests/Drupal/Tests/Core/Form/FormStateTest.php b/core/tests/Drupal/Tests/Core/Form/FormStateTest.php
index 9e8d552e0c3e913657fdfcd369655b4ef37db0ba..e553d887cd95a11760aa3d7d04ab96caf38cc333 100644
--- a/core/tests/Drupal/Tests/Core/Form/FormStateTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/FormStateTest.php
@@ -441,7 +441,9 @@ public function getFormId() {
return 'test_form';
}
- public function buildForm(array $form, FormStateInterface $form_state) {}
+ public function buildForm(array $form, FormStateInterface $form_state) {
+ return [];
+ }
public function validateForm(array &$form, FormStateInterface $form_state) {}
diff --git a/core/tests/Drupal/Tests/Core/Image/ImageTest.php b/core/tests/Drupal/Tests/Core/Image/ImageTest.php
index b2d9636129234bd1077dae2863588f9eeed42ef6..e0a15e2a8260e010a87debf97520b432852c0db7 100644
--- a/core/tests/Drupal/Tests/Core/Image/ImageTest.php
+++ b/core/tests/Drupal/Tests/Core/Image/ImageTest.php
@@ -116,6 +116,8 @@ protected function getTestImage($load_expected = TRUE, array $stubs = []) {
}
$this->image = new Image($this->toolkit, $this->source);
+
+ return $this->image;
}
/**
@@ -140,6 +142,8 @@ protected function getTestImageForOperation($class_name) {
->will($this->returnValue($this->toolkitOperation));
$this->image = new Image($this->toolkit, $this->source);
+
+ return $this->image;
}
/**
diff --git a/core/tests/Drupal/Tests/Core/Plugin/LazyPluginCollectionTestBase.php b/core/tests/Drupal/Tests/Core/Plugin/LazyPluginCollectionTestBase.php
index 45132288d7ccaa78d13c11c0a099178336035e8a..1cfdcd01e3eac67cd4ad9f89ad3446bafd7d2253 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/LazyPluginCollectionTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/LazyPluginCollectionTestBase.php
@@ -86,9 +86,7 @@ protected function setupPluginCollection(InvocationOrder $create_count = NULL) {
* The mock plugin object.
*/
public function returnPluginMap($plugin_id) {
- if (isset($this->pluginInstances[$plugin_id])) {
- return $this->pluginInstances[$plugin_id];
- }
+ return $this->pluginInstances[$plugin_id];
}
/**