Create manipulator manually in proxy entrypoints instead of using...

Create manipulator manually in proxy entrypoints instead of using TestingEnvironmentVariables::addHooks().

misc/cron/updatetoken.php

@@ -12,6 +12,8 @@
 namespace Piwik;
 
 use Piwik\Application\Environment;
+use Piwik\Tests\Framework\TestingEnvironmentManipulator;
+use Piwik\Tests\Framework\TestingEnvironmentVariables;
 
 if (!defined('PIWIK_INCLUDE_PATH')) {
     define('PIWIK_INCLUDE_PATH', realpath(dirname(__FILE__) . "/../.."));
@@ -35,7 +37,7 @@ $testmode = in_array('--testmode', $_SERVER['argv']);
 if ($testmode) {
     define('PIWIK_TEST_MODE', true);
 
-    Tests\Framework\TestingEnvironmentVariables::addHooks();
+    Environment::addEnvironmentManipulator(new TestingEnvironmentManipulator(new TestingEnvironmentVariables()));
 }
 
 function getPiwikDomain()

tests/PHPUnit/Framework/TestingEnvironmentVariables.php

@@ -109,12 +109,6 @@ class TestingEnvironmentVariables
         return $plugins;
     }
 
-    public static function addHooks($globalObservers = array())
-    {
-        $testingEnvironment = new TestingEnvironmentVariables();
-        Environment::addEnvironmentManipulator(new TestingEnvironmentManipulator($testingEnvironment, $globalObservers));
-    }
-
     /**
      * for plugins that need to inject special testing logic
      */

tests/PHPUnit/proxy/archive.php

 <?php
+use Piwik\Application\Environment;
+use Piwik\Tests\Framework\TestingEnvironmentManipulator;
+use Piwik\Tests\Framework\TestingEnvironmentVariables;
+
 define('PIWIK_ARCHIVE_NO_TRUNCATE', true);
 
 require realpath(dirname(__FILE__)) . "/includes.php";
 
-\Piwik\Tests\Framework\TestingEnvironmentVariables::addHooks();
+Environment::addEnvironmentManipulator(new TestingEnvironmentManipulator(new TestingEnvironmentVariables()));
 
 // include archive.php, and let 'er rip
 require_once PIWIK_INCLUDE_PATH . "/misc/cron/archive.php";

tests/PHPUnit/proxy/console

 #!/usr/bin/env php
 <?php
+use Piwik\Application\Environment;
+use Piwik\Tests\Framework\TestingEnvironmentManipulator;
+use Piwik\Tests\Framework\TestingEnvironmentVariables;
+
 require realpath(dirname(__FILE__)) . "/includes.php";
 
-\Piwik\Tests\Framework\TestingEnvironmentVariables::addHooks();
+Environment::addEnvironmentManipulator(new TestingEnvironmentManipulator(new TestingEnvironmentVariables()));
 
 require_once PIWIK_INCLUDE_PATH . "/console";

tests/PHPUnit/proxy/index.php

@@ -4,8 +4,12 @@
  * Used by tests/PHPUnit/System/ImportLogsTest.php and tests/PHPUnit/System/UITest.php
  */
 
+use Piwik\Application\Environment;
+use Piwik\Tests\Framework\TestingEnvironmentManipulator;
+use Piwik\Tests\Framework\TestingEnvironmentVariables;
+
 require realpath(dirname(__FILE__)) . "/includes.php";
 
-\Piwik\Tests\Framework\TestingEnvironmentVariables::addHooks();
+Environment::addEnvironmentManipulator(new TestingEnvironmentManipulator(new TestingEnvironmentVariables()));
 
 include PIWIK_INCLUDE_PATH . '/index.php';
\ No newline at end of file

tests/PHPUnit/proxy/piwik.php

@@ -7,10 +7,13 @@
  *
  */
 
+use Piwik\Application\Environment;
 use Piwik\DataTable\Manager;
 use Piwik\Option;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 use Piwik\Site;
+use Piwik\Tests\Framework\TestingEnvironmentManipulator;
+use Piwik\Tests\Framework\TestingEnvironmentVariables;
 use Piwik\Tracker;
 
 require realpath(dirname(__FILE__)) . "/includes.php";
@@ -29,7 +32,7 @@ try {
         })
     );
 
-    \Piwik\Tests\Framework\TestingEnvironmentVariables::addHooks($globalObservers);
+    Environment::addEnvironmentManipulator(new TestingEnvironmentManipulator(new TestingEnvironmentVariables(), $globalObservers));
 
     GeoIp::$geoIPDatabaseDir = 'tests/lib/geoip-files';