Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2018-07-19 05:06:45 +0300
committerdiosmosis <diosmosis@users.noreply.github.com>2018-07-19 05:06:45 +0300
commit5fe27fd1086762c915ca3190fd3c3a60c7d583f5 (patch)
treef2b17261ea1c9ff9c24cb30139411e78eba5e448 /core
parent2020b122615789c36eaa0917e10b483f12793b3c (diff)
Do not apply local config in tests (#13182)
Diffstat (limited to 'core')
-rw-r--r--core/Container/ContainerFactory.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/Container/ContainerFactory.php b/core/Container/ContainerFactory.php
index 9c5eed1276..e1696db194 100644
--- a/core/Container/ContainerFactory.php
+++ b/core/Container/ContainerFactory.php
@@ -88,7 +88,8 @@ class ContainerFactory
}
// User config
- if (file_exists(PIWIK_USER_PATH . '/config/config.php')) {
+ if (file_exists(PIWIK_USER_PATH . '/config/config.php')
+ && !in_array('test', $this->environments, true)) {
$builder->addDefinitions(PIWIK_USER_PATH . '/config/config.php');
}