From 63197266467d5732c3dbc8095a7b2c36599e64f7 Mon Sep 17 00:00:00 2001
From: roxblnfk <roxblnfk@ya.ru>
Date: Sun, 19 May 2024 00:16:40 +0400
Subject: [PATCH] Fix psalm issues

---
 psalm.xml                                          | 6 ++++++
 src/Config/TemporalConfig.php                      | 1 +
 src/Dispatcher.php                                 | 2 +-
 src/Scaffolder/Declaration/ActivityDeclaration.php | 3 ++-
 src/Scaffolder/Declaration/WorkflowDeclaration.php | 1 +
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/psalm.xml b/psalm.xml
index d4a2702..c695981 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -14,6 +14,12 @@
         </ignoreFiles>
     </projectFiles>
     <issueHandlers>
+        <DeprecatedInterface>
+            <errorLevel type="suppress">
+                <file name="src/Commands/InfoCommand.php"/>
+                <file name="src/DeclarationLocator.php"/>
+            </errorLevel>
+        </DeprecatedInterface>
         <PropertyNotSetInConstructor>
             <errorLevel type="suppress">
                 <file name="src/Commands/Scaffolder/ActivityCommand.php"/>
diff --git a/src/Config/TemporalConfig.php b/src/Config/TemporalConfig.php
index 9853921..ff4c847 100644
--- a/src/Config/TemporalConfig.php
+++ b/src/Config/TemporalConfig.php
@@ -32,6 +32,7 @@
  */
 final class TemporalConfig extends InjectableConfig
 {
+    /** @var non-empty-string */
     public const CONFIG = 'temporal';
 
     protected array $config = [
diff --git a/src/Dispatcher.php b/src/Dispatcher.php
index bc643b4..0a750ad 100644
--- a/src/Dispatcher.php
+++ b/src/Dispatcher.php
@@ -32,7 +32,7 @@ public function serve(): void
         /**
          * @var array<class-string<WorkflowInterface>|class-string<ActivityInterface>, ReflectionClass> $declarations
          */
-        $declarations = $this->container->get(DeclarationLocatorInterface::class)->getDeclarations();
+        $declarations = $this->container->get(DeclarationRegistryInterface::class)->getDeclarations();
 
         // factory initiates and runs task queue specific activity and workflow workers
         /** @var WorkerFactoryInterface $factory */
diff --git a/src/Scaffolder/Declaration/ActivityDeclaration.php b/src/Scaffolder/Declaration/ActivityDeclaration.php
index 8dd65bc..182059b 100644
--- a/src/Scaffolder/Declaration/ActivityDeclaration.php
+++ b/src/Scaffolder/Declaration/ActivityDeclaration.php
@@ -13,6 +13,7 @@
 
 final class ActivityDeclaration extends AbstractDeclaration
 {
+    /** @var non-empty-string */
     public const TYPE = 'activity';
 
     public function __construct(
@@ -20,7 +21,7 @@ public function __construct(
         string $name,
         ?string $comment = null,
         ?string $namespace = null,
-        private ?string $activityName = null,
+        private readonly ?string $activityName = null,
     ) {
         parent::__construct($config, $name, $comment, $namespace);
     }
diff --git a/src/Scaffolder/Declaration/WorkflowDeclaration.php b/src/Scaffolder/Declaration/WorkflowDeclaration.php
index f572aa9..df670f5 100644
--- a/src/Scaffolder/Declaration/WorkflowDeclaration.php
+++ b/src/Scaffolder/Declaration/WorkflowDeclaration.php
@@ -14,6 +14,7 @@
 
 final class WorkflowDeclaration extends AbstractDeclaration
 {
+    /** @var non-empty-string */
     public const TYPE = 'workflow';
 
     public function __construct(