Merge branch 'develop' into feature/search-subscriptions

.github/workflows/lint.yml

@@ -57,23 +57,22 @@ jobs:
       run: |
         composer config -g cache-dir "${{ env.COMPOSER_CACHE }}"
     - name: Prepare composer cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{ env.COMPOSER_CACHE }}
         key: composer-${{ env.COMPOSER_VERSION }}-${{ hashFiles('**/composer.lock') }}
         restore-keys: |
           composer-${{ env.COMPOSER_VERSION }}-
+
     - name: Set PHP version
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.4'
+        php-version: '8.0'
+        tools: cs2pr
         coverage: none
 
     - name: composer install
       run: composer install
 
     - name: PHPCS check
-      uses: chekalsky/phpcs-action@v1
-      with:
-        enable_warnings: true
-        phpcs_bin_path: './vendor/bin/phpcs . --runtime-set testVersion 7.0-'
+      run: './vendor/bin/phpcs . -q --report=checkstyle --runtime-set testVersion 7.0- | cs2pr'

.github/workflows/test.yml

@@ -36,6 +36,11 @@ jobs:
         sudo sysctl -w fs.file-max=262144
         sudo sysctl -w vm.max_map_count=262144
 
+    - name: Setup Elasticsearch
+      uses: getong/elasticsearch-action@v1.2
+      with:
+        elasticsearch version: '7.5.0'
+
     - name: Set standard 10up cache directories
       run: |
         composer config -g cache-dir "${{ env.COMPOSER_CACHE }}"

composer.json

@@ -12,25 +12,25 @@
     }
   ],
   "require": {
-    "php": ">=7.0"
+    "php": "^7.0|^8.0"
   },
   "autoload": {
     "psr-4": {
       "ElasticPressLabs\\": "includes/classes/"
     }
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.5",
-    "10up/wp_mock": "^0.5.0",
+    "phpunit/phpunit": "^9",
+    "10up/wp_mock": "dev-trunk",
     "10up/phpcs-composer": "dev-master",
-    "10up/elasticpress": "*",
+    "10up/elasticpress": "dev-develop",
     "yoast/phpunit-polyfills": "^1.0"
   },
   "scripts": {
     "lint": "phpcs elasticpresslabs.php includes --runtime-set testVersion 7.0-",
     "lint-fix": "phpcbf elasticpresslabs.php includes",
     "test": "phpunit",
-    "setup-local-tests": "bash bin/install-wp-tests.sh epl_wp_test root password mysql trunk true"
+    "setup-local-tests": "bash bin/install-wp-tests.sh epl_wp_test root password 127.0.0.1 latest true"
   },
   "config": {
     "allow-plugins": {