Remove the last autoload.php

Two maintenance scripts must be autoloadable for DatabaseSchemaUpdater, and are added to AutoloadClasses; however, we anticipate that they can be removed soon, once we remove support for the wb_terms table. Six maintenance scripts need to be loaded in some way in order for their unit tests to work; however, we want to avoid any other code depending on those maintenance scripts, so we only load them in the test files themselves, using require_once. Bug: T172368 Bug: T255108 Change-Id: I0f52629775144949eb8140619dc1e2f03f6f97cc
agniMahesvara · Jun 15, 2020 · aa42baa · aa42baa
1 parent 093c4de
commit aa42baa
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 121 deletions.
diff --git a/.phpcs.xml b/.phpcs.xml
@@ -25,10 +25,6 @@
 	<rule ref="Generic.Files.OneObjectStructurePerFile">
 		<exclude-pattern>Scribunto_LuaWikibaseLibraryTestCase</exclude-pattern>
 	</rule>
-	<rule ref="MediaWiki.Files.ClassMatchesFilename">
-		<!-- FIXME: These files should be renamed to match their class name. -->
-		<exclude-pattern>build/generateAutoload\.php</exclude-pattern>
-	</rule>
 	<rule ref="MediaWiki.Usage.DeprecatedGlobalVariables.Deprecated$wgTitle">
 		<exclude-pattern>RepoHooks\.php</exclude-pattern>
 	</rule>

diff --git a/build/generateAutoload.php b/build/generateAutoload.php
diff --git a/extension-repo-wip.json b/extension-repo-wip.json
@@ -19,6 +19,10 @@
 		"Wikibase\\Repo\\": "repo/includes/",
 		"Wikibase\\Repo\\Maintenance\\": "repo/maintenance/"
 	},
+	"AutoloadClasses": {
+		"Wikibase\\Repo\\Maintenance\\PopulateTermFullEntityId": "repo/maintenance/populateTermFullEntityId.php",
+		"Wikibase\\Repo\\Maintenance\\RebuildTermsSearchKey": "repo/maintenance/rebuildTermsSearchKey.php"
+	},
 	"TestAutoloadNamespaces": {
 		"Wikibase\\Repo\\Tests\\": "repo/tests/phpunit/includes/",
 		"Wikibase\\Repo\\Tests\\Maintenance\\": "repo/tests/phpunit/maintenance/"

diff --git a/repo/Wikibase.php b/repo/Wikibase.php
@@ -114,9 +114,6 @@
 require_once __DIR__ . '/../lib/WikibaseLib.php';
 require_once __DIR__ . '/../view/WikibaseView.php';
 
-// Load autoload info as long as extension classes are not PSR-4-autoloaded
-require_once __DIR__ . '/autoload.php';
-
 call_user_func( function() {
 	global $wgAPIMetaModules,
 		$wgAPIListModules,

diff --git a/repo/autoload.php b/repo/autoload.php
diff --git a/repo/tests/phpunit/maintenance/DumpJsonTest.php b/repo/tests/phpunit/maintenance/DumpJsonTest.php
@@ -34,6 +34,9 @@
 use Wikibase\Repo\Store\Sql\SqlEntityIdPagerFactory;
 use Wikibase\Repo\WikibaseRepo;
 
+// files in maintenance/ are not autoloaded to avoid accidental usage, so load explicitly
+require_once __DIR__ . '/../../../maintenance/dumpJson.php';
+
 /**
  * @covers \Wikibase\Repo\Maintenance\DumpJson
  *

diff --git a/repo/tests/phpunit/maintenance/DumpRdfTest.php b/repo/tests/phpunit/maintenance/DumpRdfTest.php
@@ -43,6 +43,9 @@
 use Wikibase\Repo\WikibaseRepo;
 use Wikimedia\TestingAccessWrapper;
 
+// files in maintenance/ are not autoloaded to avoid accidental usage, so load explicitly
+require_once __DIR__ . '/../../../maintenance/dumpRdf.php';
+
 /**
  * @covers \Wikibase\Repo\Maintenance\DumpRdf
  *

diff --git a/repo/tests/phpunit/maintenance/MockAddUnits.php b/repo/tests/phpunit/maintenance/MockAddUnits.php
@@ -6,6 +6,9 @@
 use Wikibase\Lib\Units\UnitConverter;
 use Wikibase\Repo\Maintenance\AddUnitConversions;
 
+// files in maintenance/ are not autoloaded to avoid accidental usage, so load explicitly
+require_once __DIR__ . '/../../../maintenance/addUnitConversions.php';
+
 /**
  * @license GPL-2.0-or-later
  * @author Stas Malyshev

diff --git a/repo/tests/phpunit/maintenance/PruneItemsPerSiteTest.php b/repo/tests/phpunit/maintenance/PruneItemsPerSiteTest.php
@@ -9,6 +9,9 @@
 use Wikibase\Repo\Maintenance\PruneItemsPerSite;
 use Wikibase\Repo\WikibaseRepo;
 
+// files in maintenance/ are not autoloaded to avoid accidental usage, so load explicitly
+require_once __DIR__ . '/../../../maintenance/pruneItemsPerSite.php';
+
 /**
  * @covers \Wikibase\Repo\Maintenance\PruneItemsPerSite
  *

diff --git a/repo/tests/phpunit/maintenance/RemoveTermsInLanguageTest.php b/repo/tests/phpunit/maintenance/RemoveTermsInLanguageTest.php
@@ -8,6 +8,9 @@
 use Wikibase\Repo\Maintenance\RemoveTermsInLanguage;
 use Wikibase\Repo\WikibaseRepo;
 
+// files in maintenance/ are not autoloaded to avoid accidental usage, so load explicitly
+require_once __DIR__ . '/../../../maintenance/removeTermsInLanguage.php';
+
 /**
  * @covers \Wikibase\Repo\Maintenance\RemoveTermsInLanguage
  *

diff --git a/repo/tests/phpunit/maintenance/UpdateUnitsTest.php b/repo/tests/phpunit/maintenance/UpdateUnitsTest.php
@@ -6,6 +6,9 @@
 use MediaWikiLangTestCase;
 use Wikibase\Repo\Maintenance\UpdateUnits;
 
+// files in maintenance/ are not autoloaded to avoid accidental usage, so load explicitly
+require_once __DIR__ . '/../../../maintenance/updateUnits.php';
+
 /**
  * @covers \Wikibase\Repo\Maintenance\UpdateUnits
  *