Merge pull request #8027 from piwik/test_env_di_8

Injection Inception, Change #6: Final cleanup of test environment setup. Remove TestingEnvironment.addHooks event, make sure core doesn't depend on test files/classes/constants, integrate test environment variables w/ DI for easier overriding in tests, and related clean ups to test environment setup.

4 files changed, 14 insertions, 11 deletions

diff --git a/plugins/DBStats/DBStats.php b/plugins/DBStats/DBStats.php
index 1f5f9d7609..5f16ed8451 100644
--- a/plugins/DBStats/DBStats.php
+++ b/plugins/DBStats/DBStats.php
@@ -11,6 +11,7 @@ namespace Piwik\Plugins\DBStats;
 use Piwik\Piwik;
 use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
 use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable;
+use Piwik\Plugins\DBStats\tests\Mocks\MockDataAccess;
 
 class DBStats extends \Piwik\Plugin
 {
@@ -35,8 +36,7 @@ class DBStats extends \Piwik\Plugin
     public function setupTestEnvironment($environment)
     {
         Piwik::addAction("MySQLMetadataProvider.createDao", function (&$dao) {
-            require_once dirname(__FILE__) . "/tests/Mocks/MockDataAccess.php";
-            $dao = new Mocks\MockDataAccess();
+            $dao = new MockDataAccess();
         });
     }
 }
diff --git a/plugins/DBStats/MySQLMetadataProvider.php b/plugins/DBStats/MySQLMetadataProvider.php
index 2862b6153b..fdce9a938f 100755
--- a/plugins/DBStats/MySQLMetadataProvider.php
+++ b/plugins/DBStats/MySQLMetadataProvider.php
@@ -14,7 +14,6 @@ use Piwik\DataTable;
 use Piwik\Db;
 use Piwik\DbHelper;
 use Piwik\Option;
-use Piwik\Piwik;
 
 /**
  * Utility class that provides general information about databases, including the size of
@@ -39,13 +38,9 @@ class MySQLMetadataProvider
     /**
      * Constructor.
      */
-    public function __construct()
+    public function __construct(MySQLMetadataDataAccess $dataAccess)
     {
-        Piwik::postTestEvent("MySQLMetadataProvider.createDao", array(&$this->dataAccess));
-
-        if ($this->dataAccess === null) {
-            $this->dataAccess = new MySQLMetadataDataAccess();
-        }
+        $this->dataAccess = $dataAccess;
     }
 
     /**
diff --git a/plugins/DBStats/config/test.php b/plugins/DBStats/config/test.php
new file mode 100644
index 0000000000..f14acb17b0
--- /dev/null
+++ b/plugins/DBStats/config/test.php
@@ -0,0 +1,7 @@
+<?php
+
+return array(
+
+    'Piwik\Plugins\DBStats\MySQLMetadataDataAccess' => \DI\object('Piwik\Plugins\DBStats\tests\Mocks\MockDataAccess'),
+
+);
\ No newline at end of file
diff --git a/plugins/DBStats/tests/Mocks/MockDataAccess.php b/plugins/DBStats/tests/Mocks/MockDataAccess.php
index a3b32cefdd..bceaca7470 100644
--- a/plugins/DBStats/tests/Mocks/MockDataAccess.php
+++ b/plugins/DBStats/tests/Mocks/MockDataAccess.php
@@ -6,11 +6,12 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  */
-namespace Piwik\Plugins\DBStats\Mocks;
+namespace Piwik\Plugins\DBStats\tests\Mocks;
 
 use Piwik\Common;
+use Piwik\Plugins\DBStats\MySQLMetadataDataAccess;
 
-class MockDataAccess
+class MockDataAccess extends MySQLMetadataDataAccess
 {
     public static $tableStatuses = array(
         'user' => array(5, 8192, 8192),