some tweaks for WP 7 compatibility (#1401)

* update tested up to version to 7.0.0 and update php tested against in tests.yml to 7.4

* allow css to differentiate between wp version < 7 or >= 7 and add utility styles to use WP colors regardless of version

* bump test against version in e2e test build

* update expected screenshots

* rename files for new php version used in tests

* fix some failing e2e tests

* add phpcs ignore

Author: diosmosis

.github/workflows/tests.yml

@@ -40,7 +40,7 @@ jobs:
       fail-fast: false
       matrix:
         wp-versions: [ 'latest' ]
-        php-versions: [ '7.2', '8.1' ]
+        php-versions: [ '7.4', '8.1' ]
         multisite: [ "singlesite", "multisite" ]
         include:
           - wp-versions: '5.2'
@@ -170,7 +170,7 @@ jobs:
       fail-fast: false
       matrix:
         wp-versions: [ 'latest' ]
-        php-versions: [ '7.2', '8.1' ]
+        php-versions: [ '7.4', '8.1' ]
         include:
           - wp-versions: 'trunk'
             php-versions: '7.4'

assets/css/admin-style.css

@@ -312,3 +312,39 @@ table.matomo-tracking-form th {
     font-size: 0.9em;
     margin-top: 24px;
 }
+
+.matomo-primary-color-fg {
+    color: #2271b1;
+}
+
+.matomo-secondary-color-fg {
+    color: #f6f7f7;
+}
+
+.matomo-primary-color-bg {
+    background-color: #2271b1;
+}
+
+.matomo-secondary-color-bg {
+    background-color: #f6f7f7;
+}
+
+.mtm-wp-gte-7 .matomo-primary-color-fg {
+    color: var(--wp-admin-theme-color, #3858e9);
+}
+
+.mtm-wp-gte-7 .matomo-secondary-color-fg {
+    color: white;
+}
+
+.mtm-wp-gte-7 .matomo-primary-color-bg {
+    background-color: var(--wp-admin-theme-color, #3858e9);
+}
+
+.mtm-wp-gte-7 .matomo-secondary-color-bg {
+    background-color: white;
+}
+
+.mtm-wp-gte-7 .matomo-toggle input:checked + .slider {
+    background-color: var(--wp-admin-theme-color, #3858e9);
+}

classes/WpMatomo/Admin/Admin.php

@@ -43,6 +43,7 @@ public function register_hooks() {
 		}
 
 		add_action( 'admin_enqueue_scripts', [ $this, 'load_scripts' ] );
+		add_filter( 'admin_body_class', [ $this, 'on_admin_body_class' ], 9999 );
 	}
 
 	public static function is_matomo_admin() {
@@ -81,4 +82,20 @@ public function load_scripts() {
 			]
 		);
 	}
+
+	public function on_admin_body_class( $classes ) {
+		$raw_version = get_bloginfo( 'version' );
+		if ( ! $raw_version ) {
+			return $classes;
+		}
+
+		$version_parts = explode( '-', $raw_version );
+		$version       = count( $version_parts ) > 1 ? $version_parts[0] : $raw_version;
+
+		if ( version_compare( $version, '7.0', '>=' ) ) {
+			$classes .= 'mtm-wp-gte-7';
+		}
+
+		return $classes;
+	}
 }

readme.txt

@@ -2,7 +2,7 @@
 Contributors: matomoteam
 Tags: analytics,privacy-friendly,gdpr,behavior,conversion,wordpress analytics,google analytics,woocommerce analytics,matomo,statistics,stats,ecommerce
 Requires at least: 4.8
-Tested up to: 6.9.4
+Tested up to: 7.0.0
 Stable tag: 5.10.0
 Requires PHP: 7.2.5
 License: GPLv3 or later