Use explicit nullable type on parameter arguments

Implicitly marking parameter $... as nullable is deprecated in php8.4,
the explicit nullable type must be used instead

Created with autofix from Ide15839e98a6229c22584d1c1c88c690982e1d7a

Break one long line in SpecialPage.php

Bug: T376276
Change-Id: I807257b2ba1ab2744ab74d9572c9c3d3ac2a968e

5 files changed, 7 insertions, 7 deletions

diff --git a/includes/Settings/Config/ConfigBuilder.php b/includes/Settings/Config/ConfigBuilder.php
index c920cf3dadf2..02f26de84080 100644
--- a/includes/Settings/Config/ConfigBuilder.php
+++ b/includes/Settings/Config/ConfigBuilder.php
@@ -20,7 +20,7 @@ interface ConfigBuilder {
 	 * @param MergeStrategy|null $mergeStrategy strategy for merging array config values.
 	 * @return ConfigBuilder
 	 */
-	public function set( string $key, $value, MergeStrategy $mergeStrategy = null ): ConfigBuilder;
+	public function set( string $key, $value, ?MergeStrategy $mergeStrategy = null ): ConfigBuilder;
 
 	/**
 	 * Set all values in the array.
@@ -43,7 +43,7 @@ interface ConfigBuilder {
 	 * @param MergeStrategy|null $mergeStrategy strategy for merging array config values.
 	 * @return ConfigBuilder
 	 */
-	public function setDefault( string $key, $defaultValue, MergeStrategy $mergeStrategy = null ): ConfigBuilder;
+	public function setDefault( string $key, $defaultValue, ?MergeStrategy $mergeStrategy = null ): ConfigBuilder;
 
 	/**
 	 * Set defaults in a batch.
diff --git a/includes/Settings/Config/ConfigBuilderBase.php b/includes/Settings/Config/ConfigBuilderBase.php
index f91870cc580e..af134edec77c 100644
--- a/includes/Settings/Config/ConfigBuilderBase.php
+++ b/includes/Settings/Config/ConfigBuilderBase.php
@@ -14,7 +14,7 @@ abstract class ConfigBuilderBase implements ConfigBuilder {
 	public function set(
 		string $key,
 		$newValue,
-		MergeStrategy $mergeStrategy = null
+		?MergeStrategy $mergeStrategy = null
 	): ConfigBuilder {
 		if ( $mergeStrategy && $this->has( $key ) && is_array( $newValue ) ) {
 			$oldValue = $this->get( $key );
@@ -42,7 +42,7 @@ abstract class ConfigBuilderBase implements ConfigBuilder {
 	public function setDefault(
 		string $key,
 		$defaultValue,
-		MergeStrategy $mergeStrategy = null
+		?MergeStrategy $mergeStrategy = null
 	): ConfigBuilder {
 		if ( $this->has( $key ) ) {
 			if ( $mergeStrategy && $defaultValue && is_array( $defaultValue ) ) {
diff --git a/includes/Settings/SettingsBuilder.php b/includes/Settings/SettingsBuilder.php
index f36b86d503eb..39211cd32bc2 100644
--- a/includes/Settings/SettingsBuilder.php
+++ b/includes/Settings/SettingsBuilder.php
@@ -202,7 +202,7 @@ class SettingsBuilder {
 		ExtensionRegistry $extensionRegistry,
 		ConfigBuilder $configSink,
 		PhpIniSink $phpIniSink,
-		BagOStuff $cache = null
+		?BagOStuff $cache = null
 	) {
 		$this->baseDir = $baseDir;
 		$this->extensionRegistry = $extensionRegistry;
diff --git a/includes/Settings/SettingsBuilderException.php b/includes/Settings/SettingsBuilderException.php
index 3eb15121d81c..9fb5773fcbd6 100644
--- a/includes/Settings/SettingsBuilderException.php
+++ b/includes/Settings/SettingsBuilderException.php
@@ -20,7 +20,7 @@ class SettingsBuilderException extends RuntimeException implements INormalizedEx
 		string $normalizedMessage = '',
 		array $messageContext = [],
 		int $code = 0,
-		Throwable $previous = null
+		?Throwable $previous = null
 	) {
 		$this->normalizedMessage = $normalizedMessage;
 		$this->messageContext = $messageContext;
diff --git a/includes/Settings/Source/FileSource.php b/includes/Settings/Source/FileSource.php
index 3c81da144985..3c6bb81ca9fb 100644
--- a/includes/Settings/Source/FileSource.php
+++ b/includes/Settings/Source/FileSource.php
@@ -85,7 +85,7 @@ class FileSource implements Stringable, CacheableSource, SettingsIncludeLocator
 	 * @param string $path
 	 * @param SettingsFormat|null $format
 	 */
-	public function __construct( string $path, SettingsFormat $format = null ) {
+	public function __construct( string $path, ?SettingsFormat $format = null ) {
 		$this->path = $path;
 		$this->format = $format;
 	}