Nette\DI\Statement are allowed for options base_path and base_urls

68publishers · Jul 24, 2022 · 61c686e · 61c686e
1 parent c67c5ce
commit 61c686e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/DI/Config.php b/src/DI/Config.php
@@ -90,10 +90,10 @@ private function validatePackage(array $package, bool $isDefault): array
 		Nette\Utils\Validators::assertField($package, 'version', 'string|null');
 		Nette\Utils\Validators::assertField($package, 'version_format', TRUE === $isDefault ? 'string' : 'string|null');
 		Nette\Utils\Validators::assertField($package, 'json_manifest_path', 'string|null');
-		Nette\Utils\Validators::assertField($package, 'base_path', 'string|null');
-		Nette\Utils\Validators::assertField($package, 'base_urls', 'string|string[]');
+		Nette\Utils\Validators::assertField($package, 'base_path', 'string|null|' . Nette\DI\Statement::class);
+		Nette\Utils\Validators::assertField($package, 'base_urls', 'string|string[]|' . Nette\DI\Statement::class . '[]');
 
-		if (is_string($package['base_urls'])) {
+		if (!is_array($package['base_urls'])) {
 			$package['base_urls'] = [ $package['base_urls'] ];
 		}
 

diff --git a/src/DI/PackageDefinitionFacade.php b/src/DI/PackageDefinitionFacade.php
@@ -23,14 +23,14 @@ public function __construct(ReferenceFacade $referenceFacade)
 	}
 
 	/**
-	 * @param string              $name
-	 * @param string|NULL         $basePath
-	 * @param array               $baseUrls
-	 * @param \Nette\DI\Statement $versionStrategy
+	 * @param string                          $name
+	 * @param string|NULL|\Nette\DI\Statement $basePath
+	 * @param array                           $baseUrls
+	 * @param \Nette\DI\Statement             $versionStrategy
 	 *
 	 * @return \Nette\DI\Statement
 	 */
-	public function createPackageStatement(string $name, ?string $basePath, array $baseUrls, Nette\DI\Statement $versionStrategy): Nette\DI\Statement
+	public function createPackageStatement(string $name, $basePath, array $baseUrls, Nette\DI\Statement $versionStrategy): Nette\DI\Statement
 	{
 		if (!empty($basePath) && !empty($baseUrls)) {
 			throw new \LogicException('An asset package cannot have base URLs and base paths.');
@@ -39,7 +39,7 @@ public function createPackageStatement(string $name, ?string $basePath, array $b
 		if (empty($baseUrls)) {
 			$reference = $this->getPackageDependencyReference(
 				new Nette\DI\Statement(Symfony\Component\Asset\PathPackage::class, [
-					'basePath' => (string) $basePath,
+					'basePath' => $basePath ?? '',
 					'versionStrategy' => $versionStrategy,
 				]),
 				$name