Merge branch 'develop' into quicker-close

johnbillion · Aug 19, 2024 · 4ad82fa · 4ad82fa
2 parents 76263c1 + 64f1467
commit 4ad82fa
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 24 deletions.
diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
@@ -45,21 +45,19 @@ jobs:
       # https://make.wordpress.org/core/handbook/references/php-compatibility-and-wordpress-versions/
       matrix:
         wp:
-          # Latest three stable:
+          # Three most recent versions of WordPress
           - '6.6'
           - '6.5'
           - '6.4'
         php:
-          - '8.2'
+          # Most recent version of PHP supported by all of the above, plus 7.4
+          - '8.3'
           - '7.4'
         include:
-          # Latest stable on PHP 8.3:
-          - wp: '6.6'
-            php: '8.3'
-          # Latest stable on PHP 8.4:
+          # Latest WordPress on PHP 8.4
           - wp: '6.6'
             php: '8.4'
-          # Oldest supported on PHP 7.4:
+          # Oldest supported WordPress
           - wp: '5.8'
             php: '7.4'
       fail-fast: false

diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -44,7 +44,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - '8.2'
+          - '8.3'
           - '7.4'
       fail-fast: false
     with:

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -46,21 +46,19 @@ jobs:
       # https://make.wordpress.org/core/handbook/references/php-compatibility-and-wordpress-versions/
       matrix:
         wp:
-          # Latest three stable:
+          # Three most recent versions of WordPress
           - '6.6'
           - '6.5'
           - '6.4'
         php:
-          - '8.2'
+          # Most recent version of PHP supported by all of the above, plus 7.4
+          - '8.3'
           - '7.4'
         include:
-          # Latest stable on PHP 8.3:
-          - wp: '6.6'
-            php: '8.3'
-          # Latest stable on PHP 8.4:
+          # Latest WordPress on PHP 8.4
           - wp: '6.6'
             php: '8.4'
-          # Oldest supported on PHP 7.4:
+          # Oldest supported WordPress
           - wp: '5.8'
             php: '7.4'
       fail-fast: false

diff --git a/dispatchers/Html.php b/dispatchers/Html.php
@@ -436,7 +436,7 @@ protected function before_output() {
 		echo '<div id="qm-title" class="qm-resizer">';
 		echo '<h1 class="qm-title-heading">' . esc_html__( 'Query Monitor', 'query-monitor' ) . '</h1>';
 		echo '<div class="qm-title-heading">';
-		echo '<select>';
+		echo '<select id="qm-title-heading-select">';
 
 		printf(
 			'<option value="%1$s">%2$s</option>',

diff --git a/docs/privacy.md b/docs/privacy.md
@@ -19,8 +19,10 @@ Please note that in a future version of Query Monitor, opt-in features may be in
 
 ## querymonitor.com website privacy statement
 
-* The querymonitor.com website makes no use of cookies and collects no data from visitors.
-* The querymonitor.com website is operated by [John Blackbourn](/about/).
-* The querymonitor.com website is hosted on [Netlify](https://www.netlify.com/).
+The querymonitor.com website:
 
-This privacy statement is subject to change and was last updated on June 28, 2024.
+* Makes no use of cookies and collects no client-side data from visitors. Anonymous analytics are collected server-side.
+* Is operated by [John Blackbourn](/about/).
+* Is hosted on [Netlify](https://www.netlify.com/).
+
+This privacy statement is subject to change and was last updated on July 29, 2024.
diff --git a/output/html/http.php b/output/html/http.php
@@ -131,10 +131,6 @@ public function output() {
 					}
 				}
 
-				if ( empty( parse_url( $row['url'], PHP_URL_QUERY ) ) ) {
-					$url = trim( $url, '?' );
-				}
-
 				$component = $row['component'];
 
 				$stack = array();