From 15eaa3d5823647cf8d810c35fa1d30ebe5a3a9f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20Mat=C4=9Bj=C4=8Dek?= <milan.matejcek@gmail.com>
Date: Fri, 24 May 2024 14:04:17 +0200
Subject: [PATCH 1/2] add psr-16 implementation

---
 composer.json                                 |   3 +-
 src/Bridges/Psr/PsrCacheAdapter.php           | 120 ++++++++++++++++++
 tests/Bridges.Psr/PsrCacheAdapter.delete.phpt |  24 ++++
 .../PsrCacheAdapter.deleteMultiple.phpt       |  25 ++++
 tests/Bridges.Psr/PsrCacheAdapter.get.phpt    |  19 +++
 .../PsrCacheAdapter.getMultiple.phpt          |  29 +++++
 tests/Bridges.Psr/PsrCacheAdapter.has.phpt    |  18 +++
 tests/Bridges.Psr/PsrCacheAdapter.set.phpt    |  62 +++++++++
 .../PsrCacheAdapter.setMultiple.phpt          |  67 ++++++++++
 tests/Caching/Cache.php                       |   1 +
 10 files changed, 367 insertions(+), 1 deletion(-)
 create mode 100644 src/Bridges/Psr/PsrCacheAdapter.php
 create mode 100644 tests/Bridges.Psr/PsrCacheAdapter.delete.phpt
 create mode 100644 tests/Bridges.Psr/PsrCacheAdapter.deleteMultiple.phpt
 create mode 100644 tests/Bridges.Psr/PsrCacheAdapter.get.phpt
 create mode 100644 tests/Bridges.Psr/PsrCacheAdapter.getMultiple.phpt
 create mode 100644 tests/Bridges.Psr/PsrCacheAdapter.has.phpt
 create mode 100644 tests/Bridges.Psr/PsrCacheAdapter.set.phpt
 create mode 100644 tests/Bridges.Psr/PsrCacheAdapter.setMultiple.phpt

diff --git a/composer.json b/composer.json
index fddef60..be8a119 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,8 @@
 		"nette/di": "^3.1 || ^4.0",
 		"latte/latte": "^3.0.12",
 		"tracy/tracy": "^2.9",
