Skip to content

Commit 45d9ace

Browse files
committed
ApplicationExtension: compatibility with nette/schema 2
1 parent 2f247c6 commit 45d9ace

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
"conflict": {
4040
"nette/di": "<3.0-stable",
4141
"nette/forms": "<3.0",
42+
"nette/schema": "<1.1",
4243
"latte/latte": "<2.7.1 >=3.0",
4344
"tracy/tracy": "<2.5"
4445
},

src/Bridges/ApplicationDI/ApplicationExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function getConfigSchema(): Nette\Schema\Schema
5858
'errorPresenter' => Expect::string('Nette:Error')->dynamic(),
5959
'catchExceptions' => Expect::bool()->dynamic(),
6060
'mapping' => Expect::arrayOf('string|array'),
61-
'scanDirs' => Expect::anyOf(Expect::arrayOf('string')->default($this->scanDirs), false),
61+
'scanDirs' => Expect::anyOf(Expect::arrayOf('string')->default($this->scanDirs)->mergeDefaults(), false),
6262
'scanComposer' => Expect::bool(class_exists(ClassLoader::class)),
6363
'scanFilter' => Expect::string('*Presenter'),
6464
'silentLinks' => Expect::bool(),

0 commit comments

Comments
 (0)