Skip to content

Commit 2764209

Browse files
committed
Merge remote-tracking branch 'origin/v0.7' into v0.8
# Conflicts: # composer.json
2 parents 350f317 + b62910c commit 2764209

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"codeception/codeception": "^2.3.2",
1717
"nette/bootstrap": "^2.4.0",
1818
"nette/di": "^2.4.10",
19-
"nette/http": "^2.4.0"
19+
"nette/http": "^2.4.0",
20+
"nette/utils": "^2.4.0"
2021
},
2122
"require-dev": {
2223
"friendsofphp/php-cs-fixer": "^2.8.0",

docs/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ class MyServiceTest extends Unit
4848
}
4949
}
5050
```
51+
`useConfigFiles` method takes array of file paths that are either absolute or relative to suite root.
5152

5253
NetteApplicationModule
5354
----

src/Module/NetteDIModule.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ private function createContainer(): void
147147

148148
$configFiles = is_array($this->configFiles) ? $this->configFiles : $this->config['configFiles'];
149149
foreach ($configFiles as $file) {
150-
$configurator->addConfig($this->path.'/'.$file);
150+
$configurator->addConfig(FileSystem::isAbsolute($file) ? $file : $this->path.'/'.$file);
151151
}
152152

153153
$this->container = $configurator->createContainer();

0 commit comments

Comments
 (0)