- * The sdk returns the default treatment of this feature if: + * The sdk returns the default treatment of this feature flag if: *
* This method does not throw any exceptions. * It also never returns null. * * @param $key - * @param $featureName + * @param $featureFlagName * @param $attributes * @return string */ - public function getTreatment($key, $featureName, array $attributes = null); + public function getTreatment($key, $featureFlagName, array $attributes = null); /** * Returns an object with the treatment to show this id for this feature - * and the config provided. - * The set of treatments and config for a feature can be configured - * on the Split web console. + * flag and the config provided. + * The set of treatments and config for a feature flag can be configured + * on the Split user interface. * This method returns the string 'control' if: *
- * The sdk returns the default treatment of this feature if: + * The sdk returns the default treatment of this feature flag if: *
* This method does not throw any exceptions. @@ -72,95 +72,95 @@ public function getTreatment($key, $featureName, array $attributes = null); *
- * The sdk returns the default treatment of this feature if: + * The sdk returns the default treatment of this feature flag if: *
* This method does not throw any exceptions. * It also never returns null. * * @param $key - * @param $featureNames + * @param $featureFlagNames * @param $attributes * @return array */ - public function getTreatments($key, $featureNames, array $attributes = null); + public function getTreatments($key, $featureFlagNames, array $attributes = null); /** * Returns an associative array which each key will be * the treatment result and the config for each - * feature passed as parameter. - * The set of treatments for a feature can be configured - * on the Split web console and the config for + * feature flag passed as parameter. + * The set of treatments for a feature flag can be configured + * on the Split user interface and the config for * that treatment. * This method returns the string 'control' if: *
- * The sdk returns the default treatment of this feature if: + * The sdk returns the default treatment of this feature flag if: *
* This method does not throw any exceptions. * It also never returns null. * * @param $key - * @param $featureNames + * @param $featureFlagNames * @param $attributes * @return array */ - public function getTreatmentsWithConfig($key, $featureNames, array $attributes = null); + public function getTreatmentsWithConfig($key, $featureFlagNames, array $attributes = null); /** * A short-hand for *
- * (getTreatment(key, feature) == treatment) ? true : false;
+ * (getTreatment(key, featureFlagName) == treatment) ? true : false;
*
*
* This method never throws exceptions.
* Instead of throwing exceptions, it returns false.
*
* @param $key
- * @param $featureName
+ * @param $featureFlagName
* @param $treatment
* @return bool
*/
- public function isTreatment($key, $featureName, $treatment);
+ public function isTreatment($key, $featureFlagName, $treatment);
/**
* Method to send events
diff --git a/src/SplitIO/Sdk/Impressions/ImpressionLabel.php b/src/SplitIO/Sdk/Impressions/ImpressionLabel.php
index 5fdace77..1bf7c2a3 100644
--- a/src/SplitIO/Sdk/Impressions/ImpressionLabel.php
+++ b/src/SplitIO/Sdk/Impressions/ImpressionLabel.php
@@ -8,7 +8,7 @@
class ImpressionLabel
{
/**
- * Condition: Split Was Killed
+ * Condition: Feature flag Was Killed
* Treatment: Default treatment
* Label: killed
*/
@@ -22,7 +22,7 @@ class ImpressionLabel
const NO_CONDITION_MATCHED = "default rule";
/**
- * Condition: Split definition was not found
+ * Condition: Feature flag definition was not found
* Treatment: control
* Label: split not found
*/
diff --git a/src/SplitIO/Sdk/LocalhostClient.php b/src/SplitIO/Sdk/LocalhostClient.php
index 618f0113..ac86afa6 100644
--- a/src/SplitIO/Sdk/LocalhostClient.php
+++ b/src/SplitIO/Sdk/LocalhostClient.php
@@ -118,27 +118,27 @@ public function getSplits()
return $this->splits;
}
- public function doValidation($key, $featureName, $operation)
+ public function doValidation($key, $featureFlagName, $operation)
{
$key = InputValidator::validateKey($key, $operation);
if (is_null($key)) {
return null;
}
- $featureName = InputValidator::validateFeatureName($featureName, $operation);
- if (is_null($featureName)) {
+ $featureFlagName = InputValidator::validateFeatureFlagName($featureFlagName, $operation);
+ if (is_null($featureFlagName)) {
return null;
}
- return is_null($key) ? $featureName : ($featureName . ":" . $key["matchingKey"]);
+ return is_null($key) ? $featureFlagName : ($featureFlagName . ":" . $key["matchingKey"]);
}
/**
* @inheritdoc
*/
- public function getTreatment($key, $featureName, array $attributes = null)
+ public function getTreatment($key, $featureFlagName, array $attributes = null)
{
- $key = $this->doValidation($key, $featureName, "getTreatment");
+ $key = $this->doValidation($key, $featureFlagName, "getTreatment");
if (is_null($key)) {
return TreatmentEnum::CONTROL;
}
@@ -146,8 +146,8 @@ public function getTreatment($key, $featureName, array $attributes = null)
if (isset($this->splits[$key])) {
return $this->splits[$key]["treatment"];
} else {
- if (isset($this->splits[$featureName])) {
- return $this->splits[$featureName]["treatment"];
+ if (isset($this->splits[$featureFlagName])) {
+ return $this->splits[$featureFlagName]["treatment"];
}
}
@@ -157,14 +157,14 @@ public function getTreatment($key, $featureName, array $attributes = null)
/**
* @inheritdoc
*/
- public function getTreatmentWithConfig($key, $featureName, array $attributes = null)
+ public function getTreatmentWithConfig($key, $featureFlagName, array $attributes = null)
{
$treatmentResult = array(
"treatment" => TreatmentEnum::CONTROL,
"config" => null,
);
- $key = $this->doValidation($key, $featureName, "getTreatmentWithConfig");
+ $key = $this->doValidation($key, $featureFlagName, "getTreatmentWithConfig");
if (is_null($key)) {
return $treatmentResult;
}
@@ -175,10 +175,10 @@ public function getTreatmentWithConfig($key, $featureName, array $attributes = n
$treatmentResult["config"] = $this->splits[$key]["config"];
}
} else {
- if (isset($this->splits[$featureName])) {
- $treatmentResult["treatment"] = $this->splits[$featureName]["treatment"];
- if (isset($this->splits[$featureName]["config"])) {
- $treatmentResult["config"] = $this->splits[$featureName]["config"];
+ if (isset($this->splits[$featureFlagName])) {
+ $treatmentResult["treatment"] = $this->splits[$featureFlagName]["treatment"];
+ if (isset($this->splits[$featureFlagName]["config"])) {
+ $treatmentResult["config"] = $this->splits[$featureFlagName]["config"];
}
}
}
@@ -189,21 +189,21 @@ public function getTreatmentWithConfig($key, $featureName, array $attributes = n
/**
* @inheritdoc
*/
- public function getTreatments($key, $featureNames, array $attributes = null)
+ public function getTreatments($key, $featureFlagNames, array $attributes = null)
{
$result = array();
- $splitNames = InputValidator::validateFeatureNames($featureNames, "getTreatments");
- if (is_null($splitNames)) {
+ $featureFlags = InputValidator::validateFeatureFlagNames($featureFlagNames, "getTreatments");
+ if (is_null($featureFlags)) {
return $result;
}
$key = InputValidator::validateKey($key, "getTreatments");
if (is_null($key)) {
- return array_fill_keys($splitNames, TreatmentEnum::CONTROL);
+ return array_fill_keys($featureFlags, TreatmentEnum::CONTROL);
}
- foreach ($splitNames as $split) {
+ foreach ($featureFlags as $split) {
$result[$split] = $this->getTreatment($key["matchingKey"], $split, $attributes);
};
@@ -213,21 +213,21 @@ public function getTreatments($key, $featureNames, array $attributes = null)
/**
* @inheritdoc
*/
- public function getTreatmentsWithConfig($key, $featureNames, array $attributes = null)
+ public function getTreatmentsWithConfig($key, $featureFlagNames, array $attributes = null)
{
$result = array();
- $splitNames = InputValidator::validateFeatureNames($featureNames, "getTreatmentsWithConfig");
- if (is_null($splitNames)) {
+ $featureFlags = InputValidator::validateFeatureFlagNames($featureFlagNames, "getTreatmentsWithConfig");
+ if (is_null($featureFlags)) {
return $result;
}
$key = InputValidator::validateKey($key, "getTreatmentsWithConfig");
if (is_null($key)) {
- return array_fill_keys($splitNames, array('treatment' => TreatmentEnum::CONTROL, 'config' => null));
+ return array_fill_keys($featureFlags, array('treatment' => TreatmentEnum::CONTROL, 'config' => null));
}
- foreach ($splitNames as $split) {
+ foreach ($featureFlags as $split) {
$result[$split] = $this->getTreatmentWithConfig($key["matchingKey"], $split, $attributes);
};
@@ -237,9 +237,9 @@ public function getTreatmentsWithConfig($key, $featureNames, array $attributes =
/**
* @inheritdoc
*/
- public function isTreatment($key, $featureName, $treatment)
+ public function isTreatment($key, $featureFlagName, $treatment)
{
- $calculatedTreatment = $this->getTreatment($key, $featureName);
+ $calculatedTreatment = $this->getTreatment($key, $featureFlagName);
if ($calculatedTreatment !== TreatmentEnum::CONTROL) {
if ($treatment == $calculatedTreatment) {
diff --git a/src/SplitIO/Sdk/Manager/LocalhostSplitManager.php b/src/SplitIO/Sdk/Manager/LocalhostSplitManager.php
index d932cbfe..2bb3f7a5 100644
--- a/src/SplitIO/Sdk/Manager/LocalhostSplitManager.php
+++ b/src/SplitIO/Sdk/Manager/LocalhostSplitManager.php
@@ -14,25 +14,25 @@ public function __construct(array $splits)
if ($splits) {
foreach (array_keys($splits) as $concatenated) {
$splitted = explode(":", $concatenated);
- $featureName = $splitted[0];
+ $featureFlagName = $splitted[0];
$split = $splits[$concatenated];
- if (isset($splitDefinitions[$featureName])) {
+ if (isset($splitDefinitions[$featureFlagName])) {
array_push(
- $splitDefinitions[$featureName]["treatments"],
+ $splitDefinitions[$featureFlagName]["treatments"],
$split["treatment"]
);
- $splitDefinitions[$featureName]["treatments"] = array_unique(
- $splitDefinitions[$featureName]["treatments"]
+ $splitDefinitions[$featureFlagName]["treatments"] = array_unique(
+ $splitDefinitions[$featureFlagName]["treatments"]
);
if (isset($split["config"])) {
- $splitDefinitions[$featureName]["config"][ $split["treatment"]] = $split["config"];
+ $splitDefinitions[$featureFlagName]["config"][ $split["treatment"]] = $split["config"];
}
} else {
- $splitDefinitions[$featureName] = array(
+ $splitDefinitions[$featureFlagName] = array(
"treatments" => array($split["treatment"]),
);
if (isset($split["config"])) {
- $splitDefinitions[$featureName]["config"] = array($split["treatment"] => $split["config"]);
+ $splitDefinitions[$featureFlagName]["config"] = array($split["treatment"] => $split["config"]);
}
}
}
@@ -57,14 +57,14 @@ public function splits()
$_splits = array();
if ($this->splits) {
- foreach (array_keys($this->splits) as $featureName) {
- $configs = isset($this->splits[$featureName]["config"]) ?
- $this->splits[$featureName]["config"] : new StdClass;
+ foreach (array_keys($this->splits) as $featureFlagName) {
+ $configs = isset($this->splits[$featureFlagName]["config"]) ?
+ $this->splits[$featureFlagName]["config"] : new StdClass;
$_splits[] = new SplitView(
- $featureName,
+ $featureFlagName,
null,
false,
- $this->splits[$featureName]["treatments"],
+ $this->splits[$featureFlagName]["treatments"],
0,
$configs
);
@@ -74,21 +74,21 @@ public function splits()
return $_splits;
}
- public function split($featureName)
+ public function split($featureFlagName)
{
- $featureName = InputValidator::validateFeatureName($featureName, 'split');
- if (is_null($featureName)) {
+ $featureFlagName = InputValidator::validateFeatureFlagName($featureFlagName, 'split');
+ if (is_null($featureFlagName)) {
return null;
}
- if (isset($this->splits[$featureName])) {
- $configs = isset($this->splits[$featureName]["config"]) ?
- $this->splits[$featureName]["config"] : new StdClass;
+ if (isset($this->splits[$featureFlagName])) {
+ $configs = isset($this->splits[$featureFlagName]["config"]) ?
+ $this->splits[$featureFlagName]["config"] : new StdClass;
return new SplitView(
- $featureName,
+ $featureFlagName,
null,
false,
- $this->splits[$featureName]["treatments"],
+ $this->splits[$featureFlagName]["treatments"],
0,
$configs
);
diff --git a/src/SplitIO/Sdk/Manager/SplitManager.php b/src/SplitIO/Sdk/Manager/SplitManager.php
index 38e667d1..2acefb2d 100644
--- a/src/SplitIO/Sdk/Manager/SplitManager.php
+++ b/src/SplitIO/Sdk/Manager/SplitManager.php
@@ -2,8 +2,6 @@
namespace SplitIO\Sdk\Manager;
use \stdClass;
-use SplitIO\Component\Common\Di;
-use SplitIO\Grammar\Condition;
use SplitIO\Grammar\Split;
use SplitIO\Split as SplitApp;
use SplitIO\Component\Cache\SplitCache;
@@ -28,22 +26,22 @@ public function splits()
}
/**
- * @param $featureName
+ * @param $featureFlagName
* @return null|SplitView
*/
- public function split($featureName)
+ public function split($featureFlagName)
{
- $featureName = InputValidator::validateFeatureName($featureName, 'split');
- if (is_null($featureName)) {
+ $featureFlagName = InputValidator::validateFeatureFlagName($featureFlagName, 'split');
+ if (is_null($featureFlagName)) {
return null;
}
$cache = new SplitCache();
- $raw = $cache->getSplit($featureName);
+ $raw = $cache->getSplit($featureFlagName);
if (is_null($raw)) {
- SplitApp::logger()->warning("split: you passed " . $featureName
- . " that does not exist in this environment, please double check what Splits exist"
- . " in the web console.");
+ SplitApp::logger()->warning("split: you passed " . $featureFlagName
+ . " that does not exist in this environment, please double check what"
+ . " feature flags exist in the Split user interface.");
return null;
}
return self::parseSplitView($raw);
diff --git a/src/SplitIO/Sdk/Manager/SplitManagerInterface.php b/src/SplitIO/Sdk/Manager/SplitManagerInterface.php
index a0d8687e..f4475bd1 100644
--- a/src/SplitIO/Sdk/Manager/SplitManagerInterface.php
+++ b/src/SplitIO/Sdk/Manager/SplitManagerInterface.php
@@ -14,8 +14,8 @@ public function splitNames();
public function splits();
/**
- * @param $featureName
+ * @param $featureFlagName
* @return \SplitIO\Sdk\Manager\SplitView
*/
- public function split($featureName);
+ public function split($featureFlagName);
}
diff --git a/src/SplitIO/Sdk/Validator/InputValidator.php b/src/SplitIO/Sdk/Validator/InputValidator.php
index 6cdbf962..50905331 100644
--- a/src/SplitIO/Sdk/Validator/InputValidator.php
+++ b/src/SplitIO/Sdk/Validator/InputValidator.php
@@ -21,10 +21,10 @@ class InputValidator
* @param $operation
* @return true|false
*/
- public static function validString($value, $name, $operation)
+ public static function validString($value, $name, $nameType, $operation)
{
- if (self::checkIsNull($value, $name, $operation) or self::checkIsNotString($value, $name, $operation)
- or self::checkIsEmpty($value, $name, $operation)) {
+ if (self::checkIsNull($value, $name, $nameType, $operation) or self::checkIsNotString($value, $name, $nameType, $operation)
+ or self::checkIsEmpty($value, $name, $nameType, $operation)) {
return false;
}
return true;
@@ -55,31 +55,31 @@ public static function toString($var, $name, $operation)
return false;
}
- private static function checkIsNull($value, $name, $operation)
+ private static function checkIsNull($value, $name, $nameType, $operation)
{
if (is_null($value)) {
- SplitApp::logger()->critical($operation . ": you passed a null " . $name . ", " . $name .
+ SplitApp::logger()->critical($operation . ": you passed a null " . $name . ", " . $nameType .
" must be a non-empty string.");
return true;
}
return false;
}
- private static function checkIsEmpty($value, $name, $operation)
+ private static function checkIsEmpty($value, $name, $nameType, $operation)
{
$trimmed = trim($value);
if (empty($trimmed)) {
- SplitApp::logger()->critical($operation . ": you passed an empty " . $name . ", " . $name .
+ SplitApp::logger()->critical($operation . ": you passed an empty " . $name . ", " . $nameType .
" must be a non-empty string.");
return true;
}
return false;
}
- private static function checkIsNotString($value, $name, $operation)
+ private static function checkIsNotString($value, $name, $nameType, $operation)
{
if (!is_string($value)) {
- SplitApp::logger()->critical($operation . ": you passed an invalid " . $name . ", " . $name .
+ SplitApp::logger()->critical($operation . ": you passed an invalid " . $name . ", " . $nameType .
" must be a non-empty string.");
return true;
}
@@ -103,7 +103,7 @@ private static function checkNotProperLength($value, $name, $operation)
*/
public static function validateKey($key, $operation)
{
- if (self::checkIsNull($key, "key", $operation)) {
+ if (self::checkIsNull($key, "key", "key", $operation)) {
return null;
}
if ($key instanceof Key) {
@@ -118,7 +118,7 @@ public static function validateKey($key, $operation)
. ' key must be a non-empty string.');
return null;
}
- if (self::checkIsEmpty($strKey, "key", $operation) or self::checkNotProperLength($strKey, "key", $operation)) {
+ if (self::checkIsEmpty($strKey, "key", "key", $operation) or self::checkNotProperLength($strKey, "key", $operation)) {
return null;
}
@@ -132,7 +132,7 @@ private static function trimFeatureName($featureName, $operation = "getTreatment
{
$trimmed = trim($featureName);
if ($trimmed !== $featureName) {
- SplitApp::logger()->warning($operation . ": split name " . json_encode($featureName) . " has extra " .
+ SplitApp::logger()->warning($operation . ": featureFlagName " . json_encode($featureName) . " has extra " .
"whitespace, trimming.");
}
return $trimmed;
@@ -143,10 +143,10 @@ private static function trimFeatureName($featureName, $operation = "getTreatment
* @param $operation
* @return string|null
*/
- public static function validateFeatureName($featureName, $operation)
+ public static function validateFeatureFlagName($featureFlagName, $operation)
{
- return self::validString($featureName, 'split name', $operation) ?
- self::trimFeatureName($featureName, $operation) : null;
+ return self::validString($featureFlagName, 'featureFlagName', 'flag name', $operation) ?
+ self::trimFeatureName($featureFlagName, $operation) : null;
}
/**
@@ -155,7 +155,7 @@ public static function validateFeatureName($featureName, $operation)
*/
public static function validateTrackKey($key)
{
- if (self::checkIsNull($key, "key", "track")) {
+ if (self::checkIsNull($key, "key", "key", "track")) {
return null;
}
$strKey = self::toString($key, 'key', 'track');
@@ -163,7 +163,7 @@ public static function validateTrackKey($key)
SplitApp::logger()->critical('track: you passed an invalid key type, key must be a non-empty string.');
return null;
}
- if (self::checkIsEmpty($strKey, "key", "track") or self::checkNotProperLength($strKey, "key", "track")) {
+ if (self::checkIsEmpty($strKey, "key", "key", "track") or self::checkNotProperLength($strKey, "key", "track")) {
return null;
}
return $strKey;
@@ -175,7 +175,7 @@ public static function validateTrackKey($key)
*/
public static function validateTrafficType($trafficType)
{
- if (!self::validString($trafficType, 'traffic type', 'track')) {
+ if (!self::validString($trafficType, 'traffic type', 'traffic type', 'track')) {
return null;
}
$toLowercase = strtolower($trafficType);
@@ -198,7 +198,7 @@ public static function validateTrafficType($trafficType)
*/
public static function validateEventType($eventType)
{
- if (!self::validString($eventType, 'event type', 'track')) {
+ if (!self::validString($eventType, 'event type', 'event type', 'track')) {
return null;
}
if (!preg_match(REG_EXP_EVENT_TYPE, $eventType)) {
@@ -232,34 +232,34 @@ public static function validateValue($value)
* @param $operation
* @return array|null
*/
- public static function validateFeatureNames($featureNames, $operation)
+ public static function validateFeatureFlagNames($featureFlagNames, $operation)
{
- if (is_null($featureNames) || !is_array($featureNames)) {
- SplitApp::logger()->critical($operation . ': featureNames must be a non-empty array.');
+ if (is_null($featureFlagNames) || !is_array($featureFlagNames)) {
+ SplitApp::logger()->critical($operation . ': featureFlagNames must be a non-empty array.');
return null;
}
$filteredArray = array_values(
array_map(
- function ($featureName) use ($operation) {
- $trimmed = trim($featureName);
- if ($trimmed !== $featureName) {
- SplitApp::logger()->warning($operation . ": split name " . json_encode($featureName)
+ function ($featureFlagName) use ($operation) {
+ $trimmed = trim($featureFlagName);
+ if ($trimmed !== $featureFlagName) {
+ SplitApp::logger()->warning($operation . ": featureFlagName " . json_encode($featureFlagName)
. " has extra " . "whitespace, trimming.");
}
return $trimmed;
},
array_unique(
array_filter(
- $featureNames,
- function ($featureName) use ($operation) {
- return InputValidator::validString($featureName, 'split name', $operation);
+ $featureFlagNames,
+ function ($featureFlagName) use ($operation) {
+ return InputValidator::validString($featureFlagName, 'featureFlagName', 'flag name', $operation);
}
)
)
)
);
if (empty($filteredArray)) {
- SplitApp::logger()->critical($operation . ': featureNames must be a non-empty array.');
+ SplitApp::logger()->critical($operation . ': featureFlagNames must be a non-empty array.');
return null;
}
return $filteredArray;
@@ -344,8 +344,8 @@ public static function isSplitFound($label, $splitName, $operation)
{
if ($label == ImpressionLabel::SPLIT_NOT_FOUND) {
SplitApp::logger()->warning($operation . ": you passed " . $splitName
- . " that does not exist in this environment, please double check what Splits exist"
- . " in the web console.");
+ . " that does not exist in this environment, please double check what feature flags exist"
+ . " in the Split user interface.");
return false;
}
return true;
diff --git a/src/SplitIO/Version.php b/src/SplitIO/Version.php
index b827e7d0..a2091362 100644
--- a/src/SplitIO/Version.php
+++ b/src/SplitIO/Version.php
@@ -3,5 +3,5 @@
class Version
{
- const CURRENT = '7.1.6';
+ const CURRENT = '7.2.0-rc1';
}
diff --git a/tests/Suite/InputValidation/GetTreatmentValidationTest.php b/tests/Suite/InputValidation/GetTreatmentValidationTest.php
index 312ab2ac..9d0158e2 100644
--- a/tests/Suite/InputValidation/GetTreatmentValidationTest.php
+++ b/tests/Suite/InputValidation/GetTreatmentValidationTest.php
@@ -87,7 +87,7 @@ public function testGetTreatmentWitNumberMatchingKey()
->with($this->logicalOr(
$this->equalTo("Key: matchingKey '12345' is not of type string, converting."),
$this->equalTo("getTreatment: you passed some_feature that does not exist in this environment, "
- . "please double check what Splits exist in the web console.")
+ . "please double check what feature flags exist in the Split user interface.")
));
$this->assertEquals(
@@ -142,7 +142,7 @@ public function testGetTreatmentWitNumberBucketingKey()
->with($this->logicalOr(
$this->equalTo("Key: bucketingKey '12345' is not of type string, converting."),
$this->equalTo("getTreatment: you passed some_feature that does not exist in this environment, "
- . "please double check what Splits exist in the web console.")
+ . "please double check what feature flags exist in the Split user interface.")
));
$this->assertEquals(
@@ -217,7 +217,7 @@ public function testGetTreatmentWitNumberKey()
->with($this->logicalOr(
$this->equalTo("getTreatment: key '123456' is not of type string, converting."),
$this->equalTo("getTreatment: you passed some_feature that does not exist in this environment, "
- . "please double check what Splits exist in the web console.")
+ . "please double check what feature flags exist in the Split user interface.")
));
$this->assertEquals('control', $splitSdk->getTreatment(123456, 'some_feature'));
@@ -244,7 +244,7 @@ public function testGetTreatmentWithNullFeatureName()
$logger->expects($this->once())
->method('critical')
- ->with($this->equalTo("getTreatment: you passed a null split name, split name must be a non-empty"
+ ->with($this->equalTo("getTreatment: you passed a null featureFlagName, flag name must be a non-empty"
. " string."));
$this->assertEquals('control', $splitSdk->getTreatment('some_key', null));
@@ -258,7 +258,7 @@ public function testGetTreatmentWithEmptyFeatureName()
$logger->expects($this->once())
->method('critical')
- ->with($this->equalTo("getTreatment: you passed an empty split name, split name must be a non-empty"
+ ->with($this->equalTo("getTreatment: you passed an empty featureFlagName, flag name must be a non-empty"
. " string."));
$this->assertEquals('control', $splitSdk->getTreatment('some_key', ''));
@@ -272,7 +272,7 @@ public function testGetTreatmentWithNumericFeatureName()
$logger->expects($this->once())
->method('critical')
- ->with($this->equalTo("getTreatment: you passed an invalid split name, split name must be a non-empty"
+ ->with($this->equalTo("getTreatment: you passed an invalid featureFlagName, flag name must be a non-empty"
. " string."));
$this->assertEquals('control', $splitSdk->getTreatment('some_key', 12345));
@@ -288,7 +288,7 @@ public function testGetTreatmentWithFeatureNameWithWhitespaces()
->with($this->logicalOr(
$this->equalTo("getTreatment: key '123456' is not of type string, converting."),
$this->equalTo("getTreatment: you passed some_feature that does not exist in this environment, "
- . "please double check what Splits exist in the web console.")
+ . "please double check what feature flags exist in the Split user interface.")
));
$this->assertEquals('control', $splitSdk->getTreatment("some_key", 'some_feature '));
@@ -303,7 +303,7 @@ public function testGetTreatmentWithFeatureNameWithWhitespaces2()
$logger->expects($this->any())
->method('warning')
->with($this->logicalOr(
- $this->equalTo('getTreatment: split name " some_feature " has extra whitespace, trimming.')
+ $this->equalTo('getTreatment: featureFlagName " some_feature " has extra whitespace, trimming.')
));
$this->assertEquals('control', $splitSdk->getTreatment("some_key", ' some_feature '));
@@ -317,7 +317,7 @@ public function testGetTreatmentWitBooleanFeatureName()
$logger->expects($this->once())
->method('critical')
- ->with($this->equalTo("getTreatment: you passed an invalid split name, split name must be a non-empty"
+ ->with($this->equalTo("getTreatment: you passed an invalid featureFlagName, flag name must be a non-empty"
. " string."));
$this->assertEquals('control', $splitSdk->getTreatment('some_key', true));
@@ -331,7 +331,7 @@ public function testGetTreatmentWitArrayFeatureName()
$logger->expects($this->once())
->method('critical')
- ->with($this->equalTo("getTreatment: you passed an invalid split name, split name must be a non-empty"
+ ->with($this->equalTo("getTreatment: you passed an invalid featureFlagName, flag name must be a non-empty"
. " string."));
$this->assertEquals('control', $splitSdk->getTreatment('some_key', array()));
@@ -346,7 +346,7 @@ public function testGetTreatmentWithNotExistantSplitName()
$logger->expects($this->once())
->method('warning')
->with($this->equalTo("getTreatment: you passed some_feature_non_existant that does not exist in this"
- . " environment, please double check what Splits exist in the web console."));
+ . " environment, please double check what feature flags exist in the Split user interface."));
$this->assertEquals('control', $splitSdk->getTreatment('some_key_non_existant', 'some_feature_non_existant'));
}
@@ -360,7 +360,7 @@ public function testGetTreatmentWithConfigWithNotExistantSplitName()
$logger->expects($this->once())
->method('warning')
->with($this->equalTo("getTreatmentWithConfig: you passed some_feature_non_existant that does"
- . " not exist in this environment, please double check what Splits exist in the web console."));
+ . " not exist in this environment, please double check what feature flags exist in the Split user interface."));
$result = $splitSdk->getTreatmentWithConfig('some_key_non_existant', 'some_feature_non_existant');
$this->assertEquals('control', $result['treatment']);
@@ -374,7 +374,7 @@ public function testGetTreatmentWitConfigWithhNullFeatureName()
$logger->expects($this->once())
->method('critical')
- ->with($this->equalTo("getTreatmentWithConfig: you passed a null split name, split name must be a non-empty"
+ ->with($this->equalTo("getTreatmentWithConfig: you passed a null featureFlagName, flag name must be a non-empty"
. " string."));
$result = $splitSdk->getTreatmentWithConfig('some_key', null);
diff --git a/tests/Suite/InputValidation/GetTreatmentsValidationTest.php b/tests/Suite/InputValidation/GetTreatmentsValidationTest.php
index 7e8d9da6..921f36c2 100644
--- a/tests/Suite/InputValidation/GetTreatmentsValidationTest.php
+++ b/tests/Suite/InputValidation/GetTreatmentsValidationTest.php
@@ -84,7 +84,7 @@ public function testGetTreatmentsWithNumberMatchingKey()
->with($this->logicalOr(
$this->equalTo("Key: matchingKey '12345' is not of type string, converting."),
$this->equalTo("getTreatments: you passed some_feature that does not exist in this environment, "
- . "please double check what Splits exist in the web console.")
+ . "please double check what feature flags exist in the Split user interface.")
));
$treatmentResult = $splitSdk->getTreatments(new Key(12345, 'some_bucketing_key'), array('some_feature'));
@@ -135,7 +135,7 @@ public function testGetTreatmentsWitNumberBucketingKey()
->with($this->logicalOr(
$this->equalTo("Key: bucketingKey '12345' is not of type string, converting."),
$this->equalTo("getTreatments: you passed some_feature that does not exist in this environment, "
- . "please double check what Splits exist in the web console.")
+ . "please double check what feature flags exist in the Split user interface.")
));
$treatmentResult = $splitSdk->getTreatments(new Key('some_matching_key', 12345), array('some_feature'));
@@ -200,7 +200,7 @@ public function testGetTreatmentsWitNumberKey()
->with($this->logicalOr(
$this->equalTo("getTreatments: key '123456' is not of type string, converting."),
$this->equalTo("getTreatments: you passed some_feature that does not exist in this environment, "
- . "please double check what Splits exist in the web console.")
+ . "please double check what feature flags exist in the Split user interface.")
));
$treatmentResult = $splitSdk->getTreatments(123456, array('some_feature'));
@@ -251,7 +251,7 @@ public function testGetTreatmentsWithNullFeatures()
$logger->expects($this->once())
->method('critical')
- ->with($this->equalTo('getTreatments: featureNames must be a non-empty array.'));
+ ->with($this->equalTo('getTreatments: featureFlagNames must be a non-empty array.'));
$this->assertEquals(array(), $splitSdk->getTreatments('some_key', null, null));
}
@@ -264,7 +264,7 @@ public function testGetTreatmentsWithFeaturesNotArray()
$logger->expects($this->once())
->method('critical')
- ->with($this->equalTo('getTreatments: featureNames must be a non-empty array.'));
+ ->with($this->equalTo('getTreatments: featureFlagNames must be a non-empty array.'));
$this->assertEquals(array(), $splitSdk->getTreatments('some_key', true, null));
}
@@ -277,7 +277,7 @@ public function testGetTreatmentsWithEmptyFeatures()
$logger->expects($this->once())
->method('critical')
- ->with($this->equalTo('getTreatments: featureNames must be a non-empty array.'));
+ ->with($this->equalTo('getTreatments: featureFlagNames must be a non-empty array.'));
$this->assertEquals(array(), $splitSdk->getTreatments('some_key', array(), null));
}
@@ -290,9 +290,9 @@ public function testGetTreatmentsWithNullFeaturesNames()
$logger->expects($this->exactly(3))
->method('critical')
->willReturnOnConsecutiveCalls(
- 'getTreatments: you passed a null split name, split name must be a non-empty string.',
- 'getTreatments: you passed a null split name, split name must be a non-empty string.',
- 'getTreatments: featureNames must be a non-empty array.'
+ 'getTreatments: you passed a null featureFlagName, flag name must be a non-empty string.',
+ 'getTreatments: you passed a null featureFlagName, flag name must be a non-empty string.',
+ 'getTreatments: featureFlagNames must be a non-empty array.'
);
$this->assertEquals(array(), $splitSdk->getTreatments('some_key', array(null, null), null));
}
@@ -323,9 +323,9 @@ public function testGetTreatmentsWithOneWrongTypeOfFeaturesNames()
$logger->expects($this->exactly(3))
->method('critical')
->willReturnOnConsecutiveCalls(
- 'getTreatments: you passed an invalid split name, split name must be a non-empty string.',
- 'getTreatments: you passed an invalid split name, split name must be a non-empty string',
- 'getTreatments: featureNames must be a non-empty array.'
+ 'getTreatments: you passed an invalid featureFlagName, flag name must be a non-empty string.',
+ 'getTreatments: you passed an invalid featureFlagName, flag name must be a non-empty string',
+ 'getTreatments: featureFlagNames must be a non-empty array.'
);
$this->assertEquals(array(), $splitSdk->getTreatments('some_key', array(true, array()), null));
@@ -339,9 +339,9 @@ public function testGetTreatmenstWithFeatureNameWithWhitespaces()
$logger->expects($this->any())
->method('warning')
->with($this->logicalOr(
- $this->equalTo('getTreatments: split name "some_feature " has extra whitespace, trimming.'),
+ $this->equalTo('getTreatments: featureFlagName "some_feature " has extra whitespace, trimming.'),
$this->equalTo("getTreatments: you passed some_feature that does not exist in this environment, "
- . "please double check what Splits exist in the web console.")
+ . "please double check what feature flags exist in the Split user interface.")
));
$treatmentResult = $splitSdk->getTreatments("some_key", array('some_feature '));
@@ -359,9 +359,9 @@ public function testGetTreatmenstWithFeatureNameWithWhitespaces2()
$logger->expects($this->any())
->method('warning')
->with($this->logicalOr(
- $this->equalTo('getTreatments: split name " some_feature " has extra whitespace, trimming.'),
+ $this->equalTo('getTreatments: featureFlagName " some_feature " has extra whitespace, trimming.'),
$this->equalTo("getTreatments: you passed some_feature that does not exist in this environment, "
- . "please double check what Splits exist in the web console.")
+ . "please double check what feature flags exist in the Split user interface.")
));
$treatmentResult = $splitSdk->getTreatments("some_key", array(' some_feature '));
@@ -380,7 +380,7 @@ public function testGetTreatmenstWithoutExistingFeatureName()
$logger->expects($this->once())
->method('warning')
->with($this->equalTo("getTreatments: you passed some_feature_non_existant that does"
- . " not exist in this environment, please double check what Splits exist in the web console."));
+ . " not exist in this environment, please double check what feature flags exist in the Split user interface."));
$treatmentResult = $splitSdk->getTreatments("some_key", array('some_feature_non_existant'));
@@ -398,7 +398,7 @@ public function testGetTreatmenstConfigWithoutExistingFeatureName()
$logger->expects($this->once())
->method('warning')
->with($this->equalTo("getTreatmentsWithConfig: you passed some_feature_non_existant that does"
- . " not exist in this environment, please double check what Splits exist in the web console."));
+ . " not exist in this environment, please double check what feature flags exist in the Split user interface."));
$treatmentResult = $splitSdk->getTreatmentsWithConfig("some_key", array('some_feature_non_existant'));
@@ -415,7 +415,7 @@ public function testGetTreatmenstConfigWithNullFeatures()
$logger->expects($this->once())
->method('critical')
- ->with($this->equalTo('getTreatmentsWithConfig: featureNames must be a non-empty array.'));
+ ->with($this->equalTo('getTreatmentsWithConfig: featureFlagNames must be a non-empty array.'));
$treatmentResult = $splitSdk->getTreatmentsWithConfig("some_key", null);
$this->assertEquals(array(), $treatmentResult);
@@ -429,7 +429,7 @@ public function testGetTreatmenstConfigWithEmptyFeatures()
$logger->expects($this->once())
->method('critical')
- ->with($this->equalTo('getTreatmentsWithConfig: featureNames must be a non-empty array.'));
+ ->with($this->equalTo('getTreatmentsWithConfig: featureFlagNames must be a non-empty array.'));
$treatmentResult = $splitSdk->getTreatmentsWithConfig("some_key", array());
$this->assertEquals(array(), $treatmentResult);
diff --git a/tests/Suite/InputValidation/ManagerValidationTest.php b/tests/Suite/InputValidation/ManagerValidationTest.php
index 77ef7bb9..7035fc1f 100644
--- a/tests/Suite/InputValidation/ManagerValidationTest.php
+++ b/tests/Suite/InputValidation/ManagerValidationTest.php
@@ -46,7 +46,7 @@ public function testManagerWithNullSplitName()
$logger->expects($this->once())
->method('critical')
- ->with($this->equalTo("split: you passed a null split name, split name must be a non-empty string."));
+ ->with($this->equalTo("split: you passed a null featureFlagName, flag name must be a non-empty string."));
$this->assertEquals(null, $splitSdk->split(null));
}
@@ -59,7 +59,7 @@ public function testManagerWithEmptySplitName()
$logger->expects($this->once())
->method('critical')
- ->with($this->equalTo("split: you passed an empty split name, split name must be a non-empty string."));
+ ->with($this->equalTo("split: you passed an empty featureFlagName, flag name must be a non-empty string."));
$this->assertEquals(null, $splitSdk->split(''));
}
@@ -72,7 +72,7 @@ public function testManagerWithBooleanSplitName()
$logger->expects($this->once())
->method('critical')
- ->with($this->equalTo("split: you passed an invalid split name, split name must be a non-empty string."));
+ ->with($this->equalTo("split: you passed an invalid featureFlagName, flag name must be a non-empty string."));
$this->assertEquals(null, $splitSdk->split(true));
}
@@ -85,7 +85,7 @@ public function testManagerWithArraySplitName()
$logger->expects($this->once())
->method('critical')
- ->with($this->equalTo("split: you passed an invalid split name, split name must be a non-empty string."));
+ ->with($this->equalTo("split: you passed an invalid featureFlagName, flag name must be a non-empty string."));
$this->assertEquals(null, $splitSdk->split(array()));
}
@@ -98,7 +98,7 @@ public function testManagerWithNumberSplitName()
$logger->expects($this->once())
->method('critical')
- ->with($this->equalTo("split: you passed an invalid split name, split name must be a non-empty string."));
+ ->with($this->equalTo("split: you passed an invalid featureFlagName, flag name must be a non-empty string."));
$this->assertEquals(null, $splitSdk->split(1));
}
@@ -112,7 +112,7 @@ public function testManagerWithValidFeatureName()
$logger->expects($this->once())
->method('warning')
->with($this->equalTo("split: you passed this_is_a_non_existing_split that does"
- . " not exist in this environment, please double check what Splits exist in the web console."));
+ . " not exist in this environment, please double check what feature flags exist in the Split user interface."));
$this->assertEquals(null, $splitSdk->split('this_is_a_non_existing_split'));
}
diff --git a/tests/Suite/Sdk/SdkClientTest.php b/tests/Suite/Sdk/SdkClientTest.php
index a26ab3fa..12c3dcfa 100644
--- a/tests/Suite/Sdk/SdkClientTest.php
+++ b/tests/Suite/Sdk/SdkClientTest.php
@@ -337,7 +337,7 @@ public function testClient()
$this->assertEquals('on', $result['all_feature']);
$this->validateLastImpression($redisClient, 'all_feature', 'invalidKey', 'on');
- //testing multiple splitNames
+ //testing multiple featureFlags
$result = $splitSdk->getTreatments('invalidKey', array(
'all_feature',
'killed_feature',
@@ -388,7 +388,7 @@ public function testClient()
$this->assertEquals(null, $result['all_feature']['config']);
$this->validateLastImpression($redisClient, 'all_feature', 'invalidKey', 'on');
- //testing multiple splitNames
+ //testing multiple featureFlags
$result = $splitSdk->getTreatmentsWithConfig('invalidKey', array(
'all_feature',
'killed_feature',