Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/Flagsmith.php
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,11 @@ private function getEnvironmentFlagsFromLocalEvaluationContext(): Flags
throw new FlagsmithClientError('Evaluation context is not present');
}

$evaluationResult = Engine::getEvaluationResult($this->localEvaluationContext);
// Omit segments from evaluation context for environment flags
$context = $this->localEvaluationContext->deepClone();
$context->segments = [];

$evaluationResult = Engine::getEvaluationResult($context);

return Flags::fromEvaluationResult(
$evaluationResult,
Expand Down
14 changes: 14 additions & 0 deletions tests/ClientFixtures.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,18 @@ public static function getFlags()
{
return EnvironmentModel::build(json_decode(self::loadFileContents('environment.json')));
}

public static function getMockClientWithSegmentOverride()
{
$handlerBuilder = self::getHandlerBuilder();
$handlerBuilder->addRoute(
self::getRouteBuilder()->new()
->withMethod('GET')
->withPath('/api/v1/environment-document/')
->withFileResponse(self::DATA_DIR . 'environment_with_segment_override.json')
->build()
);

return self::getMockClient($handlerBuilder, false);
}
}
70 changes: 70 additions & 0 deletions tests/Data/environment_with_segment_override.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"api_key": "test-api-key",
"name": "Test environment with segment override",
"project": {
"name": "Test project",
"organisation": {
"feature_analytics": false,
"name": "Test Org",
"id": 1,
"persist_trait_data": true,
"stop_serving_flags": false
},
"id": 1,
"hide_disabled_flags": false,
"segments": [
{
"id": 1,
"name": "Test segment with override",
"feature_states": [
{
"feature_state_value": "segment-override-value",
"django_id": 10,
"featurestate_uuid": "99999999-9999-9999-9999-999999999999",
"feature": {
"name": "test_feature",
"type": "STANDARD",
"id": 10
},
"enabled": false,
"multivariate_feature_state_values": [],
"feature_segment": {
"priority": 1
}
}
],
"rules": [
{
"type": "ALL",
"rules": [],
"conditions": [
{
"operator": "EQUAL",
"property_": "$.environment.name",
"value": "Test environment with segment override"
}
]
}
]
}
]
},
"segment_overrides": [],
"id": 1,
"feature_states": [
{
"feature_state_value": "environment-default-value",
"django_id": 1,
"featurestate_uuid": "00000000-0000-0000-0000-000000000000",
"feature": {
"name": "test_feature",
"type": "STANDARD",
"id": 10
},
"segment_id": null,
"enabled": true,
"multivariate_feature_state_values": []
}
],
"identity_overrides": []
}
21 changes: 21 additions & 0 deletions tests/FlagsmithClientTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -478,4 +478,25 @@ public function testApiRequestsIncludeUserAgentHeader()
$expectedUserAgent = "flagsmith-php-sdk/{$expectedVersion}";
$this->assertEquals($expectedUserAgent, $userAgent);
}

public function testGetEnvironmentFlagsOmitsSegmentsFromEvaluation()
{
// Given
$flagsmith = (new Flagsmith('ser.api_key', environmentTtl: 1))
->withClient(ClientFixtures::getMockClientWithSegmentOverride());
$flagsmith->updateEnvironment();

// When
$environmentFlags = $flagsmith->getEnvironmentFlags();
$identityFlags = $flagsmith->getIdentityFlags('test-identity');

// Then
$environmentFlag = $environmentFlags->getFlag('test_feature');
$this->assertTrue($environmentFlag->enabled);
$this->assertEquals('environment-default-value', $environmentFlag->value);

$identityFlag = $identityFlags->getFlag('test_feature');
$this->assertFalse($identityFlag->enabled);
$this->assertEquals('segment-override-value', $identityFlag->value);
}
}