Refactor extract CbpIterator getPageIfNecessary()

zendesk · Oct 18, 2023 · 238b314 · 238b314
1 parent c5016b9
commit 238b314
Showing 1 changed file with 15 additions and 16 deletions.
diff --git a/src/Zendesk/API/Traits/Utility/CbpIterator.php b/src/Zendesk/API/Traits/Utility/CbpIterator.php
@@ -14,7 +14,6 @@ class CbpIterator implements Iterator
      */
     public const DEFAULT_PAGE_SIZE = 100;
 
-
     /**
      * @var string The root key in the response with the page resources (eg: users, tickets).
      */
@@ -62,17 +61,6 @@ public function __construct($resourcesRoot, $resourcesKey, $pageSize = self::DEF
         $this->pageSize = $pageSize;
     }
 
-    /**
-     * @return mixed (using FindAll) The current resource, maybe fetching a new page.
-     */
-    public function current()
-    {
-        if ($this->isEndOfPage()) {
-            $this->getPage();
-        }
-        return $this->page[$this->position];
-    }
-
     /**
      * @return int The current position.
      */
@@ -102,17 +90,28 @@ public function rewind()
      */
     public function valid()
     {
-        if ($this->isEndOfPage()) {
-            $this->getPage();
-        }
+        $this->getPageIfNecessary();
         return isset($this->page[$this->position]);
     }
 
+    /**
+     * @return mixed (using FindAll) The current resource, maybe fetching a new page.
+     */
+    public function current()
+    {
+        $this->getPageIfNecessary();
+        return $this->page[$this->position];
+    }
+
     /**
      * Fetches the next page of resources from the API.
      */
-    private function getPage()
+    private function getPageIfNecessary()
     {
+        if (!$this->isEndOfPage()) {
+            return;
+        }
+
         $this->started = true;
         $params = ['page[size]' => $this->pageSize];
         if ($this->afterCursor) {