Merge pull request #9 from launchdarkly/jko/fix-user-target

Fix two bugs in user targets

Author: jkodumal

src/LaunchDarkly/LDClient.php

@@ -212,7 +212,7 @@ protected static function _decode($json, $user) {
             $ts = empty($v['targets']) ? [] : $v['targets'];
             $targets = array_map($makeTarget, $ts);
             if (isset($v['userTarget'])) {
-                return new Variation($v['value'], $v['weight'], $targets, $v['userTarget']);
+                return new Variation($v['value'], $v['weight'], $targets, $makeTarget($v['userTarget']));
             }
             else {
                 return new Variation($v['value'], $v['weight'], $targets, null);

src/LaunchDarkly/TargetRule.php

@@ -15,6 +15,10 @@ public function __construct($attribute, $operator, $values) {
         $this->_values    = $values;
     }
 
+    public function isKey() {
+        return $this->_attribute == "key";
+    }
+
 
     public function matchTarget($user) {
         $u_value = null;

src/LaunchDarkly/Variation.php

@@ -27,7 +27,7 @@ public function matchUser($user) {
 
     public function matchTarget($user) {
         foreach($this->_targets as $target) {
-            if ($this->_userTarget != null && $target->_attribute == "key") {
+            if ($this->_userTarget != null && $target->isKey()) {
                 continue;
             }
             if ($target->matchTarget($user)) {