Skip to content

EspoCRM – Open Source CRM Application

Add types, cleanup, CS

Yurii36235a2776d9
diff --git a/application/Espo/Core/Job/JobFactory.php b/application/Espo/Core/Job/JobFactory.php
index 35fd15bd9f..6aee73809c 100644
--- a/application/Espo/Core/Job/JobFactory.php
+++ b/application/Espo/Core/Job/JobFactory.php
@@ -38,15 +38,13 @@ class JobFactory
public function __construct(
private ClassFinder $classFinder,
private InjectableFactory $injectableFactory,
- private MetadataProvider $metadataProvider
+ private MetadataProvider $metadataProvider,
) {}
/**
* Create a job by a scheduled job name.
- *
- * @return Job|JobDataLess
*/
- public function create(string $name): object
+ public function create(string $name): Job|JobDataLess
{
$className = $this->getClassName($name);
@@ -61,9 +59,8 @@ class JobFactory
* Create a job by a class name.
*
* @param class-string<Job|JobDataLess> $className
- * @return Job|JobDataLess
*/
- public function createByClassName(string $className): object
+ public function createByClassName(string $className): Job|JobDataLess
{
return $this->injectableFactory->create($className);
}
diff --git a/application/Espo/Core/Job/JobRunner.php b/application/Espo/Core/Job/JobRunner.php
index cdb35f97b7..76dbf20181 100644
--- a/application/Espo/Core/Job/JobRunner.php
+++ b/application/Espo/Core/Job/JobRunner.php
@@ -35,7 +35,6 @@ use Espo\Core\Utils\System;
use Espo\Core\Job\Job\Data;
use Espo\Core\Job\Job\Status;
use Espo\Entities\Job as JobEntity;
-
use Espo\ORM\Name\Attribute;
use LogicException;
use RuntimeException;
@@ -153,11 +152,10 @@ class JobRunner
if ($jobEntity->getScheduledJobId()) {
$this->scheduleUtil->addLogRecord(
- $jobEntity->getScheduledJobId(),
- $status,
- null,
- $jobEntity->getTargetId(),
- $jobEntity->getTargetType()
+ scheduledJobId: $jobEntity->getScheduledJobId(),
+ status: $status,
+ targetId: $jobEntity->getTargetId(),
+ targetType: $jobEntity->getTargetType(),
);
}
}
@@ -201,11 +199,7 @@ class JobRunner
$this->runJob($job, $jobEntity);
}
- /**
- * @param Job|JobDataLess $job
- * @internal Native type is not used for bc.
- */
- private function runJob($job, JobEntity $jobEntity): void
+ private function runJob(Job|JobDataLess $job, JobEntity $jobEntity): void
{
if ($job instanceof JobDataLess) {
$job->run();