FIX Make PageinatedList::count() give the number of items in the current page

Author: GuySartorelli

src/Model/List/ListDecorator.php

@@ -126,10 +126,7 @@ public function last(): mixed
         return $this->list->last();
     }
 
-    /**
-     * @return int
-     */
-    public function TotalItems()
+    public function getTotalItems(): int
     {
         return $this->list->count();
     }

src/Model/List/PaginatedList.php

@@ -142,12 +142,20 @@ public function setPageStart($start)
         return $this;
     }
 
+    /**
+     * Returns the number of items on the current page of the list.
+     * For the total number of items in the unpaginated list, use getTotalItems().
+     */
+    public function count(): int
+    {
+        return count($this->getListForCurrentPage());
+    }
+
     /**
      * Returns the total number of items in the unpaginated list.
-     *
-     * @return int
+     * For the number of items on the current page of the list, use count().
      */
-    public function getTotalItems()
+    public function getTotalItems(): int
     {
         if ($this->totalItems === null) {
             $this->totalItems = count($this->list ?? []);
@@ -214,15 +222,7 @@ public function setLimitItems($limit)
 
     public function getIterator(): Traversable
     {
-        $pageLength = $this->getPageLength();
-        if ($this->limitItems && $pageLength) {
-            $tmptList = clone $this->list;
-            return new IteratorIterator(
-                $tmptList->limit($pageLength, $this->getPageStart())
-            );
-        } else {
-            return new IteratorIterator($this->list);
-        }
+        return new IteratorIterator($this->getListForCurrentPage());
     }
 
     /**
@@ -532,14 +532,6 @@ public function PrevLink()
         }
     }
 
-    /**
-     * Returns the total number of items in the list
-     */
-    public function TotalItems()
-    {
-        return $this->getTotalItems();
-    }
-
     /**
      * Set the request object for this list
      *
@@ -557,4 +549,15 @@ public function getRequest()
     {
         return $this->request;
     }
+
+    private function getListForCurrentPage()
+    {
+        $pageLength = $this->getPageLength();
+        if ($this->limitItems && $pageLength) {
+            $tmptList = clone $this->list;
+            return$tmptList->limit($pageLength, $this->getPageStart());
+        } else {
+            return $this->list;
+        }
+    }
 }

tests/php/Model/List/GroupedListTest.php

@@ -193,6 +193,6 @@ public function testTotalItems()
             )
         );
 
-        $this->assertEquals(4, $list->TotalItems());
+        $this->assertEquals(4, $list->getTotalItems());
     }
 }

tests/php/Model/List/ListDecoratorTest.php

@@ -267,7 +267,7 @@ public function testLimit()
     public function testTotalItems()
     {
         $this->list->expects($this->once())->method('count')->willReturn(5);
-        $this->assertSame(5, $this->decorator->TotalItems());
+        $this->assertSame(5, $this->decorator->getTotalItems());
     }
 
     public function testAdd()

tests/php/Model/List/PaginatedListTest.php

@@ -218,10 +218,14 @@ public function testLimitItems()
         $list = new PaginatedList($list);
 
         $list->setCurrentPage(3);
-        $this->assertEquals(10, count($list->toArray()));
+        // toArray uses the iterator while count is a discrete method that doesn't use the iterator.
+        // They should both give the same results.
+        $this->assertCount(10, $list->toArray());
+        $this->assertEquals(10, $list->count());
 
         $list->setLimitItems(false);
-        $this->assertEquals(50, count($list->toArray()));
+        $this->assertCount(50, $list->toArray());
+        $this->assertEquals(50, $list->count());
     }
 
     public function testCurrentPage()