Merge remote-tracking branch 'origin/release_10' into release_10

ILIAS-eLearning · Jan 16, 2025 · c160411 · c160411
2 parents be9d92b + ef62965
commit c160411
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/components/ILIAS/Component/classes/class.ilComponentRepository.php b/components/ILIAS/Component/classes/class.ilComponentRepository.php
@@ -24,7 +24,7 @@
  */
 interface ilComponentRepository
 {
-    public const PLUGIN_BASE_PATH = "public/Customizing/plugins";
+    public const PLUGIN_BASE_PATH = "Customizing/plugins";
 
     /**
      * Check if a component exists.

diff --git a/components/ILIAS/Component/classes/class.ilPluginSlotInfo.php b/components/ILIAS/Component/classes/class.ilPluginSlotInfo.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of ILIAS, a powerful learning management system
  * published by ILIAS open source e-Learning e.V.
@@ -65,7 +66,11 @@ public function getQualifiedName(): string
 
     public function getPath(): string
     {
-        return ilComponentRepository::PLUGIN_BASE_PATH . "/" . $this->getQualifiedName();
+        return implode('/', [
+            ilComponentRepository::PLUGIN_BASE_PATH,
+            $this->component->getName(),
+            $this->getName()
+        ]);
     }
 
     /**

diff --git a/components/ILIAS/Component/tests/ilPluginInfoTest.php b/components/ILIAS/Component/tests/ilPluginInfoTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of ILIAS, a powerful learning management system
  * published by ILIAS open source e-Learning e.V.
@@ -245,7 +246,7 @@ public static function versionCompliance(): array
     public function testGetPath(): void
     {
         $this->assertEquals(
-            ilComponentRepository::PLUGIN_BASE_PATH . "/" . "components/ILIAS/Module1/Slot1/Plugin1",
+            ilComponentRepository::PLUGIN_BASE_PATH . "/Module1/Slot1/Plugin1",
             $this->plugin->getPath()
         );
     }

diff --git a/components/ILIAS/Component/tests/ilPluginSlotInfoTest.php b/components/ILIAS/Component/tests/ilPluginSlotInfoTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of ILIAS, a powerful learning management system
  * published by ILIAS open source e-Learning e.V.
@@ -119,7 +120,7 @@ public function testGetUnknownPluginName(): void
     public function testGetPath(): void
     {
         $this->assertEquals(
-            ilComponentRepository::PLUGIN_BASE_PATH . "/" . "components/ILIAS/Module1/Slot1",
+            ilComponentRepository::PLUGIN_BASE_PATH . "/Module1/Slot1",
             $this->pluginslot->getPath()
         );
     }