Merge branch 'master' of github.com:launchdarkly/php-client

eli-darkly · eli-darkly · commit f224cfc16571 · 2019-04-25T14:04:27.000-07:00
diff --git a/src/LaunchDarkly/SegmentRule.php b/src/LaunchDarkly/SegmentRule.php
@@ -39,7 +39,7 @@ public function matchesUser($user, $segmentKey, $segmentSalt)
             return true;
         }
         // All of the clauses are met. See if the user buckets in
-        $bucketBy = ($this->_bucketBy === null) ? "key" : bucketBy;
+        $bucketBy = ($this->_bucketBy === null) ? "key" : $this->_bucketBy;
         $bucket = VariationOrRollout::bucketUser($user, $segmentKey, $bucketBy, $segmentSalt);
         $weight = $this->_weight / 100000.0;
         return $bucket < $weight;

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function matchesUser($user, $segmentKey, $segmentSalt)`
`39`	`39`	`return true;`
`40`	`40`	`}`
`41`	`41`	`// All of the clauses are met. See if the user buckets in`
`42`		`- $bucketBy = ($this->_bucketBy === null) ? "key" : bucketBy;`
	`42`	`+ $bucketBy = ($this->_bucketBy === null) ? "key" : $this->_bucketBy;`
`43`	`43`	`$bucket = VariationOrRollout::bucketUser($user, $segmentKey, $bucketBy, $segmentSalt);`
`44`	`44`	`$weight = $this->_weight / 100000.0;`
`45`	`45`	`return $bucket < $weight;`