Merge remote-tracking branch 'origin/develop'

Author: tillkruss

.github/FUNDING.yml

@@ -1,2 +1,2 @@
 github: tillkruss
-custom: "https://www.paypal.me/tillkruss"
+custom: "https://www.paypal.me/tillkruess"

.github/workflows/lint.yml

@@ -1,8 +1,6 @@
 name: Code style
 
-on:
-  pull_request: null
-  push: null
+on: push
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -55,3 +53,18 @@ jobs:
         with:
           eclint_args: |
             -exclude=dependencies/**/*
+
+  plugincheck:
+    name: Plugin Check
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Run plugin check
+        uses: wordpress/plugin-check-action@v1
+        with:
+          exclude-directories: '.github,dependencies,tests'
+          exclude-files: '.editorconfig,.gitattributes,.gitignore,phpunit.xml.dist'
+          # exclude-checks: ''

.github/workflows/tests.yml

@@ -55,6 +55,11 @@ jobs:
           php-version: ${{ matrix.php }}
           extensions: msgpack, igbinary, redis-5.3.7
 
+      - name: Install SVN
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y subversion
+
       - name: Set up WordPress and WordPress Test Library
         uses: sjinks/setup-wordpress-test-library@master
         with:
@@ -65,8 +70,7 @@ jobs:
         uses: ramsey/composer-install@v2
 
       - name: Install missing library
-        run: |
-          composer require --dev yoast/phpunit-polyfills
+        run: composer require --dev yoast/phpunit-polyfills
 
       - name: Run test suite
         run: ./vendor/bin/phpunit
@@ -125,6 +129,11 @@ jobs:
           php-version: ${{ matrix.php }}
           extensions: msgpack, igbinary, redis-5.3.7
 
+      - name: Install SVN
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y subversion
+
       - name: Set up WordPress and WordPress Test Library
         uses: sjinks/setup-wordpress-test-library@master
         with:
@@ -135,8 +144,7 @@ jobs:
         uses: ramsey/composer-install@v2
 
       - name: Install missing library
-        run: |
-          composer require --dev yoast/phpunit-polyfills
+        run: composer require --dev yoast/phpunit-polyfills
 
       - name: Run test suite
         run: ./vendor/bin/phpunit

CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## 2.6.2
+
+- Fixed more PHP 7.2 heredoc parsing errors
+
+## 2.6.1
+
+- Fixed PHP 7.2 heredoc parsing error
+- Fixed call to undefined function `wp_rand()`
+
+## 2.6.0
+
+- Added `Primary Branch` header
+- Added `id` to script/style tags
+- Upgraded Predis to v2.4.0
+- Upgraded Credis to v1.17.0
+- Mark as tested up to 6.8
+- Adhere to Plugin Check (PCP)
+- Fixed (in|de)crement not working with serializer
+- Fixed rare replication mode issue
+- Fixed rare fatal error in diganostics
+
 ## 2.5.4
 
 - Respect `WP_REDIS_SCHEME` for Cluster connections

dependencies/colinmollenhour/credis/.editorconfig

@@ -0,0 +1,6 @@
+[*.php]
+charset=utf-8
+end_of_line=lf
+insert_final_newline=true
+indent_style=space
+indent_size=4

dependencies/colinmollenhour/credis/.php-cs-fixer.dist.php

@@ -0,0 +1,19 @@
+<?php
+/*
+ * This document has been generated with
+ * https://mlocati.github.io/php-cs-fixer-configurator/#version:3.13.2|configurator
+ * you can change this configuration by importing this file.
+ */
+$config = new PhpCsFixer\Config();
+return $config
+    ->setRules([
+        '@PSR12' => true,
+        'visibility_required' => false, // php 5.6 doesn't support "public const ..."
+    ])
+    ->setFinder(PhpCsFixer\Finder::create()
+        ->in(__DIR__)
+        ->name('*.php')
+        ->ignoreDotFiles(true)
+        ->ignoreVCS(true)
+    )
+;