Extract Project::listing()

Author: Art4

src/Redmine/Api/CustomField.php

@@ -138,7 +138,7 @@ public function getIdByName($name, array $params = [])
         return $arr[(string) $name];
     }
 
-    private function doListing($forceUpdate = false, array $params = [])
+    private function doListing(bool $forceUpdate, array $params)
     {
         if (empty($this->customFields) || $forceUpdate) {
             $this->customFields = $this->list($params);

src/Redmine/Api/IssueCategory.php

@@ -155,7 +155,7 @@ public function getIdByName($project, $name)
     {
         @trigger_error('`' . __METHOD__ . '()` is deprecated since v2.7.0, use `' . __CLASS__ . '::listNamesByProject()` instead.', E_USER_DEPRECATED);
 
-        $arr = $this->doListing($project);
+        $arr = $this->doListing($project, false);
 
         if (!isset($arr[$name])) {
             return false;
@@ -282,7 +282,7 @@ public function remove($id, array $params = [])
         return $this->lastResponse->getContent();
     }
 
-    private function doListing($project, $forceUpdate = false)
+    private function doListing($project, bool $forceUpdate)
     {
         if (true === $forceUpdate || empty($this->issueCategories)) {
             $this->issueCategories = $this->listByProject($project);

src/Redmine/Api/Project.php

@@ -132,15 +132,7 @@ public function listing($forceUpdate = false, $reverse = true, array $params = [
     {
         @trigger_error('`' . __METHOD__ . '()` is deprecated since v2.7.0, use `' . __CLASS__ . '::listNames()` instead.', E_USER_DEPRECATED);
 
-        if (true === $forceUpdate || empty($this->projects)) {
-            $this->projects = $this->list($params);
-        }
-        $ret = [];
-        foreach ($this->projects['projects'] as $e) {
-            $ret[(int) $e['id']] = $e['name'];
-        }
-
-        return $reverse ? array_flip($ret) : $ret;
+        return $this->doListing($forceUpdate, $reverse, $params);
     }
 
     /**
@@ -153,7 +145,8 @@ public function listing($forceUpdate = false, $reverse = true, array $params = [
      */
     public function getIdByName($name, array $params = [])
     {
-        $arr = $this->listing(false, true, $params);
+        $arr = $this->doListing(false, true, $params);
+
         if (!isset($arr[$name])) {
             return false;
         }
@@ -447,4 +440,19 @@ public function remove($id)
 
         return $this->lastResponse->getContent();
     }
+
+    private function doListing(bool $forceUpdate, bool $reverse, array $params)
+    {
+        if (true === $forceUpdate || empty($this->projects)) {
+            $this->projects = $this->list($params);
+        }
+
+        $ret = [];
+
+        foreach ($this->projects['projects'] as $e) {
+            $ret[(int) $e['id']] = $e['name'];
+        }
+
+        return $reverse ? array_flip($ret) : $ret;
+    }
 }