diff options
author | diosmosis <benaka@piwik.pro> | 2015-06-05 23:35:44 +0300 |
---|---|---|
committer | diosmosis <benaka@piwik.pro> | 2015-06-06 00:35:46 +0300 |
commit | aff138ab0347002774f3beafb2b77fe2880d9526 (patch) | |
tree | 5eaf67c103d2192a3b6d977bfbc92a2862cacac6 /tests/PHPUnit/proxy | |
parent | cc9ee9f6111a8d7522dce014a47fda0730aabcaa (diff) |
Allow only a single EnvironmentManipulator instance to be specified in Environment.php.
Diffstat (limited to 'tests/PHPUnit/proxy')
-rw-r--r-- | tests/PHPUnit/proxy/archive.php | 2 | ||||
-rw-r--r-- | tests/PHPUnit/proxy/console | 2 | ||||
-rw-r--r-- | tests/PHPUnit/proxy/index.php | 2 | ||||
-rwxr-xr-x | tests/PHPUnit/proxy/piwik.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/PHPUnit/proxy/archive.php b/tests/PHPUnit/proxy/archive.php index ba4faeca84..a7f4222efe 100644 --- a/tests/PHPUnit/proxy/archive.php +++ b/tests/PHPUnit/proxy/archive.php @@ -7,7 +7,7 @@ define('PIWIK_ARCHIVE_NO_TRUNCATE', true); require realpath(dirname(__FILE__)) . "/includes.php"; -Environment::addEnvironmentManipulator(new TestingEnvironmentManipulator(new TestingEnvironmentVariables())); +Environment::setGlobalEnvironmentManipulator(new TestingEnvironmentManipulator(new TestingEnvironmentVariables())); // include archive.php, and let 'er rip require_once PIWIK_INCLUDE_PATH . "/misc/cron/archive.php"; diff --git a/tests/PHPUnit/proxy/console b/tests/PHPUnit/proxy/console index f58f09d1fd..31c2b9c2b5 100644 --- a/tests/PHPUnit/proxy/console +++ b/tests/PHPUnit/proxy/console @@ -6,6 +6,6 @@ use Piwik\Tests\Framework\TestingEnvironmentVariables; require realpath(dirname(__FILE__)) . "/includes.php"; -Environment::addEnvironmentManipulator(new TestingEnvironmentManipulator(new TestingEnvironmentVariables())); +Environment::setGlobalEnvironmentManipulator(new TestingEnvironmentManipulator(new TestingEnvironmentVariables())); require_once PIWIK_INCLUDE_PATH . "/console"; diff --git a/tests/PHPUnit/proxy/index.php b/tests/PHPUnit/proxy/index.php index 4eb3497882..fe75475688 100644 --- a/tests/PHPUnit/proxy/index.php +++ b/tests/PHPUnit/proxy/index.php @@ -10,6 +10,6 @@ use Piwik\Tests\Framework\TestingEnvironmentVariables; require realpath(dirname(__FILE__)) . "/includes.php"; -Environment::addEnvironmentManipulator(new TestingEnvironmentManipulator(new TestingEnvironmentVariables())); +Environment::setGlobalEnvironmentManipulator(new TestingEnvironmentManipulator(new TestingEnvironmentVariables())); include PIWIK_INCLUDE_PATH . '/index.php';
\ No newline at end of file diff --git a/tests/PHPUnit/proxy/piwik.php b/tests/PHPUnit/proxy/piwik.php index f1e94930c3..5e542379f6 100755 --- a/tests/PHPUnit/proxy/piwik.php +++ b/tests/PHPUnit/proxy/piwik.php @@ -32,7 +32,7 @@ try { }) ); - Environment::addEnvironmentManipulator(new TestingEnvironmentManipulator(new TestingEnvironmentVariables(), $globalObservers)); + Environment::setGlobalEnvironmentManipulator(new TestingEnvironmentManipulator(new TestingEnvironmentVariables(), $globalObservers)); GeoIp::$geoIPDatabaseDir = 'tests/lib/geoip-files'; |