Nette\DI\Definitions\Statement is now acceptable type for option `bas…

…e_urls` and `packages[].base_urls`
68publishers · Mar 24, 2023 · 9e5731f · 9e5731f
1 parent a045a32
commit 9e5731f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Bridge/Nette/DI/AssetExtension.php b/src/Bridge/Nette/DI/AssetExtension.php
@@ -39,7 +39,7 @@ public function getConfigSchema(): Schema
 		$packageStructure = Expect::structure([
 			'base_path' => Expect::string()
 				->nullable(),
-			'base_urls' => Expect::anyOf(Expect::string(), Expect::listOf('string'))
+			'base_urls' => Expect::anyOf(Expect::type(Statement::class), Expect::string(), Expect::listOf('string|' . Statement::class))
 				->default([])
 				->before(static fn ($val): array => !is_array($val) ? [$val] : $val),
 			'version' => Expect::anyOf(Expect::string(), Expect::int(), Expect::float())
@@ -61,7 +61,7 @@ public function getConfigSchema(): Schema
 
 		return Expect::structure([
 			'base_path' => Expect::string(''),
-			'base_urls' => Expect::anyOf(Expect::string(), Expect::listOf('string'))
+			'base_urls' => Expect::anyOf(Expect::type(Statement::class), Expect::string(), Expect::listOf('string|' . Statement::class))
 				->default([])
 				->before(static fn ($val): array => !is_array($val) ? [$val] : $val),
 			'version' => Expect::anyOf(Expect::string(), Expect::int(), Expect::float())

diff --git a/tests/Bridge/Nette/DI/fullFeatured.neon b/tests/Bridge/Nette/DI/fullFeatured.neon
@@ -19,7 +19,7 @@ asset:
 			version_format: '%%s-%%s'
 		bar:
 			base_urls:
-				- https://bar2.example.com
+				- ::implode('', ['https://', 'bar2.example', '.com'])
 		bar_version_strategy:
 			base_urls:
 				- https://bar_version_strategy.example.com