Fix psalm issues

spiral · May 18, 2024 · f9d1d5b · f9d1d5b
1 parent 6c148a8
commit f9d1d5b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -13,14 +13,15 @@
 
 final class ActivityDeclaration extends AbstractDeclaration
 {
+    /** @var non-empty-string */
     public const TYPE = 'activity';
 
     public function __construct(
         ScaffolderConfig $config,
         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
@@ -14,6 +14,7 @@
 
 final class WorkflowDeclaration extends AbstractDeclaration
 {
+    /** @var non-empty-string */
     public const TYPE = 'workflow';
 
     public function __construct(

diff --git a/tests/src/DispatcherTest.php b/tests/src/DispatcherTest.php
@@ -8,7 +8,7 @@
 use Spiral\Attributes\AttributeReader;
 use Spiral\RoadRunnerBridge\RoadRunnerMode;
 use Spiral\TemporalBridge\Config\TemporalConfig;
-use Spiral\TemporalBridge\DeclarationLocatorInterface;
+use Spiral\TemporalBridge\DeclarationRegistryInterface;
 use Spiral\TemporalBridge\DeclarationWorkerResolver;
 use Spiral\TemporalBridge\Dispatcher;
 use Spiral\TemporalBridge\Tests\App\SomeActivity;
@@ -41,7 +41,7 @@ protected function setUp(): void
 
     public function testServeWithoutDeclarations(): void
     {
-        $locator = $this->mockContainer(DeclarationLocatorInterface::class);
+        $locator = $this->mockContainer(DeclarationRegistryInterface::class);
         $locator->shouldReceive('getDeclarations')->once()->andReturn([]);
 
         $registry = $this->mockContainer(WorkersRegistryInterface::class);
@@ -59,7 +59,7 @@ public function testServeWithoutDeclarations(): void
 
     public function testServeWithDeclarations(): void
     {
-        $locator = $this->mockContainer(DeclarationLocatorInterface::class);
+        $locator = $this->mockContainer(DeclarationRegistryInterface::class);
         $locator->shouldReceive('getDeclarations')->once()->andReturnUsing(function () {
             yield WorkflowInterface::class => new \ReflectionClass(SomeWorkflow::class);
             yield WorkflowInterface::class => new \ReflectionClass(SomeWorkflowWithMultipleWorkers::class);