NullableTypeSniff: 'mixed' is already nullable

The mixed type (PHP 8+) already includes 'null'. So trying to fix that to '?mixed' fails with a type error. Bug: T378552 Change-Id: I8e3034888942ed398d6459f45bc3404d358fc289
wikimedia · Dec 9, 2024 · 4621920 · 4621920
1 parent fd6ecb5
commit 4621920
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/MediaWiki/Sniffs/Usage/NullableTypeSniff.php b/MediaWiki/Sniffs/Usage/NullableTypeSniff.php
@@ -45,6 +45,7 @@ public function process( File $phpcsFile, $stackPtr ) {
 		foreach ( $params as $param ) {
 			if (
 				$param['type_hint'] &&
+				$param['type_hint'] !== 'mixed' &&
 				$param['nullable_type'] === false &&
 				array_key_exists( 'default', $param ) &&
 				$param['default'] === 'null'

diff --git a/MediaWiki/Tests/files/Usage/nullable_type.php b/MediaWiki/Tests/files/Usage/nullable_type.php
@@ -38,6 +38,9 @@ public function testClosure(): void {
 	public function testArrowFunctions(): void {
 		$c = fn ( MyClass $x = null ) => $x;
 	}
+
+	public function testMixedDefaultsToNull( mixed $x = null ): void {
+	}
 }
 
 class PassedExamples {

diff --git a/MediaWiki/Tests/files/Usage/nullable_type.php.fixed b/MediaWiki/Tests/files/Usage/nullable_type.php.fixed
@@ -38,6 +38,9 @@ class FailedExamples {
 	public function testArrowFunctions(): void {
 		$c = fn ( ?MyClass $x = null ) => $x;
 	}
+
+	public function testMixedDefaultsToNull( mixed $x = null ): void {
+	}
 }
 
 class PassedExamples {