Merge branch 'master' into config_step_2

Conflicts:
	config/global.php
	core/CliMulti/RequestCommand.php
	core/Config.php
	core/Config/IniFileChain.php
	tests/PHPUnit/System/BlobReportLimitingTest.php
	tests/PHPUnit/TestingEnvironment.php
	tests/PHPUnit/Unit/Config/IniFileChainTest.php
	tests/PHPUnit/Unit/ConfigTest.php

1 files changed, 10 insertions, 0 deletions

diff --git a/tests/PHPUnit/System/BlobReportLimitingTest.php b/tests/PHPUnit/System/BlobReportLimitingTest.php
index ba2ea49b46..8122fd195c 100755
--- a/tests/PHPUnit/System/BlobReportLimitingTest.php
+++ b/tests/PHPUnit/System/BlobReportLimitingTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\System;
 
 use Piwik\Application\Kernel\GlobalSettingsProvider\IniSettingsProvider;
+use Piwik\Cache;
 use Piwik\Config;
 use Piwik\Plugins\Actions\ArchivingHelper;
 use Piwik\Tests\Framework\Mock\TestConfig;
@@ -23,6 +24,9 @@ use Piwik\Tests\Fixtures\ManyVisitsWithMockLocationProvider;
  */
 class BlobReportLimitingTest extends SystemTestCase
 {
+    /**
+     * @var ManyVisitsWithMockLocationProvider
+     */
     public static $fixture = null; // initialized below class definition
 
     public static function setUpBeforeClass()
@@ -31,6 +35,12 @@ class BlobReportLimitingTest extends SystemTestCase
         parent::setUpBeforeClass();
     }
 
+    public function setUp()
+    {
+        Cache::getTransientCache()->flushAll();
+        parent::setUp();
+    }
+
     public function getApiForTesting()
     {
         // TODO: test Provider plugin? Not sure if it's possible.