BackwardCompatibility Refactor

Sources/Actions/Activate.php

@@ -13,7 +13,6 @@
 
 namespace SMF\Actions;
 
-use SMF\BackwardCompatibility;
 use SMF\Config;
 use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
@@ -31,19 +30,6 @@
  */
 class Activate implements ActionInterface
 {
-	use BackwardCompatibility;
-
-	/**
-	 * @var array
-	 *
-	 * BackwardCompatibility settings for this class.
-	 */
-	private static $backcompat = [
-		'func_names' => [
-			'call' => 'Activate',
-		],
-	];
-
 	/*******************
 	 * Public properties
 	 *******************/
@@ -289,9 +275,4 @@ protected function __construct()
 	}
 }
 
-// Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\\Activate::exportStatic')) {
-	Activate::exportStatic();
-}
-
 ?>

Sources/Actions/Admin/ACP.php

@@ -16,7 +16,6 @@
 use SMF\Actions\ActionInterface;
 use SMF\Actions\MessageIndex;
 use SMF\Actions\Notify;
-use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
 use SMF\Cache\CacheApi;
 use SMF\Config;
@@ -37,27 +36,6 @@
  */
 class ACP implements ActionInterface
 {
-	use BackwardCompatibility;
-
-	/**
-	 * @var array
-	 *
-	 * BackwardCompatibility settings for this class.
-	 */
-	private static $backcompat = [
-		'func_names' => [
-			'call' => 'AdminMain',
-			'prepareDBSettingContext' => 'prepareDBSettingContext',
-			'saveSettings' => 'saveSettings',
-			'saveDBSettings' => 'saveDBSettings',
-			'getServerVersions' => 'getServerVersions',
-			'getFileVersions' => 'getFileVersions',
-			'updateAdminPreferences' => 'updateAdminPreferences',
-			'emailAdmins' => 'emailAdmins',
-			'adminLogin' => 'adminLogin',
-		],
-	];
-
 	/*******************
 	 * Public properties
 	 *******************/
@@ -1434,7 +1412,7 @@ public static function saveDBSettings(&$config_vars)
 	 * @param array $checkFor An array of what to check versions for - can contain one or more of 'gd', 'imagemagick', 'db_server', 'phpa', 'memcache', 'php' or 'server'
 	 * @return array An array of versions (keys are same as what was in $checkFor, values are the versions)
 	 */
-	public static function getServerVersions($checkFor)
+	public static function getServerVersions(array $checkFor)
 	{
 		Lang::load('Admin');
 		Lang::load('ManageSettings');
@@ -2006,6 +1984,8 @@ protected static function adminLogin_outputPostVars($k, $v)
 	/**
 	 * Properly urlencodes a string to be used in a query.
 	 *
+	 * todo: fix typing
+	 *
 	 * @param string $get A copy of $_GET.
 	 * @return string Our query string.
 	 */
@@ -2042,9 +2022,4 @@ protected static function construct_query_string($get)
 	}
 }
 
-// Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\\ACP::exportStatic')) {
-	ACP::exportStatic();
-}
-
 ?>

Sources/Actions/Admin/AntiSpam.php

@@ -14,7 +14,7 @@
 namespace SMF\Actions\Admin;
 
 use SMF\Actions\ActionInterface;
-use SMF\BackwardCompatibility;
+use SMF\Actions\BackwardCompatibility;
 use SMF\Cache\CacheApi;
 use SMF\Config;
 use SMF\Db\DatabaseApi as Db;
@@ -32,17 +32,6 @@ class AntiSpam implements ActionInterface
 {
 	use BackwardCompatibility;
 
-	/**
-	 * @var array
-	 *
-	 * BackwardCompatibility settings for this class.
-	 */
-	private static $backcompat = [
-		'func_names' => [
-			'modifyAntispamSettings' => 'ModifyAntispamSettings',
-		],
-	];
-
 	/****************************
 	 * Internal static properties
 	 ****************************/
@@ -466,6 +455,7 @@ public static function getConfigVars(): array
 	 *
 	 * @param bool $return_config Whether to return the config_vars array.
 	 * @return void|array Returns nothing or returns the config_vars array.
+	 * @deprecated since 3.0
 	 */
 	public static function modifyAntispamSettings($return_config = false)
 	{
@@ -489,9 +479,4 @@ protected function __construct()
 	}
 }
 
-// Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\\AntiSpam::exportStatic')) {
-	AntiSpam::exportStatic();
-}
-
 ?>

Sources/Actions/Admin/Attachments.php

@@ -19,7 +19,7 @@
 
 use SMF\Actions\ActionInterface;
 use SMF\Attachment;
-use SMF\BackwardCompatibility;
+use SMF\Actions\BackwardCompatibility;
 use SMF\Config;
 use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
@@ -32,40 +32,15 @@
 use SMF\User;
 use SMF\Utils;
 
