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
diff options
context:
space:
mode:
authordiosmosis <benaka@piwik.pro>2015-05-21 06:00:11 +0300
committerdiosmosis <benaka@piwik.pro>2015-05-25 01:22:14 +0300
commit38a51b00d3618fe512da3d7e4ba2ef401999c12a (patch)
treea2ec1cd2008fcb0977f03acc6c961d553457c88a /config/environment
parent0afc478224999dd58d8a9ca18ac59a4a88e68e52 (diff)
Moved Config object to the DI container and override w/ TestConfig through DI config. Replaced the singleton GlobalSettingsProvider hack w/ the concept of an EnvironmentManipulator (internal to Piwik, not to be used anywhere but TestingEnvironment.php).
Diffstat (limited to 'config/environment')
-rw-r--r--config/environment/test.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/environment/test.php b/config/environment/test.php
index 4eac327a6e..95200e0e97 100644
--- a/config/environment/test.php
+++ b/config/environment/test.php
@@ -14,4 +14,5 @@ return array(
'Piwik\Translation\Translator' => DI\object()
->constructorParameter('directories', array()),
+ 'Piwik\Config' => DI\object('Piwik\Tests\Framework\Mock\TestConfig'),
);