From 3fd785654372d493c031d9b541ab33a881023a32 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 26 Feb 2021 19:16:17 +0300
Subject: * switch to composer for qrcode and otp dependencies * move most
 OTP-related stuff into userhelper * remove old phpqrcode and otphp libraries

---
 include/autoload.php | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'include/autoload.php')

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";
-- 
cgit v1.2.3-54-g00ecf