Define observer in proxy piwik.php through TestingEnvironment, instead of calling Piwik::addAction, since the latter needs the DI container (which is not setup yet).

1 files changed, 10 insertions, 8 deletions

diff --git a/tests/PHPUnit/proxy/piwik.php b/tests/PHPUnit/proxy/piwik.php
index b5a984cd00..078069b30f 100755
--- a/tests/PHPUnit/proxy/piwik.php
+++ b/tests/PHPUnit/proxy/piwik.php
@@ -20,16 +20,18 @@ require realpath(dirname(__FILE__)) . "/includes.php";
 ob_start();
 
 try {
-    Piwik_TestingEnvironment::addHooks();
+    $globalObservers = array(
+        array('Environment.bootstrapped', function () {
+            Tracker::setTestEnvironment();
+            Manager::getInstance()->deleteAll();
+            Option::clearCache();
+            Site::clearCache();
+        })
+    );
 
-    GeoIp::$geoIPDatabaseDir = 'tests/lib/geoip-files';
+    Piwik_TestingEnvironment::addHooks($globalObservers);
 
-    \Piwik\Piwik::addAction('Environment.bootstrapped', function () {
-        Tracker::setTestEnvironment();
-        Manager::getInstance()->deleteAll();
-        Option::clearCache();
-        Site::clearCache();
-    });
+    GeoIp::$geoIPDatabaseDir = 'tests/lib/geoip-files';
 
     include PIWIK_INCLUDE_PATH . '/piwik.php';
 } catch (Exception $ex) {