add better check for blank user key

Author: Dan Richelson

src/LaunchDarkly/LDClient.php

@@ -116,7 +116,7 @@ public function variation($key, $user, $default = false) {
                 $this->_logger->warn("Variation called with null user or null user key! Returning default value");
                 return $default;
             }
-            if (strlen($user->getKey()) === 0) {
+            if ($user->isKeyBlank()) {
                 $this->_logger->warn("User key is blank. Flag evaluation will proceed, but the user will not be stored in LaunchDarkly.");
             }
             $flag = $this->_featureRequester->get($key);
@@ -177,7 +177,7 @@ public function track($eventName, $user, $data) {
         if ($this->isOffline()) {
             return;
         }
-        if (is_null($user) || strlen($user->getKey()) === 0) {
+        if (is_null($user) || $user->isKeyBlank()) {
             $this->_logger->warn("Track called with null user or null/empty user key!");
         }
 
@@ -199,7 +199,7 @@ public function identify($user) {
         if ($this->isOffline()) {
             return;
         }
-        if (is_null($user) || strlen($user->getKey()) === 0) {
+        if (is_null($user) || $user->isKeyBlank()) {
             $this->_logger->warn("Track called with null user or null/empty user key!");
         }
 

src/LaunchDarkly/LDUser.php

@@ -33,7 +33,9 @@ class LDUser {
      * @param array|null $custom Other custom attributes that can be used to create custom rules
      */
     public function __construct($key, $secondary = null, $ip = null, $country = null, $email = null, $name = null, $avatar = null, $firstName = null, $lastName = null, $anonymous = null, $custom = array()) {
-        $this->_key = strval($key);
+        if ($key !== null) {
+            $this->_key = strval($key);
+        }
         $this->_secondary = $secondary;
         $this->_ip = $ip;
         $this->_country = $country;
@@ -92,6 +94,9 @@ public function getIP() {
         return $this->_ip;
     }
 
+    /**
+     * @return null|string
+     */
     public function getKey() {
         return $this->_key;
     }
@@ -124,6 +129,10 @@ public function getAnonymous() {
         return $this->_anonymous;
     }
 
+    public function isKeyBlank() {
+        return isset($this->_key) && empty($this->_key);
+    }
+
     public function toJSON() {
         $json = array("key" => $this->_key);
 

tests/LDUserTest.php

@@ -100,5 +100,20 @@ public function testLDUserAnonymous() {
         $this->assertEquals(true, $json['anonymous']);
 
     }
+
+    public function testLDUserBlankKey() {
+        $builder = new LDUserBuilder("");
+        $user = $builder->build();
+        $this->assertTrue($user->isKeyBlank());
+
+        $builder = new LDUserBuilder("key");
+        $user = $builder->build();
+        $this->assertFalse($user->isKeyBlank());
+
+        $builder = new LDUserBuilder(null);
+        $user = $builder->build();
+        $this->assertFalse($user->isKeyBlank());
+
+    }
 }