Remove version_compare check

Universal-Omega · Feb 7, 2025 · a62a8f5 · a62a8f5
1 parent 45e06c0
commit a62a8f5
Showing 1 changed file with 7 additions and 26 deletions.
diff --git a/tests/phpunit/DPLIntegrationTestCase.php b/tests/phpunit/DPLIntegrationTestCase.php
@@ -17,14 +17,6 @@ abstract class DPLIntegrationTestCase extends MediaWikiIntegrationTestCase {
 	/** @var Status */
 	private $importStreamSource;
 
-	/**
-	 * Guard condition to ensure we only import seed data once per test suite run.
-	 * Only used before 1.42 as it breaks on 1.42 if not running for each test
-	 *
-	 * @var bool
-	 */
-	private static $wasSeedDataImported = false;
-
 	protected function setUp(): void {
 		parent::setUp();
 
@@ -37,25 +29,14 @@ protected function setUp(): void {
 	}
 
 	private function doImport(): void {
+		$file = dirname( __DIR__ ) . '/seed-data.xml';
+		$this->seedTestUsers( $file );
+
 		$services = $this->getServiceContainer();
-		if ( version_compare( MW_VERSION, '1.42', '>=' ) ) {
-			$file = dirname( __DIR__ ) . '/seed-data.xml';
-			$this->seedTestUsers( $file );
-			$importer = $services->getWikiImporterFactory()->getWikiImporter(
-				$this->importStreamSource->value,
-				$this->getTestSysop()->getAuthority()
-			);
-		} else {
-			if ( self::$wasSeedDataImported ) {
-				return;
-			}
-			self::$wasSeedDataImported = true;
-			$file = dirname( __DIR__ ) . '/seed-data.xml';
-			$this->seedTestUsers( $file );
-			$importer = $services->getWikiImporterFactory()->getWikiImporter(
-				$this->importStreamSource->value
-			);
-		}
+		$importer = $services->getWikiImporterFactory()->getWikiImporter(
+			$this->importStreamSource->value,
+			$this->getTestSysop()->getAuthority()
+		);
 
 		$importer->disableStatisticsUpdate();