WIP / use do/while

Author: jrfnl

.phpcs.xml.dist

@@ -68,6 +68,7 @@
 		<exclude name="PHPCompatibility.Constants.NewConstants.t_coalesceFound"/>
 		<exclude name="PHPCompatibility.Constants.NewConstants.t_coalesce_equalFound"/>
 		<exclude name="PHPCompatibility.Constants.NewConstants.t_yield_fromFound"/>
+		<exclude name="PHPCompatibility.Constants.NewConstants.t_readonlyFound"/>
 	</rule>
 
 	<!-- Enforce PSR1 compatible namespaces. -->

WordPress/Sniffs/Security/EscapeOutputSniff.php

@@ -216,41 +216,35 @@ public function process_token( $stackPtr ) {
 
 			case \T_THROW:
 				// Find the open parentheses, while stepping over the exception creation tokens.
-				$ignore               = Tokens::$emptyTokens;
-				$ignore              += Collections::namespacedNameTokens();
-				$ignore              += Collections::functionCallTokens();
-				$ignore              += Collections::objectOperators();
-				$ignore[ T_READONLY ] = T_READONLY;
-
-				$next_relevant = $this->phpcsFile->findNext( $ignore, ( $stackPtr + 1 ), null, true );
-				if ( false === $next_relevant ) {
-					return;
-				}
-
-				if ( \T_NEW === $this->tokens[ $next_relevant ]['code'] ) {
+				$ignore                = Tokens::$emptyTokens;
+				$ignore               += Collections::namespacedNameTokens();
+				$ignore               += Collections::functionCallTokens();
+				$ignore               += Collections::objectOperators();
+				$ignore[ \T_READONLY ] = \T_READONLY;
+
+				$next_relevant = $stackPtr;
+				do {
 					$next_relevant = $this->phpcsFile->findNext( $ignore, ( $next_relevant + 1 ), null, true );
 					if ( false === $next_relevant ) {
 						return;
 					}
-				}
 
-				// Skip over attribute declarations when searching for the open parenthesis.
-				while ( \T_ATTRIBUTE === $this->tokens[ $next_relevant ]['code'] ) {
-					if ( isset( $this->tokens[ $next_relevant ]['attribute_closer'] ) === false ) {
-						return;
+					if ( \T_NEW === $this->tokens[ $next_relevant ]['code'] ) {
+						continue;
 					}
 
-					$next_relevant = $this->phpcsFile->findNext(
-						$ignore,
-						( $this->tokens[ $next_relevant ]['attribute_closer'] + 1 ),
-						null,
-						true
-					);
+					// Skip over attribute declarations when searching for the open parenthesis.
+					if ( \T_ATTRIBUTE === $this->tokens[ $next_relevant ]['code'] ) {
+						if ( isset( $this->tokens[ $next_relevant ]['attribute_closer'] ) === false ) {
+							return;
+						}
 
-					if ( false === $next_relevant ) {
-						return;
+						$next_relevant = $this->tokens[ $next_relevant ]['attribute_closer'];
+						continue;
 					}
-				}
+
+					break;
+				} while ( true );
 
 				if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $next_relevant ]['code']
 					|| isset( $this->tokens[ $next_relevant ]['parenthesis_closer'] ) === false