Merge branch 'master'

Author: arun251

CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to the LaunchDarkly PHP SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
 
+## [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!
+
+### Fixed
+- Documentation comment references the correct namespace for `CacheStorageInterface`. Thanks @pmeth!
+
+## [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
 - Relaxed the requirement on `kevinrob/guzzle-cache-middleware` for the default `GuzzleFeatureRequester`.

VERSION

@@ -1 +1 @@
-2.1.2
+2.3.0

src/LaunchDarkly/EventProcessor.php

@@ -17,7 +17,7 @@ public function __construct($sdkKey, $options = array()) {
     $this->_capacity = $options['capacity'];
     $this->_timeout = $options['timeout'];
 
-    $this->_queue = array(); 
+    $this->_queue = array();
   }
 
   public function __destruct() {
@@ -38,7 +38,11 @@ public function enqueue($event) {
     return true;
   }
 
-  protected function flush() {
+  /**
+   * Publish events to LaunchDarkly
+   * @return bool Whether the events were successfully published
+   */
+  public function flush() {
     if (empty($this->_queue)) {
       return null;
     }

src/LaunchDarkly/LDClient.php

@@ -11,7 +11,7 @@
 class LDClient {
     const DEFAULT_BASE_URI = 'https://app.launchdarkly.com';
     const DEFAULT_EVENTS_URI = 'https://events.launchdarkly.com';
-    const VERSION = '2.1.2';
+    const VERSION = '2.3.0';
 
     /** @var string */
     protected $_sdkKey;
@@ -41,7 +41,7 @@ class LDClient {
      *     - events_uri: Base URI for sending events to LaunchDarkly. Defaults to 'https://events.launchdarkly.com'
      *     - timeout: Float describing the maximum length of a request in seconds. Defaults to 3
      *     - connect_timeout: Float describing the number of seconds to wait while trying to connect to a server. Defaults to 3
-     *     - cache: An optional Kevinrob\GuzzleCache\Strategy\CacheStorageInterface. Defaults to an in-memory cache.
+     *     - cache: An optional Kevinrob\GuzzleCache\Storage\CacheStorageInterface. Defaults to an in-memory cache.
      *     - send_events: An optional bool that can disable the sending of events to LaunchDarkly. Defaults to false.
      *     - logger: An optional Psr\Log\LoggerInterface. Defaults to a Monolog\Logger sending all messages to the php error_log.
      *     - offline: An optional boolean which will disable all network calls and always return the default value. Defaults to false.
@@ -95,7 +95,7 @@ public function __construct($sdkKey, $options = array()) {
 
         $this->_featureRequester = $this->getFeatureRequester($sdkKey, $options);
     }
-    
+
     /**
      * @param string $sdkKey
      * @param mixed[] $options
@@ -106,7 +106,7 @@ private function getFeatureRequester($sdkKey, array $options)
         if (isset($options['feature_requester']) && $options['feature_requester'] instanceof FeatureRequester) {
             return $options['feature_requester'];
         }
-        
+
         if (isset($options['feature_requester_class'])) {
             $featureRequesterClass = $options['feature_requester_class'];
         } else {
@@ -279,6 +279,15 @@ public function secureModeHash($user) {
         return hash_hmac("sha256", $user->getKey(), $this->_sdkKey, false);
     }
 
+    /**
+     * Publish events to LaunchDarkly
+     * @return bool Whether the events were successfully published
+     */
+    public function flush()
+    {
+        return $this->_eventProcessor->flush();
+    }
+
     /**
      * @param $key string
      * @param $user LDUser