Init: Use UI framework for startup forms

mjansenDatabay · Oct 25, 2023 · 7a5ab6c · 7a5ab6c
1 parent 52f7d8f
commit 7a5ab6c
Show file tree

Hide file tree

Showing 4 changed files with 721 additions and 890 deletions.
diff --git a/Services/Authentication/classes/Frontend/class.ilAuthFrontendCredentialsApache.php b/Services/Authentication/classes/Frontend/class.ilAuthFrontendCredentialsApache.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 Psr\Http\Message\ServerRequestInterface;
 
 /**
@@ -30,11 +30,11 @@
 class ilAuthFrontendCredentialsApache extends ilAuthFrontendCredentials
 {
     private ServerRequestInterface $httpRequest;
-    private ilCtrl $ctrl;
+    private ilCtrlInterface $ctrl;
     private ilSetting $settings;
     private ilLogger $logger;
 
-    public function __construct(ServerRequestInterface $httpRequest, ilCtrl $ctrl)
+    public function __construct(ServerRequestInterface $httpRequest, ilCtrlInterface $ctrl)
     {
         global $DIC;
         $this->logger = $DIC->logger()->auth();

diff --git a/Services/Authentication/classes/Frontend/class.ilAuthFrontendCredentialsSoap.php b/Services/Authentication/classes/Frontend/class.ilAuthFrontendCredentialsSoap.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,27 +16,23 @@
  *
  *********************************************************************/
 
+declare(strict_types=1);
+
 use Psr\Http\Message\ServerRequestInterface;
 
 class ilAuthFrontendCredentialsSoap extends ilAuthFrontendCredentials
 {
     private ServerRequestInterface $httpRequest;
 
-    private ilCtrl $ctrl;
+    private ilCtrlInterface $ctrl;
 
     private ilSetting $settings;
 
     private ilAuthSession $authSession;
     private \ilGlobalTemplateInterface $main_tpl;
     private ilLogger $logger;
 
-    /**
-     * ilAuthFrontendCredentialsApache constructor.
-     * @param ServerRequestInterface $httpRequest
-     * @param ilCtrl $ctrl
-     * @param ilSetting $settings
-     */
-    public function __construct(ServerRequestInterface $httpRequest, ilCtrl $ctrl, ilSetting $settings)
+    public function __construct(ServerRequestInterface $httpRequest, ilCtrlInterface $ctrl, ilSetting $settings)
     {
         global $DIC;
         $this->main_tpl = $DIC->ui()->mainTemplate();

diff --git a/Services/Authentication/classes/class.ilAuthUtils.php b/Services/Authentication/classes/class.ilAuthUtils.php
@@ -421,7 +421,7 @@ public static function _hasMultipleAuthenticationMethods(): bool
 
     /**
      * @param ilLanguage $lng
-     * @return array<int|string, string>
+     * @return array<int|string, array{"txt": string, "checked"?: bool, "hide_in_ui"?: bool}>
      */
     public static function _getMultipleAuthModeOptions(ilLanguage $lng): array
     {