POC: manage third party libs via composer

.php-cs-fixer.dist.php

@@ -14,13 +14,11 @@
 	->in(__DIR__)
 	// Don't touch libraries.
 	->exclude([
+		'vendor',
 		'cache',
 		'other',
 		'Packages',
 		'Smileys',
-		'Sources/minify',
-		'Sources/random_compat',
-		'Sources/ReCaptcha',
 		'Themes',
 	])
 	// Skip all index.php files and ssi_example.php.

.scrutinizer.yml

@@ -1,13 +1,7 @@
 filter:
     excluded_paths:
         - '*.min.js'
-        - 'Sources/minify/'
-        - 'Sources/random_compat/'
-        - 'Sources/ReCaptcha/'
-    dependency_paths:
-        - 'Sources/minify/'
-        - 'Sources/random_compat/'
-        - 'Sources/ReCaptcha/'
+        - 'vendor/' # Just to be sure
 checks:
     php:
         variable_existence: true

Sources/Actions/Admin/ACP.php

@@ -1523,8 +1523,6 @@ public static function getFileVersions(array &$versionOptions): array
 		);
 
 		$ignore_sources = [
-			Config::$sourcedir . '/minify/*',
-			Config::$sourcedir . '/ReCaptcha/*',
 			Config::$sourcedir . '/Tasks/*',
 		];
 

Sources/Autoloader.php

@@ -15,73 +15,32 @@
 
 namespace SMF;
 
-/*
- * An autoloader for certain classes.
- *
- * @param string $class The fully-qualified class name.
- */
-spl_autoload_register(function ($class) {
-	static $hook_value = '';
 
-	static $class_map = [
-		// Some special cases.
-		'ReCaptcha\\' => 'ReCaptcha/',
-		'MatthiasMullie\\Minify\\' => 'minify/src/',
-		'MatthiasMullie\\PathConverter\\' => 'minify/path-converter/src/',
+$loader = require Config::$vendordir . '/autoload.php';
+$third_party_mappers = [];
 
-		// In general, the SMF namespace maps to $sourcedir.
-		'SMF\\' => '',
-	];
+// Ensure $sourcedir is set to something valid.
+if (class_exists(Config::class, false) && isset(Config::$sourcedir)) {
+	$sourcedir = Config::$sourcedir;
+}
 
-	// Ensure $sourcedir is set to something valid.
-	if (class_exists(Config::class, false) && isset(Config::$sourcedir)) {
-		$sourcedir = Config::$sourcedir;
-	}
+if (empty($sourcedir) || !is_dir($sourcedir)) {
+	$sourcedir = __DIR__;
+}
 
-	if (empty($sourcedir) || !is_dir($sourcedir)) {
-		$sourcedir = __DIR__;
+// Do any third-party scripts want in on the fun?
+if (!defined('SMF_INSTALLING') && class_exists(Config::class, false)) {
+	if (!class_exists(IntegrationHook::class, false) && is_file($sourcedir . '/IntegrationHook.php')) {
+		require_once $sourcedir . '/IntegrationHook.php';
 	}
 
-	// Do any third-party scripts want in on the fun?
-	if (!defined('SMF_INSTALLING') && class_exists(Config::class, false) && $hook_value !== (Config::$modSettings['integrate_autoload'] ?? '')) {
-		if (!class_exists(IntegrationHook::class, false) && is_file($sourcedir . '/IntegrationHook.php')) {
-			require_once $sourcedir . '/IntegrationHook.php';
-		}
-
-		if (class_exists(IntegrationHook::class, false)) {
-			$hook_value = Config::$modSettings['integrate_autoload'];
-			IntegrationHook::call('integrate_autoload', [&$class_map]);
-		}
+	if (class_exists(IntegrationHook::class, false)) {
+		IntegrationHook::call('integrate_autoload', [&$third_party_mappers]);
 	}
+}
 
-	foreach ($class_map as $prefix => $dirname) {
-		// Does the class use the namespace prefix?
-		$len = strlen($prefix);
-
-		if (strncmp($prefix, $class, $len) !== 0) {
-			continue;
-		}
-
-		// Get the relative class name.
-		$relative_class = substr($class, $len);
-
-		// Replace the namespace prefix with the base directory, replace namespace
-		// separators with directory separators in the relative class name, append
-		// with .php
-		$filename = $dirname . strtr($relative_class, '\\', '/') . '.php';
-
-		// Failsafe: Never load a file named index.php.
-		if (basename($filename) === 'index.php') {
-			return;
-		}
-
-		// If the file exists, require it.
-		if (file_exists($filename = $sourcedir . '/' . $filename)) {
-			require $filename;
-
-			return;
-		}
-	}
-});
+foreach ($third_party_mappers as $prefix => $dirname) {
+	$loader->addPsr4($prefix, $dirname);
+}
 
 ?>

Sources/Config.php

@@ -228,6 +228,10 @@ class Config
 	 * Path to the Sources directory.
 	 */
 	public static string $sourcedir;
+	/**
+	 * Path to where our dependencies are located.
+	 */
+	public static string $vendordir;
 	/**
 	 * Path to the Packages directory.
 	 *
@@ -949,6 +953,8 @@ public static function set(array $settings): void
 		// As of 3.0, this is no longer changeable.
 		self::$tasksdir = self::$sourcedir . '/Tasks';
 
+		self::$vendordir = self::$boarddir . '/vendor';
+
 		if ((empty(self::$packagesdir) || !is_dir(realpath(self::$packagesdir))) && is_dir(self::$boarddir . '/Packages')) {
 			self::$packagesdir = self::$boarddir . '/Packages';
 		}