From 27d7e6e522aa63e566443f1c6d9fe0b99a42c653 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Fri, 18 Mar 2022 14:05:16 +0200
Subject: [PATCH] type fixes

---
 application/Espo/Core/Job/Job/Data.php                      | 2 ++
 application/Espo/Core/Job/JobFactory.php                    | 6 ++++--
 application/Espo/Core/Job/JobRunner.php                     | 1 +
 application/Espo/Core/Job/JobTask.php                       | 1 +
 application/Espo/Core/Job/MetadataProvider.php              | 5 ++++-
 application/Espo/Core/Job/PreparatorFactory.php             | 2 +-
 application/Espo/Core/Job/QueueUtil.php                     | 2 +-
 application/Espo/Core/Job/ScheduleProcessor.php             | 1 +
 application/Espo/Core/Loaders/InternalAclManager.php        | 1 +
 .../Espo/Core/Log/Handler/EspoRotatingFileHandler.php       | 1 +
 application/Espo/Core/Log/HandlerListLoader.php             | 2 +-
 11 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/application/Espo/Core/Job/Job/Data.php b/application/Espo/Core/Job/Job/Data.php
index 6b9e903ac8..bb2fb564a0 100644
--- a/application/Espo/Core/Job/Job/Data.php
+++ b/application/Espo/Core/Job/Job/Data.php
@@ -65,6 +65,8 @@ class Data
             $data = (object) $data;
         }
 
+        /** @var ?stdClass $data */
+
         return new self($data);
     }
 
diff --git a/application/Espo/Core/Job/JobFactory.php b/application/Espo/Core/Job/JobFactory.php
index 9a07c02210..e38d59c471 100644
--- a/application/Espo/Core/Job/JobFactory.php
+++ b/application/Espo/Core/Job/JobFactory.php
@@ -74,7 +74,7 @@ class JobFactory
 
     /**
      * Create a job by a class name.
-     * @param class-string $className
+     * @param class-string<Job|JobDataLess> $className
      * @return Job|JobDataLess
      */
     public function createByClassName(string $className): object
@@ -85,16 +85,18 @@ class JobFactory
     }
 
     /**
-     * @return ?class-string
+     * @return ?class-string<Job|JobDataLess>
      */
     private function getClassName(string $name): ?string
     {
+        /** @var ?class-string<Job|JobDataLess> */
         $className = $this->metadataProvider->getJobClassName($name);
 
         if ($className) {
             return $className;
         }
 
+        /** @var ?class-string<Job|JobDataLess> */
         return $this->classFinder->find('Jobs', ucfirst($name));
     }
 }
