drop hhvm

Author: tillkruss

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 - Changed `wp_cache_*()` function signatures to match core
+- Removed deprecated HHVM support
 - Removed deprecated `WP_REDIS_SERIALIZER` constant
 
 ## 2.6.5

includes/diagnostics.php

@@ -46,10 +46,6 @@
     $info['PHP Version'] = PHP_VERSION;
 }
 
-if ( defined( 'HHVM_VERSION' ) ) {
-    $info['HHVM Version'] = HHVM_VERSION;
-}
-
 $info['Plugin Version'] = WP_REDIS_VERSION;
 $info['Redis Version'] = $roc->get_redis_version() ?: 'Unknown';
 

includes/object-cache.php

@@ -519,18 +519,11 @@ public function __construct( $fail_gracefully = false ) {
 
         $this->cache_group_types();
 
-        if ( defined( 'WP_REDIS_TRACE' ) && WP_REDIS_TRACE ) {
-            trigger_error('Tracing feature was removed', E_USER_DEPRECATED);
-        }
-
         $client = $this->determine_client();
         $parameters = $this->build_parameters();
 
         try {
             switch ( $client ) {
-                case 'hhvm':
-                    $this->connect_using_hhvm( $parameters );
-                    break;
                 case 'phpredis':
                     $this->connect_using_phpredis( $parameters );
                     break;
@@ -600,7 +593,7 @@ protected function determine_client() {
         $client = 'predis';
 
         if ( class_exists( 'Redis' ) ) {
-            $client = defined( 'HHVM_VERSION' ) ? 'hhvm' : 'phpredis';
+            $client = 'phpredis';
         }
 
         if ( defined( 'WP_REDIS_CLIENT' ) ) {
@@ -1067,55 +1060,6 @@ protected function connect_using_credis( $parameters ) {
         );
     }
 
-    /**
-     * Connect to Redis using HHVM's Redis extension.
-     *
-     * @param  array $parameters Connection parameters built by the `build_parameters` method.
-     * @return void
-     */
-    protected function connect_using_hhvm( $parameters ) {
-        trigger_error('HHVM support is deprecated and will be removed in the future', E_USER_DEPRECATED);
-
-        $this->redis = new Redis();
-
-        // Adjust host and port if the scheme is `unix`.
-        if ( strcasecmp( 'unix', $parameters['scheme'] ) === 0 ) {
-            $parameters['host'] = 'unix://' . $parameters['path'];
-            $parameters['port'] = 0;
-        }
-
-        $this->redis->connect(
-            $parameters['host'],
-            $parameters['port'],
-            $parameters['timeout'],
-            null,
-            $parameters['retry_interval']
-        );
-
-        if ( $parameters['read_timeout'] ) {
-            $this->redis->setOption( Redis::OPT_READ_TIMEOUT, $parameters['read_timeout'] );
-        }
-
-        if ( isset( $parameters['password'] ) ) {
-            $this->redis->auth( $parameters['password'] );
-        }
-
-        if ( isset( $parameters['database'] ) ) {
-            if ( ctype_digit( (string) $parameters['database'] ) ) {
-                $parameters['database'] = (int) $parameters['database'];
-            }
-
-            if ( $parameters['database'] ) {
-                $this->redis->select( $parameters['database'] );
-            }
-        }
-
-        $this->diagnostics = array_merge(
-            [ 'client' => sprintf( 'HHVM Extension (v%s)', HHVM_VERSION ) ],
-            $parameters
-        );
-    }
-
     /**
      * Fetches Redis `INFO` mostly for server version.
      *

tests/PHPStan/bootstrap.php

@@ -7,7 +7,6 @@
     exit(2);
 }
 
-const HHVM_VERSION = '0.0.0';
 const WPINC = 'wp-includes';
 const WP_CONTENT_DIR = './';
 const WP_DEBUG_DISPLAY = true;