Move test autoload setup to composer.json.

demiankatz · Dec 9, 2024 · 7d57479 · 7d57479
1 parent f962bf2
commit 7d57479
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -32,6 +32,11 @@
             "minSO": "module/VuFind/src/VuFind/Search"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "VuFindTest\\": ["module/VuFind/src/VuFindTest", "module/VuFind/tests/unit-tests/src/VuFindTest"]
+        }
+    },
     "provide": {
         "ext-memcached": "*",
         "ext-oci8": "*",

diff --git a/module/VuFind/tests/bootstrap.php b/module/VuFind/tests/bootstrap.php
@@ -35,20 +35,6 @@
 // Composer autoloading
 if (file_exists('vendor/autoload.php')) {
     include 'vendor/autoload.php';
-    $loader = new Composer\Autoload\ClassLoader();
-    $loader->addClassMap(['minSO' => __DIR__ . '/../src/VuFind/Search/minSO.php']);
-    $loader->add('VuFindTest', __DIR__ . '/unit-tests/src');
-    $loader->add('VuFindTest', __DIR__ . '/../src');
-    // Dynamically discover all module src directories:
-    $modules = opendir(__DIR__ . '/../..');
-    while ($mod = readdir($modules)) {
-        $mod = trim($mod, '.'); // ignore . and ..
-        $dir = empty($mod) ? false : realpath(__DIR__ . "/../../{$mod}/src");
-        if (!empty($dir) && is_dir($dir . '/' . $mod)) {
-            $loader->add($mod, $dir);
-        }
-    }
-    $loader->register();
 }
 
 // Make sure local config dir exists: