Fixing build for branch.

plugins/PrivacyManager/Config.php

@@ -62,7 +62,6 @@ class Config
         $cache = Cache::getCacheGeneral();
 
         if (array_key_exists($name, $cache)) {
-
             $value = $cache[$name];
             settype($value, $config['type']);
             return $value;

tests/PHPUnit/DatabaseTestCase.php

@@ -38,6 +38,7 @@ class DatabaseTestCase extends PHPUnit_Framework_TestCase
         $this->fixture = new Fixture();
         $this->fixture->loadTranslations = false;
         $this->fixture->createSuperUser = false;
+        $this->fixture->configureComponents = false;
         $this->fixture->performSetUp(__CLASS__);
     }
 

tests/PHPUnit/Fixture.php

@@ -60,6 +60,7 @@ class Fixture extends PHPUnit_Framework_Assert
     public $loadTranslations = true;
     public $createSuperUser = true;
     public $overwriteExisting = true;
+    public $configureComponents = true;
 
     /** Adds data to Piwik. Creates sites, tracks visits, imports log files, etc. */
     public function setUp()
@@ -157,8 +158,10 @@ class Fixture extends PHPUnit_Framework_Assert
         \Piwik\SettingsPiwik::$cachedKnownSegmentsToArchive = null;
         \Piwik\CacheFile::$invalidateOpCacheBeforeRead = true;
 
-        \Piwik\Plugins\PrivacyManager\IPAnonymizer::deactivate();
-        \Piwik\Plugins\PrivacyManager\DoNotTrackHeaderChecker::deactivate();
+        if ($this->configureComponents) {
+            \Piwik\Plugins\PrivacyManager\IPAnonymizer::deactivate();
+            \Piwik\Plugins\PrivacyManager\DoNotTrackHeaderChecker::deactivate();
+        }
 
         if ($this->createSuperUser) {
             self::createSuperUser();

tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php

@@ -6,8 +6,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-use \Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
-use \Piwik\Option;
+use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
+use Piwik\Option;
 
 /**
  * Class Plugins_SitesManagerTest