Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	readme.txt

.gitattributes

@@ -6,12 +6,10 @@ includes/ui/* linguist-language=HTML+PHP
 /.github export-ignore
 /.wordpress-org export-ignore
 /bin export-ignore
-/docker export-ignore
 .editorconfig export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
 composer.json export-ignore
-docker-compose.yml export-ignore
 phpcs.xml export-ignore
 phpunit.xml.dist export-ignore
-readme.txt export-ignore
+readme.txt export-ignore

.github/workflows/tests.yml

@@ -1,11 +1,12 @@
 name: Run Tests
 
 on:
-  push:
-  pull_request:
+  push: null
+  pull_request: null
 
 jobs:
-  single-instance:
+
+  instance:
     name: Testing (PHP ${{ matrix.php }}; Instance ${{ matrix.redis }})
     runs-on: ubuntu-latest
     timeout-minutes: 5
@@ -36,14 +37,11 @@ jobs:
           --health-timeout 5s
           --health-retries 5
 
-
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
-        composer: [ 'composer' ]
-        redis: [ '4.0.14', '5.0.12', '6.2.6' ]
-        wordpress: [ 'latest' ]
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1']
+        redis: ['3.2.12', '6.2.6', '7.0.3']
 
     steps:
       - name: Checkout
@@ -54,12 +52,12 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           extensions: msgpack, igbinary, redis-5.3.7
-          tools: ${{ matrix.composer }}
 
       - name: Set up WordPress and WordPress Test Library
         uses: sjinks/setup-wordpress-test-library@master
         with:
-          version: ${{ matrix.wordpress }}
+          version: latest
+          cache_prefix: redis-cache-${{ github.ref }}
 
       - name: Install PHP Dependencies
         uses: ramsey/composer-install@v2
@@ -71,7 +69,7 @@ jobs:
       - name: Run test suite
         run: ./vendor/bin/phpunit
 
-  cluster-instance:
+  cluster:
     name: Testing (PHP ${{ matrix.php }}; Cluster ${{ matrix.redis }})
     runs-on: ubuntu-latest
     timeout-minutes: 5
@@ -93,7 +91,7 @@ jobs:
           MYSQL_DATABASE: wordpress_test
 
       redis:
-        image: grokzen/redis-cluster
+        image: grokzen/redis-cluster:${{ matrix.redis }}
         ports:
           - '6379-6384:6379-6384'
         options: >-
@@ -112,10 +110,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
-        composer: [ 'composer' ]
-        redis: [ '5.0.12', '6.2.1' ]
-        wordpress: [ 'latest' ]
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1']
+        redis: ['5.0.12', '6.2.1']
 
     steps:
       - name: Checkout
@@ -126,12 +122,12 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           extensions: msgpack, igbinary, redis-5.3.7
-          tools: ${{ matrix.composer }}
 
       - name: Set up WordPress and WordPress Test Library
         uses: sjinks/setup-wordpress-test-library@master
         with:
-          version: ${{ matrix.wordpress }}
+          version: latest
+          cache_prefix: redis-cache-${{ github.ref }}     
 
       - name: Install PHP Dependencies
         uses: ramsey/composer-install@v2

.gitignore

@@ -1,5 +1,9 @@
+/.wp-test
+/.phpunit.cache
 /docker/apf.php
 /php-tools
 /vendor
 /reports
+.phpunit.result.cache
 composer.lock
+config.sh

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 2.1.1
+
+- Bumped PHP requirement to 7.2
+- Renamed `WP_REDIS_DIR` to `WP_REDIS_PLUGIN_DIR`
+- Fixed rare fatal error in diagnostics
+- Allow Predis v1.1 Composer installs
+- Support using `WP_REDIS_CLUSTER` string
+
 ## 2.1.0
 
 - Bumped PHP requirement to 7.0

README.md

@@ -48,4 +48,4 @@ To see a list of all available WP-CLI commands, please see the [WP CLI commands
 
 ### Development
 
-Head over to the [Docker Development wiki page](https://github.com/rhubarbgroup/redis-cache/wiki/Docker-Development) to spin up various Redis setups.
+Head over to the [Local development wiki page](https://github.com/rhubarbgroup/redis-cache/wiki/Local-Development) for more information.