RequireExplicitAssertionSniff: Fixed fixer

Author: kukulich

SlevomatCodingStandard/Sniffs/PHP/RequireExplicitAssertionSniff.php

@@ -12,6 +12,7 @@
 use SlevomatCodingStandard\Helpers\Annotation\VariableAnnotation;
 use SlevomatCodingStandard\Helpers\AnnotationHelper;
 use SlevomatCodingStandard\Helpers\IndentationHelper;
+use SlevomatCodingStandard\Helpers\ScopeHelper;
 use SlevomatCodingStandard\Helpers\TokenHelper;
 use SlevomatCodingStandard\Helpers\TypeHintHelper;
 use function array_key_exists;
@@ -109,7 +110,7 @@ public function process(File $phpcsFile, $docCommentOpenPointer): void
 					continue;
 				}
 
-				$pointerToAddAssertion = TokenHelper::findNext($phpcsFile, T_SEMICOLON, $codePointer + 1);
+				$pointerToAddAssertion = $this->getNextSemicolonInSameScope($phpcsFile, $codePointer, $codePointer + 1);
 				$indentation = IndentationHelper::getIndentation($phpcsFile, $docCommentOpenPointer);
 
 			} elseif ($tokens[$codePointer]['code'] === T_LIST) {
@@ -120,7 +121,7 @@ public function process(File $phpcsFile, $docCommentOpenPointer): void
 					continue;
 				}
 
-				$pointerToAddAssertion = TokenHelper::findNext($phpcsFile, T_SEMICOLON, $codePointer + 1);
+				$pointerToAddAssertion = $this->getNextSemicolonInSameScope($phpcsFile, $codePointer, $codePointer + 1);
 				$indentation = IndentationHelper::getIndentation($phpcsFile, $docCommentOpenPointer);
 
 			} elseif ($tokens[$codePointer]['code'] === T_OPEN_SHORT_ARRAY) {
@@ -134,7 +135,7 @@ public function process(File $phpcsFile, $docCommentOpenPointer): void
 					continue;
 				}
 
-				$pointerToAddAssertion = TokenHelper::findNext($phpcsFile, T_SEMICOLON, $tokens[$codePointer]['bracket_closer'] + 1);
+				$pointerToAddAssertion = $this->getNextSemicolonInSameScope($phpcsFile, $codePointer, $tokens[$codePointer]['bracket_closer'] + 1);
 				$indentation = IndentationHelper::getIndentation($phpcsFile, $docCommentOpenPointer);
 
 			} else {
@@ -226,6 +227,24 @@ private function isValidTypeNode(TypeNode $typeNode): bool
 		return !in_array($typeNode->name, ['mixed', 'static'], true);
 	}
 
+	private function getNextSemicolonInSameScope(File $phpcsFile, int $scopePointer, int $searchAt): int
+	{
+		$semicolonPointer = null;
+
+		do {
+			$semicolonPointer = TokenHelper::findNext($phpcsFile, T_SEMICOLON, $searchAt);
+
+			if (ScopeHelper::isInSameScope($phpcsFile, $scopePointer, $semicolonPointer)) {
+				break;
+			}
+
+			$searchAt = $semicolonPointer + 1;
+
+		} while (true);
+
+		return $semicolonPointer;
+	}
+
 	/**
 	 * @param string $variableName
 	 * @param IdentifierTypeNode|ThisTypeNode|UnionTypeNode|IntersectionTypeNode $typeNode

tests/Sniffs/PHP/RequireExplicitAssertionSniffTest.php

@@ -17,7 +17,7 @@ public function testErrors(): void
 	{
 		$report = self::checkFile(__DIR__ . '/data/requireExplicitAssertionErrors.php');
 
-		self::assertSame(27, $report->getErrorCount());
+		self::assertSame(28, $report->getErrorCount());
 
 		self::assertSniffError($report, 3, RequireExplicitAssertionSniff::CODE_REQUIRED_EXPLICIT_ASSERTION);
 		self::assertSniffError($report, 6, RequireExplicitAssertionSniff::CODE_REQUIRED_EXPLICIT_ASSERTION);
@@ -46,6 +46,7 @@ public function testErrors(): void
 		self::assertSniffError($report, 96, RequireExplicitAssertionSniff::CODE_REQUIRED_EXPLICIT_ASSERTION);
 		self::assertSniffError($report, 97, RequireExplicitAssertionSniff::CODE_REQUIRED_EXPLICIT_ASSERTION);
 		self::assertSniffError($report, 102, RequireExplicitAssertionSniff::CODE_REQUIRED_EXPLICIT_ASSERTION);
+		self::assertSniffError($report, 109, RequireExplicitAssertionSniff::CODE_REQUIRED_EXPLICIT_ASSERTION);
 
 		self::assertAllFixedInFile($report);
 	}

tests/Sniffs/PHP/data/requireExplicitAssertionErrors.fixed.php

@@ -90,5 +90,12 @@ function () {
 	\assert($y2 === true);
 };
 
+function () {
+	$form = $this->formCreator->create(['inputs' => array_map(static function (Config $config): array {
+		return $config->toArray();
+	}, $this->config->inputs)]);
+	\assert($form instanceof Form);
+};
+
 $z = new ArrayObject();
 \assert($z instanceof \Traversable && $z instanceof \Countable);

tests/Sniffs/PHP/data/requireExplicitAssertionErrors.php

@@ -98,5 +98,12 @@ function () {
 	 */
 };
 
+function () {
+	/** @var Form $form */
+	$form = $this->formCreator->create(['inputs' => array_map(static function (Config $config): array {
+		return $config->toArray();
+	}, $this->config->inputs)]);
+};
+
 $z = new ArrayObject();
 /** @var \Traversable&\Countable $z */