Release 3.1.0

github-actions(deps): bump dependabot/fetch-metadata from 3.0.0 to 3.1.0

.gitattributes

@@ -6,4 +6,3 @@
 /.gitignore                     export-ignore
 /phpstan.neon.dist              export-ignore
 /phpunit.xml.dist               export-ignore
-/psalm.xml.dist                 export-ignore

.github/dependabot.yml

@@ -12,4 +12,4 @@ updates:
       prefix: "github-actions"
     open-pull-requests-limit: 10
     labels:
-      - "dependency"
+      - "dependencies"

.github/workflows/dependabot-auto-merge.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: "Dependabot metadata"
         id: "metadata"
-        uses: "dependabot/fetch-metadata@v1.3.5"
+        uses: "dependabot/fetch-metadata@v3.1.0"
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: "Enable auto-merge for Dependabot PRs"

.github/workflows/tests.yml

@@ -6,11 +6,12 @@ on:
     branches:
       - '1.x'
       - '2.x'
+      - '3.x'
 
 jobs:
   tests:
     name: PHP ${{ matrix.php }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
@@ -18,10 +19,16 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
+          - "8.4"
+          - "8.5"
+        include:
+          - php: "8.6"
+            composer-options: "--ignore-platform-req=php+"
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -31,7 +38,9 @@ jobs:
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: "ramsey/composer-install@v2"
+      - uses: "ramsey/composer-install@v4"
+        with:
+          composer-options: "${{ matrix.composer-options }}"
 
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
@@ -39,9 +48,6 @@ jobs:
       - name: Run PHPStan
         run: vendor/bin/phpstan analyse --error-format=github
 
-      - name: Run Psalm
-        run: vendor/bin/psalm --output-format=github
-
       - name: Setup Problem Matchers for PHPUnit
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 

.gitignore

@@ -4,4 +4,3 @@
 /composer.lock
 /phpstan.neon
 /phpunit.xml
-/psalm.xml

CHANGELOG.md

@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## Unreleased
+
+## 3.1.0 - 2026-08-22
+
+Deprecates `Beste\Clock` in favor of `Psr\Clock\ClockInterface`. The implementations continue to implement
+the deprecated interface for backwards compatibility. Please type against `Psr\Clock\ClockInterface`.
+`Beste\Clock` will be removed in 4.0.
+
+## 3.0.0 - 2022-11-26
+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`
+
 ## 2.3.0 - 2022-11-25
 This release re-introduces support for PHP ^8.0 and implements the freshly released `psr/clock` (PSR-20) directly.
 

README.md

@@ -4,7 +4,7 @@
 [![Packagist PHP Version Support](https://img.shields.io/packagist/php-v/beste/clock)](https://packagist.org/packages/beste/clock)
 [![Tests](https://github.com/beste/clock/actions/workflows/tests.yml/badge.svg)](https://github.com/beste/clock/actions/workflows/tests.yml)
 
-A collection of Clock implementations.
+A collection of [PSR-20](https://www.php-fig.org/psr/psr-20/) Clock implementations.
 
 ## Table of Contents
 

SECURITY.md

@@ -0,0 +1,5 @@
+## Security contact information
+
+To report a security vulnerability, please use the
+[Tidelift security contact](https://tidelift.com/security).
+Tidelift will coordinate the fix and disclosure.

composer.json

@@ -15,13 +15,11 @@
         "psr/clock": "^1.0"
     },
     "require-dev": {
-        "phpstan/extension-installer": "^1.2",
+        "phpstan/extension-installer": "^1.4.1",
-        "phpstan/phpstan": "^1.9.1",
+        "phpstan/phpstan": "^2.1",
-        "phpstan/phpstan-phpunit": "^1.2.2",
+        "phpstan/phpstan-phpunit": "^2.0",
-        "phpstan/phpstan-strict-rules": "^1.4.4",
+        "phpstan/phpstan-strict-rules": "^2.0",
-        "phpunit/phpunit": "^9.5.26",
+        "phpunit/phpunit": "^9.6.20"
-        "psalm/plugin-phpunit": "^0.16.1",
-        "vimeo/psalm": "^4.29"
     },
     "autoload": {
         "psr-4": {
@@ -48,11 +46,9 @@
     "scripts": {
         "test": [
             "@phpstan",
-            "@psalm",
             "@phpunit"
         ],
         "phpunit": "vendor/bin/phpunit",
-        "phpstan": "vendor/bin/phpstan analyse",
+        "phpstan": "vendor/bin/phpstan analyse"
-        "psalm": "vendor/bin/psalm"
     }
 }

psalm.xml.dist

@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    xmlns="https://getpsalm.org/schema/config"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    cacheDirectory=".build/psalm"
-    errorLevel="1"
-    resolveFromConfigFile="true"
->
-    <projectFiles>
-        <directory name="src" />
-        <directory name="tests" />
-        <ignoreFiles>
-            <directory name="vendor" />
-        </ignoreFiles>
-    </projectFiles>
-
-    <plugins>
-        <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
-    </plugins>
-</psalm>

src/Clock.php

@@ -6,6 +6,9 @@ namespace Beste;
 
 use Psr\Clock\ClockInterface;
 
+/**
+ * @deprecated since 3.1.0, use {@see ClockInterface} instead.
+ */
 interface Clock extends ClockInterface
 {
 

src/Clock/WrappingClock.php

@@ -25,7 +25,7 @@ final class WrappingClock implements Clock
         }
 
         if (!method_exists($clock, 'now')) {
-            throw new InvalidArgumentException('$clock must implement '.ClockInterface::class.' or have a now() method');
+            throw new InvalidArgumentException('$clock must implement StellaMaris\Clock\ClockInterface or have a now() method');
         }
 
         if (!($clock->now() instanceof DateTimeImmutable)) {

tests/Clock/FrozenClockTest.php

@@ -32,10 +32,10 @@ final class FrozenClockTest extends TestCase
     /**
      * @test
      *
-     * @uses \Beste\Clock\FrozenClock::__construct
+     * @uses ::__construct
-     * @uses \Beste\Clock\FrozenClock::fromUTC()
+     * @uses ::fromUTC
      *
-     * @covers ::now()
+     * @covers ::now
      */
     public function itReturnsAnEqualNowButNotTheSame(): void
     {
@@ -51,8 +51,8 @@ final class FrozenClockTest extends TestCase
     /**
      * @test
      *
-     * @uses \Beste\Clock\FrozenClock::__construct
+     * @uses ::__construct
-     * @uses \Beste\Clock\FrozenClock::now
+     * @uses ::now
      *
      * @covers ::withNowFrom
      */
@@ -74,8 +74,8 @@ final class FrozenClockTest extends TestCase
     /**
      * @test
      *
-     * @uses \Beste\Clock\FrozenClock::__construct
+     * @uses ::__construct
-     * @uses \Beste\Clock\FrozenClock::now
+     * @uses ::now
      *
      * @covers ::fromUTC
      */
@@ -90,9 +90,9 @@ final class FrozenClockTest extends TestCase
     /**
      * @test
      *
-     * @uses \Beste\Clock\FrozenClock::__construct
+     * @uses ::__construct
-     * @uses \Beste\Clock\FrozenClock::at
+     * @uses ::at
-     * @uses \Beste\Clock\FrozenClock::now
+     * @uses ::now
      *
      * @covers ::setTo
      */

tests/Clock/WrappingClockTest.php

@@ -6,6 +6,8 @@ namespace Beste\Clock\Tests;
 
 use Beste\Clock\FrozenClock;
 use Beste\Clock\WrappingClock;
+use DateTimeImmutable;
+use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -18,7 +20,7 @@ final class WrappingClockTest extends TestCase
      * @test
      *
      * @covers ::__construct
-     * @covers ::create
+     * @covers ::wrapping
      * @covers ::now
      */
     public function itWrapsAClockInterface(): void
@@ -36,23 +38,21 @@ final class WrappingClockTest extends TestCase
     /**
      * @test
      *
-     * @covers ::__construct
+     * @covers ::wrapping
-     * @covers ::create
-     * @covers ::now
      */
     public function itWrapsAnObjectWithANowMethod(): void
     {
         $now = FrozenClock::fromUTC()->now();
 
         $clock = new class($now) {
-            private \DateTimeImmutable $now;
+            private DateTimeImmutable $now;
 
-            public function __construct(\DateTimeImmutable $now)
+            public function __construct(DateTimeImmutable $now)
             {
                 $this->now = $now;
             }
 
-            public function now(): \DateTimeImmutable
+            public function now(): DateTimeImmutable
             {
                 return $this->now;
             }
@@ -69,7 +69,7 @@ final class WrappingClockTest extends TestCase
     /**
      * @test
      *
-     * @covers ::create
+     * @covers ::wrapping
      */
     public function itRejectsObjectsWithANowMethodReturningANonDateTimeImmutable(): void
     {
@@ -80,7 +80,7 @@ final class WrappingClockTest extends TestCase
             }
         };
 
-        $this->expectException(\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('$clock->now() must return a DateTimeImmutable');
 
         WrappingClock::wrapping($clock);