From 0cbb7f30670145cebf3339ec7eb93f4592091050 Mon Sep 17 00:00:00 2001
From: Lukas Scharmer <lscharmer@databay.de>
Date: Mon, 9 Sep 2024 15:52:41 +0200
Subject: [PATCH] LegalDocuments: Annotation cleanup

---
 .../ILIAS/DataProtection/classes/Consumer.php |  2 +-
 .../classes/class.ilObjDataProtectionGUI.php  | 10 ++++-
 .../LegalDocuments/classes/Administration.php | 43 ++++++++++++-------
 .../Condition/Definitions/RoleDefinition.php  |  7 +--
 .../classes/ConditionDefinition.php           |  1 +
 .../LegalDocuments/classes/Conductor.php      |  6 +++
 .../ILIAS/LegalDocuments/classes/Consumer.php |  2 +-
 .../ConsumerSlots/Agreement.php               |  8 +---
 .../ConsumerSlots/SelfRegistration.php        |  6 ++-
 .../ConsumerSlots/ShowOnLoginPage.php         |  1 +
 .../ConsumerSlots/WithdrawProcess.php         |  6 +--
 .../classes/ConsumerToolbox/Routing.php       |  6 +--
 .../classes/ConsumerToolbox/Slot.php          |  8 ++--
 .../classes/ConsumerToolbox/User.php          |  1 +
 .../classes/DefaultMappings.php               |  5 +++
 .../classes/FileUpload/UploadHandler.php      |  1 +
 .../LegalDocuments/classes/HTMLPurifier.php   |  1 +
 .../classes/Legacy/Confirmation.php           |  2 +-
 .../LegalDocuments/classes/Legacy/Table.php   |  2 +-
 .../classes/Provide/ProvideDocument.php       |  3 +-
 .../classes/Provide/ProvideHistory.php        |  2 +
 .../classes/Provide/ProvidePublicPage.php     |  4 +-
 .../classes/Provide/ProvideWithdrawal.php     |  6 +--
 .../Repository/DatabaseDocumentRepository.php |  9 +++-
 .../Repository/DatabaseHistoryRepository.php  |  1 +
 .../classes/Repository/DeriveFieldTypes.php   |  2 +-
 .../Repository/DocumentRepositoryMeta.php     |  7 +++
 .../classes/Repository/HistoryRepository.php  |  3 +-
 .../Repository/ReadOnlyDocumentRepository.php |  2 +-
 .../LegalDocuments/classes/SelectionMap.php   |  2 +-
 .../classes/Setup/UpdateSteps.php             |  2 +-
 .../classes/SlotConstructor.php               |  2 +-
 .../classes/SmoothTableConfig.php             |  3 +-
 .../classes/SmoothTableFilter.php             |  1 +
 .../LegalDocuments/classes/StartUpStep.php    | 12 +++++-
 .../ILIAS/LegalDocuments/classes/Table.php    |  2 +
 .../classes/Table/DocumentModal.php           |  3 +-
 .../classes/Table/DocumentTable.php           |  5 ++-
 .../classes/Table/EditableDocumentTable.php   |  4 +-
 .../classes/Table/HistoryTable.php            |  8 ++--
 .../LegalDocuments/classes/TableConfig.php    |  2 +-
 .../ILIAS/LegalDocuments/classes/UseSlot.php  |  4 +-
 .../LegalDocuments/classes/ValidHTML.php      |  1 +
 .../ILIAS/LegalDocuments/classes/Wiring.php   | 10 ++++-
 ...lass.ilLegalDocumentsAdministrationGUI.php |  3 ++
 .../ConsumerSlots/AgreementTest.php           |  6 ---
 .../ILIAS/TermsOfService/classes/Consumer.php |  3 +-
 .../ILIAS/TermsOfService/classes/Settings.php |  1 +
 .../classes/class.ilObjTermsOfServiceGUI.php  |  5 ++-
 49 files changed, 150 insertions(+), 86 deletions(-)

diff --git a/components/ILIAS/DataProtection/classes/Consumer.php b/components/ILIAS/DataProtection/classes/Consumer.php
index 040a4b765e18..7f2ea348cc0a 100755
--- a/components/ILIAS/DataProtection/classes/Consumer.php
+++ b/components/ILIAS/DataProtection/classes/Consumer.php
@@ -75,7 +75,7 @@ public function uses(UseSlot $slot, LazyProvide $provide): UseSlot
 
         $slot = $slot->showOnLoginPage($blocks->slot()->showOnLoginPage());
 
