Update php-5.3 branch

.gitignore

@@ -4,4 +4,4 @@
 composer.phar
 .vagrant
 integration-tests/vendor
-integration-tests/composer.lock
+composer.lock

CHANGELOG.md

@@ -1,6 +1,74 @@
 # Change log
 
-All notable changes to the LaunchDarkly Java SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
+All notable changes to the LaunchDarkly PHP SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
+
+## [2.4.0] - 2018-01-04
+### Added
+- Support for [private user attributes](https://docs.launchdarkly.com/docs/private-user-attributes).
+
+### Changed
+- Stop retrying HTTP requests if the API key has been invalidated.
+- User bucketing supports integer attributes. Thanks @mlund01!
+- Source code complies with the PSR-2 standard. Thanks @valerianpereira!
+
+## [2.3.0] - 2017-10-06
+### Added
+- New `flush` method forces events to be published to the LaunchDarkly service. This can be useful if `LDClient` is not automatically destroyed at the end of a request. Thanks @foxted!
+
+## [2.2.0] - 2017-06-06
+### Added
+- Support for [publishing events via ld-relay](README.md#using-ld-relay)
+- Allow `EventPublisher` to be injected into the client.
+- `GuzzleEventPublisher` as a synchronous, in-process alternative to publishing events via background processes.
+- Allow the `curl` path used by `CurlEventPublisher` to be customized via the `curl` option to `LDClient`. Thanks @abacaphiliac!
+
+## [2.1.2] - 2017-04-27
+### Changed
+- Added package suggestions in `composer.json`.
+
+### Fixed
+- Better handling of possibly null variations. Thanks @idirouhab!
+
+## [2.1.1] - 2017-04-11
+### Changed
+- Better handling of possibly null targets. Thanks @idirouhab!
+- Better handling of possibly null rules.
+
+## [2.1.0] - 2017-03-23
+### Changed
+- Allow FeatureRequester to be injected into the client. Thanks @abacaphiliac!
+- Allow Predis\Client to be overriden in LDDFeatureRequester. Thanks @abacaphiliac!
+- Use logger interface method instead of Monolog method. Thanks @abacaphiliac!
+- Improve type hinting for default. Thanks @jdrieghe!
+
+## [2.0.7] - 2017-03-03
+### Changed
+- Removed warning when calling `allFlags` via `LDDFeatureRequester`
+- Removed warning when a feature flag's prerequisites happen to be null
+
+## [2.0.6] - 2017-02-07
+### Changed
+- Use minimum versions in composer.json
+
+## [2.0.5] - 2017-02-03
+### Changed
+- Made Monolog dependency version less strict
+
+## [2.0.4] - 2017-01-26
+### Changed
+- Made Composer requirements less strict
+
+## [2.0.3] - 2017-01-05
+### Changed
+- Fixed botched 2.0.2 release: Better handling of null vs false when evaluating.
+
+## [2.0.2] - 2017-01-04
+### Changed
+- Better handling of null vs false when evaluating.
+
+## [2.0.1] - 2016-11-09
+### Added
+- Monolog is now a required dependency
 
 ## [2.0.0] - 2016-08-08
 ### Added
@@ -15,4 +83,4 @@ All notable changes to the LaunchDarkly Java SDK will be documented in this file
 - The `toggle` call has been deprecated in favor of `variation`.
 
 ### Removed
-- The `getFlag` function has been removed.
+- The `getFlag` function has been removed.

CONTRIBUTING.md

@@ -7,4 +7,4 @@ We encourage pull-requests and other contributions from the community. We've als
 This can help with getting php 5.3 on your mac: https://github.com/Homebrew/homebrew-php
 
 To see composer dependency graph: 
-`php composer.phar show -i -t`
+`php composer.phar show -i -t`

README.md

@@ -5,20 +5,23 @@ LaunchDarkly SDK for PHP
 
 [![Circle CI](https://circleci.com/gh/launchdarkly/php-client.svg?style=svg)](https://circleci.com/gh/launchdarkly/php-client)
 
+Requirements
+------------
+1. PHP 5.3 or higher. 
+
 Quick setup
 -----------
 
-0. Install the PHP SDK with [Composer](https://getcomposer.org/)
+1. Install the PHP SDK and monolog for logging with [Composer](https://getcomposer.org/)
 
         php composer.phar require launchdarkly/launchdarkly-php
-        php composer.phar require "guzzlehttp/guzzle:6.2.1"
-        php composer.phar require "kevinrob/guzzle-cache-middleware": "1.4.1"
+        php composer.phar require "guzzle/guzzle:dev-master#ecb935d2d0ecd8cddae4dcfb90515cac5e2cb023"
 
 1. After installing, require Composer's autoloader:
 
 		require 'vendor/autoload.php';
 
-2. Create a new LDClient with your SDK key:
+1. Create a new LDClient with your SDK key:
 
         $client = new LaunchDarkly\LDClient("your_sdk_key");
 
@@ -39,42 +42,66 @@ Your first feature flag
 Fetching flags
 --------------
 
-There are two approaches to fetching the flag rules from LaunchDarkly:
+There are two distinct methods of integrating LaunchDarkly in a PHP environment.  
+
+* [Guzzle](https://github.com/launchdarkly/guzzle3) with its [cache plugin](https://github.com/launchdarkly/guzzle3/blob/master/docs/plugins/cache-plugin.rst) to request and cache HTTP responses in an in-memory array (default) -- note, this is a forked older version of Guzzle for PHP 5.3 compatibility
+* [ld-relay](https://github.com/launchdarkly/ld-relay) to retrieve and store flags in Redis (recommended)
 
-* Making HTTP requests (using Guzzle)
-* Setting up the [ld-daemon](https://github.com/launchdarkly/ld-daemon) to store the flags in Redis
+We strongly recommend using the ld-relay.  Per-flag caching (Guzzle method) is only intended for low-throughput environments.
 
 Using Guzzle
 ============
 
-To use Guzzle it must be required as a dependency:
+Require Guzzle as a dependency:
 
-    php composer.phar require "guzzlehttp/guzzle:6.2.1"
-    php composer.phar require "kevinrob/guzzle-cache-middleware": "1.4.1"
+    php composer.phar require "guzzle/guzzle:dev-master#ecb935d2d0ecd8cddae4dcfb90515cac5e2cb023"
 
 It will then be used as the default way of fetching flags.
 
-Using Redis
-===========
+With Guzzle, you could persist your cache somewhere other than the default in-memory store, like Memcached or Redis.  You could then specify your cache when initializing the client with the [cache option](https://github.com/launchdarkly/php-client/blob/master/src/LaunchDarkly/LDClient.php#L44).
 
-1. Require Predis as a dependency:
+    $client = new LaunchDarkly\LDClient("YOUR_SDK_KEY", array("cache_storage" => $cacheStorage));
 
-    php composer.phar require "predis/predis:1.0.*"
+Using LD-Relay
+==============
 
-2. Create the LDClient with the Redis feature requester as an option:
+The LaunchDarkly Relay Proxy ([ld-relay](https://github.com/launchdarkly/ld-relay)) consumes the LaunchDarkly streaming API and can update
+a Redis cache operating in your production environment. The ld-relay offers many benefits such as performance and feature flag consistency. With PHP applications, we strongly recommend setting up ld-relay with a Redis store.
 
-    $client = new LaunchDarkly\LDClient("your_sdk_key", ['feature_requester_class' => 'LaunchDarkly\LDDFeatureRequester']);
+1. Set up ld-relay in [daemon-mode](https://github.com/launchdarkly/ld-relay#redis-storage-and-daemon-mode) with Redis
 
-Learn more
------------
+2. Require Predis as a dependency:
 
-Check out our [documentation](http://docs.launchdarkly.com) for in-depth instructions on configuring and using LaunchDarkly. You can also head straight to the [complete reference guide for this SDK](http://docs.launchdarkly.com/docs/php-sdk-reference).
+        php composer.phar require "predis/predis:1.0.*"
+
+3. Create the LDClient with the Redis feature requester as an option:
+
+        $client = new LaunchDarkly\LDClient("your_sdk_key", [
+            'feature_requester_class' => 'LaunchDarkly\LDDFeatureRequester',
+            'redis_host' => 'your.redis.host',
+            'redis_port' => 6379
+        ]);
+
+4. If ld-relay is configured for [event forwarding](https://github.com/launchdarkly/ld-relay#event-forwarding), you can configure the LDClient to publish events to ld-relay instead of directly to `events.launchdarkly.com`. Using `GuzzleEventPublisher` with ld-relay event forwarding can be an efficient alternative to the default `curl`-based event publishing.
+
+        $client = new LaunchDarkly\LDClient("your_sdk_key", [
+            'event_publisher_class' => 'LaunchDarkly\GuzzleEventPublisher',
+            'events_uri' => 'http://your-ldrelay-host:8030',
+            'feature_requester_class' => 'LaunchDarkly\LDDFeatureRequester',
+            'redis_host' => 'your.redis.host',
+            'redis_port' => 6379
+        ]);
 
 Testing
 -------
 
 We run integration tests for all our SDKs using a centralized test harness. This approach gives us the ability to test for consistency across SDKs, as well as test networking behavior in a long-running application. These tests cover each method in the SDK, and verify that event sending, flag evaluation, stream reconnection, and other aspects of the SDK all behave correctly.
 
+Learn more
+-----------
+
+Check out our [documentation](http://docs.launchdarkly.com) for in-depth instructions on configuring and using LaunchDarkly. You can also head straight to the [complete reference guide for this SDK](http://docs.launchdarkly.com/docs/php-sdk-reference).
+
 Contributing
 ------------
 
@@ -90,19 +117,19 @@ About LaunchDarkly
     * 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")
-    * [.NET] (http://docs.launchdarkly.com/docs/dotnet-sdk-reference "LaunchDarkly .Net SDK")
-    * [Ruby] (http://docs.launchdarkly.com/docs/ruby-sdk-reference "LaunchDarkly Ruby SDK")
-    * [Python Twisted] (http://docs.launchdarkly.com/docs/python-twisted "LaunchDarkly Python Twisted 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")
+    * [Python Twisted](http://docs.launchdarkly.com/docs/python-twisted-sdk-reference "LaunchDarkly Python Twisted 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")
+    * [.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")
 * Explore LaunchDarkly
-    * [www.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](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
+    * [Feature Flagging Guide](https://github.com/launchdarkly/featureflags/  "Feature Flagging Guide") for best practices and strategies

VERSION

@@ -1 +1 @@
-2.0.0
+2.4.0

circle.yml

@@ -1,10 +1,15 @@
 machine:
   php:
     version: 5.3.25
+  services:
+      - redis
+      - docker
 
 test:
   override:
     # syntax check php files
     - find ./src -name "*.php" -type f -print0 | xargs -0 -I {} php -l {}
     - find ./tests -name "*.php" -type f -print0 | xargs -0 -I {} php -l {}
-    - vendor/bin/phpunit tests
+
+    - vendor/bin/phpunit tests --coverage-text
+    - vendor/bin/phpunit integration-tests/LDDFeatureRequesterTest.php

composer.json

@@ -20,20 +20,20 @@
         }
     ],
     "require": {
+        "monolog/monolog": "^1.6",
         "php": "~5.3",
-        "guzzle/guzzle": "dev-master#ecb935d2d0ecd8cddae4dcfb90515cac5e2cb023",
-        "psr/log": "1.0.0",
+        "psr/log": "^1.0",
         "justinrainbow/json-schema": "v1.6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.8.26",
-        "phpdocumentor/phpdocumentor": "2.*",
-        "predis/predis": "1.0.*",
-        "zendframework/zend-serializer": "2.4.*"
+        "guzzle/guzzle": "dev-master#ecb935d2d0ecd8cddae4dcfb90515cac5e2cb023",
+        "phpunit/phpunit": ">=4.8.26 <5.0",
+        "phpdocumentor/phpdocumentor": "^2.0",
+        "predis/predis": "^1.0"
     },
     "suggested": {
-        "monolog/monolog": "1.21.0",
-        "predis/predis": "1.0.*"
+        "guzzle/guzzle": "(^dev-master#ecb935d2d0ecd8cddae4dcfb90515cac5e2cb023) Required when using GuzzleEventPublisher or the default FeatureRequester",
+        "predis/predis": "(^1.0) Required when using LDDFeatureRequester"
     },
     "autoload": {
         "psr-4": {