From 273bf8e1be72841d8bad6a5bee527f2d57f9b5ce Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Thu, 24 Oct 2019 14:42:29 +0100
Subject: [PATCH] Issue #3087518 by kim.pepper: Remove references to
queryAddPage() in comments and deprecation notices
---
core/includes/pager.inc | 4 ++--
core/lib/Drupal/Core/Render/Element/Pager.php | 10 +++++-----
.../tests/src/Kernel/Pager/PagerDeprecationTest.php | 2 +-
.../Drupal/KernelTests/Core/Pager/PagerManagerTest.php | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/core/includes/pager.inc b/core/includes/pager.inc
index c18507331aa2..922b5d33f9c2 100644
--- a/core/includes/pager.inc
+++ b/core/includes/pager.inc
@@ -335,13 +335,13 @@ function template_preprocess_pager(&$variables) {
* The altered $query parameter array.
*
* @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
- * \Drupal\Core\Pager\PagerManagerInterface->queryAddPage() instead.
+ * \Drupal\Core\Pager\PagerManagerInterface::getUpdatedParameters() instead.
*
* @see https://www.drupal.org/node/2779457
* @see \Drupal\Core\Pager\PagerManagerInterface::getUpdatedParameters()
*/
function pager_query_add_page(array $query, $element, $index) {
- @trigger_error(__FUNCTION__ . ' is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use \Drupal\Core\Pager\PagerManagerInterface->queryAddPage() instead. See https://www.drupal.org/node/2779457', E_USER_DEPRECATED);
+ @trigger_error(__FUNCTION__ . ' is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use \Drupal\Core\Pager\PagerManagerInterface->getUpdatedParameters() instead. See https://www.drupal.org/node/2779457', E_USER_DEPRECATED);
/* @var $pager_manager \Drupal\Core\Pager\PagerManagerInterface */
$pager_manager = \Drupal::service('pager.manager');
return $pager_manager->getUpdatedParameters($query, $element, $index);
diff --git a/core/lib/Drupal/Core/Render/Element/Pager.php b/core/lib/Drupal/Core/Render/Element/Pager.php
index 948fd7789f09..25bc5002d3ed 100644
--- a/core/lib/Drupal/Core/Render/Element/Pager.php
+++ b/core/lib/Drupal/Core/Render/Element/Pager.php
@@ -69,11 +69,11 @@ public function getInfo() {
public static function preRenderPager(array $pager) {
// Note: the default pager theme process function
// template_preprocess_pager() also calls
- // \Drupal\Core\Pager\PagerManagerInterface::queryAddPage(), which maintains
- // the existing query string. Therefore template_preprocess_pager() adds the
- // 'url.query_args' cache context, which causes the more specific cache
- // context below to be optimized away. In other themes, however, that may
- // not be the case.
+ // \Drupal\Core\Pager\PagerManagerInterface::getUpdatedParameters(), which
+ // maintains the existing query string. Therefore
+ // template_preprocess_pager() adds the 'url.query_args' cache context,
+ // which causes the more specific cache context below to be optimized away.
+ // In other themes, however, that may not be the case.
$pager['#cache']['contexts'][] = 'url.query_args.pagers:' . $pager['#element'];
return $pager;
}
diff --git a/core/modules/system/tests/src/Kernel/Pager/PagerDeprecationTest.php b/core/modules/system/tests/src/Kernel/Pager/PagerDeprecationTest.php
index 37ea40fc870d..245c965b1883 100644
--- a/core/modules/system/tests/src/Kernel/Pager/PagerDeprecationTest.php
+++ b/core/modules/system/tests/src/Kernel/Pager/PagerDeprecationTest.php
@@ -34,7 +34,7 @@ public function testGetQueryParameters() {
}
/**
- * @expectedDeprecation pager_query_add_page is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use \Drupal\Core\Pager\PagerManagerInterface->queryAddPage() instead. See https://www.drupal.org/node/2779457
+ * @expectedDeprecation pager_query_add_page is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use \Drupal\Core\Pager\PagerManagerInterface->getUpdatedParameters() instead. See https://www.drupal.org/node/2779457
*/
public function testQueryAddPage() {
$this->assertArrayHasKey('page', pager_query_add_page([], 1, 1));
diff --git a/core/tests/Drupal/KernelTests/Core/Pager/PagerManagerTest.php b/core/tests/Drupal/KernelTests/Core/Pager/PagerManagerTest.php
index 10428a079f0e..169793a45906 100644
--- a/core/tests/Drupal/KernelTests/Core/Pager/PagerManagerTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Pager/PagerManagerTest.php
@@ -38,7 +38,7 @@ public function testDefaultInitializeGlobals() {
/**
* @covers ::getUpdatedParameters
*/
- public function testQueryAddPage() {
+ public function testGetUpdatedParameters() {
$element = 2;
$index = 5;
$test_parameters = [
--
GitLab