PreGetPosts: improve the isEarlyMainQueryCheck() method [2]

This adds a second unit test which is based on the actual code which originally triggered the error.

The error was caused by the code in question using inline control structures (without braces) for the early main query check.

After the previous fix, that code would now throw a false positive.

I've fixed this now by adding an additional check for a `return` statement straight after the parenthesis closer of the `if()` statement.

Fixes 499

Author: jrfnl

WordPressVIPMinimum/Sniffs/Hooks/PreGetPostsSniff.php

@@ -321,6 +321,18 @@ private function isEarlyMainQueryCheck( $stackPtr ) {
 
 		$owner = $this->tokens[ $nestedParenthesisEnd ]['parenthesis_owner'];
 		if ( isset( $this->tokens[ $owner ]['scope_opener'], $this->tokens[ $owner ]['scope_closer'] ) === false ) {
+			// This may be an inline control structure (no braces).
+			$next = $this->phpcsFile->findNext(
+				Tokens::$emptyTokens,
+				( $nestedParenthesisEnd + 1 ),
+				null,
+				true
+			);
+
+			if ( false !== $next && T_RETURN === $this->tokens[ $next ]['code'] ) {
+				return true;
+			}
+
 			return false;
 		}
 

WordPressVIPMinimum/Tests/Hooks/PreGetPostsUnitTest.inc

@@ -106,3 +106,13 @@ class undefined_index_issue_499 {
 		$wp_query->set( 'cat', '-5' );
 	}
 }
+
+add_action('pre_get_posts', 'inline_control_structures', 10, 1);
+
+function inline_control_structures( $query ) {
+	if( !$query->is_main_query() && !is_front_page()) return;
+	if(is_single() || is_search() || is_archive()) return;
+
+	$query->set('meta_query', 'foo');
+	return $query;
+}