From 32c0c07cc1fb1019a61b83814bdd7c3830b621e6 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 7 Aug 2018 14:36:45 +0300 Subject: [PATCH] pluginhost: implement basic autoloader for classes bundled with plugins (uses vendor/ layout) --- classes/pluginhost.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) mode change 100644 => 100755 classes/pluginhost.php diff --git a/classes/pluginhost.php b/classes/pluginhost.php old mode 100644 new mode 100755 index 4eada78b2..5a45f09d4 --- a/classes/pluginhost.php +++ b/classes/pluginhost.php @@ -170,15 +170,37 @@ class PluginHost { // try system plugin directory first $file = __DIR__ . "/../plugins/$class_file/init.php"; + $vendor_dir = __DIR__ . "/../plugins/$class_file/vendor"; if (!file_exists($file)) { $file = __DIR__ . "/../plugins.local/$class_file/init.php"; + $vendor_dir = __DIR__ . "/../plugins.local/$class_file/vendor"; } if (!isset($this->plugins[$class])) { if (file_exists($file)) require_once $file; if (class_exists($class) && is_subclass_of($class, "Plugin")) { + + // register plugin autoloader if necessary, for namespaced classes ONLY + // layout corresponds to tt-rss main /vendor/author/Package/Class.php + + if (file_exists($vendor_dir)) { + spl_autoload_register(function($class) use ($vendor_dir) { + + if (strpos($class, '\\') !== FALSE) { + list ($namespace, $class_name) = explode('\\', $class, 2); + + if ($namespace && $class_name) { + $class_file = "$vendor_dir/$namespace/" . str_replace('\\', '/', $class_name) . ".php"; + + if (file_exists($class_file)) + require_once $class_file; + } + } + }); + } + $plugin = new $class($this); $plugin_api = $plugin->api_version();