Fix #40: Make RedisCache::$client readonly

s1lver · web-flow · commit 0886627ff269 · 2026-01-11T23:34:22.000+03:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,6 +27,7 @@ jobs:
           - '8.2'
           - '8.3'
           - '8.4'
+          - '8.5'
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml
@@ -21,4 +21,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1', '8.2', '8.3', '8.4']
+        ['8.1', '8.2', '8.3', '8.4', '8.5']
diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [ 'ubuntu-latest' ]
-        php: [ '8.4' ]
+        php: [ '8.5' ]
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest']
-        php: ['8.1', '8.2', '8.3', '8.4']
+        php: ['8.1', '8.2', '8.3', '8.4', '8.5']
 
     steps:
       - name: Checkout
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Enh #30: Remove unneeded casting to array in private method `RedisCache::iterableToArray()` (@vjik)
 - Chg #38: Bump minimum PHP version to `8.1` (@s1lver)
+- Chg #40: Make `RedisCache::$client` readonly (@s1lver)
 
 ## 2.0.0 July 10, 2023
 
diff --git a/composer.json b/composer.json
@@ -29,10 +29,8 @@
             "url": "https://github.com/sponsors/yiisoft"
         }
     ],
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "require": {
-        "php": "^8.1",
+        "php": "8.1 - 8.5",
         "predis/predis": "^v3.0.0",
         "psr/simple-cache": "^3.0"
     },
diff --git a/src/RedisCache.php b/src/RedisCache.php
@@ -38,7 +38,7 @@ final class RedisCache implements CacheInterface
     /**
      * @param ClientInterface $client Predis client instance to use.
      */
-    public function __construct(private ClientInterface $client)
+    public function __construct(private readonly ClientInterface $client)
     {
         $this->connections = $this->client->getConnection();
     }
diff --git a/tests/RedisCacheTest.php b/tests/RedisCacheTest.php
@@ -10,6 +10,7 @@
 use IteratorAggregate;
 use PHPUnit\Framework\TestCase;
 use Predis\ClientInterface;
+use Predis\Connection\ConnectionInterface;
 use Psr\SimpleCache\InvalidArgumentException;
 use Predis\Client;
 use ReflectionException;
@@ -257,19 +258,18 @@ public function testSetMultipleFailure(): void
     {
         $client = $this
             ->getMockBuilder(ClientInterface::class)
+            ->onlyMethods(['getConnection'])
             ->addMethods(['exec'])
-            ->getMockForAbstractClass()
-        ;
+            ->getMockForAbstractClass();
 
-        $client
+        $client->method('getConnection')
+            ->willReturn($this->createMock(ConnectionInterface::class));
+
+        $client->expects($this->once())
             ->method('exec')
             ->willReturn([null]);
 
-        $reflection = new ReflectionObject($this->cache);
-        $property = $reflection->getProperty('client');
-        $property->setValue($this->cache, $client);
-
-        $this->assertFalse($this->cache->setMultiple(['key' => 'value'], time()));
+        $this->assertFalse((new RedisCache($client))->setMultiple(['key' => 'value'], time()));
     }
 
     public function testGetMultiple(): void
diff --git a/tests/docker/php/Dockerfile b/tests/docker/php/Dockerfile
@@ -5,7 +5,8 @@ FROM php:${PHP_VERSION}-cli-alpine
 
 RUN apk add unzip zlib-dev libzip-dev libsodium-dev icu-dev autoconf g++ make
 
-RUN docker-php-ext-install zip opcache bcmath sodium intl
+RUN docker-php-ext-install zip bcmath sodium intl \
+    && docker-php-ext-install opcache || true # For backward compatibility with PHP versions below 8.5
 RUN pecl install pcov
 RUN docker-php-ext-enable pcov
 

-Original file line number
+Diff line change
           - '8.2'
           - '8.3'
           - '8.4'
 +          - '8.5'
     steps:
       - name: Checkout
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ final class RedisCache implements CacheInterface`
`38`	`38`	`/**`
`39`	`39`	`* @param ClientInterface $client Predis client instance to use.`
`40`	`40`	`*/`
`41`		`- public function __construct(private ClientInterface $client)`
	`41`	`+ public function __construct(private readonly ClientInterface $client)`
`42`	`42`	`{`
`43`	`43`	`$this->connections = $this->client->getConnection();`
`44`	`44`	`}`