Merge pull request #22 from launchdarkly/eb/fix-event-properties

fix Redis key for segments + event properties for invalid user

Author: eli-darkly

src/LaunchDarkly/LDClient.php

@@ -148,12 +148,7 @@ public function variation($key, $user, $default = false)
         }
 
         try {
-            if (is_null($user) || is_null($user->getKey())) {
-                $this->_sendFlagRequestEvent($key, $user, null, $default, $default);
-                $this->_logger->warning("Variation called with null user or null user key! Returning default value");
-                return $default;
-            }
-            if ($user->isKeyBlank()) {
+            if (!is_null($user) && $user->isKeyBlank()) {
                 $this->_logger->warning("User key is blank. Flag evaluation will proceed, but the user will not be stored in LaunchDarkly.");
             }
             try {
@@ -167,6 +162,11 @@ public function variation($key, $user, $default = false)
                 $this->_sendFlagRequestEvent($key, $user, null, $default, $default);
                 return $default;
             }
+            if (is_null($user) || is_null($user->getKey())) {
+                $this->_sendFlagRequestEvent($key, $user, null, $default, $default, $flag->getVersion());
+                $this->_logger->warning("Variation called with null user or null user key! Returning default value");
+                return $default;
+            }
             $evalResult = $flag->evaluate($user, $this->_featureRequester);
             if (!$this->isOffline() && $this->_send_events) {
                 foreach ($evalResult->getPrerequisiteEvents() as $e) {

src/LaunchDarkly/LDDFeatureRequester.php

@@ -98,7 +98,7 @@ public function getSegment($key)
         $raw = $this->get_from_cache($this->_segments_key, $key);
         if ($raw === null) {
             $redis = $this->get_connection();
-            $raw = $redis->hget($this->_features_key, $key);
+            $raw = $redis->hget($this->_segments_key, $key);
             if ($raw) {
                 $this->store_in_cache($this->_segments_key, $key, $raw);
             }