Port server tests to PHPUnit 12 mock API

server/composer.json

@@ -29,7 +29,7 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^11.0"
+        "phpunit/phpunit": "^12.5"
     },
     "scripts": {
         "test": "phpunit"

server/tests/Support/RedisClientStub.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Swordfish\Server\Tests\Support;
+
+use Predis\Client;
+
+/**
+ * Predis\Client dispatches all Redis commands through __call(), so reflection
+ * sees none of them. PHPUnit 12 removed MockBuilder::addMethods(), leaving
+ * onlyMethods() as the only option — but onlyMethods() requires the methods to
+ * exist on the target class. This subclass exposes the commands the suite
+ * mocks as concrete no-ops so onlyMethods() can override them.
+ */
+class RedisClientStub extends Client
+{
+    public function setex($key, $ttl, $value): mixed { return null; }
+    public function get($key): mixed { return null; }
+    public function incr($key): mixed { return null; }
+    public function incrby($key, $amount): mixed { return null; }
+    public function expire($key, $seconds): mixed { return null; }
+    public function ping(...$args): mixed { return null; }
+    public function keys($pattern): mixed { return null; }
+    public function mget(...$keys): mixed { return null; }
+    public function eval(...$args): mixed { return null; }
+}

server/tests/Unit/CreateRequestTest.php

@@ -4,6 +4,7 @@
 
 namespace Swordfish\Server\Tests;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Swordfish\Server\CreateRequest;
 
@@ -77,9 +78,7 @@ public function testFromStringAcceptsZeroMaxViewsForUnlimited(): void
         $this->assertSame(0, $request->maxViews());
     }
 
-    /**
-     * @dataProvider invalidMaxViewsProvider
-     */
+    #[DataProvider('invalidMaxViewsProvider')]
     public function testFromStringRejectsInvalidMaxViews(int $invalid): void
     {
         $salt     = bin2hex(str_repeat('a', 16));
@@ -115,9 +114,7 @@ public function testFromStringRejectsDisallowedTtlValue(): void
         CreateRequest::fromString("{$salt}\${$verifier}\${$secret}\$7200");
     }
 
-    /**
-     * @dataProvider allowedTtlProvider
-     */
+    #[DataProvider('allowedTtlProvider')]
     public function testFromStringAcceptsAllowedTtlValues(int $ttl): void
     {
         $salt     = bin2hex(str_repeat('a', 16));
@@ -173,9 +170,7 @@ public function testFromJsonThrowsOnInvalidJson(): void
         CreateRequest::fromJson('not-json');
     }
 
