fix: psalm 6

psalm.xml

@@ -2,7 +2,7 @@
 <psalm xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="https://getpsalm.org/schema/config"
        xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-       errorLevel="8"
+       errorLevel="6"
        findUnusedBaselineEntry="false"
        findUnusedCode="false"
 >

src/Core/Dispatchers/WaitEventDispatcher.php

@@ -21,10 +21,10 @@ public function dispatch(MayPromised $promised): void
         PromiseEvent::saveWaitEvent($promised);
 
         // Чтобы сохранить ID события в задачу-обертку
-        $promise_job = PromiseJob::find($promised->getBaseJobId());
-        if ($promise_job !== null) {
-            $promise_job->initial_job = $promised;
-            $promise_job->save();
+        $promiseJob = PromiseJob::find($promised->getBaseJobId());
+        if ($promiseJob !== null) {
+            $promiseJob->initial_job = $promised;
+            $promiseJob->save();
         }
     }
 }

src/Core/GarbageCollector.php

@@ -25,7 +25,7 @@ public function __construct(int $sleepTime, int $deleteOlderThen, array $states)
         $this->sleepTime = $sleepTime;
         $this->deleteOlderThen = $deleteOlderThen;
         $this->states = $states;
-        $this->lastIteration = Carbon::parse(0);
+        $this->lastIteration = Carbon::minValue();
     }
 
     /**

src/Core/Support/PromiseQueueJob.php

@@ -6,6 +6,7 @@
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Support\Collection;
 use Tochka\Promises\Contracts\JobFacadeContract;
 use Tochka\Promises\Contracts\JobStateContract;
 use Tochka\Promises\Contracts\MayPromised;
@@ -134,21 +135,24 @@ protected function dispatchMethodWithParams(string $method)
     }
 
     /**
-     * @return array<string, array<MayPromised>>
+     * @return array<class-string<MayPromised|PromisedEvent>, non-empty-list<MayPromised|PromisedEvent>>
      */
     private function getResults(): array
     {
         $results = [];
 
-        $jobs = PromiseJob::byPromise($this->getPromiseId())->orderBy('id')->get();
-        /** @var PromiseJob $job */
+        /** @var Collection<array-key,PromiseJob> $jobs */
+        $jobs = PromiseJob::byPromise($this->getPromiseId())
+            ->orderBy('id')
+            ->get();
+
         foreach ($jobs as $job) {
             $resultJob = $job->getBaseJob()->getResultJob();
-            $results[\get_class($resultJob)][] = $resultJob;
+            $results[$resultJob::class][] = $resultJob;
             if ($resultJob instanceof WaitEvent) {
                 $resultEvent = $resultJob->getEvent();
                 if ($resultEvent !== null) {
-                    $results[\get_class($resultEvent)][] = $resultEvent;
+                    $results[$resultEvent::class][] = $resultEvent;
                 }
             }
         }

src/Models/Casts/ConditionsCast.php

@@ -6,7 +6,7 @@
 use Tochka\Promises\Core\Support\ConditionTransition;
 
 /**
- * @template-implements CastsAttributes<array<ConditionTransition>, string>
+ * @template-implements CastsAttributes<array<ConditionTransition>, array<ConditionTransition>>
  */
 class ConditionsCast implements CastsAttributes
 {

src/Models/PromiseJob.php

@@ -1,7 +1,5 @@
 <?php
 
-/** @noinspection PhpMissingFieldTypeInspection */
-
 namespace Tochka\Promises\Models;
 
 use Carbon\Carbon;
@@ -38,7 +36,6 @@
  * @method static Builder byPromise(int $promiseId)
  * @method static self|null find(int $id)
  * @method static lockForUpdate()
- * @mixin Builder
  */
 class PromiseJob extends Model
 {
@@ -100,7 +97,7 @@ function (PromiseJob $promiseJob) {
         );
     }
 
-    public function setNestedEvents(bool $nestedEvents)
+    public function setNestedEvents(bool $nestedEvents): void
     {
         $this->nestedEvents = $nestedEvents;
     }

src/Registry/PromiseEventRegistry.php

@@ -15,31 +15,26 @@ class PromiseEventRegistry
     /**
      * @param string $event_name
      * @param string $event_unique_id
-     *
-     * @return \Tochka\Promises\Support\WaitEvent[]|Collection
+     * @return Collection<array-key, WaitEvent>
      */
     public function loadByEvent(string $event_name, string $event_unique_id): Collection
     {
+        /** @psalm-suppress InvalidTemplateParam */
         return PromiseEvent::byEvent($event_name, $event_unique_id)
             ->get()
             ->map(
-                function (PromiseEvent $promiseEventModel) {
+                function (PromiseEvent $promiseEventModel): WaitEvent {
                     return $promiseEventModel->getWaitEvent();
                 }
             );
     }
 
-    /**
-     * @param \Tochka\Promises\Support\WaitEvent $waitEvent
-     */
     public function save(WaitEvent $waitEvent): void
     {
         PromiseEvent::saveWaitEvent($waitEvent);
     }
 
     /**
-     * @param int $id
-     *
      * @throws \Exception
      */
     public function delete(int $id): void

src/Registry/PromiseJobRegistry.php

@@ -26,14 +26,15 @@ public function load(int $id): BaseJob
     /**
      * @param int $promise_id
      *
-     * @return \Illuminate\Support\Collection|BaseJob[]
+     * @return Collection<array-key, BaseJob>
      */
     public function loadByPromiseId(int $promise_id): Collection
     {
+        /** @psalm-suppress InvalidTemplateParam */
         return PromiseJob::byPromise($promise_id)
             ->get()
             ->map(
-                function (PromiseJob $jobModel) {
+                function (PromiseJob $jobModel): BaseJob {
                     return $jobModel->getBaseJob();
                 }
             );