Merge branch 'master'

Author: arun251

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 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!
+
+### Fixed
+- The PSR-4 autoloading specification is now correct. Thanks @jenssegers!
+
 ## [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!

VERSION

@@ -1 +1 @@
-2.3.0
+2.4.0

circle.yml

@@ -28,3 +28,4 @@ test:
 
     - docker run -it -v `pwd`:/php-client nyanpass/php5.5:5.5-alpine sh -c "curl -s https://getcomposer.org/installer | php && cd /php-client && /composer.phar update && vendor/bin/phpunit"
     - docker run -it -v `pwd`:/php-client nyanpass/php5.5:5.5-alpine sh -c "curl -s https://getcomposer.org/installer | php && cd /php-client && /composer.phar update --prefer-lowest && vendor/bin/phpunit"
+

composer.json

@@ -33,7 +33,7 @@
     },
     "autoload": {
         "psr-4": {
-            "": "src/"
+            "LaunchDarkly\\": "src/LaunchDarkly/"
         }
     },
     "autoload-dev": {

src/LaunchDarkly/ApcLDDFeatureRequester.php

@@ -1,7 +1,6 @@
 <?php
 namespace LaunchDarkly;
 
-
 /**
  * Feature requester from an LDD-populated redis, with APC caching
  * @deprecated Per the docs (http://php.net/manual/en/intro.apc.php):
@@ -10,10 +9,12 @@
  *
  * @package LaunchDarkly
  */
-class ApcLDDFeatureRequester extends LDDFeatureRequester {
+class ApcLDDFeatureRequester extends LDDFeatureRequester
+{
     protected $_expiration = 30;
 
-    function __construct($baseUri, $sdkKey, $options) {
+    public function __construct($baseUri, $sdkKey, $options)
+    {
         parent::__construct($baseUri, $sdkKey, $options);
 
         if (isset($options['apc_expiration'])) {
@@ -31,13 +32,13 @@ protected function fetch($key, &$success = null)
         return \apc_fetch($key, $success);
     }
 
-    protected function get_from_cache($key) {
+    protected function get_from_cache($key)
+    {
         $key = self::make_cache_key($key);
         $enabled = $this->fetch($key);
         if ($enabled === false) {
             return null;
-        }
-        else {
+        } else {
             return $enabled;
         }
     }
@@ -53,11 +54,13 @@ protected function add($key, $var, $ttl = 0)
         return \apc_add($key, $var, $ttl);
     }
 
-    protected function store_in_cache($key, $val) {
+    protected function store_in_cache($key, $val)
+    {
         $this->add($this->make_cache_key($key), $val, $this->_expiration);
     }
 
-    private function make_cache_key($name) {
+    private function make_cache_key($name)
+    {
         return $this->_features_key.'.'.$name;
     }
-}
+}

src/LaunchDarkly/Clause.php

@@ -2,7 +2,8 @@
 
 namespace LaunchDarkly;
 
-class Clause {
+class Clause
+{
     /** @var string */
     private $_attribute = null;
     /** @var string */
@@ -12,14 +13,16 @@ class Clause {
     /** @var bool  */
     private $_negate = false;
 
-    private function __construct($attribute, $op, array $values, $negate) {
+    private function __construct($attribute, $op, array $values, $negate)
+    {
         $this->_attribute = $attribute;
         $this->_op = $op;
         $this->_values = $values;
         $this->_negate = $negate;
     }
 
-    public static function getDecoder() {
+    public static function getDecoder()
+    {
         return function ($v) {
             return new Clause($v['attribute'], $v['op'], $v['values'], $v['negate']);
         };
@@ -29,7 +32,8 @@ public static function getDecoder() {
      * @param $user LDUser
      * @return bool
      */
-    public function matchesUser($user) {
+    public function matchesUser($user)
+    {
         $userValue = $user->getValueForEvaluation($this->_attribute);
         if ($userValue === null) {
             return false;
@@ -50,36 +54,41 @@ public function matchesUser($user) {
     /**
      * @return string
      */
-    public function getAttribute() {
+    public function getAttribute()
+    {
         return $this->_attribute;
     }
 
     /**
      * @return string
      */
-    public function getOp() {
+    public function getOp()
+    {
         return $this->_op;
     }
 
     /**
      * @return array
      */
-    public function getValues() {
+    public function getValues()
+    {
         return $this->_values;
     }
 
     /**
      * @return boolean
      */
-    public function isNegate() {
+    public function isNegate()
+    {
         return $this->_negate;
     }
 
     /**
      * @param $userValue
      * @return bool
      */
-    private function matchAny($userValue) {
+    private function matchAny($userValue)
+    {
         foreach ($this->_values as $v) {
             $result = Operators::apply($this->_op, $userValue, $v);
             if ($result === true) {
@@ -89,11 +98,12 @@ private function matchAny($userValue) {
         return false;
     }
 
-    private function _maybeNegate($b) {
+    private function _maybeNegate($b)
+    {
         if ($this->_negate) {
             return !$b;
         } else {
             return $b;
         }
     }
-}
+}

src/LaunchDarkly/CurlEventPublisher.php

@@ -19,26 +19,25 @@ class CurlEventPublisher implements EventPublisher
     private $_ssl;
     private $_curl = '/usr/bin/env curl';
 
-    function __construct($sdkKey, array $options = array()) {
+    public function __construct($sdkKey, array $options = array())
+    {
         $this->_sdkKey = $sdkKey;
 
         $eventsUri = LDClient::DEFAULT_EVENTS_URI;
         if (isset($options['events_uri'])) {
             $eventsUri = $options['events_uri'];
         }
-        $url = parse_url(rtrim($eventsUri,'/'));
+        $url = parse_url(rtrim($eventsUri, '/'));
         $this->_host = $url['host'];
         $this->_ssl = $url['scheme'] === 'https';
         if (isset($url['port'])) {
             $this->_port = $url['port'];
-        } 
-        else {
+        } else {
             $this->_port = $this->_ssl ? 443 : 80;
         }
         if (isset($url['path'])) {
             $this->_path = $url['path'];
-        }
-        else {
+        } else {
             $this->_path = '';
         }
 
@@ -47,13 +46,15 @@ function __construct($sdkKey, array $options = array()) {
         }
     }
 
-    public function publish($payload) {
+    public function publish($payload)
+    {
         $args = $this->createArgs($payload);
 
         return $this->makeRequest($args);
     }
 
-    private function createArgs($payload) {
+    private function createArgs($payload)
+    {
         $scheme = $this->_ssl ? "https://" : "http://";
         $args = " -X POST";
         $args.= " -H 'Content-Type: application/json'";
@@ -65,9 +66,10 @@ private function createArgs($payload) {
         return $args;
     }
 
-    private function makeRequest($args) {
+    private function makeRequest($args)
+    {
         $cmd = $this->_curl . " " . $args . ">> /dev/null 2>&1 &";
         shell_exec($cmd);
         return true;
     }
-}
+}

src/LaunchDarkly/EvaluationException.php

@@ -1,15 +1,16 @@
 <?php
 namespace LaunchDarkly;
 
-
 use Exception;
 
-class EvaluationException extends Exception {
+class EvaluationException extends Exception
+{
     /**
      * EvaluationException constructor.
      * @param string $message
      */
-    public function __construct($message) {
+    public function __construct($message)
+    {
         parent::__construct($message);
     }
-}
+}