Extract TimeEntryActivity::listing()

Author: Art4

src/Redmine/Api/TimeEntryActivity.php

@@ -105,15 +105,7 @@ public function listing($forceUpdate = false)
     {
         @trigger_error('`' . __METHOD__ . '()` is deprecated since v2.7.0, use `' . __CLASS__ . '::listNames()` instead.', E_USER_DEPRECATED);
 
-        if (empty($this->timeEntryActivities) || $forceUpdate) {
-            $this->timeEntryActivities = $this->list();
-        }
-        $ret = [];
-        foreach ($this->timeEntryActivities['time_entry_activities'] as $e) {
-            $ret[$e['name']] = (int) $e['id'];
-        }
-
-        return $ret;
+        return $this->doListing((bool) $forceUpdate);
     }
 
     /**
@@ -125,11 +117,27 @@ public function listing($forceUpdate = false)
      */
     public function getIdByName($name)
     {
-        $arr = $this->listing();
+        $arr = $this->doListing(false);
+
         if (!isset($arr[$name])) {
             return false;
         }
 
         return $arr[(string) $name];
     }
+
+    private function doListing(bool $forceUpdate)
+    {
+        if (empty($this->timeEntryActivities) || $forceUpdate) {
+            $this->timeEntryActivities = $this->list();
+        }
+
+        $ret = [];
+
+        foreach ($this->timeEntryActivities['time_entry_activities'] as $e) {
+            $ret[$e['name']] = (int) $e['id'];
+        }
+
+        return $ret;
+    }
 }