Support LDD feature retrieval

* Clean up formatting and add types
* New FeatureRequester interface to abstract grizzly and ldd support
* Support PHP 5.3
* New optional predis for LDD retrieval

Author: mrdon

.gitignore

@@ -1,2 +1,4 @@
 /vendor/
-/doc/
+/doc/
+*.iml
+composer.phar

composer.json

@@ -20,7 +20,11 @@
     },
     "require-dev": {
         "phpunit/phpunit": "4.3.*",
-        "phpdocumentor/phpdocumentor": "2.*"
+        "phpdocumentor/phpdocumentor": "2.*",
+        "predis/predis": "1.0.*"
+    },
+    "suggested": {
+        "predis/predis": "1.0.*"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -10,12 +10,11 @@ class EventProcessor {
   private $_queue;
   private $_capacity;
   private $_timeout;
-  private $_socket_failed;
   private $_host;
   private $_port;
   private $_ssl;
 
-  public function __construct($apiKey, $options = []) {
+  public function __construct($apiKey, $options = array()) {
     $this->_apiKey = $apiKey;
     if (!isset($options['base_uri'])) {
         $this->_host = 'app.launchdarkly.com';
@@ -60,7 +59,7 @@ public function enqueue($event) {
 
   protected function flush() {
     if (empty($this->_queue)) {
-      return;
+      return null;
     }
 
     $payload = json_encode($this->_queue);

src/LaunchDarkly/EventProcessor.php

@@ -11,16 +11,22 @@ class FeatureRep {
     protected $_key = null;
     protected $_salt = null;
     protected $_on = false;
-    protected $_variations = [];
 
-    public function __construct($name, $key, $salt, $on = true, $variations = []) {
+    /** @var Variation[] */
+    protected $_variations = array();
+
+    public function __construct($name, $key, $salt, $on = true, $variations = array()) {
         $this->_name = $name;
-        $this->_key  = $key;
+        $this->_key = $key;
         $this->_salt = $salt;
-        $this->_on   = $on;
+        $this->_on = $on;
         $this->_variations = $variations;
     }
 
+    /**
+     * @param $user LDUser
+     * @return mixed
+     */
     public function evaluate($user) {
         if (!$this->_on || !$user) {
             return null;
@@ -29,7 +35,8 @@ public function evaluate($user) {
         $param = $this->_get_param($user);
         if (is_null($param)) {
             return null;
-        } else {
+        }
+        else {
             foreach ($this->_variations as $variation) {
                 if ($variation->matchUser($user)) {
                     return $variation->getValue();
@@ -55,18 +62,23 @@ public function evaluate($user) {
         return null;
     }
 
+    /**
+     * @param $user LDUser
+     * @return float|null
+     */
     private function _get_param($user) {
         $id_hash = null;
         $hash = null;
 
         if ($user->getKey()) {
             $id_hash = $user->getKey();
-        } else {
+        }
+        else {
             return null;
         }
 
         if ($user->getSecondary()) {
-            $id_hash += "." . $user->getSecondary();
+            $id_hash .= "." . $user->getSecondary();
         }
 
         $hash = substr(sha1($this->_key . "." . $this->_salt . "." . $id_hash), 0, 15);

src/LaunchDarkly/FeatureRep.php

@@ -0,0 +1,13 @@
+<?php
+namespace LaunchDarkly;
+
+interface FeatureRequester {
+
+    /**
+     * Gets feature data from a likely cached store
+     *
+     * @param $key string feature key
+     * @return mixed|null The decoded JSON feature data, or null if missing
+     */
+    public function get($key);
+}

src/LaunchDarkly/FeatureRequester.php

@@ -0,0 +1,51 @@
+<?php
+namespace LaunchDarkly;
+
+use GuzzleHttp\Client;
+use \GuzzleHttp\Exception\BadResponseException;
+use \GuzzleHttp\Subscriber\Cache\CacheSubscriber;
+
+class GuzzleFeatureRequester implements FeatureRequester {
+    function __construct($baseUri, $apiKey, $options) {
+        $this->_client = new Client(array(
+                                        'base_url' => $baseUri,
+                                        'defaults' => array(
+                                            'headers' => array(
+                                                'Authorization' => "api_key {$apiKey}",
+                                                'Content-Type' => 'application/json',
+                                                'User-Agent' => 'PHPClient/' . LDClient::VERSION
+                                            ),
+                                            'debug' => false,
+                                            'timeout' => $options['timeout'],
+                                            'connect_timeout' => $options['connect_timeout']
+                                        )
+                                    ));
+
+        if (!isset($options['cache_storage'])) {
+            $csOptions = array('validate' => false);
+        }
+        else {
+            $csOptions = array('storage' => $options['cache_storage'], 'validate' => false);
+        }
+
+        CacheSubscriber::attach($this->_client, $csOptions);
+    }
+
+
+    /**
+     * Gets feature data from a likely cached store
+     *
+     * @param $key string feature key
+     * @return mixed The decoded JSON feature data, or null if missing
+     */
+    public function get($key) {
+        try {
+            $response = $this->_client->get("/api/eval/features/$key");
+            return $response->json();
+        } catch (BadResponseException $e) {
+            $code = $e->getResponse()->getStatusCode();
+            error_log("GuzzleFeatureRetriever::get received an unexpected HTTP status code $code");
+            return null;
+        }
+    }
+}