Update EvaluationResult spec

Contributes to Flagsmith/flagsmith#6121

Author: emyller

src/Engine/Engine.php

@@ -44,7 +44,7 @@ public static function getEvaluationResult($context): EvaluationResult
         /** @var array<string, SegmentContext> */
         $matchedSegmentsByFeatureKey = [];
 
-        /** @var array<FlagResult> */
+        /** @var array<string, FlagResult> */
         $evaluatedFlags = [];
 
         foreach ($context->segments as $segment) {
@@ -80,23 +80,23 @@ public static function getEvaluationResult($context): EvaluationResult
 
         foreach ($context->features as $feature) {
             $featureKey = $feature->feature_key;
+            $featureName = $feature->name;
             $evaluatedFeature = $evaluatedFeatures[$featureKey] ?? null;
             if ($evaluatedFeature) {
-                $evaluatedFlags[] = self::getFlagResultFromSegmentContext(
+                $evaluatedFlags[$featureName] = self::getFlagResultFromSegmentContext(
                     $evaluatedFeature,
                     $matchedSegmentsByFeatureKey[$featureKey],
                 );
                 continue;
             }
 
-            $evaluatedFlags[] = self::getFlagResultFromFeatureContext(
+            $evaluatedFlags[$featureName] = self::getFlagResultFromFeatureContext(
                 $feature,
                 $context->identity?->key,
             );
         }
 
         $result = new EvaluationResult();
-        $result->context = $context;
         $result->flags = $evaluatedFlags;
         $result->segments = $evaluatedSegments;
         return $result;

src/Engine/Utils/Types/Result/EvaluationResult.php

@@ -2,14 +2,9 @@
 
 namespace Flagsmith\Engine\Utils\Types\Result;
 
-use Flagsmith\Engine\Utils\Types\Context\EvaluationContext;
-
 // TODO: Port this to https://wiki.php.net/rfc/dataclass
 class EvaluationResult
 {
-    /** @var EvaluationContext */
-    public $context;
-
     /** @var array<FlagResult> */
     public array $flags;
 

tests/Engine/EngineTests/EngineDataTest.php

@@ -41,12 +41,6 @@ public function testEngine(
         // When
         $evaluationResult = Engine::getEvaluationResult($evaluationContext);
 
-        // Hack to allow comparing flags as associative arrays (<feature_name>: <flag>)
-        $wanted = array_column($expectedEvaluationResult->flags, null, 'name');
-        $expectedEvaluationResult->flags = $wanted;
-        $actual = array_column($evaluationResult->flags, null, 'name');
-        $evaluationResult->flags = $actual;
-
         // Then
         $this->assertEquals(
             json_decode(json_encode($expectedEvaluationResult), true),