Merge Platform.initialized test environment event observer w/ the Environment.bootstrapped one.

1 files changed, 8 insertions, 10 deletions

diff --git a/config/environment/test.php b/config/environment/test.php
index 5f631db07a..674d6c44a2 100644
--- a/config/environment/test.php
+++ b/config/environment/test.php
@@ -74,6 +74,14 @@ return array(
             \Piwik\Plugins\CoreVisualizations\Visualizations\Cloud::$debugDisableShuffle = true;
             \Piwik\Visualization\Sparkline::$enableSparklineImages = false;
             \Piwik\Plugins\ExampleUI\API::$disableRandomness = true;
+
+            $testingEnvironment = new TestingEnvironment();
+            if ($testingEnvironment->deleteArchiveTables
+                && !$testingEnvironment->_archivingTablesDeleted
+            ) {
+                $testingEnvironment->_archivingTablesDeleted = true;
+                DbHelper::deleteArchiveTables();
+            }
         }),
 
         array('AssetManager.getStylesheetFiles', function (&$stylesheets) {
@@ -111,15 +119,5 @@ return array(
             );
             file_put_contents($outputFile, json_encode($outputContents));
         }),
-
-        array('Platform.initialized', function () {
-            $testingEnvironment = new TestingEnvironment();
-            if ($testingEnvironment->deleteArchiveTables
-                && !$testingEnvironment->_archivingTablesDeleted
-            ) {
-                $testingEnvironment->_archivingTablesDeleted = true;
-                DbHelper::deleteArchiveTables();
-            }
-        }),
     )),
 );