diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2020-09-08 06:42:41 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-08 06:42:41 +0300 |
commit | 685176281e07757022f8e5700c6a39f89c4e768a (patch) | |
tree | 403112807bdb0e4c8adc44ea6527fa4c5a86e8eb | |
parent | ac47e1c92f2db966ace3a0abeace59c27daa61cb (diff) |
Activate Matomo 4 by default (#16398)4.0.0-a1
-rw-r--r-- | core/Updates/4.0.0-b1.php | 14 | ||||
-rw-r--r-- | plugins/PagePerformance/Columns/TimeDomCompletion.php | 7 | ||||
-rw-r--r-- | plugins/PagePerformance/Columns/TimeDomProcessing.php | 7 | ||||
-rw-r--r-- | plugins/PagePerformance/Columns/TimeNetwork.php | 7 | ||||
-rw-r--r-- | plugins/PagePerformance/Columns/TimeOnLoad.php | 7 | ||||
-rw-r--r-- | plugins/PagePerformance/Columns/TimeServer.php | 7 | ||||
-rw-r--r-- | plugins/PagePerformance/Columns/TimeTransfer.php | 7 |
7 files changed, 44 insertions, 12 deletions
diff --git a/core/Updates/4.0.0-b1.php b/core/Updates/4.0.0-b1.php index 127517f411..b903fd6d46 100644 --- a/core/Updates/4.0.0-b1.php +++ b/core/Updates/4.0.0-b1.php @@ -16,6 +16,12 @@ use Piwik\Plugin\Manager; use Piwik\Plugins\CoreHome\Columns\Profilable; use Piwik\Plugins\CoreHome\Columns\VisitorSecondsSinceFirst; use Piwik\Plugins\CoreHome\Columns\VisitorSecondsSinceOrder; +use Piwik\Plugins\PagePerformance\Columns\TimeDomCompletion; +use Piwik\Plugins\PagePerformance\Columns\TimeDomProcessing; +use Piwik\Plugins\PagePerformance\Columns\TimeNetwork; +use Piwik\Plugins\PagePerformance\Columns\TimeOnLoad; +use Piwik\Plugins\PagePerformance\Columns\TimeServer; +use Piwik\Plugins\PagePerformance\Columns\TimeTransfer; use Piwik\Plugins\UsersManager\Model; use Piwik\Common; use Piwik\Config; @@ -122,6 +128,12 @@ class Updates_4_0_0_b1 extends PiwikUpdates } $columnsToAdd['log_visit']['visitor_seconds_since_last'] = VisitorSecondsSinceLast::COLUMN_TYPE; $columnsToAdd['log_visit']['profilable'] = Profilable::COLUMN_TYPE; + $columnsToAdd['log_visit'][TimeDomCompletion::class] = TimeDomCompletion::COLUMN_TYPE; + $columnsToAdd['log_visit'][TimeDomProcessing::class] = TimeDomProcessing::COLUMN_TYPE; + $columnsToAdd['log_visit'][TimeNetwork::class] = TimeNetwork::COLUMN_TYPE; + $columnsToAdd['log_visit'][TimeOnLoad::class] = TimeOnLoad::COLUMN_TYPE; + $columnsToAdd['log_visit'][TimeServer::class] = TimeServer::COLUMN_TYPE; + $columnsToAdd['log_visit'][TimeTransfer::class] = TimeTransfer::COLUMN_TYPE; $columnsToMaybeAdd = ['revenue', 'revenue_discount', 'revenue_shipping', 'revenue_subtotal', 'revenue_tax']; $columnsLogConversion = $tableMetadata->getColumns(Common::prefixTable('log_conversion')); @@ -199,6 +211,8 @@ class Updates_4_0_0_b1 extends PiwikUpdates $migrations[] = $this->migration->config->set('mail', 'type', 'Cram-md5'); } + $migrations[] = $this->migration->plugin->activate('PagePerformance'); + return $migrations; } 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'; |