renaming 4

application/Espo/Core/Console/Commands/RunJob.php

@@ -36,7 +36,7 @@ use Espo\Core\{
 };
 
 use Espo\Core\Job\JobManager;
-use Espo\Core\Job\Status;
+use Espo\Core\Job\Job\Status;
 use Espo\Core\Utils\Util;
 
 use Espo\ORM\EntityManager;

application/Espo/Core/Job/AbstractGroupJob.php

@@ -31,6 +31,8 @@ namespace Espo\Core\Job;
 
 use Espo\Core\Utils\DateTime;
 use Espo\Core\Utils\Config;
+use Espo\Core\Job\Job\Data;
+use Espo\Core\Job\Job\Status;
 
 use Espo\ORM\EntityManager;
 

application/Espo/Core/Job/Job.php

@@ -29,6 +29,8 @@
 
 namespace Espo\Core\Job;
 
+use Espo\Core\Job\Job\Data;
+
 /**
  * A job.
  */

application/Espo/Core/Job/Job/Data.php

@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Job;
+namespace Espo\Core\Job\Job;
 
 use Espo\Core\Utils\ObjectUtil;
 

application/Espo/Core/Job/Job/Status.php

@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Job;
+namespace Espo\Core\Job\Job;
 
 class Status
 {

application/Espo/Core/Job/JobRunner.php

@@ -38,6 +38,9 @@ use Espo\Core\{
     Utils\DateTime as DateTimeUtil,
 };
 
+use Espo\Core\Job\Job\Data;
+use Espo\Core\Job\Job\Status;
+
 use Espo\Entities\Job as JobEntity;
 
 use Throwable;

application/Espo/Core/Job/JobScheduler.php

@@ -32,6 +32,7 @@ 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;
 
@@ -180,7 +181,7 @@ class JobScheduler
             $time = $time->add($this->delay);
         }
 
-        $data = $this->data ?? Data::create();       
+        $data = $this->data ?? Data::create();
 
         return $this->entityManager->createEntity(JobEntity::ENTITY_TYPE, [
             'name' => $this->className,

application/Espo/Core/Job/QueueProcessor.php

@@ -39,6 +39,8 @@ use Espo\{
     Entities\Job as JobEntity,
 };
 
+use Espo\Core\Job\Job\Status;
+
 use Spatie\Async\Pool as AsyncPool;
 
 class QueueProcessor

application/Espo/Core/Job/QueueUtil.php

@@ -36,6 +36,8 @@ use Espo\Core\{
     Utils\DateTime as DateTimeUtil,
 };
 
+use Espo\Core\Job\Job\Status;
+
 use Espo\Entities\Job as JobEntity;
 
 use Espo\ORM\Collection;

application/Espo/Core/Job/ScheduleProcessor.php

@@ -35,6 +35,8 @@ use Espo\Core\{
     Utils\DateTime as DateTimeUtil,
 };
 
+use Espo\Core\Job\Job\Status;
+
 use Espo\Entities\{
     ScheduledJob as ScheduledJobEntity,
     Job as JobEntity,

application/Espo/Jobs/CheckEmailAccounts.php

@@ -32,9 +32,9 @@ namespace Espo\Jobs;
 use Espo\Core\Exceptions\Error;
 
 use Espo\Core\{
-    Job\Status,
+    Job\Job\Status,
     Job\JobPreparable,
-    Job\Data,
+    Job\Job\Data,
     Job\ScheduledJobData,
     ServiceFactory,
     ORM\EntityManager,

application/Espo/Jobs/CheckInboundEmails.php

@@ -32,9 +32,9 @@ namespace Espo\Jobs;
 use Espo\Core\Exceptions\Error;
 
 use Espo\Core\{
-    Job\Status,
+    Job\Job\Status,
     Job\JobPreparable,
-    Job\Data,
+    Job\Job\Data,
     Job\ScheduledJobData,
     ServiceFactory,
     ORM\EntityManager,

application/Espo/Repositories/ScheduledJob.php

@@ -31,7 +31,7 @@ namespace Espo\Repositories;
 
 use Espo\ORM\Entity;
 
-use Espo\Core\Job\Status;
+use Espo\Core\Job\Job\Status;
 
 class ScheduledJob extends \Espo\Core\Repositories\Database
 {

application/Espo/Tools/EmailNotification/Jobs/NotifyAboutAssignment.php

@@ -30,7 +30,7 @@
 namespace Espo\Tools\EmailNotification\Jobs;
 
 use Espo\Core\Job\Job;
-use Espo\Core\Job\Data;
+use Espo\Core\Job\Job\Data;
 
 use Espo\Tools\EmailNotification\AssignmentProcessor;
 use Espo\Tools\EmailNotification\AssignmentProcessorData;

application/Espo/Tools/Import/Jobs/RunIdle.php

@@ -30,7 +30,7 @@
 namespace Espo\Tools\Import\Jobs;
 
 use Espo\Core\Job\Job;
-use Espo\Core\Job\Data;
+use Espo\Core\Job\Job\Data;
 use Espo\Core\Exceptions\Error;
 
 use Espo\Tools\Import\ImportFactory;

application/Espo/Tools/Stream/Jobs/AutoFollow.php

@@ -30,7 +30,7 @@
 namespace Espo\Tools\Stream\Jobs;
 
 use Espo\Core\Job\Job;
-use Espo\Core\Job\Data;
+use Espo\Core\Job\Job\Data;
 
 use Espo\Core\AclManager;
 use Espo\Core\Acl\Exceptions\NotImplemented as AclNotImplemented;

application/Espo/Tools/Stream/Jobs/ControlFollowers.php

@@ -30,7 +30,7 @@
 namespace Espo\Tools\Stream\Jobs;
 
 use Espo\Core\Job\Job;
-use Espo\Core\Job\Data;
+use Espo\Core\Job\Job\Data;
 
 use Espo\Core\AclManager;
 use Espo\Core\Acl\Exceptions\NotImplemented as AclNotImplemented;

tests/integration/Espo/Core/Job/JobTest.php

@@ -31,7 +31,7 @@ namespace tests\integration\Espo\Core\Job;
 
 use Espo\Core\{
     Job\JobManager,
-    Job\Status,
+    Job\Job\Status,
     Job\JobSchedulerFactory,
     Job\QueueName,
     ORM\EntitManager,

tests/integration/testClasses/Job/Job.php

@@ -30,7 +30,7 @@
 namespace tests\integration\testClasses\Job;
 
 use Espo\Core\Job\Job as JobInterface;
-use Espo\Core\Job\Data;
+use Espo\Core\Job\Job\Data;
 
 class Job implements JobInterface
 {

tests/unit/Espo/Core/Job/DataTest.php

@@ -29,7 +29,7 @@
 
 namespace tests\unit\Espo\Core\Job;
 
-use Espo\Core\Job\Data;
+use Espo\Core\Job\Job\Data;
 
 class DataTest extends \PHPUnit\Framework\TestCase
 {

tests/unit/Espo/Core/Job/JobSchedulerTest.php

@@ -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\Data;
+use Espo\Core\Job\Job\Data;
 
 use Espo\ORM\EntityManager;
 

tests/unit/testClasses/Core/Job/TestJob.php

@@ -30,7 +30,7 @@
 namespace tests\unit\testClasses\Core\Job;
 
 use Espo\Core\Job\Job;
-use Espo\Core\Job\Data;
+use Espo\Core\Job\Job\Data;
 
 class TestJob implements Job
 {