type fixes

This commit is contained in:
Yuri Kuznetsov
2022-03-18 14:05:16 +02:00
parent abca847e5a
commit 27d7e6e522
11 changed files with 18 additions and 6 deletions
+2
View File
@@ -65,6 +65,8 @@ class Data
$data = (object) $data;
}
/** @var ?stdClass $data */
return new self($data);
}
+4 -2
View File
@@ -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));
}
}
+1
View File
@@ -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);
+1
View File
@@ -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(
@@ -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);
}
/**
@@ -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) {
+1 -1
View File
@@ -347,7 +347,7 @@ class QueueUtil
*/
protected function markJobListFailed(iterable $jobList): void
{
if (!count($jobList)) {
if (is_countable($jobList) && !count($jobList)) {
return;
}
@@ -140,6 +140,7 @@ class ScheduleProcessor
$data = new PreparatorData($scheduledJob->getId(), $scheduledJob->getName());
/** @var DateTimeImmutable */
$executeTimeObj = DateTimeImmutable
::createFromFormat(DateTimeUtil::SYSTEM_DATE_TIME_FORMAT, $executeTime);
@@ -46,6 +46,7 @@ class InternalAclManager implements Loader
public function load(): AclManagerService
{
/** @var AclManagerService */
return $this->container->get('aclManager');
}
}
@@ -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) {
@@ -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) {