added PHP 8 typehints

Author: dg

src/Bridges/CacheLatte/CacheMacro.php

@@ -101,14 +101,14 @@ public static function initRuntime(Latte\Runtime\Template $template): void
 
 	/**
 	 * Starts the output cache. Returns Nette\Caching\OutputHelper object if buffering was started.
-	 * @return Nette\Caching\OutputHelper|\stdClass
 	 */
 	public static function createCache(
 		Nette\Caching\Storage $cacheStorage,
 		string $key,
 		?array &$parents,
 		?array $args = null,
-	) {
+	): Nette\Caching\OutputHelper|\stdClass|null
+	{
 		if ($args) {
 			if (array_key_exists('if', $args) && !$args['if']) {
 				return $parents[] = new \stdClass;
@@ -122,7 +122,7 @@ public static function createCache(
 		}
 
 		$cache = new Cache($cacheStorage, 'Nette.Templating.Cache');
-		if ($helper = $cache->start($key)) {
+		if ($helper = $cache->capture($key)) {
 			$parents[] = $helper;
 		}
 

src/Caching/Cache.php

@@ -81,20 +81,17 @@ final public function getNamespace(): string
 
 	/**
 	 * Returns new nested cache object.
-	 * @return static
 	 */
-	public function derive(string $namespace)
+	public function derive(string $namespace): static
 	{
 		return new static($this->storage, $this->namespace . $namespace);
 	}
 
 
 	/**
 	 * Reads the specified item from the cache or generate it.
-	 * @param  mixed  $key
-	 * @return mixed
 	 */
-	public function load($key, ?callable $generator = null)
+	public function load(mixed $key, ?callable $generator = null): mixed
 	{
 		$storageKey = $this->generateKey($key);
 		$data = $this->storage->read($storageKey);
@@ -170,12 +167,10 @@ public function bulkLoad(array $keys, ?callable $generator = null): array
 	 * - Cache::Files => (array|string) file names
 	 * - Cache::Items => (array|string) cache items
 	 * - Cache::Constants => (array|string) cache items
-	 * @param  mixed  $key
-	 * @param  mixed  $data
 	 * @return mixed  value itself
 	 * @throws Nette\InvalidArgumentException
 	 */
-	public function save($key, $data, ?array $dependencies = null)
+	public function save(mixed $key, mixed $data, ?array $dependencies = null): mixed
 	{
 		$key = $this->generateKey($key);
 
@@ -191,6 +186,7 @@ public function save($key, $data, ?array $dependencies = null)
 
 		if ($data === null) {
 			$this->storage->remove($key);
+			return null;
 		} else {
 			$dependencies = $this->completeDependencies($dependencies);
 			if (isset($dependencies[self::Expire]) && $dependencies[self::Expire] <= 0) {
@@ -254,9 +250,8 @@ private function completeDependencies(?array $dp): array
 
 	/**
 	 * Removes item from the cache.
-	 * @param  mixed  $key
 	 */
-	public function remove($key): void
+	public function remove(mixed $key): void
 	{
 		$this->save($key, null);
 	}
@@ -282,9 +277,8 @@ public function clean(?array $conditions = null): void
 
 	/**
 	 * Caches results of function/method calls.
-	 * @return mixed
 	 */
-	public function call(callable $function)
+	public function call(callable $function): mixed
 	{
 		$key = func_get_args();
 		if (is_array($function) && is_object($function[0])) {
@@ -316,9 +310,8 @@ public function wrap(callable $function, ?array $dependencies = null): \Closure
 
 	/**
 	 * Starts the output cache.
-	 * @param  mixed  $key
 	 */
-	public function capture($key): ?OutputHelper
+	public function capture(mixed $key): ?OutputHelper
 	{
 		$data = $this->load($key);
 		if ($data === null) {

src/Caching/OutputHelper.php

@@ -24,7 +24,7 @@ class OutputHelper
 	private mixed $key;
 
 
-	public function __construct(Cache $cache, $key)
+	public function __construct(Cache $cache, mixed $key)
 	{
 		$this->cache = $cache;
 		$this->key = $key;

src/Caching/Storages/DevNullStorage.php

@@ -19,8 +19,9 @@ class DevNullStorage implements Nette\Caching\Storage
 {
 	use Nette\SmartObject;
 
-	public function read(string $key)
+	public function read(string $key): mixed
 	{
+		return null;
 	}
 
 

src/Caching/Storages/FileStorage.php

@@ -72,7 +72,7 @@ public function __construct(string $dir, ?Journal $journal = null)
 	}
 
 
-	public function read(string $key)
+	public function read(string $key): mixed
 	{
 		$meta = $this->readMetaAndLock($this->getCacheFile($key), LOCK_SH);
 		return $meta && $this->verify($meta)
@@ -321,9 +321,8 @@ protected function readMetaAndLock(string $file, int $lock): ?array
 
 	/**
 	 * Reads cache data from disk and closes cache file handle.
-	 * @return mixed
 	 */
-	protected function readData(array $meta)
+	protected function readData(array $meta): mixed
 	{
 		$data = stream_get_contents($meta[self::Handle]);
 		flock($meta[self::Handle], LOCK_UN);

src/Caching/Storages/MemcachedStorage.php

@@ -74,7 +74,7 @@ public function getConnection(): \Memcached
 	}
 
 
-	public function read(string $key)
+	public function read(string $key): mixed
 	{
 		$key = urlencode($this->prefix . $key);
 		$meta = $this->memcached->get($key);

src/Caching/Storages/MemoryStorage.php

@@ -22,7 +22,7 @@ class MemoryStorage implements Nette\Caching\Storage
 	private array $data = [];
 
 
-	public function read(string $key)
+	public function read(string $key): mixed
 	{
 		return $this->data[$key] ?? null;
 	}

src/Caching/Storages/SQLiteStorage.php

@@ -51,12 +51,12 @@ public function __construct(string $path)
 	}
 
 
-	public function read(string $key)
+	public function read(string $key): mixed
 	{
 		$stmt = $this->pdo->prepare('SELECT data, slide FROM cache WHERE key=? AND (expire IS NULL OR expire >= ?)');
 		$stmt->execute([$key, time()]);
 		if (!$row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-			return;
+			return null;
 		}
 
 		if ($row['slide'] !== null) {

tests/Caching/Cache.php

@@ -10,7 +10,7 @@ class TestStorage implements IStorage
 	private array $data = [];
 
 
-	public function read(string $key)
+	public function read(string $key): mixed
 	{
 		return $this->data[$key] ?? null;
 	}