Merge branch 'develop' into feature/3767

10up · Feb 26, 2025 · 304fe86 · 304fe86
2 parents a3e3ff6 + 377fb88
commit 304fe86
Show file tree

Hide file tree

Showing 105 changed files with 14,569 additions and 5,230 deletions.
diff --git a/.github/hookdoc-tmpl/README.md b/.github/hookdoc-tmpl/README.md
@@ -2,6 +2,11 @@
 
 ElasticPress, a fast and flexible search and query engine for WordPress, enables WordPress to find or “query” relevant content extremely fast through a variety of highly customizable features. WordPress out-of-the-box struggles to analyze content relevancy and can be very slow. ElasticPress supercharges your WordPress website making for happier users and administrators. The plugin even contains features for popular plugins.
 
+**ElasticPress 5.2:** Minimum versions required for ElasticPress 5.2 are:
+* [Elasticsearch](https://www.elastic.co) 5.2+
+* [WordPress](https://wordpress.org) 6.2+
+* [PHP](https://php.net/) 7.4+
+
 **ElasticPress 5.0:** Minimum versions required for ElasticPress 5.0 are:
 * [Elasticsearch](https://www.elastic.co) 5.2+
 * [WordPress](https://wordpress.org) 6.0+

diff --git a/.github/workflows/cypress-tests.yml b/.github/workflows/cypress-tests.yml
@@ -29,7 +29,7 @@ jobs:
         esVersion: ['7.10.1', '8.12.2']
         core:
           - {name: 'WP latest', version: '', wcVersion: ''}
-          - {name: 'WP minimum', version: '6.0', wcVersion: '6.4.0'}
+          - {name: 'WP minimum', version: '6.2', wcVersion: '6.4.0'}
 
     steps:
     - name: Checkout
@@ -79,7 +79,7 @@ jobs:
       run: npm run build
 
     - name: Set up database
-      run: npm run cypress:setup -- --wp-version=${{ matrix.core.version }} --wc-version=${{ matrix.core.wcVersion }}
+      run: npm run cypress:setup -- --wp-version=${{ matrix.core.version }} --wc-version=${{ matrix.core.wcVersion }} --acf-pro-license='${{ secrets.ACF_PRO_LICENSE_KEY }}'
 
     - name: Test
       run: npm run cypress:run -- --env grepTags=${{ matrix.testGroup }}
@@ -117,7 +117,7 @@ jobs:
         testGroup: ['@slow', '-@slow']
         core:
           - {name: 'WP latest', version: '', wcVersion: ''}
-          - {name: 'WP minimum', version: '6.0', wcVersion: '6.4.0'}
+          - {name: 'WP minimum', version: '6.2', wcVersion: '6.4.0'}
 
     steps:
     - name: Checkout
@@ -166,7 +166,7 @@ jobs:
       run: npm run build
 
     - name: Set up database
-      run: npm run cypress:setup -- --ep-host=${{ secrets.EPIO_HOST }} --es-shield='${{ secrets.EPIO_SHIELD }}' --ep-index-prefix=${{ secrets.EPIO_INDEX_PREFIX }} --wp-version=${{ matrix.core.version }} --wc-version=${{ matrix.core.wcVersion }}
+      run: npm run cypress:setup -- --ep-host=${{ secrets.EPIO_HOST }} --es-shield='${{ secrets.EPIO_SHIELD }}' --ep-index-prefix=${{ secrets.EPIO_INDEX_PREFIX }} --wp-version=${{ matrix.core.version }} --wc-version=${{ matrix.core.wcVersion }} --acf-pro-license='${{ secrets.ACF_PRO_LICENSE_KEY }}'
 
     - name: Test
       run: npm run cypress:run -- --env grepTags=${{ matrix.testGroup }}

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -82,4 +82,4 @@ jobs:
       run: composer install
 
     - name: PHPCS check
-      run: './vendor/bin/phpcs . -q --report=checkstyle --warning-severity=6 --runtime-set testVersion 7.4- | cs2pr'
+      run: './vendor/bin/phpcs . -q --report=checkstyle --runtime-set testVersion 7.4- | cs2pr'
diff --git a/.stylelintrc b/.stylelintrc
@@ -1,18 +1,17 @@
 {
-  "extends": [
-    "@10up/stylelint-config"
-  ],
-  "rules": {
-    "scale-unlimited/declaration-strict-value": [
-      "/color/",
-      {
-        "ignoreValues": ["currentColor", "inherit", "initial", "transparent", "unset"],
-        "severity": "warning"
-      }
-    ],
-    "font-family-no-missing-generic-family-keyword": null,
-    "declaration-property-unit-allowed-list": null,
-    "at-rule-disallowed-list": null
-  }
+	"extends": [
+		"@10up/stylelint-config"
+	],
+	"rules": {
+		"scale-unlimited/declaration-strict-value": [
+			"/color/",
+			{
+				"ignoreValues": ["currentcolor", "inherit", "initial", "transparent", "unset"],
+				"severity": "warning"
+			}
+		],
+		"font-family-no-missing-generic-family-keyword": null,
+		"declaration-property-unit-allowed-list": null
+	}
 
 }
diff --git a/.wp-env.json b/.wp-env.json
@@ -18,6 +18,7 @@
       ],
       "mappings": {
         ".htaccess": "./tests/cypress/wordpress-files/.htaccess",
+        "wp-content/composer.json": "./tests/cypress/wordpress-files/composer.json",
         "wp-content/mu-plugins/disable-welcome-guide.php": "./tests/cypress/wordpress-files/test-mu-plugins/disable-welcome-guide.php",
         "wp-content/mu-plugins/skip-wp-lookup.php": "./tests/cypress/wordpress-files/test-mu-plugins/skip-wp-lookup.php",
         "wp-content/mu-plugins/unique-index-name.php": "./tests/cypress/wordpress-files/test-mu-plugins/unique-index-name.php",
@@ -29,6 +30,7 @@
         "wp-content/plugins/enable-debug-bar.php": "./tests/cypress/wordpress-files/test-plugins/enable-debug-bar.php",
         "wp-content/plugins/fake-log-messages.php": "./tests/cypress/wordpress-files/test-plugins/fake-log-messages.php",
         "wp-content/plugins/fake-new-activation.php": "./tests/cypress/wordpress-files/test-plugins/fake-new-activation.php",
+        "wp-content/plugins/filter-instant-results-category-terms.php": "./tests/cypress/wordpress-files/test-plugins/filter-instant-results-category-terms.php",
         "wp-content/plugins/filter-instant-results-per-page.php": "./tests/cypress/wordpress-files/test-plugins/filter-instant-results-per-page.php",
         "wp-content/plugins/filter-instant-results-args-schema.php": "./tests/cypress/wordpress-files/test-plugins/filter-instant-results-args-schema.php",
         "wp-content/plugins/filter-autosuggest-navigate-callback.php": "./tests/cypress/wordpress-files/test-plugins/filter-autosuggest-navigate-callback.php",

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ ElasticPress, a fast and flexible search and query engine for WordPress, enables
 ElasticPress requires these software with the following versions:
 
 * [Elasticsearch](https://www.elastic.co) 5.2+
-* [WordPress](https://wordpress.org) 6.0+
+* [WordPress](https://wordpress.org) 6.2+
 * [PHP](https://php.net/) 7.4+
 
 ### Compatibility

diff --git a/assets/css/autosuggest.css b/assets/css/autosuggest.css
@@ -1,9 +1,11 @@
+@import "./global/colors.css";
+
 .ep-autosuggest-container {
 	position: relative;
 
 	& .ep-autosuggest {
-		background: #fff;
-		border: 1px solid #ccc;
+		background: var(--ep-c-white);
+		border: 1px solid var(--ep-c-white-gray);
 		box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
 		display: none;
 		position: absolute;
@@ -19,14 +21,14 @@
 				font-family: sans-serif;
 
 				& > a.autosuggest-link {
-					color: #000;
+					color: var(--ep-c-black);
 					cursor: pointer;
 					display: block;
 					padding: 2px 10px;
 
 					&:hover,
 					&:active {
-						background-color: #eee;
+						background-color: var(--ep-c-medium-white);
 						text-decoration: none;
 					}
 				}
@@ -35,7 +37,7 @@
 	}
 
 	& .selected {
-		background-color: #eee;
+		background-color: var(--ep-c-medium-white);
 		text-decoration: none;
 	}
 }