CacheExtension: accepts complete path (BC break)

Author: dg

src/Bridges/CacheDI/CacheExtension.php

@@ -29,23 +29,22 @@ 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';
-		FileSystem::createDir($dir);
-		if (!is_writable($dir)) {
-			throw new Nette\InvalidStateException("Make directory '$dir' writable.");
+		FileSystem::createDir($this->tempDir);
+		if (!is_writable($this->tempDir)) {
+			throw new Nette\InvalidStateException("Make directory '$this->tempDir' writable.");
 		}
 
 		$builder = $this->getContainerBuilder();
 
 		if (extension_loaded('pdo_sqlite')) {
 			$builder->addDefinition($this->prefix('journal'))
 				->setType(Nette\Caching\Storages\Journal::class)
-				->setFactory(Nette\Caching\Storages\SQLiteJournal::class, [$dir . '/journal.s3db']);
+				->setFactory(Nette\Caching\Storages\SQLiteJournal::class, [$this->tempDir . '/journal.s3db']);
 		}
 
 		$builder->addDefinition($this->prefix('storage'))
 			->setType(Nette\Caching\Storage::class)
-			->setFactory(Nette\Caching\Storages\FileStorage::class, [$dir]);
+			->setFactory(Nette\Caching\Storages\FileStorage::class, [$this->tempDir]);
 
 		if ($this->name === 'cache') {
 			if (extension_loaded('pdo_sqlite')) {