WIP: Proposal/12/component revision some components

components/ILIAS/Authentication/Authentication.php

@@ -69,5 +69,7 @@ public function offsetUnset(mixed $offset): void
             new Component\Resource\ComponentJS($this, 'js/dist/SessionReminder.min.js');
         $contribute[User\Settings\UserSettings::class] = fn() =>
             new Authentication\UserSettings\Settings();
+        $contribute[\ILIAS\StaticURL\Handler\Handler::class] = static fn(): \ILIAS\StaticURL\Handler\Handler =>
+            new \ILIAS\Authentication\StaticUrlHandler();
     }
 }

components/ILIAS/Authentication/classes/StaticUrlHandler.php

@@ -30,13 +30,15 @@
 
 class StaticUrlHandler extends BaseHandler implements Handler
 {
-    private readonly ilLanguage $language;
+    private ?ilLanguage $language = null;
 
-    public function __construct()
+    private function language(): ilLanguage
     {
-        global $DIC;
-        $this->language = $DIC->language();
-        parent::__construct();
+        if ($this->language === null) {
+            global $DIC;
+            $this->language = $DIC->language();
+        }
+        return $this->language;
     }
 
     public function getNamespace(): string
@@ -51,7 +53,7 @@ public function handle(Request $request, Context $context, Factory $response_fac
         return match ($additional_params) {
             'login' => $response_factory->can('login.php?' . http_build_query([
                 'cmd' => 'force_login',
-                'lang' => $this->language->getLangKey(),
+                'lang' => $this->language()->getLangKey(),
             ])),
         };
     }

components/ILIAS/Badge/Badge.php

@@ -39,5 +39,7 @@ public function init(
             $this,
             'PublicProfileBadges.js'
         );
+        $contribute[\ILIAS\StaticURL\Handler\Handler::class] = static fn(): \ILIAS\StaticURL\Handler\Handler =>
+            new \ILIAS\Badge\URL\StaticUrlHandler();
     }
 }

components/ILIAS/Blog/Blog.php

@@ -36,5 +36,7 @@ public function init(
             new \ILIAS\Blog\Setup\Agent(
                 $pull[\ILIAS\Refinery\Factory::class]
             );
+        $contribute[\ILIAS\StaticURL\Handler\Handler::class] = static fn(): \ILIAS\StaticURL\Handler\Handler =>
+            new \ILIAS\PermanentLink\StaticURLHandler();
     }
 }

components/ILIAS/Calendar/Calendar.php

@@ -53,5 +53,7 @@ public function init(
         $contribute[Component\Resource\PublicAsset::class] = fn() =>
             new Component\Resource\NodeModule("eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js");
         */
+        $contribute[\ILIAS\StaticURL\Handler\Handler::class] = static fn(): \ILIAS\StaticURL\Handler\Handler =>
+            new \ILIAS\Calendar\URL\CalendarStaticURLHandler();
     }
 }

components/ILIAS/Certificate/Certificate.php

@@ -36,5 +36,7 @@ public function init(
             new \ilCertificatSetupAgent(
                 $pull[\ILIAS\Refinery\Factory::class]
             );
+        $contribute[\ILIAS\StaticURL\Handler\Handler::class] = static fn(): \ILIAS\StaticURL\Handler\Handler =>
+            new \ILIAS\Certificate\StaticUrlHandler();
     }
 }

components/ILIAS/Contact/Contact.php

@@ -36,5 +36,7 @@ public function init(
             new Component\Resource\ComponentJS($this, "buddy_system.js");
         $contribute[User\Settings\UserSettings::class] = fn() =>
             new Contact\UserSettings\Settings();
+        $contribute[\ILIAS\StaticURL\Handler\Handler::class] = static fn(): \ILIAS\StaticURL\Handler\Handler =>
+            new \ILIAS\Contact\URL\StaticUrlHandler();
     }
 }

components/ILIAS/DI/src/Container.php

@@ -25,6 +25,8 @@
 use ILIAS\Filesystem\Util\Convert\Converters;
 use ILIAS\Repository;
 use ILIAS\Skill\Service\SkillService;
+use ILIAS\HTTP\GlobalHttpState;
+use ILIAS\Filesystem\Configuration\FilesystemConfig;
 
 /**
  * Customizing of pimple-DIC for ILIAS.
@@ -34,8 +36,6 @@
  */
 class Container extends \Pimple\Container
 {
-    private ?\ilFileServicesSettings $file_service_settings = null;
-
     /**
      * Get interface to the Database.
      */
@@ -402,16 +402,9 @@ public function infoScreen(): \ILIAS\InfoScreen\Service
         return new \ILIAS\InfoScreen\Service($this);
     }
 
-    public function fileServiceSettings(): \ilFileServicesSettings
+    public function fileServiceSettings(): FilesystemConfig
     {
-        if ($this->file_service_settings === null) {
-            $this->file_service_settings = new \ilFileServicesSettings(
-                $this->settings(),
-                $this->clientIni(),
-                $this->database()
-            );
-        }
-        return $this->file_service_settings;
+        return $this[FilesystemConfig::class];
     }
 
 

components/ILIAS/Database/Database.php

@@ -23,22 +23,26 @@
 use ILIAS\Component\Component;
 use ILIAS\Setup\Agent;
 use ILIAS\Refinery\Factory;
+use ILIAS\Database\PDO\External;
 
 class Database implements Component
 {
     public function init(
-        array | \ArrayAccess &$define,
-        array | \ArrayAccess &$implement,
-        array | \ArrayAccess &$use,
-        array | \ArrayAccess &$contribute,
-        array | \ArrayAccess &$seek,
-        array | \ArrayAccess &$provide,
-        array | \ArrayAccess &$pull,
-        array | \ArrayAccess &$internal,
+        array|\ArrayAccess &$define,
+        array|\ArrayAccess &$implement,
+        array|\ArrayAccess &$use,
+        array|\ArrayAccess &$contribute,
+        array|\ArrayAccess &$seek,
+        array|\ArrayAccess &$provide,
+        array|\ArrayAccess &$pull,
+        array|\ArrayAccess &$internal,
     ): void {
-        $contribute[Agent::class] = static fn(): \ilDatabaseSetupAgent =>
-            new \ilDatabaseSetupAgent(
-                $pull[Factory::class]
-            );
+        $define[] = External::class;
+
+        $implement[External::class] = static fn(): External => new Database\DBLegacyProxy();
+
+        $contribute[Agent::class] = static fn(): \ilDatabaseSetupAgent => new \ilDatabaseSetupAgent(
+            $pull[Factory::class]
+        );
     }
 }

components/ILIAS/Database/classes/PDO/External.php

@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Database\PDO;
+
+use ilDBInterface;
+use ilDBPdoInterface;
+
+interface External extends ilDBInterface, ilDBPdoInterface
+{
+}

components/ILIAS/Database/classes/PDO/Internal.php

@@ -20,11 +20,9 @@
 
 namespace ILIAS\Database\PDO;
 
-use ilDBInterface;
-use ilDBPdoInterface;
 use ILIAS\Database\FieldDefinition;
 
-interface Internal extends ilDBInterface, ilDBPdoInterface
+interface Internal extends External
 {
     public function getFieldDefinition(): ?FieldDefinition;
     public function getIndexName(string $index_name_base): string;