Merge pull request #9015 from MissAllSunday/composer-2

[3.0] Manage third party libraries via composer

Author: Sesquipedalian

.php-cs-fixer.dist.php

@@ -20,10 +20,8 @@
 		'other',
 		'Packages',
 		'Smileys',
-		'Sources/minify',
-		'Sources/ReCaptcha',
-		'Sources/ZxcvbnPhp',
 		'Themes',
+		'vendor',
 	])
 	// Skip ssi_example.php.
 	->notName(['ssi_examples.php'])

.scrutinizer.yml

@@ -1,13 +1,8 @@
 filter:
     excluded_paths:
         - '*.min.js'
-        - 'Sources/minify/'
-        - 'Sources/random_compat/'
-        - 'Sources/ReCaptcha/'
     dependency_paths:
-        - 'Sources/minify/'
-        - 'Sources/random_compat/'
-        - 'Sources/ReCaptcha/'
+        - 'vendor/'
 checks:
     php:
         variable_existence: true

README.md

@@ -25,6 +25,8 @@ by signing off your contributions, you acknowledge that you can and do license y
   * It is enough to include in your commit comment "Signed-off by: " followed by your name and email address (for example: `Signed-off-by: Your Name <[email protected]>`)
   * an easy way to do so is to define an alias for the git commit command, which includes -s switch (reference: [How to create Git aliases](https://git.wiki.kernel.org/index.php/Aliases))
 * send a pull request to us.
+* SMF uses third party libraries via composer, if you want to run a local version, please [install composer first](https://getcomposer.org)
+  and run `composer install`
 
 ## How to submit a pull request:
 * If you want to send a bug fix for version 3.0, send it to the branch ***release-3.0***
@@ -34,4 +36,4 @@ by signing off your contributions, you acknowledge that you can and do license y
 Lastly, if you have a security issue you would like to notify us about regarding SMF for any version -
 please file a [security report](https://www.simplemachines.org/about/smf/security.php) on our website: https://www.simplemachines.org/about/smf/security.php
 
-For further information regarding our security policy, see SECURITY.md
+For further information regarding our security policy, see SECURITY.md

Sources/Actions/Admin/ACP.php

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

Sources/Autoloader.php

@@ -253,6 +253,11 @@ class Config
 	 */
 	public static string $sourcedir;
 
+	/**
+	 * Path to where our dependencies are located.
+	 */
+	public static string $vendordir;
+
 	/**
 	 * Path to the Packages directory.
 	 *
@@ -785,6 +790,18 @@ class Config
 			'raw_default' => true,
 			'type' => 'string',
 		],
+		'vendordir' => [
+			'text' => <<<'END'
+				/**
+				 * @var string
+				 *
+				 * Path to where our dependencies are located.
+				 */
+				END,
+			'default' => '__DIR__ . \'/vendor\'',
+			'raw_default' => true,
+			'type' => 'string',
+		],
 		'languagesdir' => [
 			'text' => <<<'END'
 				/**
@@ -979,6 +996,10 @@ public static function set(array $settings): void
 			self::$sourcedir = self::$boarddir . '/Sources';
 		}
 
+		if ((empty(self::$vendordir) || !is_dir(realpath(self::$vendordir))) && is_dir(self::$boarddir . '/vendor')) {
+			self::$vendordir = self::$boarddir . '/vendor';
+		}
+
 		if ((empty(self::$packagesdir) || !is_dir(realpath(self::$packagesdir))) && is_dir(self::$boarddir . '/Packages')) {
 			self::$packagesdir = self::$boarddir . '/Packages';
 		}