Merge branch 'main' into phan

Author: Universal-Omega

includes/HookHandlers/Main.php

@@ -21,31 +21,18 @@
 
 class Main implements ArticleViewHeaderHook {
 
-	private Config $config;
-	private JobQueueGroupFactory $jobQueueGroupFactory;
-	private LanguageNameUtils $languageNameUtils;
-	private MachineTranslationLanguageFetcher $machineTranslationLanguageFetcher;
-	private MachineTranslationUtils $machineTranslationUtils;
-	private MessageLocalizer $messageLocalizer;
-	private TitleFactory $titleFactory;
-	private WikiPageFactory $wikiPageFactory;
+	private readonly Config $config;
+	private readonly MessageLocalizer $messageLocalizer;
 
 	public function __construct(
 		ConfigFactory $configFactory,
-		JobQueueGroupFactory $jobQueueGroupFactory,
-		LanguageNameUtils $languageNameUtils,
-		MachineTranslationLanguageFetcher $machineTranslationLanguageFetcher,
-		MachineTranslationUtils $machineTranslationUtils,
-		TitleFactory $titleFactory,
-		WikiPageFactory $wikiPageFactory
+		private readonly JobQueueGroupFactory $jobQueueGroupFactory,
+		private readonly LanguageNameUtils $languageNameUtils,
+		private readonly MachineTranslationLanguageFetcher $machineTranslationLanguageFetcher,
+		private readonly MachineTranslationUtils $machineTranslationUtils,
+		private readonly TitleFactory $titleFactory,
+		private readonly WikiPageFactory $wikiPageFactory
 	) {
-		$this->jobQueueGroupFactory = $jobQueueGroupFactory;
-		$this->languageNameUtils = $languageNameUtils;
-		$this->machineTranslationLanguageFetcher = $machineTranslationLanguageFetcher;
-		$this->machineTranslationUtils = $machineTranslationUtils;
-		$this->titleFactory = $titleFactory;
-		$this->wikiPageFactory = $wikiPageFactory;
-
 		$this->config = $configFactory->makeConfig( 'MachineTranslation' );
 		$this->messageLocalizer = RequestContext::getMain();
 	}

includes/Jobs/MachineTranslationJob.php

@@ -12,24 +12,22 @@ class MachineTranslationJob extends Job {
 
 	public const JOB_NAME = 'MachineTranslationJob';
 
-	private Config $config;
-	private MachineTranslationUtils $machineTranslationUtils;
+	private readonly Config $config;
 
-	private string $cacheKey;
-	private string $content;
-	private string $source;
-	private string $target;
-	private string $titleText;
+	private readonly string $cacheKey;
+	private readonly string $content;
+	private readonly string $source;
+	private readonly string $target;
+	private readonly string $titleText;
 
 	public function __construct(
 		array $params,
 		ConfigFactory $configFactory,
-		MachineTranslationUtils $machineTranslationUtils
+		private readonly MachineTranslationUtils $machineTranslationUtils
 	) {
 		parent::__construct( self::JOB_NAME, $params );
 
 		$this->config = $configFactory->makeConfig( 'MachineTranslation' );
-		$this->machineTranslationUtils = $machineTranslationUtils;
 
 		$this->cacheKey = $params['cachekey'];
 		$this->content = $params['content'];

includes/Services/MachineTranslationLanguageFetcher.php

@@ -17,20 +17,12 @@ class MachineTranslationLanguageFetcher {
 		MainConfigNames::HTTPProxy,
 	];
 
-	private HttpRequestFactory $httpRequestFactory;
-	private MachineTranslationUtils $machineTranslationUtils;
-	private ServiceOptions $options;
-
 	public function __construct(
-		HttpRequestFactory $httpRequestFactory,
-		MachineTranslationUtils $machineTranslationUtils,
-		ServiceOptions $options
+		private readonly HttpRequestFactory $httpRequestFactory,
+		private readonly MachineTranslationUtils $machineTranslationUtils,
+		private readonly ServiceOptions $options
 	) {
 		$options->assertRequiredOptions( self::CONSTRUCTOR_OPTIONS );
-
-		$this->httpRequestFactory = $httpRequestFactory;
-		$this->machineTranslationUtils = $machineTranslationUtils;
-		$this->options = $options;
 	}
 
 	public function getSupportedLanguages(): array {

includes/Services/MachineTranslationUtils.php

@@ -23,20 +23,12 @@ class MachineTranslationUtils {
 	public const USER_AGENT = 'MachineTranslation, MediaWiki extension ' .
 		'(https://github.com/miraheze/MachineTranslation)';
 
-	private HttpRequestFactory $httpRequestFactory;
-	private ObjectCacheFactory $objectCacheFactory;
-	private ServiceOptions $options;
-
 	public function __construct(
-		HttpRequestFactory $httpRequestFactory,
-		ObjectCacheFactory $objectCacheFactory,
-		ServiceOptions $options
+		private readonly HttpRequestFactory $httpRequestFactory,
+		private readonly ObjectCacheFactory $objectCacheFactory,
+		private readonly ServiceOptions $options
 	) {
 		$options->assertRequiredOptions( self::CONSTRUCTOR_OPTIONS );
-
-		$this->httpRequestFactory = $httpRequestFactory;
-		$this->objectCacheFactory = $objectCacheFactory;
-		$this->options = $options;
 	}
 
 	public function callTranslation(