Support dynamic tempDir parameter in TranslationExtension

src/DI/TranslationExtension.php

@@ -52,7 +52,7 @@
  *     loaders: array<string, class-string|Statement>,
  *     dirs: array<string>,
  *     cache: array{
- *         dir: string,
+ *         dir: string|Statement,
  *         factory: class-string,
  *         vary: array<string>,
  *     },
@@ -69,11 +69,11 @@ class TranslationExtension extends CompilerExtension
 	public function getConfigSchema(): Schema
 	{
 		$builder = $this->getContainerBuilder();
-		$tempDir = $builder->parameters['tempDir'];
+		$tempDir = $builder->parameters['tempDir'] ?? null;
 
-		if (!is_string($tempDir)) {
-			throw new InvalidArgument('Container parameter "tempDir" must be a string.');
-		}
+		$cacheDir = is_string($tempDir)
+			? $tempDir . '/cache/translation'
+			: new Statement('::implode', [[$tempDir, '/cache/translation']]);
 
 		return Expect::structure([
 			'debug' => Expect::bool($builder->parameters['debugMode']),
@@ -119,7 +119,7 @@ static function (
 			]),
 			'dirs' => Expect::listOf('string')->default([]),
 			'cache' => Expect::structure([
-				'dir' => Expect::string($tempDir . '/cache/translation'),
+				'dir' => Expect::string($cacheDir),
 				'factory' => Expect::string(ConfigCacheFactory::class),
 				'vary' => Expect::listOf('string')->default([]),
 			])->castTo('array'),

tests/Tests/DI/TranslationExtensionTest.phpt

@@ -10,6 +10,7 @@ use Contributte\Translation\Tracy\Panel;
 use Contributte\Translation\Translator;
 use Nette\DI\Compiler;
 use Nette\DI\CompilerExtension;
+use Nette\DI\Container as NetteContainer;
 use Nette\DI\ContainerLoader;
 use Nette\DI\MissingServiceException;
 use Nette\InvalidStateException;
@@ -24,10 +25,12 @@ use Tester\Assert;
 use Tests\CustomTranslatorMock;
 use Tests\Fixtures\DummyLoader;
 use Tests\Helpers;
+use Tests\LocaleResolverMock;
 use Tests\PsrLoggerMock;
 use Tests\TestAbstract;
 use Tests\Toolkit\Container;
 use Tests\Toolkit\Helpers as ToolkitHelpers;
+use Tests\Toolkit\Tests as ToolkitTests;
 use UnexpectedValueException;
 
 $container = require __DIR__ . '/../../bootstrap.php';
@@ -311,6 +314,108 @@ final class TranslationExtensionTest extends TestAbstract
 		}, InvalidArgument::class, 'Loader must implement interface "Symfony\Component\Translation\Loader\LoaderInterface".');
 	}
 
+	public function testCacheDirFromStringTempDir(): void
+	{
+		$loader = new ContainerLoader(ToolkitTests::TEMP_PATH, true);
+
+		/** @var class-string $class */
+		$class = $loader->load(function (Compiler $compiler): void {
+			$compiler->addExtension('translation', new TranslationExtension());
+			$compiler->addConfig([
+				'parameters' => ['tempDir' => 'relative/temp', 'debugMode' => false],
+				'translation' => [
+					'localeResolvers' => [LocaleResolverMock::class],
+					'dirs' => [__DIR__ . '/../../lang'],
+				],
+			]);
+		}, uniqid(random_bytes(16)));
+
+		$container = new $class();
+		assert($container instanceof NetteContainer);
+
+		/** @var Translator $translator */
+		$translator = $container->getByType(ITranslator::class);
+
+		Assert::same('relative/temp/cache/translation', $translator->getCacheDir());
+	}
+
+	public function testCacheDirFromNullTempDir(): void
+	{
+		$loader = new ContainerLoader(ToolkitTests::TEMP_PATH, true);
+
+		/** @var class-string $class */
+		$class = $loader->load(function (Compiler $compiler): void {
+			$compiler->addExtension('translation', new TranslationExtension());
+			$compiler->addConfig([
+				'parameters' => ['tempDir' => null, 'debugMode' => false],
+				'translation' => [
+					'localeResolvers' => [LocaleResolverMock::class],
+					'dirs' => [__DIR__ . '/../../lang'],
+				],
+			]);
+		}, uniqid(random_bytes(16)));
+
+		$container = new $class();
+		assert($container instanceof NetteContainer);
+
+		/** @var Translator $translator */
+		$translator = $container->getByType(ITranslator::class);
+
+		Assert::same('/cache/translation', $translator->getCacheDir());
+	}
+
+	public function testCacheDirFromDynamicTempDir(): void
+	{
+		$loader = new ContainerLoader(ToolkitTests::TEMP_PATH, true);
+
+		/** @var class-string $class */
+		$class = $loader->load(function (Compiler $compiler): void {
+			$compiler->addExtension('translation', new TranslationExtension());
+			$compiler->addConfig([
+				'parameters' => ['debugMode' => false],
+				'translation' => [
+					'localeResolvers' => [LocaleResolverMock::class],
+					'dirs' => [__DIR__ . '/../../lang'],
+				],
+			]);
+			$compiler->setDynamicParameterNames(['tempDir']);
+		}, uniqid(random_bytes(16)));
+
+		$container = new $class(['tempDir' => 'relative/temp']);
+		assert($container instanceof NetteContainer);
+
+		/** @var Translator $translator */
+		$translator = $container->getByType(ITranslator::class);
+
+		Assert::same('relative/temp/cache/translation', $translator->getCacheDir());
+	}
+
+	public function testCacheDirFromExplicitConfig(): void
+	{
+		$loader = new ContainerLoader(ToolkitTests::TEMP_PATH, true);
+
+		/** @var class-string $class */
+		$class = $loader->load(function (Compiler $compiler): void {
+			$compiler->addExtension('translation', new TranslationExtension());
+			$compiler->addConfig([
+				'parameters' => ['tempDir' => 'relative/temp', 'debugMode' => false],
+				'translation' => [
+					'localeResolvers' => [LocaleResolverMock::class],
+					'dirs' => [__DIR__ . '/../../lang'],
+					'cache' => ['dir' => 'explicit/cache/dir'],
+				],
+			]);
+		}, uniqid(random_bytes(16)));
+
+		$container = new $class();
+		assert($container instanceof NetteContainer);
+
+		/** @var Translator $translator */
+		$translator = $container->getByType(ITranslator::class);
+
+		Assert::same('explicit/cache/dir', $translator->getCacheDir());
+	}
+
 }
 
 (new TranslationExtensionTest($container))->run();