Skip to content

Read the conditions once in AlwaysReturnInFilter's isInsideIfConditonal() #905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GaryJones merged 1 commit into from
Oct 9, 2026
Merged

Read the conditions once in AlwaysReturnInFilter's isInsideIfConditonal() #905

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 4 additions & 19 deletions WordPressVIPMinimum/Sniffs/Hooks/AlwaysReturnInFilterSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,29 +269,14 @@ private function isInsideIfConditonal( $stackPtr ) {

// This check helps us in situations a class or a function is wrapped
// inside a conditional as a whole. Eg.: inside `class_exists`.
if ( end( $this->tokens[ $stackPtr ]['conditions'] ) === T_FUNCTION ) {
return false;
}

// Similar case may be a conditional closure.
if ( end( $this->tokens[ $stackPtr ]['conditions'] ) === T_CLOSURE ) {
$conditions = $this->tokens[ $stackPtr ]['conditions'];
$innermost = end( $conditions );
if ( $innermost === T_FUNCTION || $innermost === T_CLOSURE ) {
return false;
}

// Loop over the array of conditions and look for an IF.
reset( $this->tokens[ $stackPtr ]['conditions'] );

if ( array_key_exists( 'conditions', $this->tokens[ $stackPtr ] ) === true
&& is_array( $this->tokens[ $stackPtr ]['conditions'] ) === true
&& empty( $this->tokens[ $stackPtr ]['conditions'] ) === false
) {
foreach ( $this->tokens[ $stackPtr ]['conditions'] as $tokenPtr => $tokenCode ) {
if ( $this->tokens[ $stackPtr ]['conditions'][ $tokenPtr ] === T_IF ) {
return true;
}
}
}
return false;
return in_array( T_IF, $conditions, true );
}

/**
Expand Down
Loading