Merge branch 'master' into mng/pr-68

Author: wangjoshuah

composer.json

@@ -14,7 +14,8 @@
     "justinrainbow/json-schema": "^1.6 || ^2.0 || ^4.0",
     "lastguest/murmurhash": "1.3.0",
     "guzzlehttp/guzzle": "~5.3|~6.2",
-    "monolog/monolog": "~1.21"
+    "monolog/monolog": "~1.21",
+    "icecave/parity": "^1.0"
   },
   "require-dev": {
     "phpunit/phpunit": "~4.8|~5.0",

src/Optimizely/Bucketer.php

@@ -84,7 +84,7 @@ protected function generateBucketValue($bucketingKey)
     {
         $hashCode = $this->generateHashCode($bucketingKey);
         $ratio = $hashCode / Bucketer::$MAX_HASH_VALUE;
-        return floor($ratio * Bucketer::$MAX_TRAFFIC_VALUE);
+        return intval(floor($ratio * Bucketer::$MAX_TRAFFIC_VALUE));
     }
 
     /**

src/Optimizely/Event/Builder/EventBuilder.php

@@ -105,7 +105,7 @@ private function getCommonParams($config, $userId, $attributes)
                             ENTITY_ID => $attributeEntity->getId(),
                             KEY => $attributeKey,
                             TYPE => CUSTOM_ATTRIBUTE_FEATURE_TYPE,
-                            VALUE => $attributeValue,
+                            VALUE => $attributeValue
                         ];
                     }
                 }
@@ -139,8 +139,8 @@ private function getImpressionParams(Experiment $experiment, $variationId)
                 [
                     ENTITY_ID => $experiment->getLayerId(),
                     TIMESTAMP => time()*1000,
-                    KEY => ACTIVATE_EVENT_KEY,
-                    UUID => GeneratorUtils::getRandomUuid()
+                    UUID => GeneratorUtils::getRandomUuid(),
+                    KEY => ACTIVATE_EVENT_KEY
                 ]
             ]
 
@@ -169,7 +169,7 @@ private function getConversionParams($config, $eventKey, $experimentVariationMap
             $singleSnapshot[DECISIONS] = [
                 [
                     CAMPAIGN_ID => $experiment->getLayerId(),
-                    EXPERIMENT_ID => $experimentId,
+                    EXPERIMENT_ID => $experiment->getId(),
                     VARIATION_ID => $variationId
                 ]
             ];

src/Optimizely/Utils/EventTagUtils.php

@@ -43,7 +43,7 @@ public static function getRevenueValue($eventTags) {
             return null;
         }
 
-        if (!isset($eventTags[self::REVENUE_EVENT_METRIC_NAME]) or !$eventTags[self::REVENUE_EVENT_METRIC_NAME]) {
+        if (!isset($eventTags[self::REVENUE_EVENT_METRIC_NAME])) {
             return null;
         }
 

tests/BucketerTest.php

@@ -61,23 +61,23 @@ public function testGenerateBucketValue()
         $generateBucketValueMethod = new \ReflectionMethod(Bucketer::class, 'generateBucketValue');
         $generateBucketValueMethod->setAccessible(true);
 
-        $this->assertEquals(
+        $this->assertSame(
             5254,
             $generateBucketValueMethod->invoke(new Bucketer($this->loggerMock), $this->getBucketingKey('ppid1', '1886780721'))
         );
-        $this->assertEquals(
+        $this->assertSame(
             4299,
             $generateBucketValueMethod->invoke(new Bucketer($this->loggerMock), $this->getBucketingKey('ppid2', '1886780721'))
         );
-        $this->assertEquals(
+        $this->assertSame(
             2434,
             $generateBucketValueMethod->invoke(new Bucketer($this->loggerMock), $this->getBucketingKey('ppid2', '1886780722'))
         );
-        $this->assertEquals(
+        $this->assertSame(
             5439,
             $generateBucketValueMethod->invoke(new Bucketer($this->loggerMock), $this->getBucketingKey('ppid3', '1886780721'))
         );
-        $this->assertEquals(
+        $this->assertSame(
             6128,
             $generateBucketValueMethod->invoke(
                 new Bucketer($this->loggerMock),

tests/DecisionServiceTests/DecisionServiceTest.php

@@ -564,15 +564,15 @@ public function testGetVariationWithBucketingId()
 
         // check invalid audience with bucketing ID
         $variationKey = $optlyObject->getVariation($this->experimentKey, $userId, $invalidUserAttributesWithBucketingId);
-        $this->assertEquals(null, $variationKey);
+        $this->assertNull($variationKey);
 
         // check null audience with bucketing Id
         $variationKey = $optlyObject->getVariation($this->experimentKey, $userId, null);
-        $this->assertEquals(null, $variationKey);
+        $this->assertNull($variationKey);
 
         // test that an experiment that's not running returns a null variation
         $variationKey = $optlyObject->getVariation($pausedExperimentKey, $userId, $userAttributesWithBucketingId);
-        $this->assertEquals(null, $variationKey);
+        $this->assertNull($variationKey);
 
         // check forced variation
         $this->assertTrue($optlyObject->setForcedVariation($this->experimentKey, $userId, $this->variationKeyControl), sprintf('Set variation to "%s" failed.', $this->variationKeyControl));