Merge branch 'develop' into trunk

Author: felipeelia

.github/workflows/lint.yml

@@ -82,4 +82,7 @@ jobs:
       run: composer install
 
     - name: PHPCS check
-      run: './vendor/bin/phpcs . -q --report=checkstyle --runtime-set testVersion 7.4- | cs2pr'
+      run: './vendor/bin/phpcs . -q --ignore=tests/* --report=checkstyle --runtime-set testVersion 7.4- | cs2pr'
+
+    - name: PHPCS check tests
+      run: './vendor/bin/phpcs tests/. -q --report=checkstyle --runtime-set testVersion 8.2- | cs2pr'

CHANGELOG.md

@@ -14,6 +14,11 @@ All notable changes to this project will be documented in this file, per [the Ke
 ### Developer
 -->
 
+## [5.3.1] - 2025-11-06
+
+### Fixed
+* Compatibility with PHP 7.4. Props [@realrellek](https://github.com/realrellek) and [@felipeelia](https://github.com/felipeelia) via [#4232](https://github.com/10up/ElasticPress/pull/4232).
+
 ## [5.3.0] - 2025-11-05
 
 Highlights of this version:

composer.json

@@ -38,7 +38,8 @@
     "phpcompatibility/phpcompatibility-wp": "*",
     "brianhenryie/strauss": "^0.21.0",
     "yoast/phpunit-polyfills": "^4.0",
-    "phpunit/phpunit": "^9.0.0"
+    "phpunit/phpunit": "^9.0.0",
+    "phpcompatibility/php-compatibility": "dev-develop as 9.99.99"
   },
   "scripts": {
     "lint": "phpcs . -s --runtime-set testVersion 7.4-",

composer.lock

@@ -3,7 +3,7 @@
  * Plugin Name:       ElasticPress
  * Plugin URI:        https://github.com/10up/ElasticPress
  * Description:       A fast and flexible search and query engine for WordPress.
- * Version:           5.3.0
+ * Version:           5.3.1
  * Requires at least: 6.2
  * Requires PHP:      7.4
  * Author:            10up
@@ -33,7 +33,7 @@
 define( 'EP_URL', plugin_dir_url( __FILE__ ) );
 define( 'EP_PATH', plugin_dir_path( __FILE__ ) );
 define( 'EP_FILE', plugin_basename( __FILE__ ) );
-define( 'EP_VERSION', '5.3.0' );
+define( 'EP_VERSION', '5.3.1' );
 
 define( 'EP_PHP_VERSION_MIN', '7.4' );
 

elasticpress.php

@@ -1035,7 +1035,7 @@ protected function maybe_set_orderby( \WP_Query $query ) {
 	 * @param array $meta_key The meta key to get the mapping for.
 	 * @return string|array The mapped meta key.
 	 */
-	public function get_orderby_meta_mapping( $meta_key ): string|array {
+	public function get_orderby_meta_mapping( $meta_key ) {
 		/**
 		 * Filter WooCommerce to Elasticsearch meta mapping
 		 *

includes/classes/Feature/WooCommerce/Products.php

@@ -326,11 +326,12 @@ function maybe_notice( $force = false ) {
 	$notices = AdminNotices::factory()->get_notices();
 
 	foreach ( $notices as $notice_key => $notice ) {
+		$class = 'notice notice-' . $notice['type'];
+		if ( $notice['dismiss'] ) {
+			$class .= ' is-dismissible';
+		}
 		?>
-		<div data-ep-notice="<?php echo esc_attr( $notice_key ); ?>" class="notice notice-<?php echo esc_attr( $notice['type'] ); ?> <?php
-		if ( $notice['dismiss'] ) :
-			?>
-			is-dismissible<?php endif; ?>">
+		<div data-ep-notice="<?php echo esc_attr( $notice_key ); ?>" class="<?php echo esc_attr( $class ); ?>">
 			<p>
 				<?php echo wp_kses( $notice['html'], 'ep-html' ); ?>
 			</p>

includes/dashboard.php

@@ -2,14 +2,14 @@
 # This file is distributed under the GPL v2 or later.
 msgid ""
 msgstr ""
-"Project-Id-Version: ElasticPress 5.3.0\n"
+"Project-Id-Version: ElasticPress 5.3.1\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/elasticpress\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-11-05T14:17:48+00:00\n"
+"POT-Creation-Date: 2025-11-06T14:03:59+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.8.1\n"
 "X-Domain: elasticpress\n"
@@ -2034,7 +2034,7 @@ msgid "Network Active"
 msgstr ""
 
 #: includes/classes/StatusReport/ElasticPress.php:79
-#: includes/dashboard.php:650
+#: includes/dashboard.php:651
 #: includes/partials/settings-page.php:34
 #: assets/js/blocks/facets/common/edit.js:87
 #: assets/js/blocks/facets/date/edit.js:23
@@ -2308,49 +2308,47 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
-#: includes/dashboard.php:640
+#: includes/dashboard.php:641
 msgid "ElasticPress Features"
 msgstr ""
 
-#: includes/dashboard.php:641
+#: includes/dashboard.php:642
 #: assets/js/features/index.js:34
-#: dist/js/features-script.js:1
 msgid "Features"
 msgstr ""
 
-#: includes/dashboard.php:649
+#: includes/dashboard.php:650
 msgid "ElasticPress Settings"
 msgstr ""
 
-#: includes/dashboard.php:658
 #: includes/dashboard.php:659
+#: includes/dashboard.php:660
 #: assets/js/features/apps/features.js:185
 #: assets/js/synonyms/apps/synonyms-settings.js:61
-#: dist/js/features-script.js:1
 #: dist/js/synonyms-script.js:1
 msgid "Sync"
 msgstr ""
 
-#: includes/dashboard.php:667
+#: includes/dashboard.php:668
 msgid "ElasticPress Index Health"
 msgstr ""
 
-#: includes/dashboard.php:668
+#: includes/dashboard.php:669
 #: includes/partials/stats-page.php:35
 msgid "Index Health"
 msgstr ""
 
-#: includes/dashboard.php:676
+#: includes/dashboard.php:677
 msgid "ElasticPress Status Report"
 msgstr ""
 
-#: includes/dashboard.php:677
+#: includes/dashboard.php:678
 #: assets/js/status-report/index.js:21
 #: dist/js/status-report-script.js:1
 msgid "Status Report"
 msgstr ""
 
-#: includes/dashboard.php:875
+#: includes/dashboard.php:876
 msgid "ElasticPress Indexing"
 msgstr ""
 
@@ -2660,127 +2658,105 @@ msgid "It looks like you’re trying to use ElasticPress’s advanced features o
 msgstr ""
 
 #: assets/js/features/apps/features.js:157
-#: dist/js/features-script.js:1
 msgid "Could not save feature settings. Please try again."
 msgstr ""
 
 #: assets/js/features/apps/features.js:165
-#: dist/js/features-script.js:1
 msgid "View sync status"
 msgstr ""
 
 #: assets/js/features/apps/features.js:172
-#: dist/js/features-script.js:1
 msgid "Cannot save settings while a sync is in progress."
 msgstr ""
 
 #: assets/js/features/apps/features.js:177
-#: dist/js/features-script.js:1
 msgid "Changes to feature settings discarded."
 msgstr ""
 
 #: assets/js/features/apps/features.js:192
-#: dist/js/features-script.js:1
 msgid "If you choose to sync later some settings changes may not take effect until the sync is performed. Save and sync later?"
 msgstr ""
 
 #: assets/js/features/apps/features.js:200
-#: dist/js/features-script.js:1
 msgid "Saving these settings will begin re-syncing your content. Save and sync now?"
 msgstr ""
 
 #: assets/js/features/apps/features.js:208
-#: dist/js/features-script.js:1
 msgid "Feature settings saved. Starting sync…"
 msgstr ""
 
 #: assets/js/features/apps/features.js:213
-#: dist/js/features-script.js:1
 msgid "Feature settings saved."
 msgstr ""
 
 #: assets/js/features/apps/features.js:256
-#: dist/js/features-script.js:1
 msgid "Other"
 msgstr ""
 
 #: assets/js/features/apps/features.js:279
-#: dist/js/features-script.js:1
 msgid "ElasticPress: Could not save feature settings."
 msgstr ""
 
 #: assets/js/features/apps/features.js:390
-#: dist/js/features-script.js:1
 msgid "Select a feature above."
 msgstr ""
 
 #: assets/js/features/apps/features.js:410
-#: dist/js/features-script.js:1
 msgid "Save and sync now"
 msgstr ""
 
 #: assets/js/features/apps/features.js:411
 #: assets/js/synonyms/apps/synonyms-settings.js:174
 #: assets/js/synonyms/components/common/edit-panel.js:101
 #: assets/js/weighting/apps/weighting.js:59
-#: dist/js/features-script.js:1
 #: dist/js/synonyms-script.js:1
 #: dist/js/weighting-script.js:1
 msgid "Save changes"
 msgstr ""
 
 #: assets/js/features/apps/features.js:423
-#: dist/js/features-script.js:1
 msgid "Save and sync later"
 msgstr ""
 
 #: assets/js/features/apps/features.js:430
-#: dist/js/features-script.js:1
 msgid "Discard changes"
 msgstr ""
 
 #: assets/js/features/apps/features.js:475
-#: dist/js/features-script.js:1
 msgid "No features available."
 msgstr ""
 
 #. translators: %s: feature list
 #: assets/js/features/components/control.js:96
-#: dist/js/features-script.js:1
 msgid "The %s feature must be enabled to use this feature."
 msgid_plural "The %s features must be enabled to use this feature."
 msgstr[0] ""
 msgstr[1] ""
 
 #. translators: %s: feature list
 #: assets/js/features/components/control.js:103
-#: dist/js/features-script.js:1
 msgid "The %s feature must be enabled to use the following setting."
 msgid_plural "The %s features must be enabled to use the following setting."
 msgstr[0] ""
 msgstr[1] ""
 
 #: assets/js/features/components/control.js:115
-#: dist/js/features-script.js:1
 msgid "Enabling this feature requires re-syncing your content."
 msgstr ""
 
 #: assets/js/features/components/control.js:116
-#: dist/js/features-script.js:1
 msgid "A change to following setting requires re-syncing your content."
 msgstr ""
 
 #. translators: %1$s: first feature name, %2$s: second feature name
 #. translators: %1$s: comma-separated list of feature names, %2$s: last feature name
 #: assets/js/features/components/control.js:167
 #: assets/js/features/components/control.js:174
-#: dist/js/features-script.js:1
 msgid "%1$s and %2$s"
 msgstr ""
 
 #: assets/js/features/components/control.js:175
 #: assets/js/instant-results/components/facets/taxonomy-terms-facet.js:43
-#: dist/js/features-script.js:1
 #: dist/js/instant-results-script.js:1
 msgid ", "
 msgstr ""
@@ -2790,7 +2766,6 @@ msgid "Unavailable"
 msgstr ""
 
 #: assets/js/features/index.js:46
-#: dist/js/features-script.js:1
 msgid "ElasticPress Features add functionality to enhance search and queries on your site. You may choose to activate some or all of these Features depending on your needs. You can learn more about each Feature <a>here</a>."
 msgstr ""
 

lang/elasticpress.pot

@@ -1,6 +1,6 @@
 {
   "name": "elasticpress",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "license": "GPL-2.0-or-later",
   "description": "A fast and flexible search and query engine for WordPress.",
   "private": true,