From ebd491dc6ef1802a3153b7c9bc0d7a9a1d13bbee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gamez?= <jerome@gamez.name>
Date: Sat, 26 Nov 2022 18:59:58 +0100
Subject: [PATCH] Replace `stella-maris/clock` with `psr/clock`

---
 .github/workflows/tests.yml     | 1 +
 CHANGELOG.md                    | 3 +++
 composer.json                   | 2 +-
 src/Clock.php                   | 2 +-
 src/Clock/FrozenClock.php       | 2 +-
 src/Clock/MinuteClock.php       | 2 +-
 src/Clock/WrappingClock.php     | 2 +-
 tests/Clock/FrozenClockTest.php | 2 +-
 tests/Clock/MinuteClockTest.php | 2 +-
 9 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ecd5a86..8a68ade 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -6,6 +6,7 @@ on:
     branches:
       - '1.x'
       - '2.x'
+      - '3.x'
 
 jobs:
   tests:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d822006..0e0738e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## Unreleased
+This release replaces `stella-maris/clock` with `psr/clock`.
+
 ## 2.3.1 - 2022-11-25
 This release reverts the change to implement `psr/clock` directly, to not break dependents who rely on `stella-maris/clock`
 
diff --git a/composer.json b/composer.json
index eaa698b..7c0da57 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "stella-maris/clock": "^0.1.6"
+        "psr/clock": "^1.0"
     },
     "require-dev": {
         "phpstan/extension-installer": "^1.2",
diff --git a/src/Clock.php b/src/Clock.php
index 02d9f71..5693d1d 100644
--- a/src/Clock.php
+++ b/src/Clock.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Beste;
 
-use StellaMaris\Clock\ClockInterface;
+use Psr\Clock\ClockInterface;
 
 interface Clock extends ClockInterface
 {
diff --git a/src/Clock/FrozenClock.php b/src/Clock/FrozenClock.php
index f2bf651..40f2895 100644
--- a/src/Clock/FrozenClock.php
+++ b/src/Clock/FrozenClock.php
@@ -7,7 +7,7 @@ namespace Beste\Clock;
 use Beste\Clock;
 use DateTimeImmutable;
 use DateTimeZone;
-use StellaMaris\Clock\ClockInterface;
+use Psr\Clock\ClockInterface;
 
 final class FrozenClock implements Clock
 {
diff --git a/src/Clock/MinuteClock.php b/src/Clock/MinuteClock.php
index a7b5a31..309545f 100644
--- a/src/Clock/MinuteClock.php
+++ b/src/Clock/MinuteClock.php
@@ -6,7 +6,7 @@ namespace Beste\Clock;
 
 use Beste\Clock;
 use DateTimeImmutable;
-use StellaMaris\Clock\ClockInterface;
+use Psr\Clock\ClockInterface;
 
 final class MinuteClock implements Clock
 {
diff --git a/src/Clock/WrappingClock.php b/src/Clock/WrappingClock.php
index 5919590..2e91b55 100644
--- a/src/Clock/WrappingClock.php
+++ b/src/Clock/WrappingClock.php
@@ -6,7 +6,7 @@ namespace Beste\Clock;
 
 use Beste\Clock;
 use DateTimeImmutable;
-use StellaMaris\Clock\ClockInterface;
+use Psr\Clock\ClockInterface;
 
 final class WrappingClock implements Clock
 {
diff --git a/tests/Clock/FrozenClockTest.php b/tests/Clock/FrozenClockTest.php
index af24b1a..42d5be8 100644
--- a/tests/Clock/FrozenClockTest.php
+++ b/tests/Clock/FrozenClockTest.php
@@ -7,7 +7,7 @@ namespace Beste\Clock\Tests;
 use Beste\Clock\FrozenClock;
 use DateTimeImmutable;
 use PHPUnit\Framework\TestCase;
-use StellaMaris\Clock\ClockInterface;
+use Psr\Clock\ClockInterface;
 
 /**
  * @internal
diff --git a/tests/Clock/MinuteClockTest.php b/tests/Clock/MinuteClockTest.php
index baf55fb..729c0ac 100644
--- a/tests/Clock/MinuteClockTest.php
+++ b/tests/Clock/MinuteClockTest.php
@@ -7,7 +7,7 @@ namespace Beste\Clock\Tests;
 use Beste\Clock\MinuteClock;
 use DateTimeImmutable;
 use PHPUnit\Framework\TestCase;
-use StellaMaris\Clock\ClockInterface;
+use Psr\Clock\ClockInterface;
 
 /**
  * @internal