Allow Environment to be specified via constructor to Console app for tests,...

Allow Environment to be specified via constructor to Console app for tests, and re-use Fixture environment in ConsoleCommandTestCase.

core/Console.php

@@ -26,12 +26,14 @@ class Console extends Application
      */
     private $environment;
 
-    public function __construct()
+    public function __construct(Environment $environment = null)
     {
         $this->setServerArgsIfPhpCgi();
 
         parent::__construct();
 
+        $this->environment = $environment;
+
         $option = new InputOption('piwik-domain',
             null,
             InputOption::VALUE_OPTIONAL,
@@ -169,8 +171,10 @@ class Console extends Application
     protected function initEnvironment(OutputInterface $output)
     {
         try {
-            $this->environment = new Environment('cli');
-            $this->environment->init();
+            if ($this->environment === null) {
+                $this->environment = new Environment('cli');
+                $this->environment->init();
+            }
 
             $config = Config::getInstance();
             return $config;

tests/PHPUnit/Framework/TestCase/ConsoleCommandTestCase.php

@@ -75,7 +75,7 @@ class ConsoleCommandTestCase extends SystemTestCase
     {
         parent::setUp();
 
-        $this->application = new TestConsole();
+        $this->application = new TestConsole(self::$fixture->piwikEnvironment);
         $this->application->setAutoExit(false);
 
         $this->applicationTester = new ApplicationTester($this->application);