ApplicationExtension: fixed scanDir! & compatibility with nette/schem…

…a 2 [Closes #257]
nette · Dec 17, 2020 · f8892db · f8892db
1 parent 0ee270d
commit f8892db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -39,6 +39,7 @@
 	"conflict": {
 		"nette/di": "<3.0-stable",
 		"nette/forms": "<3.0",
+		"nette/schema": "<1.1-stable",
 		"latte/latte": "<2.7.1 >=3.0",
 		"tracy/tracy": "<2.5"
 	},

diff --git a/src/Bridges/ApplicationDI/ApplicationExtension.php b/src/Bridges/ApplicationDI/ApplicationExtension.php
@@ -58,7 +58,7 @@ public function getConfigSchema(): Nette\Schema\Schema
 			'errorPresenter' => Expect::string('Nette:Error')->dynamic(),
 			'catchExceptions' => Expect::bool()->dynamic(),
 			'mapping' => Expect::arrayOf('string|array'),
-			'scanDirs' => Expect::anyOf(Expect::arrayOf('string'), false)->default($this->scanDirs),
+			'scanDirs' => Expect::anyOf(Expect::arrayOf('string')->default($this->scanDirs)->mergeDefaults(), false),
 			'scanComposer' => Expect::bool(class_exists(ClassLoader::class)),
 			'scanFilter' => Expect::string('*Presenter'),
 			'silentLinks' => Expect::bool(),