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-04-05 00:14:34 +0300
committerdiosmosis <benaka@piwik.pro>2015-04-05 00:14:34 +0300
commit0c007ab7c5cf3b773c4e74f9c45ef0783a963997 (patch)
tree96fdd7bb44df0017120c828cbe4720e0a9a13a5c /tests/PHPUnit/bootstrap.php
parent93127480a9ccaa091825b92e50395cdd2193618e (diff)
Move DI container creation to Piwik\Application\Environment class.
Diffstat (limited to 'tests/PHPUnit/bootstrap.php')
-rw-r--r--tests/PHPUnit/bootstrap.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php
index edaea8a9f4..3cb15b5c3b 100644
--- a/tests/PHPUnit/bootstrap.php
+++ b/tests/PHPUnit/bootstrap.php
@@ -43,7 +43,9 @@ if (getenv('PIWIK_USE_XHPROF') == 1) {
}
// setup container for tests
-StaticContainer::setEnvironment('test');
+$rootTestEnvironment = new \Piwik\Application\Environment('test');
+$rootTestEnvironment->init();
+unset($rootTestEnvironment); // so it doesn't appear in $_GLOBALS and so PHPUnit won't try to serialize it. (TODO: this is a quick hack)
// require test fixtures
$fixturesToLoad = array(