Merge remote-tracking branch 'origin/develop'

Author: tillkruss

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.6.3
+
+- Switch to `E_USER_DEPRECATED` instead of `_doing_it_wrong()` in drop-in
+- Fixed `undefined constant` error when using Credis (deprecated) as client
+
 ## 2.6.2
 
 - Fixed more PHP 7.2 heredoc parsing errors

includes/object-cache.php

@@ -3,7 +3,7 @@
  * Plugin Name: Redis Object Cache Drop-In
  * Plugin URI: https://wordpress.org/plugins/redis-cache/
  * Description: A persistent object cache backend powered by Redis. Supports Predis, PhpRedis, Relay, replication, sentinels, clustering and WP-CLI.
- * Version: 2.6.2
+ * Version: 2.6.3
  * Author: Till Krüss
  * Author URI: https://objectcache.pro
  * License: GPLv3
@@ -518,10 +518,8 @@ public function __construct( $fail_gracefully = false ) {
 
         $this->cache_group_types();
 
-        if ( function_exists( '_doing_it_wrong' ) ) {
-            if ( defined( 'WP_REDIS_TRACE' ) && WP_REDIS_TRACE ) {
-                _doing_it_wrong( __FUNCTION__ , 'Tracing feature was removed.' , '2.1.2' );
-            }
+        if ( defined( 'WP_REDIS_TRACE' ) && WP_REDIS_TRACE ) {
+            trigger_error('Tracing feature was removed', E_USER_DEPRECATED);
         }
 
         $client = $this->determine_client();
@@ -758,9 +756,7 @@ protected function connect_using_phpredis( $parameters ) {
         if ( defined( 'WP_REDIS_SERIALIZER' ) && ! empty( WP_REDIS_SERIALIZER ) ) {
             $this->redis->setOption( Redis::OPT_SERIALIZER, WP_REDIS_SERIALIZER );
 
-            if ( function_exists( '_doing_it_wrong' ) ) {
-                _doing_it_wrong( __FUNCTION__ , 'The `WP_REDIS_SERIALIZER` configuration constant has been deprecated, use `WP_REDIS_IGBINARY` instead.', '2.3.1' );
-            }
+            trigger_error('The `WP_REDIS_SERIALIZER` configuration constant has been deprecated in favor of `WP_REDIS_IGBINARY`', E_USER_DEPRECATED);
         }
     }
 
@@ -834,9 +830,7 @@ protected function connect_using_relay( $parameters ) {
         if ( defined( 'WP_REDIS_SERIALIZER' ) && ! empty( WP_REDIS_SERIALIZER ) ) {
             $this->redis->setOption( Relay\Relay::OPT_SERIALIZER, WP_REDIS_SERIALIZER );
 
-            if ( function_exists( '_doing_it_wrong' ) ) {
-                _doing_it_wrong( __FUNCTION__ , 'The `WP_REDIS_SERIALIZER` configuration constant has been deprecated, use `WP_REDIS_IGBINARY` instead.', '2.3.1' );
-            }
+            trigger_error('The `WP_REDIS_SERIALIZER` configuration constant has been deprecated in favor of `WP_REDIS_IGBINARY`', E_USER_DEPRECATED);
         }
     }
 
@@ -948,11 +942,11 @@ protected function connect_using_predis( $parameters ) {
      * @param  array $parameters Connection parameters built by the `build_parameters` method.
      * @throws \Exception If the Credis library was not found or is unreadable.
      * @throws \Exception If redis sharding should be configured as Credis does not support sharding.
-     * @throws \Exception If more than one seninel is configured as Credis does not support multiple sentinel servers.
+     * @throws \Exception If more than one sentinel is configured as Credis does not support multiple sentinel servers.
      * @return void
      */
     protected function connect_using_credis( $parameters ) {
-        _doing_it_wrong( __FUNCTION__ , 'Credis support will be removed in future versions.' , '2.0.26' );
+        trigger_error( 'Credis support is deprecated and will be removed in the future', E_USER_DEPRECATED );
 
         $client = 'Credis';
 
@@ -1079,7 +1073,7 @@ protected function connect_using_credis( $parameters ) {
         }
 
         $this->diagnostics = array_merge(
-            [ 'client' => sprintf( '%s (v%s)', $client, Credis_Client::VERSION ) ],
+            [ 'client' => sprintf( '%s (%s)', $client, 'bundled' ) ],
             $args
         );
     }
@@ -1091,7 +1085,7 @@ protected function connect_using_credis( $parameters ) {
      * @return void
      */
     protected function connect_using_hhvm( $parameters ) {
-        _doing_it_wrong( __FUNCTION__ , 'HHVM support will be removed in future versions.' , '2.0.26' );
+        trigger_error('HHVM support is deprecated and will be removed in the future', E_USER_DEPRECATED);
 
         $this->redis = new Redis();
 

phpstan.dist.neon

@@ -61,12 +61,6 @@ parameters:
             count: 1
             path: includes/ui/settings.php
 
-        # False positive
-        -
-            message: "#^Access to undefined constant Credis_Client::VERSION#"
-            count: 1
-            path: tests/PHPStan/object-cache.php
-
         # whatever
         -
             message: "#^Call to an undefined method Credis_Sentinel::getCluster#"

readme.txt

@@ -5,7 +5,7 @@ Tags: redis, object cache, caching, performance, relay
 Requires at least: 4.6
 Tested up to: 6.8
 Requires PHP: 7.2
-Stable tag: 2.6.2
+Stable tag: 2.6.3
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -61,6 +61,11 @@ Redis Object Cache has various WP CLI commands, for more information run `wp hel
 
 == Changelog ==
 
+= 2.6.3 =
+
+- Switch to `E_USER_DEPRECATED` instead of `_doing_it_wrong()` in drop-in
+- Fixed error when using Credis (deprecated) as client
+
 = 2.6.2 =
 
 - Fixed more PHP 7.2 heredoc parsing errors

redis-cache.php

@@ -3,7 +3,7 @@
  * Plugin Name: Redis Object Cache
  * Plugin URI: https://wordpress.org/plugins/redis-cache/
  * Description: A persistent object cache backend powered by Redis. Supports Predis, PhpRedis, Relay, replication, sentinels, clustering and WP-CLI.
- * Version: 2.6.2
+ * Version: 2.6.3
  * Text Domain: redis-cache
  * Domain Path: /languages
  * Network: true