Support from Acquia helps fund testing for Drupal Acquia logo

Comments

ricky.middaugh’s picture

Assigned: Unassigned » ricky.middaugh

I'll take this one.

ricky.middaugh’s picture

Status: Active » Needs review
FileSize
4.23 KB

Issue is ready for review.

All instances of set_current_page() have been updated to the proper convention.

ricky.middaugh’s picture

Oops... included the wrong patch. Here's the new one.

Status: Needs review » Needs work

The last submitted patch, core-rename-set-current-page-2003292-3.patch, failed testing.

heddn’s picture

Failing tests. Please test and re-roll.

elvis2’s picture

Status: Needs work » Needs review

Failing is due to an error on the test server side... Re-testing...

elvis2’s picture

oenie’s picture

Status: Needs review » Needs work
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.phpundefined
@@ -114,7 +114,7 @@ function get_current_page() {
+  function setCurrentPage($number = NULL) {

+++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.phpundefined
@@ -249,7 +249,7 @@ public function query() {
+  function setCurrentPage($number = NULL) {

Add public access modifier in front of the function(s) to adhere to the new OOP standards.

All occurences seem to have been replaced.

elvis2’s picture

Status: Needs work » Needs review
FileSize
3.55 KB

Re-rolled.

heddn’s picture

Status: Needs review » Reviewed & tested by the community

Looks good now.

alexpott’s picture

Status: Reviewed & tested by the community » Needs work

Needs a re-roll

curl https://drupal.org/files/2003292-9-rename-set_current_page.patch | git a
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  3633  100  3633    0     0   3838      0 --:--:-- --:--:-- --:--:--  4693
error: patch failed: core/modules/views/lib/Drupal/views/ViewExecutable.php:727
error: core/modules/views/lib/Drupal/views/ViewExecutable.php: patch does not apply
elvis2’s picture

Status: Needs work » Needs review
FileSize
3.55 KB

Re-rolled based on most recent pull or 8.x branch.

dawehner’s picture

Status: Needs review » Reviewed & tested by the community
alexpott’s picture

Status: Reviewed & tested by the community » Needs work

Needs a re-roll

curl https://drupal.org/files/2003292-12-rename-set_current_page.patch | git a
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  3632  100  3632    0     0   3964      0 --:--:-- --:--:-- --:--:--  4888
error: patch failed: core/modules/views/lib/Drupal/views/Tests/Plugin/PagerTest.php:311
error: core/modules/views/lib/Drupal/views/Tests/Plugin/PagerTest.php: patch does not apply
jibran’s picture

Status: Needs work » Needs review
FileSize
3.55 KB

Reroll
Conflict

++<<<<<<< HEAD
 +    $view->pager->set_current_page($rand_number);
 +    $this->assertEqual($view->getCurrentPage(), $rand_number, 'Make sure getCurrentPage uses the settings of set_current_page.');
++=======
+     $view->pager->setCurrentPage($rand_number);
+     $this->assertEqual($view->getCurrentPage(), $rand_number, 'Make sure get_current_page uses the settings of set_current_page.');
++>>>>>>> 12

Resolved

-     $view->pager->set_current_page($rand_number);
+     $view->pager->setCurrentPage($rand_number);
 -    $this->assertEqual($view->getCurrentPage(), $rand_number, 'Make sure get_current_page uses the settings of set_current_page.');
 +
aspilicious’s picture

Status: Needs review » Reviewed & tested by the community
alexpott’s picture

Status: Reviewed & tested by the community » Fixed

Committed cf23ee6 and pushed to 8.x. Thanks!

Automatically closed -- issue fixed for 2 weeks with no activity.