NullableTypeSniff: Also check closure and arrow functions

Bug: T362014 Follow-Up: Ide15839e98a6229c22584d1c1c88c690982e1d7a Change-Id: I6581b9a41e5c7993b053eee6f962e5675dccb0c2
wikimedia · Oct 24, 2024 · 21db407 · 21db407
1 parent 477ac00
commit 21db407
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 2 deletions.
diff --git a/MediaWiki/Sniffs/Usage/NullableTypeSniff.php b/MediaWiki/Sniffs/Usage/NullableTypeSniff.php
@@ -31,7 +31,7 @@ class NullableTypeSniff implements Sniff {
 	 * @inheritDoc
 	 */
 	public function register(): array {
-		return [ T_FUNCTION ];
+		return [ T_FUNCTION, T_CLOSURE, T_FN ];
 	}
 
 	/**

diff --git a/MediaWiki/Tests/files/Usage/nullable_type.php b/MediaWiki/Tests/files/Usage/nullable_type.php
@@ -28,6 +28,16 @@ public function nullableAfterRequired2( $foo, MyClass $x = null, MyClass $y = nu
 	 */
 	public function nullableOnly( MyClass $x = null ) {
 	}
+
+	public function testClosure(): void {
+		$c = static function ( MyClass $x = null ) {
+			return $x;
+		};
+	}
+
+	public function testArrowFunctions(): void {
+		$c = fn ( MyClass $x = null ) => $x;
+	}
 }
 
 class PassedExamples {
@@ -45,4 +55,14 @@ public function genericNullable( ?MyClass $x, $foo ) {
 	 */
 	public function docOptionalArgNullable( $foo, ?MyClass $x ) {
 	}
+
+	public function testClosure(): void {
+		$c = static function ( ?MyClass $x ) {
+			return $x;
+		};
+	}
+
+	public function testArrowFunctions(): void {
+		$c = fn ( ?MyClass $x ) => $x;
+	}
 }
diff --git a/MediaWiki/Tests/files/Usage/nullable_type.php.expect b/MediaWiki/Tests/files/Usage/nullable_type.php.expect
@@ -10,4 +10,8 @@
     |       |     (MediaWiki.Usage.NullableType.ExplicitNullableTypes)
  29 | ERROR | [x] Use PHP 8.4 compatible syntax for explicit nullable types ("?MyClass $x = null")
     |       |     (MediaWiki.Usage.NullableType.ExplicitNullableTypes)
-PHPCBF CAN FIX THE 5 MARKED SNIFF VIOLATIONS AUTOMATICALLY
+ 33 | ERROR | [x] Use PHP 8.4 compatible syntax for explicit nullable types ("?MyClass $x = null")
+    |       |     (MediaWiki.Usage.NullableType.ExplicitNullableTypes)
+ 39 | ERROR | [x] Use PHP 8.4 compatible syntax for explicit nullable types ("?MyClass $x = null")
+    |       |     (MediaWiki.Usage.NullableType.ExplicitNullableTypes)
+PHPCBF CAN FIX THE 7 MARKED SNIFF VIOLATIONS AUTOMATICALLY
diff --git a/MediaWiki/Tests/files/Usage/nullable_type.php.fixed b/MediaWiki/Tests/files/Usage/nullable_type.php.fixed
@@ -28,6 +28,16 @@ class FailedExamples {
 	 */
 	public function nullableOnly( ?MyClass $x = null ) {
 	}
+
+	public function testClosure(): void {
+		$c = static function ( ?MyClass $x = null ) {
+			return $x;
+		};
+	}
+
+	public function testArrowFunctions(): void {
+		$c = fn ( ?MyClass $x = null ) => $x;
+	}
 }
 
 class PassedExamples {
@@ -45,4 +55,14 @@ class PassedExamples {
 	 */
 	public function docOptionalArgNullable( $foo, ?MyClass $x ) {
 	}
+
+	public function testClosure(): void {
+		$c = static function ( ?MyClass $x ) {
+			return $x;
+		};
+	}
+
+	public function testArrowFunctions(): void {
+		$c = fn ( ?MyClass $x ) => $x;
+	}
 }