feat: Fix phpstan array type

.github/workflows/coding-style.yml

@@ -10,7 +10,7 @@ jobs:
             - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.0
+                  php-version: 8.1
                   coverage: none
 
             - run: composer create-project nette/code-checker temp/code-checker ^3 --no-progress
@@ -24,7 +24,7 @@ jobs:
             - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.0
+                  php-version: 8.1
                   coverage: none
 
             - run: composer create-project nette/coding-standard temp/coding-standard ^3 --no-progress

.github/workflows/static-analysis.yml

@@ -13,7 +13,7 @@ jobs:
             - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.0
+                  php-version: 8.1
                   coverage: none
 
             - run: composer install --no-progress --prefer-dist

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['8.0', '8.1', '8.2', '8.3', '8.4']
+                php: ['8.1', '8.2', '8.3', '8.4']
 
             fail-fast: false
 
@@ -37,7 +37,7 @@ jobs:
             - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.0
+                  php-version: 8.1
                   coverage: none
 
             - run: composer update --no-progress --prefer-dist --prefer-lowest --prefer-stable
@@ -52,7 +52,7 @@ jobs:
             - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.0
+                  php-version: 8.1
                   coverage: none
 
             - run: composer install --no-progress --prefer-dist

composer.json

@@ -15,19 +15,19 @@
 		}
 	],
 	"require": {
-		"php": "8.0 - 8.4",
+		"php": "8.1 - 8.4",
 		"nette/utils": "^4.0"
 	},
 	"require-dev": {
 		"nette/tester": "^2.4",
 		"nette/di": "^3.1 || ^4.0",
-		"latte/latte": "^2.11 || ^3.0.12",
+		"latte/latte": "^3.0.12",
 		"tracy/tracy": "^2.9",
 		"phpstan/phpstan": "^1.0",
 		"psr/simple-cache": "^2.0 || ^3.0"
 	},
 	"conflict": {
-		"latte/latte": ">=3.0.0 <3.0.12"
+		"latte/latte": "<3.0.12"
 	},
 	"suggest": {
 		"ext-pdo_sqlite": "to use SQLiteStorage or SQLiteJournal"
@@ -42,7 +42,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "3.3-dev"
+			"dev-master": "4.0-dev"
 		}
 	}
 }

readme.md

@@ -33,7 +33,7 @@ Installation
 composer require nette/caching
 ```
 
-It requires PHP version 8.0 and supports PHP up to 8.4.
+It requires PHP version 8.1 and supports PHP up to 8.4.
 
 
 Basic Usage

src/Bridges/CacheDI/CacheExtension.php

@@ -45,13 +45,5 @@ public function loadConfiguration(): void
 		$builder->addDefinition($this->prefix('storage'))
 			->setType(Nette\Caching\Storage::class)
 			->setFactory(Nette\Caching\Storages\FileStorage::class, [$this->tempDir]);
-
-		if ($this->name === 'cache') {
-			if (extension_loaded('pdo_sqlite')) {
-				$builder->addAlias('nette.cacheJournal', $this->prefix('journal'));
-			}
-
-			$builder->addAlias('cacheStorage', $this->prefix('storage'));
-		}
 	}
 }

src/Caching/BulkWriter.php

@@ -17,7 +17,7 @@ interface BulkWriter
 {
 	/**
 	 * Writes to cache in bulk.
-	 * @param array{string, mixed} $items
+	 * @param array<string, mixed> $items
 	 */
 	function bulkWrite(array $items, array $dependencies): void;
 

src/Caching/Cache.php

@@ -64,9 +64,7 @@ class Cache
 	public const ALL = self::All;
 
 	/** @internal */
-	public const
-		NamespaceSeparator = "\x00",
-		NAMESPACE_SEPARATOR = self::NamespaceSeparator;
+	public const NamespaceSeparator = "\x00";
 
 	private Storage $storage;
 	private string $namespace;
@@ -385,6 +383,7 @@ public function capture(mixed $key): ?OutputHelper
 	 */
 	public function start($key): ?OutputHelper
 	{
+		trigger_error(__METHOD__ . '() was renamed to capture()', E_USER_DEPRECATED);
 		return $this->capture($key);
 	}
 
@@ -394,7 +393,7 @@ public function start($key): ?OutputHelper
 	 */
 	protected function generateKey($key): string
 	{
-		return $this->namespace . md5(is_scalar($key) ? (string) $key : serialize($key));
+		return $this->namespace . hash('xxh128', is_scalar($key) ? (string) $key : serialize($key));
 	}
 
 

src/Caching/Storage.php

@@ -17,9 +17,8 @@ interface Storage
 {
 	/**
 	 * Read from cache.
-	 * @return mixed
 	 */
-	function read(string $key);
+	function read(string $key): mixed;
 
 	/**
 	 * Prevents item reading and writing. Lock is released by write() or remove().

src/Caching/Storages/MemcachedStorage.php

@@ -105,7 +105,7 @@ public function bulkRead(array $keys): array
 	{
 		$prefixedKeys = array_map(fn($key) => urlencode($this->prefix . $key), $keys);
 		$keys = array_combine($prefixedKeys, $keys);
-		$metas = $this->memcached->getMulti($prefixedKeys);
+		$metas = $this->memcached->getMulti($prefixedKeys) ?: [];
 		$result = [];
 		$deleteKeys = [];
 		foreach ($metas as $prefixedKey => $meta) {

src/Caching/Storages/SQLiteJournal.php

@@ -40,7 +40,6 @@ private function open(): void
 		}
 
 		$this->pdo = new \PDO('sqlite:' . $this->path);
-		$this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
 		$this->pdo->exec('
 			PRAGMA foreign_keys = OFF;
 			PRAGMA journal_mode = WAL;

src/Caching/Storages/SQLiteStorage.php

@@ -28,7 +28,6 @@ public function __construct(string $path)
 		}
 
 		$this->pdo = new \PDO('sqlite:' . $path);
-		$this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
 		$this->pdo->exec('
 			PRAGMA foreign_keys = ON;
 			CREATE TABLE IF NOT EXISTS cache (

tests/Bridges.DI/CacheExtension.phpt

@@ -28,8 +28,4 @@ test('', function () {
 
 	$storage = $container->getService('cache.storage');
 	Assert::type(Nette\Caching\Storages\FileStorage::class, $storage);
-
-	// aliases
-	Assert::same($journal, $container->getService('nette.cacheJournal'));
-	Assert::same($storage, $container->getService('cacheStorage'));
 });