-        $agreement = $blocks->slot()->agreement($user, $global_settings);
+        $agreement = $blocks->slot()->agreement($user);
         $constraint = $this->container->refinery()->custom()->constraint(...);
 
         if ($global_settings->noAcceptance()->value()) {
diff --git a/components/ILIAS/DataProtection/classes/class.ilObjDataProtectionGUI.php b/components/ILIAS/DataProtection/classes/class.ilObjDataProtectionGUI.php
index 58603b93049c..8734f0baafe6 100755
--- a/components/ILIAS/DataProtection/classes/class.ilObjDataProtectionGUI.php
+++ b/components/ILIAS/DataProtection/classes/class.ilObjDataProtectionGUI.php
@@ -20,7 +20,6 @@
 
 use ILIAS\DataProtection\Consumer;
 use ILIAS\DataProtection\Settings;
-use ILIAS\LegalDocuments\ConsumerToolbox\Settings as SettingsInterface;
 use ILIAS\LegalDocuments\ConsumerToolbox\Setting;
 use ILIAS\LegalDocuments\ConsumerToolbox\KeyValueStore\ReadOnlyStore;
 use ILIAS\LegalDocuments\ConsumerToolbox\KeyValueStore\ILIASSettingStore;
@@ -34,6 +33,7 @@
 use ILIAS\UI\Component\Component;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\LegalDocuments\ConsumerToolbox\UI;
+use ILIAS\UI\Component\Input\Input;
 
 /**
  * @ilCtrl_isCalledBy ilObjDataProtectionGUI: ilAdministrationGUI
@@ -45,7 +45,7 @@ final class ilObjDataProtectionGUI extends ilObject2GUI
     private readonly ilLegalDocumentsAdministrationGUI $legal_documents;
     private readonly Container $container;
     private readonly Config $config;
-    private readonly SettingsInterface $data_protection_settings;
+    private readonly Settings $data_protection_settings;
     private readonly UI $ui;
 
     public function __construct()
@@ -214,6 +214,9 @@ private function form(): Component
         });
     }
 
+    /**
+     * @param array<string|int, Input> $fields
+     */
     private function optionalGroup(string $label, string $description, array $fields): OptionalGroup
     {
         return $this->ui->create()->input()->field()->optionalGroup(
@@ -223,6 +226,9 @@ private function optionalGroup(string $label, string $description, array $fields
         );
     }
 
+    /**
+     * @param array<string|int, string> $options
+     */
     private function radio(string $prefix, array $options): Component
     {
         $field = $this->ui->create()->input()->field()->radio($this->ui->txt($prefix), $this->ui->txt($prefix . '_desc'));
diff --git a/components/ILIAS/LegalDocuments/classes/Administration.php b/components/ILIAS/LegalDocuments/classes/Administration.php
index 6fe84ffcd9eb..69de69927b51 100755
--- a/components/ILIAS/LegalDocuments/classes/Administration.php
+++ b/components/ILIAS/LegalDocuments/classes/Administration.php
@@ -20,10 +20,11 @@
 
 namespace ILIAS\LegalDocuments;
 
-use ILIAS\UI\Component\Button\Button;
+use ILIAS\UI\Component\Button\Standard as Button;
 use ILIAS\LegalDocuments\DocumentId;
 use ILIAS\LegalDocuments\Value\Criterion;
 use ILIAS\LegalDocuments\Value\Document;
+use ILIAS\LegalDocuments\Value\CriterionContent;
 use ILIAS\DI\Container;
 use ILIAS\UI\Component\Component;
 use ilDatePresentation;
@@ -44,6 +45,7 @@
 use ILIAS\LegalDocuments\Legacy\Confirmation;
 use ilObjUserFolderGUI;
 use ILIAS\LegalDocuments\Value\DocumentContent;
+use ILIAS\UI\Component\Input\Container\Form\Form;
 
 class Administration
 {
@@ -112,6 +114,9 @@ public function withDocumentAndCriterion(Closure $proc): void
         $proc($document, $criterion);
     }
 
+    /**
+     * @return list<Document>
+     */
     public function retrieveDocuments(): array
     {
         $ids = $this->retrieveIds();
@@ -123,13 +128,16 @@ public function retrieveDocuments(): array
         return $documents;
     }
 
+    /**
+     * @return list<int>
+     */
     public function retrieveIds(): array
     {
         return $this->container->http()->wrapper()->post()->retrieve('ids', $this->container->refinery()->to()->listOf($this->container->refinery()->kindlyTo()->int()));
     }
 
     /**
-     * @param Closure(Closure(string): string, DocumentId, bool): void $then
+     * @param Closure(Closure(string): string, string, DocumentId, bool): mixed $then
      */
     public function idOrHash(object $gui, Closure $then): void
     {
@@ -144,13 +152,13 @@ public function idOrHash(object $gui, Closure $then): void
 
     }
 
-    public function targetWithDoc(object $gui, $document, string $cmd, string $method = 'getLinkTarget'): string
+    public function targetWithDoc(object $gui, Document $document, string $cmd, string $method = 'getLinkTarget'): string
     {
         $link = $this->willLinkWith($gui, ['doc_id' => (string) $document->id()]);
         return $link($cmd, $method);
     }
 
-    public function targetWithDocAndCriterion(object $gui, $document, $criterion, string $cmd, string $method = 'getLinkTarget')
+    public function targetWithDocAndCriterion(object $gui, Document $document, Criterion $criterion, string $cmd, string $method = 'getLinkTarget'): string
     {
         $link = $this->willLinkWith($gui, [
             'doc_id' => (string) $document->id(),
@@ -161,7 +169,9 @@ public function targetWithDocAndCriterion(object $gui, $document, $criterion, st
     }
 
     /**
-     * @param array<string, string> $parameters
+     * @param string|object $gui
+     * @param array<int|string, string> $parameters
+     * @return Closure(string, ?string?): string
      */
     public function willLinkWith($gui, array $parameters = []): Closure
     {
@@ -170,11 +180,11 @@ public function willLinkWith($gui, array $parameters = []): Closure
             $method ??= $class === $gui ? 'getLinkTargetByClass' : 'getLinkTarget';
             $array = $this->container->ctrl()->getParameterArrayByClass($class);
             foreach ($parameters as $key => $value) {
-                $this->container->ctrl()->setParameterByClass($class, $key, $value);
+                $this->container->ctrl()->setParameterByClass($class, (string) $key, $value);
             }
             $link = $this->container->ctrl()->$method($gui, $cmd);
             foreach ($parameters as $key => $_) {
-                $this->container->ctrl()->setParameterByClass($class, $key, $array[$key] ?? '');
+                $this->container->ctrl()->setParameterByClass($class, (string) $key, $array[$key] ?? '');
             }
 
             return $link;
@@ -184,7 +194,7 @@ public function willLinkWith($gui, array $parameters = []): Closure
     /**
      * @param Closure(array): void $then
      */
-    public function withFormData($form, Closure $then)
+    public function withFormData(Form $form, Closure $then): Form
     {
         $request = $this->container->http()->request();
         if ($request->getMethod() !== 'POST') {
@@ -227,7 +237,7 @@ public function currentDocument(): Result
         return $this->container->refinery()->kindlyTo()->int()->applyTo(new Ok($doc_id))->then($repo->find(...));
     }
 
-    public function criterionForm(string $url, Document $document, $criterion = null)
+    public function criterionForm(string $url, Document $document, ?CriterionContent $criterion = null): Form
     {
         $groups = $this->config->legalDocuments()->document()->conditionGroups($criterion);
         $group = $this->ui->create()->input()->field()->switchableGroup($groups->choices(), $this->ui->txt('form_criterion'));
@@ -282,7 +292,7 @@ public function uploadContent(): string
     }
 
     /**
-     * @param list<Component>|Component $component
+     * @param list<Component>|Component|string $component
      */
     public function setContent($component): void
     {
@@ -317,7 +327,7 @@ public function render($component): string
     }
 
     /**
-     * @param list<Button> $buttons
+     * @param array<Button> $buttons
      */
     public function resetBox(DateTimeImmutable $reset_date, array $buttons = []): Component
     {
@@ -328,7 +338,7 @@ public function resetBox(DateTimeImmutable $reset_date, array $buttons = []): Co
                                ->withButtons($buttons);
     }
 
-    public function resetButton(string $confirm_reset_link): Component
+    public function resetButton(string $confirm_reset_link): Button
     {
         return $this->ui->create()->button()->standard(
             $this->ui->txt('reset_for_all_users'),
@@ -340,7 +350,7 @@ public function resetButton(string $confirm_reset_link): Component
      * @param Closure(string): string $link
      * @param Closure(): Result<DocumentContent> $document_content
      */
-    public function documentForm(Closure $link, string $title, Closure $document_content, bool $may_be_new): Component
+    public function documentForm(Closure $link, string $title, Closure $document_content, bool $may_be_new): Form
     {
         $edit_link = $link('editDocument');
         $content_title = $may_be_new ? 'form_document' : 'form_document_new';
@@ -374,7 +384,10 @@ public function saveDocumentOrder(array $documents, array $order_by_document): v
     }
 
     /**
-     * @param Closure(list<Document>, array<int, int>) $proc
+     * @template A
+     *
+     * @param Closure(list<Document>, array<int, int>): A $proc
+     * @return A
      */
     public function withDocumentsAndOrder(Closure $proc)
     {
@@ -434,7 +447,7 @@ public function externalSettingsMessage(bool $enabled): Component
         )->withLinks([
             $this->ui->create()->link()->standard(
                 $this->ui->txt('adm_external_setting_edit'),
-                $this->willLinkWith(ilObjUserFolderGUI::class, ['ref_id' => USER_FOLDER_ID])('generalSettings')
+                $this->willLinkWith(ilObjUserFolderGUI::class, ['ref_id' => (string) USER_FOLDER_ID])('generalSettings')
             )
         ]);
     }
diff --git a/components/ILIAS/LegalDocuments/classes/Condition/Definitions/RoleDefinition.php b/components/ILIAS/LegalDocuments/classes/Condition/Definitions/RoleDefinition.php
index 411f808d0588..29f8f95050e5 100755
--- a/components/ILIAS/LegalDocuments/classes/Condition/Definitions/RoleDefinition.php
+++ b/components/ILIAS/LegalDocuments/classes/Condition/Definitions/RoleDefinition.php
@@ -30,11 +30,12 @@
 use ilObjectDataCache;
 use ilRbacReview;
 use Closure;
+use ILIAS\UI\Component\Input\Field\Radio;
 
 class RoleDefinition implements ConditionDefinition
 {
     /**
-     * @param Closure(array<string, mixed>): Constraint $required
+     * @param Closure(array<int|string, mixed>): Constraint $required
      */
     public function __construct(
         private readonly UI $ui,
@@ -75,9 +76,9 @@ public function withCriterion(CriterionContent $criterion): Condition
     }
 
     /**
-     * @param array<string, string> $options
+     * @param array<string|int, string> $options
      */
-    private function radio($lang_key, array $options, $value)
+    private function radio(string $lang_key, array $options, $value): Radio
     {
         $field = $this->ui->create()->input()->field()->radio($lang_key);
         foreach ($options as $key => $label) {
diff --git a/components/ILIAS/LegalDocuments/classes/ConditionDefinition.php b/components/ILIAS/LegalDocuments/classes/ConditionDefinition.php
index a93d8ceaee56..5681b835e623 100755
--- a/components/ILIAS/LegalDocuments/classes/ConditionDefinition.php
+++ b/components/ILIAS/LegalDocuments/classes/ConditionDefinition.php
@@ -27,4 +27,5 @@ interface ConditionDefinition
 {
     public function formGroup(array $arguments = []): Group;
     public function withCriterion(CriterionContent $criterion): Condition;
+    public function translatedType(): string;
 }
diff --git a/components/ILIAS/LegalDocuments/classes/Conductor.php b/components/ILIAS/LegalDocuments/classes/Conductor.php
index 9647397dbe44..02e623ad5d18 100755
--- a/components/ILIAS/LegalDocuments/classes/Conductor.php
+++ b/components/ILIAS/LegalDocuments/classes/Conductor.php
@@ -166,6 +166,9 @@ public function findGotoLink(string $goto_target): Result
         )->map(fn($goto_link) => $goto_link->target());
     }
 
+    /**
+     * @return list<Intercept>
+     */
     public function intercepting(): array
     {
         return $this->internal->all('intercept');
@@ -176,6 +179,9 @@ public function selfRegistration(): SelfRegistration
         return new Bundle($this->internal->all('self-registration'));
     }
 
+    /**
+     * @return array<string|int, string>
+     */
     public function userManagementFields(ilObjUser $user): array
     {
         return array_reduce(
diff --git a/components/ILIAS/LegalDocuments/classes/Consumer.php b/components/ILIAS/LegalDocuments/classes/Consumer.php
index 398a5c4a804a..fb479902adfe 100755
--- a/components/ILIAS/LegalDocuments/classes/Consumer.php
+++ b/components/ILIAS/LegalDocuments/classes/Consumer.php
@@ -24,7 +24,7 @@ interface Consumer
 {
     /**
      * @template A
-     * @param UseSlot<A> $lens
+     * @param UseSlot<A> $slot
      * @return UseSlot<A>
      */
     public function uses(UseSlot $slot, LazyProvide $provide): UseSlot;
diff --git a/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/ConsumerSlots/Agreement.php b/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/ConsumerSlots/Agreement.php
index 2549510d35ca..af26d9438e2c 100755
--- a/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/ConsumerSlots/Agreement.php
+++ b/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/ConsumerSlots/Agreement.php
@@ -22,23 +22,18 @@
 
 use ILIAS\LegalDocuments\ConsumerSlots\Agreement as AgreementInterface;
 use ILIAS\LegalDocuments\Value\Document;
-use ILIAS\LegalDocuments\Provide;
 use ILIAS\UI\Component\Component;
 use ILIAS\LegalDocuments\PageFragment;
 use ILIAS\LegalDocuments\PageFragment\PageContent;
-use ILIAS\Data\Result;
 use ILIAS\Data\Result\Ok;
 use ilLegacyFormElementsUtil;
 use ilSystemSupportContacts;
 use Psr\Http\Message\RequestInterface;
-use ilSession;
-use ILIAS\LegalDocuments\ConsumerToolbox\Settings;
 use ILIAS\LegalDocuments\ConsumerToolbox\User;
-use ILIAS\LegalDocuments\ConsumerToolbox\Marshal;
-use ILIAS\LegalDocuments\ConsumerToolbox\Setting;
 use ILIAS\LegalDocuments\ConsumerToolbox\Routing;
 use ILIAS\LegalDocuments\ConsumerToolbox\UI;
 use Closure;
+use ILIAS\UI\Component\Input\Container\Form\Form;
 
 final class Agreement implements AgreementInterface
 {
@@ -47,7 +42,6 @@ final class Agreement implements AgreementInterface
      */
     public function __construct(
         private readonly User $user,
-        private readonly Settings $settings,
         private readonly UI $ui,
         private readonly Routing $routing,
         private readonly Closure $with_request
diff --git a/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/ConsumerSlots/SelfRegistration.php b/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/ConsumerSlots/SelfRegistration.php
index d33714067b14..38e33dcd1759 100755
--- a/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/ConsumerSlots/SelfRegistration.php
+++ b/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/ConsumerSlots/SelfRegistration.php
@@ -32,13 +32,14 @@
 use ILIAS\LegalDocuments\Provide;
 use ILIAS\Data\Result\Ok;
 use Closure;
+use ILIAS\UI\Component\Component;
+use ilFormPropertyGUI;
 
 final class SelfRegistration implements SelfRegistrationInterface
 {
     private readonly Closure $create_input;
 
     /**
-     * @param Closure(ilObjUser $user): User
      * @param Closure(list<Component>|Component): string $render
      * @param Closure(ilObjUser): User $build_user
      * @param Closure(string): object $create_input
@@ -86,6 +87,9 @@ public function userCreation(ilObjUser $user): void
         ($this->build_user)($user)->acceptMatchingDocument();
     }
 
+    /**
+     * @return array<ilFormPropertyGUI|ilFormSectionHeaderGUI>
+     */
     private function guis(Document $document): array
     {
         $header = ($this->create_input)(ilFormSectionHeaderGUI::class);
diff --git a/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/ConsumerSlots/ShowOnLoginPage.php b/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/ConsumerSlots/ShowOnLoginPage.php
index acb5f925b42f..367e9317a179 100755
--- a/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/ConsumerSlots/ShowOnLoginPage.php
+++ b/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/ConsumerSlots/ShowOnLoginPage.php
@@ -24,6 +24,7 @@
 use ILIAS\LegalDocuments\ConsumerToolbox\UI;
 use ILIAS\UI\Component\Component;
 use Closure;
+use ilTemplate;
 
 final class ShowOnLoginPage
 {
diff --git a/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/ConsumerSlots/WithdrawProcess.php b/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/ConsumerSlots/WithdrawProcess.php
index 9b1e8b9458b4..b6a94c072162 100755
--- a/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/ConsumerSlots/WithdrawProcess.php
+++ b/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/ConsumerSlots/WithdrawProcess.php
@@ -35,6 +35,7 @@
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\LegalDocuments\ConsumerToolbox\Settings;
 use ilStartUpGUI;
+use ILIAS\Refinery\Transformation;
 
 final class WithdrawProcess implements WithdrawProcessInterface
 {
@@ -169,11 +170,6 @@ private function sendMail(): void
         $mail->sendGeneric($this->ui->txt('withdrawal_mail_subject'), $this->user->format($this->ui->txt('withdrawal_mail_text')));
     }
 
-    private function refuseContent($components): PageFragment
-    {
-        return new PageContent($this->ui->txt('refuse_tos_acceptance'), $components);
-    }
-
     private function query(string $query_parameter): ?string
     {
         return ($this->query_parameter)($query_parameter, fn(Refinery $r) => $r->byTrying([
diff --git a/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/Routing.php b/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/Routing.php
index 357586e86fe7..e6ded2a36f9b 100755
--- a/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/Routing.php
+++ b/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/Routing.php
@@ -20,7 +20,7 @@
 
 namespace ILIAS\LegalDocuments\ConsumerToolbox;
 
-use ilCtrl;
+use ilCtrlInterface;
 use Closure;
 
 class Routing
@@ -30,14 +30,14 @@ class Routing
      * @param Closure(): string $logout_url
      */
     public function __construct(
-        private readonly ilCtrl $ctrl,
+        private readonly ilCtrlInterface $ctrl,
         private readonly SelectSetting $session,
         private readonly Closure $redirect_to_starting_page,
         private readonly Closure $logout_url
     ) {
     }
 
-    public function ctrl(): ilCtrl
+    public function ctrl(): ilCtrlInterface
     {
         return $this->ctrl;
     }
diff --git a/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/Slot.php b/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/Slot.php
index bc0f24afa549..a49432076229 100755
--- a/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/Slot.php
+++ b/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/Slot.php
@@ -28,7 +28,7 @@
 use ILIAS\LegalDocuments\ConsumerToolbox\ConsumerSlots\WithdrawProcess;
 use ILIAS\LegalDocuments\ConsumerToolbox\ConsumerSlots\ShowOnLoginPage;
 use ILIAS\DI\Container;
-use ILIAS\LegalDocuments\LazyProvide;
+use ILIAS\LegalDocuments\Provide;
 use Closure;
 use ilObjUser;
 use ilTemplate;
@@ -38,7 +38,7 @@ class Slot
     public function __construct(
         private readonly string $id,
         private readonly Blocks $blocks,
-        private readonly LazyProvide $provide,
+        private readonly Provide $provide,
         private readonly Container $container
     ) {
     }
@@ -64,9 +64,9 @@ public function withdrawProcess(User $user, Settings $global_settings, Closure $
         );
     }
 
-    public function agreement(User $user, Settings $settings): Agreement
+    public function agreement(User $user): Agreement
     {
-        return new Agreement($user, $settings, $this->blocks->ui(), $this->blocks->routing(), $this->blocks->withRequest(...));
+        return new Agreement($user, $this->blocks->ui(), $this->blocks->routing(), $this->blocks->withRequest(...));
     }
 
     public function modifyFooter(User $user): ModifyFooter
diff --git a/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/User.php b/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/User.php
index 80035e5aae59..c7e0f07ad4d5 100755
--- a/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/User.php
+++ b/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/User.php
@@ -31,6 +31,7 @@
 use ILIAS\LegalDocuments\Provide;
 use ilAuthUtils;
 use ILIAS\Data\Clock\ClockInterface as Clock;
+use DateTimeImmutable;
 
 class User
 {
diff --git a/components/ILIAS/LegalDocuments/classes/DefaultMappings.php b/components/ILIAS/LegalDocuments/classes/DefaultMappings.php
index 2051d96792e2..5febf2f6ed76 100755
--- a/components/ILIAS/LegalDocuments/classes/DefaultMappings.php
+++ b/components/ILIAS/LegalDocuments/classes/DefaultMappings.php
@@ -26,6 +26,8 @@
 use ILIAS\LegalDocuments\Condition\Definition\UserCountryDefinition;
 use ILIAS\LegalDocuments\ConsumerToolbox\UI;
 use ILIAS\DI\Container;
+use ILIAS\UI\Component\Component;
+use ILIAS\LegalDocuments\Value\DocumentContent;
 
 class DefaultMappings
 {
@@ -62,6 +64,9 @@ public function conditionDefinitions(): SelectionMap
         ], 'usr_country');
     }
 
+    /**
+     * @return array<string|int, callable(DocumentContent): Component>
+     */
     public function contentAsComponent(): array
     {
         return [
diff --git a/components/ILIAS/LegalDocuments/classes/FileUpload/UploadHandler.php b/components/ILIAS/LegalDocuments/classes/FileUpload/UploadHandler.php
index 05efd019650d..bb74ad6aedf3 100755
--- a/components/ILIAS/LegalDocuments/classes/FileUpload/UploadHandler.php
+++ b/components/ILIAS/LegalDocuments/classes/FileUpload/UploadHandler.php
@@ -26,6 +26,7 @@
 use Closure;
 use ILIAS\LegalDocuments\Value\DocumentContent;
 use ILIAS\Data\Result\Ok;
+use ILIAS\Data\Result;
 
 class UploadHandler implements UploadHandlerInterface
 {
diff --git a/components/ILIAS/LegalDocuments/classes/HTMLPurifier.php b/components/ILIAS/LegalDocuments/classes/HTMLPurifier.php
index 604786a6b95a..44008c11f2ad 100755
--- a/components/ILIAS/LegalDocuments/classes/HTMLPurifier.php
+++ b/components/ILIAS/LegalDocuments/classes/HTMLPurifier.php
@@ -35,6 +35,7 @@ class HTMLPurifier extends ilHtmlPurifierAbstractLibWrapper
     private readonly Closure $create_config;
 
     /**
+     * @param list<string> $allowed_tags
      * @param null|Closure(): HTMLPurifier_Config $create_config
      */
     public function __construct(
diff --git a/components/ILIAS/LegalDocuments/classes/Legacy/Confirmation.php b/components/ILIAS/LegalDocuments/classes/Legacy/Confirmation.php
index 4586c2372735..efbbf9e1ef10 100755
--- a/components/ILIAS/LegalDocuments/classes/Legacy/Confirmation.php
+++ b/components/ILIAS/LegalDocuments/classes/Legacy/Confirmation.php
@@ -38,7 +38,7 @@ public function __construct(private readonly ilLanguage $language, Closure $crea
     }
 
     /**
-     * @param array<string, string> $items
+     * @param array<int|string, string> $items
      */
     public function render(string $link, string $command, string $cancel_command, string $message, array $items = []): string
     {
diff --git a/components/ILIAS/LegalDocuments/classes/Legacy/Table.php b/components/ILIAS/LegalDocuments/classes/Legacy/Table.php
index 262ebc1dd002..de41a9d7d20d 100755
--- a/components/ILIAS/LegalDocuments/classes/Legacy/Table.php
+++ b/components/ILIAS/LegalDocuments/classes/Legacy/Table.php
@@ -75,7 +75,7 @@ public function setMaxCount(int $a_max_count): void
         parent::setMaxCount($a_max_count);
     }
 
-    public function setSelectableColumns(...$names): void
+    public function setSelectableColumns(string ...$names): void
     {
         $this->sel = array_merge($this->sel, $names);
     }
diff --git a/components/ILIAS/LegalDocuments/classes/Provide/ProvideDocument.php b/components/ILIAS/LegalDocuments/classes/Provide/ProvideDocument.php
index 5b9423924b76..d9b552df6491 100755
--- a/components/ILIAS/LegalDocuments/classes/Provide/ProvideDocument.php
+++ b/components/ILIAS/LegalDocuments/classes/Provide/ProvideDocument.php
@@ -56,9 +56,8 @@ class ProvideDocument
     private readonly Closure $create_table_gui;
 
     /**
+     * @param array<string, Closure(DocumentContent): Component> $content_as_component
      * @param null|Closure(object, string, TableInterface): Table $create_table_gui
-     * @param array<ConditionDefinition> $conditions
-     * @param array<string, Closure(CriterionContent): Component $content_as_component
      */
     public function __construct(
         private readonly string $id,
diff --git a/components/ILIAS/LegalDocuments/classes/Provide/ProvideHistory.php b/components/ILIAS/LegalDocuments/classes/Provide/ProvideHistory.php
index 4f2148958659..7038cf26536e 100755
--- a/components/ILIAS/LegalDocuments/classes/Provide/ProvideHistory.php
+++ b/components/ILIAS/LegalDocuments/classes/Provide/ProvideHistory.php
@@ -23,9 +23,11 @@
 use ILIAS\Data\Result;
 use ILIAS\DI\Container;
 use ILIAS\LegalDocuments\Legacy\Table;
+use ILIAS\LegalDocuments\Table as TableInterface;
 use ILIAS\LegalDocuments\Repository\HistoryRepository;
 use ILIAS\LegalDocuments\Table\HistoryTable;
 use ILIAS\LegalDocuments\Value\Document;
+use ILIAS\LegalDocuments\Value\DocumentContent;
 use ILIAS\LegalDocuments\TableConfig;
 use ILIAS\LegalDocuments\ConsumerToolbox\UI;
 use ILIAS\LegalDocuments\Table\DocumentModal;
diff --git a/components/ILIAS/LegalDocuments/classes/Provide/ProvidePublicPage.php b/components/ILIAS/LegalDocuments/classes/Provide/ProvidePublicPage.php
index 80ff799aadcd..50b06d25354d 100755
--- a/components/ILIAS/LegalDocuments/classes/Provide/ProvidePublicPage.php
+++ b/components/ILIAS/LegalDocuments/classes/Provide/ProvidePublicPage.php
@@ -20,14 +20,14 @@
 
 namespace ILIAS\LegalDocuments\Provide;
 
-use ilCtrl;
+use ilCtrlInterface;
 use ilStartUpGUI;
 
 class ProvidePublicPage
 {
     public function __construct(
         private readonly string $id,
-        private readonly ilCtrl $ctrl
+        private readonly ilCtrlInterface $ctrl
     ) {
     }
 
diff --git a/components/ILIAS/LegalDocuments/classes/Provide/ProvideWithdrawal.php b/components/ILIAS/LegalDocuments/classes/Provide/ProvideWithdrawal.php
index 4b66311536f0..3b5546437e8f 100755
--- a/components/ILIAS/LegalDocuments/classes/Provide/ProvideWithdrawal.php
+++ b/components/ILIAS/LegalDocuments/classes/Provide/ProvideWithdrawal.php
@@ -21,7 +21,7 @@
 namespace ILIAS\LegalDocuments\Provide;
 
 use ilAuthSession;
-use ilCtrl;
+use ilCtrlInterface;
 use ilSession;
 use ilStartUpGUI;
 use ilPersonalProfileGUI;
@@ -36,12 +36,12 @@ class ProvideWithdrawal
     private readonly Closure $logout_url;
 
     /**
-     * @param null|Closure(array): string $logout_url
+     * @param null|Closure(array<string|int, string|int>): string $logout_url
      * @param null|Closure(int): void $close_session_context
      */
     public function __construct(
         private readonly string $id,
-        private readonly ilCtrl $ctrl,
+        private readonly ilCtrlInterface $ctrl,
         private readonly ilAuthSession $auth_session,
         ?Closure $logout_url = null,
         ?Closure $close_session_context = null
diff --git a/components/ILIAS/LegalDocuments/classes/Repository/DatabaseDocumentRepository.php b/components/ILIAS/LegalDocuments/classes/Repository/DatabaseDocumentRepository.php
index 225202f445dd..5f98301e421b 100755
--- a/components/ILIAS/LegalDocuments/classes/Repository/DatabaseDocumentRepository.php
+++ b/components/ILIAS/LegalDocuments/classes/Repository/DatabaseDocumentRepository.php
@@ -112,7 +112,7 @@ public function updateCriterionContent(int $criterion_id, CriterionContent $cont
     }
 
     /**
-     * @param array<string, string> $fields_and_values
+     * @param array<string|int, string|int> $fields_and_values
      */
     private function updateDocument(DocumentId $document_id, array $fields_and_values): void
     {
@@ -176,6 +176,7 @@ public function findId(DocumentId $document_id): Result
      *     sorting: string,
      *     text: ?string,
      *     title: ?string,
+     *     type: string,
      * } $row
      * @param list<Criterion> $criteria
      */
@@ -246,6 +247,9 @@ private function lazyDocFields(array $fields_and_values, string $hash): void
         }
     }
 
+    /**
+     * @return array<string, string>
+     */
     private function criterionFields(CriterionContent $content): array
     {
         return [
@@ -254,6 +258,9 @@ private function criterionFields(CriterionContent $content): array
         ];
     }
 
+    /**
+     * @return Document[]
+     */
     private function queryDocuments(string $where = '1', string $limit = ''): array
     {
         $doc_table = $this->documentTable();
diff --git a/components/ILIAS/LegalDocuments/classes/Repository/DatabaseHistoryRepository.php b/components/ILIAS/LegalDocuments/classes/Repository/DatabaseHistoryRepository.php
index 01d75573316f..e41639f62d48 100755
--- a/components/ILIAS/LegalDocuments/classes/Repository/DatabaseHistoryRepository.php
+++ b/components/ILIAS/LegalDocuments/classes/Repository/DatabaseHistoryRepository.php
@@ -289,6 +289,7 @@ private function filterQuery(array $filter, Closure $filter_to_query): string
 
     /**
      * @param array<string, mixed> $filter
+     * @param array<string, mixed> $order_by
      * @return array{0: string, 1: string}
      */
     private function filterAndJoin(array $filter, array $order_by = []): array
diff --git a/components/ILIAS/LegalDocuments/classes/Repository/DeriveFieldTypes.php b/components/ILIAS/LegalDocuments/classes/Repository/DeriveFieldTypes.php
index 2b38e40be825..f9e322aa46dd 100755
--- a/components/ILIAS/LegalDocuments/classes/Repository/DeriveFieldTypes.php
+++ b/components/ILIAS/LegalDocuments/classes/Repository/DeriveFieldTypes.php
@@ -57,7 +57,7 @@ private function query(string $query): array
     }
 
     /**
-     * @param array<string, mixed> $values
+     * @param array<int|string, mixed> $values
      */
     private function queryF(string $query, array $values): array
     {
diff --git a/components/ILIAS/LegalDocuments/classes/Repository/DocumentRepositoryMeta.php b/components/ILIAS/LegalDocuments/classes/Repository/DocumentRepositoryMeta.php
index 488bf6582537..a986cf867018 100755
--- a/components/ILIAS/LegalDocuments/classes/Repository/DocumentRepositoryMeta.php
+++ b/components/ILIAS/LegalDocuments/classes/Repository/DocumentRepositoryMeta.php
@@ -22,6 +22,7 @@
 
 use ILIAS\LegalDocuments\Value\Criterion;
 use ILIAS\LegalDocuments\Value\Document;
+use ILIAS\Data\Result;
 
 interface DocumentRepositoryMeta
 {
@@ -32,4 +33,10 @@ interface DocumentRepositoryMeta
     public function documentFromRow(array $row, array $criteria): Document;
     public function documentTable(): string;
     public function exists(string $doc_id_name): string;
+
+    /**
+     * @return Result<Document>
+     */
+    public function find(int $id): Result;
+
 }
diff --git a/components/ILIAS/LegalDocuments/classes/Repository/HistoryRepository.php b/components/ILIAS/LegalDocuments/classes/Repository/HistoryRepository.php
index 39c9d790d8b2..4e3944aa8bec 100755
--- a/components/ILIAS/LegalDocuments/classes/Repository/HistoryRepository.php
+++ b/components/ILIAS/LegalDocuments/classes/Repository/HistoryRepository.php
@@ -22,6 +22,7 @@
 
 use ILIAS\Data\Result;
 use ILIAS\LegalDocuments\Value\Document;
+use ILIAS\LegalDocuments\Value\DocumentContent;
 use ILIAS\LegalDocuments\Value\History;
 use ilObjUser;
 
@@ -38,7 +39,7 @@ public function all(array $filter = [], array $order_by = [], int $offset = 0, ?
      * @param array<string, mixed> $filter
      */
     public function countAll(array $filter = []): int;
-    public function acceptDocument(ilObjUser $user, Document $document);
+    public function acceptDocument(ilObjUser $user, Document $document): void;
     public function alreadyAccepted(ilObjUser $user, Document $document): bool;
 
     /**
diff --git a/components/ILIAS/LegalDocuments/classes/Repository/ReadOnlyDocumentRepository.php b/components/ILIAS/LegalDocuments/classes/Repository/ReadOnlyDocumentRepository.php
index 317809220ad3..52adf90c867b 100755
--- a/components/ILIAS/LegalDocuments/classes/Repository/ReadOnlyDocumentRepository.php
+++ b/components/ILIAS/LegalDocuments/classes/Repository/ReadOnlyDocumentRepository.php
@@ -86,7 +86,7 @@ public function find(int $id): Result
     public function findId(DocumentId $document_id): Result
     {
         $this->checkAccess(__FUNCTION__);
-        return $this->repository->findId($id);
+        return $this->repository->findId($document_id);
     }
 
     public function createDocument(string $title, DocumentContent $content): void
diff --git a/components/ILIAS/LegalDocuments/classes/SelectionMap.php b/components/ILIAS/LegalDocuments/classes/SelectionMap.php
index 9b9c5640e470..ecd3b1f1b988 100644
--- a/components/ILIAS/LegalDocuments/classes/SelectionMap.php
+++ b/components/ILIAS/LegalDocuments/classes/SelectionMap.php
@@ -21,7 +21,7 @@
 namespace ILIAS\LegalDocuments;
 
 /**
- * @template A
+ * @template-covariant A
  */
 class SelectionMap
 {
diff --git a/components/ILIAS/LegalDocuments/classes/Setup/UpdateSteps.php b/components/ILIAS/LegalDocuments/classes/Setup/UpdateSteps.php
index a1dcf43fd329..7fb0e98730b0 100755
--- a/components/ILIAS/LegalDocuments/classes/Setup/UpdateSteps.php
+++ b/components/ILIAS/LegalDocuments/classes/Setup/UpdateSteps.php
@@ -95,7 +95,7 @@ private function ensureColumn(string $table, string $name, array $attributes): v
     }
 
     /**
-     * @param array<string, $string> $tables
+     * @param array<string|int, mixed> $tables
      */
     private function renameTables(array $tables): void
     {
diff --git a/components/ILIAS/LegalDocuments/classes/SlotConstructor.php b/components/ILIAS/LegalDocuments/classes/SlotConstructor.php
index 7a5eefad1285..115d3d74613c 100755
--- a/components/ILIAS/LegalDocuments/classes/SlotConstructor.php
+++ b/components/ILIAS/LegalDocuments/classes/SlotConstructor.php
@@ -61,7 +61,7 @@ public function history(ProvideDocument $document): ProvideHistory
 
     /**
      * @param SelectionMap<ConditionDefinition> $conditions
-     * @param array<string, Closure(DocumentContent): Component $content_as_component
+     * @param array<string, Closure(DocumentContent): Component> $content_as_component
      */
     public function document(DocumentRepository $document_repository, SelectionMap $conditions, array $content_as_component): ProvideDocument
     {
diff --git a/components/ILIAS/LegalDocuments/classes/SmoothTableConfig.php b/components/ILIAS/LegalDocuments/classes/SmoothTableConfig.php
index 0e458c3a5a12..f3df5547506b 100755
--- a/components/ILIAS/LegalDocuments/classes/SmoothTableConfig.php
+++ b/components/ILIAS/LegalDocuments/classes/SmoothTableConfig.php
@@ -21,6 +21,7 @@
 namespace ILIAS\LegalDocuments;
 
 use ilTable2GUI;
+use Closure;
 
 /**
  * This class takes care of the order in which the methods must be called.
@@ -57,7 +58,7 @@ public function setDefaultOrderDirection(string $a_defaultorderdirection): void
         $this->target->setDefaultOrderDirection($a_defaultorderdirection);
     }
 
-    public function setSelectableColumns(...$names): void
+    public function setSelectableColumns(string ...$names): void
     {
         $this->target->setSelectableColumns(...$names);
     }
diff --git a/components/ILIAS/LegalDocuments/classes/SmoothTableFilter.php b/components/ILIAS/LegalDocuments/classes/SmoothTableFilter.php
index 1e17b50bde51..34c0b5db410e 100755
--- a/components/ILIAS/LegalDocuments/classes/SmoothTableFilter.php
+++ b/components/ILIAS/LegalDocuments/classes/SmoothTableFilter.php
@@ -22,6 +22,7 @@
 
 use ilTableFilterItem;
 use ilTable2GUI;
+use Closure;
 
 class SmoothTableFilter implements TableFilter
 {
diff --git a/components/ILIAS/LegalDocuments/classes/StartUpStep.php b/components/ILIAS/LegalDocuments/classes/StartUpStep.php
index e749f8d4e470..4afda339b0dc 100755
--- a/components/ILIAS/LegalDocuments/classes/StartUpStep.php
+++ b/components/ILIAS/LegalDocuments/classes/StartUpStep.php
@@ -20,6 +20,7 @@
 
 namespace ILIAS\LegalDocuments;
 
+use ILIAS\LegalDocuments\Intercept;
 use ILIAS\LegalDocuments\Intercept\LazyIntercept;
 use ILIAS\LegalDocuments\Intercept\NullIntercept;
 use ILIAS\Data\Result;
@@ -82,7 +83,7 @@ private function allInterceptingPaths(): array
         );
     }
 
-    private function findCurrent()
+    private function findCurrent(): Intercept
     {
         return $this->find(
             fn($x) => $x->intercept(),
@@ -92,7 +93,14 @@ private function findCurrent()
         )->value();
     }
 
-    private function find($predicate, $array)
+    /**
+     * @template A
+     * @param Closure(A): bool $predicate
+     * @param A[] $array
+     *
+     * @return Result<A>
+     */
+    private function find(Closure $predicate, array $array): Result
     {
         foreach ($array as $x) {
             if ($predicate($x)) {
diff --git a/components/ILIAS/LegalDocuments/classes/Table.php b/components/ILIAS/LegalDocuments/classes/Table.php
index d3527e1e069c..cd7237439575 100755
--- a/components/ILIAS/LegalDocuments/classes/Table.php
+++ b/components/ILIAS/LegalDocuments/classes/Table.php
@@ -20,6 +20,8 @@
 
 namespace ILIAS\LegalDocuments;
 
+use Closure;
+
 interface Table
 {
     /**
diff --git a/components/ILIAS/LegalDocuments/classes/Table/DocumentModal.php b/components/ILIAS/LegalDocuments/classes/Table/DocumentModal.php
index cb3f1a68346b..af7f28bcd3fa 100755
--- a/components/ILIAS/LegalDocuments/classes/Table/DocumentModal.php
+++ b/components/ILIAS/LegalDocuments/classes/Table/DocumentModal.php
@@ -20,7 +20,6 @@
 
 namespace ILIAS\LegalDocuments\Table;
 
-use ILIAS\LegalDocuments\Value\CriterionContent;
 use ILIAS\LegalDocuments\Value\DocumentContent;
 use ILIAS\UI\Component\Component;
 use ILIAS\DI\UIServices;
@@ -29,7 +28,7 @@
 class DocumentModal
 {
     /**
-     * @param Closure(CriterionContent): Component $content_as_component
+     * @param Closure(DocumentContent): Component $content_as_component
      */
     public function __construct(
         private readonly UIServices $ui,
diff --git a/components/ILIAS/LegalDocuments/classes/Table/DocumentTable.php b/components/ILIAS/LegalDocuments/classes/Table/DocumentTable.php
index a9dbd09cf11b..cfbca049ee5f 100755
--- a/components/ILIAS/LegalDocuments/classes/Table/DocumentTable.php
+++ b/components/ILIAS/LegalDocuments/classes/Table/DocumentTable.php
@@ -39,14 +39,14 @@
 
 class DocumentTable implements Table
 {
-    /** @var Closure(class-string): object<class-string> */
+    /** @var Closure(class-string, ... $constructor_args): object<class-string> */
     private readonly Closure $create;
     /** @var Closure(DateTimeImmutable): string */
     private readonly Closure $format_date;
 
     /**
      * @param Closure(CriterionContent): Component $criterion_as_component
-     * @param null|Closure(class-string): object<class-string> $create
+     * @param null|Closure(class-string, ... $constructor_args): object<class-string> $create
      * @param Closure(DateTimeImmutable): string $format_date
      */
     public function __construct(
@@ -109,6 +109,7 @@ public function row(Document $document, int $sorting): array
 
     /**
      * @param Closure(Criterion): list<Component> $proc
+     * @return string|list<Component>
      */
     public function showCriteria(Document $document, Closure $proc)
     {
diff --git a/components/ILIAS/LegalDocuments/classes/Table/EditableDocumentTable.php b/components/ILIAS/LegalDocuments/classes/Table/EditableDocumentTable.php
index 126aba27cf65..d31b5d2517f6 100755
--- a/components/ILIAS/LegalDocuments/classes/Table/EditableDocumentTable.php
+++ b/components/ILIAS/LegalDocuments/classes/Table/EditableDocumentTable.php
@@ -80,7 +80,7 @@ public function name(): string
         return self::class;
     }
 
-    private function willShowCriterion($document): Closure
+    private function willShowCriterion(Document $document): Closure
     {
         return function (Criterion $criterion) use ($document) {
             $modal = $this->table->ui()->create()->modal()->interruptive(
@@ -103,7 +103,7 @@ private function willShowCriterion($document): Closure
         };
     }
 
-    private function orderInputGui($document, $step): Closure
+    private function orderInputGui(Document $document, int $step): Closure
     {
         $input = $this->table->orderInputGui($document, $step);
         $input->setDisabled(false);
diff --git a/components/ILIAS/LegalDocuments/classes/Table/HistoryTable.php b/components/ILIAS/LegalDocuments/classes/Table/HistoryTable.php
index 9182b64af10e..096f041e7805 100755
--- a/components/ILIAS/LegalDocuments/classes/Table/HistoryTable.php
+++ b/components/ILIAS/LegalDocuments/classes/Table/HistoryTable.php
@@ -37,18 +37,16 @@
 use ilDatePresentation;
 use ilObjUser;
 use DateTimeImmutable;
+use ILIAS\UI\Component\Component;
 
-/**
- * @implements Table<History>
- */
 class HistoryTable implements Table
 {
     /** @var Closure(DateTimeImmutable): string */
     private readonly Closure $format_date;
 
     /**
-     * @param Closure(class-string): object<class-string> $create
-     * @param null|Closure(DateTimeImmutable): string $create
+     * @param Closure(class-string, ... $constructor_args): object<class-string> $create
+     * @param null|Closure(DateTimeImmutable): string $format_date
      */
     public function __construct(
         private readonly HistoryRepository $repository,
diff --git a/components/ILIAS/LegalDocuments/classes/TableConfig.php b/components/ILIAS/LegalDocuments/classes/TableConfig.php
index fae136cdd72c..6084fd2c7c35 100755
--- a/components/ILIAS/LegalDocuments/classes/TableConfig.php
+++ b/components/ILIAS/LegalDocuments/classes/TableConfig.php
@@ -35,7 +35,7 @@ public function setTitle(
     public function setExternalSorting(bool $a_val): void;
     public function setDefaultOrderField(string $a_defaultorderfield): void;
     public function setDefaultOrderDirection(string $a_defaultorderdirection): void;
-    public function setSelectableColumns(...$names): void;
+    public function setSelectableColumns(string ...$names): void;
 
     public function addMultiCommand(string $a_cmd, string $a_text): void;
     public function addCommandButton(
diff --git a/components/ILIAS/LegalDocuments/classes/UseSlot.php b/components/ILIAS/LegalDocuments/classes/UseSlot.php
index 376801379a9e..012090dabf80 100755
--- a/components/ILIAS/LegalDocuments/classes/UseSlot.php
+++ b/components/ILIAS/LegalDocuments/classes/UseSlot.php
@@ -29,6 +29,8 @@
 use ILIAS\UI\Component\MainControls\Footer;
 use ilObjUser;
 use ilNonEditableValueGUI;
+use ILIAS\UI\Component\Component;
+use ILIAS\LegalDocuments\Value\DocumentContent;
 
 interface UseSlot
 {
@@ -68,7 +70,7 @@ public function canWithdraw(WithdrawProcess $withdraw_process): self;
      * @param callable(string, string): PageFragment $public_page
      */
     public function hasPublicPage(callable $public_page): self;
-    public function hasAgreement(Agreement $on_login): self;
+    public function hasAgreement(Agreement $on_login, ?string $goto_name = null): self;
     public function hasHistory(): self;
     public function onSelfRegistration(SelfRegistration $self_registration): self;
     public function canReadInternalMails(Constraint $constraint): self;
diff --git a/components/ILIAS/LegalDocuments/classes/ValidHTML.php b/components/ILIAS/LegalDocuments/classes/ValidHTML.php
index dfa725ec73e0..edf106fe055a 100755
--- a/components/ILIAS/LegalDocuments/classes/ValidHTML.php
+++ b/components/ILIAS/LegalDocuments/classes/ValidHTML.php
@@ -26,6 +26,7 @@
 use RecursiveIteratorIterator;
 use LibXMLError;
 use Throwable;
+use DOMNode;
 
 class ValidHTML
 {
diff --git a/components/ILIAS/LegalDocuments/classes/Wiring.php b/components/ILIAS/LegalDocuments/classes/Wiring.php
index 0939e6880fdd..4bf79e80c10f 100755
--- a/components/ILIAS/LegalDocuments/classes/Wiring.php
+++ b/components/ILIAS/LegalDocuments/classes/Wiring.php
@@ -151,12 +151,12 @@ public function map(): Map
         return $this->map;
     }
 
-    private function error($message): void
+    private function error(string $message): void
     {
         throw new Exception($message);
     }
 
-    private function addTo(string $name, $id_or_value, $value = null)
+    private function addTo(string $name, $id_or_value, $value = null): self
     {
         $map = $this->map;
         if ($value !== null) {
@@ -172,6 +172,9 @@ private function addTo(string $name, $id_or_value, $value = null)
     }
 
     /**
+     * @template A
+     * @template B
+     *
      * @param Closure(A ...): B $to_be_protected
      * @param Closure(): bool $protector
      * @return Closure(A ...): Result<B>
@@ -181,6 +184,9 @@ private function protect(Closure $to_be_protected, Closure $protector): Closure
         return static fn(...$args): Result => $protector() ? new Ok($to_be_protected(...$args)) : new Error('Not available.');
     }
 
+    /**
+     * @return string[]
+     */
     private function path(string $class): array
     {
         return [ilDashboardGUI::class, ilPersonalProfileGUI::class, $class];
diff --git a/components/ILIAS/LegalDocuments/classes/class.ilLegalDocumentsAdministrationGUI.php b/components/ILIAS/LegalDocuments/classes/class.ilLegalDocumentsAdministrationGUI.php
index 24b7586ea2d6..ca47c9d2041a 100755
--- a/components/ILIAS/LegalDocuments/classes/class.ilLegalDocumentsAdministrationGUI.php
+++ b/components/ILIAS/LegalDocuments/classes/class.ilLegalDocumentsAdministrationGUI.php
@@ -263,6 +263,9 @@ public function tabs(array $run_after = []): void
         ], $run_after);
     }
 
+    /**
+     * @return array{0: string, 1: string, 2: string, 3: bool}
+     */
     private function tab(string $cmd, string $label, bool $can_access = true): array
     {
         return [$cmd, $label, $this->ctrlTo('getLinkTargetByClass', $cmd), $can_access];
diff --git a/components/ILIAS/LegalDocuments/tests/ConsumerToolbox/ConsumerSlots/AgreementTest.php b/components/ILIAS/LegalDocuments/tests/ConsumerToolbox/ConsumerSlots/AgreementTest.php
index 7d962f130526..55dafc47555f 100755
--- a/components/ILIAS/LegalDocuments/tests/ConsumerToolbox/ConsumerSlots/AgreementTest.php
+++ b/components/ILIAS/LegalDocuments/tests/ConsumerToolbox/ConsumerSlots/AgreementTest.php
@@ -43,7 +43,6 @@ public function testConstruct(): void
     {
         $this->assertInstanceOf(Agreement::class, new Agreement(
             $this->mock(User::class),
-            $this->mock(Settings::class),
             $this->mock(UI::class),
             $this->mock(Routing::class),
             $this->fail(...)
@@ -54,7 +53,6 @@ public function testShowAgreement(): void
     {
         $instance = new Agreement(
             $this->mockTree(User::class, ['matchingDocument' => new Ok($this->mock(Document::class))]),
-            $this->mock(Settings::class),
             $this->mock(UI::class),
             $this->mock(Routing::class),
             $this->fail(...)
@@ -67,7 +65,6 @@ public function testShowAgreementForm(): void
     {
         $instance = new Agreement(
             $this->mockTree(User::class, ['matchingDocument' => new Ok($this->mock(Document::class))]),
-            $this->mock(Settings::class),
             $this->mock(UI::class),
             $this->mock(Routing::class),
             fn() => $this->mock(Component::class)
@@ -84,7 +81,6 @@ public function testNeedsToAgree(): void
                 'neverAgreed' => false,
                 'didNotAcceptCurrentVersion' => false,
             ]),
-            $this->mock(Settings::class),
             $this->mock(UI::class),
             $this->mock(Routing::class),
             $this->fail(...)
@@ -100,7 +96,6 @@ public function testCannotAgree(): void
                 'cannotAgree' => true,
                 'didNotAcceptCurrentVersion' => true,
             ]),
-            $this->mock(Settings::class),
             $this->mock(UI::class),
             $this->mock(Routing::class),
             $this->fail(...)
@@ -116,7 +111,6 @@ public function testDidNotAcceptCurrentVersion(): void
                 'cannotAgree' => false,
                 'needsToAcceptNewDocument' => true,
             ]),
-            $this->mock(Settings::class),
             $this->mock(UI::class),
             $this->mock(Routing::class),
             $this->fail(...)
diff --git a/components/ILIAS/TermsOfService/classes/Consumer.php b/components/ILIAS/TermsOfService/classes/Consumer.php
index fc2b189ae96a..1e1c4c6b02b4 100755
--- a/components/ILIAS/TermsOfService/classes/Consumer.php
+++ b/components/ILIAS/TermsOfService/classes/Consumer.php
@@ -34,7 +34,6 @@
 class Consumer implements ConsumerInterface
 {
     private readonly Container $container;
-    private readonly Closure $lazy_users;
 
     public const ID = 'tos';
 
@@ -70,7 +69,7 @@ public function uses(UseSlot $slot, LazyProvide $provide): UseSlot
         $constraint = $this->container->refinery()->custom()->constraint(...);
 
         return $slot->canWithdraw($blocks->slot()->withdrawProcess($user, $global_settings, $this->userHasWithdrawn(...)))
-                    ->hasAgreement($blocks->slot()->agreement($user, $global_settings), 'agreement')
+                    ->hasAgreement($blocks->slot()->agreement($user), 'agreement')
                     ->showInFooter($blocks->slot()->modifyFooter($user))
                     ->showOnLoginPage($blocks->slot()->showOnLoginPage())
                     ->onSelfRegistration($blocks->slot()->selfRegistration($user, $build_user))
diff --git a/components/ILIAS/TermsOfService/classes/Settings.php b/components/ILIAS/TermsOfService/classes/Settings.php
index 066b5f6594c3..7d6ced4c8be1 100755
--- a/components/ILIAS/TermsOfService/classes/Settings.php
+++ b/components/ILIAS/TermsOfService/classes/Settings.php
@@ -25,6 +25,7 @@
 use ILIAS\LegalDocuments\ConsumerToolbox\Marshal;
 use ILIAS\LegalDocuments\ConsumerToolbox\SelectSetting;
 use ILIAS\LegalDocuments\ConsumerToolbox\Convert;
+use DateTimeImmutable;
 
 class Settings implements SettingsInterface
 {
diff --git a/components/ILIAS/TermsOfService/classes/class.ilObjTermsOfServiceGUI.php b/components/ILIAS/TermsOfService/classes/class.ilObjTermsOfServiceGUI.php
index b4c67e10bb70..48ef2053b475 100755
--- a/components/ILIAS/TermsOfService/classes/class.ilObjTermsOfServiceGUI.php
+++ b/components/ILIAS/TermsOfService/classes/class.ilObjTermsOfServiceGUI.php
@@ -26,6 +26,7 @@
 use ILIAS\LegalDocuments\ConsumerToolbox\UI;
 use ILIAS\LegalDocuments\ConsumerToolbox\Blocks;
 use ILIAS\Data\Factory as DataFactory;
+use ILIAS\UI\Component\Input\Container\Form\Form;
 
 /**
  * @author            Michael Jansen <mjansen@databay.de>
@@ -44,7 +45,7 @@ class ilObjTermsOfServiceGUI extends ilObject2GUI
     private readonly UI $ui;
     private readonly Settings $tos_settings;
 
-    public function __construct($a_id = 0, $a_id_type = self::REPOSITORY_NODE_ID, $a_parent_node_id = 0)
+    public function __construct(int $a_id = 0, int $a_id_type = self::REPOSITORY_NODE_ID, int $a_parent_node_id = 0)
     {
         global $DIC;
 
@@ -122,7 +123,7 @@ public function getAdminTabs(): void
         }
     }
 
-    public function form(): ILIAS\UI\Component\Input\Container\Form\Standard
+    public function form(): Form
     {
         $read_only = !$this->rbac_system->checkAccess('write', $this->object->getRefId());