From 0f6101a7cb7916acda2411acb9f4562daf6f63b2 Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Fri, 23 Dec 2022 03:37:42 -0600
Subject: [PATCH] Issue #3180227 by danflanagan8, robertom, xjm, Lendude,
quietone: Notice: Trying to access array offset on value of type null in
Drupal\views\Plugin\views\display\EntityReference->query()
---
.../Plugin/views/display/EntityReference.php | 13 ++++++++++++-
.../Plugin/DisplayEntityReferenceTest.php | 17 +++++++++++++++++
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/core/modules/views/src/Plugin/views/display/EntityReference.php b/core/modules/views/src/Plugin/views/display/EntityReference.php
index b592ee06ad35..d81ff34db21c 100644
--- a/core/modules/views/src/Plugin/views/display/EntityReference.php
+++ b/core/modules/views/src/Plugin/views/display/EntityReference.php
@@ -160,7 +160,18 @@ public function query() {
$id_table = $this->view->storage->get('base_table');
$this->id_field_alias = $this->view->query->addField($id_table, $id_field);
- $options = $this->getOption('entity_reference_options');
+ $options = $this->getOption('entity_reference_options') ?? [];
+ // The entity_reference_options are typically set during a call to
+ // Drupal\views\Plugin\EntityReferenceSelection\ViewsSelection::initializeView().
+ // If any entity_reference_options are not yet set, we apply the same
+ // default values that would typically be added by that method.
+ $default_options = [
+ 'match' => NULL,
+ 'match_operator' => 'CONTAINS',
+ 'limit' => 0,
+ 'ids' => NULL,
+ ];
+ $options += $default_options;
// Restrict the autocomplete options based on what's been typed already.
if (isset($options['match'])) {
diff --git a/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php b/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php
index ebacfc5c2794..f6639dce1ac2 100644
--- a/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php
@@ -275,6 +275,23 @@ public function testEntityReferenceDisplay() {
$view->setDisplay('entity_reference_1');
$render = $view->display_handler->render();
$this->assertSame([], $render, 'Render returned empty array');
+
+ // Execute the View without setting the 'entity_reference_options'.
+ // This is equivalent to using the following as entity_reference_options.
+ // @code
+ // $options = [
+ // 'match' => NULL,
+ // 'match_operator' => 'CONTAINS',
+ // 'limit' => 0,
+ // 'ids' => NULL,
+ // ];
+ // @endcode
+ // Assert that this view returns a row for each test entity.
+ $view->destroy();
+ $view = Views::getView('test_display_entity_reference');
+ $view->setDisplay('entity_reference_1');
+ $this->executeView($view);
+ $this->assertCount(13, $view->result, 'Search returned thirteen rows');
}
}
--
GitLab