bump version to 5.6.0 for new release (#1335)

* bump version to 5.6.0 for new release

* update minimum tested against versions and fix some tests

* use older version of wp-statistics for php 7.2

* update expected screenshots

Author: diosmosis

CHANGELOG.md

@@ -1,5 +1,14 @@
 == Changelog ===
 
+= 5.6.0 =
+* Update Matomo core to 5.6.1.
+* Add clear warning message if an adblocker is detected since many adblockers interfere with Matomo's reporting.
+* Slight redesign to Marketplace overview.
+* Ensure matomo language cookie is always set to current user's locale so changes users make to language settings will always be reflected in Matomo.
+* Bug fix: ensure the wp-statistics importer works with the newest version of wp-statistics.
+* Add current user locale to system report.
+* Bug fix: ensure user agents with commas can be excluded from tracking.
+
 = 5.3.3 =
 * Fix regression causing fatal errors when ecommerce tracking is used but WooCommerce is not installed.
 * Workaround infinite recursion problem in Matomo core that occurs when an AJAX method is not authorized to function.

docker-compose.yml

@@ -37,9 +37,6 @@ services:
     depends_on:
       - $BACKEND
       - mailer
-    deploy:
-      restart_policy:
-        condition: on-failure
     extra_hosts:
       - "host.docker.internal:host-gateway"
 
@@ -65,9 +62,6 @@ services:
     entrypoint: /usr/src/entrypoint.sh
     depends_on:
       - "$BACKEND"
-    deploy:
-      restart_policy:
-        condition: on-failure
   nginx:
     image: nginx
     volumes:

matomo.php

@@ -4,10 +4,10 @@
  * Description: Privacy friendly, GDPR compliant and self-hosted. Matomo is the #1 Google Analytics alternative that gives you control of your data. Free and secure.
  * Author: Matomo
  * Author URI: https://matomo.org
- * Version: 5.3.3
+ * Version: 5.6.0
  * Domain Path: /languages
  * WC requires at least: 2.4.0
- * WC tested up to: 10.3.5
+ * WC tested up to: 10.3.6
  *
  * Matomo - free/libre analytics platform
  *

readme.txt

@@ -2,8 +2,8 @@
 Contributors: matomoteam
 Tags: matomo,analytics,statistics,stats,ecommerce
 Requires at least: 4.8
-Tested up to: 6.8.3
-Stable tag: 5.3.3
+Tested up to: 6.9.0
+Stable tag: 5.6.0
 Requires PHP: 7.2.5
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html

scripts/local-dev-entrypoint.sh

@@ -407,10 +407,8 @@ EOF
     echo "installing wp-statistics"
 
     WP_STATS_VERSION=""
-    if php -r "exit('$WORDPRESS_VERSION' !== 'trunk' && version_compare('$WORDPRESS_VERSION', '5.3', '<') ? 0 : 1);"; then
+    if php -r "exit('$WORDPRESS_VERSION' !== 'trunk' && version_compare('$WORDPRESS_VERSION', '5.3', '<') ? 0 : 1);" || php -r "exit(version_compare(PHP_VERSION, '8.0', '<') ? 0 : 1);"; then
       WP_STATS_VERSION="--version=13.2.16"
-    elif php -r "exit('$WORDPRESS_VERSION' !== 'trunk' && version_compare(PHP_VERSION, '8.0', '<') ? 0 : 1);"; then
-      WP_STATS_VERSION="--version=14.5.2"
     fi
 
     /var/www/html/wp-cli.phar --allow-root --path=/var/www/html/$WORDPRESS_FOLDER plugin install --activate wp-statistics $WP_STATS_VERSION
@@ -441,6 +439,7 @@ EOF
   if php -r 'exit(version_compare(PHP_VERSION, "7.3", "<") ? 0 : 1);'; then
     OCEANWP_VERSION="--version=3.5.5"
   fi
+
   /var/www/html/wp-cli.phar --path=/var/www/html/$WORDPRESS_FOLDER --allow-root theme install oceanwp --activate $OCEANWP_VERSION
 
   # setup woocommerce if requested