Release 1.3.3 (#389)

* Update images for lint and test-behat jobs * Bump yoast/phpunit-polyfills from 1.0.3 to 1.0.4 * Bump dealerdirect/phpcodesniffer-composer-installer from 0.7.2 to 1.0.0 Bumps [dealerdirect/phpcodesniffer-composer-installer](https://github.com/Dealerdirect/phpcodesniffer-composer-installer) from 0.7.2 to 1.0.0. - [Release notes](https://github.com/Dealerdirect/phpcodesniffer-composer-installer/releases) - [Changelog](https://github.com/PHPCSStandards/composer-installer/blob/main/.github_changelog_generator) - [Commits](PHPCSStandards/composer-installer@v0.7.2...v1.0.0) --- updated-dependencies: - dependency-name: dealerdirect/phpcodesniffer-composer-installer dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Bump grunt from 1.5.2 to 1.6.1 (#386) * [CMSP-223] WP Redis housekeeping (#387) * add spdy-compatible license version * remove reference to package.json --------- Co-authored-by: John Spellman <[email protected]> * [CMSP-72] PHP 8.2 compatibility (#388) * Release 1.3.3
pantheon-systems · Feb 28, 2023 · d1731fa · d1731fa
1 parent b0ba386
commit d1731fa
Show file tree

Hide file tree

Showing 12 changed files with 1,257 additions and 1,762 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,8 +5,10 @@ workflows:
     jobs:
       - lint
       - test-behat
-      - test-phpunit-redis-disabled
-      - test-phpunit-redis-enabled
+      - test-phpunit-redis-disabled-74
+      - test-phpunit-redis-enabled-74
+      - test-phpunit-redis-disabled-82
+      - test-phpunit-redis-enabled-82
   nightly:
     triggers:
       - schedule:
@@ -21,7 +23,7 @@ jobs:
   lint:
     working_directory: ~/pantheon-systems/wp-redis
     docker:
-      - image: quay.io/pantheon-public/build-tools-ci:6.x
+      - image: quay.io/pantheon-public/build-tools-ci:8.x-php8.2
     steps:
       - checkout
       - restore_cache:
@@ -40,7 +42,7 @@ jobs:
     working_directory: ~/pantheon-systems/wp-redis
     parallelism: 1
     docker:
-    - image: quay.io/pantheon-public/build-tools-ci:6.x
+    - image: quay.io/pantheon-public/build-tools-ci:8.x-php8.2
     steps:
     - checkout
     - restore_cache:
@@ -81,7 +83,7 @@ jobs:
     - run:
         command: ./bin/behat-cleanup.sh
         when: always
-  test-phpunit-redis-disabled:
+  test-phpunit-redis-disabled-74:
     working_directory: ~/pantheon-systems/wp-redis
     docker:
       - image: circleci/php:7.4-node-browsers
@@ -93,10 +95,10 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - test-phpunit-dependencies-{{ checksum "composer.json" }}
+            - test-phpunit-74-dependencies-{{ checksum "composer.json" }}
       - run: composer install -n --prefer-dist
       - save_cache:
-          key: test-phpunit-dependencies-{{ checksum "composer.json" }}
+          key: test-phpunit-74-dependencies-{{ checksum "composer.json" }}
           paths:
             - vendor
       - run:
@@ -120,7 +122,7 @@ jobs:
             rm -rf $WP_TESTS_DIR $WP_CORE_DIR
             bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1 nightly true
             composer phpunit
-  test-phpunit-redis-enabled:
+  test-phpunit-redis-enabled-74:
     working_directory: ~/pantheon-systems/wp-redis
     docker:
       - image: circleci/php:7.4-node-browsers
@@ -133,10 +135,10 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - test-phpunit-dependencies-{{ checksum "composer.json" }}
+            - test-phpunit-74-dependencies-{{ checksum "composer.json" }}
       - run: composer install -n --prefer-dist
       - save_cache:
-          key: test-phpunit-dependencies-{{ checksum "composer.json" }}
+          key: test-phpunit-74-dependencies-{{ checksum "composer.json" }}
           paths:
             - vendor
       - run:
@@ -162,3 +164,84 @@ jobs:
             rm -rf $WP_TESTS_DIR $WP_CORE_DIR
             bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1 nightly true
             composer phpunit
+  test-phpunit-redis-disabled-82:
+    working_directory: ~/pantheon-systems/wp-redis
+    docker:
+      - image: cimg/php:8.2.0
+      - image: circleci/mariadb:10.3
+    environment:
+      - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
+      - WP_CORE_DIR: "/tmp/wordpress/"
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - test-phpunit-82-dependencies-{{ checksum "composer.json" }}
+      - run: composer install -n --prefer-dist
+      - save_cache:
+          key: test-phpunit-82-dependencies-{{ checksum "composer.json" }}
+          paths:
+            - vendor
+      - run:
+          name: "Install Extras"
+          command: |
+            sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
+            sudo apt-get update
+            sudo apt-get install subversion
+            sudo apt-get install -y libmagickwand-dev --no-install-recommends
+            yes '' | sudo pecl install imagick || true
+            sudo docker-php-ext-enable imagick
+            sudo docker-php-ext-install mysqli
+            sudo apt-get install mariadb-client-10.6
+      - run:
+          name: "Run Tests"
+          command: |
+            bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1 latest
+            composer phpunit
+            WP_MULTISITE=1 composer phpunit
+            WP_REDIS_USE_CACHE_GROUPS=1 composer phpunit
+            rm -rf $WP_TESTS_DIR $WP_CORE_DIR
+            bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1 nightly true
+            composer phpunit
+  test-phpunit-redis-enabled-82:
+    working_directory: ~/pantheon-systems/wp-redis
+    docker:
+      - image: cimg/php:8.2.0
+      - image: circleci/mariadb:10.3
+      - image: circleci/redis:latest
+    environment:
+      - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
+      - WP_CORE_DIR: "/tmp/wordpress/"
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - test-phpunit-82-dependencies-{{ checksum "composer.json" }}
+      - run: composer install -n --prefer-dist
+      - save_cache:
+          key: test-phpunit-82-dependencies-{{ checksum "composer.json" }}
+          paths:
+            - vendor
+      - run:
+          name: "Install Extras"
+          command: |
+            sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
+            sudo apt-get update
+            sudo apt-get install subversion
+            sudo apt-get install -y libmagickwand-dev --no-install-recommends
+            yes '' | sudo pecl install imagick || true
+            sudo docker-php-ext-enable imagick
+            sudo docker-php-ext-install mysqli
+            sudo apt-get install mariadb-client-10.6
+            yes '' | sudo pecl install redis || true
+            sudo docker-php-ext-enable redis
+      - run:
+          name: "Run Tests"
+          command: |
+            bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1 latest
+            composer phpunit
+            WP_MULTISITE=1 composer phpunit
+            WP_REDIS_USE_CACHE_GROUPS=1 composer phpunit
+            rm -rf $WP_TESTS_DIR $WP_CORE_DIR
+            bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1 nightly true
+            composer phpunit
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -26,12 +26,12 @@ Behat requires a Pantheon site with Redis enabled. Once you've created the site,
 ## Release Process
 
 1. Starting from `develop`, cut a release branch named `release_X.Y.Z` containing your changes.
-1. Update plugin version in `package.json`, `README.md`, `readme.txt`, and `wp-redis.php`.
+1. Update plugin version in `README.md`, `readme.txt`, and `wp-redis.php`.
 1. Update the Changelog with the latest changes.
 1. Create a PR against the `master` branch.
 1. After all tests pass and you have received approval from a CODEOWNER (including resolving any merge conflicts), merge the PR into `master`.
 1. Pull `master` locally, create a new tag, and push up.
 1. Confirm that the necessary assets are present in the newly created tag, and test on a WP install if desired.
 1. Create a [new release](https://github.com/pantheon-systems/wp-redis/releases/new) using the tag created in the previous steps, naming the release with the new version number, and targeting the tag created in the previous step. Paste the release changelog from the `Changelog` section of the `README` into the body of the release and include a link to the closed issues if applicable.
 1. Wait for the [_Release wp-redis plugin to wp.org_ action](https://github.com/pantheon-systems/wp-redis/actions/workflows/wordpress-plugin-deploy.yml) to finish deploying to the WordPress.org repository. If all goes well, users with SVN commit access for that plugin will receive an emailed diff of changes.
-1. Check WordPress.org: Ensure that the changes are live on https://wordpress.org/plugins/wp-redis/. This may take a few minutes.
+1. Check WordPress.org: Ensure that the changes are live on https://wordpress.org/plugins/wp-redis/. This may take a few minutes.
diff --git a/Gruntfile.js b/Gruntfile.js
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 **Tags:** cache, plugin, redis  
 **Requires at least:** 3.0.1  
 **Tested up to:** 6.1.1  
-**Stable tag:** 1.3.2  
+**Stable tag:** 1.3.3  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -104,6 +104,11 @@ There's a known issue with WordPress `alloptions` cache design. Specifically, a
 
 ## Changelog ##
 
+### 1.3.3 (February 28, 2023) ###
+* Add PHP 8.2 support [[#388](https://github.com/pantheon-systems/wp-redis/pull/388)].
+* Remove Grunt, add valid license to Composer file [[#387](https://github.com/pantheon-systems/wp-redis/pull/387)].
+* Update Composer dependencies [[#384](https://github.com/pantheon-systems/wp-redis/pull/384)] [[#385](https://github.com/pantheon-systems/wp-redis/pull/385)].
+
 ### 1.3.2 (December 5, 2022) ###
 * Fix broken `wp_cache_supports` function [[#382](https://github.com/pantheon-systems/wp-redis/pull/382)].
 

diff --git a/composer.json b/composer.json
@@ -1,6 +1,7 @@
 {
   "name": "pantheon-systems/wp-redis",
   "type": "wordpress-plugin",
+  "license": "GPL-2.0-or-later",
   "authors": [
     {
       "name": "Pantheon",
@@ -12,9 +13,9 @@
     "behat/mink-extension": "^2.2",
     "behat/mink-goutte-driver": "^1.2",
     "pantheon-systems/pantheon-wordpress-upstream-tests": "dev-master",
-    "wp-coding-standards/wpcs": "^2",
-    "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-    "phpunit/phpunit": "^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"
   },