diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/autoload.php | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/include/autoload.php b/include/autoload.php index 19e00b9ea..4422a435c 100644 --- a/include/autoload.php +++ b/include/autoload.php @@ -1,24 +1,17 @@ <?php spl_autoload_register(function($class) { - $namespace = ''; - $class_name = $class; - if (strpos($class, '\\') !== false) - list ($namespace, $class_name) = explode('\\', $class, 2); + $root_dir = dirname(__DIR__); // we were in tt-rss/include - $root_dir = dirname(__DIR__); // we're in tt-rss/include + // - internal tt-rss classes are loaded from classes/ and use special naming logic instead of namespaces + // - plugin classes are loaded by PluginHandler from plugins.local/ and plugins/ - // 1. third party libraries with namespaces are loaded from vendor/ - // 2. internal tt-rss classes are loaded from classes/ and use special naming logic instead of namespaces - // 3. plugin classes are loaded by PluginHandler from plugins.local/ and plugins/ (TODO: use generic autoloader?) - - if ($namespace && $class_name) { - $class_file = "$root_dir/vendor/$namespace/" . str_replace('\\', '/', $class_name) . ".php"; - } else { - $class_file = "$root_dir/classes/" . str_replace("_", "/", strtolower($class)) . ".php"; - } + $class_file = "$root_dir/classes/" . str_replace("_", "/", strtolower($class)) . ".php"; if (file_exists($class_file)) include $class_file; }); + + // also pull composer autoloader + require_once "vendor/autoload.php"; |