Activate Matomo 4 by default (#16398)4.0.0-a1

6 files changed, 30 insertions, 12 deletions

diff --git a/plugins/PagePerformance/Columns/TimeDomCompletion.php b/plugins/PagePerformance/Columns/TimeDomCompletion.php
index 16190c27c3..5124dd9a24 100644
--- a/plugins/PagePerformance/Columns/TimeDomCompletion.php
+++ b/plugins/PagePerformance/Columns/TimeDomCompletion.php
@@ -21,8 +21,11 @@ use Piwik\Tracker\Visitor;
 
 class TimeDomCompletion extends ActionDimension
 {
-    protected $columnName = 'time_dom_completion';
-    protected $columnType = 'MEDIUMINT(10) UNSIGNED NULL';
+    const COLUMN_TYPE = 'MEDIUMINT(10) UNSIGNED NULL';
+    const COLUMN_NAME = 'time_dom_completion';
+
+    protected $columnName = self::COLUMN_NAME;
+    protected $columnType = self::COLUMN_TYPE;
     protected $type = self::TYPE_DURATION_MS;
     protected $nameSingular = 'PagePerformance_ColumnTimeDomCompletion';
 
diff --git a/plugins/PagePerformance/Columns/TimeDomProcessing.php b/plugins/PagePerformance/Columns/TimeDomProcessing.php
index e829e54a6f..3a426da96a 100644
--- a/plugins/PagePerformance/Columns/TimeDomProcessing.php
+++ b/plugins/PagePerformance/Columns/TimeDomProcessing.php
@@ -21,8 +21,11 @@ use Piwik\Tracker\Visitor;
 
 class TimeDomProcessing extends ActionDimension
 {
-    protected $columnName = 'time_dom_processing';
-    protected $columnType = 'MEDIUMINT(10) UNSIGNED NULL';
+    const COLUMN_TYPE = 'MEDIUMINT(10) UNSIGNED NULL';
+    const COLUMN_NAME = 'time_dom_processing';
+
+    protected $columnName = self::COLUMN_NAME;
+    protected $columnType = self::COLUMN_TYPE;
     protected $type = self::TYPE_DURATION_MS;
     protected $nameSingular = 'PagePerformance_ColumnTimeDomProcessing';
 
diff --git a/plugins/PagePerformance/Columns/TimeNetwork.php b/plugins/PagePerformance/Columns/TimeNetwork.php
index d363e6f9cb..6d247e16f8 100644
--- a/plugins/PagePerformance/Columns/TimeNetwork.php
+++ b/plugins/PagePerformance/Columns/TimeNetwork.php
@@ -21,8 +21,11 @@ use Piwik\Tracker\Visitor;
 
 class TimeNetwork extends ActionDimension
 {
-    protected $columnName = 'time_network';
-    protected $columnType = 'MEDIUMINT(10) UNSIGNED NULL';
+    const COLUMN_TYPE = 'MEDIUMINT(10) UNSIGNED NULL';
+    const COLUMN_NAME = 'time_network';
+
+    protected $columnName = self::COLUMN_NAME;
+    protected $columnType = self::COLUMN_TYPE;
     protected $type = self::TYPE_DURATION_MS;
     protected $nameSingular = 'PagePerformance_ColumnTimeNetwork';
 
diff --git a/plugins/PagePerformance/Columns/TimeOnLoad.php b/plugins/PagePerformance/Columns/TimeOnLoad.php
index 522e25b2e0..48ca77af05 100644
--- a/plugins/PagePerformance/Columns/TimeOnLoad.php
+++ b/plugins/PagePerformance/Columns/TimeOnLoad.php
@@ -21,8 +21,11 @@ use Piwik\Tracker\Visitor;
 
 class TimeOnLoad extends ActionDimension
 {
-    protected $columnName = 'time_on_load';
-    protected $columnType = 'MEDIUMINT(10) UNSIGNED NULL';
+    const COLUMN_TYPE = 'MEDIUMINT(10) UNSIGNED NULL';
+    const COLUMN_NAME = 'time_on_load';
+
+    protected $columnName = self::COLUMN_NAME;
+    protected $columnType = self::COLUMN_TYPE;
     protected $type = self::TYPE_DURATION_MS;
     protected $nameSingular = 'PagePerformance_ColumnTimeOnLoad';
 
diff --git a/plugins/PagePerformance/Columns/TimeServer.php b/plugins/PagePerformance/Columns/TimeServer.php
index c86ec2a9e4..cc85c4fa2e 100644
--- a/plugins/PagePerformance/Columns/TimeServer.php
+++ b/plugins/PagePerformance/Columns/TimeServer.php
@@ -21,8 +21,11 @@ use Piwik\Tracker\Visitor;
 
 class TimeServer extends ActionDimension
 {
-    protected $columnName = 'time_server';
-    protected $columnType = 'MEDIUMINT(10) UNSIGNED NULL';
+    const COLUMN_TYPE = 'MEDIUMINT(10) UNSIGNED NULL';
+    const COLUMN_NAME = 'time_server';
+
+    protected $columnName = self::COLUMN_NAME;
+    protected $columnType = self::COLUMN_TYPE;
     protected $type = self::TYPE_DURATION_MS;
     protected $nameSingular = 'PagePerformance_ColumnTimeServer';
 
diff --git a/plugins/PagePerformance/Columns/TimeTransfer.php b/plugins/PagePerformance/Columns/TimeTransfer.php
index a09c20db8d..e8454888bd 100644
--- a/plugins/PagePerformance/Columns/TimeTransfer.php
+++ b/plugins/PagePerformance/Columns/TimeTransfer.php
@@ -21,8 +21,11 @@ use Piwik\Tracker\Visitor;
 
 class TimeTransfer extends ActionDimension
 {
-    protected $columnName = 'time_transfer';
-    protected $columnType = 'MEDIUMINT(10) UNSIGNED NULL';
+    const COLUMN_TYPE = 'MEDIUMINT(10) UNSIGNED NULL';
+    const COLUMN_NAME = 'time_transfer';
+
+    protected $columnName = self::COLUMN_NAME;
+    protected $columnType = self::COLUMN_TYPE;
     protected $type = self::TYPE_DURATION_MS;
     protected $nameSingular = 'PagePerformance_ColumnTimeTransfer';