This commit is contained in:
Yuri Kuznetsov
2021-06-15 16:27:09 +03:00
parent b6ae809b56
commit 747e9438c9
8 changed files with 13 additions and 13 deletions
@@ -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.");
+1 -1
View File
@@ -37,5 +37,5 @@ interface Job
/**
* Run a job.
*/
public function run(Data $data): void;
public function run(JobData $data): void;
}
@@ -34,7 +34,7 @@ use Espo\Core\Utils\ObjectUtil;
use TypeError;
use stdClass;
class Data
class JobData
{
private $data;
+1 -1
View File
@@ -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());
+2 -2
View File
@@ -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();
+2 -2
View File
@@ -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();
+2 -2
View File
@@ -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
{
}
+3 -3
View File
@@ -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'));