Support phpunit 10

snc · Dec 16, 2023 · ade5cb9 · ade5cb9
1 parent 3ea0156
commit ade5cb9
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 35 deletions.
diff --git a/composer.json b/composer.json
@@ -31,18 +31,18 @@
     "require-dev": {
         "ext-pdo_sqlite": "*",
         "ext-redis": "*",
-        "doctrine/annotations": "^1.13",
+        "doctrine/annotations": "^1.13 || ^2.0",
         "doctrine/coding-standard": "^12.0",
         "friendsofphp/proxy-manager-lts": "^1.0.6",
         "monolog/monolog": "*",
-        "phpunit/phpunit": "^8.5.32 || ^9.5.28",
+        "phpunit/phpunit": "^9.5.28 || ^10",
         "predis/predis": "^2.0",
+        "seec/phpunit-consecutive-params": "dev-master",
         "symfony/browser-kit": "^4.4 || ^5.3 || ^6.0 || ^7.0",
         "symfony/cache": "^4.4 || ^5.3 || ^6.0 || ^7.0",
         "symfony/console": "^4.4 || ^5.3 || ^6.0 || ^7.0",
         "symfony/dom-crawler": "^4.4 || ^5.3 || ^6.0 || ^7.0",
         "symfony/filesystem": "^4.4 || ^5.3 || ^6.0 || ^7.0",
-        "symfony/phpunit-bridge": "^6.0 || ^7.0",
         "symfony/profiler-pack": "^1.0",
         "symfony/stopwatch": "^4.4 || ^5.3 || ^6.0 || ^7.0",
         "symfony/twig-bundle": "^4.4 || ^5.3 || ^6.0 || ^7.0",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          colors="true"
          bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-        <env name="SHELL_VERBOSITY" value="-1" />
-    </php>
-
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-    </listeners>
-
-    <testsuites>
-        <testsuite name="RedisBundle Test Suite">
-            <directory>./tests</directory>
-        </testsuite>
-    </testsuites>
+         cacheDirectory=".phpunit.cache">
+  <php>
+    <ini name="error_reporting" value="-1"/>
+    <env name="SHELL_VERBOSITY" value="-1"/>
+  </php>
+  <testsuites>
+    <testsuite name="RedisBundle Test Suite">
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/tests/DependencyInjection/Configuration/RedisDsnTest.php b/tests/DependencyInjection/Configuration/RedisDsnTest.php
@@ -19,7 +19,7 @@
 class RedisDsnTest extends TestCase
 {
     /** @return list<list<string>> */
-    public function hostValues(): array
+    public static function hostValues(): array
     {
         return [
             ['redis://localhost', 'localhost'],
@@ -108,7 +108,7 @@ public function testSocket(string $dsn, string $socket): void
     }
 
     /** @return list<array{0: string, 1:bool}> */
-    public function tlsValues(): array
+    public static function tlsValues(): array
     {
         return [
             ['redis://localhost', false],

diff --git a/tests/Factory/PhpredisClientFactoryTest.php b/tests/Factory/PhpredisClientFactoryTest.php
@@ -10,6 +10,7 @@
 use Redis;
 use RedisCluster;
 use Relay\Relay;
+use SEEC\PhpUnit\Helper\ConsecutiveParams;
 use Snc\RedisBundle\Factory\PhpredisClientFactory;
 use Snc\RedisBundle\Logger\RedisCallInterceptor;
 use Snc\RedisBundle\Logger\RedisLogger;
@@ -23,6 +24,8 @@
 
 class PhpredisClientFactoryTest extends TestCase
 {
+    use ConsecutiveParams;
+
     private MockObject $logger;
     private RedisLogger $redisLogger;
 
@@ -56,9 +59,9 @@ public function testCreateMinimalConfig(): void
     /** @requires extension relay */
     public function testCreateRelay(): void
     {
-        $this->logger->method('debug')->withConsecutive(
+        $this->logger->method('debug')->with(...$this->withConsecutive(
             [$this->stringContains('Executing command "CONNECT localhost 6379 5 <null>')],
-        );
+        ));
 
         $client = (new PhpredisClientFactory(new RedisCallInterceptor($this->redisLogger)))
             ->create(Relay::class, ['redis://localhost:6379'], ['connection_timeout' => 5], 'default', true);
@@ -109,10 +112,12 @@ public function testCreateMinimalClusterConfig(): void
      */
     public function testCreateSentinelConfig(string $sentinelClass, string $outputClass): void
     {
-        $this->logger->method('debug')->withConsecutive(
+        $this->logger->method('debug')->with(...$this->withConsecutive(
             [$this->stringContains('Executing command "CONNECT 127.0.0.1 6379 5 <null>')],
             ['Executing command "AUTH sncredis"'],
-        );
+            ['Executing command "GETTIMEOUT"'],
+            ['Executing command "GETAUTH"'],
+        ));
         $factory = new PhpredisClientFactory(new RedisCallInterceptor($this->redisLogger));
 
         $client = $factory->create(
@@ -171,11 +176,13 @@ public function testCreateFullConfig(): void
 
     public function testDsnConfig(): void
     {
-        $this->logger->method('debug')->withConsecutive(
+        $this->logger->method('debug')->with(...$this->withConsecutive(
             [$this->stringContains('Executing command "CONNECT localhost 6379 5')],
             ['Executing command "AUTH sncredis"'],
             ['Executing command "SELECT 2"'],
-        );
+            ['Executing command "GETDBNUM"'],
+            ['Executing command "GETAUTH"'],
+        ));
 
         $factory = new PhpredisClientFactory(new RedisCallInterceptor($this->redisLogger));
 
@@ -201,11 +208,13 @@ public function testDsnConfig(): void
 
     public function testDsnConfigWithUsername(): void
     {
-        $this->logger->method('debug')->withConsecutive(
+        $this->logger->method('debug')->with(...$this->withConsecutive(
             [$this->stringContains('Executing command "CONNECT localhost 7099 5')],
             ['Executing command "AUTH snc_redis snc_password"'],
             ['Executing command "SELECT 0"'],
-        );
+            ['Executing command "GETDBNUM"'],
+            ['Executing command "GETAUTH"'],
+        ));
 
         $factory = new PhpredisClientFactory(new RedisCallInterceptor($this->redisLogger));
 
@@ -290,7 +299,7 @@ public function testLoadSerializationTypeFail(): void
     }
 
     /** @return list<array{0: string, 1: Redis::SERIALIZER_*}> */
-    public function serializationTypes(): array
+    public static function serializationTypes(): array
     {
         return [
             ['default', Redis::SERIALIZER_NONE],
@@ -302,14 +311,14 @@ public function serializationTypes(): array
 
     public function testMethodsWithVariadicParameters(): void
     {
-        $this->logger->method('debug')->withConsecutive(
+        $this->logger->method('debug')->with(...$this->withConsecutive(
             [$this->stringContains('Executing command "CONNECT localhost 6379 5')],
             ['Executing command "AUTH sncredis"'],
             ['Executing command "SELECT 2"'],
             ['Executing command "RAWCOMMAND scan fleet cursor 0 limit 10"'],
             ['Executing command "HDEL foo bar"'],
             ['Executing command "UNLINK bar baz"'],
-        );
+        ));
 
         $factory = new PhpredisClientFactory(new RedisCallInterceptor($this->redisLogger));
 
@@ -335,14 +344,14 @@ public function testMethodsWithVariadicParameters(): void
 
     public function testMethodWithPassByRefArgument(): void
     {
-        $this->logger->method('debug')->withConsecutive(
+        $this->logger->method('debug')->with(...$this->withConsecutive(
             [$this->stringContains('Executing command "CONNECT localhost 6379 5')],
             ['Executing command "AUTH sncredis"'],
             ['Executing command "SELECT 2"'],
             ['Executing command "SSCAN set 1 <null> 0"'],
             ['Executing command "SET mykey myvalue <null>"'],
             ['Executing command "SCAN <null> <null> ' . (version_compare(phpversion('redis'), '6', '<') ? '' : '0 ') . '<null>"'],
-        );
+        ));
 
         $factory = new PhpredisClientFactory(new RedisCallInterceptor($this->redisLogger));
 

diff --git a/tests/Factory/PredisParametersFactoryTest.php b/tests/Factory/PredisParametersFactoryTest.php
@@ -15,7 +15,7 @@
 class PredisParametersFactoryTest extends TestCase
 {
     /** @return array<array{0: string, 1: class-string, 2: array<string, mixed>, 3: array<string, mixed>}> */
-    public function createDp(): array
+    public static function createDp(): array
     {
         return [
             [