Merge pull request #3 from Innmind/simplify-timezone

Rename `Timezone` to `Zone`

Author: Baptouuuu

fixtures/Timezone.php fixtures/Zone.phpfixtures/Timezone.php renamed to fixtures/Zone.php

@@ -4,21 +4,21 @@
 namespace Fixtures\Innmind\Time;
 
 use Innmind\Time\{
-    Timezone as Model,
-    Timezones,
+    Zone as Model,
+    Zones,
     Offset,
 };
 use Innmind\BlackBox\Set;
 
-final class Timezone
+final class Zone
 {
     /**
-     * @return Set\Provider<callable(Timezones): Model>
+     * @return Set\Provider<callable(Zones): Model>
      */
     public static function any(): Set\Provider
     {
         return Set::compose(
-            static fn($offset, $daylight) => static fn(Timezones $timezones) => Model::of(
+            static fn($offset, $daylight) => static fn(Zones $timezones) => Model::of(
                 $offset,
                 $daylight,
             ),

proofs/clock.php

@@ -9,7 +9,7 @@
 };
 use Fixtures\Innmind\Time\{
     Point as PointInTime,
-    Timezone,
+    Zone,
 };
 use Innmind\BlackBox\Set;
 
@@ -251,7 +251,7 @@ static function($assert) {
 
     yield proof(
         'Timezone fixtures',
-        given(Timezone::any()),
+        given(Zone::any()),
         static function($assert, $timezone) {
             $clock = Clock::live()->switch($timezone);
 

src/Clock.php

@@ -64,7 +64,7 @@ public function now(): Point
     }
 
     /**
-     * @param callable(Timezones): Timezone $changeTimezone
+     * @param callable(Zones): Zone $changeTimezone
      */
     #[\NoDiscard]
     public function switch(callable $changeTimezone): self

src/Clock/Implementation.php

@@ -6,8 +6,8 @@
 use Innmind\Time\{
     Point,
     Format,
-    Timezones,
-    Timezone,
+    Zones,
+    Zone,
 };
 use Innmind\Immutable\Attempt;
 
@@ -17,7 +17,7 @@
 interface Implementation
 {
     /**
-     * @param callable(Timezones): Timezone $changeTimezone
+     * @param callable(Zones): Zone $changeTimezone
      */
     #[\NoDiscard]
     public function switch(callable $changeTimezone): self;

src/Clock/Via.php

@@ -7,8 +7,8 @@
     Point,
     Format,
     Offset,
-    Timezone,
-    Timezones,
+    Zone,
+    Zones,
 };
 use Innmind\Immutable\Attempt;
 
@@ -30,18 +30,18 @@ public function __construct(
     public function switch(callable $changeTimezone): self
     {
         $now = $this->now();
-        /** @var callable(non-empty-string): Timezone */
-        $of = static function(string $zone) use ($now): Timezone {
+        /** @var callable(non-empty-string): Zone */
+        $of = static function(string $zone) use ($now): Zone {
             /** @var non-empty-string $zone */
             $now = (new \DateTimeImmutable($now->format(Format::iso8601())))->setTimezone(new \DateTimeZone($zone));
 
-            return Timezone::of(
+            return Zone::of(
                 Offset::from($now->format('P')),
                 (bool) (int) $now->format('I'),
             );
         };
 
-        $offset = $changeTimezone(Timezones::new($of))->offset();
+        $offset = $changeTimezone(Zones::new($of))->offset();
 
         return new self(
             $this->now,

src/Timezone.php src/Zone.phpsrc/Timezone.php renamed to src/Zone.php

@@ -3,7 +3,7 @@
 
 namespace Innmind\Time;
 
-final class Timezone
+final class Zone
 {
     private function __construct(
         private Offset $offset,