Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <benaka@piwik.pro>2015-05-26 22:21:09 +0300
committerdiosmosis <benaka@piwik.pro>2015-06-02 01:05:27 +0300
commitbd7b1634f08a2452d8cd526a99b0d0248834658a (patch)
tree978cfb535ec0e9caf9291098ea2e210665acf8f4 /tests/PHPUnit/Framework/Mock
parent86738409ae2ad93675fbdd6741ca82f4ec6212b6 (diff)
Add TestingEnvironment to DI and use Config instead of TestConfig in ConfigTest.php.
Diffstat (limited to 'tests/PHPUnit/Framework/Mock')
-rw-r--r--tests/PHPUnit/Framework/Mock/TestConfig.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/PHPUnit/Framework/Mock/TestConfig.php b/tests/PHPUnit/Framework/Mock/TestConfig.php
index fce172a7fd..49e252dedc 100644
--- a/tests/PHPUnit/Framework/Mock/TestConfig.php
+++ b/tests/PHPUnit/Framework/Mock/TestConfig.php
@@ -10,13 +10,14 @@ namespace Piwik\Tests\Framework\Mock;
use Piwik\Application\Kernel\GlobalSettingsProvider;
use Piwik\Config;
+use Piwik\Tests\Framework\TestingEnvironment;
class TestConfig extends Config
{
private $allowSave = false;
private $doSetTestEnvironment = false;
- public function __construct(GlobalSettingsProvider $provider, $allowSave = false, $doSetTestEnvironment = true)
+ public function __construct(GlobalSettingsProvider $provider, TestingEnvironment $testingEnvironment, $allowSave = false, $doSetTestEnvironment = true)
{
parent::__construct($provider);
@@ -25,7 +26,6 @@ class TestConfig extends Config
$this->reload();
- $testingEnvironment = new \Piwik\Tests\Framework\TestingEnvironment();
$this->setFromTestEnvironment($testingEnvironment);
}