Enable DevicesDetection plugin by default starting in 2.4.0-b6 refs m…

…atomo-org#5329

config/global.ini.php

@@ -609,6 +609,7 @@
 Plugins[] = MultiSites
 Plugins[] = Referrers
 Plugins[] = UserSettings
+Plugins[] = DevicesDetection
 Plugins[] = Goals
 Plugins[] = SEO
 Plugins[] = Events

core/Config.php

@@ -148,16 +148,6 @@ public function setTestEnvironment($pathLocal = null, $pathGlobal = null, $pathC
         // for unit tests, we set that no plugin is installed. This will force
         // the test initialization to create the plugins tables, execute ALTER queries, etc.
         $this->configCache['PluginsInstalled'] = array('PluginsInstalled' => array());
-
-        // DevicesDetection plugin is not yet enabled by default
-        if (isset($configGlobal['Plugins'])) {
-            $this->configCache['Plugins'] = $this->configGlobal['Plugins'];
-            $this->configCache['Plugins']['Plugins'][] = 'DevicesDetection';
-        }
-        if (isset($configGlobal['Plugins_Tracker'])) {
-            $this->configCache['Plugins_Tracker'] = $this->configGlobal['Plugins_Tracker'];
-            $this->configCache['Plugins_Tracker']['Plugins_Tracker'][] = 'DevicesDetection';
-        }
     }
 
     /**

core/Plugin/Manager.php

@@ -68,7 +68,6 @@ class Manager extends Singleton
     // Plugins bundled with core package, disabled by default
     protected $corePluginsDisabledByDefault = array(
         'DBStats',
-        'DevicesDetection',
         'ExampleCommand',
         'ExampleSettingsPlugin',
         'ExampleUI',

core/Updates/2.4.0-b6.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Updates;
+
+use Piwik\Updates;
+
+class Updates_2_4_0_b6 extends Updates
+{
+    public static function update()
+    {
+        $pluginManager = \Piwik\Plugin\Manager::getInstance();
+
+        try {
+            $pluginManager->activatePlugin('DevicesDetection');
+        } catch(\Exception $e) {
+        }
+    }
+}

core/Version.php

@@ -21,5 +21,5 @@ final class Version
      * The current Piwik version.
      * @var string
      */
-    const VERSION = '2.4.0-b5';
+    const VERSION = '2.4.0-b6';
 }

plugins/CoreConsole/Commands/SyncUITestScreenshots.php

@@ -73,7 +73,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     $downloadTo = "plugins/$testPlugin/tests/UI/expected-ui-screenshots/$file";
                 }
 
-                $output->write("<info>Downloading $file to $downloadTo...</info>\n");
+                $output->write("<info>Downloading $file to  $downloadTo...</info>\n");
                 Http::sendHttpRequest("$urlBase/processed-ui-screenshots/$file", $timeout = 60, $userAgent = null,
                     PIWIK_DOCUMENT_ROOT . "/" . $downloadTo);
             }