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:
authorFabian Becker <fabian.becker@uni-tuebingen.de>2013-07-18 13:25:08 +0400
committerFabian Becker <fabian.becker@uni-tuebingen.de>2013-07-18 13:25:08 +0400
commit879d0e094824bd6d46ca1ecbba1cda945394bb05 (patch)
tree038ad7cbfe1e6441ada4e5a979ec54331d910f42 /tests/PHPUnit/proxy/piwik.php
parentdf0fd261c9172926a8a2a9a05fd4b30bd840d5f7 (diff)
Refactor Piwik_Config to \Piwik\Core\Config
2 steps required: 1. Refactor > Move > \Piwik\Core\Config (uncheck "Create new File") 2. Refactor > Rename > Piwik_Config to Config
Diffstat (limited to 'tests/PHPUnit/proxy/piwik.php')
-rwxr-xr-xtests/PHPUnit/proxy/piwik.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/PHPUnit/proxy/piwik.php b/tests/PHPUnit/proxy/piwik.php
index 841d2bb549..1f4c58258c 100755
--- a/tests/PHPUnit/proxy/piwik.php
+++ b/tests/PHPUnit/proxy/piwik.php
@@ -11,6 +11,8 @@
// Wrapping the request inside ob_start() calls to ensure that the Test
// calling us waits for the full request to process before unblocking
+use Piwik\Core\Config;
+
ob_start();
define('PIWIK_INCLUDE_PATH', '../../..');
@@ -22,15 +24,15 @@ require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
// Config files forced to use the test database
// Note that this also provides security for Piwik installs containing tests files:
// this proxy will not record any data in the production database.
-Piwik_Config::getInstance()->setTestEnvironment();
-Piwik_Config::getInstance()->PluginsInstalled['PluginsInstalled'] = array();
+Config::getInstance()->setTestEnvironment();
+Config::getInstance()->PluginsInstalled['PluginsInstalled'] = array();
try {
- $trackerPlugins = Piwik_Config::getInstance()->Plugins_Tracker['Plugins_Tracker'];
+ $trackerPlugins = Config::getInstance()->Plugins_Tracker['Plugins_Tracker'];
}catch(Exception $e) {
$trackerPlugins = array();
}
$trackerPlugins[] = 'DevicesDetection';
-Piwik_Config::getInstance()->Plugins_Tracker['Plugins_Tracker'] = $trackerPlugins;
+Config::getInstance()->Plugins_Tracker['Plugins_Tracker'] = $trackerPlugins;
Piwik_UserCountry_LocationProvider_GeoIp::$geoIPDatabaseDir = 'tests/lib/geoip-files';
Piwik_Tracker::setTestEnvironment();