diff --git a/core/modules/views/src/Plugin/views/query/Sql.php b/core/modules/views/src/Plugin/views/query/Sql.php index 6f8ab15..3e2cbbc 100644 --- a/core/modules/views/src/Plugin/views/query/Sql.php +++ b/core/modules/views/src/Plugin/views/query/Sql.php @@ -5,7 +5,6 @@ use Drupal\Component\Utility\NestedArray; use Drupal\Core\Cache\Cache; use Drupal\Core\Database\Database; -use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\display\DisplayPluginBase; @@ -1554,7 +1553,7 @@ public function loadEntities(&$results) { $flat_ids = iterator_to_array(new \RecursiveIteratorIterator(new \RecursiveArrayIterator($ids)), FALSE); $entities = $entity_storage->loadMultiple(array_unique($flat_ids)); - $results = $this->assignEntitiesToResult($ids, $entities, $results); + $results = $this->_assignEntitiesToResult($ids, $entities, $results); } // Now load all revisions. @@ -1570,7 +1569,7 @@ public function loadEntities(&$results) { } } - $results = $this->assignEntitiesToResult($revision_ids, $entities, $results); + $results = $this->_assignEntitiesToResult($revision_ids, $entities, $results); } } @@ -1591,7 +1590,7 @@ public function loadEntities(&$results) { * @return \Drupal\views\ResultRow[] * The changed views results. */ - protected function assignEntitiesToResult($ids, array $entities, array $results) { + protected function _assignEntitiesToResult($ids, array $entities, array $results) { foreach ($ids as $index => $relationships) { foreach ($relationships as $relationship_id => $id) { if (isset($entities[$id])) { diff --git a/core/modules/views/tests/src/Unit/Plugin/query/SqlTest.php b/core/modules/views/tests/src/Unit/Plugin/query/SqlTest.php index 4958846..19d2fac 100644 --- a/core/modules/views/tests/src/Unit/Plugin/query/SqlTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/query/SqlTest.php @@ -233,7 +233,7 @@ protected function setupEntityTypes($entities_by_type = [], $entity_revisions_by /** * @covers ::loadEntities - * @covers ::assignEntitiesToResult + * @covers ::_assignEntitiesToResult */ public function testLoadEntitiesWithEmptyResult() { $view = $this->prophesize('Drupal\views\ViewExecutable')->reveal(); @@ -255,7 +255,7 @@ public function testLoadEntitiesWithEmptyResult() { /** * @covers ::loadEntities - * @covers ::assignEntitiesToResult + * @covers ::_assignEntitiesToResult */ public function testLoadEntitiesWithNoRelationshipAndNoRevision() { $view = $this->prophesize('Drupal\views\ViewExecutable')->reveal();