Merge remote-tracking branch 'origin/v0.8'

# Conflicts: # composer.json
contributte · Dec 12, 2017 · 53fa2d5 · 53fa2d5
2 parents d2dfe59 + 2764209
commit 53fa2d5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,8 @@
         "codeception/codeception": "^2.3.2",
         "nette/bootstrap": "^3.0.0",
         "nette/di": "^3.0.0@dev",
-        "nette/http": "^3.0.0@dev"
+        "nette/http": "^3.0.0@dev",
+        "nette/utils": "^3.0.0@dev"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.8.0",

diff --git a/docs/index.md b/docs/index.md
@@ -48,6 +48,7 @@ class MyServiceTest extends Unit
     }
 }
 ```
+`useConfigFiles` method takes array of file paths that are either absolute or relative to suite root. 
 
 NetteApplicationModule
 ----

diff --git a/src/Module/NetteDIModule.php b/src/Module/NetteDIModule.php
@@ -147,7 +147,7 @@ private function createContainer(): void
 
         $configFiles = is_array($this->configFiles) ? $this->configFiles : $this->config['configFiles'];
         foreach ($configFiles as $file) {
-            $configurator->addConfig($this->path.'/'.$file);
+            $configurator->addConfig(FileSystem::isAbsolute($file) ? $file : $this->path.'/'.$file);
         }
 
         $this->container = $configurator->createContainer();