diff --git a/application/Espo/Core/Job/AsyncPoolFactory.php b/application/Espo/Core/Job/AsyncPoolFactory.php index 13dd69f1d9..ab1f6af2eb 100644 --- a/application/Espo/Core/Job/AsyncPoolFactory.php +++ b/application/Espo/Core/Job/AsyncPoolFactory.php @@ -35,12 +35,8 @@ use Spatie\Async\Pool; class AsyncPoolFactory { - private $config; - - public function __construct(Config $config) - { - $this->config = $config; - } + public function __construct(private Config $config) + {} public function isSupported(): bool { diff --git a/application/Espo/Core/Job/Job/Data.php b/application/Espo/Core/Job/Job/Data.php index e8c1061249..b125af1440 100644 --- a/application/Espo/Core/Job/Job/Data.php +++ b/application/Espo/Core/Job/Job/Data.php @@ -37,9 +37,7 @@ use stdClass; class Data { private stdClass $data; - private ?string $targetId = null; - private ?string $targetType = null; public function __construct(?stdClass $data = null) @@ -50,7 +48,7 @@ class Data /** * Create an instance. * - * @param stdClass|array|null $data Raw data. + * @param stdClass|array|null $data Raw data. * @return self */ public static function create($data = null): self @@ -101,7 +99,6 @@ class Data public function withTargetId(?string $targetId): self { $obj = clone $this; - $obj->targetId = $targetId; return $obj; @@ -110,7 +107,6 @@ class Data public function withTargetType(?string $targetType): self { $obj = clone $this; - $obj->targetType = $targetType; return $obj; diff --git a/application/Espo/Core/Job/Job/Jobs/ProcessJobGroup.php b/application/Espo/Core/Job/Job/Jobs/ProcessJobGroup.php index acc6bd3711..530208248d 100644 --- a/application/Espo/Core/Job/Job/Jobs/ProcessJobGroup.php +++ b/application/Espo/Core/Job/Job/Jobs/ProcessJobGroup.php @@ -38,17 +38,10 @@ class ProcessJobGroup implements Job { private const PORTION_NUMBER = 100; - private JobManager $jobManager; - - private Config $config; - public function __construct( - JobManager $jobManager, - Config $config - ) { - $this->jobManager = $jobManager; - $this->config = $config; - } + private JobManager $jobManager, + private Config $config + ) {} public function run(Data $data): void { diff --git a/application/Espo/Core/Job/Job/Jobs/ProcessJobQueueE0.php b/application/Espo/Core/Job/Job/Jobs/ProcessJobQueueE0.php index 2c5755c97d..d8d7d8578a 100644 --- a/application/Espo/Core/Job/Job/Jobs/ProcessJobQueueE0.php +++ b/application/Espo/Core/Job/Job/Jobs/ProcessJobQueueE0.php @@ -29,10 +29,7 @@ namespace Espo\Core\Job\Job\Jobs; -use Espo\Core\{ - Job\QueueName, - Job\Job\Jobs\AbstractQueueJob, -}; +use Espo\Core\Job\QueueName; class ProcessJobQueueE0 extends AbstractQueueJob { diff --git a/application/Espo/Core/Job/Job/Jobs/ProcessJobQueueQ0.php b/application/Espo/Core/Job/Job/Jobs/ProcessJobQueueQ0.php index 175201fa27..4eb68242ac 100644 --- a/application/Espo/Core/Job/Job/Jobs/ProcessJobQueueQ0.php +++ b/application/Espo/Core/Job/Job/Jobs/ProcessJobQueueQ0.php @@ -29,10 +29,7 @@ namespace Espo\Core\Job\Job\Jobs; -use Espo\Core\{ - Job\QueueName, - Job\Job\Jobs\AbstractQueueJob, -}; +use Espo\Core\Job\QueueName; class ProcessJobQueueQ0 extends AbstractQueueJob { diff --git a/application/Espo/Core/Job/Job/Jobs/ProcessJobQueueQ1.php b/application/Espo/Core/Job/Job/Jobs/ProcessJobQueueQ1.php index d0586a9b0c..fb418a7e37 100644 --- a/application/Espo/Core/Job/Job/Jobs/ProcessJobQueueQ1.php +++ b/application/Espo/Core/Job/Job/Jobs/ProcessJobQueueQ1.php @@ -29,10 +29,7 @@ namespace Espo\Core\Job\Job\Jobs; -use Espo\Core\{ - Job\QueueName, - Job\Job\Jobs\AbstractQueueJob, -}; +use Espo\Core\Job\QueueName; class ProcessJobQueueQ1 extends AbstractQueueJob { diff --git a/application/Espo/Core/Job/Job/Status.php b/application/Espo/Core/Job/Job/Status.php index 96e6f87639..5569d885b7 100644 --- a/application/Espo/Core/Job/Job/Status.php +++ b/application/Espo/Core/Job/Job/Status.php @@ -32,12 +32,8 @@ namespace Espo\Core\Job\Job; class Status { public const PENDING = 'Pending'; - public const READY = 'Ready'; - public const RUNNING = 'Running'; - public const SUCCESS = 'Success'; - public const FAILED = 'Failed'; } diff --git a/application/Espo/Core/Job/JobFactory.php b/application/Espo/Core/Job/JobFactory.php index 04646656a0..098dbfaab6 100644 --- a/application/Espo/Core/Job/JobFactory.php +++ b/application/Espo/Core/Job/JobFactory.php @@ -35,19 +35,11 @@ use Espo\Core\Utils\ClassFinder; class JobFactory { - private ClassFinder $classFinder; - private InjectableFactory $injectableFactory; - private MetadataProvider $metadataProvider; - public function __construct( - ClassFinder $classFinder, - InjectableFactory $injectableFactory, - MetadataProvider $metadataProvider - ) { - $this->classFinder = $classFinder; - $this->injectableFactory = $injectableFactory; - $this->metadataProvider = $metadataProvider; - } + private ClassFinder $classFinder, + private InjectableFactory $injectableFactory, + private MetadataProvider $metadataProvider + ) {} /** * Create a job by a scheduled job name. @@ -68,6 +60,7 @@ class JobFactory /** * Create a job by a class name. + * * @param class-string $className * @return Job|JobDataLess */ diff --git a/application/Espo/Core/Job/JobScheduler.php b/application/Espo/Core/Job/JobScheduler.php index 80287debec..ef67e48a25 100644 --- a/application/Espo/Core/Job/JobScheduler.php +++ b/application/Espo/Core/Job/JobScheduler.php @@ -30,10 +30,8 @@ namespace Espo\Core\Job; use Espo\ORM\EntityManager; - use Espo\Core\Utils\DateTime; use Espo\Core\Job\Job\Data; - use Espo\Entities\Job as JobEntity; use ReflectionClass; diff --git a/application/Espo/Core/Job/JobSchedulerFactory.php b/application/Espo/Core/Job/JobSchedulerFactory.php index b85775b368..bd66312972 100644 --- a/application/Espo/Core/Job/JobSchedulerFactory.php +++ b/application/Espo/Core/Job/JobSchedulerFactory.php @@ -36,12 +36,8 @@ use Espo\Core\InjectableFactory; */ class JobSchedulerFactory { - private $injectableFactory; - - public function __construct(InjectableFactory $injectableFactory) - { - $this->injectableFactory = $injectableFactory; - } + public function __construct(private InjectableFactory $injectableFactory) + {} public function create(): JobScheduler { diff --git a/application/Espo/Core/Job/JobTask.php b/application/Espo/Core/Job/JobTask.php index 43bc9f0c37..08c7b8f127 100644 --- a/application/Espo/Core/Job/JobTask.php +++ b/application/Espo/Core/Job/JobTask.php @@ -29,14 +29,13 @@ namespace Espo\Core\Job; -use Espo\Core\{ - Application, - ApplicationRunners\Job as JobRunner, - Application\Runner\Params as RunnerParams, -}; - use Spatie\Async\Task as AsyncTask; +use Espo\Core\Application; +use Espo\Core\Application\Runner\Params as RunnerParams; +use Espo\Core\ApplicationRunners\Job as JobRunner; +use Espo\Core\Utils\Log; + use Throwable; class JobTask extends AsyncTask @@ -52,8 +51,7 @@ class JobTask extends AsyncTask * @return void */ public function configure() - { - } + {} /** * @return void @@ -62,20 +60,15 @@ class JobTask extends AsyncTask { $app = new Application(); - $params = RunnerParams::fromArray([ - 'id' => $this->jobId, - ]); + $params = RunnerParams::fromArray(['id' => $this->jobId]); try { $app->run(JobRunner::class, $params); } catch (Throwable $e) { - /** @var \Espo\Core\Utils\Log $log */ - $log = $app->getContainer()->get('log'); + $log = $app->getContainer()->getByClass(Log::class); - $log->error( - "JobTask: Failed to run job '{$this->jobId}'. Error: " . $e->getMessage() - ); + $log->error("JobTask: Failed to run job '{$this->jobId}'. Error: " . $e->getMessage()); } } } diff --git a/application/Espo/Core/Job/MetadataProvider.php b/application/Espo/Core/Job/MetadataProvider.php index d9bc2e7fbb..5b8e726d1f 100644 --- a/application/Espo/Core/Job/MetadataProvider.php +++ b/application/Espo/Core/Job/MetadataProvider.php @@ -33,12 +33,8 @@ use Espo\Core\Utils\Metadata; class MetadataProvider { - private Metadata $metadata; - - public function __construct(Metadata $metadata) - { - $this->metadata = $metadata; - } + public function __construct(private Metadata $metadata) + {} /** * @return string[] diff --git a/application/Espo/Core/Job/Preparator/Data.php b/application/Espo/Core/Job/Preparator/Data.php index 3153b11757..dcc6017c0e 100644 --- a/application/Espo/Core/Job/Preparator/Data.php +++ b/application/Espo/Core/Job/Preparator/Data.php @@ -31,15 +31,8 @@ namespace Espo\Core\Job\Preparator; class Data { - private $id; - - private $name; - - public function __construct(string $id, string $name) - { - $this->id = $id; - $this->name = $name; - } + public function __construct(private string $id, private string $name) + {} /** * A scheduled job ID. diff --git a/application/Espo/Core/Job/Preparator/Preparators/ProcessJobGroupPreparator.php b/application/Espo/Core/Job/Preparator/Preparators/ProcessJobGroupPreparator.php index 9d98c83724..4401a270c5 100644 --- a/application/Espo/Core/Job/Preparator/Preparators/ProcessJobGroupPreparator.php +++ b/application/Espo/Core/Job/Preparator/Preparators/ProcessJobGroupPreparator.php @@ -42,12 +42,8 @@ use DateTimeImmutable; class ProcessJobGroupPreparator implements Preparator { - private $entityManager; - - public function __construct(EntityManager $entityManager) - { - $this->entityManager = $entityManager; - } + public function __construct(private EntityManager $entityManager) + {} public function prepare(Data $data, DateTimeImmutable $executeTime): void { diff --git a/application/Espo/Core/Job/PreparatorFactory.php b/application/Espo/Core/Job/PreparatorFactory.php index 92b141303e..af007a4d25 100644 --- a/application/Espo/Core/Job/PreparatorFactory.php +++ b/application/Espo/Core/Job/PreparatorFactory.php @@ -34,14 +34,10 @@ use Espo\Core\Exceptions\Error; class PreparatorFactory { - private MetadataProvider $metadataProvider; - private InjectableFactory $injectableFactory; - - public function __construct(MetadataProvider $metadataProvider, InjectableFactory $injectableFactory) - { - $this->metadataProvider = $metadataProvider; - $this->injectableFactory = $injectableFactory; - } + public function __construct( + private MetadataProvider $metadataProvider, + private InjectableFactory $injectableFactory + ) {} /** * Create a preparator. diff --git a/application/Espo/Core/Job/QueuePortionNumberProvider.php b/application/Espo/Core/Job/QueuePortionNumberProvider.php index 27f2cf2c6b..8c6ca18140 100644 --- a/application/Espo/Core/Job/QueuePortionNumberProvider.php +++ b/application/Espo/Core/Job/QueuePortionNumberProvider.php @@ -33,20 +33,14 @@ use Espo\Core\Utils\Config; class QueuePortionNumberProvider { - private Config $config; - - /** - * @var array - */ + /** @var array */ private $queueNumberMap = [ QueueName::Q0 => self::Q0_PORTION_NUMBER, QueueName::Q1 => self::Q1_PORTION_NUMBER, QueueName::E0 => self::E0_PORTION_NUMBER, ]; - /** - * @var array - */ + /** @var array */ private $queueParamNameMap = [ QueueName::Q0 => 'jobQ0MaxPortion', QueueName::Q1 => 'jobQ1MaxPortion', @@ -54,17 +48,12 @@ class QueuePortionNumberProvider ]; private const Q0_PORTION_NUMBER = 200; - private const Q1_PORTION_NUMBER = 500; - private const E0_PORTION_NUMBER = 100; - private const DEFAULT_PORTION_NUMBER = 200; - public function __construct(Config $config) - { - $this->config = $config; - } + public function __construct(private Config $config) + {} public function get(string $queue): int { @@ -75,4 +64,4 @@ class QueuePortionNumberProvider $this->queueNumberMap[$queue] ?? self::DEFAULT_PORTION_NUMBER; } -} \ No newline at end of file +} diff --git a/application/Espo/Core/Job/QueueProcessorFactory.php b/application/Espo/Core/Job/QueueProcessorFactory.php index 33927e343e..467939439c 100644 --- a/application/Espo/Core/Job/QueueProcessorFactory.php +++ b/application/Espo/Core/Job/QueueProcessorFactory.php @@ -33,12 +33,8 @@ use Espo\Core\InjectableFactory; class QueueProcessorFactory { - private $injectableFactory; - - public function __construct(InjectableFactory $injectableFactory) - { - $this->injectableFactory = $injectableFactory; - } + public function __construct(private InjectableFactory $injectableFactory) + {} public function create(QueueProcessorParams $params): QueueProcessor { diff --git a/application/Espo/Core/Job/ScheduleProcessor.php b/application/Espo/Core/Job/ScheduleProcessor.php index 41de852df5..f6943c617d 100644 --- a/application/Espo/Core/Job/ScheduleProcessor.php +++ b/application/Espo/Core/Job/ScheduleProcessor.php @@ -58,28 +58,14 @@ class ScheduleProcessor '* * * * * *', ]; - private Log $log; - private EntityManager $entityManager; - private QueueUtil $queueUtil; - private ScheduleUtil $scheduleUtil; - private PreparatorFactory $preparatorFactory; - private MetadataProvider $metadataProvider; - public function __construct( - Log $log, - EntityManager $entityManager, - QueueUtil $queueUtil, - ScheduleUtil $scheduleUtil, - PreparatorFactory $preparatorFactory, - MetadataProvider $metadataProvider - ) { - $this->log = $log; - $this->entityManager = $entityManager; - $this->queueUtil = $queueUtil; - $this->scheduleUtil = $scheduleUtil; - $this->preparatorFactory = $preparatorFactory; - $this->metadataProvider = $metadataProvider; - } + private Log $log, + private EntityManager $entityManager, + private QueueUtil $queueUtil, + private ScheduleUtil $scheduleUtil, + private PreparatorFactory $preparatorFactory, + private MetadataProvider $metadataProvider + ) {} public function process(): void { diff --git a/application/Espo/Core/Job/ScheduleUtil.php b/application/Espo/Core/Job/ScheduleUtil.php index 47f7569572..c6220234c2 100644 --- a/application/Espo/Core/Job/ScheduleUtil.php +++ b/application/Espo/Core/Job/ScheduleUtil.php @@ -29,23 +29,17 @@ namespace Espo\Core\Job; +use Espo\Core\Utils\DateTime as DateTimeUtil; use Espo\Core\ORM\Repository\Option\SaveOption; use Espo\ORM\Collection; use Espo\ORM\EntityManager; - -use Espo\Core\Utils\DateTime as DateTimeUtil; - use Espo\Entities\ScheduledJob as ScheduledJobEntity; use Espo\Entities\ScheduledJobLogRecord as ScheduledJobLogRecordEntity; class ScheduleUtil { - private EntityManager $entityManager; - - public function __construct(EntityManager $entityManager) - { - $this->entityManager = $entityManager; - } + public function __construct(private EntityManager $entityManager) + {} /** * Get active scheduled job list.