espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renaming 1

Browse Source
This commit is contained in:
Yuri Kuznetsov
2021-09-22 12:59:48 +03:00
parent 0a320cb3b3
commit 7db64e9375
33 changed files with 112 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Application.php
+1 -1
View File
@@ -34,7 +34,7 @@ use Espo\Core\Container\ContainerBuilder;
use Espo\Core\InjectableFactory;
use Espo\Core\Application\RunnerRunner;
use Espo\Core\Application\RunnerParams;
use Espo\Core\Application\Runner\Params as RunnerParams;
use Espo\Core\Application\Exceptions\RunnerException;
use Espo\Core\ApplicationUser;
application/Espo/Core/Application/RunnerParams.php → application/Espo/Core/Application/Runner/Params.php
+2 -2
View File
@@ -27,12 +27,12 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
namespace Espo\Core\Application;
namespace Espo\Core\Application\Runner;
/**
* Parameters for an application runner.
*/
class RunnerParams
class Params
{
private $data = [];
application/Espo/Core/Application/RunnerParameterized.php
+3 -1
View File
@@ -29,10 +29,12 @@
namespace Espo\Core\Application;
use Espo\Core\Application\Runner\Params;
/**
* Runs an application with parameters.
*/
interface RunnerParameterized
{
public function run(RunnerParams $params): void;
public function run(Params $params): void;
}
application/Espo/Core/Application/RunnerRunner.php
+3 -2
View File
@@ -33,6 +33,7 @@ use Espo\Core\Utils\Log;
use Espo\Core\ApplicationUser;
use Espo\Core\InjectableFactory;
use Espo\Core\Application\Exceptions\RunnerException;
use Espo\Core\Application\Runner\Params;
use ReflectionClass;
@@ -57,7 +58,7 @@ class RunnerRunner
$this->injectableFactory = $injectableFactory;
}
public function run(string $className, ?RunnerParams $params = null): void
public function run(string $className, ?Params $params = null): void
{
if (!$className || !class_exists($className)) {
$this->log->error("Application runner '{$className}' does not exist.");
@@ -88,7 +89,7 @@ class RunnerRunner
if ($runner instanceof RunnerParameterized) {
$runner->run(
$params ?? RunnerParams::create()
$params ?? Params::create()
);
return;
application/Espo/Core/ApplicationRunners/EntryPoint.php
+2 -2
View File
@@ -30,7 +30,7 @@
namespace Espo\Core\ApplicationRunners;
use Espo\Core\Application\RunnerParameterized;
use Espo\Core\Application\RunnerParams;
use Espo\Core\Application\Runner\Params;
use Espo\Core\EntryPoint\Starter;
/**
@@ -45,7 +45,7 @@ class EntryPoint implements RunnerParameterized
$this->starter = $starter;
}
public function run(RunnerParams $params): void
public function run(Params $params): void
{
$this->starter->start(
$params->get('entryPoint'),
application/Espo/Core/ApplicationRunners/Job.php
+2 -2
View File
@@ -31,7 +31,7 @@ namespace Espo\Core\ApplicationRunners;
use Espo\Core\{
Application\RunnerParameterized,
Application\RunnerParams,
Application\Runner\Params,
Job\JobManager,
};
@@ -50,7 +50,7 @@ class Job implements RunnerParameterized
$this->jobManager = $jobManager;
}
public function run(RunnerParams $params): void
public function run(Params $params): void
{
$id = $params->get('id');
application/Espo/Core/ApplicationRunners/PortalClient.php
+2 -2
View File
@@ -33,7 +33,7 @@ use Espo\Core\Exceptions\Error;
use Espo\Core\{
Application\RunnerParameterized,
Application\RunnerParams,
Application\Runner\Params,
Exceptions\NotFound,
Utils\ClientManager,
Utils\Config,
@@ -74,7 +74,7 @@ class PortalClient implements RunnerParameterized
$this->errorOutput = $errorOutput;
}
public function run(RunnerParams $params): void
public function run(Params $params): void
{
$id = $params->get('id') ??
Url::detectPortalId() ??
application/Espo/Core/Console/Commands/RunJob.php
+2 -2
View File
@@ -36,7 +36,7 @@ use Espo\Core\{
};
use Espo\Core\Job\JobManager;
use Espo\Core\Job\JobStatus;
use Espo\Core\Job\Status;
use Espo\Core\Utils\Util;
use Espo\ORM\EntityManager;
@@ -96,7 +96,7 @@ class RunJob implements Command
'targetType' => $targetType,
'targetId' => $targetId,
'attempts' => 0,
'status' => JobStatus::READY,
'status' => Status::READY,
]);
try {
application/Espo/Core/EntryPoint/Starter.php
+1 -1
View File
@@ -30,7 +30,7 @@
namespace Espo\Core\EntryPoint;
use Espo\Core\Exceptions\Error;
use Espo\Core\Application\RunnerParams;
use Espo\Core\Application\Runner\Params as RunnerParams;
use Espo\Core\EntryPoint\EntryPointManager;
use Espo\Core\ApplicationUser;
use Espo\Core\Portal\Application as PortalApplication;
application/Espo/Core/Job/AbstractGroupJob.php
+5 -5
View File
@@ -58,7 +58,7 @@ abstract class AbstractGroupJob implements JobPreparable
$this->config = $config;
}
public function run(JobData $data): void
public function run(Data $data): void
{
$limit = $this->config->get('jobGroupMaxPortion') ?? self::PORTION_NUMBER;
@@ -76,7 +76,7 @@ abstract class AbstractGroupJob implements JobPreparable
->select('group')
->from(JobEntity::ENTITY_TYPE)
->where([
'status' => JobStatus::PENDING,
'status' => Status::PENDING,
'queue' => null,
'group!=' => null,
'executeTime<=' => $executeTime->format(DateTime::SYSTEM_DATE_TIME_FORMAT),
@@ -108,9 +108,9 @@ abstract class AbstractGroupJob implements JobPreparable
'scheduledJobId' => $data->getId(),
'targetGroup' => $group,
'status' => [
JobStatus::RUNNING,
JobStatus::READY,
JobStatus::PENDING,
Status::RUNNING,
Status::READY,
Status::PENDING,
],
])
->findOne();
application/Espo/Core/Job/JobData.php → application/Espo/Core/Job/Data.php
+1 -1
View File
@@ -34,7 +34,7 @@ use Espo\Core\Utils\ObjectUtil;
use TypeError;
use stdClass;
class JobData
class Data
{
private $data;
application/Espo/Core/Job/Job.php
+1 -1
View File
@@ -37,5 +37,5 @@ interface Job
/**
* Run a job.
*/
public function run(JobData $data): void;
public function run(Data $data): void;
}
application/Espo/Core/Job/JobRunner.php
+5 -5
View File
@@ -102,7 +102,7 @@ class JobRunner
throw new Error("Job '{$id}' not found.");
}
if ($jobEntity->getStatus() !== JobStatus::READY) {
if ($jobEntity->getStatus() !== Status::READY) {
throw new Error("Can't run job '{$id}' with no status Ready.");
}
@@ -118,7 +118,7 @@ class JobRunner
$exception = null;
if ($jobEntity->getStatus() !== JobStatus::RUNNING) {
if ($jobEntity->getStatus() !== Status::RUNNING) {
$this->setJobRunning($jobEntity);
}
@@ -154,7 +154,7 @@ class JobRunner
}
}
$status = $isSuccess ? JobStatus::SUCCESS : JobStatus::FAILED;
$status = $isSuccess ? Status::SUCCESS : Status::FAILED;
$jobEntity->set('status', $status);
@@ -217,7 +217,7 @@ class JobRunner
*/
private function runJob($job, JobEntity $jobEntity): void
{
$data = JobData::create($jobEntity->getData())
$data = Data::create($jobEntity->getData())
->withTargetId($jobEntity->getTargetId())
->withTargetType($jobEntity->getTargetType());
@@ -257,7 +257,7 @@ class JobRunner
$jobEntity->set('startedAt', DateTimeUtil::getSystemNowString());
}
$jobEntity->set('status', JobStatus::RUNNING);
$jobEntity->set('status', Status::RUNNING);
$jobEntity->set('pid', System::getPid());
$this->entityManager->saveEntity($jobEntity);
application/Espo/Core/Job/JobScheduler.php
+6 -6
View File
@@ -54,7 +54,7 @@ class JobScheduler
private $group = null;
/**
* @var JobData|null
* @var Data|null
*/
private $data = null;
@@ -147,16 +147,16 @@ class JobScheduler
/**
* Set data to be passed to the job.
*
* @param JobData|array|null $data
* @param Data|array|null $data
*/
public function setData($data): self
{
if (!is_null($data) && !is_array($data) && !$data instanceof JobData) {
if (!is_null($data) && !is_array($data) && !$data instanceof Data) {
throw new TypeError();
}
if (!$data instanceof JobData) {
$data = JobData::create($data);
if (!$data instanceof Data) {
$data = Data::create($data);
}
$this->data = $data;
@@ -180,7 +180,7 @@ class JobScheduler
$time = $time->add($this->delay);
}
$data = $this->data ?? JobData::create();
$data = $this->data ?? Data::create();
return $this->entityManager->createEntity(JobEntity::ENTITY_TYPE, [
'name' => $this->className,
application/Espo/Core/Job/JobTask.php
+1 -1
View File
@@ -32,7 +32,7 @@ namespace Espo\Core\Job;
use Espo\Core\{
Application,
ApplicationRunners\Job as JobRunner,
Application\RunnerParams,
Application\Runner\Params as RunnerParams,
};
use Spatie\Async\Task as AsyncTask;
application/Espo/Core/Job/QueueProcessor.php
+2 -2
View File
@@ -142,10 +142,10 @@ class QueueProcessor
$job->set('startedAt', date(DateTimeUtil::SYSTEM_DATE_TIME_FORMAT));
if ($useProcessPool) {
$job->set('status', JobStatus::READY);
$job->set('status', Status::READY);
}
else {
$job->set('status', JobStatus::RUNNING);
$job->set('status', Status::RUNNING);
$job->set('pid', System::getPid());
}
application/Espo/Core/Job/QueueUtil.php
+19 -19
View File
@@ -83,7 +83,7 @@ class QueueUtil
return false;
}
return $job->get('status') === JobStatus::PENDING;
return $job->get('status') === Status::PENDING;
}
/**
@@ -108,7 +108,7 @@ class QueueUtil
'data',
])
->where([
'status' => JobStatus::PENDING,
'status' => Status::PENDING,
'executeTime<=' => DateTimeUtil::getSystemNowString(),
'queue' => $queue,
'group' => $group,
@@ -131,7 +131,7 @@ class QueueUtil
$where = [
'scheduledJobId' => $scheduledJobId,
'status' => [JobStatus::RUNNING, JobStatus::READY],
'status' => [Status::RUNNING, Status::READY],
];
if ($targetId && $targetType) {
@@ -160,8 +160,8 @@ class QueueUtil
->leftJoin('scheduledJob')
->where([
'status' => [
JobStatus::RUNNING,
JobStatus::READY,
Status::RUNNING,
Status::READY,
],
'scheduledJobId!=' => null,
'scheduledJob.job!=' => $this->metadataProvider->getPreparableJobNameList(),
@@ -189,10 +189,10 @@ class QueueUtil
->where([
'scheduledJobId' => $scheduledJobId,
'status' => [ // This forces usage of an appropriate index.
JobStatus::PENDING,
JobStatus::READY,
JobStatus::RUNNING,
JobStatus::SUCCESS,
Status::PENDING,
Status::READY,
Status::RUNNING,
Status::SUCCESS,
],
'executeTime>=' => $fromString,
'executeTime<=' => $toString,
@@ -208,7 +208,7 @@ class QueueUtil
->getRDBRepository(JobEntity::ENTITY_TYPE)
->where([
'scheduledJobId' => $scheduledJobId,
'status' => JobStatus::PENDING,
'status' => Status::PENDING,
])
->count();
@@ -244,7 +244,7 @@ class QueueUtil
'startedAt',
])
->where([
'status' => JobStatus::RUNNING,
'status' => Status::RUNNING,
'startedAt<' => $dateTimeThreshold,
])
->find();
@@ -279,7 +279,7 @@ class QueueUtil
'startedAt',
])
->where([
'status' => JobStatus::READY,
'status' => Status::READY,
'startedAt<' => $dateTimeThreshold,
])
->find();
@@ -311,7 +311,7 @@ class QueueUtil
'startedAt'
])
->where([
'status' => JobStatus::RUNNING,
'status' => Status::RUNNING,
'executeTime<' => $dateTimeThreshold,
])
->find();
@@ -349,7 +349,7 @@ class QueueUtil
->update()
->in(JobEntity::ENTITY_TYPE)
->set([
'status' => JobStatus::FAILED,
'status' => Status::FAILED,
'attempts' => 0,
])
->where([
@@ -366,7 +366,7 @@ class QueueUtil
$this->scheduleUtil->addLogRecord(
$job->get('scheduledJobId'),
JobStatus::FAILED,
Status::FAILED,
$job->get('startedAt'),
$job->get('targetId'),
$job->get('targetType')
@@ -385,7 +385,7 @@ class QueueUtil
->leftJoin('scheduledJob')
->where([
'scheduledJobId!=' => null,
'status' => JobStatus::PENDING,
'status' => Status::PENDING,
'executeTime<=' => DateTimeUtil::getSystemNowString(),
'scheduledJob.job!=' => $this->metadataProvider->getPreparableJobNameList(),
'targetId' => null,
@@ -413,7 +413,7 @@ class QueueUtil
->select(['id'])
->where([
'scheduledJobId' => $scheduledJobId,
'status' => JobStatus::PENDING,
'status' => Status::PENDING,
])
->order('executeTime')
->limit(0, 1000)
@@ -454,7 +454,7 @@ class QueueUtil
'failedAttempts',
])
->where([
'status' => JobStatus::FAILED,
'status' => Status::FAILED,
'executeTime<=' => DateTimeUtil::getSystemNowString(),
'attempts>' => 0,
])
@@ -465,7 +465,7 @@ class QueueUtil
$attempts = $job->get('attempts');
$job->set([
'status' => JobStatus::PENDING,
'status' => Status::PENDING,
'attempts' => $attempts - 1,
'failedAttempts' => $failedAttempts + 1,
]);
application/Espo/Core/Job/ScheduleProcessor.php
+1 -1
View File
@@ -151,7 +151,7 @@ class ScheduleProcessor
$this->entityManager->createEntity(JobEntity::ENTITY_TYPE, [
'name' => $scheduledJob->getName(),
'status' => JobStatus::PENDING,
'status' => Status::PENDING,
'scheduledJobId' => $id,
'executeTime' => $executeTime,
]);
application/Espo/Core/Job/JobStatus.php → application/Espo/Core/Job/Status.php
+1 -1
View File
@@ -29,7 +29,7 @@
namespace Espo\Core\Job;
class JobStatus
class Status
{
public const PENDING = 'Pending';
application/Espo/Jobs/CheckEmailAccounts.php
+6 -6
View File
@@ -32,9 +32,9 @@ namespace Espo\Jobs;
use Espo\Core\Exceptions\Error;
use Espo\Core\{
Job\JobStatus,
Job\Status,
Job\JobPreparable,
Job\JobData,
Job\Data,
Job\ScheduledJobData,
ServiceFactory,
ORM\EntityManager,
@@ -56,7 +56,7 @@ class CheckEmailAccounts implements JobPreparable
$this->entityManager = $entityManager;
}
public function run(JobData $data): void
public function run(Data $data): void
{
$targetId = $data->getTargetId();
@@ -104,8 +104,8 @@ class CheckEmailAccounts implements JobPreparable
->where([
'scheduledJobId' => $data->getId(),
'status' => [
JobStatus::RUNNING,
JobStatus::READY,
Status::RUNNING,
Status::READY,
],
'targetType' => 'EmailAccount',
'targetId' => $entity->getId(),
@@ -120,7 +120,7 @@ class CheckEmailAccounts implements JobPreparable
->getRDBRepository('Job')
->where([
'scheduledJobId' => $data->getId(),
'status' => JobStatus::PENDING,
'status' => Status::PENDING,
'targetType' => 'EmailAccount',
'targetId' => $entity->getId(),
])
application/Espo/Jobs/CheckInboundEmails.php
+6 -6
View File
@@ -32,9 +32,9 @@ namespace Espo\Jobs;
use Espo\Core\Exceptions\Error;
use Espo\Core\{
Job\JobStatus,
Job\Status,
Job\JobPreparable,
Job\JobData,
Job\Data,
Job\ScheduledJobData,
ServiceFactory,
ORM\EntityManager,
@@ -56,7 +56,7 @@ class CheckInboundEmails implements JobPreparable
$this->entityManager = $entityManager;
}
public function run(JobData $data): void
public function run(Data $data): void
{
$targetId = $data->getTargetId();
@@ -102,8 +102,8 @@ class CheckInboundEmails implements JobPreparable
->where([
'scheduledJobId' => $data->getId(),
'status' => [
JobStatus::RUNNING,
JobStatus::READY,
Status::RUNNING,
Status::READY,
],
'targetType' => 'InboundEmail',
'targetId' => $entity->getId(),
@@ -118,7 +118,7 @@ class CheckInboundEmails implements JobPreparable
->getRDBRepository('Job')
->where([
'scheduledJobId' => $data->getId(),
'status' => JobStatus::PENDING,
'status' => Status::PENDING,
'targetType' => 'InboundEmail',
'targetId' => $entity->getId(),
])
application/Espo/Repositories/ScheduledJob.php
+2 -2
View File
@@ -31,7 +31,7 @@ namespace Espo\Repositories;
use Espo\ORM\Entity;
use Espo\Core\Job\JobStatus;
use Espo\Core\Job\Status;
class ScheduledJob extends \Espo\Core\Repositories\Database
{
@@ -46,7 +46,7 @@ class ScheduledJob extends \Espo\Core\Repositories\Database
->getRepository('Job')
->where([
'scheduledJobId' => $entity->id,
'status' => JobStatus::PENDING,
'status' => Status::PENDING,
])
->find();
application/Espo/Tools/EmailNotification/Jobs/NotifyAboutAssignment.php
+2 -2
View File
@@ -30,7 +30,7 @@
namespace Espo\Tools\EmailNotification\Jobs;
use Espo\Core\Job\Job;
use Espo\Core\Job\JobData;
use Espo\Core\Job\Data;
use Espo\Tools\EmailNotification\AssignmentProcessor;
use Espo\Tools\EmailNotification\AssignmentProcessorData;
@@ -44,7 +44,7 @@ class NotifyAboutAssignment implements Job
$this->assignmentProcessor = $assignmentProcessor;
}
public function run(JobData $data): void
public function run(Data $data): void
{
$this->assignmentProcessor->process(
AssignmentProcessorData::create()
application/Espo/Tools/Import/Jobs/RunIdle.php
+2 -2
View File
@@ -30,7 +30,7 @@
namespace Espo\Tools\Import\Jobs;
use Espo\Core\Job\Job;
use Espo\Core\Job\JobData;
use Espo\Core\Job\Data;
use Espo\Core\Exceptions\Error;
use Espo\Tools\Import\ImportFactory;
@@ -52,7 +52,7 @@ class RunIdle implements Job
$this->entityManager = $entityManager;
}
public function run(JobData $data): void
public function run(Data $data): void
{
$raw = $data->getRaw();
application/Espo/Tools/Stream/Jobs/AutoFollow.php
+2 -2
View File
@@ -30,7 +30,7 @@
namespace Espo\Tools\Stream\Jobs;
use Espo\Core\Job\Job;
use Espo\Core\Job\JobData;
use Espo\Core\Job\Data;
use Espo\Core\AclManager;
use Espo\Core\Acl\Exceptions\NotImplemented as AclNotImplemented;
@@ -65,7 +65,7 @@ class AutoFollow implements Job
$this->entityManager = $entityManager;
}
public function run(JobData $data): void
public function run(Data $data): void
{
$userIdList = $data->get('userIdList') ?? [];
$entityType = $data->get('entityType');
application/Espo/Tools/Stream/Jobs/ControlFollowers.php
+2 -2
View File
@@ -30,7 +30,7 @@
namespace Espo\Tools\Stream\Jobs;
use Espo\Core\Job\Job;
use Espo\Core\Job\JobData;
use Espo\Core\Job\Data;
use Espo\Core\AclManager;
use Espo\Core\Acl\Exceptions\NotImplemented as AclNotImplemented;
@@ -60,7 +60,7 @@ class ControlFollowers implements Job
$this->entityManager = $entityManager;
}
public function run(JobData $data): void
public function run(Data $data): void
{
$entityType = $data->get('entityType');
$entityId = $data->get('entityId');
public/oauth-callback.php
+2 -2
View File
@@ -32,12 +32,12 @@ include "../bootstrap.php";
use Espo\Core\{
Application,
ApplicationRunners\EntryPoint,
Application\RunnerParams,
Application\Runner\Params,
};
$app = new Application();
$app->run(
EntryPoint::class,
RunnerParams::create()->with('entryPoint', 'oauthCallback')
Params::create()->with('entryPoint', 'oauthCallback')
);
public/portal/index.php
+5 -4
View File
@@ -31,7 +31,7 @@ include "../../bootstrap.php";
use Espo\Core\{
Application,
Application\RunnerParams,
Application\Runner\Params,
ApplicationRunners\EntryPoint,
ApplicationRunners\PortalClient,
Portal\Utils\Url,
@@ -59,6 +59,7 @@ if (filter_has_var(INPUT_GET, 'entryPoint')) {
exit;
}
$params = RunnerParams::create()->with('basePath', $basePath);
$app->run(PortalClient::class, $params);
$app->run(
PortalClient::class,
Params::create()->with('basePath', $basePath)
);
tests/integration/Espo/Core/Job/JobTest.php
+14 -14
View File
@@ -31,7 +31,7 @@ namespace tests\integration\Espo\Core\Job;
use Espo\Core\{
Job\JobManager,
Job\JobStatus,
Job\Status,
Job\JobSchedulerFactory,
Job\QueueName,
ORM\EntitManager,
@@ -81,7 +81,7 @@ class JobTest extends \tests\integration\Core\BaseTestCase
$jobReloaded = $this->entityManager->getEntity('Job', $job->getId());
$this->assertEquals(JobStatus::SUCCESS, $jobReloaded->getStatus());
$this->assertEquals(Status::SUCCESS, $jobReloaded->getStatus());
}
public function testProcessQueueNoGroup(): void
@@ -95,7 +95,7 @@ class JobTest extends \tests\integration\Core\BaseTestCase
$jobReloaded = $this->entityManager->getEntity('Job', $job->id);
$this->assertEquals(JobStatus::SUCCESS, $jobReloaded->getStatus());
$this->assertEquals(Status::SUCCESS, $jobReloaded->getStatus());
}
public function testProcessQueueGroupAll(): void
@@ -121,9 +121,9 @@ class JobTest extends \tests\integration\Core\BaseTestCase
$job2Reloaded = $this->entityManager->getEntity('Job', $job2->getId());
$job3Reloaded = $this->entityManager->getEntity('Job', $job3->getId());
$this->assertEquals(JobStatus::SUCCESS, $job1Reloaded->getStatus());
$this->assertEquals(JobStatus::SUCCESS, $job2Reloaded->getStatus());
$this->assertEquals(JobStatus::SUCCESS, $job3Reloaded->getStatus());
$this->assertEquals(Status::SUCCESS, $job1Reloaded->getStatus());
$this->assertEquals(Status::SUCCESS, $job2Reloaded->getStatus());
$this->assertEquals(Status::SUCCESS, $job3Reloaded->getStatus());
}
public function testProcessQueueGroupSeparate(): void
@@ -149,29 +149,29 @@ class JobTest extends \tests\integration\Core\BaseTestCase
$job2Reloaded = $this->entityManager->getEntity('Job', $job2->getId());
$job3Reloaded = $this->entityManager->getEntity('Job', $job3->getId());
$this->assertEquals(JobStatus::PENDING, $job1Reloaded->getStatus());
$this->assertEquals(JobStatus::SUCCESS, $job2Reloaded->getStatus());
$this->assertEquals(JobStatus::SUCCESS, $job3Reloaded->getStatus());
$this->assertEquals(Status::PENDING, $job1Reloaded->getStatus());
$this->assertEquals(Status::SUCCESS, $job2Reloaded->getStatus());
$this->assertEquals(Status::SUCCESS, $job3Reloaded->getStatus());
$this->jobManager->processGroup('group-0', 100);
$job1Reloaded2 = $this->entityManager->getEntity('Job', $job1->getId());
$this->assertEquals(JobStatus::SUCCESS, $job1Reloaded2->getStatus());
$this->assertEquals(Status::SUCCESS, $job1Reloaded2->getStatus());
}
public function testRunJobById(): void
{
$job = $this->entityManager->createEntity('Job', [
'job' => 'Dummy',
'status' => JobStatus::READY,
'status' => Status::READY,
]);
$this->jobManager->runJobById($job->id);
$jobReloaded = $this->entityManager->getEntity('Job', $job->id);
$this->assertEquals(JobStatus::SUCCESS, $jobReloaded->getStatus());
$this->assertEquals(Status::SUCCESS, $jobReloaded->getStatus());
}
public function testRunJobByEntity(): void
@@ -184,7 +184,7 @@ class JobTest extends \tests\integration\Core\BaseTestCase
$jobReloaded = $this->entityManager->getEntity('Job', $job->id);
$this->assertEquals(JobStatus::SUCCESS, $jobReloaded->getStatus());
$this->assertEquals(Status::SUCCESS, $jobReloaded->getStatus());
}
public function testRunJobWithClassName(): void
@@ -200,6 +200,6 @@ class JobTest extends \tests\integration\Core\BaseTestCase
$jobReloaded = $this->entityManager->getEntity('Job', $job->getId());
$this->assertEquals(JobStatus::SUCCESS, $jobReloaded->getStatus());
$this->assertEquals(Status::SUCCESS, $jobReloaded->getStatus());
}
}
tests/integration/testClasses/Job/Job.php
+2 -2
View File
@@ -30,11 +30,11 @@
namespace tests\integration\testClasses\Job;
use Espo\Core\Job\Job as JobInterface;
use Espo\Core\Job\JobData;
use Espo\Core\Job\Data;
class Job implements JobInterface
{
public function run(JobData $data): void
public function run(Data $data): void
{
}
tests/unit/Espo/Core/Job/DataTest.php
+3 -3
View File
@@ -29,13 +29,13 @@
namespace tests\unit\Espo\Core\Job;
use Espo\Core\Job\JobData;
use Espo\Core\Job\Data;
class DataTest extends \PHPUnit\Framework\TestCase
{
public function testData1()
{
$data = JobData
$data = Data
::create((object) ['test' => '1'])
->withTargetId('target-id')
->withTargetType('target-type');
@@ -47,7 +47,7 @@ class DataTest extends \PHPUnit\Framework\TestCase
public function testData2()
{
$data = JobData
$data = Data
::create(['test' => '1']);
$this->assertEquals('1', $data->get('test'));
tests/unit/Espo/Core/Job/JobSchedulerTest.php
+2 -2
View File
@@ -32,7 +32,7 @@ namespace tests\unit\Espo\Core\Job;
use Espo\Core\Job\JobScheduler;
use Espo\Core\Job\QueueName;
use Espo\Core\Utils\DateTime;
use Espo\Core\Job\JobData;
use Espo\Core\Job\Data;
use Espo\ORM\EntityManager;
@@ -123,7 +123,7 @@ class JobSchedulerTest extends \PHPUnit\Framework\TestCase
)
->willReturn($jobEntity);
$data = JobData
$data = Data
::create([
'test' => '1',
])
tests/unit/testClasses/Core/Job/TestJob.php
+2 -2
View File
@@ -30,9 +30,9 @@
namespace tests\unit\testClasses\Core\Job;
use Espo\Core\Job\Job;
use Espo\Core\Job\JobData;
use Espo\Core\Job\Data;
class TestJob implements Job
{
public function run(JobData $data): void {}
public function run(Data $data): void {}
}