Initialise 4.x branch (matomo-org#15383)

alemonteiro · Jan 13, 2020 · b247f85 · b247f85
1 parent dfd5f05
commit b247f85
Show file tree

Hide file tree

Showing 33 changed files with 54 additions and 51 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -36,32 +36,32 @@ matrix:
   fast_finish: true
   include:
     # PDO Mysql
-    - php: 5.6
+    - php: 7.2
       env: TEST_SUITE=SystemTestsCore MYSQL_ADAPTER=PDO_MYSQL
       sudo: required
-    - php: 5.6
+    - php: 7.2
       env: TEST_SUITE=SystemTestsPlugins MYSQL_ADAPTER=PDO_MYSQL
       sudo: required
-    - php: 5.6
+    - php: 7.2
       env: TEST_SUITE=IntegrationTestsCore MYSQL_ADAPTER=PDO_MYSQL
       sudo: required
-    - php: 5.6
+    - php: 7.2
       env: TEST_SUITE=IntegrationTestsPlugins MYSQL_ADAPTER=PDO_MYSQL
       sudo: required
-    - php: 5.6
+    - php: 7.2
       env: TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL
       sudo: false
       addons: false
     # Javascript tests
-    - php: 5.6
+    - php: 7.2
       env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
       sudo: false
       addons:
         apt:
           packages:
             - nginx
             - realpath
-    - php: 5.6
+    - php: 7.2
       env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1
       sudo: false
       addons: false
@@ -73,10 +73,10 @@ matrix:
       env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI ALLTEST_EXTRA_OPTIONS="--run-second-half-only"
       sudo: required
     # UITests use a specific version because the default 5.5 (== 5.5.38) is missing FreeType support
-    - php: 5.5.33
+    - php: 7.2
       env: TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL UITEST_EXTRA_OPTIONS="--run-first-half-only"
       sudo: false
-    - php: 5.5.33
+    - php: 7.2
       env: TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL UITEST_EXTRA_OPTIONS="--run-second-half-only"
       sudo: false
 

diff --git a/composer.json b/composer.json
@@ -20,12 +20,12 @@
     },
     "config":{
         "platform": {
-            "php": "5.5.9"
+            "php": "7.2.0"
         },
         "prepend-autoloader": false
     },
     "require": {
-        "php": ">=5.5.9",
+        "php": ">=7.2.0",
         "twig/twig": "~1.0",
         "leafo/lessphp": "dev-php74-compat",
         "symfony/console": "~2.6.0",

diff --git a/config/global.ini.php b/config/global.ini.php
@@ -227,7 +227,7 @@
 maintenance_mode = 0
 
 ; Defines the release channel that shall be used. Currently available values are:
-; "latest_stable", "latest_beta", "latest_3x_stable", "latest_3x_beta"
+; "latest_stable", "latest_beta", "latest_4x_stable", "latest_4x_beta"
 release_channel = "latest_stable"
 
 ; character used to automatically create categories in the Actions > Pages, Outlinks and Downloads reports

diff --git a/core/Version.php b/core/Version.php
@@ -20,7 +20,8 @@ final class Version
      * The current Matomo version.
      * @var string
      */
-    const VERSION = '3.13.1-rc2';
+    const VERSION = '4.0.0-b1';
+    const MAJOR_VERSION = 4;
 
     public function isStableVersion($version)
     {

diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php
@@ -21,7 +21,7 @@
 // 2) tests/travis/generator/Generator.php
 // 3) composer.json (in two places)
 // 4) tests/PHPUnit/Integration/ReleaseCheckListTest.php
-$piwik_minimumPHPVersion = '5.5.9';
+$piwik_minimumPHPVersion = '7.2.0';
 $piwik_currentPHPVersion = PHP_VERSION;
 $minimumPhpInvalid = version_compare($piwik_minimumPHPVersion, $piwik_currentPHPVersion) > 0;
 if ($minimumPhpInvalid) {

diff --git a/plugins/AnonymousPiwikUsageMeasurement b/plugins/AnonymousPiwikUsageMeasurement
diff --git a/plugins/Bandwidth b/plugins/Bandwidth
diff --git a/...reUpdater/ReleaseChannel/Latest3XBeta.php → ...ater/ReleaseChannel/LatestCurrentBeta.php b/...reUpdater/ReleaseChannel/Latest3XBeta.php → ...ater/ReleaseChannel/LatestCurrentBeta.php
@@ -10,17 +10,18 @@
 
 use Piwik\Piwik;
 use Piwik\Plugins\CoreUpdater\ReleaseChannel;
+use Piwik\Version;
 
-class Latest3XBeta extends ReleaseChannel
+class LatestCurrentBeta extends ReleaseChannel
 {
     public function getId()
     {
-        return 'latest_3x_beta';
+        return 'latest_'. Version::MAJOR_VERSION . 'x_beta';
     }
 
     public function getName()
     {
-        return Piwik::translate('CoreUpdater_LatestXBetaRelease', '3.X');
+        return Piwik::translate('CoreUpdater_LatestXBetaRelease', Version::MAJOR_VERSION . '.X');
     }
 
     public function getDescription()

diff --git a/...Updater/ReleaseChannel/Latest3XStable.php → ...er/ReleaseChannel/LatestCurrentStable.php b/...Updater/ReleaseChannel/Latest3XStable.php → ...er/ReleaseChannel/LatestCurrentStable.php
@@ -10,17 +10,18 @@
 
 use Piwik\Piwik;
 use Piwik\Plugins\CoreUpdater\ReleaseChannel;
+use Piwik\Version;
 
-class Latest3XStable extends ReleaseChannel
+class LatestCurrentStable extends ReleaseChannel
 {
     public function getId()
     {
-        return 'latest_3x_stable';
+        return 'latest_'.Version::MAJOR_VERSION.'x_stable';
     }
 
     public function getName()
     {
-        return Piwik::translate('CoreUpdater_LatestXStableRelease', '3.X');
+        return Piwik::translate('CoreUpdater_LatestXStableRelease', Version::MAJOR_VERSION . '.X');
     }
 
     public function getDescription()

diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions
diff --git a/plugins/DeviceDetectorCache b/plugins/DeviceDetectorCache
diff --git a/plugins/ExampleLogTables/plugin.json b/plugins/ExampleLogTables/plugin.json
@@ -4,7 +4,7 @@
   "version": "0.1.0",
   "theme": false,
   "require": {
-    "piwik": ">=3.0.0-b1,<4.0.0-b1"
+    "piwik": ">=4.0.0-b1,<5.0.0-b1"
   },
   "authors": [
     {

diff --git a/plugins/ExamplePlugin/plugin.json b/plugins/ExamplePlugin/plugin.json
@@ -4,7 +4,7 @@
   "version": "0.1.0",
   "theme": false,
   "require": {
-    "piwik": ">=3.0.0-b1,<4.0.0-b1"
+    "piwik": ">=4.0.0-b1,<5.0.0-b1"
   },
   "authors": [
     {

diff --git a/plugins/ExampleTheme/plugin.json b/plugins/ExampleTheme/plugin.json
@@ -4,7 +4,7 @@
     "version": "0.1.0",
     "theme": true,
     "require": {
-       "piwik": ">=3.0.0-b1,<4.0.0-b1"
+       "piwik": ">=4.0.0-b1,<5.0.0-b1"
     },
     "stylesheet": "stylesheets/theme.less",
     "homepage": "",

diff --git a/plugins/LogViewer b/plugins/LogViewer
diff --git a/plugins/LoginHttpAuth b/plugins/LoginHttpAuth
diff --git a/plugins/LoginLdap b/plugins/LoginLdap
diff --git a/plugins/MarketingCampaignsReporting b/plugins/MarketingCampaignsReporting
diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking
diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo
diff --git a/plugins/TagManager b/plugins/TagManager
diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable
diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization
diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator
diff --git a/tests/PHPUnit/Integration/Plugin/ReleaseChannelsTest.php b/tests/PHPUnit/Integration/Plugin/ReleaseChannelsTest.php
@@ -79,7 +79,7 @@ public function getTestValidReleaseChannelIds()
         return array(
             array($exists = true, $id = 'latest_stable'),
             array($exists = true, $id = 'latest_beta'),
-            array($exists = true, $id = 'latest_3x_stable'),
+            array($exists = true, $id = 'latest_4x_stable'),
             array($exists = true, $id = 'laTest_stable'), // we do not check for exact match
             array($exists = false, $id = ''),
             array($exists = false, $id = 'latest'),
@@ -92,7 +92,7 @@ public function getTestActiveReleaseChannel()
     {
         return array(
             array('latest_stable', 'latest_stable'),
-            array('latest_3x_stable', 'latest_3x_stable'),
+            array('latest_4x_stable', 'latest_4x_stable'),
             array('latest_beta', 'latest_beta'),
             array('latest_beta', 'latEst_betA'),
             array('latest_stable', ''), // if nothing configured should return default (the one with lowest order)

diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
@@ -28,7 +28,7 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase
 {
     private $globalConfig;
 
-    const MINIMUM_PHP_VERSION = '5.5.9';
+    const MINIMUM_PHP_VERSION = '7.2.0';
 
     public function setUp()
     {

diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml
@@ -322,8 +322,8 @@
 				<availableValues>
 					<latest_stable>Latest stable release (Recommended)</latest_stable>
 					<latest_beta>Latest beta release</latest_beta>
-					<latest_3x_stable>Latest stable 3.X (Long Term Support version)</latest_3x_stable>
-					<latest_3x_beta>Latest beta 3.X (Long Term Support version)</latest_3x_beta>
+					<latest_4x_stable>Latest stable 3.X (Long Term Support version)</latest_4x_stable>
+					<latest_4x_beta>Latest beta 3.X (Long Term Support version)</latest_4x_beta>
 				</availableValues>
 				<description />
 				<inlineHelp>While our development process includes thousands of automated tests, Beta Testers play a key role in achieving the &quot;No bug policy&quot; in Matomo.&lt;br/&gt;If Matomo is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please &lt;a target='_blank' rel='noreferrer noopener' href='https://developer.matomo.org/guides/core-team-workflow#influencing-piwik-development'&gt;see here&lt;/a&gt;.&lt;br /&gt;LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp>

diff --git a/.../PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml b/.../PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml
@@ -284,8 +284,8 @@
 				<availableValues>
 					<latest_stable>Latest stable release (Recommended)</latest_stable>
 					<latest_beta>Latest beta release</latest_beta>
-					<latest_3x_stable>Latest stable 3.X (Long Term Support version)</latest_3x_stable>
-					<latest_3x_beta>Latest beta 3.X (Long Term Support version)</latest_3x_beta>
+					<latest_4x_stable>Latest stable 3.X (Long Term Support version)</latest_4x_stable>
+					<latest_4x_beta>Latest beta 3.X (Long Term Support version)</latest_4x_beta>
 				</availableValues>
 				<description />
 				<inlineHelp>While our &lt;a target='_blank' rel='noreferrer noopener' href='https://matomo.org/participate/development-process/'&gt;development process&lt;/a&gt; includes thousands of automated tests, Beta Testers play a key role in achieving the &quot;No bug policy&quot; in Matomo.&lt;br/&gt;If Matomo is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please &lt;a target='_blank' rel='noreferrer noopener' href='https://developer.matomo.org/guides/core-team-workflow#influencing-piwik-development'&gt;see here&lt;/a&gt;.&lt;br /&gt;LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp>

diff --git a/...PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml b/...PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml
@@ -322,8 +322,8 @@
 				<availableValues>
 					<latest_stable>Latest stable release (Recommended)</latest_stable>
 					<latest_beta>Latest beta release</latest_beta>
-					<latest_3x_stable>Latest stable 3.X (Long Term Support version)</latest_3x_stable>
-					<latest_3x_beta>Latest beta 3.X (Long Term Support version)</latest_3x_beta>
+					<latest_4x_stable>Latest stable 3.X (Long Term Support version)</latest_4x_stable>
+					<latest_4x_beta>Latest beta 3.X (Long Term Support version)</latest_4x_beta>
 				</availableValues>
 				<description />
 				<inlineHelp>While our development process includes thousands of automated tests, Beta Testers play a key role in achieving the &quot;No bug policy&quot; in Matomo.&lt;br/&gt;If Matomo is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please &lt;a target='_blank' rel='noreferrer noopener' href='https://developer.matomo.org/guides/core-team-workflow#influencing-piwik-development'&gt;see here&lt;/a&gt;.&lt;br /&gt;LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp>

diff --git a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml
@@ -322,8 +322,8 @@
 				<availableValues>
 					<latest_stable>Latest stable release (Recommended)</latest_stable>
 					<latest_beta>Latest beta release</latest_beta>
-					<latest_3x_stable>Latest stable 3.X (Long Term Support version)</latest_3x_stable>
-					<latest_3x_beta>Latest beta 3.X (Long Term Support version)</latest_3x_beta>
+					<latest_4x_stable>Latest stable 3.X (Long Term Support version)</latest_4x_stable>
+					<latest_4x_beta>Latest beta 3.X (Long Term Support version)</latest_4x_beta>
 				</availableValues>
 				<description />
 				<inlineHelp>While our development process includes thousands of automated tests, Beta Testers play a key role in achieving the &quot;No bug policy&quot; in Matomo.&lt;br/&gt;If Matomo is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please &lt;a target='_blank' rel='noreferrer noopener' href='https://developer.matomo.org/guides/core-team-workflow#influencing-piwik-development'&gt;see here&lt;/a&gt;.&lt;br /&gt;LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp>

diff --git a/tests/resources/custompluginsdir/CustomDirPlugin/plugin.json b/tests/resources/custompluginsdir/CustomDirPlugin/plugin.json
@@ -4,7 +4,7 @@
     "version": "0.1.0",
     "theme": false,
     "require": {
-        "piwik": ">=3.8.1-stable,<4.0.0-b1"
+        "piwik": ">=4.0.0-b1,<5.0.0-b1"
     },
     "authors": [
         {

diff --git a/tests/travis b/tests/travis
+1 −1		CustomAlerts.php
+1 −3		Processor.php
+62 −4		lang/es-ar.json
+2 −1		lang/es.json
+5 −1		lang/ja.json
+2 −2		plugin.json
+1 −0		tests/UI/CustomAlerts_spec.js
+4 −0		CHANGELOG.md
+1 −1		Commands/AnonymizeLog.php
+11 −11		Commands/GenerateVisits.php
+1 −1		Commands/ShortenLog.php
+2 −2		Faker/Request.php
+10 −10		Generator.php
+1 −1		Generator/Annotations.php
+3 −3		Generator/LiveVisitsFromLog.php
+5 −5		Generator/VisitsFake.php
+1 −1		Generator/VisitsFromLogs.php
+8 −8		README.md
+25 −0		lang/es-ar.json
+10 −10		plugin.json
+1 −1		templates/generate.twig
+2 −2		templates/index.twig