ci: install redis in isolated kv-store tests (#1490)

innocenzi · brendt · commit f0aa01baf283 · 2025-08-14T09:33:43.000+02:00
diff --git a/.github/workflows/isolated-tests.yml b/.github/workflows/isolated-tests.yml
@@ -61,6 +61,10 @@ jobs:
           extensions: dom, curl, libxml, mbstring, pcntl, fileinfo, intl
           coverage: pcov
 
+      - name: Setup Redis
+        if: ${{ matrix.os != 'windows-latest' && matrix.package.name == 'kv-store' }}
+        uses: supercharge/redis-github-action@1.7.0
+
       - name: Install PHPUnit
         run: composer global require phpunit/phpunit:^12.2.3
 
diff --git a/packages/cryptography/tests/Encryption/EncryptionTest.php b/packages/cryptography/tests/Encryption/EncryptionTest.php
@@ -62,7 +62,7 @@ public function test_time_protection(): void
         $this->assertSame('important data', $encrypter->decrypt($encrypted));
         $elapsed = microtime(true) - $start;
 
-        $this->assertEqualsToMoreOrLess(0.3, $elapsed, margin: 0.015);
+        $this->assertEqualsToMoreOrLess(0.3, $elapsed, margin: 0.020, windowsMargin: 0.025);
     }
 
     public function test_wrong_key(): void
diff --git a/packages/cryptography/tests/HasMoreIntegerAssertions.php b/packages/cryptography/tests/HasMoreIntegerAssertions.php
@@ -6,8 +6,12 @@
 
 trait HasMoreIntegerAssertions
 {
-    private function assertEqualsToMoreOrLess(int|float $expected, int|float $actual, int|float $margin): void
+    private function assertEqualsToMoreOrLess(int|float $expected, int|float $actual, int|float $margin, null|int|float $windowsMargin = null): void
     {
+        if ($windowsMargin && PHP_OS_FAMILY === 'Windows') {
+            $margin = $windowsMargin;
+        }
+
         try {
             $this->assertGreaterThanOrEqual($expected - $margin, $actual);
             $this->assertLessThanOrEqual($expected + $margin, $actual);
diff --git a/packages/cryptography/tests/Signing/SignerTest.php b/packages/cryptography/tests/Signing/SignerTest.php
@@ -166,7 +166,7 @@ public function test_time_protection(): void
         $this->assertTrue($signer->verify($data, $signature));
         $elapsed = microtime(true) - $start;
 
-        $this->assertEqualsToMoreOrLess(0.3, $elapsed, margin: 0.015);
+        $this->assertEqualsToMoreOrLess(0.3, $elapsed, margin: 0.015, windowsMargin: 0.025);
     }
 
     public function test_time_protection_with_mock_clock(): void
diff --git a/packages/cryptography/tests/TimelockTest.php b/packages/cryptography/tests/TimelockTest.php
@@ -31,7 +31,7 @@ public function test_locks_for_duration(): void
 
         $elapsed = microtime(true) - $start;
 
-        $this->assertEqualsToMoreOrLess(0.1, $elapsed, margin: 0.015);
+        $this->assertEqualsToMoreOrLess(0.1, $elapsed, margin: 0.015, windowsMargin: 0.025);
     }
 
     public function test_return_early(): void
@@ -63,7 +63,7 @@ public function test_throws_exception_after_delay(): void
             );
         } catch (\RuntimeException) {
             $elapsed = microtime(true) - $start;
-            $this->assertEqualsToMoreOrLess(0.1, $elapsed, margin: 0.015);
+            $this->assertEqualsToMoreOrLess(0.1, $elapsed, margin: 0.015, windowsMargin: 0.025);
         }
     }
 
