testing, logging, and other stuff

src/SonsOfPHP/Component/Cache/Adapter/AbstractAdapter.php

@@ -51,6 +51,7 @@ public function deleteItems(array $keys): bool
         $isOk = true;
         foreach ($keys as $key) {
             if (!$this->deleteItem($key)) {
+                $this->logger?->debug(sprintf('Unable to delete key "%s".', $key));
                 $isOk = false;
             }
         }
@@ -77,6 +78,7 @@ public function commit(): bool
 
         foreach ($this->deferred as $item) {
             if (!$this->save($item)) {
+                $this->logger?->debug(sprintf('Unable to save key "%s".', $item->getKey()));
                 $isOk = false;
             }
         }

src/SonsOfPHP/Component/Cache/Adapter/FilesystemAdapter.php

@@ -70,22 +70,18 @@ public function hasItem(string $key): bool
      */
     public function clear(): bool
     {
-        if (is_dir($this->directory)) {
-            // Prune all files and directories
-            $it = new \RecursiveDirectoryIterator($this->directory, \RecursiveDirectoryIterator::SKIP_DOTS);
-            $files = new \RecursiveIteratorIterator($it, \RecursiveIteratorIterator::CHILD_FIRST);
-            foreach ($files as $file) {
-                if ($file->isDir()) {
-                    rmdir($file->getPathname());
-                } else {
-                    unlink($file->getPathname());
-                }
+        $it    = new \RecursiveDirectoryIterator($this->directory, \RecursiveDirectoryIterator::SKIP_DOTS);
+        $files = new \RecursiveIteratorIterator($it, \RecursiveIteratorIterator::CHILD_FIRST);
+
+        foreach ($files as $file) {
+            if ($file->isDir()) {
+                rmdir($file->getPathname());
+            } else {
+                unlink($file->getPathname());
             }
-
-            return rmdir($this->directory);
         }
 
-        return true;
+        return rmdir($this->directory);
     }
 
     /**
@@ -95,27 +91,30 @@ public function deleteItem(string $key): bool
     {
         CacheItem::validateKey($key);
 
-        if (file_exists($this->getFile($key))) {
-            return unlink($this->getFile($key));
+        $filename = $this->getFile($key);
+
+        if (!file_exists($filename)) {
+            $this->logger?->debug(sprintf('Cache file "%s" does not exist', $filename));
+            return false;
         }
 
-        return true;
+        return unlink($filename);
     }
 
     /**
      * {@inheritdoc}
      */
     public function save(CacheItemInterface $item): bool
     {
-        if (!is_dir($this->directory)) {
-            @mkdir($this->directory, $this->defaultPermission, true);
-        }
+        $filename = $this->getFile($item->getKey());
 
-        if (false === file_put_contents($this->getFile($item->getKey()), $this->marshaller->marshall($item->get()))) {
+        if (false === file_put_contents($filename, $this->marshaller->marshall($item->get()))) {
+            $this->logger?->debug(sprintf('Could not write "%s"', $filename));
             return false;
         }
 
-        if (false === chmod($this->getFile($item->getKey()), $this->defaultPermission)) {
+        if (false === chmod($filename, $this->defaultPermission)) {
+            $this->logger?->debug(sprintf('Could not chmod "%s"', $filename));
             return false;
         }
 
@@ -124,7 +123,8 @@ public function save(CacheItemInterface $item): bool
         }
 
         $mtime = (int) round($item->expiry());
-        return touch($this->getFile($item->getKey()), $mtime);
+
+        return touch($filename, $mtime);
     }
 
     /**

src/SonsOfPHP/Component/Cache/Tests/Adapter/AbstractAdapterTest.php

@@ -0,0 +1,94 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SonsOfPHP\Component\Cache\Tests\Adapter;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\UsesClass;
+use PHPUnit\Framework\TestCase;
+use Psr\Cache\CacheItemInterface;
+use Psr\Cache\CacheItemPoolInterface;
+use SonsOfPHP\Component\Cache\Adapter\AbstractAdapter;
+use SonsOfPHP\Component\Cache\Adapter\AdapterInterface;
+use SonsOfPHP\Component\Cache\CacheItem;
+
+#[CoversClass(AbstractAdapter::class)]
+#[UsesClass(CacheItem::class)]
+//#[UsesClass(SerializableMarshaller::class)]
+final class AbstractAdapterTest extends TestCase
+{
+    private AbstractAdapter $adapter;
+
+    protected function setUp(): void
+    {
+        //$this->adapter = $this->createStub(AbstractAdapter::class);
+        $this->adapter = new class extends AbstractAdapter {
+            public function getItem(string $key): CacheItemInterface
+            {
+                return new CacheItem($key, false);
+            }
+
+            public function hasItem(string $key): bool
+            {
+                return $this->getItem($key)->isHit();
+            }
+
+            public function clear(): bool
+            {
+                return true;
+            }
+
+            public function deleteItem(string $key): bool
+            {
+                return true;
+            }
+
+            public function save(CacheItemInterface $item): bool
+            {
+                return true;
+            }
+        };
+    }
+
+    public function testItHasTheCorrectInterface(): void
+    {
+        $this->assertInstanceOf(AdapterInterface::class, $this->adapter);
+        $this->assertInstanceOf(CacheItemPoolInterface::class, $this->adapter);
+    }
+
+    public function testItWillExecuteGetItemWhenGetItemsIsExecuted(): void
+    {
+        $items = iterator_to_array($this->adapter->getItems(['test']));
+        $this->assertArrayHasKey('test', $items);
+    }
+
+    public function testItWillDeleteItems(): void
+    {
+        $this->assertTrue($this->adapter->deleteItems(['test']));
+    }
+
+    public function testItWillSaveDeferred(): void
+    {
+        $cacheItem = $this->adapter->getItem('test');
+
+        $this->assertTrue($this->adapter->saveDeferred($cacheItem));
+    }
+
+    public function testItWillCommit(): void
+    {
+        $cacheItem = $this->adapter->getItem('test');
+        $this->adapter->saveDeferred($cacheItem);
+
+        $this->assertTrue($this->adapter->commit());
+    }
+
+    public function testItWillDestruct(): void
+    {
+        $cacheItem = $this->adapter->getItem('test');
+        $this->adapter->saveDeferred($cacheItem);
+
+        $this->assertTrue($this->adapter->commit());
+        unset($this->adapter);
+    }
+}

src/SonsOfPHP/Component/Cache/Tests/Adapter/FilesystemAdapterTest.php

@@ -63,4 +63,9 @@ public function testItCanDeleteCacheItem(): void
         $this->assertTrue($this->adapter->deleteItem('test'));
         $this->assertFalse($this->adapter->hasItem('test'));
     }
+
+    public function testItWillReturnFalseWhenDeletingKeyThatDoesNotExist(): void
+    {
+        $this->assertFalse($this->adapter->deleteItem('test'));
+    }
 }