Maintenance\Cleanup\v3_0\OldFiles → Maintenance\Cleanup\OldFilesBase

Signed-off-by: Jon Stovell <jonstovell@gmail.com>

Author: Sesquipedalian

Sources/Maintenance/Cleanup/CleanupBase.php

@@ -38,9 +38,7 @@ abstract class CleanupBase implements SubStepInterface
 	 ****************/
 
 	/**
-	 * Check if the task should be performed or not.
 	 *
-	 * @return bool True if this task needs to be run, false otherwise.
 	 */
 	public function isCandidate(): bool
 	{

…es/Maintenance/Cleanup/v3_0/OldFiles.php …ces/Maintenance/Cleanup/OldFilesBase.phpSources/Maintenance/Cleanup/v3_0/OldFiles.php renamed to Sources/Maintenance/Cleanup/OldFilesBase.php Sources/Maintenance/Cleanup/v3_0/OldFiles.php renamed to Sources/Maintenance/Cleanup/OldFilesBase.php

@@ -13,13 +13,16 @@
 
 declare(strict_types=1);
 
-namespace SMF\Maintenance\Cleanup\v3_0;
+namespace SMF\Maintenance\Cleanup;
 
 use SMF\Config;
-use SMF\Maintenance\Cleanup\CleanupBase;
 use SMF\Utils;
 
-class OldFiles extends CleanupBase
+/**
+ * Base class for cleanup tasks that delete files that have been removed in a
+ * new version of SMF.
+ */
+abstract class OldFilesBase extends CleanupBase
 {
 	/*******************
 	 * Public properties
@@ -37,7 +40,7 @@ class OldFiles extends CleanupBase
 	/**
 	 * @var array
 	 *
-	 * List of files removed in SMF 3.0.
+	 * List of files removed in the relevant version of SMF.
 	 */
 	protected array $removed = [
 		// Files in the Themes directory.
@@ -57,9 +60,7 @@ class OldFiles extends CleanupBase
 	 ****************/
 
 	/**
-	 * Check if the task should be performed or not.
 	 *
-	 * @return bool True if this task needs to be run, false otherwise.
 	 */
 	public function isCandidate(): bool
 	{

Sources/Maintenance/Cleanup/v2_1/OldFiles.php

@@ -15,10 +15,10 @@
 
 namespace SMF\Maintenance\Cleanup\v2_1;
 
-use SMF\Maintenance\Cleanup\v3_0\OldFiles as OldFilesBase;
+use SMF\Maintenance\Cleanup\OldFilesBase;
 
 /**
- * Just like the v3_0 version of OldFiles, but with a different list of files.
+ * Deletes files that were present in SMF 2.0 but not in SMF 2.1.
  */
 class OldFiles extends OldFilesBase
 {

Sources/Maintenance/Cleanup/v3_0/TasksDirCase.php

@@ -35,9 +35,7 @@ class TasksDirCase extends CleanupBase
 	 ****************/
 
 	/**
-	 * Check if the task should be performed or not.
 	 *
-	 * @return bool True if this task needs to be run, false otherwise.
 	 */
 	public function isCandidate(): bool
 	{

Sources/Maintenance/Tools/Upgrade.php

@@ -193,7 +193,6 @@ class Upgrade extends ToolsBase implements ToolsInterface
 		// Cleanup steps for 2.1 -> 3.0
 		'v3_0' => [
 			Cleanup\v3_0\TasksDirCase::class,
-			Cleanup\v3_0\OldFiles::class,
 		],
 	];