Release 2.5.3 (#624)

* Prepare 2.5.3-dev * [JFDI] Plugin deploy uses checkout@v3 (#614) * [CMSP-721] Bump tested-up-to and output PHP Version (#617) * bump tested-up-to * output the PHP version so we can ensure we're testing on PHP 8.3 * Bump ip from 2.0.0 to 2.0.1 (#619) Bumps [ip](https://github.com/indutny/node-ip) from 2.0.0 to 2.0.1. - [Commits](indutny/node-ip@v2.0.0...v2.0.1) --- updated-dependencies: - dependency-name: ip dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump yoast/phpunit-polyfills from 2.0.0 to 2.0.1 (#621) Bumps [yoast/phpunit-polyfills](https://github.com/Yoast/PHPUnit-Polyfills) from 2.0.0 to 2.0.1. - [Release notes](https://github.com/Yoast/PHPUnit-Polyfills/releases) - [Changelog](https://github.com/Yoast/PHPUnit-Polyfills/blob/2.x/CHANGELOG.md) - [Commits](Yoast/PHPUnit-Polyfills@2.0.0...2.0.1) --- updated-dependencies: - dependency-name: yoast/phpunit-polyfills dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * [CMSP-1034] fix typo in tax_query (#622) * close parenthesis * add debugging code * add opening parenthesis Co-authored-by: Phil Tyler <[email protected]> * make the emoji sad * remove debug code * update changelog * bump version * if multidev:delete fails, don't fail the test --------- Co-authored-by: Phil Tyler <[email protected]> * drop -dev --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Phil Tyler <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
pantheon-systems · Apr 24, 2024 · 4eb7e16 · 4eb7e16
1 parent 263ad3e
commit 4eb7e16
Show file tree

Hide file tree

Showing 12 changed files with 100 additions and 93 deletions.
diff --git a/.github/workflows/wordpress-plugin-deploy.yml b/.github/workflows/wordpress-plugin-deploy.yml
@@ -7,7 +7,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: WordPress Plugin Deploy
       uses: 10up/[email protected]
       env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Changelog ##
 
+### 2.5.3 (April 24, 2024) ###
+* Fixes a very old bug that would cause tax queries to be built incorrectly. [[#622](https://github.com/pantheon-systems/solr-power/pull/622)] (props [@offshorealert](https://wordpress.org/support/users/offshorealert/))
+
 ### 2.5.2 (September 12, 2023) ###
 * Fix incompatibility with Object Cache Pro when running "wp solr index" [[#611](https://github.com/pantheon-systems/solr-power/pull/611)]
 

diff --git a/README.md b/README.md
@@ -3,8 +3,8 @@
 **Tags:** search  
 **Requires at least:** 4.6  
 **Requires PHP:** 7.1  
-**Tested up to:** 6.4.1  
-**Stable tag:** 2.5.2  
+**Tested up to:** 6.5.2  
+**Stable tag:** 2.5.3  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -204,7 +204,7 @@ Add the following to your `functions.php` file.
 
 ## Explicit Commit vs Autocommit ##
 
-Once solr has sent the data to the solr server, solr must COMMIT the data to the index and adjust the index and relevancy ratings accordingly before that data can appear in search results. 
+Once solr has sent the data to the solr server, solr must COMMIT the data to the index and adjust the index and relevancy ratings accordingly before that data can appear in search results.
 
 By default, Solr Search for WordPress has auto-commit disabled. The index is committed when the uncommitted item is two minutes old, or the cron runs. By default, the cron runs on the Pantheon platform every hour.
 

diff --git a/bin/behat-cleanup.sh b/bin/behat-cleanup.sh
@@ -20,4 +20,4 @@ set -ex
 ###
 # Delete the environment used for this test run.
 ###
-terminus multidev:delete $SITE_ENV --delete-branch --yes
+terminus multidev:delete $SITE_ENV --delete-branch --yes || true
diff --git a/bin/behat-prepare.sh b/bin/behat-prepare.sh
@@ -56,6 +56,9 @@ cd $BASH_DIR/..
 rsync -av --exclude='node_modules/' --exclude='tests/' ./* $PREPARE_DIR/wp-content/plugins/solr-power
 cd $PREPARE_DIR/wp-content/plugins/solr-power
 
+PHP_VERSION="$(terminus env:info $SITE_ENV --field=php_version)"
+echo "PHP Version: $PHP_VERSION"
+
 ###
 # Build plugin
 ###

diff --git a/composer.lock b/composer.lock
diff --git a/includes/class-solrpower-wp-query.php b/includes/class-solrpower-wp-query.php
@@ -740,7 +740,7 @@ private function parse_tax_query( $tax_query ) {
 					$multi_query   = array();
 					$multi_query[] = '(' . $field . ':(' . implode( 'OR', $terms ) . '))';
 					if ( $tax_value['include_children'] && is_taxonomy_hierarchical( $tax_value['taxonomy'] ) ) {
-						$multi_query[] = '(parent_' . $field . ':' . implode( 'OR', $terms ) . ')';
+						$multi_query[] = '(parent_' . $field . ':(' . implode( 'OR', $terms ) . '))';
 					}
 					$query[] = '(' . implode( 'OR', $multi_query ) . ')';
 					break;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "solr-power",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/pantheon-systems/solr-power.git"
@@ -23,4 +23,4 @@
     "grunt-wp-readme-to-markdown": "~2.1.0",
     "node-sass": "^9.0.0"
   }
-}
+}
diff --git a/readme.txt b/readme.txt
@@ -3,8 +3,8 @@ Contributors: getpantheon, Outlandish Josh, 10up, collinsinternet, andrew.taylor
 Tags: search
 Requires at least: 4.6
 Requires PHP: 7.1
-Tested up to: 6.4.1
-Stable tag: 2.5.2
+Tested up to: 6.5.2
+Stable tag: 2.5.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -235,6 +235,9 @@ Please report security bugs found in the source code of the Solr Power plugin th
 
 == Changelog ==
 
+= 2.5.3 (April 24, 2024) =
+* Fixes a very old bug that would cause tax queries to be built incorrectly. [[#622](https://github.com/pantheon-systems/solr-power/pull/622)] (props [@offshorealert](https://wordpress.org/support/users/offshorealert/))
+
 = 2.5.2 (September 12, 2023) =
 * Fix incompatibility with Object Cache Pro when running "wp solr index" [[#611](https://github.com/pantheon-systems/solr-power/pull/611)]
 

diff --git a/solr-power.php b/solr-power.php
@@ -2,15 +2,15 @@
 /**
  * Plugin Name: Solr Power
  * Description: Allows WordPress sites to index and search content with ApacheSolr.
- * Version: 2.5.2
+ * Version: 2.5.3
  * Author: Pantheon
  * Author URI: http://pantheon.io
  * Text Domain: solr-for-wordpress-on-pantheon
  *
  * @package Solr_Power
  **/
 
-define( 'SOLR_POWER_VERSION', '2.5.2' );
+define( 'SOLR_POWER_VERSION', '2.5.3' );
 
 /**
  * Copyright (c) 2011-2022 Pantheon, Matt Weber, Solr Power contributors

diff --git a/tests/phpunit/wp_query/test-tax-query.php b/tests/phpunit/wp_query/test-tax-query.php
@@ -29,7 +29,6 @@ function test_wp_query_by_tax() {
 			),
 		);
 		$query = new WP_Query( $args );
-
 		$this->assertEquals( $p_id, $query->post->ID );
 	}
 
@@ -1319,4 +1318,4 @@ public function test_term_taxonomy_id_field_no_taxonomy() {
 		), $results2, 'Relation: AND; Operator: IN' );
 	}
 
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,6 @@ function test_wp_query_by_tax() { @@
     			),
     		);
     		$query = new WP_Query( $args );
     		$this->assertEquals( $p_id, $query->post->ID );
     	}
@@ Expand Down Expand Up @@
     		), $results2, 'Relation: AND; Operator: IN' );
     	}
-    }
+    }