Component/Cron: init cron jobs via Component's seek

cli/cron.php

@@ -18,10 +18,12 @@
 
 declare(strict_types=1);
 
-chdir(__DIR__);
-chdir('..');
+require_once __DIR__ . '/../vendor/composer/vendor/autoload.php';
+require_once __DIR__ . '/../artifacts/bootstrap_default.php';
 
-require_once './vendor/composer/vendor/autoload.php';
+ilContext::init(ilContext::CONTEXT_CRON);
+
+entry_point('ILIAS Legacy Initialisation Adapter');
 
 $cron = new ILIAS\Cron\CLI\App(
     new ILIAS\Cron\CLI\Commands\RunActiveJobsCommand()

cli/hello_world.php

@@ -16,7 +16,7 @@
  *
  *********************************************************************/
 
-require_once(__DIR__ . "/../artifacts/bootstrap.php");
+require_once(__DIR__ . "/../artifacts/bootstrap_setup.php");
 
 // This calls a simple entrypoint, for testing and documentation purpose. This
 // should just print a simple hello and will work when bootstrapping works.

components/ILIAS/Authentication/Authentication.php

@@ -67,5 +67,12 @@ public function offsetUnset(mixed $offset): void
             new Component\Resource\Endpoint($this, "sessioncheck.php");
         $contribute[Component\Resource\PublicAsset::class] = fn() =>
             new Component\Resource\ComponentJS($this, "session_reminder.js");
+
+        $contribute[\ILIAS\Cron\CronJob::class] = static fn() =>
+            new \ilAuthDestroyExpiredSessionsCron(
+                self::class,
+                $use[\ILIAS\Language\Language::class],
+                $use[\ILIAS\Logging\LoggerFactory::class]
+            );
     }
 }

components/ILIAS/Authentication/classes/Cron/class.ilAuthDestroyExpiredSessionsCron.php

@@ -20,13 +20,8 @@
 
 class ilAuthDestroyExpiredSessionsCron extends ilCronJob
 {
-    protected ilLanguage $lng;
-
-    public function __construct()
+    public function init(): void
     {
-        global $DIC;
-
-        $this->lng = $DIC->language();
         $this->lng->loadLanguageModule('auth');
     }
 

components/ILIAS/Authentication/service.xml

@@ -23,7 +23,4 @@
 		<pluginslot id="authhk" name="AuthenticationHook" />
 	</pluginslots>
 	<logging />
-	<crons>
-		<cron id="auth_destroy_expired_sessions" class="ilAuthDestroyExpiredSessionsCron" />
-	</crons>
 </service>

components/ILIAS/BookingManager/BookingManager.php

@@ -39,5 +39,18 @@ public function init(
 
         $contribute[Component\Resource\PublicAsset::class] = fn() =>
             new Component\Resource\ComponentJS($this, "ScheduleInput.js");
+
+        $contribute[\ILIAS\Cron\CronJob::class] = static fn() =>
+            new \ilBookCronNotification(
+                self::class,
+                $use[\ILIAS\Language\Language::class],
+                $use[\ILIAS\Logging\LoggerFactory::class]
+            );
+        $contribute[\ILIAS\Cron\CronJob::class] = static fn() =>
+            new \ilBookingPrefBookCron(
+                self::class,
+                $use[\ILIAS\Language\Language::class],
+                $use[\ILIAS\Logging\LoggerFactory::class]
+            );
     }
 }

components/ILIAS/BookingManager/classes/class.ilBookCronNotification.php

@@ -25,15 +25,14 @@
 class ilBookCronNotification extends ilCronJob
 {
     protected \ILIAS\BookingManager\InternalRepoService $repo;
-    protected ilLanguage $lng;
     protected ilLogger $book_log;
 
-    public function __construct()
+    public function init(): void
     {
-        global $DIC;
-
-        $this->lng = $DIC->language();
+        $this->lng->loadLanguageModule('dateplaner');
+        $this->lng->loadLanguageModule('book');
 
+        global $DIC;
         $this->book_log = ilLoggerFactory::getLogger("book");
         $this->repo = $DIC->bookingManager()
             ->internal()
@@ -47,18 +46,12 @@ public function getId(): string
 
     public function getTitle(): string
     {
-        $lng = $this->lng;
-
-        $lng->loadLanguageModule("book");
-        return $lng->txt("book_notification");
+        return $this->lng->txt("book_notification");
     }
 
     public function getDescription(): string
     {
-        $lng = $this->lng;
-
-        $lng->loadLanguageModule("book");
-        return $lng->txt("book_notification_info");
+        return $this->lng->txt("book_notification_info");
     }
 
     public function getDefaultScheduleType(): CronJobScheduleType

components/ILIAS/BookingManager/classes/class.ilBookingPrefBookCron.php

@@ -26,13 +26,9 @@
  */
 class ilBookingPrefBookCron extends ilCronJob
 {
-    protected ilLanguage $lng;
-
-    public function __construct()
+    public function init(): void
     {
-        global $DIC;
-
-        $this->lng = $DIC->language();
+        $this->lng->loadLanguageModule('book');
     }
 
     public function getId(): string

components/ILIAS/BookingManager/module.xml

@@ -21,9 +21,5 @@
 	<web_access_checker>
 		<secure_path path="ilBookingManager" checking-class="ilObjBookingPoolAccess"/>
 	</web_access_checker>
-	<crons>
-		<cron id="book_notification" class="ilBookCronNotification" />
-		<cron id="book_pref_book" class="ilBookingPrefBookCron" />
-	</crons>
 	<logging />
 </module>

components/ILIAS/COPage/COPage.php

@@ -110,6 +110,11 @@ public function getTarget(): string
                 return "assets/js/ilIntLink.js";
             }
         };
-
+        $contribute[\ILIAS\Cron\CronJob::class] = static fn() =>
+            new \ilCleanCOPageHistoryCronjob(
+                self::class,
+                $use[\ILIAS\Language\Language::class],
+                $use[\ILIAS\Logging\LoggerFactory::class]
+            );
     }
 }

