Fix psalm issues

temporalio · Aug 19, 2024 · b9aa569 · b9aa569
1 parent c0e3e88
commit b9aa569
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/psalm-baseline.xml b/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>

diff --git a/src/Internal/Marshaller/Type/EnumValueType.php b/src/Internal/Marshaller/Type/EnumValueType.php
@@ -22,13 +22,18 @@ 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<\UnitEnum> */
+    /** @var class-string<\BackedEnum> */
     private string $classFQCN;
 
-    public function __construct(MarshallerInterface $marshaller, string $class = null)
+    /**
+     * @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('Enum must be an instance of BackedEnum.');
+        \is_a($class, BackedEnum::class, true) ?: throw new \RuntimeException(
+            'Class for EnumValueType must be an instance of BackedEnum.',
+        );
         parent::__construct($marshaller);
     }
 
@@ -61,7 +66,7 @@ public function parse($value, $current)
             return $value;
         }
 
-        if (\is_scalar($value)) {
+        if (\is_int($value) || \is_string($value)) {
             return $this->classFQCN::from($value);
         }
 

diff --git a/src/Worker/WorkerOptions.php b/src/Worker/WorkerOptions.php
@@ -624,7 +624,7 @@ public function withEnableSessionWorker(bool $enable = true): self
      * For now, if user doesn't specify one, a new uuid will be used as the
      * resourceID.
      *
-     * @param non-empty-string|null $identifier
+     * @param string|null $identifier
      */
     #[Pure]
     public function withSessionResourceId(?string $identifier): self