refactored several code sections

removed redundant code from DeviceService class
Art-of-WiFi · Jul 25, 2024 · 9e65fda · 9e65fda
1 parent b997cdc
commit 9e65fda
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/src/Client/UniFiClient.php b/src/Client/UniFiClient.php
@@ -227,6 +227,7 @@ private function buildQuery(array $params): string
                 $query[] = urlencode($key) . '=' . urlencode($value);
             }
         }
+
         return implode('&', $query);
     }
 

diff --git a/src/Service/DeviceService.php b/src/Service/DeviceService.php
@@ -48,24 +48,15 @@ public function __construct(UniFiClient $client)
      */
     public function list(array $hostIds = [], string $time = null): array
     {
-        $query = [];
-        if (!empty($hostIds)) {
-            $query['hostIds'] = $hostIds;
-        }
+        /**
+         * array_filter() removes any null values from the $query array
+         */
+        $query = array_filter([
+            'hostIds' => !empty($hostIds) ? $hostIds : null,
+            'time'    => $time
+        ]);
 
-        if ($time) {
-            $query['time'] = $time;
-        }
-
-        if (!empty($query['hostIds'])) {
-            $query = 'hostIds[]=' . implode('&hostIds[]=', $query['hostIds']) . (isset($query['time']) ? '&time=' . $query['time'] : '');
-        }
-
-        $options = [
-            'query' => $query
-        ];
-
-        return $this->client->request('GET', '/ea/devices', $options);
+        return $this->client->request('GET', '/ea/devices', ['query' => $query]);
     }
 
     /**