From 908164e0f8812a77f3aad9f366de08751d642607 Mon Sep 17 00:00:00 2001
From: Luka Stocker <luka.stocker@concepts-and-training.de>
Date: Thu, 21 Sep 2023 10:17:42 +0200
Subject: [PATCH] Fix some tests and other referencing issues.

---
 components/ILIAS/AuthApache_/test/bootstrap.php               | 2 +-
 .../classes/class.ilSoapBackgroundTasksAdministration.php     | 2 +-
 components/ILIAS/Certificate_/test/bootstrap.php              | 2 +-
 components/ILIAS/Contact_/BuddySystem/test/bootstrap.php      | 2 +-
 components/ILIAS/Contact_/test/bootstrap.php                  | 2 +-
 components/ILIAS/EventHandling_/test/EventTest.php            | 2 +-
 components/ILIAS/Filesystem/src/Util/LegacyPathHelper.php     | 4 ++--
 .../ILIAS/Filesystem/tests/Util/LegacyPathHelperTest.php      | 4 ++--
 components/ILIAS/Forum_/test/bootstrap.php                    | 2 +-
 components/ILIAS/Html_/test/bootstrap.php                     | 2 +-
 components/ILIAS/Mail_/test/bootstrap.php                     | 2 +-
 components/ILIAS/Password_/test/bootstrap.php                 | 2 +-
 components/ILIAS/Saml_/test/bootstrap.php                     | 2 +-
 components/ILIAS/TermsOfService_/test/bootstrap.php           | 2 +-
 .../UICore_/classes/Structure/class.ilCtrlStructureReader.php | 2 +-
 components/ILIAS/WebDAV_/test/ilComponentsWebDAVSuite.php     | 2 +-
 16 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/components/ILIAS/AuthApache_/test/bootstrap.php b/components/ILIAS/AuthApache_/test/bootstrap.php
index 892a49ffad76..d57bb44c98d7 100644
--- a/components/ILIAS/AuthApache_/test/bootstrap.php
+++ b/components/ILIAS/AuthApache_/test/bootstrap.php
@@ -16,4 +16,4 @@
  *
  *****************************************************************************/
 
-require_once __DIR__ . substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
+require_once substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
diff --git a/components/ILIAS/BackgroundTasks_/classes/class.ilSoapBackgroundTasksAdministration.php b/components/ILIAS/BackgroundTasks_/classes/class.ilSoapBackgroundTasksAdministration.php
index 08e7c7966043..1e213bdfc825 100644
--- a/components/ILIAS/BackgroundTasks_/classes/class.ilSoapBackgroundTasksAdministration.php
+++ b/components/ILIAS/BackgroundTasks_/classes/class.ilSoapBackgroundTasksAdministration.php
@@ -17,7 +17,7 @@
  *********************************************************************/
 
 /** @noRector */
-require_once __DIR__ . substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . "/vendor/composer/vendor/autoload.php";
+require_once substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . "/vendor/composer/vendor/autoload.php";
 
 use ILIAS\BackgroundTasks\Implementation\TaskManager\AsyncTaskManager;
 use ILIAS\BackgroundTasks\Persistence;
diff --git a/components/ILIAS/Certificate_/test/bootstrap.php b/components/ILIAS/Certificate_/test/bootstrap.php
index 4f998ee46c37..9133b291f443 100644
--- a/components/ILIAS/Certificate_/test/bootstrap.php
+++ b/components/ILIAS/Certificate_/test/bootstrap.php
@@ -21,5 +21,5 @@
 /**
  * @author  Niels Theen <ntheen@databay.de>
  */
-require_once __DIR__ . substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
+require_once substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
 require_once __DIR__ . '/ilCertificateBaseTestCase.php';
diff --git a/components/ILIAS/Contact_/BuddySystem/test/bootstrap.php b/components/ILIAS/Contact_/BuddySystem/test/bootstrap.php
index e644a2d9f55b..131c4124c732 100644
--- a/components/ILIAS/Contact_/BuddySystem/test/bootstrap.php
+++ b/components/ILIAS/Contact_/BuddySystem/test/bootstrap.php
@@ -18,4 +18,4 @@
 
 declare(strict_types=1);
 
