[CMSP-73] PHP 8.2 compatibility

.gitattributes

@@ -23,5 +23,4 @@
 /package.json export-ignore
 /phpcs.xml.dist export-ignore
 /phpunit.xml.dist export-ignore
-/README.md export-ignore
-/schema.xml export-ignore
+/README.md export-ignore

.github/workflows/lint-test.yml

@@ -0,0 +1,144 @@
+name: Lint and Test
+on:
+  push:
+    branches:
+      - '**'
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    container:
+      image: quay.io/pantheon-public/build-tools-ci:8.x-php8.2
+      options: --user root
+    name: Lint
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Cache dependencies
+      uses: actions/cache@v3
+      with:
+        path: ~/vendor
+        key: test-lint-dependencies-{{ checksum "composer.json" }}
+        restore-keys: test-lint-dependencies-{{ checksum "composer.json" }}
+
+    - name: Install dependencies
+      run: composer install -n --prefer-dist
+
+    - name: Run PHP Lint
+      run: composer phpcs
+
+  test-phpunit:
+    # needs: lint
+    runs-on: ubuntu-latest
+    services:
+      mariadb:
+        image: mariadb:10.4
+    name: PHP Unit tests
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Start MySQL
+      run: |
+        sudo systemctl start mysql
+
+    - name: Cache dependencies
+      uses: actions/cache@v3
+      with:
+        path: ~/vendor
+        key: test-phpunit-dependencies-{{ checksum "composer.json" }}
+        restore-keys: test-phpunit-dependencies-{{ checksum "composer.json" }}
+
+    - name: Add PUBKEYs
+      run: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
+
+    - name: Install Extras 
+      run: |
+        sudo apt-get update
+        sudo apt-get install subversion
+
+    - name: Run install-solr.sh 
+      run: bash bin/install-solr.sh
+
+    - name: Set PHP version
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '8.2'
+        coverage: none
+
+    - name: Install dependencies
+      run: composer install
+
+    - name: "Run Tests"
+      run: |
+        bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1 latest
+        composer phpunit
+        rm -rf $WP_TESTS_DIR $WP_CORE_DIR
+        bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1 nightly true
+        WP_MULTISITE=1 composer phpunit
+
+  test-behat:
+    needs: test-phpunit
+    runs-on: ubuntu-latest
+    container:
+      image: quay.io/pantheon-public/build-tools-ci:8.x-php8.2
+      options: --user root
+    env:
+      TERMINUS_TOKEN: ${{ secrets.TERMINUS_TOKEN }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      TERMINUS_ENV: ci-${{github.run_number}}
+      TERMINUS_SITE: solr-power
+      SITE_ENV: solr-power.ci-${{github.run_number}}
+      WORDPRESS_ADMIN_USERNAME: pantheon
+      WORDPRESS_ADMIN_EMAIL: [email protected]
+      WORDPRESS_ADMIN_PASSWORD: solr-power.ci-${{github.run_number}}
+    name: Behat tests
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Install SSH key
+      uses: webfactory/[email protected]
+      with:
+        ssh-private-key: ${{ secrets.SITE_OWNER_SSH_PRIVATE_KEY }}
+
+    - name: Cache dependencies
+      uses: actions/cache@v3
+      with:
+        path: ~/vendor
+        key: test-behat-dependencies-{{ checksum "composer.json" }}
+        restore-keys: test-behat-dependencies-{{ checksum "composer.json" }}
+
+    - name: Check for $GITHUB_TOKEN
+      run: |
+        if [ -z "$GITHUB_TOKEN" ]; then
+          echo "GITHUB_TOKEN environment variables missing; assuming unauthenticated build"
+          exit 0
+        fi
+        echo "Setting GitHub OAuth token with suppressed ouput"
+        {
+          composer config -g github-oauth.github.com $GITHUB_TOKEN
+        } &> /dev/null
+
+    - name: Check for $TERMINUS_TOKEN
+      run: |
+        if [ -z "$TERMINUS_TOKEN" ]; then
+          echo "TERMINUS_TOKEN environment variables missing; assuming unauthenticated build"
+          exit 0
+        fi
+        terminus auth:login --machine-token=$TERMINUS_TOKEN
+
+    - name: Prepare for Behat tests  
+      run: ./bin/behat-prepare.sh
+
+    - name: Execute Behat tests
+      run: ./bin/behat-test.sh --strict
+
+    - name: Clean up Behat tests
+      run: ./bin/behat-cleanup.sh

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Changelog ##
 
+## 2.4.2 (December 2, 2022) ##
+* Re-add changelog heading to readme.txt [[#564](https://github.com/pantheon-systems/solr-power/pull/564)]
+
 ## 2.4.1 (December 1, 2022) ##
 * Fixes the WordPress `readme.txt` [[#562](https://github.com/pantheon-systems/solr-power/pull/562/)]
 

README.md

@@ -4,7 +4,7 @@
 **Requires at least:** 4.6
 **Requires PHP:** 7.1
 **Tested up to:** 6.0
-**Stable tag:** 2.4.1
+**Stable tag:** 2.4.2
 **License:** GPLv2 or later
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html
 

bin/behat-prepare.sh

@@ -24,6 +24,9 @@ fi
 
 set -ex
 
+# Set StrictHostKeyChecking to no
+echo "StrictHostKeyChecking no" >> /etc/ssh/ssh_config
+
 ###
 # Create a new environment for this particular test run.
 ###
@@ -51,7 +54,20 @@ git clone -b $TERMINUS_ENV $PANTHEON_GIT_URL $PREPARE_DIR
 rm -rf $PREPARE_DIR/wp-content/plugins/solr-power
 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
+
+###
+# Build plugin
+###
+npm ci
+npm run build
+composer install --no-dev -o
+
+# Remove unneeded stuff
 rm -rf $PREPARE_DIR/wp-content/plugins/solr-power/.git
+rm -rf $PREPARE_DIR/wp-content/plugins/solr-power/node_modules/
+rm -rf $PREPARE_DIR/wp-content/plugins/solr-power/tests/
+cd $BASH_DIR/..
 
 # Download the latest Classic Editor release from WordPress.org
 wget -O $PREPARE_DIR/classic-editor.zip https://downloads.wordpress.org/plugin/classic-editor.zip
@@ -75,9 +91,7 @@ terminus build:workflow:wait $TERMINUS_SITE.$TERMINUS_ENV
 ###
 # Set up WordPress, theme, and plugins for the test run
 ###
-{
-  terminus wp $SITE_ENV -- core install --title=$TERMINUS_ENV-$TERMINUS_SITE --url=$PANTHEON_SITE_URL --admin_user=$WORDPRESS_ADMIN_USERNAME --admin_email=$WORDPRESS_ADMIN_EMAIL --admin_password=$WORDPRESS_ADMIN_PASSWORD
-} &> /dev/null
+terminus wp $SITE_ENV -- core install --title=$TERMINUS_ENV-$TERMINUS_SITE --url=$PANTHEON_SITE_URL --admin_user=$WORDPRESS_ADMIN_USERNAME --admin_email=$WORDPRESS_ADMIN_EMAIL --admin_password=$WORDPRESS_ADMIN_PASSWORD
 terminus wp $SITE_ENV -- plugin activate solr-power classic-editor
 terminus wp $SITE_ENV -- theme activate twentyseventeen
 terminus wp $SITE_ENV -- rewrite structure '/%year%/%monthnum%/%day%/%postname%/'

bin/behat-test.sh

@@ -24,4 +24,8 @@ set -ex
 
 export BEHAT_PARAMS='{"extensions" : {"Behat\\MinkExtension" : {"base_url" : "http://'$TERMINUS_ENV'-'$TERMINUS_SITE'.pantheonsite.io"} }}'
 
+###
+# Install dependencies for tests
+###
+composer install
 ./vendor/bin/behat "$@"

bin/install-solr.sh

@@ -29,6 +29,7 @@ run() {
     else
         java -Djetty.port=$SOLR_PORT -jar start.jar > /dev/null 2>&1 &
     fi
+    is_solr_up
     wait_for_solr
     cd ../../
     echo "Started"

composer.json

@@ -16,21 +16,21 @@
     "prefer-stable": true,
     "config": {
         "platform": {
-            "php": "7.1"
+            "php": "7.3"
         },
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
         }
     },
     "require": {
-        "solarium/solarium": "~4",
-        "symfony/event-dispatcher": "^3.4"
+        "solarium/solarium": "~6",
+        "symfony/event-dispatcher": "^4.3 || ^5.0 || ^6.0"
     },
     "require-dev": {
         "pantheon-systems/pantheon-wordpress-upstream-tests": "dev-master",
-        "wp-coding-standards/wpcs": "^2.1",
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-        "phpunit/phpunit": "^6 || ^7",
+        "wp-coding-standards/wpcs": "dev-develop as 2.3.1",
+        "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
+        "phpunit/phpunit": "^9",
         "phpcompatibility/php-compatibility": "^9.3",
         "yoast/phpunit-polyfills": "^1.0"
     },