From d080d12db31a6d8ed743a9cea976176cda1b70a5 Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Fri, 3 Jan 2025 12:31:44 +1000
Subject: [PATCH] Issue #3473228 by mstrelan, smustgrave, larowlan: Fix more
var and param docs identified by phpstan
---
core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php | 2 +-
core/lib/Drupal/Core/Entity/EntityViewBuilder.php | 2 +-
core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php | 2 +-
.../comment/tests/src/Functional/CommentTestBase.php | 6 +++---
.../datetime/tests/src/Functional/DateTestBase.php | 2 +-
.../jsonapi/src/JsonApiResource/ResourceIdentifier.php | 2 +-
.../tests/src/Functional/JsonApiRegressionTest.php | 4 ++--
.../layout_builder/src/LayoutBuilderHighlightTrait.php | 6 +++---
.../tests/src/Kernel/Migrate/MigrateMenuLinkTestTrait.php | 4 ++--
.../Kernel/Migrate/d6/MigrateMenuLinkLocalizedTest.php | 2 +-
core/modules/menu_ui/tests/src/Traits/MenuUiTrait.php | 2 +-
core/modules/taxonomy/tests/src/Functional/RssTest.php | 2 +-
.../tests/src/Functional/TaxonomyTranslationTestTrait.php | 2 +-
.../taxonomy/tests/src/Functional/TermIndexTest.php | 4 ++--
core/modules/taxonomy/tests/src/Functional/TermTest.php | 2 +-
.../tests/src/Functional/Views/TaxonomyIndexTidUiTest.php | 8 ++++----
.../tests/src/Functional/Views/TaxonomyTermViewTest.php | 2 +-
.../taxonomy/tests/src/Kernel/TokenReplaceTest.php | 2 +-
.../update/tests/src/Functional/UpdateTestTrait.php | 2 +-
.../views/tests/src/Functional/DefaultViewsTest.php | 2 +-
.../src/Functional/Plugin/DisplayEntityReferenceTest.php | 2 +-
.../views/tests/src/Functional/Wizard/TaggedWithTest.php | 2 +-
.../FunctionalJavascriptTests/TableDrag/TableDragTest.php | 2 +-
.../Core/Entity/EntityQueryRelationshipTest.php | 2 +-
24 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php b/core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php
index 9d5ff5a3e4ec..1ebd77fdafc7 100644
--- a/core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php
+++ b/core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php
@@ -41,7 +41,7 @@ trait SchemaCheckTrait {
* path segment can use a wildcard (`*`) to indicate any value for that
* segment should be accepted for this property path to be ignored.
*
- * @var \string[][]
+ * @var array<string, array<string, array<int, string>>>
*/
protected static array $ignoredPropertyPaths = [
'search.page.*' => [
diff --git a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
index dc617f650bc5..a35f9be9ad23 100644
--- a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
+++ b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
@@ -494,7 +494,7 @@ public function viewFieldItem(FieldItemInterface $item, $display = []) {
/**
* Gets an EntityViewDisplay for rendering an individual field.
*
- * @param \Drupal\Core\Entity\EntityInterface $entity
+ * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
* The entity.
* @param string $field_name
* The field name.
diff --git a/core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php b/core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php
index 396227525506..c6327af7e3d4 100644
--- a/core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php
+++ b/core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php
@@ -57,7 +57,7 @@ public function getUri() {
*
* @param string $uri
* A string containing the URI to the file to open.
- * @param int $mode
+ * @param string $mode
* The file mode, only strict readonly modes are supported.
* @param int $options
* A bit mask of STREAM_USE_PATH and STREAM_REPORT_ERRORS.
diff --git a/core/modules/comment/tests/src/Functional/CommentTestBase.php b/core/modules/comment/tests/src/Functional/CommentTestBase.php
index f2c94ac2c864..cb6bfec05fd7 100644
--- a/core/modules/comment/tests/src/Functional/CommentTestBase.php
+++ b/core/modules/comment/tests/src/Functional/CommentTestBase.php
@@ -108,7 +108,7 @@ protected function setUp(): void {
* Comment body.
* @param string $subject
* Comment subject.
- * @param string $contact
+ * @param null|true|array $contact
* Set to NULL for no contact info, TRUE to ignore success checking, and
* array of values to set contact info.
* @param string $field_name
@@ -327,9 +327,9 @@ protected function setCommentsPerPage($number, $field_name = 'comment') {
*
* @param string $name
* Name of variable.
- * @param string $value
+ * @param string|int $value
* Value of variable.
- * @param string $message
+ * @param string|\Stringable $message
* Status message to display.
* @param string $field_name
* (optional) Field name through which the comment should be posted.
diff --git a/core/modules/datetime/tests/src/Functional/DateTestBase.php b/core/modules/datetime/tests/src/Functional/DateTestBase.php
index e58f8582a253..6b128598a944 100644
--- a/core/modules/datetime/tests/src/Functional/DateTestBase.php
+++ b/core/modules/datetime/tests/src/Functional/DateTestBase.php
@@ -156,7 +156,7 @@ protected function createField() {
/**
* Renders an entity_test and sets the output in the internal browser.
*
- * @param int $id
+ * @param string|int $id
* The entity_test ID to render.
* @param string $view_mode
* (optional) The view mode to use for rendering. Defaults to 'full'.
diff --git a/core/modules/jsonapi/src/JsonApiResource/ResourceIdentifier.php b/core/modules/jsonapi/src/JsonApiResource/ResourceIdentifier.php
index d220c5becbc6..e77f671ca449 100644
--- a/core/modules/jsonapi/src/JsonApiResource/ResourceIdentifier.php
+++ b/core/modules/jsonapi/src/JsonApiResource/ResourceIdentifier.php
@@ -123,7 +123,7 @@ public function getId() {
/**
* Whether this ResourceIdentifier has an arity.
*
- * @return int
+ * @return bool
* TRUE if the ResourceIdentifier has an arity, FALSE otherwise.
*/
public function hasArity() {
diff --git a/core/modules/jsonapi/tests/src/Functional/JsonApiRegressionTest.php b/core/modules/jsonapi/tests/src/Functional/JsonApiRegressionTest.php
index ba7bd148946d..04d1f706ae09 100644
--- a/core/modules/jsonapi/tests/src/Functional/JsonApiRegressionTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/JsonApiRegressionTest.php
@@ -342,7 +342,7 @@ public function testThatRoutesAreRebuiltAfterDataModelChangesFromIssue2984886():
$response = $this->request('GET', Url::fromUri('internal:/jsonapi/node/dog'), $request_options);
$this->assertSame(200, $response->getStatusCode());
- $this->createEntityReferenceField('node', 'dog', 'field_test', NULL, 'node');
+ $this->createEntityReferenceField('node', 'dog', 'field_test', '', 'node');
\Drupal::service('router.builder')->rebuildIfNeeded();
$dog = Node::create(['type' => 'dog', 'title' => 'retriever']);
@@ -351,7 +351,7 @@ public function testThatRoutesAreRebuiltAfterDataModelChangesFromIssue2984886():
$response = $this->request('GET', Url::fromUri('internal:/jsonapi/node/dog/' . $dog->uuid() . '/field_test'), $request_options);
$this->assertSame(200, $response->getStatusCode());
- $this->createEntityReferenceField('node', 'cat', 'field_test', NULL, 'node');
+ $this->createEntityReferenceField('node', 'cat', 'field_test', '', 'node');
\Drupal::service('router.builder')->rebuildIfNeeded();
$cat = Node::create(['type' => 'cat', 'title' => 'E. Napoleon']);
diff --git a/core/modules/layout_builder/src/LayoutBuilderHighlightTrait.php b/core/modules/layout_builder/src/LayoutBuilderHighlightTrait.php
index 5c3e53c7b554..af0b2b7760f2 100644
--- a/core/modules/layout_builder/src/LayoutBuilderHighlightTrait.php
+++ b/core/modules/layout_builder/src/LayoutBuilderHighlightTrait.php
@@ -10,7 +10,7 @@ trait LayoutBuilderHighlightTrait {
/**
* Provides the ID used to highlight the active Layout Builder UI element.
*
- * @param string $delta
+ * @param int $delta
* The section the block is in.
* @param string $region
* The section region in which the block is placed.
@@ -38,7 +38,7 @@ protected function blockUpdateHighlightId($uuid) {
/**
* Provides the ID used to highlight the active Layout Builder UI element.
*
- * @param string $delta
+ * @param int $delta
* The location of the section.
*
* @return string
@@ -51,7 +51,7 @@ protected function sectionAddHighlightId($delta) {
/**
* Provides the ID used to highlight the active Layout Builder UI element.
*
- * @param string $delta
+ * @param int $delta
* The location of the section.
*
* @return string
diff --git a/core/modules/menu_link_content/tests/src/Kernel/Migrate/MigrateMenuLinkTestTrait.php b/core/modules/menu_link_content/tests/src/Kernel/Migrate/MigrateMenuLinkTestTrait.php
index a7ca5e86c912..32a0747979ee 100644
--- a/core/modules/menu_link_content/tests/src/Kernel/Migrate/MigrateMenuLinkTestTrait.php
+++ b/core/modules/menu_link_content/tests/src/Kernel/Migrate/MigrateMenuLinkTestTrait.php
@@ -15,7 +15,7 @@ trait MigrateMenuLinkTestTrait {
/**
* Asserts various aspects of a menu link entity.
*
- * @param string $id
+ * @param int $id
* The link ID.
* @param string $langcode
* The language of the menu link.
@@ -23,7 +23,7 @@ trait MigrateMenuLinkTestTrait {
* The expected title of the link.
* @param string $menu
* The expected ID of the menu to which the link will belong.
- * @param string $description
+ * @param string|null $description
* The link's expected description.
* @param bool $enabled
* Whether the link is enabled.
diff --git a/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkLocalizedTest.php b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkLocalizedTest.php
index 69726693722d..5e83ab710f70 100644
--- a/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkLocalizedTest.php
+++ b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkLocalizedTest.php
@@ -51,7 +51,7 @@ protected function setUp(): void {
*/
public function testMenuLinkLocalized(): void {
// A localized menu link.
- $this->assertEntity('463', 'fr', 'fr - Test 1', 'secondary-links', 'fr - Test menu link 1', TRUE, FALSE, [
+ $this->assertEntity(463, 'fr', 'fr - Test 1', 'secondary-links', 'fr - Test menu link 1', TRUE, FALSE, [
'attributes' => ['title' => 'fr - Test menu link 1'],
'langcode' => 'fr',
'alter' => TRUE,
diff --git a/core/modules/menu_ui/tests/src/Traits/MenuUiTrait.php b/core/modules/menu_ui/tests/src/Traits/MenuUiTrait.php
index 6c41d7bf79fd..7c2a56d56aaa 100644
--- a/core/modules/menu_ui/tests/src/Traits/MenuUiTrait.php
+++ b/core/modules/menu_ui/tests/src/Traits/MenuUiTrait.php
@@ -14,7 +14,7 @@ trait MenuUiTrait {
*
* @param array $expected_item
* Array containing properties to check.
- * @param int $menu_plugin_id
+ * @param string $menu_plugin_id
* Menu item id.
*/
protected function assertMenuLink(array $expected_item, $menu_plugin_id) {
diff --git a/core/modules/taxonomy/tests/src/Functional/RssTest.php b/core/modules/taxonomy/tests/src/Functional/RssTest.php
index 0f9b5fc63401..5b3a30664cb3 100644
--- a/core/modules/taxonomy/tests/src/Functional/RssTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/RssTest.php
@@ -59,7 +59,7 @@ protected function setUp(): void {
],
'auto_create' => TRUE,
];
- $this->createEntityReferenceField('node', 'article', $this->fieldName, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
+ $this->createEntityReferenceField('node', 'article', $this->fieldName, '', 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
/** @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface $display_repository */
$display_repository = \Drupal::service('entity_display.repository');
diff --git a/core/modules/taxonomy/tests/src/Functional/TaxonomyTranslationTestTrait.php b/core/modules/taxonomy/tests/src/Functional/TaxonomyTranslationTestTrait.php
index 69e9023e1701..459d5d883654 100644
--- a/core/modules/taxonomy/tests/src/Functional/TaxonomyTranslationTestTrait.php
+++ b/core/modules/taxonomy/tests/src/Functional/TaxonomyTranslationTestTrait.php
@@ -79,7 +79,7 @@ protected function setUpTermReferenceField() {
],
'auto_create' => TRUE,
];
- $this->createEntityReferenceField('node', 'article', $this->termFieldName, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
+ $this->createEntityReferenceField('node', 'article', $this->termFieldName, '', 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
$field_storage = FieldStorageConfig::loadByName('node', $this->termFieldName);
$field_storage->setTranslatable(FALSE);
$field_storage->save();
diff --git a/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php b/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php
index 421483533db8..13d6e10853ac 100644
--- a/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php
@@ -68,7 +68,7 @@ protected function setUp(): void {
],
'auto_create' => TRUE,
];
- $this->createEntityReferenceField('node', 'article', $this->fieldName1, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
+ $this->createEntityReferenceField('node', 'article', $this->fieldName1, '', 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
/** @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface $display_repository */
$display_repository = \Drupal::service('entity_display.repository');
@@ -84,7 +84,7 @@ protected function setUp(): void {
->save();
$this->fieldName2 = $this->randomMachineName();
- $this->createEntityReferenceField('node', 'article', $this->fieldName2, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
+ $this->createEntityReferenceField('node', 'article', $this->fieldName2, '', 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
/** @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface $display_repository */
$display_repository = \Drupal::service('entity_display.repository');
diff --git a/core/modules/taxonomy/tests/src/Functional/TermTest.php b/core/modules/taxonomy/tests/src/Functional/TermTest.php
index 9ea1ef323a38..3d4d1b88f781 100644
--- a/core/modules/taxonomy/tests/src/Functional/TermTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TermTest.php
@@ -70,7 +70,7 @@ protected function setUp(): void {
],
'auto_create' => TRUE,
];
- $this->createEntityReferenceField('node', 'article', $field_name, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
+ $this->createEntityReferenceField('node', 'article', $field_name, '', 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
$this->field = FieldConfig::loadByName('node', 'article', $field_name);
/** @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface $display_repository */
diff --git a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
index ff94a08ac1ba..3fc85872fb27 100644
--- a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
@@ -164,7 +164,7 @@ public function testExposedFilter(): void {
// Create the tag field itself.
$field_name = 'taxonomy_tags';
- $this->createEntityReferenceField('node', $node_type->id(), $field_name, NULL, 'taxonomy_term');
+ $this->createEntityReferenceField('node', $node_type->id(), $field_name, '', 'taxonomy_term');
// Create 4 nodes: 1 without a term, 2 with the same term, and 1 with a
// different term.
@@ -294,7 +294,7 @@ public function testExposedGroupedFilter(): void {
// Create a content type with a taxonomy field.
$this->drupalCreateContentType(['type' => 'article']);
$field_name = 'field_views_testing_tags';
- $this->createEntityReferenceField('node', 'article', $field_name, NULL, 'taxonomy_term');
+ $this->createEntityReferenceField('node', 'article', $field_name, '', 'taxonomy_term');
$nodes = [];
for ($i = 0; $i < 3; $i++) {
@@ -378,11 +378,11 @@ public function testFilterGrouping(): void {
// Create the tag field itself.
$field_name = 'taxonomy_tags';
- $this->createEntityReferenceField('node', $node_type->id(), $field_name, NULL, 'taxonomy_term');
+ $this->createEntityReferenceField('node', $node_type->id(), $field_name, '', 'taxonomy_term');
// Create the other tag field itself.
$field_name2 = 'taxonomy_other_tags';
- $this->createEntityReferenceField('node', $node_type->id(), $field_name2, NULL, 'taxonomy_term');
+ $this->createEntityReferenceField('node', $node_type->id(), $field_name2, '', 'taxonomy_term');
// Create 5 nodes: 1 node without any tagging, 2 nodes tagged with 1 term,
// 1 node with 2 tagged terms and 1 with other tags term.
diff --git a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php
index 2a5c65d864af..0059646f023d 100644
--- a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php
@@ -65,7 +65,7 @@ protected function setUp($import_test_views = TRUE, $modules = []): void {
],
'auto_create' => TRUE,
];
- $this->createEntityReferenceField('node', 'article', $this->fieldName1, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
+ $this->createEntityReferenceField('node', 'article', $this->fieldName1, '', 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
/** @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface $display_repository */
$display_repository = \Drupal::service('entity_display.repository');
diff --git a/core/modules/taxonomy/tests/src/Kernel/TokenReplaceTest.php b/core/modules/taxonomy/tests/src/Kernel/TokenReplaceTest.php
index bd98cc2a44b2..ff6654753cf1 100644
--- a/core/modules/taxonomy/tests/src/Kernel/TokenReplaceTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/TokenReplaceTest.php
@@ -78,7 +78,7 @@ protected function setUp(): void {
],
'auto_create' => TRUE,
];
- $this->createEntityReferenceField('node', 'article', $this->fieldName, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
+ $this->createEntityReferenceField('node', 'article', $this->fieldName, '', 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
/** @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface $display_repository */
$display_repository = \Drupal::service('entity_display.repository');
diff --git a/core/modules/update/tests/src/Functional/UpdateTestTrait.php b/core/modules/update/tests/src/Functional/UpdateTestTrait.php
index 0caf99efe93d..2e9187e489f3 100644
--- a/core/modules/update/tests/src/Functional/UpdateTestTrait.php
+++ b/core/modules/update/tests/src/Functional/UpdateTestTrait.php
@@ -18,7 +18,7 @@ trait UpdateTestTrait {
/**
* Sets information about installed extensions.
*
- * @param string[][] $installed_extensions
+ * @param array<string, array<string, string|bool>> $installed_extensions
* An array containing mocked installed extensions info. Keys are
* extension names, values are arrays containing key-value pairs that would
* be present in extensions' *.info.yml files.
diff --git a/core/modules/views/tests/src/Functional/DefaultViewsTest.php b/core/modules/views/tests/src/Functional/DefaultViewsTest.php
index 72f8370735ba..26a327c6ccff 100644
--- a/core/modules/views/tests/src/Functional/DefaultViewsTest.php
+++ b/core/modules/views/tests/src/Functional/DefaultViewsTest.php
@@ -86,7 +86,7 @@ protected function setUp($import_test_views = TRUE, $modules = []): void {
],
'auto_create' => TRUE,
];
- $this->createEntityReferenceField('node', 'page', $field_name, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
+ $this->createEntityReferenceField('node', 'page', $field_name, '', 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
// Create a time in the past for the archive.
$time = \Drupal::time()->getRequestTime() - 3600;
diff --git a/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php b/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php
index 693f325b7211..b454256243bd 100644
--- a/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php
@@ -93,7 +93,7 @@ protected function setUp($import_test_views = TRUE, $modules = ['views_test_conf
// Add an entity reference field to reference the same base table.
$this->entityRefFieldName = 'field_test_entity_ref_entity_ref';
- $this->createEntityReferenceField('entity_test', 'entity_test', $this->entityRefFieldName, NULL, 'entity_test');
+ $this->createEntityReferenceField('entity_test', 'entity_test', $this->entityRefFieldName, '', 'entity_test');
// Create some entities to search. Add a common string to the name and
// the text field in two entities so we can test that we can search in both.
diff --git a/core/modules/views/tests/src/Functional/Wizard/TaggedWithTest.php b/core/modules/views/tests/src/Functional/Wizard/TaggedWithTest.php
index 47c58a95bfdd..a67ae3a46661 100644
--- a/core/modules/views/tests/src/Functional/Wizard/TaggedWithTest.php
+++ b/core/modules/views/tests/src/Functional/Wizard/TaggedWithTest.php
@@ -98,7 +98,7 @@ protected function setUp($import_test_views = TRUE, $modules = []): void {
],
'auto_create' => TRUE,
];
- $this->createEntityReferenceField('node', $this->nodeTypeWithTags->id(), $this->tagFieldName, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
+ $this->createEntityReferenceField('node', $this->nodeTypeWithTags->id(), $this->tagFieldName, '', 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
/** @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface $display_repository */
$display_repository = \Drupal::service('entity_display.repository');
diff --git a/core/tests/Drupal/FunctionalJavascriptTests/TableDrag/TableDragTest.php b/core/tests/Drupal/FunctionalJavascriptTests/TableDrag/TableDragTest.php
index dec8abda4038..a9350a1976e6 100644
--- a/core/tests/Drupal/FunctionalJavascriptTests/TableDrag/TableDragTest.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/TableDrag/TableDragTest.php
@@ -548,7 +548,7 @@ protected function assertTableRow(NodeElement $row, string $id, int $weight, str
/**
* Finds a row in the test table by the row ID.
*
- * @param string $id
+ * @param string|int $id
* The ID of the row.
* @param string $table_id
* The ID of the parent table. Defaults to 'tabledrag-test-table'.
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php
index ce1725c5a4b3..07e29ba3e9fa 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php
@@ -84,7 +84,7 @@ protected function setUp(): void {
],
'auto_create' => TRUE,
];
- $this->createEntityReferenceField('entity_test', 'test_bundle', $this->fieldName, NULL, 'taxonomy_term', 'default', $handler_settings);
+ $this->createEntityReferenceField('entity_test', 'test_bundle', $this->fieldName, '', 'taxonomy_term', 'default', $handler_settings);
// Create two terms and also two accounts.
for ($i = 0; $i <= 1; $i++) {
--
GitLab