diff --git a/application/Espo/Core/Job/AbstractQueueJob.php b/application/Espo/Core/Job/AbstractQueueJob.php index b42b4b7317..a72866c834 100644 --- a/application/Espo/Core/Job/AbstractQueueJob.php +++ b/application/Espo/Core/Job/AbstractQueueJob.php @@ -60,7 +60,7 @@ abstract class AbstractQueueJob implements JobPreperable $this->entityManager = $entityManager; } - public function run(Data $data): void + public function run(JobData $data): void { if (!$this->queue) { throw new RuntimeException("No queue name."); diff --git a/application/Espo/Core/Job/Job.php b/application/Espo/Core/Job/Job.php index 72906399cd..c649b90fee 100644 --- a/application/Espo/Core/Job/Job.php +++ b/application/Espo/Core/Job/Job.php @@ -37,5 +37,5 @@ interface Job /** * Run a job. */ - public function run(Data $data): void; + public function run(JobData $data): void; } diff --git a/application/Espo/Core/Job/Data.php b/application/Espo/Core/Job/JobData.php similarity index 99% rename from application/Espo/Core/Job/Data.php rename to application/Espo/Core/Job/JobData.php index 6472fffeae..d712f58152 100644 --- a/application/Espo/Core/Job/Data.php +++ b/application/Espo/Core/Job/JobData.php @@ -34,7 +34,7 @@ use Espo\Core\Utils\ObjectUtil; use TypeError; use stdClass; -class Data +class JobData { private $data; diff --git a/application/Espo/Core/Job/JobRunner.php b/application/Espo/Core/Job/JobRunner.php index 45e4e6739b..8ec2583987 100644 --- a/application/Espo/Core/Job/JobRunner.php +++ b/application/Espo/Core/Job/JobRunner.php @@ -229,7 +229,7 @@ class JobRunner throw new TypeError(); } - $data = Data::create($jobEntity->getData()) + $data = JobData::create($jobEntity->getData()) ->withTargetId($jobEntity->getTargetId()) ->withTargetType($jobEntity->getTargetType()); diff --git a/application/Espo/Jobs/CheckEmailAccounts.php b/application/Espo/Jobs/CheckEmailAccounts.php index 48bc2ae347..2184801760 100644 --- a/application/Espo/Jobs/CheckEmailAccounts.php +++ b/application/Espo/Jobs/CheckEmailAccounts.php @@ -34,7 +34,7 @@ use Espo\Core\Exceptions\Error; use Espo\Core\{ Job\JobStatus, Job\JobPreperable, - Job\Data, + Job\JobData, Job\ScheduledJobData, ServiceFactory, ORM\EntityManager, @@ -56,7 +56,7 @@ class CheckEmailAccounts implements JobPreperable $this->entityManager = $entityManager; } - public function run(Data $data): void + public function run(JobData $data): void { $targetId = $data->getTargetId(); diff --git a/application/Espo/Jobs/CheckInboundEmails.php b/application/Espo/Jobs/CheckInboundEmails.php index 503eb2164e..f3323b7f09 100644 --- a/application/Espo/Jobs/CheckInboundEmails.php +++ b/application/Espo/Jobs/CheckInboundEmails.php @@ -34,7 +34,7 @@ use Espo\Core\Exceptions\Error; use Espo\Core\{ Job\JobStatus, Job\JobPreperable, - Job\Data, + Job\JobData, Job\ScheduledJobData, ServiceFactory, ORM\EntityManager, @@ -56,7 +56,7 @@ class CheckInboundEmails implements JobPreperable $this->entityManager = $entityManager; } - public function run(Data $data): void + public function run(JobData $data): void { $targetId = $data->getTargetId(); diff --git a/tests/integration/testClasses/Job/Job.php b/tests/integration/testClasses/Job/Job.php index 57f1afc328..b44cf83d9d 100644 --- a/tests/integration/testClasses/Job/Job.php +++ b/tests/integration/testClasses/Job/Job.php @@ -30,11 +30,11 @@ namespace tests\integration\testClasses\Job; use Espo\Core\Job\Job as JobInterface; -use Espo\Core\Job\Data; +use Espo\Core\Job\JobData; class Job implements JobInterface { - public function run(Data $data): void + public function run(JobData $data): void { } diff --git a/tests/unit/Espo/Core/Job/DataTest.php b/tests/unit/Espo/Core/Job/DataTest.php index afbf299ade..caaeaa3603 100644 --- a/tests/unit/Espo/Core/Job/DataTest.php +++ b/tests/unit/Espo/Core/Job/DataTest.php @@ -29,13 +29,13 @@ namespace tests\unit\Espo\Core\Job; -use Espo\Core\Job\Data; +use Espo\Core\Job\JobData; class DataTest extends \PHPUnit\Framework\TestCase { public function testData1() { - $data = Data + $data = JobData ::create((object) ['test' => '1']) ->withTargetId('target-id') ->withTargetType('target-type'); @@ -47,7 +47,7 @@ class DataTest extends \PHPUnit\Framework\TestCase public function testData2() { - $data = Data + $data = JobData ::create(['test' => '1']); $this->assertEquals('1', $data->get('test'));