-require_once __DIR__ . substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
+require_once substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
diff --git a/components/ILIAS/Contact_/test/bootstrap.php b/components/ILIAS/Contact_/test/bootstrap.php
index e644a2d9f55b..131c4124c732 100644
--- a/components/ILIAS/Contact_/test/bootstrap.php
+++ b/components/ILIAS/Contact_/test/bootstrap.php
@@ -18,4 +18,4 @@
 
 declare(strict_types=1);
 
-require_once __DIR__ . substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
+require_once substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
diff --git a/components/ILIAS/EventHandling_/test/EventTest.php b/components/ILIAS/EventHandling_/test/EventTest.php
index ae62798a328a..66a0645d0875 100644
--- a/components/ILIAS/EventHandling_/test/EventTest.php
+++ b/components/ILIAS/EventHandling_/test/EventTest.php
@@ -21,7 +21,7 @@
 use PHPUnit\Framework\TestCase;
 use ILIAS\DI\Container;
 
-require_once __DIR__ . substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . "/vendor/composer/vendor/autoload.php";
+require_once substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . "/vendor/composer/vendor/autoload.php";
 
 /**
  * Test clipboard repository
diff --git a/components/ILIAS/Filesystem/src/Util/LegacyPathHelper.php b/components/ILIAS/Filesystem/src/Util/LegacyPathHelper.php
index c8267419eda9..b524cc382055 100644
--- a/components/ILIAS/Filesystem/src/Util/LegacyPathHelper.php
+++ b/components/ILIAS/Filesystem/src/Util/LegacyPathHelper.php
@@ -222,8 +222,8 @@ private static function listPaths(): array
         $storage = CLIENT_DATA_DIR;
         $customizing = ILIAS_ABSOLUTE_PATH . '/Customizing';
         $customizingRelativeWithLeadingDot = './Customizing';
-        $libs = ILIAS_ABSOLUTE_PATH . '/libs';
-        $libsRelativeWithLeadingDot = "./libs";
+        $libs = ILIAS_ABSOLUTE_PATH . '/vendor';
+        $libsRelativeWithLeadingDot = "./vendor";
         $temp = CLIENT_DATA_DIR . "/temp";
         $nodeModules = ILIAS_ABSOLUTE_PATH . '/node_modules';
         $nodeModulesWithLeadingDot = './node_modules';
diff --git a/components/ILIAS/Filesystem/tests/Util/LegacyPathHelperTest.php b/components/ILIAS/Filesystem/tests/Util/LegacyPathHelperTest.php
index b07819a7a132..ef92c322c49f 100644
--- a/components/ILIAS/Filesystem/tests/Util/LegacyPathHelperTest.php
+++ b/components/ILIAS/Filesystem/tests/Util/LegacyPathHelperTest.php
@@ -119,7 +119,7 @@ public function testDeriveFilesystemFromWithStorageTargetWhichShouldSucceed(): v
      */
     public function testDeriveFilesystemFromWithRelativeLibsTargetWhichShouldSucceed(): void
     {
-        $target = './libs/bower/bower_components/mediaelement/build';
+        $target = './vendor/bower/bower_components/mediaelement/build';
 
         $this->filesystemsMock
             ->shouldReceive('libs')
@@ -136,7 +136,7 @@ public function testDeriveFilesystemFromWithRelativeLibsTargetWhichShouldSucceed
      */
     public function testDeriveFilesystemFromWithAbsoluteLibsTargetWhichShouldSucceed(): void
     {
-        $target = $this->libsPath . 'libs/bower/bower_components/mediaelement/build';
+        $target = $this->libsPath . '/vendor/bower/bower_components/mediaelement/build';
 
         $this->filesystemsMock
             ->shouldReceive('libs')
diff --git a/components/ILIAS/Forum_/test/bootstrap.php b/components/ILIAS/Forum_/test/bootstrap.php
index e644a2d9f55b..131c4124c732 100644
--- a/components/ILIAS/Forum_/test/bootstrap.php
+++ b/components/ILIAS/Forum_/test/bootstrap.php
@@ -18,4 +18,4 @@
 
 declare(strict_types=1);
 
-require_once __DIR__ . substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
+require_once substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
diff --git a/components/ILIAS/Html_/test/bootstrap.php b/components/ILIAS/Html_/test/bootstrap.php
index e644a2d9f55b..131c4124c732 100644
--- a/components/ILIAS/Html_/test/bootstrap.php
+++ b/components/ILIAS/Html_/test/bootstrap.php
@@ -18,4 +18,4 @@
 
 declare(strict_types=1);
 
-require_once __DIR__ . substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
+require_once substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
diff --git a/components/ILIAS/Mail_/test/bootstrap.php b/components/ILIAS/Mail_/test/bootstrap.php
index ffb7f0750740..67ef1ace17fb 100644
--- a/components/ILIAS/Mail_/test/bootstrap.php
+++ b/components/ILIAS/Mail_/test/bootstrap.php
@@ -18,5 +18,5 @@
 
 declare(strict_types=1);
 
-require_once __DIR__ . substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
+require_once substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
 require_once __DIR__ . '/ilMailBaseTest.php';
diff --git a/components/ILIAS/Password_/test/bootstrap.php b/components/ILIAS/Password_/test/bootstrap.php
index 46e2acfb066d..60d0cbb9dd2e 100644
--- a/components/ILIAS/Password_/test/bootstrap.php
+++ b/components/ILIAS/Password_/test/bootstrap.php
@@ -18,5 +18,5 @@
 
 declare(strict_types=1);
 
-require_once __DIR__ . substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
+require_once substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
 require_once __DIR__ . '/ilPasswordBaseTest.php';
diff --git a/components/ILIAS/Saml_/test/bootstrap.php b/components/ILIAS/Saml_/test/bootstrap.php
index e644a2d9f55b..131c4124c732 100644
--- a/components/ILIAS/Saml_/test/bootstrap.php
+++ b/components/ILIAS/Saml_/test/bootstrap.php
@@ -18,4 +18,4 @@
 
 declare(strict_types=1);
 
-require_once __DIR__ . substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
+require_once substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
diff --git a/components/ILIAS/TermsOfService_/test/bootstrap.php b/components/ILIAS/TermsOfService_/test/bootstrap.php
index abb5d9168255..5bb7227b2696 100644
--- a/components/ILIAS/TermsOfService_/test/bootstrap.php
+++ b/components/ILIAS/TermsOfService_/test/bootstrap.php
@@ -18,5 +18,5 @@
 
 declare(strict_types=1);
 
-require_once __DIR__ . substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
+require_once substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
 require_once __DIR__ . '/ilTermsOfServiceBaseTest.php';
diff --git a/components/ILIAS/UICore_/classes/Structure/class.ilCtrlStructureReader.php b/components/ILIAS/UICore_/classes/Structure/class.ilCtrlStructureReader.php
index 2f24083db666..0762371a9c8b 100644
--- a/components/ILIAS/UICore_/classes/Structure/class.ilCtrlStructureReader.php
+++ b/components/ILIAS/UICore_/classes/Structure/class.ilCtrlStructureReader.php
@@ -4,7 +4,7 @@
 
 /* Copyright (c) 2021 Thibeau Fuhrer <thf@studer-raimann.ch> Extended GPL, see docs/LICENSE */
 
-require_once __DIR__ . substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
+require_once substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . '/vendor/composer/vendor/autoload.php';
 
 /**
  * Class ilCtrlStructureReader is responsible for reading
diff --git a/components/ILIAS/WebDAV_/test/ilComponentsWebDAVSuite.php b/components/ILIAS/WebDAV_/test/ilComponentsWebDAVSuite.php
index d6888715ace6..e3d352c6a263 100644
--- a/components/ILIAS/WebDAV_/test/ilComponentsWebDAVSuite.php
+++ b/components/ILIAS/WebDAV_/test/ilComponentsWebDAVSuite.php
@@ -20,7 +20,7 @@
 
 use PHPUnit\Framework\TestSuite;
 
-require_once __DIR__ . substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . "/vendor/composer/vendor/autoload.php";
+require_once substr(__FILE__, 0, strpos(__FILE__, "components/ILIAS")) . "/vendor/composer/vendor/autoload.php";
 
 /**
  * @author Stephan Winiker <stephan.winiker@hslu.ch>