Promote metadata from unwrapped into deferred result after merge

Author: chr-hertel

src/platform/src/Result/DeferredResult.php

@@ -50,14 +50,17 @@ public function getResult(): ResultInterface
                 $this->convertedResult->setRawResult($this->rawResult);
             }
 
-            $this->convertedResult->getMetadata()->merge($this->getMetadata()->all());
+            $metadata = $this->convertedResult->getMetadata();
+            $metadata->merge($this->getMetadata()->all());
 
             if (null !== $tokenUsageExtractor = $this->resultConverter->getTokenUsageExtractor()) {
                 if (null !== $tokenUsage = $tokenUsageExtractor->extract($this->rawResult, $this->options)) {
-                    $this->convertedResult->getMetadata()->add('token_usage', $tokenUsage);
+                    $metadata->add('token_usage', $tokenUsage);
                 }
             }
 
+            $this->metadata->set($metadata->all());
+
             $this->isConverted = true;
         }
 

src/platform/tests/Result/DeferredResultTest.php

@@ -136,6 +136,18 @@ public function testItKeepsResultMetadata()
         $this->assertSame('value', $unwrappedResult->getMetadata()->get('key'));
     }
 
+    public function testMetadataGetsPromotedFromUnwrappedResult()
+    {
+        $result = new TextResult('Hello World');
+        $result->getMetadata()->add('foo', 'bar');
+        $converter = new PlainConverter($result);
+
+        $deferredResult = new DeferredResult($converter, new InMemoryRawResult());
+        $deferredResult->getResult();
+
+        $this->assertSame('bar', $deferredResult->getMetadata()->get('foo'));
+    }
+
     /**
      * Workaround for low deps because mocking the ResponseInterface leads to an exception with
      * mock creation "Type Traversable|object|array|string|null contains both object and a class type"