Merge branch 'master' into php-8-5

Author: xepozz

.github/workflows/run-test-suite.yml

@@ -95,6 +95,8 @@ jobs:
 
       - name: Run tests
         run: ${{ inputs.test-command }}
+        env:
+          XDEBUG_MODE: off
 
       - name: Check for failures
         if: steps.validate.outcome == 'failure'

psalm-baseline.xml

@@ -1178,6 +1178,7 @@
       <code><![CDATA[$scope]]></code>
     </PropertyNotSetInConstructor>
     <UnsupportedPropertyReferenceUsage>
+      <code><![CDATA[$ctx->currentDetails = &$context->currentDetails]]></code>
       <code><![CDATA[$ctx->trace = &$context->trace]]></code>
     </UnsupportedPropertyReferenceUsage>
   </file>

src/DataConverter/DataConverter.php

@@ -39,27 +39,33 @@ public static function createDefault(): DataConverterInterface
         );
     }
 
-    public function fromPayload(Payload $payload, $type)
+    /**
+     * @param string|\ReflectionClass|\ReflectionType|Type|null $type
+     */
+    public function fromPayload(Payload $payload, $type): mixed
     {
+        $type = Type::create($type);
+
+        if ($type->isClass() && $type->getName() === RawValue::class) {
+            return new RawValue($payload);
+        }
+
         /** @var \ArrayAccess $meta */
         $meta = $payload->getMetadata();
 
         $encoding = $meta[EncodingKeys::METADATA_ENCODING_KEY];
 
         if (!isset($this->converters[$encoding])) {
-            throw new DataConverterException(\sprintf('Undefined payload encoding %s', $encoding));
+            throw new DataConverterException(\sprintf('Undefined payload encoding "%s"', $encoding));
         }
 
-        $type = Type::create($type);
-        if (\in_array($type->getName(), [Type::TYPE_VOID, Type::TYPE_NULL, Type::TYPE_FALSE, Type::TYPE_TRUE], true)) {
-            return match ($type->getName()) {
-                Type::TYPE_VOID, Type::TYPE_NULL => null,
-                Type::TYPE_TRUE => true,
-                Type::TYPE_FALSE => false,
-            };
-        }
-
-        return $this->converters[$encoding]->fromPayload($payload, $type);
+        return match ($type->getName()) {
+            Type::TYPE_VOID,
+            Type::TYPE_NULL => null,
+            Type::TYPE_TRUE => true,
+            Type::TYPE_FALSE => false,
+            default => $this->converters[$encoding]->fromPayload($payload, $type),
+        };
     }
 
     /**
@@ -69,6 +75,9 @@ public function fromPayload(Payload $payload, $type)
      */
     public function toPayload($value): Payload
     {
+        if ($value instanceof RawValue) {
+            return $value->getPayload();
+        }
         foreach ($this->converters as $converter) {
             $payload = $converter->toPayload($value);
 

src/DataConverter/DataConverterInterface.php

@@ -23,12 +23,10 @@ interface DataConverterInterface
      * @psalm-mutation-free
      * @throws DataConverterException
      */
-    public function fromPayload(Payload $payload, $type);
+    public function fromPayload(Payload $payload, mixed $type);
 
     /**
-     * @param mixed $value
-     *
      * @throws DataConverterException
      */
-    public function toPayload($value): Payload;
+    public function toPayload(mixed $value): Payload;
 }

src/DataConverter/EncodingKeys.php

@@ -17,6 +17,7 @@ final class EncodingKeys
     public const METADATA_MESSAGE_TYPE = 'messageType';
     public const METADATA_ENCODING_NULL = 'binary/null';
     public const METADATA_ENCODING_RAW = 'binary/plain';
+    public const METADATA_ENCODING_RAW_VALUE = 'binary';
     public const METADATA_ENCODING_JSON = 'json/plain';
     public const METADATA_ENCODING_PROTOBUF_JSON = 'json/protobuf';
     public const METADATA_ENCODING_PROTOBUF = 'binary/protobuf';

src/DataConverter/ProtoJsonConverter.php

@@ -50,7 +50,13 @@ public function toPayload($value): ?Payload
     public function fromPayload(Payload $payload, Type $type)
     {
         if (!$type->isClass()) {
-            throw new DataConverterException('Unable to decode value using protobuf converter - ');
+            throw new DataConverterException(
+                \sprintf(
+                    'Unable to decode value using "%s" encoding converter: resulting type must be a class, "%s" given',
+                    $this->getEncodingType(),
+                    $type->getName(),
+                ),
+            );
         }
 
         try {

src/DataConverter/RawValue.php

@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * This file is part of Temporal package.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Temporal\DataConverter;
+
+use Temporal\Api\Common\V1\Payload;
+
+final class RawValue
+{
+    private Payload $payload;
+
+    public function __construct(Payload $data)
+    {
+        $this->payload = $data;
+    }
+
+    public function getPayload(): Payload
+    {
+        return $this->payload;
+    }
+}

src/DataConverter/Type.php

@@ -79,25 +79,14 @@ public static function fromReflectionType(\ReflectionType $type): self
      */
     public static function create($type): Type
     {
-        switch (true) {
-            case $type instanceof ReturnType:
-                return new self($type->name, $type->nullable);
-
-            case $type instanceof self:
-                return $type;
-
-            case \is_string($type):
-                return new self($type);
-
-            case $type instanceof \ReflectionClass:
-                return self::fromReflectionClass($type);
-
-            case $type instanceof \ReflectionType:
-                return self::fromReflectionType($type);
-
-            default:
-                return new self();
-        }
+        return match (true) {
+            $type instanceof ReturnType => new self($type->name, $type->nullable),
+            $type instanceof self => $type,
+            \is_string($type) => new self($type),
+            $type instanceof \ReflectionClass => self::fromReflectionClass($type),
+            $type instanceof \ReflectionType => self::fromReflectionType($type),
+            default => new self(),
+        };
     }
 
     public function getName(): string

src/Internal/Transport/Router/InvokeQuery.php

@@ -122,12 +122,14 @@ private function workflowMetadata(Deferred $resolver, WorkflowContext $context):
             static function () use ($resolver, $context): void {
                 try {
                     $result = EncodedValues::fromValues([
-                        (new WorkflowMetadata())->setDefinition(
-                            (new WorkflowDefinition())
-                                ->setQueryDefinitions($context->getQueryDispatcher()->getQueryHandlers())
-                                ->setSignalDefinitions($context->getSignalDispatcher()->getSignalHandlers())
-                                ->setUpdateDefinitions($context->getUpdateDispatcher()->getUpdateHandlers()),
-                        ),
+                        (new WorkflowMetadata())
+                            ->setDefinition(
+                                (new WorkflowDefinition())
+                                    ->setQueryDefinitions($context->getQueryDispatcher()->getQueryHandlers())
+                                    ->setSignalDefinitions($context->getSignalDispatcher()->getSignalHandlers())
+                                    ->setUpdateDefinitions($context->getUpdateDispatcher()->getUpdateHandlers()),
+                            )
+                            ->setCurrentDetails((string) $context->getCurrentDetails()),
                     ]);
 
                     $resolver->resolve($result);

src/Internal/Workflow/ScopeContext.php

@@ -57,6 +57,7 @@ public static function fromWorkflowContext(
         $ctx->readonly = $context->readonly;
         $ctx->continueAsNew = $context->continueAsNew;
         $ctx->trace = &$context->trace;
+        $ctx->currentDetails = &$context->currentDetails;
 
         return $ctx;
     }