NullableTypeForNullDefaultValueSniff: Fixed false positive

kukulich · kukulich · commit e7286b9a516f · 2021-04-14T10:49:57.000+02:00
diff --git a/SlevomatCodingStandard/Sniffs/TypeHints/NullableTypeForNullDefaultValueSniff.php b/SlevomatCodingStandard/Sniffs/TypeHints/NullableTypeForNullDefaultValueSniff.php
@@ -97,7 +97,7 @@ public function process(File $phpcsFile, $functionPointer): void
 				continue;
 			}
 
-			if (preg_match('~(?:^|\|)null(?:\||$)~i', $typeHint) === 1) {
+			if (preg_match('~(?:^|(?:\|\s*))null(?:(?:\s*\|)|$)~i', $typeHint) === 1) {
 				continue;
 			}
 
diff --git a/tests/Sniffs/TypeHints/data/nullableTypeForNullDefaultValueNoErrors.php b/tests/Sniffs/TypeHints/data/nullableTypeForNullDefaultValueNoErrors.php
@@ -80,6 +80,14 @@ public function unionTypeHint(string|null $union = null)
 	{
 	}
 
+	public function unionTypeHintWithSpace(string | null $union = null)
+	{
+	}
+
+	public function unionTypeHintWithSpaceInTheMiddle(string|null |int $union = null)
+	{
+	}
+
 }
 
 array_map(

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public function process(File $phpcsFile, $functionPointer): void`
`97`	`97`	`continue;`
`98`	`98`	`}`
`99`	`99`
`100`		`- if (preg_match('~(?:^\|\\|)null(?:\\|\|$)~i', $typeHint) === 1) {`
	`100`	`+ if (preg_match('~(?:^\|(?:\\|\s))null(?:(?:\s\\|)\|$)~i', $typeHint) === 1) {`
`101`	`101`	`continue;`
`102`	`102`	`}`
`103`	`103`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,14 @@ public function unionTypeHint(string\|null $union = null)`
`80`	`80`	`{`
`81`	`81`	`}`
`82`	`82`
	`83`	`+ public function unionTypeHintWithSpace(string \| null $union = null)`
	`84`	`+ {`
	`85`	`+ }`
	`86`	`+`
	`87`	`+ public function unionTypeHintWithSpaceInTheMiddle(string\|null \|int $union = null)`
	`88`	`+ {`
	`89`	`+ }`
	`90`	`+`
`83`	`91`	`}`
`84`	`92`
`85`	`93`	`array_map(`