Symfony cache v6 support

.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.1
+      php_version: 8.2

.github/workflows/continuous-integration.yml

@@ -30,6 +30,7 @@ jobs:
           - '7.4'
           - '8.0'
           - '8.1'
+          - '8.2'
         dependencies:
           - lowest
           - highest
@@ -59,12 +60,12 @@ jobs:
       - name: Install lowest dependencies
         if: ${{ matrix.dependencies == 'lowest' }}
         run: >-
-          composer update --prefer-lowest --no-interaction --no-progress
+          composer update --prefer-lowest --no-interaction --no-progress --no-scripts
           --no-suggest
 
       - name: Install highest dependencies
         if: ${{ matrix.dependencies == 'highest' }}
-        run: composer update --no-interaction --no-progress --no-suggest
+        run: composer update --no-interaction --no-progress --no-suggest --no-scripts
 
       - name: Run test suite
         run: ./vendor/bin/phpunit --coverage-clover=coverage.xml

.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.1
+      php_version: 8.2
       has_crc_config: true

composer.json

@@ -10,18 +10,18 @@
     ],
     "require": {
         "php": "^7.3 || ^8.0",
-        "psr/cache": "^1.0.1",
+        "psr/cache": "^1.0.1 || ^2.0 || ^3.0",
         "ray/di": "^2.13.2",
-        "symfony/cache": "^5.3.4",
+        "symfony/cache": "^5.3.4 || ^6.0",
         "doctrine/annotations": "^1.13",
-        "psr/simple-cache": "^1.0",
+        "psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
         "ray/aop": "^2.10.4"
     },
     "require-dev": {
         "ext-redis": "*",
         "ext-memcached": "*",
         "bamarni/composer-bin-plugin": "^1.4",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^9.5.28"
     },
     "autoload": {
         "psr-4": {

psalm.xml

@@ -5,6 +5,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    phpVersion="7.4"
 >
     <projectFiles>
         <directory name="src" />

src/Annotation/CacheDir.php

@@ -13,7 +13,8 @@
  * @Qualifier
  * @NamedArgumentConstructor
  */
-#[Attribute(Attribute::TARGET_PARAMETER | Attribute::TARGET_METHOD), Qualifier]
+#[Attribute(Attribute::TARGET_PARAMETER | Attribute::TARGET_METHOD)]
+#[Qualifier]
 final class CacheDir
 {
     /** @var string */

src/Annotation/CacheNamespace.php

@@ -13,7 +13,8 @@
  * @Qualifier
  * @NamedArgumentConstructor
  */
-#[Attribute(Attribute::TARGET_PARAMETER | Attribute::TARGET_METHOD), Qualifier]
+#[Attribute(Attribute::TARGET_PARAMETER | Attribute::TARGET_METHOD)]
+#[Qualifier]
 final class CacheNamespace
 {
     /** @var string */

src/Annotation/Local.php

@@ -13,7 +13,8 @@
  * @Qualifier
  * @NamedArgumentConstructor
  */
-#[Attribute(Attribute::TARGET_PARAMETER | Attribute::TARGET_METHOD), Qualifier]
+#[Attribute(Attribute::TARGET_PARAMETER | Attribute::TARGET_METHOD)]
+#[Qualifier]
 final class Local
 {
     /** @var string */

src/Annotation/MemcacheConfig.php

@@ -13,7 +13,8 @@
  * @Qualifier
  * @NamedArgumentConstructor
  */
-#[Attribute(Attribute::TARGET_METHOD), Qualifier]
+#[Attribute(Attribute::TARGET_METHOD)]
+#[Qualifier]
 final class MemcacheConfig
 {
     /** @var string */

src/Annotation/RedisConfig.php

@@ -13,7 +13,8 @@
  * @Qualifier
  * @NamedArgumentConstructor
  */
-#[Attribute, Qualifier]
+#[Attribute]
+#[Qualifier]
 final class RedisConfig
 {
     /** @var string */

src/Annotation/RedisInstance.php

@@ -11,7 +11,8 @@
  * @Annotation
  * @Qualifier()
  */
-#[Attribute, Qualifier]
+#[Attribute]
+#[Qualifier]
 final class RedisInstance
 {
 }

src/Annotation/Shared.php

@@ -13,7 +13,8 @@
  * @Qualifier
  * @NamedArgumentConstructor
  */
-#[Attribute(Attribute::TARGET_PARAMETER | Attribute::TARGET_METHOD), Qualifier]
+#[Attribute(Attribute::TARGET_PARAMETER | Attribute::TARGET_METHOD)]
+#[Qualifier]
 final class Shared
 {
     /** @var string */

src/ApcuAdapter.php

@@ -10,13 +10,15 @@
 
 use function func_get_args;
 
+/** @psalm-suppress PropertyNotSetInConstructor */
 class ApcuAdapter extends OriginAdapter implements Serializable
 {
     use SerializableTrait;
 
     public function __construct(string $namespace = '', int $defaultLifetime = 0, ?string $directory = null, ?MarshallerInterface $marshaller = null)
     {
         $this->args = func_get_args();
+
         parent::__construct($namespace, $defaultLifetime, $directory, $marshaller);
     }
 }

src/CacheDirModule.php

@@ -15,6 +15,7 @@ final class CacheDirModule extends AbstractModule
     public function __construct(string $cacheDir, ?AbstractModule $module = null)
     {
         $this->cacheDir = $cacheDir;
+
         parent::__construct($module);
     }
 

src/CacheNamespaceModule.php

@@ -15,6 +15,7 @@ final class CacheNamespaceModule extends AbstractModule
     public function __construct(string $namespace, ?AbstractModule $module = null)
     {
         $this->namespace = $namespace;
+
         parent::__construct($module);
     }
 

src/FilesystemAdapter.php

@@ -12,6 +12,7 @@
 
 use function func_get_args;
 
+/** @psalm-suppress PropertyNotSetInConstructor */
 class FilesystemAdapter extends OriginAdapter implements Serializable
 {
     use SerializableTrait;
@@ -25,6 +26,7 @@ class FilesystemAdapter extends OriginAdapter implements Serializable
     public function __construct(string $namespace = '', int $defaultLifetime = 0, ?string $directory = null, ?MarshallerInterface $marshaller = null)
     {
         $this->args = func_get_args();
+
         parent::__construct($namespace, $defaultLifetime, $directory, $marshaller);
     }
 }

src/MemcachedProvider.php

@@ -8,9 +8,7 @@
 use Ray\Di\ProviderInterface;
 use Ray\PsrCacheModule\Annotation\MemcacheConfig;
 
-/**
- * @implements ProviderInterface<Memcached>
- */
+/** @implements ProviderInterface<Memcached> */
 class MemcachedProvider implements ProviderInterface
 {
     /**

src/PhpFileAdapter.php

@@ -10,17 +10,17 @@
 
 use function func_get_args;
 
+/** @psalm-suppress PropertyNotSetInConstructor */
 class PhpFileAdapter extends OriginAdapter implements Serializable
 {
     use SerializableTrait;
 
-    /**
-     * @CacheNamespace("namespace")
-     */
+    /** @CacheNamespace("namespace") */
     #[CacheNamespace('namespace')]
     public function __construct(string $namespace = '', int $defaultLifetime = 0, ?string $directory = null, bool $appendOnly = false)
     {
         $this->args = func_get_args();
+
         parent::__construct($namespace, $defaultLifetime, $directory, $appendOnly);
     }
 }

src/Psr6MemcachedModule.php

@@ -27,6 +27,7 @@ public function __construct(string $servers, ?AbstractModule $module = null)
         $this->servers = array_map(static function ($serverString) {
             return explode(':', $serverString);
         }, explode(',', $servers));
+
         parent::__construct($module);
     }
 

src/Psr6RedisModule.php

@@ -24,6 +24,7 @@ final class Psr6RedisModule extends AbstractModule
     public function __construct(string $server, ?AbstractModule $module = null)
     {
         $this->server = explode(':', $server);
+
         parent::__construct($module);
     }
 

src/RedisProvider.php

@@ -11,9 +11,7 @@
 
 use function sprintf;
 
-/**
- * @implements ProviderInterface<Redis>
- */
+/** @implements ProviderInterface<Redis> */
 class RedisProvider implements ProviderInterface
 {
     /** @var list<string> */

src/SerializableTrait.php

@@ -13,17 +13,13 @@ trait SerializableTrait
     /** @var array<mixed> */
     private $args;
 
-    /**
-     * @return array<mixed>
-     */
+    /** @return array<mixed> */
     public function __serialize(): array
     {
         return $this->args;
     }
 
-    /**
-     * @param array<mixed> $data
-     */
+    /** @param array<mixed> $data */
     public function __unserialize(array $data): void
     {
         call_user_func_array([$this, '__construct'], $data); // @phpstan-ignore-line

tests/ApcuAdapterTest.php

@@ -19,9 +19,7 @@ public function testSerialize(): string
         return $string;
     }
 
-    /**
-     * @depends testSerialize
-     */
+    /** @depends testSerialize */
     public function testUnserialize(string $string): void
     {
         $this->assertInstanceOf(ApcuAdapter::class, unserialize($string));

tests/FilesystemAdapterTest.php

@@ -22,9 +22,7 @@ public function testSerialize(): string
         return $string;
     }
 
-    /**
-     * @depends testSerialize
-     */
+    /** @depends testSerialize */
     public function testUnserialize(string $string): void
     {
         $this->assertInstanceOf(FilesystemAdapter::class, unserialize($string));

tests/PhpFileAdapterTest.php

@@ -19,9 +19,7 @@ public function testSerialize(): string
         return $string;
     }
 
-    /**
-     * @depends testSerialize
-     */
+    /** @depends testSerialize */
     public function testUnserialize(string $string): void
     {
         $this->assertInstanceOf(PhpFileAdapter::class, unserialize($string));

vendor-bin/tools/composer.json

@@ -1,17 +1,17 @@
 {
-    "require": {
-        "doctrine/coding-standard": "^9.0",
-        "phpmd/phpmd": "^2.9",
-        "phpmetrics/phpmetrics": "^2.7",
-        "phpstan/phpstan": "^1.0.2",
-        "psalm/plugin-phpunit": "^0.13",
-        "squizlabs/php_codesniffer": "^3.5",
-        "vimeo/psalm": "^4.2"
-    },
     "config": {
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "bamarni/composer-bin-plugin": true
         }
+    },
+    "require-dev": {
+        "vimeo/psalm": "^5.6",
+        "psalm/plugin-phpunit": "^0.18.4",
+        "phpstan/phpstan": "^1.9",
+        "phpmetrics/phpmetrics": "^2.8",
+        "squizlabs/php_codesniffer": "^3.7",
+        "doctrine/coding-standard": "^11.1",
+        "phpmd/phpmd": "^2.13"
     }
 }