Revert "Cleanup"

kukulich · kukulich · commit 51be3826dc21 · 2018-08-25T01:06:51.000+02:00
This reverts commit d0d2417.
diff --git a/SlevomatCodingStandard/Sniffs/Functions/UnusedParameterSniff.php b/SlevomatCodingStandard/Sniffs/Functions/UnusedParameterSniff.php
@@ -159,15 +159,17 @@ private function isInSameScope(File $phpcsFile, int $parameterPointer, int $poin
 		$tokens = $phpcsFile->getTokens();
 
 		$functionScopeLevel = $tokens[$parameterPointer]['level'];
+		$isInSameScope = false;
 		foreach (array_reverse($tokens[$pointer]['conditions'], true) as $conditionPointer => $conditionTokenCode) {
 			if (!in_array($conditionTokenCode, TokenHelper::$functionTokenCodes, true)) {
 				continue;
 			}
 
-			return $tokens[$conditionPointer]['level'] === $functionScopeLevel;
+			$isInSameScope = $tokens[$conditionPointer]['level'] === $functionScopeLevel;
+			break;
 		}
 
-		return false;
+		return $isInSameScope;
 	}
 
 	private function getSniffName(string $sniffName): string

Original file line number	Diff line number	Diff line change
`@@ -159,15 +159,17 @@ private function isInSameScope(File $phpcsFile, int $parameterPointer, int $poin`
`159`	`159`	`$tokens = $phpcsFile->getTokens();`
`160`	`160`
`161`	`161`	`$functionScopeLevel = $tokens[$parameterPointer]['level'];`
	`162`	`+ $isInSameScope = false;`
`162`	`163`	`foreach (array_reverse($tokens[$pointer]['conditions'], true) as $conditionPointer => $conditionTokenCode) {`
`163`	`164`	`if (!in_array($conditionTokenCode, TokenHelper::$functionTokenCodes, true)) {`
`164`	`165`	`continue;`
`165`	`166`	`}`
`166`	`167`
`167`		`- return $tokens[$conditionPointer]['level'] === $functionScopeLevel;`
	`168`	`+ $isInSameScope = $tokens[$conditionPointer]['level'] === $functionScopeLevel;`
	`169`	`+ break;`
`168`	`170`	`}`
`169`	`171`
`170`		`- return false;`
	`172`	`+ return $isInSameScope;`
`171`	`173`	`}`
`172`	`174`
`173`	`175`	`private function getSniffName(string $sniffName): string`