Merge pull request #783 from Automattic/fix/alwaysreturninfilter-remo…

…ve-redundant-condition
Automattic · Aug 25, 2023 · 5f34bbe · 5f34bbe
2 parents 211e718 + 92fdfd2
commit 5f34bbe
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/WordPressVIPMinimum/Sniffs/Hooks/AlwaysReturnInFilterSniff.php b/WordPressVIPMinimum/Sniffs/Hooks/AlwaysReturnInFilterSniff.php
@@ -223,13 +223,10 @@ private function processFunctionBody( $stackPtr ) {
 			$functionBodyScopeEnd
 		);
 
-		$insideIfConditionalReturn = 0;
-		$outsideConditionalReturn  = 0;
+		$outsideConditionalReturn = 0;
 
 		while ( $returnTokenPtr ) {
-			if ( $this->isInsideIfConditonal( $returnTokenPtr ) ) {
-				++$insideIfConditionalReturn;
-			} else {
+			if ( $this->isInsideIfConditonal( $returnTokenPtr ) === false ) {
 				++$outsideConditionalReturn;
 			}
 			if ( $this->isReturningVoid( $returnTokenPtr ) ) {
@@ -244,11 +241,10 @@ private function processFunctionBody( $stackPtr ) {
 			);
 		}
 
-		if ( $insideIfConditionalReturn >= 0 && $outsideConditionalReturn === 0 ) {
+		if ( $outsideConditionalReturn === 0 ) {
 			$message = 'Please, make sure that a callback to `%s` filter is always returning some value.';
 			$data    = [ $filterName ];
 			$this->phpcsFile->addError( $message, $functionBodyScopeStart, 'MissingReturnStatement', $data );
-
 		}
 	}