Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions fixtures/Timezone.php → fixtures/Zone.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
4 changes: 2 additions & 2 deletions proofs/clock.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
};
use Fixtures\Innmind\Time\{
Point as PointInTime,
Timezone,
Zone,
};
use Innmind\BlackBox\Set;

Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/Clock.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/Clock/Implementation.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
use Innmind\Time\{
Point,
Format,
Timezones,
Timezone,
Zones,
Zone,
};
use Innmind\Immutable\Attempt;

Expand All @@ -17,7 +17,7 @@
interface Implementation
{
/**
* @param callable(Timezones): Timezone $changeTimezone
* @param callable(Zones): Zone $changeTimezone
*/
#[\NoDiscard]
public function switch(callable $changeTimezone): self;
Expand Down
12 changes: 6 additions & 6 deletions src/Clock/Via.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
Point,
Format,
Offset,
Timezone,
Timezones,
Zone,
Zones,
};
use Innmind\Immutable\Attempt;

Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/Timezone.php → src/Zone.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace Innmind\Time;

final class Timezone
final class Zone
{
private function __construct(
private Offset $offset,
Expand Down
Loading