diff options
author | diosmosis <benaka@piwik.pro> | 2015-10-17 05:27:19 +0300 |
---|---|---|
committer | diosmosis <benaka@piwik.pro> | 2015-10-27 07:46:53 +0300 |
commit | 9d19c3807d02957023549f9e4584d2c37c8deebb (patch) | |
tree | 3ae6cf8907e0663cf09c3b43333d4d385608b51d /core/Container | |
parent | a37c5c114405a1a795e68ef1e84e03a46f0f50cd (diff) |
Allow extra environments to be specified through testing environment variables, add a new one for UI tests call ui-test.php, use to remove port from localhost in UI tests, and fix a bug in ContainerFactory (config/config.php should be applied after environment files).
Diffstat (limited to 'core/Container')
-rw-r--r-- | core/Container/ContainerFactory.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/Container/ContainerFactory.php b/core/Container/ContainerFactory.php index 75735036aa..9c5eed1276 100644 --- a/core/Container/ContainerFactory.php +++ b/core/Container/ContainerFactory.php @@ -79,12 +79,7 @@ class ContainerFactory // Development config if ($this->isDevelopmentModeEnabled()) { - $builder->addDefinitions(PIWIK_USER_PATH . '/config/environment/dev.php'); - } - - // User config - if (file_exists(PIWIK_USER_PATH . '/config/config.php')) { - $builder->addDefinitions(PIWIK_USER_PATH . '/config/config.php'); + $this->addEnvironmentConfig($builder, 'dev'); } // Environment config @@ -92,6 +87,11 @@ class ContainerFactory $this->addEnvironmentConfig($builder, $environment); } + // User config + if (file_exists(PIWIK_USER_PATH . '/config/config.php')) { + $builder->addDefinitions(PIWIK_USER_PATH . '/config/config.php'); + } + if (!empty($this->definitions)) { foreach ($this->definitions as $definitionArray) { $builder->addDefinitions($definitionArray); |