feat: migrate tests to Testo, require PHP 8.2

.gitattributes

@@ -1,7 +1,7 @@
 /.github            export-ignore
 /.gitattributes     export-ignore
 /.gitignore         export-ignore
-/phpunit.xml.dist   export-ignore
+/testo.php          export-ignore
 /tests              export-ignore
 /.editorconfig      export-ignore
 /.php_cs.dist.php   export-ignore

.github/workflows/psalm.yml

@@ -2,7 +2,7 @@ on:
   pull_request: null
   push:
     branches:
-      - '*.*'
+      - '1.x'
 
 name: static analysis
 

.github/workflows/testo.yml

@@ -0,0 +1,16 @@
+on:
+  pull_request: null
+  push:
+    branches:
+      - '1.x'
+
+name: testo
+
+jobs:
+  testo:
+    uses: spiral/gh-actions/.github/workflows/testo.yml@master
+    with:
+      os: >-
+        ['ubuntu-latest']
+      dependencies: >-
+        ['lowest', 'highest']

.gitignore

@@ -1,7 +1,6 @@
 .idea
 .php_cs
 .php_cs.cache
-.phpunit.result.cache
 build
 composer.lock
 coverage

README.md

@@ -29,7 +29,7 @@ processes connected to the RoadRunner server.
 
 Make sure that your server is configured with following PHP version and extensions:
 
-- PHP 8.1+
+- PHP 8.2+
 
 ### Installation
 

composer.json

@@ -44,15 +44,16 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ramsey/uuid": "^4.7",
         "roadrunner-php/roadrunner-api-dto": "^1.0",
         "spiral/goridge": "^4.0"
     },
     "require-dev": {
-        "mockery/mockery": "^1.5",
-        "phpunit/phpunit": "^10.0",
-        "vimeo/psalm": "^5.9"
+        "mockery/mockery": "^1.6",
+        "testo/bridge-mockery": "^0.1.2",
+        "testo/testo": "^0.10.55",
+        "vimeo/psalm": "^6 || ^7"
     },
     "autoload": {
         "psr-4": {
@@ -65,7 +66,7 @@
         }
     },
     "scripts": {
-        "test": "vendor/bin/phpunit",
+        "test": "vendor/bin/testo",
         "psalm": "vendor/bin/psalm --config=psalm.xml ./src --show-info=true"
     },
     "config": {

psalm.xml

@@ -13,4 +13,14 @@
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
+    <issueHandlers>
+        <!-- #[\Override] is a PHP 8.3 attribute, the package still supports PHP 8.2 -->
+        <MissingOverrideAttribute errorLevel="suppress" />
+        <!-- int|float TTL multiplied by an int, the product is rounded and cast to int right away -->
+        <InvalidOperand>
+            <errorLevel type="suppress">
+                <file name="src/Lock.php" />
+            </errorLevel>
+        </InvalidOperand>
+    </issueHandlers>
 </psalm>

testo.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+use Testo\Application\Config\ApplicationConfig;
+use Testo\Application\Config\SuiteConfig;
+use Testo\Bridge\Mockery\MockeryPlugin;
+
+return new ApplicationConfig(
+    src: ['src'],
+    suites: [
+        new SuiteConfig(
+            name: 'Unit',
+            location: ['tests/src'],
+        ),
+    ],
+    plugins: [
+        new MockeryPlugin(),
+    ],
+);

tests/src/LockTest.php

@@ -12,17 +12,22 @@
 use RoadRunner\Lock\LockIdGeneratorInterface;
 use Spiral\Goridge\RPC\Codec\ProtobufCodec;
 use Spiral\Goridge\RPC\RPCInterface;
-
-final class LockTest extends TestCase
+use Testo\Assert;
+use Testo\Assert\ExpectException;
+use Testo\Data\DataProvider;
+use Testo\Lifecycle\BeforeTest;
+use Testo\Test;
+
+#[Test]
+final class LockTest
 {
     private RPCInterface|MockInterface $rpc;
     private LockIdGeneratorInterface|MockInterface $idGenerator;
     private Lock $lock;
 
+    #[BeforeTest]
     protected function setUp(): void
     {
-        parent::setUp();
-
         $this->rpc = m::mock(RPCInterface::class);
 
         $this->rpc->shouldReceive('withCodec')
@@ -34,9 +39,7 @@ protected function setUp(): void
         $this->lock = new Lock($this->rpc, $this->idGenerator);
     }
 
-    /**
-     * @dataProvider lockTypeDataProvider
-     */
+    #[DataProvider('lockTypeDataProvider')]
     public function testLock(
         string $method,
         string $callMethod,
@@ -69,15 +72,13 @@ public function testLock(
 
         $result = $this->lock->$method(resource: 'resource', id: $id, ttl: $ttl, waitTTL: $wait);
         if ($expectedResult) {
-            $this->assertSame(($id === null ? 'some-id' : $id), $result);
+            Assert::same($result, ($id === null ? 'some-id' : $id));
         } else {
-            $this->assertFalse($result);
+            Assert::false($result);
         }
     }
 
-    /**
-     * @dataProvider resultDataProvider
-     */
+    #[DataProvider('resultDataProvider')]
     public function testRelease(bool $result): void
     {
         $this->rpc->shouldReceive('call')
@@ -90,12 +91,10 @@ public function testRelease(bool $result): void
             })
             ->andReturn(new Response(['ok' => $result]));
 
-        $this->assertSame($result, $this->lock->release('resource', 'some-id'));
+        Assert::same($this->lock->release('resource', 'some-id'), $result);
     }
 
-    /**
-     * @dataProvider resultDataProvider
-     */
+    #[DataProvider('resultDataProvider')]
     public function testForceRelease(bool $result): void
     {
         $this->rpc->shouldReceive('call')
@@ -108,12 +107,10 @@ public function testForceRelease(bool $result): void
             })
             ->andReturn(new Response(['ok' => $result]));
 
