fix: list data issue

joy2362 · Jun 29, 2024 · c8eaf21 · c8eaf21
1 parent dc20987
commit c8eaf21
Showing 1 changed file with 23 additions and 14 deletions.
diff --git a/src/TimeZoneService.php b/src/TimeZoneService.php
@@ -52,7 +52,7 @@ public function list(): array
     {
         $list = [];
         foreach ($this->regions as $region) {
-            $list[] = $this->getTimeZoneList(DateTimeZone::listIdentifiers($region) ?? []);
+            $list = array_merge($list , $this->getTimeZoneList(DateTimeZone::listIdentifiers($region) ?? []));
         }
         return $list;
     }
@@ -64,7 +64,7 @@ public function listWithoutLabel(): array
     {
         $list = [];
         foreach ($this->regions as $region) {
-            $list[] = $this->getTimeZoneList(DateTimeZone::listIdentifiers($region) ?? [], false);
+            $list = array_merge($list , $this->getTimeZoneList(DateTimeZone::listIdentifiers($region) ?? [], 'value'));
         }
         return $list;
     }
@@ -76,7 +76,7 @@ public function listWithoutValue(): array
     {
         $list = [];
         foreach ($this->regions as $region) {
-            $list[] = $this->getTimeZoneList(DateTimeZone::listIdentifiers($region) ?? [], true, false);
+            $list = array_merge($list , $this->getTimeZoneList(DateTimeZone::listIdentifiers($region) ?? [], 'label'));
         }
         return $list;
     }
@@ -154,24 +154,33 @@ private function getZone($time): string
      * @param bool $isValue
      * @return array
     */
-    private function getTimeZoneList(array $timezones, bool $isLabel = true, bool $isValue = true): array
+    private function getTimeZoneList(array $timezones, string $type = 'list'): array
     {
         $label = Config::get('Timezone.LABEL_FIELD_NAME', 'label');
         $value = Config::get('Timezone.VALUE_FIELD_NAME', 'value');
 
         $data = [];
 
         foreach ($timezones as $timezone) {
-            if($isLabel) {
-                $data[$label] = $this->getLabel($timezone);
-            }
-
-            if($isValue) {
-                $data[$value] = $timezone;
-            }
-
+
+            switch ($type) {
+                case 'label':
+                    $data[] = $this->getLabel($timezone);
+                    break;
+
+                case 'value':
+                    $data[] = $timezone;
+                    break;
+
+                default:
+                    $zone = [
+                        "{$label}" => $this->getLabel($timezone),
+                        "{$value}" => $timezone,
+                    ];
+                    $data[] = $zone;
+                    break;
+            }            
         }
-
         return $data;
     }
-}
+}