fixed PHPStan errors

Author: dg

phpstan.neon

@@ -1,8 +1,31 @@
 parameters:
-	level: 5
+	level: 8
 
 	paths:
 		- src
 
 	excludePaths:
-		- src/Bridges/CacheLatte/CacheMacro.php
+		- src/compatibility.php
+
+	ignoreErrors:
+		-   # Intentional design pattern for derive() and factory methods
+			identifier: new.static
+			paths:
+				- src/Caching/Cache.php
+				- src/Bridges/CacheLatte/Nodes/CacheNode.php
+
+		-   # Intentional by-reference parameter for dependency injection
+			identifier: argument.byRef
+			path: src/Caching/Cache.php
+
+		-   # Runtime validation for untyped array input
+			identifier: function.alreadyNarrowedType
+			path: src/Caching/Cache.php
+
+		-   # PHPStan cannot narrow callable to array shape after is_array() in closure
+			identifier: offsetAccess.nonOffsetAccessible
+			path: src/Caching/Cache.php
+
+		-
+			identifier: method.childParameterType
+			path: src/Bridges/Psr/PsrCacheAdapter.php

src/Bridges/CacheLatte/Runtime.php

@@ -11,7 +11,7 @@
 use Nette;
 use Nette\Caching\Cache;
 use Nette\Caching\OutputHelper;
-use function array_intersect_key, array_key_exists, array_merge, array_pop, count, end, is_file, range;
+use function array_intersect_key, array_key_exists, array_merge, array_pop, count, end, is_file, is_string, range;
 
 
 /**
@@ -34,7 +34,7 @@ public function initialize(Latte\Runtime\Template $template): void
 	{
 		if ($this->stack) {
 			$file = (new \ReflectionClass($template))->getFileName();
-			if (@is_file($file)) { // @ - may trigger error
+			if (is_string($file) && @is_file($file)) { // @ - may trigger error
 				end($this->stack)->dependencies[Cache::Files][] = $file;
 			}
 		}

src/Caching/Storages/FileStorage.php

@@ -9,7 +9,7 @@
 
 use Nette;
 use Nette\Caching\Cache;
-use function dirname, fclose, filemtime, flock, fopen, fseek, ftruncate, fwrite, is_dir, is_string, microtime, mkdir, mt_getrandmax, mt_rand, rmdir, serialize, str_pad, str_repeat, stream_get_contents, strlen, strrpos, substr_replace, time, touch, unlink, unserialize, urlencode;
+use function dirname, fclose, filemtime, flock, fopen, fseek, ftruncate, fwrite, is_array, is_dir, is_string, microtime, mkdir, mt_getrandmax, mt_rand, rmdir, serialize, str_pad, str_repeat, stream_get_contents, strlen, strrpos, substr_replace, time, touch, unlink, unserialize, urlencode;
 use const LOCK_EX, LOCK_SH, LOCK_UN, STR_PAD_LEFT;
 
 
@@ -286,7 +286,7 @@ public function clean(array $conditions): void
 
 		// cleaning using journal
 		if ($this->journal) {
-			foreach ($this->journal->clean($conditions) as $file) {
+			foreach ($this->journal->clean($conditions) ?? [] as $file) {
 				$this->delete($file);
 			}
 		}
@@ -295,6 +295,7 @@ public function clean(array $conditions): void
 
 	/**
 	 * Reads cache data from disk.
+	 * @param  int<0, 7>  $lock
 	 * @return ?array<string, mixed>  meta data with 'file' and 'handle' keys added, or null if not found
 	 */
 	protected function readMetaAndLock(string $file, int $lock): ?array
@@ -309,10 +310,13 @@ protected function readMetaAndLock(string $file, int $lock): ?array
 		$size = (int) stream_get_contents($handle, self::MetaHeaderLen);
 		if ($size) {
 			$meta = stream_get_contents($handle, $size, self::MetaHeaderLen);
-			$meta = unserialize($meta);
-			$meta[self::File] = $file;
-			$meta[self::Handle] = $handle;
-			return $meta;
+			if ($meta !== false) {
+				$meta = unserialize($meta);
+				assert(is_array($meta));
+				$meta[self::File] = $file;
+				$meta[self::Handle] = $handle;
+				return $meta;
+			}
 		}
 
 		flock($handle, LOCK_UN);
@@ -330,8 +334,11 @@ protected function readData(array $meta): mixed
 		$data = stream_get_contents($meta[self::Handle]);
 		flock($meta[self::Handle], LOCK_UN);
 		fclose($meta[self::Handle]);
-
-		return empty($meta[self::MetaSerialized]) ? $data : unserialize($data);
+		return match (true) {
+			$data === false => null,
+			empty($meta[self::MetaSerialized]) => $data,
+			default => unserialize($data),
+		};
 	}
 
 

src/Caching/Storages/MemcachedStorage.php

@@ -55,7 +55,7 @@ public function addServer(string $host = 'localhost', int $port = 11211): void
 	{
 		if (@$this->memcached->addServer($host, $port, 1) === false) { // @ is escalated to exception
 			$error = error_get_last();
-			throw new Nette\InvalidStateException("Memcached::addServer(): $error[message].");
+			throw new Nette\InvalidStateException('Memcached::addServer(): ' . ($error['message'] ?? 'unknown error') . '.');
 		}
 	}
 
@@ -216,7 +216,7 @@ public function clean(array $conditions): void
 			$this->memcached->flush();
 
 		} elseif ($this->journal) {
-			foreach ($this->journal->clean($conditions) as $entry) {
+			foreach ($this->journal->clean($conditions) ?? [] as $entry) {
 				$this->memcached->delete($entry, 0);
 			}
 		}

src/Caching/Storages/SQLiteJournal.php

@@ -9,7 +9,7 @@
 
 use Nette;
 use Nette\Caching\Cache;
-use function count, extension_loaded, implode, is_file, str_repeat, touch;
+use function array_values, count, extension_loaded, implode, is_file, str_repeat, touch;
 
 
 /**
@@ -73,7 +73,7 @@ public function write(string $key, array $dependencies): void
 				$arr[] = $tag;
 			}
 
-			$this->pdo->prepare('INSERT INTO tags (key, tag) SELECT ?, ?' . str_repeat('UNION SELECT ?, ?', count($arr) / 2 - 1))
+			$this->pdo->prepare('INSERT INTO tags (key, tag) SELECT ?, ?' . str_repeat('UNION SELECT ?, ?', intdiv(count($arr), 2) - 1))
 				->execute($arr);
 		}
 
@@ -136,6 +136,6 @@ public function clean(array $conditions): ?array
 		$this->pdo->prepare("DELETE FROM priorities WHERE key IN ($unionSql)")->execute($args);
 		$this->pdo->exec('COMMIT');
 
-		return $keys;
+		return array_values($keys);
 	}
 }

src/Caching/Storages/SQLiteStorage.php

@@ -111,7 +111,7 @@ public function write(string $key, mixed $data, array $dependencies): void
 				$arr[] = $tag;
 			}
 
-			$this->pdo->prepare('INSERT INTO tags (key, tag) SELECT ?, ?' . str_repeat('UNION SELECT ?, ?', count($arr) / 2 - 1))
+			$this->pdo->prepare('INSERT INTO tags (key, tag) SELECT ?, ?' . str_repeat('UNION SELECT ?, ?', intdiv(count($arr), 2) - 1))
 				->execute($arr);
 		}