\ No newline at end of file
diff --git a/application/Espo/Core/Job/JobRunner.php b/application/Espo/Core/Job/JobRunner.php
index 1214f6b47d..25e8321de0 100644
--- a/application/Espo/Core/Job/JobRunner.php
+++ b/application/Espo/Core/Job/JobRunner.php
@@ -208,6 +208,7 @@ class JobRunner
 
     private function runJobWithClassName(JobEntity $jobEntity): void
     {
+        /** @var class-string<Job|JobDataLess> */
         $className = $jobEntity->getClassName();
 
         $job = $this->jobFactory->createByClassName($className);
diff --git a/application/Espo/Core/Job/JobTask.php b/application/Espo/Core/Job/JobTask.php
index a29cb3ecbc..b7827a8c78 100644
--- a/application/Espo/Core/Job/JobTask.php
+++ b/application/Espo/Core/Job/JobTask.php
@@ -70,6 +70,7 @@ class JobTask extends AsyncTask
             $app->run(JobRunner::class, $params);
         }
         catch (Throwable $e) {
+            /** @var \Espo\Core\Utils\Log */
             $log = $app->getContainer()->get('log');
 
             $log->error(
diff --git a/application/Espo/Core/Job/MetadataProvider.php b/application/Espo/Core/Job/MetadataProvider.php
index 8045f2d00b..6b3c9a6490 100644
--- a/application/Espo/Core/Job/MetadataProvider.php
+++ b/application/Espo/Core/Job/MetadataProvider.php
@@ -85,7 +85,10 @@ class MetadataProvider
      */
     public function getScheduledJobNameList(): array
     {
-        return array_keys($this->metadata->get(['app', 'scheduledJobs']) ?? []);
+        /** @var array<string,mixed> */
+        $items = $this->metadata->get(['app', 'scheduledJobs']) ?? [];
+
+        return array_keys($items);
     }
 
     /**
diff --git a/application/Espo/Core/Job/PreparatorFactory.php b/application/Espo/Core/Job/PreparatorFactory.php
index 842d244b9c..842ceaeec7 100644
--- a/application/Espo/Core/Job/PreparatorFactory.php
+++ b/application/Espo/Core/Job/PreparatorFactory.php
@@ -51,7 +51,7 @@ class PreparatorFactory
      */
     public function create(string $name): Preparator
     {
-        /** @var class-string */
+        /** @var ?class-string<Preparator> */
         $className = $this->metadataProvider->getPreparatorClassName($name);
 
         if (!$className) {
diff --git a/application/Espo/Core/Job/QueueUtil.php b/application/Espo/Core/Job/QueueUtil.php
index ef901355e8..e9aa362237 100644
--- a/application/Espo/Core/Job/QueueUtil.php
+++ b/application/Espo/Core/Job/QueueUtil.php
@@ -347,7 +347,7 @@ class QueueUtil
      */
     protected function markJobListFailed(iterable $jobList): void
     {
-        if (!count($jobList)) {
+        if (is_countable($jobList) && !count($jobList)) {
             return;
         }
 
diff --git a/application/Espo/Core/Job/ScheduleProcessor.php b/application/Espo/Core/Job/ScheduleProcessor.php
index c97746b7e0..0d07d2450c 100644
--- a/application/Espo/Core/Job/ScheduleProcessor.php
+++ b/application/Espo/Core/Job/ScheduleProcessor.php
@@ -140,6 +140,7 @@ class ScheduleProcessor
 
             $data = new PreparatorData($scheduledJob->getId(), $scheduledJob->getName());
 
+            /** @var DateTimeImmutable */
             $executeTimeObj = DateTimeImmutable
                 ::createFromFormat(DateTimeUtil::SYSTEM_DATE_TIME_FORMAT, $executeTime);
 
diff --git a/application/Espo/Core/Loaders/InternalAclManager.php b/application/Espo/Core/Loaders/InternalAclManager.php
index b0ee389979..c4627966e2 100644
--- a/application/Espo/Core/Loaders/InternalAclManager.php
+++ b/application/Espo/Core/Loaders/InternalAclManager.php
@@ -46,6 +46,7 @@ class InternalAclManager implements Loader
 
     public function load(): AclManagerService
     {
+        /** @var AclManagerService */
         return $this->container->get('aclManager');
     }
 }
diff --git a/application/Espo/Core/Log/Handler/EspoRotatingFileHandler.php b/application/Espo/Core/Log/Handler/EspoRotatingFileHandler.php
index d84ad3f84f..1f121f6c96 100644
--- a/application/Espo/Core/Log/Handler/EspoRotatingFileHandler.php
+++ b/application/Espo/Core/Log/Handler/EspoRotatingFileHandler.php
@@ -83,6 +83,7 @@ class EspoRotatingFileHandler extends EspoFileHandler
 
         $filePattern = $this->getFilePattern();
         $dirPath = $this->fileManager->getDirName($this->filename);
+        /** @var string[] */
         $logFiles = $this->fileManager->getFileList($dirPath, false, $filePattern, true);
 
         if (!empty($logFiles) && count($logFiles) > $this->maxFiles) {
diff --git a/application/Espo/Core/Log/HandlerListLoader.php b/application/Espo/Core/Log/HandlerListLoader.php
index b7d5589b16..7ea1068616 100644
--- a/application/Espo/Core/Log/HandlerListLoader.php
+++ b/application/Espo/Core/Log/HandlerListLoader.php
@@ -82,7 +82,7 @@ class HandlerListLoader
             $params['level'] = Logger::toMonologLevel($level);
         }
 
-        /** @var ?class-string */
+        /** @var ?class-string<\Espo\Core\Log\HandlerLoader> */
         $loaderClassName = $data['loaderClassName'] ?? null;
 
         if ($loaderClassName) {