Minor cleanup and consistency changes (#79)

Author: keelerm84

src/LaunchDarkly/FeatureFlagsState.php

@@ -27,7 +27,7 @@ class FeatureFlagsState implements \JsonSerializable
     /**
      * @ignore
      */
-    public function __construct(bool $valid, array $flagValues = array(), array $flagMetadata = array())
+    public function __construct(bool $valid)
     {
         $this->_valid = $valid;
         $this->_flagValues = array();

src/LaunchDarkly/Impl/Events/EventProcessor.php

@@ -24,16 +24,12 @@ class EventProcessor
     /** @var int */
     private $_capacity;
 
-    /** @var int */
-    private $_timeout;
-
     public function __construct(string $sdkKey, array $options = array())
     {
         $this->_eventPublisher = $this->getEventPublisher($sdkKey, $options);
         $this->_eventSerializer = new EventSerializer($options);
 
         $this->_capacity = $options['capacity'];
-        $this->_timeout = $options['timeout'];
     }
 
     public function __destruct()
@@ -55,7 +51,7 @@ public function enqueue(array $event): bool
             return false;
         }
 
-        array_push($this->_queue, $event);
+        $this->_queue[] = $event;
 
         return true;
     }

src/LaunchDarkly/Impl/Events/EventSerializer.php

@@ -27,7 +27,7 @@ public function serializeEvents(array $events): string
     {
         $filtered = array();
         foreach ($events as $e) {
-            array_push($filtered, $this->filterEvent($e));
+            $filtered[] = $this->filterEvent($e);
         }
         $ret = json_encode($filtered);
         if ($ret === false) {
@@ -54,9 +54,9 @@ private function filterAttrs(array $attrs, array &$json, ?array $userPrivateAttr
         foreach ($attrs as $key => $value) {
             if ($value != null) {
                 if ($this->_allAttrsPrivate ||
-                    (!is_null($userPrivateAttrs) && array_search($key, $userPrivateAttrs) !== false) ||
-                    array_search($key, $this->_privateAttrNames) !== false) {
-                    $allPrivateAttrs[$key] = true;
+                    (!is_null($userPrivateAttrs) && in_array($key, $userPrivateAttrs)) ||
+                    in_array($key, $this->_privateAttrNames)) {
+                    $allPrivateAttrs[] = $key;
                 } else {
                     $json[$key] = $stringify ? strval($value) : $value;
                 }
@@ -93,9 +93,8 @@ private function serializeUser(LDUser $user): array
             }
         }
         if (count($allPrivateAttrs)) {
-            $pa = array_keys($allPrivateAttrs);
-            sort($pa);
-            $json['privateAttrs'] = $pa;
+            sort($allPrivateAttrs);
+            $json['privateAttrs'] = $allPrivateAttrs;
         }
         return $json;
     }

src/LaunchDarkly/Impl/Model/FeatureFlag.php

@@ -188,7 +188,7 @@ private function checkPrerequisites(LDUser $user, FeatureRequester $featureReque
                         if (!$prereqFeatureFlag->isOn() || $prereqEvalResult->getVariationIndex() !== $variation) {
                             $prereqOk = false;
                         }
-                        array_push($events, $eventFactory->newEvalEvent($prereqFeatureFlag, $user, $prereqEvalResult, null, $this));
+                        $events[] = $eventFactory->newEvalEvent($prereqFeatureFlag, $user, $prereqEvalResult, null, $this);
                     }
                 } catch (\Exception $e) {
                     $prereqOk = false;

src/LaunchDarkly/LDUserBuilder.php

@@ -75,7 +75,7 @@ public function secondary(?string $secondary): LDUserBuilder
      */
     public function privateSecondary(?string $secondary): LDUserBuilder
     {
-        array_push($this->_privateAttributeNames, 'secondary');
+        $this->_privateAttributeNames[] = 'secondary';
         return $this->secondary($secondary);
     }
 
@@ -97,7 +97,7 @@ public function ip(?string $ip): LDUserBuilder
      */
     public function privateIp(?string $ip): LDUserBuilder
     {
-        array_push($this->_privateAttributeNames, 'ip');
+        $this->_privateAttributeNames[] = 'ip';
         return $this->ip($ip);
     }
 
@@ -123,7 +123,7 @@ public function country(?string $country): LDUserBuilder
      */
     public function privateCountry(?string $country): LDUserBuilder
     {
-        array_push($this->_privateAttributeNames, 'country');
+        $this->_privateAttributeNames[] = 'country';
         return $this->country($country);
     }
 
@@ -145,7 +145,7 @@ public function email(?string $email): LDUserBuilder
      */
     public function privateEmail(?string $email): LDUserBuilder
     {
-        array_push($this->_privateAttributeNames, 'email');
+        $this->_privateAttributeNames[] = 'email';
         return $this->email($email);
     }
 
@@ -167,7 +167,7 @@ public function name(?string $name): LDUserBuilder
      */
     public function privateName(?string $name): LDUserBuilder
     {
-        array_push($this->_privateAttributeNames, 'name');
+        $this->_privateAttributeNames[] = 'name';
         return $this->name($name);
     }
 
@@ -189,7 +189,7 @@ public function avatar(?string $avatar)
      */
     public function privateAvatar(?string $avatar): LDUserBuilder
     {
-        array_push($this->_privateAttributeNames, 'avatar');
+        $this->_privateAttributeNames[] = 'avatar';
         return $this->avatar($avatar);
     }
 
@@ -211,7 +211,7 @@ public function firstName(?string $firstName): LDUserBuilder
      */
     public function privateFirstName(?string $firstName): LDUserBuilder
     {
-        array_push($this->_privateAttributeNames, 'firstName');
+        $this->_privateAttributeNames[] = 'firstName';
         return $this->firstName($firstName);
     }
 
@@ -233,7 +233,7 @@ public function lastName(?string $lastName): LDUserBuilder
      */
     public function privateLastName(?string $lastName): LDUserBuilder
     {
-        array_push($this->_privateAttributeNames, 'lastName');
+        $this->_privateAttributeNames[] = 'lastName';
         return $this->lastName($lastName);
     }
 
@@ -284,7 +284,7 @@ public function customAttribute(string $customKey, $customValue): LDUserBuilder
      */
     public function privateCustomAttribute(string $customKey, $customValue): LDUserBuilder
     {
-        array_push($this->_privateAttributeNames, $customKey);
+        $this->_privateAttributeNames[] = $customKey;
         return $this->customAttribute($customKey, $customValue);
     }
 

tests/LDClientTest.php

@@ -675,13 +675,4 @@ public function testLoggerInterfaceWarn()
 
         $client->variation('MyFeature', $user);
     }
-
-    private function getPrivateField(&$object, $fieldName)
-    {
-        $reflection = new \ReflectionClass(get_class($object));
-        $field = $reflection->getProperty($fieldName);
-        $field->setAccessible(true);
-
-        return $field->getValue($object);
-    }
 }