gravityview / GravityView

vendor/wp-coding-standards/wpcs/WordPress/Sniffs/WP/CapitalPDangitSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -270,7 +270,7 @@
 	/**
 	 * Retrieve a list of misspellings based on an array of matched variations on the target word.
 	 *
-	 * @param array $match_stack Array of matched variations of the target word.
+	 * @param string[] $match_stack Array of matched variations of the target word.
 	 * @return array Array containing only the misspelled variants.
 	 */
 	protected function retrieve_misspellings( $match_stack ) {

Spacing +31 added lines, -31 removed lines

@@ -126,24 +126,24 @@ 
 		 * The return values skip to the end of the array.
 		 * This prevents the sniff "hanging" on very long configuration arrays.
 		 */
-		if ( \T_OPEN_SHORT_ARRAY === $this->tokens[ $stackPtr ]['code'] && isset( $this->tokens[ $stackPtr ]['bracket_closer'] ) ) {
-			return $this->tokens[ $stackPtr ]['bracket_closer'];
-		} elseif ( \T_ARRAY === $this->tokens[ $stackPtr ]['code'] && isset( $this->tokens[ $stackPtr ]['parenthesis_closer'] ) ) {
-			return $this->tokens[ $stackPtr ]['parenthesis_closer'];
+		if ( \T_OPEN_SHORT_ARRAY === $this->tokens[ $stackPtr ][ 'code' ] && isset( $this->tokens[ $stackPtr ][ 'bracket_closer' ] ) ) {
+			return $this->tokens[ $stackPtr ][ 'bracket_closer' ];
+		} elseif ( \T_ARRAY === $this->tokens[ $stackPtr ][ 'code' ] && isset( $this->tokens[ $stackPtr ][ 'parenthesis_closer' ] ) ) {
+			return $this->tokens[ $stackPtr ][ 'parenthesis_closer' ];
 		}
 
 		/*
 		 * Deal with misspellings in class/interface/trait names.
 		 * These are not auto-fixable, but need the attention of a developer.
 		 */
-		if ( isset( Tokens::$ooScopeTokens[ $this->tokens[ $stackPtr ]['code'] ] ) ) {
+		if ( isset( Tokens::$ooScopeTokens[ $this->tokens[ $stackPtr ][ 'code' ] ] ) ) {
 			$classname = $this->phpcsFile->getDeclarationName( $stackPtr );
 			if ( empty( $classname ) ) {
 				return;
 			}
 
 			if ( preg_match_all( self::WP_CLASSNAME_REGEX, $classname, $matches, \PREG_PATTERN_ORDER ) > 0 ) {
-				$mispelled = $this->retrieve_misspellings( $matches[1] );
+				$mispelled = $this->retrieve_misspellings( $matches[ 1 ] );
 
 				if ( ! empty( $mispelled ) ) {
 					$this->phpcsFile->addWarning(
@@ -163,14 +163,14 @@ 
 		 */
 
 		// Ignore content of docblock @link tags.
-		if ( \T_DOC_COMMENT_STRING === $this->tokens[ $stackPtr ]['code']
-			|| \T_DOC_COMMENT === $this->tokens[ $stackPtr ]['code']
+		if ( \T_DOC_COMMENT_STRING === $this->tokens[ $stackPtr ][ 'code' ]
+			|| \T_DOC_COMMENT === $this->tokens[ $stackPtr ][ 'code' ]
 		) {
 
 			$comment_start = $this->phpcsFile->findPrevious( \T_DOC_COMMENT_OPEN_TAG, ( $stackPtr - 1 ) );
 			if ( false !== $comment_start ) {
 				$comment_tag = $this->phpcsFile->findPrevious( \T_DOC_COMMENT_TAG, ( $stackPtr - 1 ), $comment_start );
-				if ( false !== $comment_tag && '@link' === $this->tokens[ $comment_tag ]['content'] ) {
+				if ( false !== $comment_tag && '@link' === $this->tokens[ $comment_tag ][ 'content' ] ) {
 					// @link tag, so ignore.
 					return;
 				}
@@ -178,11 +178,11 @@ 
 		}
 
 		// Ignore any text strings which are array keys `$var['key']` as this is a false positive in 80% of all cases.
-		if ( \T_CONSTANT_ENCAPSED_STRING === $this->tokens[ $stackPtr ]['code'] ) {
+		if ( \T_CONSTANT_ENCAPSED_STRING === $this->tokens[ $stackPtr ][ 'code' ] ) {
 			$prevToken = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true, null, true );
-			if ( false !== $prevToken && \T_OPEN_SQUARE_BRACKET === $this->tokens[ $prevToken ]['code'] ) {
+			if ( false !== $prevToken && \T_OPEN_SQUARE_BRACKET === $this->tokens[ $prevToken ][ 'code' ] ) {
 				$nextToken = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true, null, true );
-				if ( false !== $nextToken && \T_CLOSE_SQUARE_BRACKET === $this->tokens[ $nextToken ]['code'] ) {
+				if ( false !== $nextToken && \T_CLOSE_SQUARE_BRACKET === $this->tokens[ $nextToken ][ 'code' ] ) {
 					return;
 				}
 			}
@@ -202,44 +202,44 @@ 
 			\T_OPEN_CURLY_BRACKET,
 		);
 		$maybe_const = $this->phpcsFile->findPrevious( $stop_points, ( $stackPtr - 1 ) );
-		if ( false !== $maybe_const && \T_CONST === $this->tokens[ $maybe_const ]['code'] ) {
+		if ( false !== $maybe_const && \T_CONST === $this->tokens[ $maybe_const ][ 'code' ] ) {
 			return;
 		}
 
-		$content = $this->tokens[ $stackPtr ]['content'];
+		$content = $this->tokens[ $stackPtr ][ 'content' ];
 
 		if ( preg_match_all( self::WP_REGEX, $content, $matches, ( \PREG_PATTERN_ORDER | \PREG_OFFSET_CAPTURE ) ) > 0 ) {
 			/*
 			 * Prevent some typical false positives.
 			 */
-			if ( isset( $this->text_and_comment_tokens[ $this->tokens[ $stackPtr ]['code'] ] ) ) {
+			if ( isset( $this->text_and_comment_tokens[ $this->tokens[ $stackPtr ][ 'code' ] ] ) ) {
 				$offset = 0;
-				foreach ( $matches[1] as $key => $match_data ) {
-					$next_offset = ( $match_data[1] + \strlen( $match_data[0] ) );
+				foreach ( $matches[ 1 ] as $key => $match_data ) {
+					$next_offset = ( $match_data[ 1 ] + \strlen( $match_data[ 0 ] ) );
 
 					// Prevent matches on part of a URL.
-					if ( preg_match( '`http[s]?://[^\s<>\'"()]*' . preg_quote( $match_data[0], '`' ) . '`', $content, $discard, 0, $offset ) === 1 ) {
-						unset( $matches[1][ $key ] );
-					} elseif ( preg_match( '`[a-z]+=(["\'])' . preg_quote( $match_data[0], '`' ) . '\1`', $content, $discard, 0, $offset ) === 1 ) {
+					if ( preg_match( '`http[s]?://[^\s<>\'"()]*' . preg_quote( $match_data[ 0 ], '`' ) . '`', $content, $discard, 0, $offset ) === 1 ) {
+						unset( $matches[ 1 ][ $key ] );
+					} elseif ( preg_match( '`[a-z]+=(["\'])' . preg_quote( $match_data[ 0 ], '`' ) . '\1`', $content, $discard, 0, $offset ) === 1 ) {
 						// Prevent matches on html attributes like: `value="wordpress"`.
-						unset( $matches[1][ $key ] );
-					} elseif ( preg_match( '`\\\\\'' . preg_quote( $match_data[0], '`' ) . '\\\\\'`', $content, $discard, 0, $offset ) === 1 ) {
+						unset( $matches[ 1 ][ $key ] );
+					} elseif ( preg_match( '`\\\\\'' . preg_quote( $match_data[ 0 ], '`' ) . '\\\\\'`', $content, $discard, 0, $offset ) === 1 ) {
 						// Prevent matches on xpath queries and such: `\'wordpress\'`.
-						unset( $matches[1][ $key ] );
-					} elseif ( preg_match( '`(?:\?|&amp;|&)[a-z0-9_]+=' . preg_quote( $match_data[0], '`' ) . '(?:&|$)`', $content, $discard, 0, $offset ) === 1 ) {
+						unset( $matches[ 1 ][ $key ] );
+					} elseif ( preg_match( '`(?:\?|&amp;|&)[a-z0-9_]+=' . preg_quote( $match_data[ 0 ], '`' ) . '(?:&|$)`', $content, $discard, 0, $offset ) === 1 ) {
 						// Prevent matches on url query strings: `?something=wordpress`.
-						unset( $matches[1][ $key ] );
+						unset( $matches[ 1 ][ $key ] );
 					}
 
 					$offset = $next_offset;
 				}
 
-				if ( empty( $matches[1] ) ) {
+				if ( empty( $matches[ 1 ] ) ) {
 					return;
 				}
 			}
 
-			$mispelled = $this->retrieve_misspellings( $matches[1] );
+			$mispelled = $this->retrieve_misspellings( $matches[ 1 ] );
 
 			if ( empty( $mispelled ) ) {
 				return;
@@ -258,8 +258,8 @@ 
 			if ( true === $fix ) {
 				// Apply fixes based on offset to ensure we don't replace false positives.
 				$replacement = $content;
-				foreach ( $matches[1] as $match ) {
-					$replacement = substr_replace( $replacement, 'WordPress', $match[1], \strlen( $match[0] ) );
+				foreach ( $matches[ 1 ] as $match ) {
+					$replacement = substr_replace( $replacement, 'WordPress', $match[ 1 ], \strlen( $match[ 0 ] ) );
 				}
 
 				$this->phpcsFile->fixer->replaceToken( $stackPtr, $replacement );
@@ -278,11 +278,11 @@ 
 		foreach ( $match_stack as $match ) {
 			// Deal with multi-dimensional arrays when capturing offset.
 			if ( \is_array( $match ) ) {
-				$match = $match[0];
+				$match = $match[ 0 ];
 			}
 
 			if ( 'WordPress' !== $match ) {
-				$mispelled[] = $match;
+				$mispelled[ ] = $match;
 			}
 		}
 

wpcs/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	/**
 	 * Returns an array of tokens this test wants to listen for.
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	public function register() {
 		return array(

Spacing +6 added lines, -6 removed lines

@@ -46,7 +46,7 @@ 
 	public function process_token( $stackPtr ) {
 
 		$token = $this->tokens[ $stackPtr ];
-		if ( ! isset( $token['bracket_closer'] ) ) {
+		if ( ! isset( $token[ 'bracket_closer' ] ) ) {
 			$this->phpcsFile->addWarning( 'Missing bracket closer.', $stackPtr, 'MissingBracketCloser' );
 			return;
 		}
@@ -54,12 +54,12 @@ 
 		$need_spaces = $this->phpcsFile->findNext(
 			array( \T_CONSTANT_ENCAPSED_STRING, \T_LNUMBER, \T_WHITESPACE, \T_MINUS ),
 			( $stackPtr + 1 ),
-			$token['bracket_closer'],
+			$token[ 'bracket_closer' ],
 			true
 		);
 
-		$spaced1 = ( \T_WHITESPACE === $this->tokens[ ( $stackPtr + 1 ) ]['code'] );
-		$spaced2 = ( \T_WHITESPACE === $this->tokens[ ( $token['bracket_closer'] - 1 ) ]['code'] );
+		$spaced1 = ( \T_WHITESPACE === $this->tokens[ ( $stackPtr + 1 ) ][ 'code' ] );
+		$spaced2 = ( \T_WHITESPACE === $this->tokens[ ( $token[ 'bracket_closer' ] - 1 ) ][ 'code' ] );
 
 		// It should have spaces unless if it only has strings or numbers as the key.
 		if ( false !== $need_spaces && ! ( $spaced1 && $spaced2 ) ) {
@@ -70,7 +70,7 @@ 
 					$this->phpcsFile->fixer->addContentBefore( ( $stackPtr + 1 ), ' ' );
 				}
 				if ( ! $spaced2 ) {
-					$this->phpcsFile->fixer->addContentBefore( $token['bracket_closer'], ' ' );
+					$this->phpcsFile->fixer->addContentBefore( $token[ 'bracket_closer' ], ' ' );
 				}
 			}
 		} elseif ( false === $need_spaces && ( $spaced1 || $spaced2 ) ) {
@@ -81,7 +81,7 @@ 
 					$this->phpcsFile->fixer->replaceToken( ( $stackPtr + 1 ), '' );
 				}
 				if ( $spaced2 ) {
-					$this->phpcsFile->fixer->replaceToken( ( $token['bracket_closer'] - 1 ), '' );
+					$this->phpcsFile->fixer->replaceToken( ( $token[ 'bracket_closer' ] - 1 ), '' );
 				}
 			}
 		}

wpcs/WordPress/Sniffs/Classes/ClassInstantiationSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	/**
 	 * Returns an array of tokens this test wants to listen for.
 	 *
-	 * @return array
+	 * @return integer[]
 	 */
 	public function register() {
 		/*

Spacing +7 added lines, -7 removed lines

@@ -91,10 +91,10 @@ 
 	 */
 	public function process_token( $stackPtr ) {
 		// Make sure we have the right token, JS vs PHP.
-		if ( ( 'PHP' === $this->phpcsFile->tokenizerType && \T_NEW !== $this->tokens[ $stackPtr ]['code'] )
+		if ( ( 'PHP' === $this->phpcsFile->tokenizerType && \T_NEW !== $this->tokens[ $stackPtr ][ 'code' ] )
 			|| ( 'JS' === $this->phpcsFile->tokenizerType
-				&& ( \T_STRING !== $this->tokens[ $stackPtr ]['code']
-				|| 'new' !== strtolower( $this->tokens[ $stackPtr ]['content'] ) ) )
+				&& ( \T_STRING !== $this->tokens[ $stackPtr ][ 'code' ]
+				|| 'new' !== strtolower( $this->tokens[ $stackPtr ][ 'content' ] ) ) )
 		) {
 			return;
 		}
@@ -110,7 +110,7 @@ 
 				true
 			);
 
-			if ( false !== $prev_non_empty && 'T_BITWISE_AND' === $this->tokens[ $prev_non_empty ]['type'] ) {
+			if ( false !== $prev_non_empty && 'T_BITWISE_AND' === $this->tokens[ $prev_non_empty ][ 'type' ] ) {
 				$this->phpcsFile->recordMetric( $stackPtr, 'Assigning new by reference', 'yes' );
 
 				$this->phpcsFile->addError(
@@ -143,7 +143,7 @@ 
 		// Walk back to the last part of the class name.
 		$has_comment = false;
 		for ( $classname_ptr = ( $next_non_empty_after_class_name - 1 ); $classname_ptr >= $stackPtr; $classname_ptr-- ) {
-			if ( ! isset( Tokens::$emptyTokens[ $this->tokens[ $classname_ptr ]['code'] ] ) ) {
+			if ( ! isset( Tokens::$emptyTokens[ $this->tokens[ $classname_ptr ][ 'code' ] ] ) ) {
 				// Prevent a false positive on variable variables, disregard them for now.
 				if ( $stackPtr === $classname_ptr ) {
 					return;
@@ -152,12 +152,12 @@ 
 				break;
 			}
 
-			if ( \T_WHITESPACE !== $this->tokens[ $classname_ptr ]['code'] ) {
+			if ( \T_WHITESPACE !== $this->tokens[ $classname_ptr ][ 'code' ] ) {
 				$has_comment = true;
 			}
 		}
 
-		if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $next_non_empty_after_class_name ]['code'] ) {
+		if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $next_non_empty_after_class_name ][ 'code' ] ) {
 			$this->phpcsFile->recordMetric( $stackPtr, 'Object instantiation with parenthesis', 'no' );
 
 			$fix = $this->phpcsFile->addFixableError(

wpcs/WordPress/Sniffs/Files/FileNameSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
 	/**
 	 * Returns an array of tokens this test wants to listen for.
 	 *
-	 * @return array
+	 * @return integer[]
 	 */
 	public function register() {
 		if ( \defined( '\PHP_CODESNIFFER_IN_TESTS' ) ) {

Spacing +10 added lines, -10 removed lines

@@ -148,18 +148,18 @@ 
 		if ( \defined( '\T_PHPCS_DISABLE' ) && \defined( '\T_PHPCS_ENABLE' ) ) {
 			$i = -1;
 			while ( $i = $this->phpcsFile->findNext( \T_PHPCS_DISABLE, ( $i + 1 ) ) ) {
-				if ( empty( $this->tokens[ $i ]['sniffCodes'] )
-					|| isset( $this->tokens[ $i ]['sniffCodes']['WordPress'] )
-					|| isset( $this->tokens[ $i ]['sniffCodes']['WordPress.Files'] )
-					|| isset( $this->tokens[ $i ]['sniffCodes']['WordPress.Files.FileName'] )
+				if ( empty( $this->tokens[ $i ][ 'sniffCodes' ] )
+					|| isset( $this->tokens[ $i ][ 'sniffCodes' ][ 'WordPress' ] )
+					|| isset( $this->tokens[ $i ][ 'sniffCodes' ][ 'WordPress.Files' ] )
+					|| isset( $this->tokens[ $i ][ 'sniffCodes' ][ 'WordPress.Files.FileName' ] )
 				) {
 					do {
 						$i = $this->phpcsFile->findNext( \T_PHPCS_ENABLE, ( $i + 1 ) );
 					} while ( false !== $i
-						&& ! empty( $this->tokens[ $i ]['sniffCodes'] )
-						&& ! isset( $this->tokens[ $i ]['sniffCodes']['WordPress'] )
-						&& ! isset( $this->tokens[ $i ]['sniffCodes']['WordPress.Files'] )
-						&& ! isset( $this->tokens[ $i ]['sniffCodes']['WordPress.Files.FileName'] ) );
+						&& ! empty( $this->tokens[ $i ][ 'sniffCodes' ] )
+						&& ! isset( $this->tokens[ $i ][ 'sniffCodes' ][ 'WordPress' ] )
+						&& ! isset( $this->tokens[ $i ][ 'sniffCodes' ][ 'WordPress.Files' ] )
+						&& ! isset( $this->tokens[ $i ][ 'sniffCodes' ][ 'WordPress.Files.FileName' ] ) );
 
 					if ( false === $i ) {
 						// The entire (rest of the) file is disabled.
@@ -221,8 +221,8 @@ 
 					$fileName_end = substr( $fileName, -13 );
 					$has_class    = $this->phpcsFile->findNext( \T_CLASS, $stackPtr );
 
-					if ( ( 'Template' === trim( $this->tokens[ $subpackage ]['content'] )
-						&& $this->tokens[ $subpackage_tag ]['line'] === $this->tokens[ $subpackage ]['line'] )
+					if ( ( 'Template' === trim( $this->tokens[ $subpackage ][ 'content' ] )
+						&& $this->tokens[ $subpackage_tag ][ 'line' ] === $this->tokens[ $subpackage ][ 'line' ] )
 						&& ( ( ! \defined( '\PHP_CODESNIFFER_IN_TESTS' ) && '-template.php' !== $fileName_end )
 						|| ( \defined( '\PHP_CODESNIFFER_IN_TESTS' ) && '-template.inc' !== $fileName_end ) )
 						&& false === $has_class

wpcs/WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
 	 *
 	 * @since 1.1.0
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	public function register() {
 		$this->empty_tokens                    = Tokens::$emptyTokens;

Spacing +5 added lines, -5 removed lines

@@ -184,10 +184,10 @@ 
 			 * Check if the error silencing is done for one of the whitelisted functions.
 			 */
 			$next_non_empty = $this->phpcsFile->findNext( $this->empty_tokens, ( $stackPtr + 1 ), null, true, null, true );
-			if ( false !== $next_non_empty && \T_STRING === $this->tokens[ $next_non_empty ]['code'] ) {
+			if ( false !== $next_non_empty && \T_STRING === $this->tokens[ $next_non_empty ][ 'code' ] ) {
 				$has_parenthesis = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $next_non_empty + 1 ), null, true, null, true );
-				if ( false !== $has_parenthesis && \T_OPEN_PARENTHESIS === $this->tokens[ $has_parenthesis ]['code'] ) {
-					$function_name = strtolower( $this->tokens[ $next_non_empty ]['content'] );
+				if ( false !== $has_parenthesis && \T_OPEN_PARENTHESIS === $this->tokens[ $has_parenthesis ][ 'code' ] ) {
+					$function_name = strtolower( $this->tokens[ $next_non_empty ][ 'content' ] );
 					if ( ( true === $this->use_default_whitelist
 						&& isset( $this->function_whitelist[ $function_name ] ) === true )
 						|| in_array( $function_name, $this->custom_whitelist, true ) === true
@@ -199,7 +199,7 @@ 
 			}
 		}
 
-		$this->context_length = (int) $this->context_length;
+		$this->context_length = (int)$this->context_length;
 		$context_length       = $this->context_length;
 		if ( $this->context_length <= 0 ) {
 			$context_length = 2;
@@ -217,7 +217,7 @@ 
 		$data      = array();
 		if ( $this->context_length > 0 ) {
 			$error_msg .= ' Found: %s';
-			$data[]     = $found;
+			$data[ ]     = $found;
 		}
 
 		$this->phpcsFile->addWarning(

wpcs/WordPress/Sniffs/WP/PostsPerPageSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 	 * @param  mixed  $val   Assigned value.
 	 * @param  int    $line  Token line.
 	 * @param  array  $group Group definition.
-	 * @return mixed         FALSE if no match, TRUE if matches, STRING if matches
+	 * @return string|false         FALSE if no match, TRUE if matches, STRING if matches
 	 *                       with custom error message passed to ->process().
 	 */
 	public function callback( $key, $val, $line, $group ) {

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 	 *                       with custom error message passed to ->process().
 	 */
 	public function callback( $key, $val, $line, $group ) {
-		$this->posts_per_page = (int) $this->posts_per_page;
+		$this->posts_per_page = (int)$this->posts_per_page;
 
 		if ( $val > $this->posts_per_page ) {
 			return 'Detected high pagination limit, `%s` is set to `%s`';

future/includes/class-gv-plugin.php

Spacing +12 added lines, -12 removed lines

@@ -505,8 +505,8 @@ 
 	 */
 	private function get_php_version() {
 
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] ) ?
-			$GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion();
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] ) ?
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] : phpversion();
 	}
 
 	/**
@@ -518,8 +518,8 @@ 
 	 */
 	private function get_wordpress_version() {
 
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] ) ?
-			$GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] : $GLOBALS['wp_version'];
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] ) ?
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] : $GLOBALS[ 'wp_version' ];
 	}
 
 	/**
@@ -531,14 +531,14 @@ 
 	 */
 	private function get_gravityforms_version() {
 
-		if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE'] ) ) {
+		if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE' ] ) ) {
 			gravityview()->log->error( 'Gravity Forms is inactive or not installed.' );
 
 			return null;
 		}
 
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] ) ?
-			$GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] : \GFCommon::$version;
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] ) ?
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] : \GFCommon::$version;
 	}
 
 	/**
@@ -584,7 +584,7 @@ 
 		$items = get_posts( array(
 			'post_type'   => 'gravityview',
 			'post_status' => 'any',
-			'numberposts' => - 1,
+			'numberposts' => -1,
 			'fields'      => 'ids',
 		) );
 
@@ -598,9 +598,9 @@ 
 		$tables = array();
 
 		if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) {
-			$tables [] = \GFFormsModel::get_entry_meta_table_name();
+			$tables [ ] = \GFFormsModel::get_entry_meta_table_name();
 		} elseif ( ! $this->is_GF_25() ) {
-			$tables [] = \GFFormsModel::get_lead_meta_table_name();
+			$tables [ ] = \GFFormsModel::get_lead_meta_table_name();
 		}
 
 		foreach ( $tables as $meta_table ) {
@@ -619,9 +619,9 @@ 
 		$tables = array();
 
 		if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_notes_table_name' ) ) {
-			$tables[] = \GFFormsModel::get_entry_notes_table_name();
+			$tables[ ] = \GFFormsModel::get_entry_notes_table_name();
 		} elseif ( ! $this->is_GF_25() ) {
-			$tables[] = \GFFormsModel::get_lead_notes_table_name();
+			$tables[ ] = \GFFormsModel::get_lead_notes_table_name();
 		}
 
 		$disapproved = __( 'Disapproved the Entry for GravityView', 'gravityview' );

wpcs/WordPress/Sniff.php

Spacing +193 added lines, -193 removed lines

@@ -1105,10 +1105,10 @@ 
 	protected function get_last_ptr_on_line( $stackPtr ) {
 
 		$tokens      = $this->tokens;
-		$currentLine = $tokens[ $stackPtr ]['line'];
+		$currentLine = $tokens[ $stackPtr ][ 'line' ];
 		$nextPtr     = ( $stackPtr + 1 );
 
-		while ( isset( $tokens[ $nextPtr ] ) && $tokens[ $nextPtr ]['line'] === $currentLine ) {
+		while ( isset( $tokens[ $nextPtr ] ) && $tokens[ $nextPtr ][ 'line' ] === $currentLine ) {
 			$nextPtr++;
 			// Do nothing, we just want the last token of the line.
 		}
@@ -1186,27 +1186,27 @@ 
 
 		if ( false !== $end_of_statement ) {
 			// If the statement was ended by a semicolon, check if there is a whitelist comment directly after it.
-			if ( \T_SEMICOLON === $this->tokens[ $end_of_statement ]['code'] ) {
+			if ( \T_SEMICOLON === $this->tokens[ $end_of_statement ][ 'code' ] ) {
 				$lastPtr = $this->phpcsFile->findNext( \T_WHITESPACE, ( $end_of_statement + 1 ), null, true );
-			} elseif ( \T_CLOSE_TAG === $this->tokens[ $end_of_statement ]['code'] ) {
+			} elseif ( \T_CLOSE_TAG === $this->tokens[ $end_of_statement ][ 'code' ] ) {
 				// If the semicolon was left out and it was terminated by an ending tag, we need to look backwards.
 				$lastPtr = $this->phpcsFile->findPrevious( \T_WHITESPACE, ( $end_of_statement - 1 ), null, true );
 			}
 
-			if ( ( \T_COMMENT === $this->tokens[ $lastPtr ]['code']
-					|| ( isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastPtr ]['code'] ] )
-					&& \T_PHPCS_SET !== $this->tokens[ $lastPtr ]['code'] ) )
-				&& $this->tokens[ $lastPtr ]['line'] === $this->tokens[ $end_of_statement ]['line']
-				&& preg_match( $regex, $this->tokens[ $lastPtr ]['content'] ) === 1
+			if ( ( \T_COMMENT === $this->tokens[ $lastPtr ][ 'code' ]
+					|| ( isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastPtr ][ 'code' ] ] )
+					&& \T_PHPCS_SET !== $this->tokens[ $lastPtr ][ 'code' ] ) )
+				&& $this->tokens[ $lastPtr ][ 'line' ] === $this->tokens[ $end_of_statement ][ 'line' ]
+				&& preg_match( $regex, $this->tokens[ $lastPtr ][ 'content' ] ) === 1
 			) {
 				if ( isset( $thrown_notices[ $filename ][ $lastPtr ] ) === false
-					&& isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastPtr ]['code'] ] ) === false
+					&& isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastPtr ][ 'code' ] ] ) === false
 				) {
 					$this->phpcsFile->addWarning(
 						$deprecation_notice,
 						$lastPtr,
 						$deprecation_code,
-						array( $this->tokens[ $lastPtr ]['content'] )
+						array( $this->tokens[ $lastPtr ][ 'content' ] )
 					);
 
 					$thrown_notices[ $filename ][ $lastPtr ] = true;
@@ -1221,20 +1221,20 @@ 
 		$end_of_line = $this->get_last_ptr_on_line( $stackPtr );
 		$lastPtr     = $this->phpcsFile->findPrevious( \T_WHITESPACE, $end_of_line, null, true );
 
-		if ( ( \T_COMMENT === $this->tokens[ $lastPtr ]['code']
-				|| ( isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastPtr ]['code'] ] )
-				&& \T_PHPCS_SET !== $this->tokens[ $lastPtr ]['code'] ) )
-			&& $this->tokens[ $lastPtr ]['line'] === $this->tokens[ $stackPtr ]['line']
-			&& preg_match( $regex, $this->tokens[ $lastPtr ]['content'] ) === 1
+		if ( ( \T_COMMENT === $this->tokens[ $lastPtr ][ 'code' ]
+				|| ( isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastPtr ][ 'code' ] ] )
+				&& \T_PHPCS_SET !== $this->tokens[ $lastPtr ][ 'code' ] ) )
+			&& $this->tokens[ $lastPtr ][ 'line' ] === $this->tokens[ $stackPtr ][ 'line' ]
+			&& preg_match( $regex, $this->tokens[ $lastPtr ][ 'content' ] ) === 1
 		) {
 			if ( isset( $thrown_notices[ $filename ][ $lastPtr ] ) === false
-				&& isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastPtr ]['code'] ] ) === false
+				&& isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastPtr ][ 'code' ] ] ) === false
 			) {
 				$this->phpcsFile->addWarning(
 					$deprecation_notice,
 					$lastPtr,
 					$deprecation_code,
-					array( $this->tokens[ $lastPtr ]['content'] )
+					array( $this->tokens[ $lastPtr ][ 'content' ] )
 				);
 
 				$thrown_notices[ $filename ][ $lastPtr ] = true;
@@ -1268,7 +1268,7 @@ 
 			return false;
 		}
 
-		$conditions = $this->tokens[ $stackPtr ]['conditions'];
+		$conditions = $this->tokens[ $stackPtr ][ 'conditions' ];
 		foreach ( $conditions as $token => $condition ) {
 			if ( $token === $functionToken ) {
 				// Only examine the conditions the function is nested in, not those nested within the function.
@@ -1303,7 +1303,7 @@ 
 	 */
 	protected function is_test_class( $stackPtr ) {
 
-		if ( isset( $this->tokens[ $stackPtr ], Tokens::$ooScopeTokens[ $this->tokens[ $stackPtr ]['code'] ] ) === false ) {
+		if ( isset( $this->tokens[ $stackPtr ], Tokens::$ooScopeTokens[ $this->tokens[ $stackPtr ][ 'code' ] ] ) === false ) {
 			return false;
 		}
 
@@ -1334,7 +1334,7 @@ 
 
 		// Does the class/trait extend one of the whitelisted test classes ?
 		$extendedClassName = $this->phpcsFile->findExtendedClassName( $stackPtr );
-		if ( '\\' === $extendedClassName[0] ) {
+		if ( '\\' === $extendedClassName[ 0 ] ) {
 			if ( isset( $whitelist[ substr( $extendedClassName, 1 ) ] ) ) {
 				return true;
 			}
@@ -1380,7 +1380,7 @@ 
 		);
 
 		// Must be a variable, constant or closing square bracket (see below).
-		if ( ! isset( $valid[ $this->tokens[ $stackPtr ]['code'] ] ) ) {
+		if ( ! isset( $valid[ $this->tokens[ $stackPtr ][ 'code' ] ] ) ) {
 			return false;
 		}
 
@@ -1399,15 +1399,15 @@ 
 		}
 
 		// If the next token is an assignment, that's all we need to know.
-		if ( isset( Tokens::$assignmentTokens[ $this->tokens[ $next_non_empty ]['code'] ] ) ) {
+		if ( isset( Tokens::$assignmentTokens[ $this->tokens[ $next_non_empty ][ 'code' ] ] ) ) {
 			return true;
 		}
 
 		// Check if this is an array assignment, e.g., `$var['key'] = 'val';` .
-		if ( \T_OPEN_SQUARE_BRACKET === $this->tokens[ $next_non_empty ]['code']
-			&& isset( $this->tokens[ $next_non_empty ]['bracket_closer'] )
+		if ( \T_OPEN_SQUARE_BRACKET === $this->tokens[ $next_non_empty ][ 'code' ]
+			&& isset( $this->tokens[ $next_non_empty ][ 'bracket_closer' ] )
 		) {
-			return $this->is_assignment( $this->tokens[ $next_non_empty ]['bracket_closer'] );
+			return $this->is_assignment( $this->tokens[ $next_non_empty ][ 'bracket_closer' ] );
 		}
 
 		return false;
@@ -1444,12 +1444,12 @@ 
 
 		// If we're in a function, only look inside of it.
 		// Once PHPCS 3.5.0 comes out this should be changed to the new Conditions::GetLastCondition() method.
-		if ( isset( $tokens[ $stackPtr ]['conditions'] ) === true ) {
-			$conditions = $tokens[ $stackPtr ]['conditions'];
+		if ( isset( $tokens[ $stackPtr ][ 'conditions' ] ) === true ) {
+			$conditions = $tokens[ $stackPtr ][ 'conditions' ];
 			$conditions = array_reverse( $conditions, true );
 			foreach ( $conditions as $tokenPtr => $condition ) {
 				if ( \T_FUNCTION === $condition || \T_CLOSURE === $condition ) {
-					$start = $tokens[ $tokenPtr ]['scope_opener'];
+					$start = $tokens[ $tokenPtr ][ 'scope_opener' ];
 					break;
 				}
 			}
@@ -1470,23 +1470,23 @@ 
 		// If this superglobal is inside such a check, look for the nonce after it as well,
 		// all the way to the end of the scope.
 		if ( true === $allow_nonce_after ) {
-			$end = ( 0 === $start ) ? $this->phpcsFile->numTokens : $tokens[ $start ]['scope_closer'];
+			$end = ( 0 === $start ) ? $this->phpcsFile->numTokens : $tokens[ $start ][ 'scope_closer' ];
 		}
 
 		// Check if we've looked here before.
 		$filename = $this->phpcsFile->getFilename();
 
 		if (
-			$filename === $last['file']
-			&& $start === $last['start']
+			$filename === $last[ 'file' ]
+			&& $start === $last[ 'start' ]
 		) {
 
-			if ( false !== $last['nonce_check'] ) {
+			if ( false !== $last[ 'nonce_check' ] ) {
 				// If we have already found an nonce check in this scope, we just
 				// need to check whether it comes before this token. It is OK if the
 				// check is after the token though, if this was only a isset() check.
-				return ( true === $allow_nonce_after || $last['nonce_check'] < $stackPtr );
-			} elseif ( $end <= $last['end'] ) {
+				return ( true === $allow_nonce_after || $last[ 'nonce_check' ] < $stackPtr );
+			} elseif ( $end <= $last[ 'end' ] ) {
 				// If not, we can still go ahead and return false if we've already
 				// checked to the end of the search area.
 				return false;
@@ -1494,7 +1494,7 @@ 
 
 			// We haven't checked this far yet, but we can still save work by
 			// skipping over the part we've already checked.
-			$start = $last['end'];
+			$start = $last[ 'end' ];
 		} else {
 			$last = array(
 				'file'  => $filename,
@@ -1506,23 +1506,23 @@ 
 		// Loop through the tokens looking for nonce verification functions.
 		for ( $i = $start; $i < $end; $i++ ) {
 			// Skip over nested closed scope constructs.
-			if ( \T_FUNCTION === $tokens[ $i ]['code']
-				|| \T_CLOSURE === $tokens[ $i ]['code']
-				|| isset( Tokens::$ooScopeTokens[ $tokens[ $i ]['code'] ] )
+			if ( \T_FUNCTION === $tokens[ $i ][ 'code' ]
+				|| \T_CLOSURE === $tokens[ $i ][ 'code' ]
+				|| isset( Tokens::$ooScopeTokens[ $tokens[ $i ][ 'code' ] ] )
 			) {
-				if ( isset( $tokens[ $i ]['scope_closer'] ) ) {
-					$i = $tokens[ $i ]['scope_closer'];
+				if ( isset( $tokens[ $i ][ 'scope_closer' ] ) ) {
+					$i = $tokens[ $i ][ 'scope_closer' ];
 				}
 				continue;
 			}
 
 			// If this isn't a function name, skip it.
-			if ( \T_STRING !== $tokens[ $i ]['code'] ) {
+			if ( \T_STRING !== $tokens[ $i ][ 'code' ] ) {
 				continue;
 			}
 
 			// If this is one of the nonce verification functions, we can bail out.
-			if ( isset( $this->nonceVerificationFunctions[ $tokens[ $i ]['content'] ] ) ) {
+			if ( isset( $this->nonceVerificationFunctions[ $tokens[ $i ][ 'content' ] ] ) ) {
 				/*
 				 * Now, make sure it is a call to a global function.
 				 */
@@ -1534,13 +1534,13 @@ 
 					continue;
 				}
 
-				$last['nonce_check'] = $i;
+				$last[ 'nonce_check' ] = $i;
 				return true;
 			}
 		}
 
 		// We're still here, so no luck.
-		$last['nonce_check'] = false;
+		$last[ 'nonce_check' ] = false;
 
 		return false;
 	}
@@ -1558,11 +1558,11 @@ 
 	 */
 	protected function is_in_isset_or_empty( $stackPtr ) {
 
-		if ( ! isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
+		if ( ! isset( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) ) {
 			return false;
 		}
 
-		$nested_parenthesis = $this->tokens[ $stackPtr ]['nested_parenthesis'];
+		$nested_parenthesis = $this->tokens[ $stackPtr ][ 'nested_parenthesis' ];
 
 		end( $nested_parenthesis );
 		$open_parenthesis = key( $nested_parenthesis );
@@ -1572,7 +1572,7 @@ 
 			return false;
 		}
 
-		$previous_code = $this->tokens[ $previous_non_empty ]['code'];
+		$previous_code = $this->tokens[ $previous_non_empty ][ 'code' ];
 		if ( \T_ISSET === $previous_code || \T_EMPTY === $previous_code ) {
 			return true;
 		}
@@ -1585,7 +1585,7 @@ 
 		$functionPtr = $this->is_in_function_call( $stackPtr, $valid_functions );
 		if ( false !== $functionPtr ) {
 			$second_param = $this->get_function_call_parameter( $functionPtr, 2 );
-			if ( $stackPtr >= $second_param['start'] && $stackPtr <= $second_param['end'] ) {
+			if ( $stackPtr >= $second_param[ 'start' ] && $stackPtr <= $second_param[ 'end' ] ) {
 				return true;
 			}
 		}
@@ -1612,8 +1612,8 @@ 
 			return false;
 		}
 
-		if ( \T_OBJECT_OPERATOR !== $this->tokens[ $before ]['code']
-			&& \T_DOUBLE_COLON !== $this->tokens[ $before ]['code']
+		if ( \T_OBJECT_OPERATOR !== $this->tokens[ $before ][ 'code' ]
+			&& \T_DOUBLE_COLON !== $this->tokens[ $before ][ 'code' ]
 		) {
 			return false;
 		}
@@ -1640,7 +1640,7 @@ 
 			return false;
 		}
 
-		if ( \T_NS_SEPARATOR !== $this->tokens[ $prev ]['code'] ) {
+		if ( \T_NS_SEPARATOR !== $this->tokens[ $prev ][ 'code' ] ) {
 			return false;
 		}
 
@@ -1649,8 +1649,8 @@ 
 			return false;
 		}
 
-		if ( \T_STRING !== $this->tokens[ $before_prev ]['code']
-			&& \T_NAMESPACE !== $this->tokens[ $before_prev ]['code']
+		if ( \T_STRING !== $this->tokens[ $before_prev ][ 'code' ]
+			&& \T_NAMESPACE !== $this->tokens[ $before_prev ][ 'code' ]
 		) {
 			return false;
 		}
@@ -1691,11 +1691,11 @@ 
 	 * @return int|bool Stack pointer to the function call T_STRING token or false otherwise.
 	 */
 	protected function is_in_function_call( $stackPtr, $valid_functions, $global = true, $allow_nested = false ) {
-		if ( ! isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
+		if ( ! isset( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) ) {
 			return false;
 		}
 
-		$nested_parenthesis = $this->tokens[ $stackPtr ]['nested_parenthesis'];
+		$nested_parenthesis = $this->tokens[ $stackPtr ][ 'nested_parenthesis' ];
 		if ( false === $allow_nested ) {
 			$nested_parenthesis = array_reverse( $nested_parenthesis, true );
 		}
@@ -1703,11 +1703,11 @@ 
 		foreach ( $nested_parenthesis as $open => $close ) {
 
 			$prev_non_empty = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $open - 1 ), null, true, null, true );
-			if ( false === $prev_non_empty || \T_STRING !== $this->tokens[ $prev_non_empty ]['code'] ) {
+			if ( false === $prev_non_empty || \T_STRING !== $this->tokens[ $prev_non_empty ][ 'code' ] ) {
 				continue;
 			}
 
-			if ( isset( $valid_functions[ strtolower( $this->tokens[ $prev_non_empty ]['content'] ) ] ) === false ) {
+			if ( isset( $valid_functions[ strtolower( $this->tokens[ $prev_non_empty ][ 'content' ] ) ] ) === false ) {
 				if ( false === $allow_nested ) {
 					// Function call encountered, but not to one of the allowed functions.
 					return false;
@@ -1752,7 +1752,7 @@ 
 		 * The return can never be `0` as there will always be a PHP open tag before the
 		 * function call.
 		 */
-		return (bool) $this->is_in_function_call( $stackPtr, $this->typeTestFunctions );
+		return (bool)$this->is_in_function_call( $stackPtr, $this->typeTestFunctions );
 	}
 
 	/**
@@ -1773,7 +1773,7 @@ 
 
 		// If this isn't set, we know the value must have only been casted, because
 		// is_sanitized() would have returned false otherwise.
-		if ( ! isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
+		if ( ! isset( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) ) {
 			return true;
 		}
 
@@ -1785,7 +1785,7 @@ 
 
 		// The only parentheses should belong to the sanitizing function. If there's
 		// more than one set, this isn't *only* sanitization.
-		return ( \count( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) === 1 );
+		return ( \count( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) === 1 );
 	}
 
 	/**
@@ -1812,7 +1812,7 @@ 
 		}
 
 		// Check if it is a safe cast.
-		return isset( $this->safe_casts[ $this->tokens[ $prev ]['code'] ] );
+		return isset( $this->safe_casts[ $this->tokens[ $prev ][ 'code' ] ] );
 	}
 
 	/**
@@ -1834,7 +1834,7 @@ 
 		}
 
 		// If this isn't within a function call, we know already that it's not safe.
-		if ( ! isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
+		if ( ! isset( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) ) {
 			if ( $require_unslash ) {
 				$this->add_unslash_error( $stackPtr );
 			}
@@ -1843,13 +1843,13 @@ 
 		}
 
 		// Get the function that it's in.
-		$nested_parenthesis = $this->tokens[ $stackPtr ]['nested_parenthesis'];
+		$nested_parenthesis = $this->tokens[ $stackPtr ][ 'nested_parenthesis' ];
 		$nested_openers     = array_keys( $nested_parenthesis );
 		$function_opener    = array_pop( $nested_openers );
 		$functionPtr        = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $function_opener - 1 ), null, true, null, true );
 
 		// If it is just being unset, the value isn't used at all, so it's safe.
-		if ( \T_UNSET === $this->tokens[ $functionPtr ]['code'] ) {
+		if ( \T_UNSET === $this->tokens[ $functionPtr ][ 'code' ] ) {
 			return true;
 		}
 
@@ -1869,7 +1869,7 @@ 
 			return false;
 		}
 
-		$functionName = $this->tokens[ $functionPtr ]['content'];
+		$functionName = $this->tokens[ $functionPtr ][ 'content' ];
 
 		// Check if an unslashing function is being used.
 		if ( isset( $this->unslashingFunctions[ $functionName ] ) ) {
@@ -1888,7 +1888,7 @@ 
 			}
 
 			$functionPtr  = $higherFunctionPtr;
-			$functionName = $this->tokens[ $functionPtr ]['content'];
+			$functionName = $this->tokens[ $functionPtr ][ 'content' ];
 
 		} else {
 			$is_unslashed = false;
@@ -1907,13 +1907,13 @@ 
 				 */
 				$first_non_empty = $this->phpcsFile->findNext(
 					Tokens::$emptyTokens,
-					$callback['start'],
-					( $callback['end'] + 1 ),
+					$callback[ 'start' ],
+					( $callback[ 'end' ] + 1 ),
 					true
 				);
 
-				if ( false !== $first_non_empty && \T_CONSTANT_ENCAPSED_STRING === $this->tokens[ $first_non_empty ]['code'] ) {
-					$functionName = $this->strip_quotes( $this->tokens[ $first_non_empty ]['content'] );
+				if ( false !== $first_non_empty && \T_CONSTANT_ENCAPSED_STRING === $this->tokens[ $first_non_empty ][ 'code' ] ) {
+					$functionName = $this->strip_quotes( $this->tokens[ $first_non_empty ][ 'content' ] );
 				}
 			}
 		}
@@ -1944,7 +1944,7 @@ 
 			'%s data not unslashed before sanitization. Use wp_unslash() or similar',
 			$stackPtr,
 			'MissingUnslash',
-			array( $this->tokens[ $stackPtr ]['content'] )
+			array( $this->tokens[ $stackPtr ][ 'content' ] )
 		);
 	}
 
@@ -1966,7 +1966,7 @@ 
 
 		$keys = array();
 
-		if ( \T_VARIABLE !== $this->tokens[ $stackPtr ]['code'] ) {
+		if ( \T_VARIABLE !== $this->tokens[ $stackPtr ][ 'code' ] ) {
 			return $keys;
 		}
 
@@ -1983,19 +1983,19 @@ 
 
 			// If it isn't a bracket, this isn't an array-access.
 			if ( false === $open_bracket
-				|| \T_OPEN_SQUARE_BRACKET !== $this->tokens[ $open_bracket ]['code']
-				|| ! isset( $this->tokens[ $open_bracket ]['bracket_closer'] )
+				|| \T_OPEN_SQUARE_BRACKET !== $this->tokens[ $open_bracket ][ 'code' ]
+				|| ! isset( $this->tokens[ $open_bracket ][ 'bracket_closer' ] )
 			) {
 				break;
 			}
 
 			$key = $this->phpcsFile->getTokensAsString(
 				( $open_bracket + 1 ),
-				( $this->tokens[ $open_bracket ]['bracket_closer'] - $open_bracket - 1 )
+				( $this->tokens[ $open_bracket ][ 'bracket_closer' ] - $open_bracket - 1 )
 			);
 
-			$keys[]  = trim( $key );
-			$current = $this->tokens[ $open_bracket ]['bracket_closer'];
+			$keys[ ]  = trim( $key );
+			$current = $this->tokens[ $open_bracket ][ 'bracket_closer' ];
 		} while ( isset( $this->tokens[ $current ] ) && true === $all );
 
 		return $keys;
@@ -2017,8 +2017,8 @@ 
 
 		$keys = $this->get_array_access_keys( $stackPtr, false );
 
-		if ( isset( $keys[0] ) ) {
-			return $keys[0];
+		if ( isset( $keys[ 0 ] ) ) {
+			return $keys[ 0 ];
 		}
 
 		return false;
@@ -2072,22 +2072,22 @@ 
 			 */
 
 			// If there are no conditions, there's no validation.
-			if ( empty( $this->tokens[ $stackPtr ]['conditions'] ) ) {
+			if ( empty( $this->tokens[ $stackPtr ][ 'conditions' ] ) ) {
 				return false;
 			}
 
-			$conditions = $this->tokens[ $stackPtr ]['conditions'];
+			$conditions = $this->tokens[ $stackPtr ][ 'conditions' ];
 			end( $conditions ); // Get closest condition.
 			$conditionPtr = key( $conditions );
 			$condition    = $this->tokens[ $conditionPtr ];
 
-			if ( ! isset( $condition['parenthesis_opener'] ) ) {
+			if ( ! isset( $condition[ 'parenthesis_opener' ] ) ) {
 				// Live coding or parse error.
 				return false;
 			}
 
-			$scope_start = $condition['parenthesis_opener'];
-			$scope_end   = $condition['parenthesis_closer'];
+			$scope_start = $condition[ 'parenthesis_opener' ];
+			$scope_end   = $condition[ 'parenthesis_closer' ];
 
 		} else {
 			/*
@@ -2102,14 +2102,14 @@ 
 
 			// If so, we check only within the function, otherwise the whole file.
 			if ( false !== $function ) {
-				$scope_start = $this->tokens[ $function ]['scope_opener'];
+				$scope_start = $this->tokens[ $function ][ 'scope_opener' ];
 			} else {
 				// Check if we are in a closure.
 				$closure = $this->phpcsFile->getCondition( $stackPtr, \T_CLOSURE );
 
 				// If so, we check only within the closure.
 				if ( false !== $closure ) {
-					$scope_start = $this->tokens[ $closure ]['scope_opener'];
+					$scope_start = $this->tokens[ $closure ][ 'scope_opener' ];
 				}
 			}
 
@@ -2117,7 +2117,7 @@ 
 		}
 
 		if ( ! empty( $array_keys ) && ! is_array( $array_keys ) ) {
-			$array_keys = (array) $array_keys;
+			$array_keys = (array)$array_keys;
 		}
 
 		$bare_array_keys = array_map( array( $this, 'strip_quotes' ), $array_keys );
@@ -2133,28 +2133,28 @@ 
 		// phpcs:ignore Generic.CodeAnalysis.JumbledIncrementer.Found -- On purpose, see below.
 		for ( $i = ( $scope_start + 1 ); $i < $scope_end; $i++ ) {
 
-			if ( isset( $targets[ $this->tokens[ $i ]['code'] ] ) === false ) {
+			if ( isset( $targets[ $this->tokens[ $i ][ 'code' ] ] ) === false ) {
 				continue;
 			}
 
-			switch ( $targets[ $this->tokens[ $i ]['code'] ] ) {
+			switch ( $targets[ $this->tokens[ $i ][ 'code' ] ] ) {
 				case 'construct':
 					$issetOpener = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true, null, true );
-					if ( false === $issetOpener || \T_OPEN_PARENTHESIS !== $this->tokens[ $issetOpener ]['code'] ) {
+					if ( false === $issetOpener || \T_OPEN_PARENTHESIS !== $this->tokens[ $issetOpener ][ 'code' ] ) {
 						// Parse error or live coding.
 						continue 2;
 					}
 
-					$issetCloser = $this->tokens[ $issetOpener ]['parenthesis_closer'];
+					$issetCloser = $this->tokens[ $issetOpener ][ 'parenthesis_closer' ];
 
 					// Look for this variable. We purposely stomp $i from the parent loop.
 					for ( $i = ( $issetOpener + 1 ); $i < $issetCloser; $i++ ) {
 
-						if ( \T_VARIABLE !== $this->tokens[ $i ]['code'] ) {
+						if ( \T_VARIABLE !== $this->tokens[ $i ][ 'code' ] ) {
 							continue;
 						}
 
-						if ( $this->tokens[ $stackPtr ]['content'] !== $this->tokens[ $i ]['content'] ) {
+						if ( $this->tokens[ $stackPtr ][ 'content' ] !== $this->tokens[ $i ][ 'content' ] ) {
 							continue;
 						}
 
@@ -2176,14 +2176,14 @@ 
 
 				case 'function_call':
 					// Only check calls to array_key_exists() and key_exists().
-					if ( 'array_key_exists' !== $this->tokens[ $i ]['content']
-						&& 'key_exists' !== $this->tokens[ $i ]['content']
+					if ( 'array_key_exists' !== $this->tokens[ $i ][ 'content' ]
+						&& 'key_exists' !== $this->tokens[ $i ][ 'content' ]
 					) {
 						continue 2;
 					}
 
 					$next_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true, null, true );
-					if ( false === $next_non_empty || \T_OPEN_PARENTHESIS !== $this->tokens[ $next_non_empty ]['code'] ) {
+					if ( false === $next_non_empty || \T_OPEN_PARENTHESIS !== $this->tokens[ $next_non_empty ][ 'code' ] ) {
 						// Not a function call.
 						continue 2;
 					}
@@ -2203,10 +2203,10 @@ 
 						continue 2;
 					}
 
-					$param2_first_token = $this->phpcsFile->findNext( Tokens::$emptyTokens, $params[2]['start'], ( $params[2]['end'] + 1 ), true );
+					$param2_first_token = $this->phpcsFile->findNext( Tokens::$emptyTokens, $params[ 2 ][ 'start' ], ( $params[ 2 ][ 'end' ] + 1 ), true );
 					if ( false === $param2_first_token
-						|| \T_VARIABLE !== $this->tokens[ $param2_first_token ]['code']
-						|| $this->tokens[ $param2_first_token ]['content'] !== $this->tokens[ $stackPtr ]['content']
+						|| \T_VARIABLE !== $this->tokens[ $param2_first_token ][ 'code' ]
+						|| $this->tokens[ $param2_first_token ][ 'content' ] !== $this->tokens[ $stackPtr ][ 'content' ]
 					) {
 						continue 2;
 					}
@@ -2233,7 +2233,7 @@ 
 
 						// If that failed, try getting an exact match for the subset against the
 						// second parameter and the last key against the first.
-						if ( $bare_keys === $found_keys && $this->strip_quotes( $params[1]['raw'] ) === $last_key ) {
+						if ( $bare_keys === $found_keys && $this->strip_quotes( $params[ 1 ][ 'raw' ] ) === $last_key ) {
 							return true;
 						}
 
@@ -2248,8 +2248,8 @@ 
 					do {
 						$prev = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $prev - 1 ), null, true, null, true );
 						// Skip over array keys, like $_GET['key']['subkey'].
-						if ( \T_CLOSE_SQUARE_BRACKET === $this->tokens[ $prev ]['code'] ) {
-							$prev = $this->tokens[ $prev ]['bracket_opener'];
+						if ( \T_CLOSE_SQUARE_BRACKET === $this->tokens[ $prev ][ 'code' ] ) {
+							$prev = $this->tokens[ $prev ][ 'bracket_opener' ];
 							continue;
 						}
 
@@ -2257,11 +2257,11 @@ 
 					} while ( $prev >= ( $scope_start + 1 ) );
 
 					// We should now have reached the variable.
-					if ( \T_VARIABLE !== $this->tokens[ $prev ]['code'] ) {
+					if ( \T_VARIABLE !== $this->tokens[ $prev ][ 'code' ] ) {
 						continue 2;
 					}
 
-					if ( $this->tokens[ $prev ]['content'] !== $this->tokens[ $stackPtr ]['content'] ) {
+					if ( $this->tokens[ $prev ][ 'content' ] !== $this->tokens[ $stackPtr ][ 'content' ] ) {
 						continue 2;
 					}
 
@@ -2310,13 +2310,13 @@ 
 		}
 
 		// We first check if this is a switch statement (switch ( $var )).
-		if ( isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
-			$nested_parenthesis = $this->tokens[ $stackPtr ]['nested_parenthesis'];
+		if ( isset( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) ) {
+			$nested_parenthesis = $this->tokens[ $stackPtr ][ 'nested_parenthesis' ];
 			$close_parenthesis  = end( $nested_parenthesis );
 
 			if (
-				isset( $this->tokens[ $close_parenthesis ]['parenthesis_owner'] )
-				&& \T_SWITCH === $this->tokens[ $this->tokens[ $close_parenthesis ]['parenthesis_owner'] ]['code']
+				isset( $this->tokens[ $close_parenthesis ][ 'parenthesis_owner' ] )
+				&& \T_SWITCH === $this->tokens[ $this->tokens[ $close_parenthesis ][ 'parenthesis_owner' ] ][ 'code' ]
 			) {
 				return true;
 			}
@@ -2331,7 +2331,7 @@ 
 			true
 		);
 
-		if ( isset( $comparisonTokens[ $this->tokens[ $previous_token ]['code'] ] ) ) {
+		if ( isset( $comparisonTokens[ $this->tokens[ $previous_token ][ 'code' ] ] ) ) {
 			return true;
 		}
 
@@ -2344,17 +2344,17 @@ 
 		);
 
 		// This might be an opening square bracket in the case of arrays ($var['a']).
-		while ( false !== $next_token && \T_OPEN_SQUARE_BRACKET === $this->tokens[ $next_token ]['code'] ) {
+		while ( false !== $next_token && \T_OPEN_SQUARE_BRACKET === $this->tokens[ $next_token ][ 'code' ] ) {
 
 			$next_token = $this->phpcsFile->findNext(
 				Tokens::$emptyTokens,
-				( $this->tokens[ $next_token ]['bracket_closer'] + 1 ),
+				( $this->tokens[ $next_token ][ 'bracket_closer' ] + 1 ),
 				null,
 				true
 			);
 		}
 
-		if ( false !== $next_token && isset( $comparisonTokens[ $this->tokens[ $next_token ]['code'] ] ) ) {
+		if ( false !== $next_token && isset( $comparisonTokens[ $this->tokens[ $next_token ][ 'code' ] ] ) ) {
 			return true;
 		}
 
@@ -2377,7 +2377,7 @@ 
 			return false;
 		}
 
-		$function_name = $this->tokens[ $function_ptr ]['content'];
+		$function_name = $this->tokens[ $function_ptr ][ 'content' ];
 		if ( true === $this->arrayCompareFunctions[ $function_name ] ) {
 			return true;
 		}
@@ -2412,7 +2412,7 @@ 
 		// USE keywords inside closures.
 		$next = $this->phpcsFile->findNext( \T_WHITESPACE, ( $stackPtr + 1 ), null, true );
 
-		if ( \T_OPEN_PARENTHESIS === $this->tokens[ $next ]['code'] ) {
+		if ( \T_OPEN_PARENTHESIS === $this->tokens[ $next ][ 'code' ] ) {
 			return 'closure';
 		}
 
@@ -2445,8 +2445,8 @@ 
 		$variables = array();
 		if ( preg_match_all( '/(?P<backslashes>\\\\*)\$(?P<symbol>\w+)/', $string, $match_sets, \PREG_SET_ORDER ) ) {
 			foreach ( $match_sets as $matches ) {
-				if ( ! isset( $matches['backslashes'] ) || ( \strlen( $matches['backslashes'] ) % 2 ) === 0 ) {
-					$variables[] = $matches['symbol'];
+				if ( ! isset( $matches[ 'backslashes' ] ) || ( \strlen( $matches[ 'backslashes' ] ) % 2 ) === 0 ) {
+					$variables[ ] = $matches[ 'symbol' ];
 				}
 			}
 		}
@@ -2498,19 +2498,19 @@ 
 		}
 
 		// Is this one of the tokens this function handles ?
-		if ( false === \in_array( $this->tokens[ $stackPtr ]['code'], array( \T_STRING, \T_ARRAY, \T_OPEN_SHORT_ARRAY ), true ) ) {
+		if ( false === \in_array( $this->tokens[ $stackPtr ][ 'code' ], array( \T_STRING, \T_ARRAY, \T_OPEN_SHORT_ARRAY ), true ) ) {
 			return false;
 		}
 
 		$next_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true, null, true );
 
 		// Deal with short array syntax.
-		if ( 'T_OPEN_SHORT_ARRAY' === $this->tokens[ $stackPtr ]['type'] ) {
-			if ( false === isset( $this->tokens[ $stackPtr ]['bracket_closer'] ) ) {
+		if ( 'T_OPEN_SHORT_ARRAY' === $this->tokens[ $stackPtr ][ 'type' ] ) {
+			if ( false === isset( $this->tokens[ $stackPtr ][ 'bracket_closer' ] ) ) {
 				return false;
 			}
 
-			if ( $next_non_empty === $this->tokens[ $stackPtr ]['bracket_closer'] ) {
+			if ( $next_non_empty === $this->tokens[ $stackPtr ][ 'bracket_closer' ] ) {
 				// No parameters.
 				return false;
 			} else {
@@ -2520,15 +2520,15 @@ 
 
 		// Deal with function calls & long arrays.
 		// Next non-empty token should be the open parenthesis.
-		if ( false === $next_non_empty && \T_OPEN_PARENTHESIS !== $this->tokens[ $next_non_empty ]['code'] ) {
+		if ( false === $next_non_empty && \T_OPEN_PARENTHESIS !== $this->tokens[ $next_non_empty ][ 'code' ] ) {
 			return false;
 		}
 
-		if ( false === isset( $this->tokens[ $next_non_empty ]['parenthesis_closer'] ) ) {
+		if ( false === isset( $this->tokens[ $next_non_empty ][ 'parenthesis_closer' ] ) ) {
 			return false;
 		}
 
-		$close_parenthesis   = $this->tokens[ $next_non_empty ]['parenthesis_closer'];
+		$close_parenthesis   = $this->tokens[ $next_non_empty ][ 'parenthesis_closer' ];
 		$next_next_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $next_non_empty + 1 ), ( $close_parenthesis + 1 ), true );
 
 		if ( $next_next_non_empty === $close_parenthesis ) {
@@ -2599,67 +2599,67 @@ 
 		 */
 
 		// Mark the beginning and end tokens.
-		if ( 'T_OPEN_SHORT_ARRAY' === $this->tokens[ $stackPtr ]['type'] ) {
+		if ( 'T_OPEN_SHORT_ARRAY' === $this->tokens[ $stackPtr ][ 'type' ] ) {
 			$opener = $stackPtr;
-			$closer = $this->tokens[ $stackPtr ]['bracket_closer'];
+			$closer = $this->tokens[ $stackPtr ][ 'bracket_closer' ];
 
 			$nestedParenthesisCount = 0;
 		} else {
 			$opener = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true, null, true );
-			$closer = $this->tokens[ $opener ]['parenthesis_closer'];
+			$closer = $this->tokens[ $opener ][ 'parenthesis_closer' ];
 
 			$nestedParenthesisCount = 1;
 		}
 
 		// Which nesting level is the one we are interested in ?
-		if ( isset( $this->tokens[ $opener ]['nested_parenthesis'] ) ) {
-			$nestedParenthesisCount += \count( $this->tokens[ $opener ]['nested_parenthesis'] );
+		if ( isset( $this->tokens[ $opener ][ 'nested_parenthesis' ] ) ) {
+			$nestedParenthesisCount += \count( $this->tokens[ $opener ][ 'nested_parenthesis' ] );
 		}
 
 		$parameters  = array();
 		$next_comma  = $opener;
 		$param_start = ( $opener + 1 );
 		$cnt         = 1;
-		while ( $next_comma = $this->phpcsFile->findNext( array( \T_COMMA, $this->tokens[ $closer ]['code'], \T_OPEN_SHORT_ARRAY, \T_CLOSURE ), ( $next_comma + 1 ), ( $closer + 1 ) ) ) {
+		while ( $next_comma = $this->phpcsFile->findNext( array( \T_COMMA, $this->tokens[ $closer ][ 'code' ], \T_OPEN_SHORT_ARRAY, \T_CLOSURE ), ( $next_comma + 1 ), ( $closer + 1 ) ) ) {
 			// Ignore anything within short array definition brackets.
-			if ( 'T_OPEN_SHORT_ARRAY' === $this->tokens[ $next_comma ]['type']
-				&& ( isset( $this->tokens[ $next_comma ]['bracket_opener'] )
-					&& $this->tokens[ $next_comma ]['bracket_opener'] === $next_comma )
-				&& isset( $this->tokens[ $next_comma ]['bracket_closer'] )
+			if ( 'T_OPEN_SHORT_ARRAY' === $this->tokens[ $next_comma ][ 'type' ]
+				&& ( isset( $this->tokens[ $next_comma ][ 'bracket_opener' ] )
+					&& $this->tokens[ $next_comma ][ 'bracket_opener' ] === $next_comma )
+				&& isset( $this->tokens[ $next_comma ][ 'bracket_closer' ] )
 			) {
 				// Skip forward to the end of the short array definition.
-				$next_comma = $this->tokens[ $next_comma ]['bracket_closer'];
+				$next_comma = $this->tokens[ $next_comma ][ 'bracket_closer' ];
 				continue;
 			}
 
 			// Skip past closures passed as function parameters.
-			if ( 'T_CLOSURE' === $this->tokens[ $next_comma ]['type']
-				&& ( isset( $this->tokens[ $next_comma ]['scope_condition'] )
-					&& $this->tokens[ $next_comma ]['scope_condition'] === $next_comma )
-				&& isset( $this->tokens[ $next_comma ]['scope_closer'] )
+			if ( 'T_CLOSURE' === $this->tokens[ $next_comma ][ 'type' ]
+				&& ( isset( $this->tokens[ $next_comma ][ 'scope_condition' ] )
+					&& $this->tokens[ $next_comma ][ 'scope_condition' ] === $next_comma )
+				&& isset( $this->tokens[ $next_comma ][ 'scope_closer' ] )
 			) {
 				// Skip forward to the end of the closure declaration.
-				$next_comma = $this->tokens[ $next_comma ]['scope_closer'];
+				$next_comma = $this->tokens[ $next_comma ][ 'scope_closer' ];
 				continue;
 			}
 
 			// Ignore comma's at a lower nesting level.
-			if ( \T_COMMA === $this->tokens[ $next_comma ]['code']
-				&& isset( $this->tokens[ $next_comma ]['nested_parenthesis'] )
-				&& \count( $this->tokens[ $next_comma ]['nested_parenthesis'] ) !== $nestedParenthesisCount
+			if ( \T_COMMA === $this->tokens[ $next_comma ][ 'code' ]
+				&& isset( $this->tokens[ $next_comma ][ 'nested_parenthesis' ] )
+				&& \count( $this->tokens[ $next_comma ][ 'nested_parenthesis' ] ) !== $nestedParenthesisCount
 			) {
 				continue;
 			}
 
 			// Ignore closing parenthesis/bracket if not 'ours'.
-			if ( $this->tokens[ $next_comma ]['type'] === $this->tokens[ $closer ]['type'] && $next_comma !== $closer ) {
+			if ( $this->tokens[ $next_comma ][ 'type' ] === $this->tokens[ $closer ][ 'type' ] && $next_comma !== $closer ) {
 				continue;
 			}
 
 			// Ok, we've reached the end of the parameter.
-			$parameters[ $cnt ]['start'] = $param_start;
-			$parameters[ $cnt ]['end']   = ( $next_comma - 1 );
-			$parameters[ $cnt ]['raw']   = trim( $this->phpcsFile->getTokensAsString( $param_start, ( $next_comma - $param_start ) ) );
+			$parameters[ $cnt ][ 'start' ] = $param_start;
+			$parameters[ $cnt ][ 'end' ]   = ( $next_comma - 1 );
+			$parameters[ $cnt ][ 'raw' ]   = trim( $this->phpcsFile->getTokensAsString( $param_start, ( $next_comma - $param_start ) ) );
 
 			/*
 			 * Check if there are more tokens before the closing parenthesis.
@@ -2720,20 +2720,20 @@ 
 		/*
 		 * Determine the array opener & closer.
 		 */
-		if ( \T_ARRAY === $this->tokens[ $stackPtr ]['code'] ) {
-			if ( isset( $this->tokens[ $stackPtr ]['parenthesis_opener'] ) ) {
-				$opener = $this->tokens[ $stackPtr ]['parenthesis_opener'];
+		if ( \T_ARRAY === $this->tokens[ $stackPtr ][ 'code' ] ) {
+			if ( isset( $this->tokens[ $stackPtr ][ 'parenthesis_opener' ] ) ) {
+				$opener = $this->tokens[ $stackPtr ][ 'parenthesis_opener' ];
 
-				if ( isset( $this->tokens[ $opener ]['parenthesis_closer'] ) ) {
-					$closer = $this->tokens[ $opener ]['parenthesis_closer'];
+				if ( isset( $this->tokens[ $opener ][ 'parenthesis_closer' ] ) ) {
+					$closer = $this->tokens[ $opener ][ 'parenthesis_closer' ];
 				}
 			}
 		} else {
 			// Short array syntax.
 			$opener = $stackPtr;
 
-			if ( isset( $this->tokens[ $stackPtr ]['bracket_closer'] ) ) {
-				$closer = $this->tokens[ $stackPtr ]['bracket_closer'];
+			if ( isset( $this->tokens[ $stackPtr ][ 'bracket_closer' ] ) ) {
+				$closer = $this->tokens[ $stackPtr ][ 'bracket_closer' ];
 			}
 		}
 
@@ -2765,7 +2765,7 @@ 
 		}
 
 		// Check for scoped namespace {}.
-		if ( ! empty( $this->tokens[ $stackPtr ]['conditions'] ) ) {
+		if ( ! empty( $this->tokens[ $stackPtr ][ 'conditions' ] ) ) {
 			$namespacePtr = $this->phpcsFile->getCondition( $stackPtr, \T_NAMESPACE );
 			if ( false !== $namespacePtr ) {
 				$namespace = $this->get_declared_namespace_name( $namespacePtr );
@@ -2792,8 +2792,8 @@ 
 			$previousNSToken = $this->phpcsFile->findPrevious( \T_NAMESPACE, ( $previousNSToken - 1 ) );
 
 			// Stop if we encounter a scoped namespace declaration as we already know we're not in one.
-			if ( ! empty( $this->tokens[ $previousNSToken ]['scope_condition'] )
-				&& $this->tokens[ $previousNSToken ]['scope_condition'] === $previousNSToken
+			if ( ! empty( $this->tokens[ $previousNSToken ][ 'scope_condition' ] )
+				&& $this->tokens[ $previousNSToken ][ 'scope_condition' ] === $previousNSToken
 			) {
 				break;
 			}
@@ -2831,17 +2831,17 @@ 
 			return false;
 		}
 
-		if ( \T_NAMESPACE !== $this->tokens[ $stackPtr ]['code'] ) {
+		if ( \T_NAMESPACE !== $this->tokens[ $stackPtr ][ 'code' ] ) {
 			return false;
 		}
 
 		$nextToken = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true, null, true );
-		if ( \T_NS_SEPARATOR === $this->tokens[ $nextToken ]['code'] ) {
+		if ( \T_NS_SEPARATOR === $this->tokens[ $nextToken ][ 'code' ] ) {
 			// Not a namespace declaration, but use of, i.e. `namespace\someFunction();`.
 			return false;
 		}
 
-		if ( \T_OPEN_CURLY_BRACKET === $this->tokens[ $nextToken ]['code'] ) {
+		if ( \T_OPEN_CURLY_BRACKET === $this->tokens[ $nextToken ][ 'code' ] ) {
 			// Declaration for global namespace when using multiple namespaces in a file.
 			// I.e.: `namespace {}`.
 			return '';
@@ -2852,12 +2852,12 @@ 
 			\T_STRING       => true,
 			\T_NS_SEPARATOR => true,
 		);
-		$validTokens    = $acceptedTokens + Tokens::$emptyTokens;
+		$validTokens = $acceptedTokens + Tokens::$emptyTokens;
 
 		$namespaceName = '';
-		while ( isset( $validTokens[ $this->tokens[ $nextToken ]['code'] ] ) ) {
-			if ( isset( $acceptedTokens[ $this->tokens[ $nextToken ]['code'] ] ) ) {
-				$namespaceName .= trim( $this->tokens[ $nextToken ]['content'] );
+		while ( isset( $validTokens[ $this->tokens[ $nextToken ][ 'code' ] ] ) ) {
+			if ( isset( $acceptedTokens[ $this->tokens[ $nextToken ][ 'code' ] ] ) ) {
+				$namespaceName .= trim( $this->tokens[ $nextToken ][ 'content' ] );
 			}
 			++$nextToken;
 		}
@@ -2875,7 +2875,7 @@ 
 	 * @return bool
 	 */
 	public function is_class_constant( $stackPtr ) {
-		if ( ! isset( $this->tokens[ $stackPtr ] ) || \T_CONST !== $this->tokens[ $stackPtr ]['code'] ) {
+		if ( ! isset( $this->tokens[ $stackPtr ] ) || \T_CONST !== $this->tokens[ $stackPtr ][ 'code' ] ) {
 			return false;
 		}
 
@@ -2899,7 +2899,7 @@ 
 	 * @return bool
 	 */
 	public function is_class_property( $stackPtr ) {
-		if ( ! isset( $this->tokens[ $stackPtr ] ) || \T_VARIABLE !== $this->tokens[ $stackPtr ]['code'] ) {
+		if ( ! isset( $this->tokens[ $stackPtr ] ) || \T_VARIABLE !== $this->tokens[ $stackPtr ][ 'code' ] ) {
 			return false;
 		}
 
@@ -2913,14 +2913,14 @@ 
 		$scopePtr = $this->valid_direct_scope( $stackPtr, $valid_scopes );
 		if ( false !== $scopePtr ) {
 			// Make sure it's not a method parameter.
-			if ( empty( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
+			if ( empty( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) ) {
 				return true;
 			} else {
-				$parenthesis  = array_keys( $this->tokens[ $stackPtr ]['nested_parenthesis'] );
+				$parenthesis  = array_keys( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] );
 				$deepest_open = array_pop( $parenthesis );
 				if ( $deepest_open < $scopePtr
-					|| isset( $this->tokens[ $deepest_open ]['parenthesis_owner'] ) === false
-					|| \T_FUNCTION !== $this->tokens[ $this->tokens[ $deepest_open ]['parenthesis_owner'] ]['code']
+					|| isset( $this->tokens[ $deepest_open ][ 'parenthesis_owner' ] ) === false
+					|| \T_FUNCTION !== $this->tokens[ $this->tokens[ $deepest_open ][ 'parenthesis_owner' ] ][ 'code' ]
 				) {
 					return true;
 				}
@@ -2947,21 +2947,21 @@ 
 	 * @return int|bool StackPtr to the scope if valid, false otherwise.
 	 */
 	protected function valid_direct_scope( $stackPtr, array $valid_scopes ) {
-		if ( empty( $this->tokens[ $stackPtr ]['conditions'] ) ) {
+		if ( empty( $this->tokens[ $stackPtr ][ 'conditions' ] ) ) {
 			return false;
 		}
 
 		/*
 		 * Check only the direct wrapping scope of the token.
 		 */
-		$conditions = array_keys( $this->tokens[ $stackPtr ]['conditions'] );
+		$conditions = array_keys( $this->tokens[ $stackPtr ][ 'conditions' ] );
 		$ptr        = array_pop( $conditions );
 
 		if ( ! isset( $this->tokens[ $ptr ] ) ) {
 			return false;
 		}
 
-		if ( isset( $valid_scopes[ $this->tokens[ $ptr ]['type'] ] ) ) {
+		if ( isset( $valid_scopes[ $this->tokens[ $ptr ][ 'type' ] ] ) ) {
 			return $ptr;
 		}
 
@@ -2991,8 +2991,8 @@ 
 	protected function is_wpdb_method_call( $stackPtr, $target_methods ) {
 
 		// Check for wpdb.
-		if ( ( \T_VARIABLE === $this->tokens[ $stackPtr ]['code'] && '$wpdb' !== $this->tokens[ $stackPtr ]['content'] )
-			|| ( \T_STRING === $this->tokens[ $stackPtr ]['code'] && 'wpdb' !== $this->tokens[ $stackPtr ]['content'] )
+		if ( ( \T_VARIABLE === $this->tokens[ $stackPtr ][ 'code' ] && '$wpdb' !== $this->tokens[ $stackPtr ][ 'content' ] )
+			|| ( \T_STRING === $this->tokens[ $stackPtr ][ 'code' ] && 'wpdb' !== $this->tokens[ $stackPtr ][ 'content' ] )
 		) {
 			return false;
 		}
@@ -3015,7 +3015,7 @@ 
 			return false;
 		}
 
-		if ( \T_STRING === $this->tokens[ $methodPtr ]['code'] && property_exists( $this, 'methodPtr' ) ) {
+		if ( \T_STRING === $this->tokens[ $methodPtr ][ 'code' ] && property_exists( $this, 'methodPtr' ) ) {
 			$this->methodPtr = $methodPtr;
 		}
 
@@ -3030,21 +3030,21 @@ 
 			$this->i = $opening_paren;
 		}
 
-		if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $opening_paren ]['code']
-			|| ! isset( $this->tokens[ $opening_paren ]['parenthesis_closer'] )
+		if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $opening_paren ][ 'code' ]
+			|| ! isset( $this->tokens[ $opening_paren ][ 'parenthesis_closer' ] )
 		) {
 			return false;
 		}
 
 		// Check that this is one of the methods that we are interested in.
-		if ( ! isset( $target_methods[ $this->tokens[ $methodPtr ]['content'] ] ) ) {
+		if ( ! isset( $target_methods[ $this->tokens[ $methodPtr ][ 'content' ] ] ) ) {
 			return false;
 		}
 
 		// Find the end of the first parameter.
 		$end = $this->phpcsFile->findEndOfStatement( $opening_paren + 1 );
 
-		if ( \T_COMMA !== $this->tokens[ $end ]['code'] ) {
+		if ( \T_COMMA !== $this->tokens[ $end ][ 'code' ] ) {
 			++$end;
 		}
 
@@ -3071,14 +3071,14 @@ 
 		}
 
 		// Is this one of the tokens this function handles ?
-		if ( \T_STRING !== $this->tokens[ $stackPtr ]['code'] ) {
+		if ( \T_STRING !== $this->tokens[ $stackPtr ][ 'code' ] ) {
 			return false;
 		}
 
 		$next = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
 		if ( false !== $next
-			&& ( \T_OPEN_PARENTHESIS === $this->tokens[ $next ]['code']
-				|| \T_DOUBLE_COLON === $this->tokens[ $next ]['code'] )
+			&& ( \T_OPEN_PARENTHESIS === $this->tokens[ $next ][ 'code' ]
+				|| \T_DOUBLE_COLON === $this->tokens[ $next ][ 'code' ] )
 		) {
 			// Function call or declaration.
 			return false;
@@ -3108,7 +3108,7 @@ 
 
 		$prev = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
 		if ( false !== $prev
-			&& isset( $tokens_to_ignore[ $this->tokens[ $prev ]['type'] ] )
+			&& isset( $tokens_to_ignore[ $this->tokens[ $prev ][ 'type' ] ] )
 		) {
 			// Not the use of a constant.
 			return false;
@@ -3120,7 +3120,7 @@ 
 		}
 
 		if ( false !== $prev
-			&& \T_CONST === $this->tokens[ $prev ]['code']
+			&& \T_CONST === $this->tokens[ $prev ][ 'code' ]
 			&& $this->is_class_constant( $prev )
 		) {
 			// Class constant declaration of the same name.
@@ -3131,17 +3131,17 @@ 
 		 * Deal with a number of variations of use statements.
 		 */
 		for ( $i = $stackPtr; $i > 0; $i-- ) {
-			if ( $this->tokens[ $i ]['line'] !== $this->tokens[ $stackPtr ]['line'] ) {
+			if ( $this->tokens[ $i ][ 'line' ] !== $this->tokens[ $stackPtr ][ 'line' ] ) {
 				break;
 			}
 		}
 
 		$firstOnLine = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true );
-		if ( false !== $firstOnLine && \T_USE === $this->tokens[ $firstOnLine ]['code'] ) {
+		if ( false !== $firstOnLine && \T_USE === $this->tokens[ $firstOnLine ][ 'code' ] ) {
 			$nextOnLine = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $firstOnLine + 1 ), null, true );
 			if ( false !== $nextOnLine ) {
-				if ( \T_STRING === $this->tokens[ $nextOnLine ]['code']
-					&& 'const' === $this->tokens[ $nextOnLine ]['content']
+				if ( \T_STRING === $this->tokens[ $nextOnLine ][ 'code' ]
+					&& 'const' === $this->tokens[ $nextOnLine ][ 'content' ]
 				) {
 					$hasNsSep = $this->phpcsFile->findNext( \T_NS_SEPARATOR, ( $nextOnLine + 1 ), $stackPtr );
 					if ( false !== $hasNsSep ) {
@@ -3169,18 +3169,18 @@ 
 	 * @return bool True if it is. False otherwise.
 	 */
 	protected function is_foreach_as( $stackPtr ) {
-		if ( ! isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
+		if ( ! isset( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) ) {
 			return false;
 		}
 
-		$nested_parenthesis = $this->tokens[ $stackPtr ]['nested_parenthesis'];
+		$nested_parenthesis = $this->tokens[ $stackPtr ][ 'nested_parenthesis' ];
 		$close_parenthesis  = end( $nested_parenthesis );
 		$open_parenthesis   = key( $nested_parenthesis );
-		if ( ! isset( $this->tokens[ $close_parenthesis ]['parenthesis_owner'] ) ) {
+		if ( ! isset( $this->tokens[ $close_parenthesis ][ 'parenthesis_owner' ] ) ) {
 			return false;
 		}
 
-		if ( \T_FOREACH !== $this->tokens[ $this->tokens[ $close_parenthesis ]['parenthesis_owner'] ]['code'] ) {
+		if ( \T_FOREACH !== $this->tokens[ $this->tokens[ $close_parenthesis ][ 'parenthesis_owner' ] ][ 'code' ] ) {
 			return false;
 		}
 

Doc Comments +2 added lines, -2 removed lines

@@ -951,7 +951,7 @@ 
 	 * @param bool   $is_error  Optional. Whether to report the message as an 'error' or 'warning'.
 	 *                          Defaults to true (error).
 	 * @param string $code      Optional error code for the message. Defaults to 'Found'.
-	 * @param array  $data      Optional input for the data replacements.
+	 * @param string[]  $data      Optional input for the data replacements.
 	 * @param int    $severity  Optional. Severity level. Defaults to 0 which will translate to
 	 *                          the PHPCS default severity level.
 	 * @return bool
@@ -970,7 +970,7 @@ 
 	 * @param bool   $is_error  Optional. Whether to report the message as an 'error' or 'warning'.
 	 *                          Defaults to true (error).
 	 * @param string $code      Optional error code for the message. Defaults to 'Found'.
-	 * @param array  $data      Optional input for the data replacements.
+	 * @param string[]  $data      Optional input for the data replacements.
 	 * @param int    $severity  Optional. Severity level. Defaults to 0 which will translate to
 	 *                          the PHPCS default severity level.
 	 * @return bool

wpcs/WordPress/AbstractClassRestrictionsSniff.php

Spacing +8 added lines, -8 removed lines

@@ -118,8 +118,8 @@ 
 		$token     = $this->tokens[ $stackPtr ];
 		$classname = '';
 
-		if ( \in_array( $token['code'], array( \T_NEW, \T_EXTENDS, \T_IMPLEMENTS ), true ) ) {
-			if ( \T_NEW === $token['code'] ) {
+		if ( \in_array( $token[ 'code' ], array( \T_NEW, \T_EXTENDS, \T_IMPLEMENTS ), true ) ) {
+			if ( \T_NEW === $token[ 'code' ] ) {
 				$nameEnd = ( $this->phpcsFile->findNext( array( \T_OPEN_PARENTHESIS, \T_WHITESPACE, \T_SEMICOLON, \T_OBJECT_OPERATOR ), ( $stackPtr + 2 ) ) - 1 );
 			} else {
 				$nameEnd = ( $this->phpcsFile->findNext( array( \T_CLOSE_CURLY_BRACKET, \T_WHITESPACE ), ( $stackPtr + 2 ) ) - 1 );
@@ -128,18 +128,18 @@ 
 			$length    = ( $nameEnd - ( $stackPtr + 1 ) );
 			$classname = $this->phpcsFile->getTokensAsString( ( $stackPtr + 2 ), $length );
 
-			if ( \T_NS_SEPARATOR !== $this->tokens[ ( $stackPtr + 2 ) ]['code'] ) {
+			if ( \T_NS_SEPARATOR !== $this->tokens[ ( $stackPtr + 2 ) ][ 'code' ] ) {
 				$classname = $this->get_namespaced_classname( $classname, ( $stackPtr - 1 ) );
 			}
 		}
 
-		if ( \T_DOUBLE_COLON === $token['code'] ) {
+		if ( \T_DOUBLE_COLON === $token[ 'code' ] ) {
 			$nameEnd   = $this->phpcsFile->findPrevious( \T_STRING, ( $stackPtr - 1 ) );
 			$nameStart = ( $this->phpcsFile->findPrevious( array( \T_STRING, \T_NS_SEPARATOR, \T_NAMESPACE ), ( $nameEnd - 1 ), null, true, null, true ) + 1 );
 			$length    = ( $nameEnd - ( $nameStart - 1 ) );
 			$classname = $this->phpcsFile->getTokensAsString( $nameStart, $length );
 
-			if ( \T_NS_SEPARATOR !== $this->tokens[ $nameStart ]['code'] ) {
+			if ( \T_NS_SEPARATOR !== $this->tokens[ $nameStart ][ 'code' ] ) {
 				$classname = $this->get_namespaced_classname( $classname, ( $nameStart - 1 ) );
 			}
 		}
@@ -177,8 +177,8 @@ 
 				continue;
 			}
 
-			if ( preg_match( $group['regex'], $this->classname ) === 1 ) {
-				$skip_to[] = $this->process_matched_token( $stackPtr, $groupName, $this->classname );
+			if ( preg_match( $group[ 'regex' ], $this->classname ) === 1 ) {
+				$skip_to[ ] = $this->process_matched_token( $stackPtr, $groupName, $this->classname );
 			}
 		}
 
@@ -215,7 +215,7 @@ 
 	 */
 	protected function get_namespaced_classname( $classname, $search_from ) {
 		// Don't do anything if this is already a fully qualified classname.
-		if ( empty( $classname ) || '\\' === $classname[0] ) {
+		if ( empty( $classname ) || '\\' === $classname[ 0 ] ) {
 			return $classname;
 		}