Some cleanup (#306)

Universal-Omega · Feb 7, 2025 · c30cb8f · c30cb8f
1 parent 2126db3
commit c30cb8f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/includes/Hooks.php b/includes/Hooks.php
@@ -223,7 +223,7 @@ private static function executeTag( $input, array $args, Parser $parser, PPFrame
 		if ( $reset['categories'] ?? false ) {
 			$saveCategories = array_combine(
 				$parserOutput->getCategoryNames(),
-				array_map( fn ( $value ) => $parserOutput->getCategorySortKey( $value ), $parserOutput->getCategoryNames() )
+				array_map( static fn ( $value ) => $parserOutput->getCategorySortKey( $value ), $parserOutput->getCategoryNames() )
 			);
 		}
 
@@ -629,7 +629,7 @@ public static function endEliminate( $parser, &$text ) {
 				$categories = array_combine(
 					$parserOutput->getCategoryNames(),
 					array_map(
-						fn ( $value ) => $parserOutput->getCategorySortKey( $value ) ?? '',
+						static fn ( $value ) => $parserOutput->getCategorySortKey( $value ) ?? '',
 						$parserOutput->getCategoryNames()
 					)
 				);

diff --git a/includes/Parse.php b/includes/Parse.php
@@ -198,9 +198,9 @@ public function parse( $input, Parser $parser, &$reset, &$eliminate, $isParserTa
 			$calcRows = true;
 		}
 
-		/*********/
+		/***/
 		/* Query */
-		/*********/
+		/***/
 		try {
 			$query = new Query( $this->parameters );
 

diff --git a/maintenance/CreateTemplate.php b/maintenance/CreateTemplate.php
@@ -7,9 +7,7 @@
 
 use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Maintenance\LoggedUpdateMaintenance;
-use MediaWiki\MediaWikiServices;
 use MediaWiki\Revision\SlotRecord;
-use MediaWiki\Title\Title;
 use MediaWiki\User\User;
 
 class CreateTemplate extends LoggedUpdateMaintenance {
@@ -45,12 +43,12 @@ protected function updateSkippedMessage(): string {
 	 * @return bool
 	 */
 	protected function doDBUpdates(): bool {
-		$title = Title::newFromText( 'Template:Extension DPL' );
+		$title = $this->getServiceContainer()->getTitleFactory()
+			->newFromText( 'Template:Extension DPL' );
 
 		// Make sure template does not already exist
 		if ( !$title->exists() ) {
-			$services = MediaWikiServices::getInstance();
-			$wikiPageFactory = $services->getWikiPageFactory();
+			$wikiPageFactory = $this->getServiceContainer()->getWikiPageFactory();
 			$page = $wikiPageFactory->newFromTitle( $title );
 
 			$updater = $page->newPageUpdater( User::newSystemUser( 'DynamicPageList3 extension' ) );