Merge pull request #104 from PavelJurasek/php8-2

Fix: Config schema is normalized
Kdyby · Aug 19, 2021 · 9f0a6bf · 9f0a6bf
2 parents 494a5a6 + ede9d77
commit 9f0a6bf
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/src/Kdyby/Redis/DI/Config/ClientSchema.php b/src/Kdyby/Redis/DI/Config/ClientSchema.php
@@ -36,6 +36,7 @@ public function complete($value, \Nette\Schema\Context $context)
 	{
 		$value = $this->expandParameters($value);
 
+		$value = $this->getSchema()->normalize($value, $context);
 		$value = $this->getSchema()->complete($value, $context);
 
 		return $value;

diff --git a/src/Kdyby/Redis/DI/Config/RedisSchema.php b/src/Kdyby/Redis/DI/Config/RedisSchema.php
@@ -54,8 +54,9 @@ public function merge($value, $base)
 
 	public function complete($value, \Nette\Schema\Context $context)
 	{
-		$value = $this->expandParameters($value);
+		$value = $this->expandParameters((array) $value);
 
+		$value = $this->normalize($value, $context);
 		$value = $this->getSchema()->complete($value, $context);
 
 		return $value;

diff --git a/tests/KdybyTests/Redis/ExtensionTest.phpt b/tests/KdybyTests/Redis/ExtensionTest.phpt
@@ -22,14 +22,21 @@ require_once __DIR__ . '/../bootstrap.php';
 class ExtensionTest extends \Tester\TestCase
 {
 
-	protected function createContainer(): Container
+	protected function createConfig(): \Nette\Bootstrap\Configurator
 	{
-		$config = new Nette\Configurator();
+		$config = new \Nette\Bootstrap\Configurator();
 		$config->setTempDirectory(TEMP_DIR);
 		$config->onCompile[] = static function ($config, Nette\DI\Compiler $compiler): void {
 			$compiler->addExtension('redis', new Kdyby\Redis\DI\RedisExtension());
 		};
 
+		return $config;
+	}
+
+	protected function createContainer(): Container
+	{
+		$config = $this->createConfig();
+
 		$config->addConfig(__DIR__ . '/files/config.neon');
 
 		return $config->createContainer();
@@ -97,6 +104,15 @@ class ExtensionTest extends \Tester\TestCase
 		Assert::same(FALSE, $sessionOptions['cookie_secure']);
 	}
 
+	public function testWithoutConfiguration(): void
+	{
+		$config = $this->createConfig();
+		$dic = $config->createContainer();
+		Assert::true($dic->getService('redis.client') instanceof Kdyby\Redis\RedisClient);
+		Assert::false($dic->hasService('redis.cacheJournal'));
+		Assert::false($dic->hasService('redis.cacheStorage'));
+	}
+
 }
 
 (new ExtensionTest())->run();