From: Ori Livneh <ori@wikimedia.org>
Date: Thu, 19 Sep 2013 17:11:38 +0000 (-0700)
Subject: Allow RedisConnectionPool to be used with HHVM's Redis library
X-Git-Tag: 1.31.0-rc.0~18725
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=23c9c5546e716ec3ea1c3fb086ccc8afa3472385;p=lhc%2Fweb%2Fwiklou.git

Allow RedisConnectionPool to be used with HHVM's Redis library

As of commit 2811e9d, HHVM includes a pure-PHP Redis client library with
method-for-method compatibility with phpredis: <http://git.io/ylDAyQ>.
RedisConnectionPool appears to work well with it save for the
extension_loaded() check. Practically a freebie!

Bug: 54158
Change-Id: I3ac12293a51a45e8f6a61a35bff7a3c063e16964
---

diff --git a/includes/clientpool/RedisConnectionPool.php b/includes/clientpool/RedisConnectionPool.php
index da4621acde..ef71b1826a 100644
--- a/includes/clientpool/RedisConnectionPool.php
+++ b/includes/clientpool/RedisConnectionPool.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * PhpRedis client connection pooling manager.
+ * Redis client connection pooling manager.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
  */
 
 /**
- * Helper class to manage redis connections using PhpRedis.
+ * Helper class to manage Redis connections.
  *
  * This can be used to get handle wrappers that free the handle when the wrapper
  * leaves scope. The maximum number of free handles (connections) is configurable.
@@ -70,9 +70,9 @@ class RedisConnectionPool {
 	 * @param array $options
 	 */
 	protected function __construct( array $options ) {
-		if ( !extension_loaded( 'redis' ) ) {
-			throw new MWException( __CLASS__ . ' requires the phpredis extension: ' .
-				'https://github.com/nicolasff/phpredis' );
+		if ( !class_exists( 'Redis' ) ) {
+			throw new MWException( __CLASS__ . ' requires a Redis client library. ' .
+				'See https://www.mediawiki.org/wiki/Redis#Setup' );
 		}
 		$this->connectTimeout = $options['connectTimeout'];
 		$this->persistent = $options['persistent'];