Cleanup

kukulich · kukulich · commit d0d24176bb12 · 2018-08-24T15:13:23.000+02:00
diff --git a/SlevomatCodingStandard/Sniffs/Functions/UnusedParameterSniff.php b/SlevomatCodingStandard/Sniffs/Functions/UnusedParameterSniff.php
@@ -159,17 +159,15 @@ 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;
 			}
 
-			$isInSameScope = $tokens[$conditionPointer]['level'] === $functionScopeLevel;
-			break;
+			return $tokens[$conditionPointer]['level'] === $functionScopeLevel;
 		}
 
-		return $isInSameScope;
+		return false;
 	}
 
 	private function getSniffName(string $sniffName): string

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