Merge pull request #28 from ray-di/php8.4

Enable PHP 8.4 compat
ray-di · Jan 10, 2025 · d550309 · d550309
2 parents 81d262d + 63bc7bd
commit d550309
Show file tree

Hide file tree

Showing 26 changed files with 478 additions and 507 deletions.
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -9,4 +9,4 @@ jobs:
   cs:
     uses: ray-di/.github/.github/workflows/coding-standards.yml@v1
     with:
-      php_version: 8.3
+      php_version: 8.4
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -26,9 +26,6 @@ jobs:
           - ubuntu-latest
           - windows-latest
         php-version:
-          - '7.3'
-          - '7.4'
-          - '8.0'
           - '8.1'
           - '8.2'
           - '8.3'

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -9,5 +9,5 @@ jobs:
   sa:
     uses: ray-di/.github/.github/workflows/static-analysis.yml@v1
     with:
-      php_version: 8.3
+      php_version: 8.4
       has_crc_config: true
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "ray/psr-cache-module",
-    "description": "",
+    "description": "PSR-6 PSR-16 cache module for Ray.Di",
     "license": "MIT",
     "authors": [
         {
@@ -9,10 +9,10 @@
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^8.1",
         "psr/cache": "^1.0.1 || ^2.0 || ^3.0",
         "ray/di": "^2.13.2",
-        "symfony/cache": "^5.3.4 || ^6.0 || ^7.1",
+        "symfony/cache": "^6.0 || ^7.2",
         "doctrine/annotations": "^1.13 || ^2.0",
         "psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
         "ray/aop": "^2.10.4"

diff --git a/src/Annotation/CacheDir.php b/src/Annotation/CacheDir.php
@@ -17,11 +17,7 @@
 #[Qualifier]
 final class CacheDir
 {
-    /** @var string */
-    public $value;
-
-    public function __construct(string $value)
+    public function __construct(public string $value = '')
     {
-        $this->value = $value;
     }
 }
diff --git a/src/Annotation/CacheNamespace.php b/src/Annotation/CacheNamespace.php
@@ -17,11 +17,7 @@
 #[Qualifier]
 final class CacheNamespace
 {
-    /** @var string */
-    public $value;
-
-    public function __construct(string $value)
+    public function __construct(public string $value = '')
     {
-        $this->value = $value;
     }
 }
diff --git a/src/Annotation/Local.php b/src/Annotation/Local.php
@@ -17,11 +17,7 @@
 #[Qualifier]
 final class Local
 {
-    /** @var string */
-    public $value;
-
-    public function __construct(string $value = 'cache')
+    public function __construct(public string $value = '')
     {
-        $this->value = $value;
     }
 }
diff --git a/src/Annotation/MemcacheConfig.php b/src/Annotation/MemcacheConfig.php
@@ -17,11 +17,7 @@
 #[Qualifier]
 final class MemcacheConfig
 {
-    /** @var string */
-    public $value;
-
-    public function __construct(string $value)
+    public function __construct(public string $value = '')
     {
-        $this->value = $value;
     }
 }
diff --git a/src/Annotation/RedisConfig.php b/src/Annotation/RedisConfig.php
@@ -17,11 +17,7 @@
 #[Qualifier]
 final class RedisConfig
 {
-    /** @var string */
-    public $value;
-
-    public function __construct(string $value)
+    public function __construct(public string $value = '')
     {
-        $this->value = $value;
     }
 }
diff --git a/src/Annotation/RedisInstance.php b/src/Annotation/RedisInstance.php
@@ -9,10 +9,14 @@
 
 /**
  * @Annotation
- * @Qualifier()
+ * @Qualifier
+ * @NamedArgumentConstructor
  */
 #[Attribute]
 #[Qualifier]
 final class RedisInstance
 {
+    public function __construct(public string $value = '')
+    {
+    }
 }
diff --git a/src/Annotation/Shared.php b/src/Annotation/Shared.php
@@ -17,11 +17,7 @@
 #[Qualifier]
 final class Shared
 {
-    /** @var string */
-    public $value;
-
-    public function __construct(string $value = 'cache')
+    public function __construct(public string $value = '')
     {
-        $this->value = $value;
     }
 }
diff --git a/src/CacheDirModule.php b/src/CacheDirModule.php
@@ -9,13 +9,8 @@
 
 final class CacheDirModule extends AbstractModule
 {
-    /** @var string */
-    private $cacheDir;
-
-    public function __construct(string $cacheDir, ?AbstractModule $module = null)
+    public function __construct(private readonly string $cacheDir, ?AbstractModule $module = null)
     {
-        $this->cacheDir = $cacheDir;
-
         parent::__construct($module);
     }
 

diff --git a/src/CacheNamespaceModule.php b/src/CacheNamespaceModule.php
@@ -9,13 +9,8 @@
 
 final class CacheNamespaceModule extends AbstractModule
 {
-    /** @var string */
-    private $namespace;
-
-    public function __construct(string $namespace, ?AbstractModule $module = null)
+    public function __construct(private readonly string $namespace, ?AbstractModule $module = null)
     {
-        $this->namespace = $namespace;
-
         parent::__construct($module);
     }
 

diff --git a/src/FilesystemAdapter.php b/src/FilesystemAdapter.php
@@ -17,14 +17,14 @@ class FilesystemAdapter extends OriginAdapter implements Serializable
 {
     use SerializableTrait;
 
-    /**
-     * @CacheNamespace("namespace")
-     * @CacheDir("directory")
-     */
-    #[CacheNamespace('namespace')]
-    #[CacheDir('directory')]
-    public function __construct(string $namespace = '', int $defaultLifetime = 0, ?string $directory = null, ?MarshallerInterface $marshaller = null)
-    {
+    public function __construct(
+        #[CacheNamespace]
+        string $namespace = '',
+        int $defaultLifetime = 0,
+        #[CacheDir]
+        ?string $directory = null,
+        ?MarshallerInterface $marshaller = null
+    ) {
         $this->args = func_get_args();
 
         parent::__construct($namespace, $defaultLifetime, $directory, $marshaller);

diff --git a/src/LocalCacheProvider.php b/src/LocalCacheProvider.php
@@ -23,15 +23,11 @@ final class LocalCacheProvider implements ProviderInterface
     /** @var string  */
     private $cacheDir;
 
-    /** @var string  */
-    private $namespace;
-
     #[CacheDir('cacheDir')]
     #[CacheNamespace('namespace')]
-    public function __construct(string $cacheDir = '', string $namespace = '')
+    public function __construct(string $cacheDir = '', private readonly string $namespace = '')
     {
         $this->cacheDir = $cacheDir ?: sys_get_temp_dir();
-        $this->namespace = $namespace;
     }
 
     public function get(): AbstractAdapter

diff --git a/src/MemcachedProvider.php b/src/MemcachedProvider.php
@@ -11,23 +11,19 @@
 /** @implements ProviderInterface<Memcached> */
 class MemcachedProvider implements ProviderInterface
 {
-    /**
-     * memcached server list
-     *
-     * @var array<array<string>>
-     */
-    private $servers;
-
     /**
      * @param array<array<string>> $servers
      *
      * @MemcacheConfig("servers")
      * @see https://www.php.net/manual/en/memcached.addservers.php
      */
     #[MemcacheConfig('servers')]
-    public function __construct(array $servers)
-    {
-        $this->servers = $servers;
+    public function __construct(
+        /**
+         * memcached server list
+         */
+        private readonly array $servers
+    ) {
     }
 
     /**

diff --git a/src/PhpFileAdapter.php b/src/PhpFileAdapter.php
@@ -15,10 +15,13 @@ class PhpFileAdapter extends OriginAdapter implements Serializable
 {
     use SerializableTrait;
 
-    /** @CacheNamespace("namespace") */
-    #[CacheNamespace('namespace')]
-    public function __construct(string $namespace = '', int $defaultLifetime = 0, ?string $directory = null, bool $appendOnly = false)
-    {
+    public function __construct(
+        #[CacheNamespace]
+        string $namespace = '',
+        int $defaultLifetime = 0,
+        ?string $directory = null,
+        bool $appendOnly = false
+    ) {
         $this->args = func_get_args();
 
         parent::__construct($namespace, $defaultLifetime, $directory, $appendOnly);

diff --git a/src/Psr6MemcachedModule.php b/src/Psr6MemcachedModule.php
@@ -23,9 +23,7 @@ final class Psr6MemcachedModule extends AbstractModule
 
     public function __construct(string $servers, ?AbstractModule $module = null)
     {
-        $this->servers = array_map(static function ($serverString) {
-            return explode(':', $serverString);
-        }, explode(',', $servers));
+        $this->servers = array_map(static fn ($serverString) => explode(':', $serverString), explode(',', $servers));
 
         parent::__construct($module);
     }

diff --git a/src/RedisAdapter.php b/src/RedisAdapter.php
@@ -19,16 +19,15 @@ class RedisAdapter extends OriginAdapter implements Serializable
 {
     use SerializableTrait;
 
-    /**
-     * @param ProviderInterface<Redis> $redisProvider
-     *
-     * @CacheNamespace("namespace")
-     * @Named("redisProvider=redis")
-     */
-    #[CacheNamespace('namespace')]
-    #[Named('redisProvider=redis')]
-    public function __construct(ProviderInterface $redisProvider, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null)
-    {
+    /** @param ProviderInterface<Redis> $redisProvider */
+    public function __construct(
+        #[Named('redis')]
+        ProviderInterface $redisProvider,
+        #[CacheNamespace]
+        string $namespace = '',
+        int $defaultLifetime = 0,
+        ?MarshallerInterface $marshaller = null
+    ) {
         $this->args = func_get_args();
 
         parent::__construct($redisProvider->get(), $namespace, $defaultLifetime, $marshaller);

diff --git a/src/RedisProvider.php b/src/RedisProvider.php
@@ -14,18 +14,14 @@
 /** @implements ProviderInterface<Redis> */
 class RedisProvider implements ProviderInterface
 {
-    /** @var list<string> */
-    private $server;
-
     /**
      * @param list<string> $server
      *
      * @RedisConfig("server")
      */
     #[RedisConfig('server')]
-    public function __construct(array $server)
+    public function __construct(private array $server)
     {
-        $this->server = $server;
     }
 
     /**

diff --git a/tests/MemcachedAdapterTest.php b/tests/MemcachedAdapterTest.php
@@ -20,12 +20,8 @@ public function testSerialize(): array
     {
         $provider = new MemcachedProvider([['127.0.0.1', '11211']]);
         $adapter = new MemcachedAdapter($provider);
-        $adapter->get('foo', static function (ItemInterface $item) {
-            return 'foobar';
-        });
-        $foo = $adapter->get('foo', static function (ItemInterface $item) {
-            return '_no_serve_';
-        });
+        $adapter->get('foo', static fn (ItemInterface $item) => 'foobar');
+        $foo = $adapter->get('foo', static fn (ItemInterface $item) => '_no_serve_');
         $this->assertSame('foobar', $foo);
         $string = serialize($adapter);
         $this->assertIsString($string);
@@ -41,15 +37,11 @@ public function testSerialize(): array
     public function testUnserialize(array $adapters): void
     {
         $this->assertInstanceOf(MemcachedAdapter::class, $adapters[1]);
-        $this->assertSame('foobar', $adapters[1]->get('foo', static function (ItemInterface $item) {
-            return '_no_serve_in_object';
-        }));
+        $this->assertSame('foobar', $adapters[1]->get('foo', static fn (ItemInterface $item) => '_no_serve_in_object'));
 
         $adapter0 = unserialize($adapters[0]);
         $this->assertInstanceOf(MemcachedAdapter::class, $adapter0);
-        $this->assertSame('foobar', $adapter0->get('foo', static function (ItemInterface $item) {
-            return '_no_serve_in_serialize';
-        }));
+        $this->assertSame('foobar', $adapter0->get('foo', static fn (ItemInterface $item) => '_no_serve_in_serialize'));
     }
 
     public function testCacheNamespaceModule(): void

diff --git a/tests/RedisAdapterTest.php b/tests/RedisAdapterTest.php
@@ -21,12 +21,8 @@ public function testSerialize(): array
     {
         $provider = new RedisProvider(['127.0.0.1', '6379']);
         $adapter = new RedisAdapter($provider);
-        $adapter->get('foo', static function (ItemInterface $item) {
-            return 'foobar';
-        });
-        $foo = $adapter->get('foo', static function (ItemInterface $item) {
-            return '_no_serve_';
-        });
+        $adapter->get('foo', static fn (ItemInterface $item) => 'foobar');
+        $foo = $adapter->get('foo', static fn (ItemInterface $item) => '_no_serve_');
         $this->assertSame('foobar', $foo);
         $string = serialize($adapter);
         $this->assertIsString($string);
@@ -42,15 +38,11 @@ public function testSerialize(): array
     public function testUnserialize(array $adapters): void
     {
         $this->assertInstanceOf(RedisAdapter::class, $adapters[1]);
-        $this->assertSame('foobar', $adapters[1]->get('foo', static function (ItemInterface $item) {
-            return '_no_serve_in_object';
-        }));
+        $this->assertSame('foobar', $adapters[1]->get('foo', static fn (ItemInterface $item) => '_no_serve_in_object'));
 
         $adapter0 = unserialize($adapters[0]);
         $this->assertInstanceOf(RedisAdapter::class, $adapter0);
-        $this->assertSame('foobar', $adapter0->get('foo', static function (ItemInterface $item) {
-            return '_no_serve_in_serialize';
-        }));
+        $this->assertSame('foobar', $adapter0->get('foo', static fn (ItemInterface $item) => '_no_serve_in_serialize'));
     }
 
     public function testCacheNamespaceModule(): void

diff --git a/vendor-bin/metrics/composer.json b/vendor-bin/metrics/composer.json
@@ -0,0 +1,5 @@
+{
+    "require-dev": {
+        "phpmetrics/phpmetrics": "^2.8"
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,9 +26,6 @@ jobs: @@
               - ubuntu-latest
               - windows-latest
             php-version:
-              - '7.3'
-              - '7.4'
-              - '8.0'
               - '8.1'
               - '8.2'
               - '8.3'
@@ Expand Down @@