Skip to content

Commit a6dccf4

Browse files
aliabbasrizvialiabbasrizvi
authored
Minor cleanups (#117)
1 parent 78a422d commit a6dccf4

File tree

7 files changed

+113
-113
lines changed

7 files changed

+113
-113
lines changed

‎src/Optimizely/DecisionService/DecisionService.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,14 @@ public function getVariationForFeature(FeatureFlag $featureFlag, $userId, $userA
215215
*/
216216
public function getVariationForFeatureExperiment(FeatureFlag $featureFlag, $userId, $userAttributes)
217217
{
218-
$feature_flag_key = $featureFlag->getKey();
218+
$featureFlagKey = $featureFlag->getKey();
219219
$experimentIds = $featureFlag->getExperimentIds();
220220

221221
// Check if there are any experiment IDs inside feature flag
222222
if (empty($experimentIds)) {
223223
$this->_logger->log(
224224
Logger::DEBUG,
225-
"The feature flag '{$feature_flag_key}' is not used in any experiments."
225+
"The feature flag '{$featureFlagKey}' is not used in any experiments."
226226
);
227227
return null;
228228
}
@@ -239,7 +239,7 @@ public function getVariationForFeatureExperiment(FeatureFlag $featureFlag, $user
239239
if ($variation && $variation->getKey()) {
240240
$this->_logger->log(
241241
Logger::INFO,
242-
"The user '{$userId}' is bucketed into experiment '{$experiment->getKey()}' of feature '{$feature_flag_key}'."
242+
"The user '{$userId}' is bucketed into experiment '{$experiment->getKey()}' of feature '{$featureFlagKey}'."
243243
);
244244

245245
return new FeatureDecision($experiment, $variation, FeatureDecision::DECISION_SOURCE_EXPERIMENT);
@@ -248,7 +248,7 @@ public function getVariationForFeatureExperiment(FeatureFlag $featureFlag, $user
248248

249249
$this->_logger->log(
250250
Logger::INFO,
251-
"The user '{$userId}' is not bucketed into any of the experiments using the feature '{$feature_flag_key}'."
251+
"The user '{$userId}' is not bucketed into any of the experiments using the feature '{$featureFlagKey}'."
252252
);
253253

254254
return null;
@@ -270,12 +270,12 @@ public function getVariationForFeatureExperiment(FeatureFlag $featureFlag, $user
270270
public function getVariationForFeatureRollout(FeatureFlag $featureFlag, $userId, $userAttributes)
271271
{
272272
$bucketing_id = $this->getBucketingId($userId, $userAttributes);
273-
$feature_flag_key = $featureFlag->getKey();
273+
$featureFlagKey = $featureFlag->getKey();
274274
$rollout_id = $featureFlag->getRolloutId();
275275
if (empty($rollout_id)) {
276276
$this->_logger->log(
277277
Logger::DEBUG,
278-
"Feature flag '{$feature_flag_key}' is not used in a rollout."
278+
"Feature flag '{$featureFlagKey}' is not used in a rollout."
279279
);
280280
return null;
281281
}

‎src/Optimizely/Event/Builder/Params.php

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright 2016-2017, Optimizely
3+
* Copyright 2016-2018, Optimizely
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.
@@ -16,25 +16,25 @@
1616
*/
1717

1818
define('ACCOUNT_ID', 'account_id');
19-
define('PROJECT_ID', 'project_id');
20-
define('ENTITY_ID', 'entity_id');
21-
define('TIMESTAMP', 'timestamp');
22-
define('VISITORS', 'visitors');
23-
define('REVISION', 'revision');
24-
define('EXPERIMENT_ID', 'experiment_id');
25-
define('VARIATION_ID', 'variation_id');
19+
define('ACTIVATE_EVENT_KEY', 'campaign_activated');
20+
define('ANONYMIZE_IP', 'anonymize_ip');
21+
define('ATTRIBUTES', 'attributes');
2622
define('CAMPAIGN_ID', 'campaign_id');
27-
define('VISITOR_ID', 'visitor_id');
28-
define('DECISIONS', 'decisions');
29-
define('EVENTS', 'events');;
3023
define('CLIENT_ENGINE', 'client_name');
3124
define('CLIENT_VERSION', 'client_version');
3225
define('CUSTOM_ATTRIBUTE_FEATURE_TYPE', 'custom');
33-
define('ACTIVATE_EVENT_KEY', 'campaign_activated');
34-
define('SNAPSHOTS', 'snapshots');
35-
define('ATTRIBUTES', 'attributes');
26+
define('DECISIONS', 'decisions');
27+
define('ENTITY_ID', 'entity_id');
28+
define('EVENTS', 'events');;
29+
define('EXPERIMENT_ID', 'experiment_id');
3630
define('KEY', 'key');
31+
define('PROJECT_ID', 'project_id');
32+
define('REVISION', 'revision');
33+
define('SNAPSHOTS', 'snapshots');
34+
define('TIMESTAMP', 'timestamp');
3735
define('TYPE', 'type');
38-
define('VALUE', 'value');
3936
define('UUID', 'uuid');
40-
define('ANONYMIZE_IP', 'anonymize_ip');
37+
define('VALUE', 'value');
38+
define('VARIATION_ID', 'variation_id');
39+
define('VISITOR_ID', 'visitor_id');
40+
define('VISITORS', 'visitors');

‎src/Optimizely/Optimizely.php

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
use Optimizely\DecisionService\FeatureDecision;
2626
use Optimizely\Entity\Experiment;
2727
use Optimizely\Entity\FeatureVariable;
28-
use Optimizely\Logger\DefaultLogger;
2928
use Optimizely\ErrorHandler\ErrorHandlerInterface;
3029
use Optimizely\ErrorHandler\NoOpErrorHandler;
3130
use Optimizely\Event\Builder\EventBuilder;
3231
use Optimizely\Event\Dispatcher\DefaultEventDispatcher;
3332
use Optimizely\Event\Dispatcher\EventDispatcherInterface;
33+
use Optimizely\Logger\DefaultLogger;
3434
use Optimizely\Logger\LoggerInterface;
3535
use Optimizely\Logger\NoOpLogger;
3636
use Optimizely\Notification\NotificationCenter;
@@ -479,18 +479,18 @@ public function isFeatureEnabled($featureFlagKey, $userId, $attributes = null)
479479
return false;
480480
}
481481

482-
$feature_flag = $this->_config->getFeatureFlagFromKey($featureFlagKey);
483-
if ($feature_flag && (!$feature_flag->getId())) {
482+
$featureFlag = $this->_config->getFeatureFlagFromKey($featureFlagKey);
483+
if ($featureFlag && (!$featureFlag->getId())) {
484484
// Error logged in ProjectConfig - getFeatureFlagFromKey
485485
return false;
486486
}
487487

488488
//validate feature flag
489-
if (!Validator::isFeatureFlagValid($this->_config, $feature_flag)) {
489+
if (!Validator::isFeatureFlagValid($this->_config, $featureFlag)) {
490490
return false;
491491
}
492492

493-
$decision = $this->_decisionService->getVariationForFeature($feature_flag, $userId, $attributes);
493+
$decision = $this->_decisionService->getVariationForFeature($featureFlag, $userId, $attributes);
494494
if (!$decision) {
495495
$this->_logger->log(Logger::INFO, "Feature Flag '{$featureFlagKey}' is not enabled for user '{$userId}'.");
496496
return false;
@@ -574,8 +574,8 @@ public function getFeatureVariableValueForType(
574574
return null;
575575
}
576576

577-
$feature_flag = $this->_config->getFeatureFlagFromKey($featureFlagKey);
578-
if ($feature_flag && (!$feature_flag->getId())) {
577+
$featureFlag = $this->_config->getFeatureFlagFromKey($featureFlagKey);
578+
if ($featureFlag && (!$featureFlag->getId())) {
579579
// Error logged in ProjectConfig - getFeatureFlagFromKey
580580
return null;
581581
}
@@ -594,35 +594,35 @@ public function getFeatureVariableValueForType(
594594
return null;
595595
}
596596

597-
$decision = $this->_decisionService->getVariationForFeature($feature_flag, $userId, $attributes);
598-
$variable_value = $variable->getDefaultValue();
597+
$decision = $this->_decisionService->getVariationForFeature($featureFlag, $userId, $attributes);
598+
$variableValue = $variable->getDefaultValue();
599599

600600
if (!$decision) {
601601
$this->_logger->log(
602602
Logger::INFO,
603603
"User '{$userId}'is not in any variation, ".
604-
"returning default value '{$variable_value}'."
604+
"returning default value '{$variableValue}'."
605605
);
606606
} else {
607607
$variation = $decision->getVariation();
608608
$variable_usage = $variation->getVariableUsageById($variable->getId());
609609
if ($variable_usage) {
610-
$variable_value = $variable_usage->getValue();
610+
$variableValue = $variable_usage->getValue();
611611
$this->_logger->log(
612612
Logger::INFO,
613-
"Returning variable value '{$variable_value}' for variation '{$variation->getKey()}' ".
613+
"Returning variable value '{$variableValue}' for variation '{$variation->getKey()}' ".
614614
"of feature flag '{$featureFlagKey}'"
615615
);
616616
} else {
617617
$this->_logger->log(
618618
Logger::INFO,
619619
"Variable '{$variableKey}' is not used in variation '{$variation->getKey()}', ".
620-
"returning default value '{$variable_value}'."
620+
"returning default value '{$variableValue}'."
621621
);
622622
}
623623
}
624624

625-
return $variable_value;
625+
return $variableValue;
626626
}
627627

628628
/**
@@ -637,19 +637,19 @@ public function getFeatureVariableValueForType(
637637
*/
638638
public function getFeatureVariableBoolean($featureFlagKey, $variableKey, $userId, $attributes = null)
639639
{
640-
$variable_value = $this->getFeatureVariableValueForType(
640+
$variableValue = $this->getFeatureVariableValueForType(
641641
$featureFlagKey,
642642
$variableKey,
643643
$userId,
644644
$attributes,
645645
FeatureVariable::BOOLEAN_TYPE
646646
);
647647

648-
if (!is_null($variable_value)) {
649-
return VariableTypeUtils::castStringToType($variable_value, FeatureVariable::BOOLEAN_TYPE, $this->_logger);
648+
if (!is_null($variableValue)) {
649+
return VariableTypeUtils::castStringToType($variableValue, FeatureVariable::BOOLEAN_TYPE, $this->_logger);
650650
}
651651

652-
return $variable_value;
652+
return $variableValue;
653653
}
654654

655655
/**
@@ -664,19 +664,19 @@ public function getFeatureVariableBoolean($featureFlagKey, $variableKey, $userId
664664
*/
665665
public function getFeatureVariableInteger($featureFlagKey, $variableKey, $userId, $attributes = null)
666666
{
667-
$variable_value = $this->getFeatureVariableValueForType(
667+
$variableValue = $this->getFeatureVariableValueForType(
668668
$featureFlagKey,
669669
$variableKey,
670670
$userId,
671671
$attributes,
672672
FeatureVariable::INTEGER_TYPE
673673
);
674674

675-
if (!is_null($variable_value)) {
676-
return VariableTypeUtils::castStringToType($variable_value, FeatureVariable::INTEGER_TYPE, $this->_logger);
675+
if (!is_null($variableValue)) {
676+
return VariableTypeUtils::castStringToType($variableValue, FeatureVariable::INTEGER_TYPE, $this->_logger);
677677
}
678678

679-
return $variable_value;
679+
return $variableValue;
680680
}
681681

682682
/**
@@ -691,19 +691,19 @@ public function getFeatureVariableInteger($featureFlagKey, $variableKey, $userId
691691
*/
692692
public function getFeatureVariableDouble($featureFlagKey, $variableKey, $userId, $attributes = null)
693693
{
694-
$variable_value = $this->getFeatureVariableValueForType(
694+
$variableValue = $this->getFeatureVariableValueForType(
695695
$featureFlagKey,
696696
$variableKey,
697697
$userId,
698698
$attributes,
699699
FeatureVariable::DOUBLE_TYPE
700700
);
701701

702-
if (!is_null($variable_value)) {
703-
return VariableTypeUtils::castStringToType($variable_value, FeatureVariable::DOUBLE_TYPE, $this->_logger);
702+
if (!is_null($variableValue)) {
703+
return VariableTypeUtils::castStringToType($variableValue, FeatureVariable::DOUBLE_TYPE, $this->_logger);
704704
}
705705

706-
return $variable_value;
706+
return $variableValue;
707707
}
708708

709709
/**
@@ -718,14 +718,14 @@ public function getFeatureVariableDouble($featureFlagKey, $variableKey, $userId,
718718
*/
719719
public function getFeatureVariableString($featureFlagKey, $variableKey, $userId, $attributes = null)
720720
{
721-
$variable_value = $this->getFeatureVariableValueForType(
721+
$variableValue = $this->getFeatureVariableValueForType(
722722
$featureFlagKey,
723723
$variableKey,
724724
$userId,
725725
$attributes,
726726
FeatureVariable::STRING_TYPE
727727
);
728728

729-
return $variable_value;
729+
return $variableValue;
730730
}
731731
}

‎src/Optimizely/ProjectConfig.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -508,8 +508,8 @@ public function getVariationFromId($experimentKey, $variationId)
508508
*/
509509
public function getFeatureVariableFromKey($featureFlagKey, $variableKey)
510510
{
511-
$feature_flag = $this->getFeatureFlagFromKey($featureFlagKey);
512-
if ($feature_flag && !($feature_flag->getKey())) {
511+
$featureFlag = $this->getFeatureFlagFromKey($featureFlagKey);
512+
if ($featureFlag && !($featureFlag->getKey())) {
513513
return null;
514514
}
515515

0 commit comments

Comments
 (0)