Cron: ilCronJobEntities is more of array than iterator

Author: nhaagen

components/ILIAS/Cron/classes/class.ilCronJobEntities.php

@@ -20,46 +20,47 @@
 
 class ilCronJobEntities implements ilCronJobCollection
 {
-    private readonly ArrayIterator $jobs;
+    private array $jobs;
 
     public function __construct(ilCronJobEntity ...$jobs)
     {
-        $this->jobs = new ArrayIterator($jobs);
+        $this->jobs = $jobs;
     }
 
     /**
      * @return ArrayIterator|ilCronJobEntity[]
      */
     public function getIterator(): ArrayIterator
     {
-        return $this->jobs;
+        return new ArrayIterator($this->jobs);
     }
 
     public function count(): int
     {
-        return iterator_count($this);
+        return count($this->jobs);
     }
 
     public function add(ilCronJobEntity $job): void
     {
-        $this->jobs->append($job);
+        $this->jobs[] = $job;
     }
 
     public function filter(callable $callable): ilCronJobCollection
     {
-        return new static(...array_filter(iterator_to_array($this), $callable));
+
+        return new static(...array_filter($this->jobs, $callable));
     }
 
     public function slice(int $offset, ?int $length = null): ilCronJobCollection
     {
-        return new static(...array_slice(iterator_to_array($this), $offset, $length, true));
+        return new static(...array_slice($this->jobs, $offset, $length, true));
     }
 
     /**
      * @return ilCronJobEntity[]
      */
     public function toArray(): array
     {
-        return iterator_to_array($this);
+        return $this->jobs;
     }
 }

components/ILIAS/Cron/classes/class.ilCronJobEntity.php

@@ -19,6 +19,7 @@
 declare(strict_types=1);
 
 use ILIAS\Cron\Schedule\CronJobScheduleType;
+use ILIAS\Cron\CronJob;
 
 class ilCronJobEntity
 {
@@ -48,7 +49,7 @@ class ilCronJobEntity
      * @param array<string, mixed> $record
      * @param bool $isPlugin
      */
-    public function __construct(private readonly ilCronJob $job, array $record, private readonly bool $isPlugin = false)
+    public function __construct(private readonly CronJob $job, array $record, private readonly bool $isPlugin = false)
     {
         $job->init();
         $this->mapRecord($job, $record);
@@ -57,7 +58,7 @@ public function __construct(private readonly ilCronJob $job, array $record, priv
     /**
      * @param array<string, mixed> $record
      */
-    private function mapRecord(ilCronJob $job, array $record): void
+    private function mapRecord(CronJob $job, array $record): void
     {
         if (! array_key_exists('job_id', $record)) {
             //TODO: remove!

components/ILIAS/Cron/tests/CronJobEntityTest.php

@@ -20,6 +20,7 @@
 
 use PHPUnit\Framework\TestCase;
 use ILIAS\Cron\Schedule\CronJobScheduleType;
+use ILIAS\Cron\CronJob;
 
 /**
  * Class CronJobEntityTest
@@ -36,7 +37,47 @@ private function getEntity(
         int $schedule_value = 5,
         bool $is_plugin = false
     ): ilCronJobEntity {
-        $job_instance ??= $this->createMock(ilCronJob::class);
+        $job_instance ??= new class (
+            $schedule_type,
+            $schedule_value
+        ) implements CronJob {
+            public function __construct(
+                private $schedule_type,
+                private $schedule_value
+            ) {
+            }
+            public function getId(): string
+            {
+                return 'phpunit';
+            }
+            public function getComponent(): string
+            {
+                return 'phpunit';
+            }
+            public function getTitle(): string
+            {
+                return 'phpunit';
+            }
+            public function getDescription(): string
+            {
+                return 'phpunit';
+            }
+            public function getScheduleType(): ?CronJobScheduleType
+            {
+                return $this->schedule_type;
+            }
+            public function getScheduleValue(): ?int
+            {
+                return $this->schedule_value;
+            }
+            public function run(): \ilCronJobResult
+            {
+                return new \ilCronJobResult();
+            }
+            public function init(): void
+            {
+            }
+        };
 
         if ($schedule_type === null) {
             $schedule_type = CronJobScheduleType::SCHEDULE_TYPE_IN_MINUTES->value;
@@ -91,9 +132,14 @@ public function testCollectionCanBeChanged(ilCronJobEntities $entities): ilCronJ
      */
     public function testCollectionCanBeFilteredAndSliced(ilCronJobEntities $entities): void
     {
-        $this->assertCount(0, $entities->filter(static function (ilCronJobEntity $entity): bool {
-            return $entity->getJobId() !== 'phpunit';
-        }));
+        $this->assertCount(
+            0,
+            $entities->filter(
+                static function (ilCronJobEntity $entity): bool {
+                    return $entity->getJobId() !== 'phpunit';
+                }
+            )
+        );
 
         $this->assertCount(1, $entities->slice(1, 1));
     }