Make TEstingEnvironmentManipulator override the global settings provider ONLY if were custom paths used. This allows other Environment classes to provide their own custom provider, w/o it being overridden by tests. Also when getting DI overrides from a fixture, use the fixture that is configured by the test class, so any fixture properties will be correctly initialized.

1 files changed, 2 insertions, 0 deletions

diff --git a/core/Tracker.php b/core/Tracker.php
index ddc62a9d0e..fa774112c3 100644
--- a/core/Tracker.php
+++ b/core/Tracker.php
@@ -11,6 +11,8 @@ namespace Piwik;
 use Exception;
 use Piwik\Plugins\BulkTracking\Tracker\Requests;
 use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
+use Piwik\Config;
+use Piwik\Tests\Framework\TestingEnvironmentVariables;
 use Piwik\Tracker\Db as TrackerDb;
 use Piwik\Tracker\Db\DbException;
 use Piwik\Tracker\Handler;