From b436e2965c68adb60bd0042caf4422bb37ba711d Mon Sep 17 00:00:00 2001
From: diosmosis <benakamoorthi@fastmail.fm>
Date: Fri, 21 Feb 2014 07:46:18 +0000
Subject: [PATCH] Fixing build for branch.
---
plugins/PrivacyManager/Config.php | 1 -
tests/PHPUnit/DatabaseTestCase.php | 1 +
tests/PHPUnit/Fixture.php | 7 +++++--
.../Integration/Plugins/PrivacyManagerConfigTest.php | 4 ++--
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/plugins/PrivacyManager/Config.php b/plugins/PrivacyManager/Config.php
index 4a5848cd60..88ca3a00b3 100644
--- a/plugins/PrivacyManager/Config.php
+++ b/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;
diff --git a/tests/PHPUnit/DatabaseTestCase.php b/tests/PHPUnit/DatabaseTestCase.php
index 390b054f42..9541ae7b55 100644
--- a/tests/PHPUnit/DatabaseTestCase.php
+++ b/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__);
}
diff --git a/tests/PHPUnit/Fixture.php b/tests/PHPUnit/Fixture.php
index 38ce63afef..575caf3eb2 100644
--- a/tests/PHPUnit/Fixture.php
+++ b/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();
diff --git a/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php b/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php
index cd0b9a9ecd..1efef82c2d 100644
--- a/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php
+++ b/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
--
GitLab