Fixed "TypeHintDeclaration with disabled enableNullableTypeHints does not work with optional parameters"

Author: kukulich

SlevomatCodingStandard/Sniffs/TypeHints/TypeHintDeclarationSniff.php

@@ -246,7 +246,7 @@ private function checkParametersTypeHints(\PHP_CodeSniffer_File $phpcsFile, int
 					$phpcsFile->fixer->addContentBefore($beforeParameterPointer, sprintf('%s%s ', ($nullableParameterTypeHint ? '?' : ''), $parameterTypeHint));
 				} else {
 					$phpcsFile->fixer->addContentBefore($beforeParameterPointer, sprintf('%s ', $parameterTypeHint));
-					if ($nullableParameterTypeHint) {
+					if ($nullableParameterTypeHint && $tokens[TokenHelper::findNextEffective($phpcsFile, $parameterPointer + 1)]['code'] !== T_EQUAL) {
 						$phpcsFile->fixer->addContent($parameterPointer, ' = null');
 					}
 				}

tests/Sniffs/TypeHints/data/fixableParameterTypeHintsWithDisabledNullableTypeHints.fixed.php

@@ -56,6 +56,14 @@ function oneWithoutTypeHintAndWithAnnotationWithoutParameterName(string $a, bool
 {
 }
 
+/**
+ * @param string|null $a
+ */
+function optionalWithoutTypeHint(string $a = null)
+{
+
+}
+
 class Foo
 {
 
@@ -111,4 +119,12 @@ public function oneWithoutTypeHintAndWithAnnotationWithoutParameterName(string $
 	{
 	}
 
+	/**
+	 * @param string|null $a
+	 */
+	public function optionalWithoutTypeHint(string $a = null)
+	{
+
+	}
+
 }

tests/Sniffs/TypeHints/data/fixableParameterTypeHintsWithDisabledNullableTypeHints.php

@@ -56,6 +56,14 @@ function oneWithoutTypeHintAndWithAnnotationWithoutParameterName(string $a, $b,
 {
 }
 
+/**
+ * @param string|null $a
+ */
+function optionalWithoutTypeHint($a = null)
+{
+
+}
+
 class Foo
 {
 
@@ -111,4 +119,12 @@ public function oneWithoutTypeHintAndWithAnnotationWithoutParameterName(string $
 	{
 	}
 
+	/**
+	 * @param string|null $a
+	 */
+	public function optionalWithoutTypeHint($a = null)
+	{
+
+	}
+
 }