Create custom TestingEnvironmentVariablesDefinitionSource in...

Create custom TestingEnvironmentVariablesDefinitionSource in TestingEnvironmentManipulator instead of in ContainerFactory.php.

core/Container/ContainerFactory.php

@@ -95,12 +95,6 @@ class ContainerFactory
             $this->addEnvironmentConfig($builder, $environment);
         }
 
-        // Test config
-        if (defined('PIWIK_TEST_MODE')) {
-            $vars = new TestingEnvironmentVariables();
-            $builder->addDefinitions(new TestingEnvironmentVariablesDefinitionSource($vars));
-        }
-
         if (!empty($this->definitions)) {
             foreach ($this->definitions as $definitionArray) {
                 $builder->addDefinitions($definitionArray);

tests/PHPUnit/Framework/TestingEnvironmentManipulator.php

@@ -95,6 +95,8 @@ class TestingEnvironmentManipulator implements EnvironmentManipulator
 
     public function getExtraDefinitions()
     {
+        $testVarDefinitionSource = new TestingEnvironmentVariablesDefinitionSource($this->vars);
+
         // Apply DI config from the fixture
         $diConfig = array();
         if ($this->vars->fixtureClass) {
@@ -122,6 +124,7 @@ class TestingEnvironmentManipulator implements EnvironmentManipulator
         }
 
         return array(
+            $testVarDefinitionSource,
             $diConfig,
             array('observers.global' => \DI\add($this->globalObservers)),
         );