-    /**
-     * @dataProvider allowedTtlProvider
-     */
+    #[DataProvider('allowedTtlProvider')]
     public function testFromJsonAcceptsAllowedTtlValues(int $ttl): void
     {
         $json = json_encode([
@@ -192,9 +187,7 @@ public static function allowedTtlProvider(): array
         return [[3600], [21600], [86400], [259200], [604800]];
     }
 
-    /**
-     * @dataProvider disallowedTtlProvider
-     */
+    #[DataProvider('disallowedTtlProvider')]
     public function testFromJsonThrowsOnDisallowedTtlValue(int $ttl): void
     {
         $json = json_encode([

server/tests/Unit/CreateSecretJsonTest.php

@@ -12,14 +12,15 @@
 use PHPUnit\Framework\TestCase;
 use Predis\Client as RedisClient;
 use Swordfish\Server\ServerRoutes;
+use Swordfish\Server\Tests\Support\RedisClientStub;
 
 class CreateSecretJsonTest extends TestCase
 {
     private function makeRedisMock(): RedisClient
     {
-        return $this->getMockBuilder(RedisClient::class)
+        return $this->getMockBuilder(RedisClientStub::class)
             ->disableOriginalConstructor()
-            ->addMethods(['setex'])
+            ->onlyMethods(['setex'])
             ->getMock();
     }
 

server/tests/Unit/DashboardMetricsTest.php

@@ -12,14 +12,15 @@
 use PHPUnit\Framework\TestCase;
 use Predis\Client as RedisClient;
 use Swordfish\Server\ServerRoutes;
+use Swordfish\Server\Tests\Support\RedisClientStub;
 
 class DashboardMetricsTest extends TestCase
 {
     private function makeRedisMock(): RedisClient
     {
-        return $this->getMockBuilder(RedisClient::class)
+        return $this->getMockBuilder(RedisClientStub::class)
             ->disableOriginalConstructor()
-            ->addMethods(['mget'])
+            ->onlyMethods(['mget'])
             ->getMock();
     }
 

server/tests/Unit/HealthCheckTest.php

@@ -13,6 +13,7 @@
 use Predis\Client as RedisClient;
 use Predis\Connection\ConnectionException;
 use Swordfish\Server\ServerRoutes;
+use Swordfish\Server\Tests\Support\RedisClientStub;
 
 class HealthCheckTest extends TestCase
 {
@@ -24,9 +25,9 @@ private function makeRequest(): Request
 
     private function makeRedisMock(): RedisClient
     {
-        return $this->getMockBuilder(RedisClient::class)
+        return $this->getMockBuilder(RedisClientStub::class)
             ->disableOriginalConstructor()
-            ->addMethods(['ping'])
+            ->onlyMethods(['ping'])
             ->getMock();
     }
 

server/tests/Unit/MetricsEndpointTest.php

@@ -12,6 +12,7 @@
 use PHPUnit\Framework\TestCase;
 use Predis\Client as RedisClient;
 use Swordfish\Server\ServerRoutes;
+use Swordfish\Server\Tests\Support\RedisClientStub;
 
 class MetricsEndpointTest extends TestCase
 {
@@ -24,9 +25,9 @@ private function makeRequest(array $headers = []): Request
 
     private function makeRedisMock(): RedisClient
     {
-        return $this->getMockBuilder(RedisClient::class)
+        return $this->getMockBuilder(RedisClientStub::class)
             ->disableOriginalConstructor()
-            ->addMethods(['keys', 'mget'])
+            ->onlyMethods(['keys', 'mget'])
             ->getMock();
     }
 

server/tests/Unit/MetricsServiceTest.php

@@ -7,14 +7,15 @@
 use PHPUnit\Framework\TestCase;
 use Predis\Client as RedisClient;
 use Swordfish\Server\MetricsService;
+use Swordfish\Server\Tests\Support\RedisClientStub;
 
 class MetricsServiceTest extends TestCase
 {
     private function makeRedisMock(): RedisClient
     {
-        return $this->getMockBuilder(RedisClient::class)
+        return $this->getMockBuilder(RedisClientStub::class)
             ->disableOriginalConstructor()
-            ->addMethods(['incrby', 'expire'])
+            ->onlyMethods(['incrby', 'expire'])
             ->getMock();
     }
 

server/tests/Unit/RateLimiterTest.php

@@ -7,14 +7,15 @@
 use PHPUnit\Framework\TestCase;
 use Predis\Client as RedisClient;
 use Swordfish\Server\RateLimiter;
+use Swordfish\Server\Tests\Support\RedisClientStub;
 
 class RateLimiterTest extends TestCase
 {
     private function makeRedisMock(): RedisClient
     {
-        return $this->getMockBuilder(RedisClient::class)
+        return $this->getMockBuilder(RedisClientStub::class)
             ->disableOriginalConstructor()
-            ->addMethods(['incr', 'expire'])
+            ->onlyMethods(['incr', 'expire'])
             ->getMock();
     }
 

server/tests/Unit/RetrieveRateLimitTest.php

@@ -13,14 +13,15 @@
 use PHPUnit\Framework\TestCase;
 use Predis\Client as RedisClient;
 use Swordfish\Server\ServerRoutes;
+use Swordfish\Server\Tests\Support\RedisClientStub;
 
 class RetrieveRateLimitTest extends TestCase
 {
     private function makeRedisMock(int $incrReturn): RedisClient
     {
-        $redis = $this->getMockBuilder(RedisClient::class)
+        $redis = $this->getMockBuilder(RedisClientStub::class)
             ->disableOriginalConstructor()
-            ->addMethods(['incr', 'expire'])
+            ->onlyMethods(['incr', 'expire'])
             ->getMock();
         $redis->method('incr')->willReturn($incrReturn);
         return $redis;
@@ -70,9 +71,9 @@ public function testReturns429AtLimitPlusOne(): void
     public function testDoesNotReturn429WhenUnderLimit(): void
     {
         $logger = new Logger('test');
-        $redis  = $this->getMockBuilder(RedisClient::class)
+        $redis  = $this->getMockBuilder(RedisClientStub::class)
             ->disableOriginalConstructor()
-            ->addMethods(['incr', 'expire', 'get'])
+            ->onlyMethods(['incr', 'expire', 'get'])
             ->getMock();
         $redis->method('incr')->willReturn(1);
         $redis->method('get')->willReturn(null); // secret not found → 400 bad request path

server/tests/Unit/RetrieveSecretJsonTest.php

@@ -13,6 +13,7 @@
 use PHPUnit\Framework\TestCase;
 use Predis\Client as RedisClient;
 use Swordfish\Server\ServerRoutes;
+use Swordfish\Server\Tests\Support\RedisClientStub;
 
 /**
  * Tests for the JSON API POST /api/retrieve handler (happy path, error paths, view limits).
@@ -23,9 +24,9 @@ class RetrieveSecretJsonTest extends TestCase
 {
     private function makeRedisMock(array $methods = ['incr', 'expire', 'get', 'eval']): RedisClient
     {
-        $redis = $this->getMockBuilder(RedisClient::class)
+        $redis = $this->getMockBuilder(RedisClientStub::class)
             ->disableOriginalConstructor()
-            ->addMethods($methods)
+            ->onlyMethods($methods)
             ->getMock();
 
         // Default: rate limiter allows the request (count = 1)

server/tests/Unit/RetrieveSecretTest.php

@@ -12,6 +12,7 @@
 use PHPUnit\Framework\TestCase;
 use Predis\Client as RedisClient;
 use Swordfish\Server\ServerRoutes;
+use Swordfish\Server\Tests\Support\RedisClientStub;
 
 /**
  * Tests for the v1 (backward-compatible) POST /retrieve handler.
@@ -22,9 +23,9 @@ class RetrieveSecretTest extends TestCase
 {
     private function makeRedisMock(): RedisClient
     {
-        return $this->getMockBuilder(RedisClient::class)
+        return $this->getMockBuilder(RedisClientStub::class)
             ->disableOriginalConstructor()
-            ->addMethods(['get'])
+            ->onlyMethods(['get'])
             ->getMock();
     }
 

server/tests/Unit/SecretInfoTest.php

@@ -15,14 +15,15 @@
 use Swordfish\Server\SecretNotFoundException;
 use Swordfish\Server\SecretService;
 use Swordfish\Server\ServerRoutes;
+use Swordfish\Server\Tests\Support\RedisClientStub;
 
 class SecretInfoTest extends TestCase
 {
     private function makeRedisMock(): RedisClient
     {
-        return $this->getMockBuilder(RedisClient::class)
+        return $this->getMockBuilder(RedisClientStub::class)
             ->disableOriginalConstructor()
-            ->addMethods(['get'])
+            ->onlyMethods(['get'])
             ->getMock();
     }
 

server/tests/Unit/SecretServiceTest.php

@@ -6,6 +6,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Predis\Client as RedisClient;
+use Swordfish\Server\Tests\Support\RedisClientStub;
 use Swordfish\Server\CreateRequest;
 use Swordfish\Server\InvalidVerifierException;
 use Swordfish\Server\SecretNotFoundException;
@@ -15,9 +16,9 @@ class SecretServiceTest extends TestCase
 {
     private function makeRedisMock(): RedisClient
     {
-        return $this->getMockBuilder(RedisClient::class)
+        return $this->getMockBuilder(RedisClientStub::class)
             ->disableOriginalConstructor()
-            ->addMethods(['setex', 'get', 'eval'])
+            ->onlyMethods(['setex', 'get', 'eval'])
             ->getMock();
     }
 

server/tests/Unit/SecurityHeadersTest.php

@@ -15,6 +15,7 @@
 use PHPUnit\Framework\TestCase;
 use Predis\Client as RedisClient;
 use Swordfish\Server\ServerRoutes;
+use Swordfish\Server\Tests\Support\RedisClientStub;
 
 class SecurityHeadersTest extends TestCase
 {
@@ -49,10 +50,12 @@ private function makePostRequest(string $path, string $body = ''): Request
 
     private function makeRedisMock(array $methods = []): RedisClient
     {
-        return $this->getMockBuilder(RedisClient::class)
-            ->disableOriginalConstructor()
-            ->addMethods($methods)
-            ->getMock();
+        $builder = $this->getMockBuilder(RedisClientStub::class)
+            ->disableOriginalConstructor();
+        if ($methods !== []) {
+            $builder->onlyMethods($methods);
+        }
+        return $builder->getMock();
     }
 
     public function testMainContentIncludesSecurityHeaders(): void

server/tests/Unit/VerifierServiceTest.php

@@ -6,15 +6,16 @@
 
 use PHPUnit\Framework\TestCase;
 use Predis\Client as RedisClient;
+use Swordfish\Server\Tests\Support\RedisClientStub;
 use Swordfish\Server\VerifierService;
 
 class VerifierServiceTest extends TestCase
 {
     private function makeRedisMock(): RedisClient
     {
-        return $this->getMockBuilder(RedisClient::class)
+        return $this->getMockBuilder(RedisClientStub::class)
             ->disableOriginalConstructor()
-            ->addMethods(['setex', 'get'])
+            ->onlyMethods(['setex', 'get'])
             ->getMock();
     }