components/ILIAS/COPage/Cron/class.ilCleanCOPageHistoryCronjob.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of ILIAS, a powerful learning management system
  * published by ILIAS open source e-Learning e.V.
@@ -18,6 +16,8 @@
  *
  *********************************************************************/
 
+declare(strict_types=1);
+
 use ILIAS\COPage\History\HistoryManager;
 use ILIAS\Cron\Schedule\CronJobScheduleType;
 
@@ -28,13 +28,12 @@ class ilCleanCOPageHistoryCronjob extends ilCronJob
 {
     protected HistoryManager $history_manager;
     protected ilSetting $settings;
-    protected ilLanguage $lng;
 
-    public function __construct()
+    public function init(): void
     {
-        global $DIC;
+        $this->lng->loadLanguageModule("copg");
 
-        $this->lng = $DIC->language();
+        global $DIC;
         $this->settings = $DIC->settings();
         $this->history_manager = $DIC
             ->copage()
@@ -50,18 +49,12 @@ public function getId(): string
 
     public function getTitle(): string
     {
-        $lng = $this->lng;
-
-        $lng->loadLanguageModule("copg");
-        return $lng->txt("copg_history_cleanup_cron");
+        return $this->lng->txt("copg_history_cleanup_cron");
     }
 
     public function getDescription(): string
     {
-        $lng = $this->lng;
-
-        $lng->loadLanguageModule("copg");
-        return $lng->txt("copg_history_cleanup_cron_info");
+        return $this->lng->txt("copg_history_cleanup_cron_info");
     }
 
     public function getDefaultScheduleType(): CronJobScheduleType

components/ILIAS/COPage/service.xml

@@ -38,7 +38,4 @@
 		<pageobject parent_type="stys" class_name="ilPageLayoutPage" directory="Layout/classes"/>
 	</copage>
 	<logging />
-	<crons>
-		<cron id="copg_history_cleanup" class="ilCleanCOPageHistoryCronjob" path="Services/COPage/Cron" />
-	</crons>
 </service>

components/ILIAS/Calendar/Calendar.php

@@ -51,5 +51,17 @@ public function init(
         $contribute[Component\Resource\PublicAsset::class] = fn() =>
             new Component\Resource\NodeModule("eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js");
         */
+        $contribute[\ILIAS\Cron\CronJob::class] = static fn() =>
+            new \ilCalendarCronRemoteReader(
+                self::class,
+                $use[\ILIAS\Language\Language::class],
+                $use[\ILIAS\Logging\LoggerFactory::class]
+            );
+        $contribute[\ILIAS\Cron\CronJob::class] = static fn() =>
+            new \ilConsultationHourCron(
+                self::class,
+                $use[\ILIAS\Language\Language::class],
+                $use[\ILIAS\Logging\LoggerFactory::class]
+            );
     }
 }

components/ILIAS/Calendar/classes/ConsultationHours/class.ilConsultationHourCron.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of ILIAS, a powerful learning management system
  * published by ILIAS open source e-Learning e.V.
@@ -18,6 +16,8 @@
  *
  *********************************************************************/
 
+declare(strict_types=1);
+
 use ILIAS\Cron\Schedule\CronJobScheduleType;
 
 /**
@@ -26,16 +26,14 @@
  */
 class ilConsultationHourCron extends ilCronJob
 {
-    protected ilLanguage $lng;
     protected ilDBInterface $db;
     protected ilSetting $setting;
 
-    public function __construct()
+    public function init(): void
     {
-        global $DIC;
-
-        $this->lng = $DIC->language();
         $this->lng->loadLanguageModule('dateplaner');
+
+        global $DIC;
         $this->db = $DIC->database();
         $this->setting = $DIC->settings();
     }

components/ILIAS/Calendar/classes/Cron/class.ilCalendarCronRemoteReader.php

@@ -24,16 +24,13 @@ class ilCalendarCronRemoteReader extends ilCronJob
 {
     private const DEFAULT_SYNC_HOURS = 1;
 
-    private ilLanguage $lng;
     private ilLogger $logger;
-
     private ?ilCalendarSettings $calendar_settings = null;
 
-    public function __construct()
+    public function init(): void
     {
+        $this->lng->loadLanguageModule('dateplaner');
         global $DIC;
-
-        $this->lng = $DIC->language();
         $this->logger = $DIC->logger()->cal();
         $this->calendar_settings = ilCalendarSettings::_getInstance();
     }
@@ -45,13 +42,11 @@ public function getId(): string
 
     public function getTitle(): string
     {
-        $this->lng->loadLanguageModule('dateplaner');
         return $this->lng->txt('cal_cronjob_remote_title');
     }
 
     public function getDescription(): string
     {
-        $this->lng->loadLanguageModule('dateplaner');
         return $this->lng->txt('cal_cronjob_remote_description');
     }
 
@@ -106,8 +101,8 @@ public function run(): ilCronJobResult
             $reader->setUser($remoteCalendar->getRemoteUser());
             $reader->setPass($remoteCalendar->getRemotePass());
             try {
-            $reader->read();
-            $reader->import($remoteCalendar);
+                $reader->read();
+                $reader->import($remoteCalendar);
             } catch (Exception $e) {
                 $this->logger->warning('Remote Calendar: ' . $remoteCalendar->getCategoryID());
                 $this->logger->warning('Reading remote calendar failed with message: ' . $e->getMessage());

components/ILIAS/Calendar/service.xml

@@ -16,10 +16,6 @@
 		<event type="listen" id="components/ILIAS/Exercise" />
 		<event type="listen" id="components/ILIAS/EmployeeTalk" />
 	</events>
-	<crons>
-		<cron id="cal_remote_reader" class="ilCalendarCronRemoteReader" path="Services/Calendar/classes/Cron/" />
-		<cron id="cal_consultation" class="ilConsultationHourCron" path="Services/Calendar/classes/ConsultationHours/" />
-	</crons>
 	<pluginslots>
 		<pluginslot id="capm" name="AppointmentCustomModal" />
 		<pluginslot id="capg" name="AppointmentCustomGrid" />

components/ILIAS/Certificate/Certificate.php

@@ -36,5 +36,12 @@ public function init(
             new \ilCertificatSetupAgent(
                 $pull[\ILIAS\Refinery\Factory::class]
             );
+
+        $contribute[\ILIAS\Cron\CronJob::class] = static fn() =>
+            new \ilCertificateCron(
+                'components\\' . self::class,
+                $use[\ILIAS\Language\Language::class],
+                $use[\ILIAS\Logging\LoggerFactory::class]
+            );
     }
 }

components/ILIAS/Certificate/classes/class.ilCertificateCron.php

@@ -26,33 +26,23 @@
  */
 class ilCertificateCron extends ilCronJob
 {
-    protected ?ilLanguage $lng;
-    private ?Container $dic;
+    private ?Container $dic = null;
 
     public function __construct(
+        string $component,
+        \ILIAS\Language\Language $lng,
+        \ILIAS\Logging\LoggerFactory $logger_factory,
         private ?ilCertificateQueueRepository $queueRepository = null,
         private ?ilCertificateTemplateRepository $templateRepository = null,
         private ?ilUserCertificateRepository $userRepository = null,
         private ?ilCertificateValueReplacement $valueReplacement = null,
         private ?ilLogger $logger = null,
         ?Container $dic = null,
-        ?ilLanguage $language = null,
         private ?ilCertificateObjectHelper $objectHelper = null,
         private ?ilSetting $settings = null,
         private ?ilCronManager $cronManager = null,
     ) {
-        if (null === $dic) {
-            global $DIC;
-            $dic = $DIC;
-        }
-        $this->dic = $dic;
-
-        if ($dic && isset($dic['lng'])) {
-            $language = $dic->language();
-            $language->loadLanguageModule('certificate');
-        }
-
-        $this->lng = $language;
+        parent::__construct($component, $lng, $logger_factory);
     }
 
     public function getTitle(): string
@@ -67,6 +57,8 @@ public function getDescription(): string
 
     public function init(): void
     {
+        $this->lng->loadLanguageModule('certificate');
+
         if (null === $this->dic) {
             global $DIC;
             $this->dic = $DIC;