Merge branch '1.3.x' of https://github.com/joy2362/php-time-zone into…

… 1.3.x
joy2362 · Jun 28, 2024 · 4925ab5 · 4925ab5
2 parents df9bad9 + a81fde6
commit 4925ab5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/src/PhpTimeZoneServiceProvider.php b/src/PhpTimeZoneServiceProvider.php
@@ -22,4 +22,4 @@ public function register()
             return new TimeZoneService();
         });
     }
-}
+}
diff --git a/src/TimeZoneService.php b/src/TimeZoneService.php
@@ -64,7 +64,7 @@ public function listWithoutLabel(): array
     {
         $list = [];
         foreach ($this->regions as $region) {
-            $list[] = $this->getTimeZoneList(DateTimeZone::listIdentifiers($region) ?? [] , false);
+            $list[] = $this->getTimeZoneList(DateTimeZone::listIdentifiers($region) ?? [], false);
         }
         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[] = $this->getTimeZoneList(DateTimeZone::listIdentifiers($region) ?? [], true, false);
         }
         return $list;
     }
@@ -119,8 +119,8 @@ private function getLabel($timezone): string
             $time = new DateTime('', new DateTimeZone($timezone));
             $time_diff = $this->getTimeDiff($time);
             $zone = $this->getZone($time);
-            
-            $defaultTimeZone = Config::get('Timezone.DEFAULT_TIME_ZONE' , 'GMT');
+
+            $defaultTimeZone = Config::get('Timezone.DEFAULT_TIME_ZONE', 'GMT');
             $defaultTimeZone = in_array($defaultTimeZone, $this->supportedTimeZone) ? $defaultTimeZone : $this->supportedTimeZone[0];
             return "({$defaultTimeZone} {$time_diff}) {$zone}";
         } catch (Exception $ex) {
@@ -134,7 +134,7 @@ private function getLabel($timezone): string
      */
     private function getTimeDiff($time): string
     {
-        $time_diff_symbol = Config::get('Timezone.TIME_DIFF_SYMBOL','.');
+        $time_diff_symbol = Config::get('Timezone.TIME_DIFF_SYMBOL', '.');
         $str_time_diff = $time->format('p');
         return str_replace(':', $time_diff_symbol, $str_time_diff);
     }
@@ -147,31 +147,31 @@ private function getZone($time): string
     {
         return str_replace('_', ' ', $time->format('e'));
     }
-    
+
     /**
      * @param array $timezones
      * @param bool $isLabel
      * @param bool $isValue
      * @return array
     */
-    private function getTimeZoneList(array $timezones , bool $isLabel = true , bool $isValue = true): array
+    private function getTimeZoneList(array $timezones, bool $isLabel = true, bool $isValue = true): array
     {
-        $label = Config::get('Timezone.LABEL_FIELD_NAME','label');
-        $value = Config::get('Timezone.VALUE_FIELD_NAME','value');
-        
+        $label = Config::get('Timezone.LABEL_FIELD_NAME', 'label');
+        $value = Config::get('Timezone.VALUE_FIELD_NAME', 'value');
+
         $data = [];
 
         foreach ($timezones as $timezone) {
-            if($isLabel ){
+            if($isLabel) {
                 $data[$label] = $this->getLabel($timezone);
             }
 
-            if($isValue ){
+            if($isValue) {
                 $data[$value] = $timezone;
             }
-            
+
         }
 
         return $data;
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,4 +22,4 @@ public function register() @@
                 return new TimeZoneService();
             });
         }
-    }
+    }