Pop feature ID out of the override key

Author: emyller

src/Utils/Mappers.php

@@ -141,6 +141,9 @@ private static function _mapEnvironmentDocumentFeatureStatesToFeatureContexts($f
      */
     private static function _mapIdentityOverridesToSegments($identityOverrides)
     {
+        /** @var array<string, int> */
+        $featureIDsByName = [];
+
         /** @var array<string, array<string>> */
         $featuresToIdentifiers = [];
         foreach ($identityOverrides as $identityOverride) {
@@ -154,8 +157,8 @@ private static function _mapIdentityOverridesToSegments($identityOverrides)
             /** @var array<array<mixed>> */
             $overridesKey = [];
             foreach ($identityFeatures as $featureState) {
+                $featureIDsByName[$featureState->feature->name] = $featureState->feature->id;
                 $part = [
-                    $featureState->feature->id,
                     $featureState->feature->name,
                     $featureState->enabled,
                     $featureState->feature_state_value,
@@ -185,7 +188,8 @@ private static function _mapIdentityOverridesToSegments($identityOverrides)
 
             $segment->overrides = [];
             foreach (unserialize($serializedOverridesKey) as $overrideKey) {
-                [$featureId, $featureName, $enabled, $value] = $overrideKey;
+                [$featureName, $enabled, $value] = $overrideKey;
+                $featureId = $featureIDsByName[$featureName];
                 $feature = new FeatureContext();
                 $feature->key = '';  // Not used in identity overrides
                 $feature->name = $featureName;

tests/Utils/MappersTest.php

@@ -47,7 +47,7 @@ public function testMapEnvironmentDocumentToContextProducesEvaluationContext():
         $this->assertEquals(SegmentConditionOperator::EQUAL, $context->segments[0]->rules[0]->rules[0]->conditions[0]->operator);
         $this->assertEquals('bar', $context->segments[0]->rules[0]->rules[0]->conditions[0]->value);
 
-        $overrideKey = '1dfdec3e4c67121138b1faa01b82f9f731c692842b865f263824bfabf46d5fff';
+        $overrideKey = '2a3691c8a306223592e2e657e50c44cf126db84730e813adea6f951c502b19e8';
         $this->assertArrayHasKey($overrideKey, $context->segments);
         $this->assertEquals('', $context->segments[$overrideKey]->key);
         $this->assertEquals('identity_overrides', $context->segments[$overrideKey]->name);