chore: Merge 2.2.1 into release branch for release (#139)

Author: mikeproeng37

CHANGELOG.md

@@ -4,6 +4,14 @@ Changes that have landed in master but are not yet released.
 - refac: Renames notification-center methods. ([#120](https://github.com/optimizely/php-sdk/pull/120))
 - fix: Validate Inputs for activate/track/getVariation. ([#105](https://github.com/optimizely/php-sdk/pull/105))
 
+## 2.2.1
+November 14th, 2018
+
+### Bug fixes
+- fix(generateBucketValue): Avoid negative bucket number for PHP x86. ([#137](https://github.com/optimizely/php-sdk/pull/137))
+- fix(phpdoc-notification-callback): Fixes phpdoc primitive type of notification-callback. ([#135](https://github.com/optimizely/php-sdk/pull/135))
+
+
 ## 2.2.0
 October 29th, 2018
 

src/Optimizely/Bucketer.php

@@ -86,7 +86,13 @@ protected function generateBucketValue($bucketingKey)
     {
         $hashCode = $this->generateHashCode($bucketingKey);
         $ratio = $hashCode / Bucketer::$MAX_HASH_VALUE;
-        return intval(floor($ratio * Bucketer::$MAX_TRAFFIC_VALUE));
+        $bucketVal = intval(floor($ratio * Bucketer::$MAX_TRAFFIC_VALUE));
+
+        if ($bucketVal < 0) {
+            $bucketVal += 10000;
+        }
+
+        return $bucketVal;
     }
 
     /**

src/Optimizely/Event/Builder/EventBuilder.php

@@ -37,7 +37,7 @@ class EventBuilder
     /**
      * @const string Version of the Optimizely PHP SDK.
      */
-    const SDK_VERSION = '2.2.0';
+    const SDK_VERSION = '2.2.1';
 
     /**
      * @var string URL to send event to.

src/Optimizely/Notification/NotificationCenter.php

@@ -59,7 +59,7 @@ public function getNotifications()
      * Adds a notification callback for a notification type to the notification center
      *
      * @param string $notification_type     One of the constants defined in NotificationType
-     * @param string $notification_callback A valid PHP callback
+     * @param callable $notification_callback A valid PHP callback
      *
      * @return null  Given invalid notification type/callback
      *         -1    Given callback has been already added

tests/EventTests/EventBuilderTest.php

@@ -73,7 +73,7 @@ public function setUp()
                 ]],
                 'revision' => '15',
                 'client_name' => 'php-sdk',
-                'client_version' => '2.2.0',
+                'client_version' => '2.2.1',
                 'anonymize_ip'=> false,
             ];
         $this->expectedEventHttpVerb = 'POST';