-        $this->assertSame($result, $this->lock->forceRelease('resource'));
+        Assert::same($this->lock->forceRelease('resource'), $result);
     }
 
-    /**
-     * @dataProvider resultDataProvider
-     */
+    #[DataProvider('resultDataProvider')]
     public function testExists(bool $result): void
     {
         $this->rpc->shouldReceive('call')
@@ -126,12 +123,10 @@ public function testExists(bool $result): void
             })
             ->andReturn(new Response(['ok' => $result]));
 
-        $this->assertSame($result, $this->lock->exists('resource'));
+        Assert::same($this->lock->exists('resource'), $result);
     }
 
-    /**
-     * @dataProvider updateTTLDataProvider
-     */
+    #[DataProvider('updateTTLDataProvider')]
     public function testUpdateTTL($ttl, int $expectedTtl, bool $result): void
     {
         $this->rpc->shouldReceive('call')
@@ -145,12 +140,10 @@ public function testUpdateTTL($ttl, int $expectedTtl, bool $result): void
             })
             ->andReturn(new Response(['ok' => $result]));
 
-        $this->assertSame($result, $this->lock->updateTTL('resource', 'some-id', $ttl));
+        Assert::same($this->lock->updateTTL('resource', 'some-id', $ttl), $result);
     }
 
-    /**
-     * @dataProvider resultDataProvider
-     */
+    #[DataProvider('resultDataProvider')]
     public function testExistsWithId(bool $result): void
     {
         $this->rpc->shouldReceive('call')
@@ -163,7 +156,7 @@ public function testExistsWithId(bool $result): void
             })
             ->andReturn(new Response(['ok' => $result]));
 
-        $this->assertSame($result, $this->lock->exists('resource', 'some-id'));
+        Assert::same($this->lock->exists('resource', 'some-id'), $result);
     }
 
     public static function lockTypeDataProvider(): \Generator
@@ -220,33 +213,33 @@ public static function resultDataProvider(): \Traversable
         yield [false];
     }
 
+    #[ExpectException(\LogicException::class)]
     public function testLockNegativeTtl(): void
     {
-        self::expectException(\LogicException::class);
         $this->lock->lock('resource', 'uuid', -300);
     }
 
+    #[ExpectException(\LogicException::class)]
     public function testLockNegativeWaitTtl(): void
     {
-        self::expectException(\LogicException::class);
         $this->lock->lock('resource', 'uuid', 0, -300);
     }
 
+    #[ExpectException(\LogicException::class)]
     public function testLockReadNegativeTtl(): void
     {
-        self::expectException(\LogicException::class);
         $this->lock->lock('resource', 'uuid', -300);
     }
 
+    #[ExpectException(\LogicException::class)]
     public function testLockReadNegativeWaitTtl(): void
     {
-        self::expectException(\LogicException::class);
         $this->lock->lockRead('resource', 'uuid', 0, -300);
     }
 
+    #[ExpectException(\LogicException::class)]
     public function testUpdateNegativeWaitTtl(): void
     {
-        self::expectException(\LogicException::class);
         $this->lock->updateTTL('resource', 'uuid', -300);
     }
 }