Support filtering timezones by country code (#480)

FakerPHP · Jun 22, 2022 · 135f6e9 · 135f6e9
1 parent 9bd9d03
commit 135f6e9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/src/Faker/Core/DateTime.php b/src/Faker/Core/DateTime.php
@@ -217,8 +217,14 @@ public function century(): string
         return Helper::randomElement($this->centuries);
     }
 
-    public function timezone(): string
+    public function timezone(string $countryCode = null): string
     {
-        return Helper::randomElement(\DateTimeZone::listIdentifiers());
+        if ($countryCode) {
+            $timezones = \DateTimeZone::listIdentifiers(\DateTimeZone::PER_COUNTRY, $countryCode);
+        } else {
+            $timezones = \DateTimeZone::listIdentifiers();
+        }
+
+        return Helper::randomElement($timezones);
     }
 }
diff --git a/src/Faker/Extension/DateTimeExtension.php b/src/Faker/Extension/DateTimeExtension.php
@@ -234,7 +234,9 @@ public function century(): string;
     /**
      * Get a random timezone, uses `\DateTimeZone::listIdentifiers()` internally.
      *
+     * @param string|null $countryCode two-letter ISO 3166-1 compatible country code
+     *
      * @example 'Europe/Rome'
      */
-    public function timezone(): string;
+    public function timezone(string $countryCode = null): string;
 }
diff --git a/src/Faker/Generator.php b/src/Faker/Generator.php
@@ -255,7 +255,7 @@
  *
  * @property string $timezone
  *
- * @method string timezone()
+ * @method string timezone($countryCode = null)
  *
  * @property void $setDefaultTimezone
  *

diff --git a/test/Faker/Core/DateTimeTest.php b/test/Faker/Core/DateTimeTest.php
@@ -221,8 +221,11 @@ public function testCentury()
     public function testTimezone()
     {
         $timezone = $this->extension->timezone();
+        $countryTimezone = $this->extension->timezone('US');
 
         self::assertIsString($timezone);
         self::assertContains($timezone, \DateTimeZone::listIdentifiers());
+        self::assertIsString($countryTimezone);
+        self::assertContains($countryTimezone, \DateTimeZone::listIdentifiers(\DateTimeZone::PER_COUNTRY, 'US'));
     }
 }