fix custom attribute validation for old users

Author: eli-darkly

src/LaunchDarkly/LDClient.php

@@ -296,7 +296,7 @@ public function isOffline(): bool
 
     /**
      * Tracks that an application-defined event occurred.
-     * 
+     *
      * This method creates a "custom" analytics event containing the specified event name (key)
      * and context properties. You may attach arbitrary data or a metric value to the event with the
      * optional `data` and `metricValue` parameters.

src/LaunchDarkly/LDContext.php

@@ -6,6 +6,25 @@
 
 use LaunchDarkly\Types\AttributeReference;
 
+function isAllowableUserCustomAttr(string $name): bool
+{
+    switch ($name) {
+        case 'anonymous':
+        case 'avatar':
+        case 'country':
+        case 'email':
+        case 'firstName':
+        case 'ip':
+        case 'key':
+        case 'kind':
+        case 'lastName':
+        case 'name':
+            return false;
+        default:
+            return true;
+    }
+}
+
 /**
  * A collection of attributes that can be referenced in flag evaluations and analytics events.
  * This entity is also called an "evaluation context."
@@ -220,7 +239,9 @@ public static function fromUser(LDUser $user): LDContext
                 $attrs = [];
             }
             foreach ($userCustom as $k => $v) {
-                $attrs[$k] = $v;
+                if (isAllowableUserCustomAttr($k)) {
+                    $attrs[$k] = $v;
+                }
             }
         }
         $privateAttrs = null;
@@ -810,9 +831,6 @@ private static function decodeJsonSingleKind(array $o, ?string $kind): LDContext
 
     private static function decodeJsonOldUser(array $o, bool $wasParsedAsArray): LDContext
     {
-        $j = json_encode($o);
-        file_put_contents('php://stderr', "decodeJsonOldUser($j, $wasParsedAsArray)\n", FILE_APPEND);
-
         $b = self::builder('');
         $key = null;
         foreach ($o as $k => $v) {
@@ -826,7 +844,9 @@ private static function decodeJsonOldUser(array $o, bool $wasParsedAsArray): LDC
                             throw self::parsingBadTypeError($k);
                         }
                         foreach ((array)$v as $k1 => $v1) {
-                            $b->set($k1, $v1);
+                            if (!isAllowableUserCustomAttr($k1)) {
+                                $b->set($k1, $v1);
+                            }
                         }
                     }
                     break;

tests/LDContextTest.php

@@ -378,6 +378,17 @@ public function testContextFromUser()
             ->private("c2")
             ->build();
         self::assertContextsEqual($c2Expected, $c2);
+
+        // make sure custom attrs can't override built-in ones
+        $u3 = (new LDUserBuilder("key"))
+            ->email("good")
+            ->custom(["email" => "bad"])
+            ->build();
+        $c3 = LDContext::fromUser($u3);
+        $c3Expected = LDContext::builder($u3->getKey())
+            ->set("email", "good")
+            ->build();
+        self::assertContextsEqual($c3Expected, $c3);
     }
 
     private static function assertContextValid($c)