SlevomatCodingStandard.PHP.RequireExplicitAssertionSniff: Fixed broke…

…n fixer when "enableAdvancedStringTypes" is enabled
slevomat · Sep 23, 2022 · 971f489 · 971f489
1 parent a52720f
commit 971f489
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/SlevomatCodingStandard/Sniffs/PHP/RequireExplicitAssertionSniff.php b/SlevomatCodingStandard/Sniffs/PHP/RequireExplicitAssertionSniff.php
@@ -443,14 +443,17 @@ private function createConditions(string $variableName, TypeNode $typeNode): arr
 			}
 		}
 
-		if ($this->enableAdvancedStringTypes) {
+		if (
+			$this->enableAdvancedStringTypes
+			&& in_array($typeNode->name, ['non-empty-string', 'callable-string', 'numeric-string'], true)
+		) {
 			$conditions = [sprintf('\is_string(%s)', $variableName)];
 
 			if ($typeNode->name === 'non-empty-string') {
 				$conditions[] = sprintf("%s !== ''", $variableName);
 			} elseif ($typeNode->name === 'callable-string') {
 				$conditions[] = sprintf('\is_callable(%s)', $variableName);
-			} elseif ($typeNode->name === 'numeric-string') {
+			} else {
 				$conditions[] = sprintf('\is_numeric(%s)', $variableName);
 			}
 

diff --git a/tests/Sniffs/PHP/RequireExplicitAssertionSniffTest.php b/tests/Sniffs/PHP/RequireExplicitAssertionSniffTest.php
@@ -99,11 +99,12 @@ public function testAdvancedStringTypesErrors(): void
 			'enableAdvancedStringTypes' => true,
 		]);
 
-		self::assertSame(3, $report->getErrorCount());
+		self::assertSame(4, $report->getErrorCount());
 
 		self::assertSniffError($report, 3, RequireExplicitAssertionSniff::CODE_REQUIRED_EXPLICIT_ASSERTION);
 		self::assertSniffError($report, 6, RequireExplicitAssertionSniff::CODE_REQUIRED_EXPLICIT_ASSERTION);
 		self::assertSniffError($report, 9, RequireExplicitAssertionSniff::CODE_REQUIRED_EXPLICIT_ASSERTION);
+		self::assertSniffError($report, 12, RequireExplicitAssertionSniff::CODE_REQUIRED_EXPLICIT_ASSERTION);
 
 		self::assertAllFixedInFile($report);
 	}

diff --git a/tests/Sniffs/PHP/data/requireExplicitAssertionAdvancedStringTypesErrors.fixed.php b/tests/Sniffs/PHP/data/requireExplicitAssertionAdvancedStringTypesErrors.fixed.php
@@ -8,3 +8,6 @@
 
 $c = '100';
 \assert(\is_string($c) && \is_numeric($c));
+
+$d = null;
+\assert($d instanceof SomeClass || $d === null);
diff --git a/tests/Sniffs/PHP/data/requireExplicitAssertionAdvancedStringTypesErrors.php b/tests/Sniffs/PHP/data/requireExplicitAssertionAdvancedStringTypesErrors.php
@@ -8,3 +8,6 @@
 
 /** @var numeric-string $c */
 $c = '100';
+
+/** @var SomeClass|null $d */
+$d = null;