diff options
33 files changed, 38 insertions, 35 deletions
diff --git a/.travis.yml b/.travis.yml index b1f04cbe84..0303f518ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,24 +36,24 @@ 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: @@ -61,7 +61,7 @@ matrix: 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 index bfbebb7ada..2c4cfbe76d 100644 --- 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 index 475d1e70ec..38538c7c4d 100755 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -227,7 +227,7 @@ segments_subquery_cache_ttl = 3600 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 index ca16a10bc4..3ed1f570a7 100644 --- 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 index f79290c1fd..4508fe9e82 100644 --- a/core/testMinimumPhpVersion.php +++ b/core/testMinimumPhpVersion.php @@ -21,7 +21,7 @@ $piwik_errorMessage = ''; // 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 -Subproject 4f57457a52bf6521fa662046f6585102245b770 +Subproject 66269ff14c32ed433d86b46fb772e4082ac66cb diff --git a/plugins/Bandwidth b/plugins/Bandwidth -Subproject de72a243e88779b550e8fd059be25af922a4464 +Subproject cf4bc33047985ac8308ed0fc39f2a24d523cde4 diff --git a/plugins/CoreUpdater/ReleaseChannel/Latest3XBeta.php b/plugins/CoreUpdater/ReleaseChannel/LatestCurrentBeta.php index e9f635f90f..93767a12f8 100644 --- a/plugins/CoreUpdater/ReleaseChannel/Latest3XBeta.php +++ b/plugins/CoreUpdater/ReleaseChannel/LatestCurrentBeta.php @@ -10,17 +10,18 @@ namespace Piwik\Plugins\CoreUpdater\ReleaseChannel; 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/plugins/CoreUpdater/ReleaseChannel/Latest3XStable.php b/plugins/CoreUpdater/ReleaseChannel/LatestCurrentStable.php index b11710dbb2..acbd9014ed 100644 --- a/plugins/CoreUpdater/ReleaseChannel/Latest3XStable.php +++ b/plugins/CoreUpdater/ReleaseChannel/LatestCurrentStable.php @@ -10,17 +10,18 @@ namespace Piwik\Plugins\CoreUpdater\ReleaseChannel; 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 -Subproject 6c81ed2bd1125f0039d624c53110d64e6d25ddf +Subproject 3a7e12db5c150af6aa9060d1f8a1affe6040c5f diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject 90717603607edfc0df076dea2878f66efdaf92c +Subproject bdef6c1ac8c2c4fe81dd7ba40a1b7bf342278bf diff --git a/plugins/DeviceDetectorCache b/plugins/DeviceDetectorCache -Subproject ac154521da440e37378f674a87051512751005e +Subproject e69f4eb28eec088fce7062bc4041f644f1a251a diff --git a/plugins/ExampleLogTables/plugin.json b/plugins/ExampleLogTables/plugin.json index 3e6442de06..c51c261e29 100644 --- 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 index 54bece1d44..1a1d6ad78c 100644 --- 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 index 5a6c26bcdd..aa27c67db5 100644 --- 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 -Subproject 0a69c2962e47a85fdae5bd20f467589d08cbe2e +Subproject 689930e54b95baa34b4221a769ed1ebedb410d2 diff --git a/plugins/LoginHttpAuth b/plugins/LoginHttpAuth -Subproject 5e1a41a6b2b94f7ed9442e35cf0b42ebdb03d80 +Subproject 8bd1e553b0c5bdda244ec4a25576cbfeda1b80e diff --git a/plugins/LoginLdap b/plugins/LoginLdap -Subproject 12f93c63c75f0c63b25ca749b268fcbb7b52c9d +Subproject 8c8e16cd01dcfc3363cbe43e135de60c6bc17f4 diff --git a/plugins/MarketingCampaignsReporting b/plugins/MarketingCampaignsReporting -Subproject a51d2262899c5adde96217d5b37e38d23335234 +Subproject 7131f1af70ef02787db7d817d3f3f01dfe7c90f diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking -Subproject e1a74178aca6ee15bdf415af035cbafe51cf222 +Subproject 47db51bc239324ea2f8665d650d07044cafdb95 diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo -Subproject 04b407f40223c41bae90161ff9506a57c55aaa3 +Subproject e115d3cbcd60fab5b33ad8ec8f5af85df6962c4 diff --git a/plugins/TagManager b/plugins/TagManager -Subproject c707c81e26ef7f7c50244707798968bc599fbfa +Subproject 33d982fa055b3310548ad8fd0678d517b02077e diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable -Subproject d0f4d2ca1095b4dddb289dffc7f23297941add3 +Subproject 30054d3bfeb280c510eee5a60df335a20735bdd diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization -Subproject 56e080753f5097b21fedfdc1b7fab51263a2433 +Subproject 7beca7d8ba5484864acc84982d891cddc5dd5f9 diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator -Subproject 5c0e707d1123336c9ee95493feb3cc26f652661 +Subproject 39b582f70784895649667c3464f120ccc6fe75e diff --git a/tests/PHPUnit/Integration/Plugin/ReleaseChannelsTest.php b/tests/PHPUnit/Integration/Plugin/ReleaseChannelsTest.php index 3d2eae212b..59a23fe743 100644 --- a/tests/PHPUnit/Integration/Plugin/ReleaseChannelsTest.php +++ b/tests/PHPUnit/Integration/Plugin/ReleaseChannelsTest.php @@ -79,7 +79,7 @@ class ReleaseChannelsTest extends IntegrationTestCase 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 @@ class ReleaseChannelsTest extends IntegrationTestCase { 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 index 0bc8438445..af49877fc5 100644 --- 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 index a234c57a46..57c2419562 100644 --- 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 "No bug policy" in Matomo.<br/>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 <a target='_blank' rel='noreferrer noopener' href='https://developer.matomo.org/guides/core-team-workflow#influencing-piwik-development'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml index 5d30c8a96b..645c6f1534 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/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 <a target='_blank' rel='noreferrer noopener' href='https://matomo.org/participate/development-process/'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Matomo.<br/>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 <a target='_blank' rel='noreferrer noopener' href='https://developer.matomo.org/guides/core-team-workflow#influencing-piwik-development'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml index a234c57a46..57c2419562 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/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 "No bug policy" in Matomo.<br/>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 <a target='_blank' rel='noreferrer noopener' href='https://developer.matomo.org/guides/core-team-workflow#influencing-piwik-development'>see here</a>.<br />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 index a234c57a46..57c2419562 100644 --- 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 "No bug policy" in Matomo.<br/>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 <a target='_blank' rel='noreferrer noopener' href='https://developer.matomo.org/guides/core-team-workflow#influencing-piwik-development'>see here</a>.<br />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 index 2d4b3c19a2..ab0ee06dc5 100644 --- 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 -Subproject fbc2a2c87118febe8e73dc50aaa598bfe6c63e8 +Subproject 8503a8c7dd271dd97a0a7bddac7bf54e476c715 |