CacheExtension, FileStorage: checks whether directory is absolute

Author: dg

src/Bridges/CacheDI/CacheExtension.php

@@ -10,26 +10,27 @@
 namespace Nette\Bridges\CacheDI;
 
 use Nette;
+use Nette\Utils\FileSystem;
 
 
 /**
  * Cache extension for Nette DI.
  */
 final class CacheExtension extends Nette\DI\CompilerExtension
 {
-	private string $tempDir;
-
-
-	public function __construct(string $tempDir)
-	{
-		$this->tempDir = $tempDir;
+	public function __construct(
+		private string $tempDir,
+	) {
 	}
 
 
 	public function loadConfiguration(): void
 	{
+		if (!FileSystem::isAbsolute($this->tempDir)) {
+			throw new Nette\InvalidArgumentException("Cache directory must be absolute, '$this->tempDir' given.");
+		}
 		$dir = $this->tempDir . '/cache';
-		Nette\Utils\FileSystem::createDir($dir);
+		FileSystem::createDir($dir);
 		if (!is_writable($dir)) {
 			throw new Nette\InvalidStateException("Make directory '$dir' writable.");
 		}

src/Caching/Storages/FileStorage.php

@@ -55,8 +55,8 @@ class FileStorage implements Nette\Caching\Storage
 
 	public function __construct(string $dir, ?Journal $journal = null)
 	{
-		if (!is_dir($dir)) {
-			throw new Nette\DirectoryNotFoundException("Directory '$dir' not found.");
+		if (!is_dir($dir) || !Nette\Utils\FileSystem::isAbsolute($dir)) {
+			throw new Nette\DirectoryNotFoundException("Directory '$dir' not found or is not absolute.");
 		}
 
 		$this->dir = $dir;

tests/Storages/FileStorage.exceptions.phpt

@@ -17,7 +17,7 @@ require __DIR__ . '/../bootstrap.php';
 Assert::exception(
 	fn() => new FileStorage(getTempDir() . '/missing'),
 	Nette\DirectoryNotFoundException::class,
-	"Directory '%a%' not found.",
+	"Directory '%a%' not found or is not absolute.",
 );