Merge branch 'master' into client-timeout-exceptions

composer.json

@@ -33,7 +33,7 @@
         "react/promise": "^2.9",
         "roadrunner-php/roadrunner-api-dto": "^1.9.0",
         "roadrunner-php/version-checker": "^1.0",
-        "spiral/attributes": "^3.1.4",
+        "spiral/attributes": "^3.1.6",
         "spiral/roadrunner": "^2024.1",
         "spiral/roadrunner-cli": "^2.5",
         "spiral/roadrunner-kv": "^4.2",

psalm-baseline.xml

@@ -1540,14 +1540,6 @@
       <code><![CDATA[run]]></code>
     </MissingReturnType>
   </file>
-  <file src="src/Worker/WorkerOptions.php">
-    <LessSpecificReturnStatement>
-      <code><![CDATA[new self()]]></code>
-    </LessSpecificReturnStatement>
-    <MoreSpecificReturnType>
-      <code><![CDATA[static]]></code>
-    </MoreSpecificReturnType>
-  </file>
   <file src="src/WorkerFactory.php">
     <DeprecatedClass>
       <code><![CDATA[new AnnotationReader()]]></code>

src/Client/Common/Paginator.php

@@ -15,8 +15,6 @@
  *
  * @template TItem
  * @implements IteratorAggregate<TItem>
- * @internal
- * @psalm-internal Temporal\Client
  */
 final class Paginator implements IteratorAggregate, Countable
 {
@@ -46,6 +44,8 @@ private function __construct(
      * @param null|callable(): int<0, max> $counter Returns total number of items.
      *
      * @return self<TInitItem>
+     *
+     * @internal
      */
     public static function createFromGenerator(Generator $loader, ?callable $counter): self
     {

src/Internal/Marshaller/Type/EnumType.php

@@ -28,10 +28,6 @@ class EnumType extends Type implements RuleFactoryInterface
 
     public function __construct(MarshallerInterface $marshaller, string $class = null)
     {
-        if (PHP_VERSION_ID < 80104) {
-            throw new \RuntimeException('Enums are not available in this version of PHP');
-        }
-
         if ($class === null) {
             throw new \RuntimeException('Enum is required');
         }

src/Internal/Marshaller/Type/EnumValueType.php

@@ -0,0 +1,80 @@
+<?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\Internal\Marshaller\Type;
+
+use BackedEnum;
+use Temporal\Internal\Marshaller\MarshallerInterface;
+use Temporal\Internal\Marshaller\MarshallingRule;
+
+/**
+ * @extends Type<int|string>
+ */
+class EnumValueType extends Type implements RuleFactoryInterface
+{
+    private const ERROR_MESSAGE = 'Invalid Enum value. Expected: int or string scalar value for BackedEnum. %s given.';
+
+    /** @var class-string<\BackedEnum> */
+    private string $classFQCN;
+
+    /**
+     * @param class-string<\BackedEnum>|null $class
+     */
+    public function __construct(MarshallerInterface $marshaller, ?string $class = null)
+    {
+        $this->classFQCN = $class ?? throw new \RuntimeException('Enum is required.');
+        \is_a($class, BackedEnum::class, true) ?: throw new \RuntimeException(
+            'Class for EnumValueType must be an instance of BackedEnum.',
+        );
+        parent::__construct($marshaller);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public static function makeRule(\ReflectionProperty $property): ?MarshallingRule
+    {
+        $type = $property->getType();
+
+        if (!$type instanceof \ReflectionNamedType || !\is_subclass_of($type->getName(), \UnitEnum::class)) {
+            return null;
+        }
+
+        return $type->allowsNull()
+            ? new MarshallingRule(
+                $property->getName(),
+                NullableType::class,
+                new MarshallingRule(type: self::class, of: $type->getName()),
+            )
+            : new MarshallingRule($property->getName(), self::class, $type->getName());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function parse($value, $current)
+    {
+        if (\is_object($value)) {
+            return $value;
+        }
+
+        if (\is_int($value) || \is_string($value)) {
+            return $this->classFQCN::from($value);
+        }
+
+        throw new \InvalidArgumentException(\sprintf(self::ERROR_MESSAGE, \ucfirst(\get_debug_type($value))));
+    }
+
+    public function serialize($value): int|string
+    {
+        return $value->value;
+    }
+}

src/Internal/Marshaller/TypeFactory.php

@@ -17,6 +17,7 @@
 use Temporal\Internal\Marshaller\Type\DetectableTypeInterface;
 use Temporal\Internal\Marshaller\Type\EncodedCollectionType;
 use Temporal\Internal\Marshaller\Type\EnumType;
+use Temporal\Internal\Marshaller\Type\EnumValueType;
 use Temporal\Internal\Marshaller\Type\ObjectType;
 use Temporal\Internal\Marshaller\Type\OneOfType;
 use Temporal\Internal\Marshaller\Type\RuleFactoryInterface as TypeRuleFactoryInterface;
@@ -139,10 +140,8 @@ private function createMatchers(iterable $matchers): void
      */
     private function getDefaultMatchers(): iterable
     {
-        if (PHP_VERSION_ID >= 80104) {
-            yield EnumType::class;
-        }
-
+        yield EnumType::class;
+        yield EnumValueType::class;
         yield DateTimeType::class;
         yield DateIntervalType::class;
         yield UuidType::class;

src/Internal/Transport/Router/GetWorkerInfo.php

@@ -84,6 +84,7 @@ private function workerToArray(WorkerInterface $worker): array
             // ActivityInfo[]
             'Activities' => $this->map($worker->getActivities(), $activityMap),
             'PhpSdkVersion' => SdkVersion::getSdkVersion(),
+            'Flags' => (object)[],
         ];
     }