Merge branch 'master' into experiment

# Conflicts:
#	src/LaunchDarkly/LDClient.php

Author: eli-darkly

.circleci/config.yml

@@ -84,7 +84,7 @@ jobs:
             sudo apt-get -q update &&
             sudo apt-cache policy docker-ce &&
             sudo apt-get -qy install docker-ce
-      - run: sudo apt-get -qy install redis-server
+      - run: sudo apt-get -qy install redis-server curl
       - checkout
       - run:
           name: validate composer.json
@@ -109,6 +109,13 @@ jobs:
           name: start Consul
           command: ./consul agent -dev
           background: true
+      - run:
+          name: wait on Consul
+          command: |
+            until $(curl --output /dev/null --silent --fail --request PUT --data 'test' http://localhost:8500/v1/kv/initchecker); do
+                echo 'still waiting on Consul...'; sleep 2;
+            done
+          timeout: 50
       - run:
           name: run tests
           command: vendor/bin/phpunit --log-junit ~/phpunit/junit.xml --coverage-text tests

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,37 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is this a support request?**
+This issue tracker is maintained by LaunchDarkly SDK developers and is intended for feedback on the SDK code. If you're not sure whether the problem you are having is specifically related to the SDK, or to the LaunchDarkly service overall, it may be more appropriate to contact the LaunchDarkly support team; they can help to investigate the problem and will consult the SDK team if necessary. You can submit a support request by going [here](https://support.launchdarkly.com/) and clicking "submit a request", or by emailing [email protected].
+
+Note that issues filed on this issue tracker are publicly accessible. Do not provide any private account information on your issues. If your problem is specific to your account, you should submit a support request as described above.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To reproduce**
+Steps to reproduce the behavior.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Logs**
+If applicable, add any log output related to your problem.
+
+**SDK version**
+The version of this SDK that you are using.
+
+**Language version, developer tools**
+For instance, Go 1.11 or Ruby 2.5.3. If you are using a language that requires a separate compiler, such as C, please include the name and version of the compiler too.
+
+**OS/platform**
+For instance, Ubuntu 16.04, Windows 10, or Android 4.0.3. If your code is running in a browser, please also include the browser type and version.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I would love to see the SDK [...does something new...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context about the feature request here.

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to the LaunchDarkly PHP SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
 
+## [3.5.2] - 2019-04-11
+### Fixed:
+- In the 3.5.1 release, the `VERSION` constant was incorrectly still reporting the version as "3.5.0". The constant is now correct. There are no other changes in this release.
+
+
+## [3.5.1] - 2019-04-03
+### Fixed:
+- Setting user attributes to non-string values when a string was expected would cause analytics events not to be processed. The SDK will now convert attribute values to strings as needed.
+- If `track` or `identify` is called without a user, the SDK now logs a warning, and does not send an analytics event to LaunchDarkly (since it would not be processed without a user).
+
 ## [3.5.0] - 2019-01-30
 ### Added:
 - It is now possible to use Consul or DynamoDB as a data store with `ld-relay`, similar to the existing Redis integration. See `LaunchDarkly\Integrations\Consul` and `LaunchDarkly\Integrations\DynamoDb`, and the reference guide [Using a persistent feature store](https://docs.launchdarkly.com/v2.0/docs/using-a-persistent-feature-store).

README.md

@@ -152,21 +152,10 @@ About LaunchDarkly
     * Gradually roll out a feature to an increasing percentage of users, and track the effect that the feature has on key metrics (for instance, how likely is a user to complete a purchase if they have feature A versus feature B?).
     * Turn off a feature that you realize is causing performance problems in production, without needing to re-deploy, or even restart the application with a changed configuration file.
     * Grant access to certain features based on user attributes, like payment plan (eg: users on the ‘gold’ plan get access to more features than users in the ‘silver’ plan). Disable parts of your application to facilitate maintenance, without taking everything offline.
-* LaunchDarkly provides feature flag SDKs for
-    * [Java](http://docs.launchdarkly.com/docs/java-sdk-reference "Java SDK")
-    * [JavaScript](http://docs.launchdarkly.com/docs/js-sdk-reference "LaunchDarkly JavaScript SDK")
-    * [PHP](http://docs.launchdarkly.com/docs/php-sdk-reference "LaunchDarkly PHP SDK")
-    * [Python](http://docs.launchdarkly.com/docs/python-sdk-reference "LaunchDarkly Python SDK")
-    * [Go](http://docs.launchdarkly.com/docs/go-sdk-reference "LaunchDarkly Go SDK")
-    * [Node.JS](http://docs.launchdarkly.com/docs/node-sdk-reference "LaunchDarkly Node SDK")
-    * [Electron](http://docs.launchdarkly.com/docs/electron-sdk-reference "LaunchDarkly Electron SDK")
-    * [.NET](http://docs.launchdarkly.com/docs/dotnet-sdk-reference "LaunchDarkly .Net SDK")
-    * [Ruby](http://docs.launchdarkly.com/docs/ruby-sdk-reference "LaunchDarkly Ruby SDK")
-    * [iOS](http://docs.launchdarkly.com/docs/ios-sdk-reference "LaunchDarkly iOS SDK")
-    * [Android](http://docs.launchdarkly.com/docs/android-sdk-reference "LaunchDarkly Android SDK")
+* LaunchDarkly provides feature flag SDKs for a wide variety of languages and technologies. Check out [our documentation](https://docs.launchdarkly.com/docs) for a complete list.
 * Explore LaunchDarkly
-    * [launchdarkly.com](http://www.launchdarkly.com/ "LaunchDarkly Main Website") for more information
-    * [docs.launchdarkly.com](http://docs.launchdarkly.com/  "LaunchDarkly Documentation") for our documentation and SDKs
-    * [apidocs.launchdarkly.com](http://apidocs.launchdarkly.com/  "LaunchDarkly API Documentation") for our API documentation
-    * [blog.launchdarkly.com](http://blog.launchdarkly.com/  "LaunchDarkly Blog Documentation") for the latest product updates
+    * [launchdarkly.com](https://www.launchdarkly.com/ "LaunchDarkly Main Website") for more information
+    * [docs.launchdarkly.com](https://docs.launchdarkly.com/  "LaunchDarkly Documentation") for our documentation and SDK reference guides
+    * [apidocs.launchdarkly.com](https://apidocs.launchdarkly.com/  "LaunchDarkly API Documentation") for our API documentation
+    * [blog.launchdarkly.com](https://blog.launchdarkly.com/  "LaunchDarkly Blog Documentation") for the latest product updates
     * [Feature Flagging Guide](https://github.com/launchdarkly/featureflags/  "Feature Flagging Guide") for best practices and strategies

VERSION

@@ -1 +1 @@
-3.5.0
+3.5.2

scripts/release.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# This script updates the version in the client code. It does not need to do anything else to release
+# a new version, because Packagist will pick up the new version automatically by watching our public
+# repository.
+
+# It takes exactly one argument: the new version.
+# It should be run from the root of this git repo like this:
+#   ./scripts/release.sh 4.0.9
+
+# When done you should commit and push the changes made.
+
+set -uxe
+echo "Starting php-client release (version update only)"
+
+VERSION=$1
+
+echo $VERSION >./VERSION
+
+# Update version in LDClient class
+LDCLIENT_PHP=src/LaunchDarkly/LDClient.php
+LDCLIENT_PHP_TEMP=./LDClient.php.tmp
+sed "s/const VERSION = '.*'/const VERSION = '${VERSION}'/g" $LDCLIENT_PHP > $LDCLIENT_PHP_TEMP
+mv $LDCLIENT_PHP_TEMP $LDCLIENT_PHP
+
+echo "Done with php-client release (version update only)"

src/LaunchDarkly/EventSerializer.php

@@ -37,7 +37,7 @@ private function filterEvent($e)
         return $ret;
     }
 
-    private function filterAttrs($attrs, &$json, $userPrivateAttrs, &$allPrivateAttrs)
+    private function filterAttrs($attrs, &$json, $userPrivateAttrs, &$allPrivateAttrs, $stringify)
     {
         foreach ($attrs as $key => $value) {
             if ($value != null) {
@@ -46,15 +46,15 @@ private function filterAttrs($attrs, &$json, $userPrivateAttrs, &$allPrivateAttr
                     array_search($key, $this->_privateAttrNames) !== false) {
                     $allPrivateAttrs[$key] = true;
                 } else {
-                    $json[$key] = $value;
+                    $json[$key] = $stringify ? strval($value) : $value;
                 }
             }
         }
     }
 
     private function serializeUser($user)
     {
-        $json = array("key" => $user->getKey());
+        $json = array("key" => strval($user->getKey()));
         $userPrivateAttrs = $user->getPrivateAttributeNames();
         $allPrivateAttrs = array();
 
@@ -66,13 +66,15 @@ private function serializeUser($user)
             'name' => $user->getName(),
             'avatar' => $user->getAvatar(),
             'firstName' => $user->getFirstName(),
-            'lastName' => $user->getLastName(),
-            'anonymous' => $user->getAnonymous()
+            'lastName' => $user->getLastName()
         );
-        $this->filterAttrs($attrs, $json, $userPrivateAttrs, $allPrivateAttrs);
+        $this->filterAttrs($attrs, $json, $userPrivateAttrs, $allPrivateAttrs, true);
+        if ($user->getAnonymous()) {
+            $json['anonymous'] = true;
+        }
         if (!empty($user->getCustom())) {
             $customs = array();
-            $this->filterAttrs($user->getCustom(), $customs, $userPrivateAttrs, $allPrivateAttrs);
+            $this->filterAttrs($user->getCustom(), $customs, $userPrivateAttrs, $allPrivateAttrs, false);
             if ($customs) { // if this is empty, we will return a json array for 'custom' instead of an object
                 $json['custom'] = $customs;
             }

src/LaunchDarkly/Impl/EventFactory.php

@@ -88,7 +88,7 @@ public function newIdentifyEvent($user)
         return array(
             'kind' => 'identify',
             'creationDate' => Util::currentTimeUnixMillis(),
-            'key' => $user->getKey(),
+            'key' => strval($user->getKey()),
             'user' => $user
         );
     }

src/LaunchDarkly/LDClient.php

@@ -14,7 +14,7 @@ class LDClient
 {
     const DEFAULT_BASE_URI = 'https://app.launchdarkly.com';
     const DEFAULT_EVENTS_URI = 'https://events.launchdarkly.com';
-    const VERSION = '3.5.0';
+    const VERSION = '3.5.2';
 
     /** @var string */
     protected $_sdkKey;
@@ -280,6 +280,7 @@ public function track($eventName, $user, $data)
         }
         if (is_null($user) || $user->isKeyBlank()) {
             $this->_logger->warning("Track called with null user or null/empty user key!");
+            return;
         }
         $this->_eventProcessor->enqueue($this->_eventFactoryDefault->newCustomEvent($eventName, $user, $data));
     }
@@ -294,6 +295,7 @@ public function identify($user)
         }
         if (is_null($user) || $user->isKeyBlank()) {
             $this->_logger->warning("Track called with null user or null/empty user key!");
+            return;
         }
         $this->_eventProcessor->enqueue($this->_eventFactoryDefault->newIdentifyEvent($user));
     }