+use const DIRECTORY_SEPARATOR;
+
 /**
  * Maintains and manages attachments and avatars.
  */
 class Attachments implements ActionInterface
 {
 	use BackwardCompatibility;
 
-	/**
-	 * @var array
-	 *
-	 * BackwardCompatibility settings for this class.
-	 */
-	private static $backcompat = [
-		'func_names' => [
-			'call' => 'ManageAttachments',
-			'list_getFiles' => 'list_getFiles',
-			'list_getNumFiles' => 'list_getNumFiles',
-			'list_getAttachDirs' => 'list_getAttachDirs',
-			'list_getBaseDirs' => 'list_getBaseDirs',
-			'attachDirStatus' => 'attachDirStatus',
-			'manageAttachmentSettings' => 'ManageAttachmentSettings',
-			'manageAvatarSettings' => 'ManageAvatarSettings',
-			'browseFiles' => 'BrowseFiles',
-			'maintainFiles' => 'MaintainFiles',
-			'removeAttachment' => 'RemoveAttachment',
-			'removeAttachmentByAge' => 'RemoveAttachmentByAge',
-			'removeAttachmentBySize' => 'RemoveAttachmentBySize',
-			'removeAllAttachments' => 'RemoveAllAttachments',
-			'repairAttachments' => 'RepairAttachments',
-			'manageAttachmentPaths' => 'ManageAttachmentPaths',
-			'transferAttachments' => 'TransferAttachments',
-		],
-	];
-
 	/*******************
 	 * Public properties
 	 *******************/
@@ -2469,7 +2444,7 @@ public static function list_getAttachDirs(): array
 			}
 
 			// Check if the directory is doing okay.
-			list($status, $error, $files) = attachDirStatus($dir, $expected_files[$id]);
+			list($status, $error, $files) = self::attachDirStatus($dir, $expected_files[$id]);
 
 			// If it is one, let's show that it's a base directory.
 			$sub_dirs = 0;
@@ -2577,7 +2552,7 @@ public static function list_getBaseDirs(): array
 	 * @param int $expected_files How many files should be in that directory
 	 * @return array An array containing the status of the directory, whether the number of files was what we expected and how many were in the directory
 	 */
-	public static function attachDirStatus($dir, $expected_files): array
+	public static function attachDirStatus(string $dir, int $expected_files): array
 	{
 		if (!is_dir($dir)) {
 			return ['does_not_exist', true, ''];
@@ -2621,7 +2596,7 @@ public static function attachDirStatus($dir, $expected_files): array
 	 * @param bool $return_config Whether to return the config_vars array.
 	 * @return void|array Returns nothing or returns the config_vars array.
 	 */
-	public static function manageAttachmentSettings($return_config = false)
+	public static function manageAttachmentSettings(bool $return_config = false)
 	{
 		if (!empty($return_config)) {
 			return self::attachConfigVars();
@@ -2651,6 +2626,7 @@ public static function manageAvatarSettings($return_config = false)
 
 	/**
 	 * Backward compatibility wrapper for the browse sub-action.
+	 * @deprecated since 3.0
 	 */
 	public static function browseFiles(): void
 	{
@@ -2661,6 +2637,7 @@ public static function browseFiles(): void
 
 	/**
 	 * Backward compatibility wrapper for the maintenance sub-action.
+	 * @deprecated since 3.0
 	 */
 	public static function maintainFiles(): void
 	{
@@ -2671,6 +2648,7 @@ public static function maintainFiles(): void
 
 	/**
 	 * Backward compatibility wrapper for the remove sub-action.
+	 * @deprecated since 3.0
 	 */
 	public static function removeAttachment(): void
 	{
@@ -2681,6 +2659,7 @@ public static function removeAttachment(): void
 
 	/**
 	 * Backward compatibility wrapper for the byage sub-action.
+	 * @deprecated since 3.0
 	 */
 	public static function removeAttachmentByAge(): void
 	{
@@ -2691,6 +2670,7 @@ public static function removeAttachmentByAge(): void
 
 	/**
 	 * Backward compatibility wrapper for the bysize sub-action.
+	 * @deprecated since 3.0
 	 */
 	public static function removeAttachmentBySize(): void
 	{
@@ -2701,6 +2681,7 @@ public static function removeAttachmentBySize(): void
 
 	/**
 	 * Backward compatibility wrapper for the removeall sub-action.
+	 * @deprecated since 3.0
 	 */
 	public static function removeAllAttachments(): void
 	{
@@ -2711,6 +2692,7 @@ public static function removeAllAttachments(): void
 
 	/**
 	 * Backward compatibility wrapper for the repair sub-action.
+	 * @deprecated since 3.0
 	 */
 	public static function repairAttachments(): void
 	{
@@ -2721,6 +2703,7 @@ public static function repairAttachments(): void
 
 	/**
 	 * Backward compatibility wrapper for the attachpaths sub-action.
+	 * @deprecated since 3.0
 	 */
 	public static function manageAttachmentPaths(): void
 	{
@@ -2731,6 +2714,7 @@ public static function manageAttachmentPaths(): void
 
 	/**
 	 * Backward compatibility wrapper for the transfer sub-action.
+	 * @deprecated since 3.0
 	 */
 	public static function transferAttachments(): void
 	{
@@ -2824,12 +2808,4 @@ protected function pauseAttachmentMaintenance($to_fix, $max_substep = 0): void
 	}
 }
 
-// Some functions have been migrated from here to the Attachment class.
-class_exists('SMF\\Attachment');
-
-// Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\\Attachments::exportStatic')) {
-	Attachments::exportStatic();
-}
-
 ?>