diff --git a/packages/kv-store/composer.json b/packages/kv-store/composer.json
@@ -6,6 +6,7 @@
     "require": {
         "php": "^8.4",
         "tempest/support": "dev-main",
+        "tempest/datetime": "dev-main",
         "tempest/event-bus": "dev-main"
     },
     "require-dev": {
diff --git a/packages/kv-store/tests/PhpRedisClientTest.php b/packages/kv-store/tests/PhpRedisClientTest.php
@@ -2,22 +2,22 @@
 
 namespace Tempest\KeyValue\Tests;
 
+use PHPUnit\Framework\Attributes\PostCondition;
+use PHPUnit\Framework\Attributes\PreCondition;
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use PHPUnit\Framework\TestCase;
 use Tempest\KeyValue\Redis\Config\RedisConfig;
 use Tempest\KeyValue\Redis\PhpRedisClient;
+use Throwable;
 
+#[RequiresPhpExtension('redis')]
 final class PhpRedisClientTest extends TestCase
 {
     private PhpRedisClient $redis;
 
-    protected function setUp(): void
+    #[PreCondition]
+    protected function configure(): void
     {
-        parent::setUp();
-
-        if (! extension_loaded('redis') || ! class_exists(\Redis::class)) {
-            $this->markTestSkipped('The `redis` extension is not loaded.');
-        }
-
         $this->redis = new PhpRedisClient(
             client: new \Redis(),
             config: new RedisConfig(
@@ -29,17 +29,17 @@ protected function setUp(): void
 
         try {
             $this->redis->connect();
-        } catch (\Throwable) {
+        } catch (Throwable) {
             $this->markTestSkipped('Could not connect to Redis.');
         }
     }
 
-    protected function tearDown(): void
+    #[PostCondition]
+    protected function cleanup(): void
     {
         try {
             $this->redis->flush();
-        } finally {
-            parent::tearDown();
+        } catch (Throwable) {
         }
     }
 
diff --git a/packages/kv-store/tests/PredisClientTest.php b/packages/kv-store/tests/PredisClientTest.php
@@ -2,19 +2,20 @@
 
 namespace Tempest\KeyValue\Tests;
 
+use PHPUnit\Framework\Attributes\PostCondition;
+use PHPUnit\Framework\Attributes\PreCondition;
 use PHPUnit\Framework\TestCase;
 use Predis;
-use Tempest\KeyValue\Redis\PhpRedisClient;
 use Tempest\KeyValue\Redis\PredisClient;
+use Throwable;
 
 final class PredisClientTest extends TestCase
 {
     private PredisClient $redis;
 
-    protected function setUp(): void
+    #[PreCondition]
+    protected function configure(): void
     {
-        parent::setUp();
-
         if (! class_exists(Predis\Client::class)) {
             $this->markTestSkipped('The `predis/predis` package is not installed.');
         }
@@ -34,17 +35,17 @@ protected function setUp(): void
 
         try {
             $this->redis->connect();
-        } catch (\Throwable) {
+        } catch (Throwable) {
             $this->markTestSkipped('Could not connect to Redis.');
         }
     }
 
-    protected function tearDown(): void
+    #[PostCondition]
+    protected function cleanup(): void
     {
         try {
             $this->redis->flush();
-        } finally {
-            parent::tearDown();
+        } catch (Throwable) {
         }
     }
 
diff --git a/packages/support/tests/Filesystem/UnixFunctionsTest.php b/packages/support/tests/Filesystem/UnixFunctionsTest.php
@@ -2,6 +2,8 @@
 
 namespace Tempest\Support\Tests\Filesystem;
 
+use PHPUnit\Framework\Attributes\PostCondition;
+use PHPUnit\Framework\Attributes\PreCondition;
 use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\TestCase;
 use Tempest\Support\Filesystem;
@@ -17,22 +19,24 @@ final class UnixFunctionsTest extends TestCase
 {
     private string $fixtures = __DIR__ . '/Fixtures';
 
-    protected function setUp(): void
+    #[PreCondition]
+    protected function configure(): void
     {
-        parent::setUp();
-
         if (PHP_OS_FAMILY === 'Windows') {
-            $this->markTestSkipped('Irrelevant on Windows.');
+            $this->markTestSkipped('This test is only for Unix-like systems.');
         }
 
         Filesystem\ensure_directory_empty($this->fixtures);
 
         $this->assertTrue(is_dir($this->fixtures));
     }
 
-    protected function tearDown(): void
+    #[PostCondition]
+    protected function cleanup(): void
     {
-        parent::tearDown();
+        if (PHP_OS_FAMILY === 'Windows') {
+            return;
+        }
 
         Filesystem\delete_directory($this->fixtures);
 
diff --git a/tests/Integration/KeyValue/RedisTest.php b/tests/Integration/KeyValue/RedisTest.php
@@ -2,19 +2,21 @@
 
 namespace Tests\Tempest\Integration\KeyValue;
 
+use PHPUnit\Framework\Attributes\PostCondition;
+use PHPUnit\Framework\Attributes\PreCondition;
 use Tempest\KeyValue\Redis\Config\RedisConfig;
 use Tempest\KeyValue\Redis\Redis;
 use Tempest\KeyValue\Redis\RedisCommandExecuted;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
+use Throwable;
 
 final class RedisTest extends FrameworkIntegrationTestCase
 {
     private Redis $redis;
 
-    protected function setUp(): void
+    #[PreCondition]
+    protected function configure(): void
     {
-        parent::setUp();
-
         $this->eventBus->preventEventHandling();
 
         $this->container->config(new RedisConfig(
@@ -32,12 +34,12 @@ protected function setUp(): void
         }
     }
 
-    protected function tearDown(): void
+    #[PostCondition]
+    protected function cleanup(): void
     {
         try {
             $this->redis->flush();
-        } finally {
-            parent::tearDown();
+        } catch (Throwable) {
         }
     }
 
diff --git a/tests/Integration/Mapper/PsrRequestToRequestMapperTest.php b/tests/Integration/Mapper/PsrRequestToRequestMapperTest.php
@@ -99,23 +99,18 @@ public function test_files(): void
 
     public function test_body_field_in_body(): void
     {
-        $psrRequest = $this->http->makePsrRequest(
-            '/',
-            Method::POST,
-            body: [
-                'body' => 'text',
-            ],
+        $request = new PsrRequestToGenericRequestMapper($this->encrypter)->map(
+            from: $this->http->makePsrRequest(
+                uri: '/',
+                body: [
+                    'body' => 'text',
+                ],
+            ),
+            to: GenericRequest::class,
         );
 
-        $mapper = new PsrRequestToGenericRequestMapper();
-
-        $request = $mapper->map($psrRequest, GenericRequest::class);
-
-        $this->assertSame(
-            [
-                'body' => 'text',
-            ],
-            $request->body,
-        );
+        $this->assertSame([
+            'body' => 'text',
+        ], $request->body);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function test_time_protection(): void`
`62`	`62`	`$this->assertSame('important data', $encrypter->decrypt($encrypted));`
`63`	`63`	`$elapsed = microtime(true) - $start;`
`64`	`64`
`65`		`- $this->assertEqualsToMoreOrLess(0.3, $elapsed, margin: 0.015);`
	`65`	`+ $this->assertEqualsToMoreOrLess(0.3, $elapsed, margin: 0.020, windowsMargin: 0.025);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public function test_wrong_key(): void`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,12 @@`
`6`	`6`
`7`	`7`	`trait HasMoreIntegerAssertions`
`8`	`8`	`{`
`9`		`- private function assertEqualsToMoreOrLess(int\|float $expected, int\|float $actual, int\|float $margin): void`
	`9`	`+ private function assertEqualsToMoreOrLess(int\|float $expected, int\|float $actual, int\|float $margin, null\|int\|float $windowsMargin = null): void`
`10`	`10`	`{`
	`11`	`+ if ($windowsMargin && PHP_OS_FAMILY === 'Windows') {`
	`12`	`+ $margin = $windowsMargin;`
	`13`	`+ }`
	`14`	`+`
`11`	`15`	`try {`
`12`	`16`	`$this->assertGreaterThanOrEqual($expected - $margin, $actual);`
`13`	`17`	`$this->assertLessThanOrEqual($expected + $margin, $actual);`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ public function test_time_protection(): void`
`166`	`166`	`$this->assertTrue($signer->verify($data, $signature));`
`167`	`167`	`$elapsed = microtime(true) - $start;`
`168`	`168`
`169`		`- $this->assertEqualsToMoreOrLess(0.3, $elapsed, margin: 0.015);`
	`169`	`+ $this->assertEqualsToMoreOrLess(0.3, $elapsed, margin: 0.015, windowsMargin: 0.025);`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`public function test_time_protection_with_mock_clock(): void`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function test_locks_for_duration(): void`
`31`	`31`
`32`	`32`	`$elapsed = microtime(true) - $start;`
`33`	`33`
`34`		`- $this->assertEqualsToMoreOrLess(0.1, $elapsed, margin: 0.015);`
	`34`	`+ $this->assertEqualsToMoreOrLess(0.1, $elapsed, margin: 0.015, windowsMargin: 0.025);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public function test_return_early(): void`
`@@ -63,7 +63,7 @@ public function test_throws_exception_after_delay(): void`
`63`	`63`	`);`
`64`	`64`	`} catch (\RuntimeException) {`
`65`	`65`	`$elapsed = microtime(true) - $start;`
`66`		`- $this->assertEqualsToMoreOrLess(0.1, $elapsed, margin: 0.015);`
	`66`	`+ $this->assertEqualsToMoreOrLess(0.1, $elapsed, margin: 0.015, windowsMargin: 0.025);`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -2,19 +2,20 @@`
`2`	`2`
`3`	`3`	`namespace Tempest\KeyValue\Tests;`
`4`	`4`
	`5`	`+use PHPUnit\Framework\Attributes\PostCondition;`
	`6`	`+use PHPUnit\Framework\Attributes\PreCondition;`
`5`	`7`	`use PHPUnit\Framework\TestCase;`
`6`	`8`	`use Predis;`
`7`		`-use Tempest\KeyValue\Redis\PhpRedisClient;`
`8`	`9`	`use Tempest\KeyValue\Redis\PredisClient;`
	`10`	`+use Throwable;`
`9`	`11`
`10`	`12`	`final class PredisClientTest extends TestCase`
`11`	`13`	`{`
`12`	`14`	`private PredisClient $redis;`
`13`	`15`
`14`		`- protected function setUp(): void`
	`16`	`+ #[PreCondition]`
	`17`	`+ protected function configure(): void`
`15`	`18`	`{`
`16`		`- parent::setUp();`
`17`		`-`
`18`	`19`	`if (! class_exists(Predis\Client::class)) {`
`19`	`20`	$this->markTestSkipped('The `predis/predis` package is not installed.');
`20`	`21`	`}`
`@@ -34,17 +35,17 @@ protected function setUp(): void`
`34`	`35`
`35`	`36`	`try {`
`36`	`37`	`$this->redis->connect();`
`37`		`- } catch (\Throwable) {`
	`38`	`+ } catch (Throwable) {`
`38`	`39`	`$this->markTestSkipped('Could not connect to Redis.');`
`39`	`40`	`}`
`40`	`41`	`}`
`41`	`42`
`42`		`- protected function tearDown(): void`
	`43`	`+ #[PostCondition]`
	`44`	`+ protected function cleanup(): void`
`43`	`45`	`{`
`44`	`46`	`try {`
`45`	`47`	`$this->redis->flush();`
`46`		`- } finally {`
`47`		`- parent::tearDown();`
	`48`	`+ } catch (Throwable) {`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`
Original file line number	Diff line number	Diff line change
`@@ -2,19 +2,21 @@`
`2`	`2`
`3`	`3`	`namespace Tests\Tempest\Integration\KeyValue;`
`4`	`4`
	`5`	`+use PHPUnit\Framework\Attributes\PostCondition;`
	`6`	`+use PHPUnit\Framework\Attributes\PreCondition;`
`5`	`7`	`use Tempest\KeyValue\Redis\Config\RedisConfig;`
`6`	`8`	`use Tempest\KeyValue\Redis\Redis;`
`7`	`9`	`use Tempest\KeyValue\Redis\RedisCommandExecuted;`
`8`	`10`	`use Tests\Tempest\Integration\FrameworkIntegrationTestCase;`
	`11`	`+use Throwable;`
`9`	`12`
`10`	`13`	`final class RedisTest extends FrameworkIntegrationTestCase`
`11`	`14`	`{`
`12`	`15`	`private Redis $redis;`
`13`	`16`
`14`		`- protected function setUp(): void`
	`17`	`+ #[PreCondition]`
	`18`	`+ protected function configure(): void`
`15`	`19`	`{`
`16`		`- parent::setUp();`
`17`		`-`
`18`	`20`	`$this->eventBus->preventEventHandling();`
`19`	`21`
`20`	`22`	`$this->container->config(new RedisConfig(`
`@@ -32,12 +34,12 @@ protected function setUp(): void`
`32`	`34`	`}`
`33`	`35`	`}`
`34`	`36`
`35`		`- protected function tearDown(): void`
	`37`	`+ #[PostCondition]`
	`38`	`+ protected function cleanup(): void`
`36`	`39`	`{`
`37`	`40`	`try {`
`38`	`41`	`$this->redis->flush();`
`39`		`- } finally {`
`40`		`- parent::tearDown();`
	`42`	`+ } catch (Throwable) {`
`41`	`43`	`}`
`42`	`44`	`}`
`43`	`45`