Merge pull request #52 from kbond/php-redis

Added support for php redis extension

Author: lsmith77

src/ZendDiagnostics/Check/Redis.php

@@ -5,8 +5,8 @@
 
 namespace ZendDiagnostics\Check;
 
-use Predis\Client;
-use ZendDiagnostics\Result\Failure;
+use Predis\Client as PredisClient;
+use Redis as RedisExtensionClient;
 use ZendDiagnostics\Result\Success;
 
 /**
@@ -38,21 +38,35 @@ public function __construct($host = 'localhost', $port = 6379)
      * Perform the check
      *
      * @see \ZendDiagnostics\Check\CheckInterface::check()
-     * @return Failure|Success
      */
     public function check()
     {
-        if (!class_exists('Predis\Client')) {
-            return new Failure('Predis is not installed');
-        }
+        $this->createClient()->ping();
+
+        return new Success();
+    }
+
+    /**
+     * @return PredisClient|RedisExtensionClient
+     *
+     * @throws \RuntimeException
+     */
+    private function createClient()
+    {
+        if (class_exists('\Redis')) {
+            $client = new RedisExtensionClient();
+            $client->connect($this->host);
 
-        $client = new Client(array(
-            'host' => $this->host,
-            'port' => $this->port,
-        ));
+            return $client;
+        }
 
-        $client->ping();
+        if (class_exists('Predis\Client')) {
+            return new PredisClient(array(
+                'host' => $this->host,
+                'port' => $this->port,
+            ));
+        }
 
-        return new Success();
+        throw new \RuntimeException('Neither the PHP Redis extension or Predis are installed');
     }
 }

tests/ZendDiagnosticsTest/ChecksTest.php

@@ -63,7 +63,7 @@ public function testRedis()
         $this->assertInstanceOf('ZendDiagnostics\Result\Success', $result);
 
         $check = new Redis('127.0.0.250', 9999);
-        $this->setExpectedException('Predis\Connection\ConnectionException');
+        $this->setExpectedException('\Exception');
         $check->check();
     }