renamed Pager::getLastIndice() and Pager::getFirstIndice(). refs #3494

Datagrid/Pager.php

@@ -251,7 +251,7 @@ abstract class Pager implements \Iterator, \Countable, \Serializable, PagerInter
      *
      * @return int
      */
-    public function getFirstIndice()
+    public function getFirstIndex()
     {
         if ($this->page == 0) {
             return 1;
@@ -260,12 +260,28 @@ abstract class Pager implements \Iterator, \Countable, \Serializable, PagerInter
         return ($this->page - 1) * $this->maxPerPage + 1;
     }
 
+    /**
+     * NEXT_MAJOR: remove this method.
+     *
+     * @deprecated since 3.x, will be removed in 4.0
+     */
+    public function getFirstIndice()
+    {
+        @trigger_error(
+            'Method '.__METHOD__.' is deprecated since version 3.x and will be removed in 4.0, '.
+            'please use getFirstIndex() instead.',
+            E_USER_DEPRECATED
+        );
+
+        return $this->getFirstIndex();
+    }
+
     /**
      * Returns the last index on the current page.
      *
      * @return int
      */
-    public function getLastIndice()
+    public function getLastIndex()
     {
         if ($this->page == 0) {
             return $this->nbResults;
@@ -277,6 +293,22 @@ abstract class Pager implements \Iterator, \Countable, \Serializable, PagerInter
         return $this->page * $this->maxPerPage;
     }
 
+    /**
+     * NEXT_MAJOR: remove this method.
+     *
+     * @deprecated since 3.x, will be removed in 4.0
+     */
+    public function getLastIndice()
+    {
+        @trigger_error(
+            'Method '.__METHOD__.' is deprecated since version 3.x and will be removed in 4.0, '.
+            'please use getLastIndex() instead.',
+            E_USER_DEPRECATED
+        );
+
+        return $this->getLastIndex();
+    }
+
     /**
      * Returns the number of results.
      *

Tests/Datagrid/PagerTest.php

@@ -433,43 +433,43 @@ class PagerTest extends \PHPUnit_Framework_TestCase
         $this->assertSame(20, $this->pager->getPreviousPage());
     }
 
-    public function testGetFirstIndice()
+    public function testGetFirstIndex()
     {
-        $this->assertSame(1, $this->pager->getFirstIndice());
+        $this->assertSame(1, $this->pager->getFirstIndex());
 
         $this->pager->setMaxPerPage(0);
         $this->pager->setPage(0);
-        $this->assertSame(1, $this->pager->getFirstIndice());
+        $this->assertSame(1, $this->pager->getFirstIndex());
 
         $this->pager->setPage(2);
         $this->pager->setMaxPerPage(10);
-        $this->assertSame(11, $this->pager->getFirstIndice());
+        $this->assertSame(11, $this->pager->getFirstIndex());
 
         $this->pager->setPage(4);
         $this->pager->setMaxPerPage(7);
-        $this->assertSame(22, $this->pager->getFirstIndice());
+        $this->assertSame(22, $this->pager->getFirstIndex());
     }
 
-    public function testGetLastIndice()
+    public function testGetLastIndex()
     {
-        $this->assertSame(0, $this->pager->getLastIndice());
+        $this->assertSame(0, $this->pager->getLastIndex());
 
         $this->pager->setMaxPerPage(0);
         $this->pager->setPage(0);
-        $this->assertSame(0, $this->pager->getLastIndice());
+        $this->assertSame(0, $this->pager->getLastIndex());
 
         $this->callMethod($this->pager, 'setNbResults', array(100));
 
-        $this->assertSame(100, $this->pager->getLastIndice());
+        $this->assertSame(100, $this->pager->getLastIndex());
 
         $this->pager->setPage(2);
-        $this->assertSame(0, $this->pager->getLastIndice());
+        $this->assertSame(0, $this->pager->getLastIndex());
 
         $this->pager->setMaxPerPage(10);
-        $this->assertSame(20, $this->pager->getLastIndice());
+        $this->assertSame(20, $this->pager->getLastIndex());
 
         $this->pager->setPage(11);
-        $this->assertSame(100, $this->pager->getLastIndice());
+        $this->assertSame(100, $this->pager->getLastIndex());
     }
 
     public function testGetNext()

UPGRADE-3.x.md

@@ -1,6 +1,10 @@
 UPGRADE 3.x
 ===========
 
+## Renamed Pager::getFirstIndice() and Pager::getLastIndice()
+
+Please use `Pager::getFirstIndex()` and `Pager::getLastIndex()` instead!
+
 UPGRADE FROM 3.9 to 3.10
 ========================