Skip to content

Commit d1731fa

Browse files
author
John Spellman
authored
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] <support@github.com> * 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 <john.spellman@pantheon.io> * [CMSP-72] PHP 8.2 compatibility (#388) * Release 1.3.3
1 parent b0ba386 commit d1731fa

File tree

12 files changed

+1257
-1762
lines changed

12 files changed

+1257
-1762
lines changed

.circleci/config.yml

Lines changed: 93 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ workflows:
55
jobs:
66
- lint
77
- test-behat
8-
- test-phpunit-redis-disabled
9-
- test-phpunit-redis-enabled
8+
- test-phpunit-redis-disabled-74
9+
- test-phpunit-redis-enabled-74
10+
- test-phpunit-redis-disabled-82
11+
- test-phpunit-redis-enabled-82
1012
nightly:
1113
triggers:
1214
- schedule:
@@ -21,7 +23,7 @@ jobs:
2123
lint:
2224
working_directory: ~/pantheon-systems/wp-redis
2325
docker:
24-
- image: quay.io/pantheon-public/build-tools-ci:6.x
26+
- image: quay.io/pantheon-public/build-tools-ci:8.x-php8.2
2527
steps:
2628
- checkout
2729
- restore_cache:
@@ -40,7 +42,7 @@ jobs:
4042
working_directory: ~/pantheon-systems/wp-redis
4143
parallelism: 1
4244
docker:
43-
- image: quay.io/pantheon-public/build-tools-ci:6.x
45+
- image: quay.io/pantheon-public/build-tools-ci:8.x-php8.2
4446
steps:
4547
- checkout
4648
- restore_cache:
@@ -81,7 +83,7 @@ jobs:
8183
- run:
8284
command: ./bin/behat-cleanup.sh
8385
when: always
84-
test-phpunit-redis-disabled:
86+
test-phpunit-redis-disabled-74:
8587
working_directory: ~/pantheon-systems/wp-redis
8688
docker:
8789
- image: circleci/php:7.4-node-browsers
@@ -93,10 +95,10 @@ jobs:
9395
- checkout
9496
- restore_cache:
9597
keys:
96-
- test-phpunit-dependencies-{{ checksum "composer.json" }}
98+
- test-phpunit-74-dependencies-{{ checksum "composer.json" }}
9799
- run: composer install -n --prefer-dist
98100
- save_cache:
99-
key: test-phpunit-dependencies-{{ checksum "composer.json" }}
101+
key: test-phpunit-74-dependencies-{{ checksum "composer.json" }}
100102
paths:
101103
- vendor
102104
- run:
@@ -120,7 +122,7 @@ jobs:
120122
rm -rf $WP_TESTS_DIR $WP_CORE_DIR
121123
bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1 nightly true
122124
composer phpunit
123-
test-phpunit-redis-enabled:
125+
test-phpunit-redis-enabled-74:
124126
working_directory: ~/pantheon-systems/wp-redis
125127
docker:
126128
- image: circleci/php:7.4-node-browsers
@@ -133,10 +135,10 @@ jobs:
133135
- checkout
134136
- restore_cache:
135137
keys:
136-
- test-phpunit-dependencies-{{ checksum "composer.json" }}
138+
- test-phpunit-74-dependencies-{{ checksum "composer.json" }}
137139
- run: composer install -n --prefer-dist
138140
- save_cache:
139-
key: test-phpunit-dependencies-{{ checksum "composer.json" }}
141+
key: test-phpunit-74-dependencies-{{ checksum "composer.json" }}
140142
paths:
141143
- vendor
142144
- run:
@@ -162,3 +164,84 @@ jobs:
162164
rm -rf $WP_TESTS_DIR $WP_CORE_DIR
163165
bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1 nightly true
164166
composer phpunit
167+
test-phpunit-redis-disabled-82:
168+
working_directory: ~/pantheon-systems/wp-redis
169+
docker:
170+
- image: cimg/php:8.2.0
171+
- image: circleci/mariadb:10.3
172+
environment:
173+
- WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
174+
- WP_CORE_DIR: "/tmp/wordpress/"
175+
steps:
176+
- checkout
177+
- restore_cache:
178+
keys:
179+
- test-phpunit-82-dependencies-{{ checksum "composer.json" }}
180+
- run: composer install -n --prefer-dist
181+
- save_cache:
182+
key: test-phpunit-82-dependencies-{{ checksum "composer.json" }}
183+
paths:
184+
- vendor
185+
- run:
186+
name: "Install Extras"
187+
command: |
188+
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
189+
sudo apt-get update
190+
sudo apt-get install subversion
191+
sudo apt-get install -y libmagickwand-dev --no-install-recommends
192+
yes '' | sudo pecl install imagick || true
193+
sudo docker-php-ext-enable imagick
194+
sudo docker-php-ext-install mysqli
195+
sudo apt-get install mariadb-client-10.6
196+
- run:
197+
name: "Run Tests"
198+
command: |
199+
bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1 latest
200+
composer phpunit
201+
WP_MULTISITE=1 composer phpunit
202+
WP_REDIS_USE_CACHE_GROUPS=1 composer phpunit
203+
rm -rf $WP_TESTS_DIR $WP_CORE_DIR
204+
bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1 nightly true
205+
composer phpunit
206+
test-phpunit-redis-enabled-82:
207+
working_directory: ~/pantheon-systems/wp-redis
208+
docker:
209+
- image: cimg/php:8.2.0
210+
- image: circleci/mariadb:10.3
211+
- image: circleci/redis:latest
212+
environment:
213+
- WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
214+
- WP_CORE_DIR: "/tmp/wordpress/"
215+
steps:
216+
- checkout
217+
- restore_cache:
218+
keys:
219+
- test-phpunit-82-dependencies-{{ checksum "composer.json" }}
220+
- run: composer install -n --prefer-dist
221+
- save_cache:
222+
key: test-phpunit-82-dependencies-{{ checksum "composer.json" }}
223+
paths:
224+
- vendor
225+
- run:
226+
name: "Install Extras"
227+
command: |
228+
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
229+
sudo apt-get update
230+
sudo apt-get install subversion
231+
sudo apt-get install -y libmagickwand-dev --no-install-recommends
232+
yes '' | sudo pecl install imagick || true
233+
sudo docker-php-ext-enable imagick
234+
sudo docker-php-ext-install mysqli
235+
sudo apt-get install mariadb-client-10.6
236+
yes '' | sudo pecl install redis || true
237+
sudo docker-php-ext-enable redis
238+
- run:
239+
name: "Run Tests"
240+
command: |
241+
bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1 latest
242+
composer phpunit
243+
WP_MULTISITE=1 composer phpunit
244+
WP_REDIS_USE_CACHE_GROUPS=1 composer phpunit
245+
rm -rf $WP_TESTS_DIR $WP_CORE_DIR
246+
bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1 nightly true
247+
composer phpunit

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ Behat requires a Pantheon site with Redis enabled. Once you've created the site,
2626
## Release Process
2727

2828
1. Starting from `develop`, cut a release branch named `release_X.Y.Z` containing your changes.
29-
1. Update plugin version in `package.json`, `README.md`, `readme.txt`, and `wp-redis.php`.
29+
1. Update plugin version in `README.md`, `readme.txt`, and `wp-redis.php`.
3030
1. Update the Changelog with the latest changes.
3131
1. Create a PR against the `master` branch.
3232
1. After all tests pass and you have received approval from a CODEOWNER (including resolving any merge conflicts), merge the PR into `master`.
3333
1. Pull `master` locally, create a new tag, and push up.
3434
1. Confirm that the necessary assets are present in the newly created tag, and test on a WP install if desired.
3535
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.
3636
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.
37-
1. Check WordPress.org: Ensure that the changes are live on https://wordpress.org/plugins/wp-redis/. This may take a few minutes.
37+
1. Check WordPress.org: Ensure that the changes are live on https://wordpress.org/plugins/wp-redis/. This may take a few minutes.

Gruntfile.js

Lines changed: 0 additions & 27 deletions
This file was deleted.

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
**Tags:** cache, plugin, redis
66
**Requires at least:** 3.0.1
77
**Tested up to:** 6.1.1
8-
**Stable tag:** 1.3.2
8+
**Stable tag:** 1.3.3
99
**License:** GPLv2 or later
1010
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html
1111

@@ -104,6 +104,11 @@ There's a known issue with WordPress `alloptions` cache design. Specifically, a
104104

105105
## Changelog ##
106106

107+
### 1.3.3 (February 28, 2023) ###
108+
* Add PHP 8.2 support [[#388](https://github.com/pantheon-systems/wp-redis/pull/388)].
109+
* Remove Grunt, add valid license to Composer file [[#387](https://github.com/pantheon-systems/wp-redis/pull/387)].
110+
* Update Composer dependencies [[#384](https://github.com/pantheon-systems/wp-redis/pull/384)] [[#385](https://github.com/pantheon-systems/wp-redis/pull/385)].
111+
107112
### 1.3.2 (December 5, 2022) ###
108113
* Fix broken `wp_cache_supports` function [[#382](https://github.com/pantheon-systems/wp-redis/pull/382)].
109114

composer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "pantheon-systems/wp-redis",
33
"type": "wordpress-plugin",
4+
"license": "GPL-2.0-or-later",
45
"authors": [
56
{
67
"name": "Pantheon",
@@ -12,9 +13,9 @@
1213
"behat/mink-extension": "^2.2",
1314
"behat/mink-goutte-driver": "^1.2",
1415
"pantheon-systems/pantheon-wordpress-upstream-tests": "dev-master",
15-
"wp-coding-standards/wpcs": "^2",
16-
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
17-
"phpunit/phpunit": "^7",
16+
"wp-coding-standards/wpcs": "dev-develop as 2.3.1",
17+
"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
18+
"phpunit/phpunit": "^9",
1819
"phpcompatibility/php-compatibility": "^9.3",
1920
"yoast/phpunit-polyfills": "^1.0"
2021
},

0 commit comments

Comments
 (0)