Merge branch 'develop' into trunk

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

@@ -15,11 +15,11 @@ jobs:
     - name: Set PHP version
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.0' # Minimum required version
+        php-version: '8.2'
         coverage: none
 
     - name: composer install
-      run: composer install --no-dev -o
+      run: composer install
 
     - name: install node v18
       uses: actions/setup-node@v3
@@ -40,7 +40,7 @@ jobs:
         git config user.name github-actions
         git config user.email [email protected]
         git checkout -b "release-$VERSION"
-        git add -f dist/* vendor/*
+        git add -f dist/* vendor-prefixed/*
         git commit --no-verify -m "Release $VERSION"
         git tag "$VERSION"
         git push --tags

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

@@ -1,4 +1,4 @@
-name: Build with vendor (test)
+name: Build with vendor-prefixed
 
 on:
   pull_request:
@@ -17,11 +17,11 @@ jobs:
     - name: Set PHP version
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.0' # Minimum required version
+        php-version: '8.2'
         coverage: none
 
     - name: composer install
-      run: composer install --no-dev -o
+      run: composer install
 
     - name: install node v18
       uses: actions/setup-node@v3
@@ -42,7 +42,7 @@ jobs:
     - name: Make artifacts available
       uses: actions/upload-artifact@v3
       with:
-        name: cypress-artifact
+        name: Plugin Zip
         retention-days: 2
         path: |
           ${{ github.workspace }}/elasticpress.zip

.github/workflows/cypress-tests.yml

@@ -50,12 +50,12 @@ jobs:
     - name: Set PHP version
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.0'
+        php-version: '8.2'
         tools: cs2pr
         coverage: none
 
     - name: composer install
-      run: composer install --no-dev -o
+      run: composer install
 
     - name: "Install node v${{ env.NODE_VERSION }}"
       uses: actions/setup-node@v3
@@ -132,12 +132,12 @@ jobs:
     - name: Set PHP version
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.0'
+        php-version: '8.2'
         tools: cs2pr
         coverage: none
 
     - name: composer install
-      run: composer install --no-dev -o
+      run: composer install
 
     - name: "Install node v${{ env.NODE_VERSION }}"
       uses: actions/setup-node@v3

.github/workflows/lint.yml

@@ -78,7 +78,7 @@ jobs:
         coverage: none
 
     - name: composer install
-      run: composer install --ignore-platform-reqs
+      run: composer install
 
     - name: PHPCS check
       run: './vendor/bin/phpcs . -q --report=checkstyle --runtime-set testVersion 7.0- | cs2pr'

.github/workflows/test.yml

@@ -112,7 +112,7 @@ jobs:
         coverage: none
 
     - name: Install dependencies
-      run: composer install --ignore-platform-reqs
+      run: composer install
 
     - name: Setup WP Tests
       run: |

.gitignore

@@ -1,4 +1,5 @@
 /vendor/
+/vendor-prefixed/
 node_modules
 /dist
 .idea

.wp-env.json

@@ -1,4 +1,9 @@
 {
+  "config": {
+    "WP_DEBUG": true,
+    "WP_DEBUG_DISPLAY": true,
+    "WP_DISABLE_FATAL_ERROR_HANDLER": true
+  },
   "env": {
     "tests": {
       "themes": [

CHANGELOG.md

@@ -13,6 +13,21 @@ All notable changes to this project will be documented in this file, per [the Ke
 ### Security
 -->
 
+## [4.7.1] - 2023-08-31
+
+**Note that starting from the ElasticPress 5.0.0 release the `Users` feature will be moved to the [ElasticPress Labs](https://github.com/10up/ElasticPressLabs) plugin. The `Terms` and `Comments` features will remain in ElasticPress but will be available only if enabled via code. Check [our blog post](https://www.elasticpress.io/blog/2023/03/enabling-comments-and-terms-in-elasticpress-5-0) for more info.**
+
+### Added
+* Synonyms and weighting settings added to the status report. Props [@felipeelia](https://github.com/felipeelia) via [#3609](https://github.com/10up/ElasticPress/pull/3609).
+
+### Changed
+* Composer packages are namespaced by Strauss. Props [@felipeelia](https://github.com/felipeelia) and [@junaidbhura](https://github.com/junaidbhura) via [#3621](https://github.com/10up/ElasticPress/pull/3621).
+* E2e tests now log the formatted query info from Debug Bar ElasticPress. Props [@felipeelia](https://github.com/felipeelia) via [#3613](https://github.com/10up/ElasticPress/pull/3613).
+
+### Fixed
+* WooCommerce products sorted by popularity are now always sorted in a descending order. Props [@felipeelia](https://github.com/felipeelia) and [@burhandodhy](https://github.com/burhandodhy) via [#3619](https://github.com/10up/ElasticPress/pull/3619).
+* E2e tests with WordPress 6.3. Props [@felipeelia](https://github.com/felipeelia) via [#3599](https://github.com/10up/ElasticPress/pull/3599).
+
 ## [4.7.0] - 2023-08-10
 
 **Note that starting from the ElasticPress 5.0.0 release the `Users` feature will be moved to the [ElasticPress Labs](https://github.com/10up/ElasticPressLabs) plugin. The `Terms` and `Comments` features will remain in ElasticPress but will be available only if enabled via code. Check [our blog post](https://www.elasticpress.io/blog/2023/03/enabling-comments-and-terms-in-elasticpress-5-0) for more info.**

CREDITS.md

@@ -216,6 +216,7 @@ Thank you to all the people who have already contributed to this repository via
 [Martin Widmann (@mwidmann)](https://github.com/mwidmann)
 [xxx (@wildberrylillet)](https://github.com/wildberrylillet)
 [@tomi10up](https://github.com/tomi10up)
+[Junaid Bhura (@junaidbhura)](https://github.com/junaidbhura)
 and
 [@qazaqstan2025](https://github.com/qazaqstan2025).
 

bin/build-zip.sh

@@ -6,4 +6,4 @@ npm run build
 rm ./elasticpress.zip
 
 git archive --output=elasticpress.zip HEAD
-zip -ur elasticpress.zip dist vendor
+zip -ur elasticpress.zip dist vendor-prefixed

composer.json

@@ -30,33 +30,44 @@
   "require": {
     "php": ">=7.0",
     "composer/installers": "^1.0 || ^2.0",
-    "psr/container": "^1.0 || ^2.0"
+    "psr/container": "1.0.0"
   },
   "require-dev": {
     "10up/phpcs-composer": "dev-master",
     "wpackagist-plugin/woocommerce":"*",
     "phpcompatibility/phpcompatibility-wp": "*",
-    "yoast/phpunit-polyfills": "^1.0"
+    "yoast/phpunit-polyfills": "^1.0",
+    "brianhenryie/strauss": "^0.14.0"
   },
   "scripts": {
     "lint": "phpcs . -s --runtime-set testVersion 7.0-",
     "lint-fix": "phpcbf .",
     "test": "phpunit",
     "test-single-site": "phpunit -c single-site.xml.dist",
-    "setup-local-tests": "bash bin/install-wp-tests.sh ep_wp_test root password 127.0.0.1 latest true"
+    "setup-local-tests": "bash bin/install-wp-tests.sh ep_wp_test root password 127.0.0.1 latest true",
+    "strauss": [ "vendor/bin/strauss" ],
+    "post-install-cmd": [
+      "@strauss"
+    ],
+    "post-update-cmd": [
+      "@strauss"
+    ]
   },
   "extra": {
     "installer-paths": {
-          "vendor/{$name}/": ["type:wordpress-plugin", "type:wordpress-theme"]
-      }
+      "vendor/{$name}/": ["type:wordpress-plugin", "type:wordpress-theme"]
+    },
+    "strauss": {
+      "target_directory": "vendor-prefixed",
+      "namespace_prefix": "ElasticPress\\Vendor_Prefixed\\",
+      "classmap_prefix": "ElasticPress_Vendor_Prefixed_",
+      "constant_prefix": "EP_VENDOR_"
+    }
   },
   "config": {
     "allow-plugins": {
       "composer/installers": true,
       "dealerdirect/phpcodesniffer-composer-installer": true
-    },
-    "platform": {
-      "php": "7.0"
     }
   }
 }