Merge pull request dokuwiki#4059 from dokuwiki/loader

Refactor autoloading, fix dokuwiki#4048

Author: splitbrain

inc/Extension/PluginController.php

@@ -28,6 +28,7 @@ public function __construct()
     {
         $this->loadConfig();
         $this->populateMasterList();
+        $this->initAutoloaders();
     }
 
     /**
@@ -394,4 +395,21 @@ protected function negate($input)
     {
         return !(bool)$input;
     }
+
+    /**
+     * Initialize vendor autoloaders for all plugins that have them
+     */
+    protected function initAutoloaders()
+    {
+        $plugins = $this->getList();
+        foreach ($plugins as $plugin) {
+            if (file_exists(DOKU_PLUGIN . $plugin . '/vendor/autoload.php')) {
+                try {
+                    require_once(DOKU_PLUGIN . $plugin . '/vendor/autoload.php');
+                } catch (\Throwable $e) {
+                    ErrorHandler::showExceptionMsg($e, sprintf('Failed to init plugin %s autoloader', $plugin));
+                }
+            }
+        }
+    }
 }

inc/init.php

@@ -202,8 +202,7 @@ function_exists('ob_gzhandler') &&
 global $plugin_controller_class, $plugin_controller;
 if (empty($plugin_controller_class)) $plugin_controller_class = PluginController::class;
 
-// load libraries
-require_once(DOKU_INC . 'vendor/autoload.php');
+// autoloader
 require_once(DOKU_INC . 'inc/load.php');
 
 // from now on everything is an exception