From 7e9885793d94d51252d319b2b2c62180b120a64b Mon Sep 17 00:00:00 2001
From: Andre Klapper <a9016009@gmx.de>
Date: Sat, 26 Oct 2024 15:06:43 +0200
Subject: [PATCH] Use explicit nullable type on parameter arguments (for PHP
 8.4)

Implicitly marking parameter $... as nullable is deprecated in PHP
8.4. The explicit nullable type must be used instead.

Bug: T376276
Change-Id: If9163b2bcdc105555ba3e4ed8bca651dbe0ac1bb
---
 .phpcs.xml                       | 4 +---
 tests/phpunit/LintUpdateTest.php | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.phpcs.xml b/.phpcs.xml
index 5d334a8b..eddb6dc8 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <ruleset>
-	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
-		<exclude name="MediaWiki.Usage.NullableType.ExplicitNullableTypes" />
-	</rule>
+	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki" />
 	<file>.</file>
 	<arg name="extensions" value="php" />
 	<arg name="encoding" value="UTF-8" />
diff --git a/tests/phpunit/LintUpdateTest.php b/tests/phpunit/LintUpdateTest.php
index 5fdbf53c..a6927528 100644
--- a/tests/phpunit/LintUpdateTest.php
+++ b/tests/phpunit/LintUpdateTest.php
@@ -190,7 +190,7 @@ class LintUpdateTest extends MediaWikiIntegrationTestCase {
 		$this->assertSame( 1, $hookCalled );
 	}
 
-	private function newRenderedRevision( WikiPage $page = null, RevisionRecord $rev = null ) {
+	private function newRenderedRevision( ?WikiPage $page = null, ?RevisionRecord $rev = null ) {
 		$page = $this->getExistingTestPage();
 		$title = $page->getTitle();