removed deprecated stuff

Author: dg

src/Caching/Cache.php

@@ -157,29 +157,18 @@ public function save(mixed $key, mixed $data, array $dependencies = null): mixed
 	{
 		$key = $this->generateKey($key);
 
-		if ($data instanceof \Closure) {
-			trigger_error(__METHOD__ . '() closure argument is deprecated.', E_USER_WARNING);
-			$this->storage->lock($key);
-			try {
-				$data = $data(...[&$dependencies]);
-			} catch (\Throwable $e) {
-				$this->storage->remove($key);
-				throw $e;
-			}
-		}
-
 		if ($data === null) {
 			$this->storage->remove($key);
 			return null;
+		}
+
+		$dependencies = $this->completeDependencies($dependencies);
+		if (isset($dependencies[self::EXPIRATION]) && $dependencies[self::EXPIRATION] <= 0) {
+			$this->storage->remove($key);
 		} else {
-			$dependencies = $this->completeDependencies($dependencies);
-			if (isset($dependencies[self::EXPIRATION]) && $dependencies[self::EXPIRATION] <= 0) {
-				$this->storage->remove($key);
-			} else {
-				$this->storage->write($key, $data, $dependencies);
-			}
-			return $data;
+			$this->storage->write($key, $data, $dependencies);
 		}
+		return $data;
 	}
 
 

src/Caching/Storages/FileStorage.php

@@ -50,9 +50,6 @@ class FileStorage implements Nette\Caching\Storage
 	/** probability that the clean() routine is started */
 	public static float $gcProbability = 0.001;
 
-	/** @deprecated */
-	public static $useDirectories = true;
-
 	private string $dir;
 
 	private ?Journal $journal;

src/Caching/Storages/NewMemcachedStorage.php

@@ -25,38 +25,3 @@ $cache->save('key', 'value', $dependencies);
 $res = $cache->load('key');
 Assert::same('value', $res['data']);
 Assert::same($dependencies, $res['dependencies']);
-
-
-// save callback return value
-$storage = new testStorage;
-$cache = new Cache($storage, 'ns');
-
-@$cache->save('key', fn () => 'value');
-
-$res = $cache->load('key');
-Assert::same('value', $res['data']);
-Assert::same([], $res['dependencies']);
-
-
-// save callback return value with dependencies
-$storage = new testStorage;
-$cache = new Cache($storage, 'ns');
-$dependencies = [Cache::TAGS => ['tag']];
-
-@$cache->save('key', fn () => 'value', $dependencies);
-
-$res = $cache->load('key');
-Assert::same('value', $res['data']);
-Assert::same($dependencies, $res['dependencies']);
-
-
-// do not save already expired data
-$storage = new testStorage;
-$cache = new Cache($storage, 'ns');
-$dependencies = [Cache::EXPIRATION => new DateTime];
-
-@$res = $cache->save('key', fn () => 'value', $dependencies);
-Assert::same('value', $res);
-
-$res = $cache->load('key');
-Assert::null($res);

tests/Caching/Cache.save.phpt

@@ -21,17 +21,3 @@ $value = range("\x00", "\xFF");
 $cache = new Cache(new FileStorage(getTempDir()));
 
 Assert::null($cache->load($key));
-
-
-// Writing cache using Closure...
-$res = @$cache->save($key, fn () => $value);
-
-Assert::same($res, $value);
-
-Assert::same($cache->load($key), $value);
-
-
-// Removing from cache using null callback...
-@$cache->save($key, fn () => null);
-
-Assert::null($cache->load($key));