-		"phpstan/phpstan": "^1.0"
+		"phpstan/phpstan": "^1.0",
+		"psr/simple-cache": "^2.0 || ^3.0"
 	},
 	"conflict": {
 		"latte/latte": "<3.0.12"
diff --git a/src/Bridges/Psr/PsrCacheAdapter.php b/src/Bridges/Psr/PsrCacheAdapter.php
new file mode 100644
index 0000000..f8400cd
--- /dev/null
+++ b/src/Bridges/Psr/PsrCacheAdapter.php
@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * This file is part of the Tracy (https://tracy.nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Nette\Bridges\Psr;
+
+use DateInterval;
+use DateTimeImmutable;
+use Generator;
+use Nette;
+use Psr;
+
+class PsrCacheAdapter implements Psr\SimpleCache\CacheInterface
+{
+	public function __construct(
+		private Nette\Caching\Storage $storage,
+	) {
+	}
+
+
+	public function get(string $key, mixed $default = null): mixed
+	{
+		return $this->storage->read($key) ?? $default;
+	}
+
+
+	public function set(string $key, mixed $value, null|int|DateInterval $ttl = null): bool
+	{
+		$dependencies = [];
+		if ($ttl !== null) {
+			$dependencies[Nette\Caching\Cache::Expire] = self::ttlToSeconds($ttl);
+		}
+
+		$this->storage->write($key, $value, $dependencies);
+
+		return true;
+	}
+
+
+	public function delete(string $key): bool
+	{
+		$this->storage->remove($key);
+
+		return true;
+	}
+
+
+	public function clear(): bool
+	{
+		$this->storage->clean([Nette\Caching\Cache::All => true]);
+
+		return true;
+	}
+
+
+	/**
+	 * @return Generator<string, mixed>
+	 */
+	public function getMultiple(iterable $keys, mixed $default = null): iterable
+	{
+		foreach ($keys as $name) {
+			yield $name => $this->get($name, $default);
+		}
+	}
+
+
+	/**
+	 * @param iterable<string|int, mixed> $values
+	 */
+	public function setMultiple(iterable $values, null|int|DateInterval $ttl = null): bool
+	{
+		$ttl = self::ttlToSeconds($ttl);
+
+		foreach ($values as $key => $value) {
+			$this->set((string) $key, $value, $ttl);
+		}
+
+		return true;
+	}
+
+
+	public function deleteMultiple(iterable $keys): bool
+	{
+		foreach ($keys as $value) {
+			$this->delete($value);
+		}
+
+		return true;
+	}
+
+
+	public function has(string $key): bool
+	{
+		return $this->storage->read($key) !== null;
+	}
+
+
+	private static function ttlToSeconds(null|int|DateInterval $ttl = null): ?int
+	{
+		if ($ttl instanceof DateInterval) {
+			return self::dateIntervalToSeconds($ttl);
+		}
+
+		return $ttl;
+	}
+
+
+	private static function dateIntervalToSeconds(DateInterval $dateInterval): int
+	{
+		$now = new DateTimeImmutable();
+		$expiresAt = $now->add($dateInterval);
+
+		return $expiresAt->getTimestamp() - $now->getTimestamp();
+	}
+}
diff --git a/tests/Bridges.Psr/PsrCacheAdapter.delete.phpt b/tests/Bridges.Psr/PsrCacheAdapter.delete.phpt
new file mode 100644
index 0000000..fc30bac
--- /dev/null
+++ b/tests/Bridges.Psr/PsrCacheAdapter.delete.phpt
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\Bridges\Psr\PsrCacheAdapter;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../Caching/Cache.php';
+
+test('delete', function () {
+	$storage = new TestStorage();
+	$cache = new PsrCacheAdapter($storage);
+	$cache->set('test1', '1');
+	$cache->set('test2', '2');
+
+	$cache->delete('test1');
+
+	Assert::null($storage->read('test1'));
+	Assert::same([
+		'data' => '2',
+		'dependencies' => [],
+	], $storage->read('test2'));
+});
diff --git a/tests/Bridges.Psr/PsrCacheAdapter.deleteMultiple.phpt b/tests/Bridges.Psr/PsrCacheAdapter.deleteMultiple.phpt
new file mode 100644
index 0000000..65b6f68
--- /dev/null
+++ b/tests/Bridges.Psr/PsrCacheAdapter.deleteMultiple.phpt
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\Bridges\Psr\PsrCacheAdapter;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../Caching/Cache.php';
+
+test('delete multiple', function () {
+	$storage = new TestStorage();
+	$cache = new PsrCacheAdapter($storage);
+	$cache->set('test1', '1');
+	$cache->set('test2', '2');
+
+	$cache->deleteMultiple(['test1', 'test3']);
+
+	Assert::null($storage->read('test1'));
+	Assert::same([
+		'data' => '2',
+		'dependencies' => [],
+	], $storage->read('test2'));
+	Assert::null($storage->read('test3'));
+});
diff --git a/tests/Bridges.Psr/PsrCacheAdapter.get.phpt b/tests/Bridges.Psr/PsrCacheAdapter.get.phpt
new file mode 100644
index 0000000..5b2f9b6
--- /dev/null
+++ b/tests/Bridges.Psr/PsrCacheAdapter.get.phpt
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\Bridges\Psr\PsrCacheAdapter;
+use Nette\Caching\Storages\DevNullStorage;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+
+test('get', function () {
+	$cache = new PsrCacheAdapter(new DevNullStorage());
+	Assert::null($cache->get('test'));
+});
+
+test('get with default', function () {
+	$cache = new PsrCacheAdapter(new DevNullStorage());
+	Assert::true($cache->get('test', true));
+});
diff --git a/tests/Bridges.Psr/PsrCacheAdapter.getMultiple.phpt b/tests/Bridges.Psr/PsrCacheAdapter.getMultiple.phpt
new file mode 100644
index 0000000..3fffc05
--- /dev/null
+++ b/tests/Bridges.Psr/PsrCacheAdapter.getMultiple.phpt
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\Bridges\Psr\PsrCacheAdapter;
+use Nette\Caching\Storages\DevNullStorage;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+
+test('get multiple', function () {
+	$cache = new PsrCacheAdapter(new DevNullStorage());
+	$x = iterator_to_array($cache->getMultiple(['test', 'test1']));
+
+	Assert::same([
+		'test' => null,
+		'test1' => null,
+	], $x);
+});
+
+test('get multiple with default', function () {
+	$cache = new PsrCacheAdapter(new DevNullStorage());
+	$x = iterator_to_array($cache->getMultiple(['test', 'test1'], true));
+
+	Assert::same([
+		'test' => true,
+		'test1' => true,
+	], $x);
+});
diff --git a/tests/Bridges.Psr/PsrCacheAdapter.has.phpt b/tests/Bridges.Psr/PsrCacheAdapter.has.phpt
new file mode 100644
index 0000000..806c987
--- /dev/null
+++ b/tests/Bridges.Psr/PsrCacheAdapter.has.phpt
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\Bridges\Psr\PsrCacheAdapter;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../Caching/Cache.php';
+
+test('has', function () {
+	$storage = new TestStorage();
+	$cache = new PsrCacheAdapter($storage);
+	$cache->set('test1', '1');
+
+	Assert::true($cache->has('test1'));
+	Assert::false($cache->has('test2'));
+});
diff --git a/tests/Bridges.Psr/PsrCacheAdapter.set.phpt b/tests/Bridges.Psr/PsrCacheAdapter.set.phpt
new file mode 100644
index 0000000..147c11d
--- /dev/null
+++ b/tests/Bridges.Psr/PsrCacheAdapter.set.phpt
@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\Bridges\Psr\PsrCacheAdapter;
+use Nette\Caching;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../Caching/Cache.php';
+
+test('set ttl unlimited', function () {
+	$storage = new TestStorage();
+	$cache = new PsrCacheAdapter($storage);
+	$cache->set('test', '1');
+	Assert::same([
+		'data' => '1',
+		'dependencies' => [],
+	], $storage->read('test'));
+});
+
+test('set ttl int', function () {
+	$storage = new TestStorage();
+	$cache = new PsrCacheAdapter($storage);
+
+	$cache->set('test', '2', 1);
+	Assert::same([
+		'data' => '2',
+		'dependencies' => [
+			Caching\Cache::Expire => 1,
+		],
+	], $storage->read('test'));
+});
+
+test('set ttl DateInterval', function () {
+	$storage = new TestStorage();
+	$cache = new PsrCacheAdapter($storage);
+
+	$cache->set('test', '3', new DateInterval('P3Y6M4DT12H30M5S'));
+	Assert::same([
+		'data' => '3',
+		'dependencies' => [
+			Caching\Cache::Expire => 110_899_805,
+		],
+	], $storage->read('test'));
+
+	$cache->set('test', '4', (new DateTime('1978-01-23 05:06:07'))->diff(new DateTime('1986-12-30 07:08:09')));
+	Assert::same([
+		'data' => '4',
+		'dependencies' => [
+			Caching\Cache::Expire => 282_016_922,
+		],
+	], $storage->read('test'));
+
+	$cache->set('test', '5', (new DateTime('1986-12-30 07:08:09'))->diff(new DateTime('1978-01-23 05:06:07')));
+	Assert::same([
+		'data' => '5',
+		'dependencies' => [
+			Caching\Cache::Expire => -282_016_922,
+		],
+	], $storage->read('test'));
+});
diff --git a/tests/Bridges.Psr/PsrCacheAdapter.setMultiple.phpt b/tests/Bridges.Psr/PsrCacheAdapter.setMultiple.phpt
new file mode 100644
index 0000000..2197b20
--- /dev/null
+++ b/tests/Bridges.Psr/PsrCacheAdapter.setMultiple.phpt
@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\Bridges\Psr\PsrCacheAdapter;
+use Nette\Caching;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../Caching/Cache.php';
+
+test('set multiple ttl unlimited', function () {
+	$storage = new TestStorage();
+	$cache = new PsrCacheAdapter($storage);
+
+	$cache->setMultiple(['test1' => '1', 'test2' => '2']);
+
+	Assert::same([
+		'data' => '1',
+		'dependencies' => [],
+	], $storage->read('test1'));
+	Assert::same([
+		'data' => '2',
+		'dependencies' => [],
+	], $storage->read('test2'));
+});
+
+test('set multiple ttl int', function () {
+	$storage = new TestStorage();
+	$cache = new PsrCacheAdapter($storage);
+
+	$cache->setMultiple(['test1' => '1', 'test2' => '2'], 1);
+
+	Assert::same([
+		'data' => '1',
+		'dependencies' => [
+			Caching\Cache::Expire => 1,
+		],
+	], $storage->read('test1'));
+
+	Assert::same([
+		'data' => '2',
+		'dependencies' => [
+			Caching\Cache::Expire => 1,
+		],
+	], $storage->read('test2'));
+});
+
+test('set multiple ttl DateInterval', function () {
+	$storage = new TestStorage();
+	$cache = new PsrCacheAdapter($storage);
+
+	$cache->setMultiple(['test1' => '1', 'test2' => '2'], new DateInterval('P3Y6M4DT12H30M5S'));
+	Assert::same([
+		'data' => '1',
+		'dependencies' => [
+			Caching\Cache::Expire => 110_899_805,
+		],
+	], $storage->read('test1'));
+
+	Assert::same([
+		'data' => '2',
+		'dependencies' => [
+			Caching\Cache::Expire => 110_899_805,
+		],
+	], $storage->read('test2'));
+});
diff --git a/tests/Caching/Cache.php b/tests/Caching/Cache.php
index c5e1436..a38e405 100644
--- a/tests/Caching/Cache.php
+++ b/tests/Caching/Cache.php
@@ -33,6 +33,7 @@ public function lock(string $key): void
 
 	public function remove(string $key): void
 	{
+		unset($this->data[$key]);
 	}
 
 

From 025a36bced20d22b51f565646a40f0d0cf3a721c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20Mat=C4=9Bj=C4=8Dek?= <milan.matejcek@gmail.com>
Date: Sun, 26 May 2024 14:46:44 +0200
Subject: [PATCH 2/2] remove delete test

---
 tests/Bridges.Psr/PsrCacheAdapter.delete.phpt | 24 ------------------
 .../PsrCacheAdapter.deleteMultiple.phpt       | 25 -------------------
 tests/Caching/Cache.php                       |  1 -
 tests/lock                                    |  0
 4 files changed, 50 deletions(-)
 delete mode 100644 tests/Bridges.Psr/PsrCacheAdapter.delete.phpt
 delete mode 100644 tests/Bridges.Psr/PsrCacheAdapter.deleteMultiple.phpt
 create mode 100644 tests/lock

diff --git a/tests/Bridges.Psr/PsrCacheAdapter.delete.phpt b/tests/Bridges.Psr/PsrCacheAdapter.delete.phpt
deleted file mode 100644
index fc30bac..0000000
--- a/tests/Bridges.Psr/PsrCacheAdapter.delete.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Nette\Bridges\Psr\PsrCacheAdapter;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../Caching/Cache.php';
-
-test('delete', function () {
-	$storage = new TestStorage();
-	$cache = new PsrCacheAdapter($storage);
-	$cache->set('test1', '1');
-	$cache->set('test2', '2');
-
-	$cache->delete('test1');
-
-	Assert::null($storage->read('test1'));
-	Assert::same([
-		'data' => '2',
-		'dependencies' => [],
-	], $storage->read('test2'));
-});
diff --git a/tests/Bridges.Psr/PsrCacheAdapter.deleteMultiple.phpt b/tests/Bridges.Psr/PsrCacheAdapter.deleteMultiple.phpt
deleted file mode 100644
index 65b6f68..0000000
--- a/tests/Bridges.Psr/PsrCacheAdapter.deleteMultiple.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Nette\Bridges\Psr\PsrCacheAdapter;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../Caching/Cache.php';
-
-test('delete multiple', function () {
-	$storage = new TestStorage();
-	$cache = new PsrCacheAdapter($storage);
-	$cache->set('test1', '1');
-	$cache->set('test2', '2');
-
-	$cache->deleteMultiple(['test1', 'test3']);
-
-	Assert::null($storage->read('test1'));
-	Assert::same([
-		'data' => '2',
-		'dependencies' => [],
-	], $storage->read('test2'));
-	Assert::null($storage->read('test3'));
-});
diff --git a/tests/Caching/Cache.php b/tests/Caching/Cache.php
index a38e405..c5e1436 100644
--- a/tests/Caching/Cache.php
+++ b/tests/Caching/Cache.php
@@ -33,7 +33,6 @@ public function lock(string $key): void
 
 	public function remove(string $key): void
 	{
-		unset($this->data[$key]);
 	}
 
 
diff --git a/tests/lock b/tests/lock
new file mode 100644
index 0000000..e69de29