Update base library to 3.0.0 (#26)

* Update base library to 3.0.0 * Fix code style * Fix some types * Trigger tests for multiple versions * Ignore php cs fixer env
RikudouSage · Feb 9, 2023 · c8f3356 · c8f3356
1 parent 5d1bbbe
commit c8f3356
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 29 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,11 +9,16 @@ jobs:
   code_style:
     name: Test code style
     runs-on: ubuntu-latest
+    env:
+      PHP_CS_FIXER_IGNORE_ENV: 1
+    strategy:
+      matrix:
+        phpVersion: ['8.0', '8.1', '8.2']
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: ${{ matrix.phpVersion }}
       - name: Checkout Code
         uses: actions/checkout@v2
       - name: Install Dependencies
@@ -25,12 +30,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
+        phpVersion: ['8.0', '8.1', '8.2']
         symfonyVersion: [^6.0]
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: ${{ matrix.phpVersion }}
       - name: Checkout Code
         uses: actions/checkout@v2
       - name: Install Dependencies
@@ -45,11 +51,12 @@ jobs:
     strategy:
       matrix:
         symfonyVersion: [^6.0]
+        phpVersion: ['8.0', '8.1', '8.2']
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: ${{ matrix.phpVersion }}
       - name: Checkout Code
         uses: actions/checkout@v2
       - name: Install Dependencies

diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "require": {
     "symfony/framework-bundle": "^6.0",
-    "rikudou/psr6-dynamo-db": "^2.0",
+    "rikudou/psr6-dynamo-db": "^2.0 | ^3.0",
     "php": "^8.0",
     "symfony/cache": "^6.0",
     "ext-json": "*"

diff --git a/src/Cache/DynamoDbCacheAdapter.php b/src/Cache/DynamoDbCacheAdapter.php
@@ -35,7 +35,10 @@ public function __construct(
      */
     public function getItem(mixed $key): CacheItem
     {
-        return $this->converter->convertToCacheItem($this->cache->getItem($key));
+        $item = $this->cache->getItem($key);
+        assert($item instanceof DynamoCacheItem);
+
+        return $this->converter->convertToCacheItem($item);
     }
 
     /**
@@ -49,7 +52,7 @@ public function getItems(array $keys = []): iterable
     {
         return array_map(function (DynamoCacheItem $item) {
             return $this->converter->convertToCacheItem($item);
-        }, $this->cache->getItems($keys));
+        }, [...$this->cache->getItems($keys)]);
     }
 
     /**

diff --git a/src/Helper/DynamoDbCacheAdapterDecorator.php b/src/Helper/DynamoDbCacheAdapterDecorator.php
@@ -91,19 +91,21 @@ public function commit(): bool
      * @param callable   $callback
      * @param float|null $beta
      * @param array|null $metadata
+     *
      * @codeCoverageIgnore
      *
      * @throws PsrInvalidArgumentException
      *
      * @return mixed
      */
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
+    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
     {
         return $this->originalAdapter->get($key, $callback, $beta, $metadata);
     }
 
     /**
      * @param string $key
+     *
      * @codeCoverageIgnore
      *
      * @throws PsrInvalidArgumentException

diff --git a/tests/AbstractCacheItemTest.php b/tests/AbstractCacheItemTest.php
@@ -60,52 +60,40 @@ protected function getRandomCacheItem(
         ?DateTimeInterface $dateTime = null
     ): CacheItemInterface {
         return new class($key, $isHit, $value, $dateTime) implements CacheItemInterface {
-            private $key;
-
-            private $isHit;
-
-            private $value;
-
-            private $dateTime;
-
             public function __construct(
-                string $key = 'test',
-                bool $isHit = true,
-                string $value = 'value',
-                ?DateTimeInterface $dateTime = null
+                private string $key = 'test',
+                private bool $isHit = true,
+                private string $value = 'value',
+                private ?DateTimeInterface $dateTime = null
             ) {
-                $this->key = $key;
-                $this->isHit = $isHit;
-                $this->value = $value;
-                $this->dateTime = $dateTime;
             }
 
-            public function getKey()
+            public function getKey(): string
             {
                 return $this->key;
             }
 
-            public function get()
+            public function get(): string
             {
                 return $this->value;
             }
 
-            public function isHit()
+            public function isHit(): bool
             {
                 return $this->isHit;
             }
 
-            public function set($value)
+            public function set(mixed $value): static
             {
                 return $this;
             }
 
-            public function expiresAt($expiration)
+            public function expiresAt(?DateTimeInterface $expiration): static
             {
                 return $this;
             }
 
-            public function expiresAfter($time)
+            public function expiresAfter(int|\DateInterval|null $time): static
             {
                 return $this;
             }