Merge branch 'develop' into trunk

Author: felipeelia

.github/ISSUE_TEMPLATE/1-bug-report.yml

@@ -55,8 +55,9 @@ body:
           label: WordPress and ElasticPress information
           placeholder: |
              <details><summary>Status Report info:</summary>
-             <!-- Go to ElasticPress > Status Report, click "Copy status report to clipboard", and paste those details here. -->
-             <!-- If your ElasticPress version is below 4.4.0, then please go to Tools > Site Health > Info tab, click "Copy site info to clipboard", and paste here those details instead. -->
+             <!-- Go to ElasticPress > Status Report and click on "Generate Full Status Report" -->
+             <!-- Click "Copy status report to clipboard" and paste those details here. -->
+             <!-- If your ElasticPress version is below 4.4.0, then please go to Tools > Site Health > Info tab, click "Copy site info to clipboard", and paste those details here instead. -->
              </details>
       validations:
           required: false

.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+

.github/workflows/build-and-tag.yml

@@ -1,4 +1,8 @@
 name: Build and Tag
+
+env:
+  NODE_VERSION: "20"
+
 on:
   push:
     branches:
@@ -22,10 +26,10 @@ jobs:
     - name: composer install
       run: composer install
 
-    - name: install node v20
+    - name: "install node v${{ env.NODE_VERSION }}"
       uses: actions/setup-node@v4
       with:
-        node-version: 20
+        node-version: ${{ env.NODE_VERSION }}
 
     - name: Build
       run: |

.github/workflows/build-docs.yml

@@ -1,5 +1,8 @@
 name: Build Docs
 
+env:
+  NODE_VERSION: "20"
+
 on:
   push:
     branches:
@@ -54,10 +57,10 @@ jobs:
         wp package install felipeelia/cli-command-docs:dev-trunk
         wp cli-command-docs elasticpress --custom-order=sync,activate-feature,deactivate-feature,list-features,get-algorithm-version,set-algorithm-version --remove=delete_transient_on_int,custom_get_transient,stop_on_failed_mapping,call_ep_cli_put_mapping,should_interrupt_sync,index_output,get-indexes,get-cluster-indexes,index,clear-index,get-indexing-status,get-last-cli-index,stop-indexing --custom-intro='The following WP-CLI commands are supported by ElasticPress:' > wp-content/plugins/elasticpress/docs/wp-cli.md
 
-    - name: Use Node.js 20
+    - name: "install node v${{ env.NODE_VERSION }}"
       uses: actions/setup-node@v4
       with:
-        node-version: '20'
+        node-version: ${{ env.NODE_VERSION }}
 
     - name: npm ci, and build docs
       run: |

.github/workflows/build-with-vendor-prefixed.yml

@@ -1,5 +1,8 @@
 name: Build with vendor-prefixed
 
+env:
+  NODE_VERSION: "20"
+
 on:
   pull_request:
     branches:
@@ -24,19 +27,16 @@ jobs:
     - name: composer install
       run: composer install
 
-    - name: install node v20
+    - name: "install node v${{ env.NODE_VERSION }}"
       uses: actions/setup-node@v4
       with:
-        node-version: 20
+        node-version: ${{ env.NODE_VERSION }}
 
     - name: Build
       run: |
         npm ci
         npm run build
 
-    - name: Setup
-      run: 'echo "VERSION=$(grep -Po ''\"version\": \"[0-9\\.]+\"'' package.json | grep -Po ''[0-9\\.]+'')" >> $GITHUB_ENV'
-
     - name: Zip
       run: npm run build:zip
 
@@ -47,4 +47,3 @@ jobs:
         retention-days: 2
         path: |
           ${{ github.workspace }}/elasticpress.zip
-

.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 }}

.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'

.github/workflows/secrets-scan.yml

@@ -0,0 +1,22 @@
+name: Secrets Scan
+
+on:
+  push:
+    branches:
+      - develop
+      - trunk
+  pull_request:
+  
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - name: Secret Scanning
+      uses: trufflesecurity/trufflehog@main
+      with:
+        extra_args: --results=verified,unknown
+  

.github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: Unit Test
+name: Unit Tests
 
 env:
   COMPOSER_VERSION: "2"

.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
+	}
 
 }