gravityview / GravityView

wpcs/WordPress/Sniffs/Security/PluginMenuSlugSniff.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 	public function process_parameters( $stackPtr, $group_name, $matched_content, $parameters ) {
 		foreach ( $this->target_functions[ $matched_content ] as $position ) {
 			if ( isset( $parameters[ $position ] ) ) {
-				$file_constant = $this->phpcsFile->findNext( \T_FILE, $parameters[ $position ]['start'], ( $parameters[ $position ]['end'] + 1 ) );
+				$file_constant = $this->phpcsFile->findNext( \T_FILE, $parameters[ $position ][ 'start' ], ( $parameters[ $position ][ 'end' ] + 1 ) );
 
 				if ( false !== $file_constant ) {
 					$this->phpcsFile->addWarning( 'Using __FILE__ for menu slugs risks exposing filesystem structure.', $stackPtr, 'Using__FILE__' );

wpcs/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php

Spacing +12 added lines, -12 removed lines

@@ -107,7 +107,7 @@ 
 	protected function processVariable( File $phpcs_file, $stack_ptr ) {
 
 		$tokens   = $phpcs_file->getTokens();
-		$var_name = ltrim( $tokens[ $stack_ptr ]['content'], '$' );
+		$var_name = ltrim( $tokens[ $stack_ptr ][ 'content' ], '$' );
 
 		// If it's a php reserved var, then its ok.
 		if ( isset( $this->phpReservedVars[ $var_name ] ) ) {
@@ -123,13 +123,13 @@ 
 		}
 
 		$obj_operator = $phpcs_file->findNext( Tokens::$emptyTokens, ( $stack_ptr + 1 ), null, true );
-		if ( \T_OBJECT_OPERATOR === $tokens[ $obj_operator ]['code'] ) {
+		if ( \T_OBJECT_OPERATOR === $tokens[ $obj_operator ][ 'code' ] ) {
 			// Check to see if we are using a variable from an object.
 			$var = $phpcs_file->findNext( Tokens::$emptyTokens, ( $obj_operator + 1 ), null, true );
-			if ( \T_STRING === $tokens[ $var ]['code'] ) {
+			if ( \T_STRING === $tokens[ $var ][ 'code' ] ) {
 				$bracket = $phpcs_file->findNext( Tokens::$emptyTokens, ( $var + 1 ), null, true );
-				if ( \T_OPEN_PARENTHESIS !== $tokens[ $bracket ]['code'] ) {
-					$obj_var_name = $tokens[ $var ]['content'];
+				if ( \T_OPEN_PARENTHESIS !== $tokens[ $bracket ][ 'code' ] ) {
+					$obj_var_name = $tokens[ $var ][ 'content' ];
 
 					// There is no way for us to know if the var is public or
 					// private, so we have to ignore a leading underscore if there is
@@ -153,7 +153,7 @@ 
 
 		$in_class     = false;
 		$obj_operator = $phpcs_file->findPrevious( Tokens::$emptyTokens, ( $stack_ptr - 1 ), null, true );
-		if ( \T_DOUBLE_COLON === $tokens[ $obj_operator ]['code'] || \T_OBJECT_OPERATOR === $tokens[ $obj_operator ]['code'] ) {
+		if ( \T_DOUBLE_COLON === $tokens[ $obj_operator ][ 'code' ] || \T_OBJECT_OPERATOR === $tokens[ $obj_operator ][ 'code' ] ) {
 			// The variable lives within a class, and is referenced like
 			// this: MyClass::$_variable or $class->variable.
 			$in_class = true;
@@ -199,7 +199,7 @@ 
 
 		$tokens = $phpcs_file->getTokens();
 
-		$var_name     = ltrim( $tokens[ $stack_ptr ]['content'], '$' );
+		$var_name     = ltrim( $tokens[ $stack_ptr ][ 'content' ], '$' );
 		$member_props = $phpcs_file->getMemberProperties( $stack_ptr );
 		if ( empty( $member_props ) ) {
 			// Couldn't get any info about this variable, which
@@ -235,12 +235,12 @@ 
 
 		$tokens = $phpcs_file->getTokens();
 
-		if ( preg_match_all( '|[^\\\]\${?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)|', $tokens[ $stack_ptr ]['content'], $matches ) > 0 ) {
+		if ( preg_match_all( '|[^\\\]\${?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)|', $tokens[ $stack_ptr ][ 'content' ], $matches ) > 0 ) {
 
 			// Merge any custom variables with the defaults.
 			$this->mergeWhiteList();
 
-			foreach ( $matches[1] as $var_name ) {
+			foreach ( $matches[ 1 ] as $var_name ) {
 				// If it's a php reserved var, then its ok.
 				if ( isset( $this->phpReservedVars[ $var_name ] ) ) {
 					continue;
@@ -270,7 +270,7 @@ 
 	 * @return bool
 	 */
 	public static function isSnakeCase( $var_name ) {
-		return (bool) preg_match( '/^[a-z0-9_]+$/', $var_name );
+		return (bool)preg_match( '/^[a-z0-9_]+$/', $var_name );
 	}
 
 	/**
@@ -283,7 +283,7 @@ 
 	 * @return void
 	 */
 	protected function mergeWhiteList() {
-		if ( $this->customPropertiesWhitelist !== $this->addedCustomProperties['properties'] ) {
+		if ( $this->customPropertiesWhitelist !== $this->addedCustomProperties[ 'properties' ] ) {
 			// Fix property potentially passed as comma-delimited string.
 			$customProperties = Sniff::merge_custom_array( $this->customPropertiesWhitelist, array(), false );
 
@@ -292,7 +292,7 @@ 
 				$this->whitelisted_mixed_case_member_var_names
 			);
 
-			$this->addedCustomProperties['properties'] = $this->customPropertiesWhitelist;
+			$this->addedCustomProperties[ 'properties' ] = $this->customPropertiesWhitelist;
 		}
 	}
 

wpcs/WordPress/Sniffs/NamingConventions/ValidHookNameSniff.php

Spacing +8 added lines, -8 removed lines

@@ -93,7 +93,7 @@ 
 			return;
 		}
 
-		if ( ! isset( $parameters[1] ) ) {
+		if ( ! isset( $parameters[ 1 ] ) ) {
 			return;
 		}
 
@@ -104,18 +104,18 @@ 
 		$content     = array();
 		$expected    = array();
 
-		for ( $i = $parameters[1]['start']; $i <= $parameters[1]['end']; $i++ ) {
-			$content[ $i ]  = $this->tokens[ $i ]['content'];
-			$expected[ $i ] = $this->tokens[ $i ]['content'];
+		for ( $i = $parameters[ 1 ][ 'start' ]; $i <= $parameters[ 1 ][ 'end' ]; $i++ ) {
+			$content[ $i ]  = $this->tokens[ $i ][ 'content' ];
+			$expected[ $i ] = $this->tokens[ $i ][ 'content' ];
 
-			if ( \in_array( $this->tokens[ $i ]['code'], array( \T_CONSTANT_ENCAPSED_STRING, \T_DOUBLE_QUOTED_STRING ), true ) ) {
-				$string = $this->strip_quotes( $this->tokens[ $i ]['content'] );
+			if ( \in_array( $this->tokens[ $i ][ 'code' ], array( \T_CONSTANT_ENCAPSED_STRING, \T_DOUBLE_QUOTED_STRING ), true ) ) {
+				$string = $this->strip_quotes( $this->tokens[ $i ][ 'content' ] );
 
 				/*
 				 * Here be dragons - a double quoted string can contain extrapolated variables
 				 * which don't have to comply with these rules.
 				 */
-				if ( \T_DOUBLE_QUOTED_STRING === $this->tokens[ $i ]['code'] ) {
+				if ( \T_DOUBLE_QUOTED_STRING === $this->tokens[ $i ][ 'code' ] ) {
 					$transform       = $this->transform_complex_string( $string, $regex );
 					$case_transform  = $this->transform_complex_string( $string, $regex, 'case' );
 					$punct_transform = $this->transform_complex_string( $string, $regex, 'punctuation' );
@@ -129,7 +129,7 @@ 
 					continue;
 				}
 
-				if ( \T_DOUBLE_QUOTED_STRING === $this->tokens[ $i ]['code'] ) {
+				if ( \T_DOUBLE_QUOTED_STRING === $this->tokens[ $i ][ 'code' ] ) {
 					$expected[ $i ] = '"' . $transform . '"';
 				} else {
 					$expected[ $i ] = '\'' . $transform . '\'';

wpcs/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 		$tokens = $phpcsFile->getTokens();
 
 		// Determine if this is a function which needs to be examined.
-		$conditions = $tokens[ $stackPtr ]['conditions'];
+		$conditions = $tokens[ $stackPtr ][ 'conditions' ];
 		end( $conditions );
 		$deepestScope = key( $conditions );
 		if ( $deepestScope !== $currScope ) {

wpcs/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php

Spacing +56 added lines, -56 removed lines

@@ -195,10 +195,10 @@ 
 	public function register() {
 		// Get a list of all PHP native functions.
 		$all_functions            = get_defined_functions();
-		$this->built_in_functions = array_flip( $all_functions['internal'] );
+		$this->built_in_functions = array_flip( $all_functions[ 'internal' ] );
 
 		// Set the sniff targets.
-		$targets  = array(
+		$targets = array(
 			\T_NAMESPACE => \T_NAMESPACE,
 			\T_FUNCTION  => \T_FUNCTION,
 			\T_CONST     => \T_CONST,
@@ -210,7 +210,7 @@ 
 		// Add function call target for hook names and constants defined using define().
 		$parent = parent::register();
 		if ( ! empty( $parent ) ) {
-			$targets[] = \T_STRING;
+			$targets[ ] = \T_STRING;
 		}
 
 		return $targets;
@@ -225,7 +225,7 @@ 
 	 */
 	public function getGroups() {
 		$this->target_functions           = $this->hookInvokeFunctions;
-		$this->target_functions['define'] = true;
+		$this->target_functions[ 'define' ] = true;
 
 		return parent::getGroups();
 	}
@@ -273,36 +273,36 @@ 
 		}
 
 		// Ignore test classes.
-		if ( isset( Tokens::$ooScopeTokens[ $this->tokens[ $stackPtr ]['code'] ] )
+		if ( isset( Tokens::$ooScopeTokens[ $this->tokens[ $stackPtr ][ 'code' ] ] )
 			&& true === $this->is_test_class( $stackPtr )
 		) {
-			if ( $this->tokens[ $stackPtr ]['scope_condition'] === $stackPtr && isset( $this->tokens[ $stackPtr ]['scope_closer'] ) ) {
+			if ( $this->tokens[ $stackPtr ][ 'scope_condition' ] === $stackPtr && isset( $this->tokens[ $stackPtr ][ 'scope_closer' ] ) ) {
 				// Skip forward to end of test class.
-				return $this->tokens[ $stackPtr ]['scope_closer'];
+				return $this->tokens[ $stackPtr ][ 'scope_closer' ];
 			}
 			return;
 		}
 
-		if ( \T_ANON_CLASS === $this->tokens[ $stackPtr ]['code'] ) {
+		if ( \T_ANON_CLASS === $this->tokens[ $stackPtr ][ 'code' ] ) {
 			// Token was only registered to allow skipping over test classes.
 			return;
 		}
 
-		if ( \T_STRING === $this->tokens[ $stackPtr ]['code'] ) {
+		if ( \T_STRING === $this->tokens[ $stackPtr ][ 'code' ] ) {
 			// Disallow excluding function groups for this sniff.
 			$this->exclude = array();
 
 			return parent::process_token( $stackPtr );
 
-		} elseif ( \T_DOLLAR === $this->tokens[ $stackPtr ]['code'] ) {
+		} elseif ( \T_DOLLAR === $this->tokens[ $stackPtr ][ 'code' ] ) {
 
 			return $this->process_variable_variable( $stackPtr );
 
-		} elseif ( \T_VARIABLE === $this->tokens[ $stackPtr ]['code'] ) {
+		} elseif ( \T_VARIABLE === $this->tokens[ $stackPtr ][ 'code' ] ) {
 
 			return $this->process_variable_assignment( $stackPtr );
 
-		} elseif ( \T_NAMESPACE === $this->tokens[ $stackPtr ]['code'] ) {
+		} elseif ( \T_NAMESPACE === $this->tokens[ $stackPtr ][ 'code' ] ) {
 			$namespace_name = $this->get_declared_namespace_name( $stackPtr );
 
 			if ( false === $namespace_name || '' === $namespace_name || '\\' === $namespace_name ) {
@@ -310,14 +310,14 @@ 
 			}
 
 			foreach ( $this->validated_namespace_prefixes as $key => $prefix_info ) {
-				if ( false === $prefix_info['is_regex'] ) {
-					if ( stripos( $namespace_name, $prefix_info['prefix'] ) === 0 ) {
+				if ( false === $prefix_info[ 'is_regex' ] ) {
+					if ( stripos( $namespace_name, $prefix_info[ 'prefix' ] ) === 0 ) {
 						$this->phpcsFile->recordMetric( $stackPtr, 'Prefix all globals: allowed prefixes', $key );
 						return;
 					}
 				} else {
 					// Ok, so this prefix should be used as a regex.
-					$regex = '`^' . $prefix_info['prefix'] . '`i';
+					$regex = '`^' . $prefix_info[ 'prefix' ] . '`i';
 					if ( preg_match( $regex, $namespace_name ) > 0 ) {
 						$this->phpcsFile->recordMetric( $stackPtr, 'Prefix all globals: allowed prefixes', $key );
 						return;
@@ -354,7 +354,7 @@ 
 			$error_text = 'Unknown syntax used';
 			$error_code = 'NonPrefixedSyntaxFound';
 
-			switch ( $this->tokens[ $stackPtr ]['type'] ) {
+			switch ( $this->tokens[ $stackPtr ][ 'type' ] ) {
 				case 'T_FUNCTION':
 					// Methods in a class do not need to be prefixed.
 					if ( $this->phpcsFile->hasCondition( $stackPtr, Tokens::$ooScopeTokens ) === true ) {
@@ -378,7 +378,7 @@ 
 					$error_text = 'Classes declared';
 					$error_code = 'NonPrefixedClassFound';
 
-					switch ( $this->tokens[ $stackPtr ]['type'] ) {
+					switch ( $this->tokens[ $stackPtr ][ 'type' ] ) {
 						case 'T_CLASS':
 							if ( class_exists( '\\' . $item_name, false ) ) {
 								// Backfill for PHP native class.
@@ -426,7 +426,7 @@ 
 						return;
 					}
 
-					$item_name = $this->tokens[ $constant_name_ptr ]['content'];
+					$item_name = $this->tokens[ $constant_name_ptr ][ 'content' ];
 					if ( \defined( '\\' . $item_name ) ) {
 						// Backfill for PHP native constant.
 						return;
@@ -486,26 +486,26 @@ 
 		// Is this a variable variable ?
 		// Not concerned with nested ones as those will be recognized on their own token.
 		$next_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true, null, true );
-		if ( false === $next_non_empty || ! isset( $indicators[ $this->tokens[ $next_non_empty ]['code'] ] ) ) {
+		if ( false === $next_non_empty || ! isset( $indicators[ $this->tokens[ $next_non_empty ][ 'code' ] ] ) ) {
 			return;
 		}
 
-		if ( \T_OPEN_CURLY_BRACKET === $this->tokens[ $next_non_empty ]['code']
-			&& isset( $this->tokens[ $next_non_empty ]['bracket_closer'] )
+		if ( \T_OPEN_CURLY_BRACKET === $this->tokens[ $next_non_empty ][ 'code' ]
+			&& isset( $this->tokens[ $next_non_empty ][ 'bracket_closer' ] )
 		) {
 			// Skip over the variable part.
-			$next_non_empty = $this->tokens[ $next_non_empty ]['bracket_closer'];
+			$next_non_empty = $this->tokens[ $next_non_empty ][ 'bracket_closer' ];
 		}
 
 		$maybe_assignment = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $next_non_empty + 1 ), null, true, null, true );
 
 		while ( false !== $maybe_assignment
-			&& \T_OPEN_SQUARE_BRACKET === $this->tokens[ $maybe_assignment ]['code']
-			&& isset( $this->tokens[ $maybe_assignment ]['bracket_closer'] )
+			&& \T_OPEN_SQUARE_BRACKET === $this->tokens[ $maybe_assignment ][ 'code' ]
+			&& isset( $this->tokens[ $maybe_assignment ][ 'bracket_closer' ] )
 		) {
 			$maybe_assignment = $this->phpcsFile->findNext(
 				Tokens::$emptyTokens,
-				( $this->tokens[ $maybe_assignment ]['bracket_closer'] + 1 ),
+				( $this->tokens[ $maybe_assignment ][ 'bracket_closer' ] + 1 ),
 				null,
 				true,
 				null,
@@ -517,7 +517,7 @@ 
 			return;
 		}
 
-		if ( ! isset( Tokens::$assignmentTokens[ $this->tokens[ $maybe_assignment ]['code'] ] ) ) {
+		if ( ! isset( Tokens::$assignmentTokens[ $this->tokens[ $maybe_assignment ][ 'code' ] ] ) ) {
 			// Not an assignment.
 			return;
 		}
@@ -538,7 +538,7 @@ 
 				$condition = $this->phpcsFile->getCondition( $stackPtr, \T_CLOSURE );
 			}
 
-			$has_global = $this->phpcsFile->findPrevious( \T_GLOBAL, ( $stackPtr - 1 ), $this->tokens[ $condition ]['scope_opener'] );
+			$has_global = $this->phpcsFile->findPrevious( \T_GLOBAL, ( $stackPtr - 1 ), $this->tokens[ $condition ][ 'scope_opener' ] );
 			if ( false === $has_global ) {
 				// No variable import happening.
 				return;
@@ -592,7 +592,7 @@ 
 		}
 
 		$is_error      = true;
-		$variable_name = substr( $this->tokens[ $stackPtr ]['content'], 1 ); // Strip the dollar sign.
+		$variable_name = substr( $this->tokens[ $stackPtr ][ 'content' ], 1 ); // Strip the dollar sign.
 
 		// Bow out early if we know for certain no prefix is needed.
 		if ( $this->variable_prefixed_or_whitelisted( $stackPtr, $variable_name ) === true ) {
@@ -601,7 +601,7 @@ 
 
 		if ( 'GLOBALS' === $variable_name ) {
 			$array_open = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true, null, true );
-			if ( false === $array_open || \T_OPEN_SQUARE_BRACKET !== $this->tokens[ $array_open ]['code'] ) {
+			if ( false === $array_open || \T_OPEN_SQUARE_BRACKET !== $this->tokens[ $array_open ][ 'code' ] ) {
 				// Live coding or something very silly.
 				return;
 			}
@@ -613,20 +613,20 @@ 
 			}
 
 			$stackPtr      = $array_key;
-			$variable_name = $this->strip_quotes( $this->tokens[ $array_key ]['content'] );
+			$variable_name = $this->strip_quotes( $this->tokens[ $array_key ][ 'content' ] );
 
 			// Check whether a prefix is needed.
-			if ( isset( Tokens::$stringTokens[ $this->tokens[ $array_key ]['code'] ] )
+			if ( isset( Tokens::$stringTokens[ $this->tokens[ $array_key ][ 'code' ] ] )
 				&& $this->variable_prefixed_or_whitelisted( $stackPtr, $variable_name ) === true
 			) {
 				return;
 			}
 
-			if ( \T_DOUBLE_QUOTED_STRING === $this->tokens[ $array_key ]['code'] ) {
+			if ( \T_DOUBLE_QUOTED_STRING === $this->tokens[ $array_key ][ 'code' ] ) {
 				// If the array key is a double quoted string, try again with only
 				// the part before the first variable (if any).
 				$exploded = explode( '$', $variable_name );
-				$first    = rtrim( $exploded[0], '{' );
+				$first    = rtrim( $exploded[ 0 ], '{' );
 				if ( '' !== $first ) {
 					if ( $this->variable_prefixed_or_whitelisted( $array_key, $first ) === true ) {
 						return;
@@ -635,17 +635,17 @@ 
 					// If the first part was dynamic, throw a warning.
 					$is_error = false;
 				}
-			} elseif ( ! isset( Tokens::$stringTokens[ $this->tokens[ $array_key ]['code'] ] ) ) {
+			} elseif ( ! isset( Tokens::$stringTokens[ $this->tokens[ $array_key ][ 'code' ] ] ) ) {
 				// Dynamic array key, throw a warning.
 				$is_error = false;
 			}
 		} else {
 			// Function parameters do not need to be prefixed.
-			if ( isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
-				foreach ( $this->tokens[ $stackPtr ]['nested_parenthesis'] as $opener => $closer ) {
-					if ( isset( $this->tokens[ $opener ]['parenthesis_owner'] )
-						&& ( \T_FUNCTION === $this->tokens[ $this->tokens[ $opener ]['parenthesis_owner'] ]['code']
-							|| \T_CLOSURE === $this->tokens[ $this->tokens[ $opener ]['parenthesis_owner'] ]['code'] )
+			if ( isset( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) ) {
+				foreach ( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] as $opener => $closer ) {
+					if ( isset( $this->tokens[ $opener ][ 'parenthesis_owner' ] )
+						&& ( \T_FUNCTION === $this->tokens[ $this->tokens[ $opener ][ 'parenthesis_owner' ] ][ 'code' ]
+							|| \T_CLOSURE === $this->tokens[ $this->tokens[ $opener ][ 'parenthesis_owner' ] ][ 'code' ] )
 					) {
 						return;
 					}
@@ -665,7 +665,7 @@ 
 					$condition = $this->phpcsFile->getCondition( $stackPtr, \T_CLOSURE );
 				}
 
-				$has_global = $this->phpcsFile->findPrevious( \T_GLOBAL, ( $stackPtr - 1 ), $this->tokens[ $condition ]['scope_opener'] );
+				$has_global = $this->phpcsFile->findPrevious( \T_GLOBAL, ( $stackPtr - 1 ), $this->tokens[ $condition ][ 'scope_opener' ] );
 				if ( false === $has_global ) {
 					// No variable import happening.
 					return;
@@ -688,7 +688,7 @@ 
 						return;
 					}
 
-					if ( substr( $this->tokens[ $ptr ]['content'], 1 ) === $variable_name ) {
+					if ( substr( $this->tokens[ $ptr ][ 'content' ], 1 ) === $variable_name ) {
 						break;
 					}
 				}
@@ -735,12 +735,12 @@ 
 		}
 
 		// No matter whether it is a constant definition or a hook call, both use the first parameter.
-		if ( ! isset( $parameters[1] ) ) {
+		if ( ! isset( $parameters[ 1 ] ) ) {
 			return;
 		}
 
 		$is_error    = true;
-		$raw_content = $this->strip_quotes( $parameters[1]['raw'] );
+		$raw_content = $this->strip_quotes( $parameters[ 1 ][ 'raw' ] );
 
 		if ( ( 'define' !== $matched_content
 			&& isset( $this->whitelisted_core_hooks[ $raw_content ] ) )
@@ -750,14 +750,14 @@ 
 			return;
 		}
 
-		if ( $this->is_prefixed( $parameters[1]['start'], $raw_content ) === true ) {
+		if ( $this->is_prefixed( $parameters[ 1 ][ 'start' ], $raw_content ) === true ) {
 			return;
 		} else {
 			// This may be a dynamic hook/constant name.
 			$first_non_empty = $this->phpcsFile->findNext(
 				Tokens::$emptyTokens,
-				$parameters[1]['start'],
-				( $parameters[1]['end'] + 1 ),
+				$parameters[ 1 ][ 'start' ],
+				( $parameters[ 1 ][ 'end' ] + 1 ),
 				true
 			);
 
@@ -765,29 +765,29 @@ 
 				return;
 			}
 
-			$first_non_empty_content = $this->strip_quotes( $this->tokens[ $first_non_empty ]['content'] );
+			$first_non_empty_content = $this->strip_quotes( $this->tokens[ $first_non_empty ][ 'content' ] );
 
 			// Try again with just the first token if it's a text string.
-			if ( isset( Tokens::$stringTokens[ $this->tokens[ $first_non_empty ]['code'] ] )
-				&& $this->is_prefixed( $parameters[1]['start'], $first_non_empty_content ) === true
+			if ( isset( Tokens::$stringTokens[ $this->tokens[ $first_non_empty ][ 'code' ] ] )
+				&& $this->is_prefixed( $parameters[ 1 ][ 'start' ], $first_non_empty_content ) === true
 			) {
 				return;
 			}
 
-			if ( \T_DOUBLE_QUOTED_STRING === $this->tokens[ $first_non_empty ]['code'] ) {
+			if ( \T_DOUBLE_QUOTED_STRING === $this->tokens[ $first_non_empty ][ 'code' ] ) {
 				// If the first part of the parameter is a double quoted string, try again with only
 				// the part before the first variable (if any).
 				$exploded = explode( '$', $first_non_empty_content );
-				$first    = rtrim( $exploded[0], '{' );
+				$first    = rtrim( $exploded[ 0 ], '{' );
 				if ( '' !== $first ) {
-					if ( $this->is_prefixed( $parameters[1]['start'], $first ) === true ) {
+					if ( $this->is_prefixed( $parameters[ 1 ][ 'start' ], $first ) === true ) {
 						return;
 					}
 				} else {
 					// Start of hook/constant name is dynamic, throw a warning.
 					$is_error = false;
 				}
-			} elseif ( ! isset( Tokens::$stringTokens[ $this->tokens[ $first_non_empty ]['code'] ] ) ) {
+			} elseif ( ! isset( Tokens::$stringTokens[ $this->tokens[ $first_non_empty ][ 'code' ] ] ) ) {
 				// Dynamic hook/constant name, throw a warning.
 				$is_error = false;
 			}
@@ -817,7 +817,7 @@ 
 			}
 		}
 
-		$data[] = $raw_content;
+		$data[ ] = $raw_content;
 
 		$recorded = $this->addMessage( self::ERROR_MSG, $first_non_empty, $is_error, $error_code, $data );
 
@@ -959,9 +959,9 @@ 
 	 */
 	private function record_potential_prefix_metric( $stackPtr, $construct_name ) {
 		if ( preg_match( '`^([A-Z]*[a-z0-9]*+)`', ltrim( $construct_name, '\$_' ), $matches ) > 0
-			&& isset( $matches[1] ) && '' !== $matches[1]
+			&& isset( $matches[ 1 ] ) && '' !== $matches[ 1 ]
 		) {
-			$this->phpcsFile->recordMetric( $stackPtr, 'Prefix all globals: potential prefixes - start of non-prefixed construct', strtolower( $matches[1] ) );
+			$this->phpcsFile->recordMetric( $stackPtr, 'Prefix all globals: potential prefixes - start of non-prefixed construct', strtolower( $matches[ 1 ] ) );
 		}
 	}
 }

wpcs/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php

Spacing +82 added lines, -82 removed lines

@@ -111,11 +111,11 @@ 
 	 * @return void
 	 */
 	public function process_token( $stackPtr ) {
-		$this->spaces_before_closure_open_paren = (int) $this->spaces_before_closure_open_paren;
+		$this->spaces_before_closure_open_paren = (int)$this->spaces_before_closure_open_paren;
 
-		if ( isset( $this->tokens[ ( $stackPtr + 1 ) ] ) && \T_WHITESPACE !== $this->tokens[ ( $stackPtr + 1 ) ]['code']
-			&& ! ( \T_ELSE === $this->tokens[ $stackPtr ]['code'] && \T_COLON === $this->tokens[ ( $stackPtr + 1 ) ]['code'] )
-			&& ! ( \T_CLOSURE === $this->tokens[ $stackPtr ]['code']
+		if ( isset( $this->tokens[ ( $stackPtr + 1 ) ] ) && \T_WHITESPACE !== $this->tokens[ ( $stackPtr + 1 ) ][ 'code' ]
+			&& ! ( \T_ELSE === $this->tokens[ $stackPtr ][ 'code' ] && \T_COLON === $this->tokens[ ( $stackPtr + 1 ) ][ 'code' ] )
+			&& ! ( \T_CLOSURE === $this->tokens[ $stackPtr ][ 'code' ]
 				&& 0 >= $this->spaces_before_closure_open_paren )
 		) {
 			$error = 'Space after opening control structure is required';
@@ -126,25 +126,25 @@ 
 			}
 		}
 
-		if ( ! isset( $this->tokens[ $stackPtr ]['scope_closer'] ) ) {
+		if ( ! isset( $this->tokens[ $stackPtr ][ 'scope_closer' ] ) ) {
 
-			if ( \T_USE === $this->tokens[ $stackPtr ]['code'] && 'closure' === $this->get_use_type( $stackPtr ) ) {
+			if ( \T_USE === $this->tokens[ $stackPtr ][ 'code' ] && 'closure' === $this->get_use_type( $stackPtr ) ) {
 				$scopeOpener = $this->phpcsFile->findNext( \T_OPEN_CURLY_BRACKET, ( $stackPtr + 1 ) );
-				$scopeCloser = $this->tokens[ $scopeOpener ]['scope_closer'];
-			} elseif ( \T_WHILE !== $this->tokens[ $stackPtr ]['code'] ) {
+				$scopeCloser = $this->tokens[ $scopeOpener ][ 'scope_closer' ];
+			} elseif ( \T_WHILE !== $this->tokens[ $stackPtr ][ 'code' ] ) {
 				return;
 			}
 		} else {
-			$scopeOpener = $this->tokens[ $stackPtr ]['scope_opener'];
-			$scopeCloser = $this->tokens[ $stackPtr ]['scope_closer'];
+			$scopeOpener = $this->tokens[ $stackPtr ][ 'scope_opener' ];
+			$scopeCloser = $this->tokens[ $stackPtr ][ 'scope_closer' ];
 		}
 
 		// Alternative syntax.
-		if ( isset( $scopeOpener ) && \T_COLON === $this->tokens[ $scopeOpener ]['code'] ) {
+		if ( isset( $scopeOpener ) && \T_COLON === $this->tokens[ $scopeOpener ][ 'code' ] ) {
 
 			if ( 'required' === $this->space_before_colon ) {
 
-				if ( \T_WHITESPACE !== $this->tokens[ ( $scopeOpener - 1 ) ]['code'] ) {
+				if ( \T_WHITESPACE !== $this->tokens[ ( $scopeOpener - 1 ) ][ 'code' ] ) {
 					$error = 'Space between opening control structure and T_COLON is required';
 					$fix   = $this->phpcsFile->addFixableError( $error, $scopeOpener, 'NoSpaceBetweenStructureColon' );
 
@@ -154,7 +154,7 @@ 
 				}
 			} elseif ( 'forbidden' === $this->space_before_colon ) {
 
-				if ( \T_WHITESPACE === $this->tokens[ ( $scopeOpener - 1 ) ]['code'] ) {
+				if ( \T_WHITESPACE === $this->tokens[ ( $scopeOpener - 1 ) ][ 'code' ] ) {
 					$error = 'Extra space between opening control structure and T_COLON found';
 					$fix   = $this->phpcsFile->addFixableError( $error, ( $scopeOpener - 1 ), 'SpaceBetweenStructureColon' );
 
@@ -168,13 +168,13 @@ 
 		$parenthesisOpener = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
 
 		// If this is a function declaration.
-		if ( \T_FUNCTION === $this->tokens[ $stackPtr ]['code'] ) {
+		if ( \T_FUNCTION === $this->tokens[ $stackPtr ][ 'code' ] ) {
 
-			if ( \T_STRING === $this->tokens[ $parenthesisOpener ]['code'] ) {
+			if ( \T_STRING === $this->tokens[ $parenthesisOpener ][ 'code' ] ) {
 
 				$function_name_ptr = $parenthesisOpener;
 
-			} elseif ( \T_BITWISE_AND === $this->tokens[ $parenthesisOpener ]['code'] ) {
+			} elseif ( \T_BITWISE_AND === $this->tokens[ $parenthesisOpener ][ 'code' ] ) {
 
 				// This function returns by reference (function &function_name() {}).
 				$parenthesisOpener = $this->phpcsFile->findNext(
@@ -202,7 +202,7 @@ 
 						$error,
 						$stackPtr,
 						'SpaceBeforeFunctionOpenParenthesis',
-						$this->tokens[ ( $function_name_ptr + 1 ) ]['content']
+						$this->tokens[ ( $function_name_ptr + 1 ) ][ 'content' ]
 					);
 
 					if ( true === $fix ) {
@@ -210,14 +210,14 @@ 
 					}
 				}
 			}
-		} elseif ( \T_CLOSURE === $this->tokens[ $stackPtr ]['code'] ) {
+		} elseif ( \T_CLOSURE === $this->tokens[ $stackPtr ][ 'code' ] ) {
 
 			// Check if there is a use () statement.
-			if ( isset( $this->tokens[ $parenthesisOpener ]['parenthesis_closer'] ) ) {
+			if ( isset( $this->tokens[ $parenthesisOpener ][ 'parenthesis_closer' ] ) ) {
 
 				$usePtr = $this->phpcsFile->findNext(
 					Tokens::$emptyTokens,
-					( $this->tokens[ $parenthesisOpener ]['parenthesis_closer'] + 1 ),
+					( $this->tokens[ $parenthesisOpener ][ 'parenthesis_closer' ] + 1 ),
 					null,
 					true,
 					null,
@@ -225,17 +225,17 @@ 
 				);
 
 				// If it is, we set that as the "scope opener".
-				if ( \T_USE === $this->tokens[ $usePtr ]['code'] ) {
+				if ( \T_USE === $this->tokens[ $usePtr ][ 'code' ] ) {
 					$scopeOpener = $usePtr;
 				}
 			}
 		}
 
-		if ( \T_COLON !== $this->tokens[ $parenthesisOpener ]['code']
-			&& \T_FUNCTION !== $this->tokens[ $stackPtr ]['code']
+		if ( \T_COLON !== $this->tokens[ $parenthesisOpener ][ 'code' ]
+			&& \T_FUNCTION !== $this->tokens[ $stackPtr ][ 'code' ]
 		) {
 
-			if ( \T_CLOSURE === $this->tokens[ $stackPtr ]['code']
+			if ( \T_CLOSURE === $this->tokens[ $stackPtr ][ 'code' ]
 				&& 0 === $this->spaces_before_closure_open_paren
 			) {
 
@@ -250,7 +250,7 @@ 
 				}
 			} elseif (
 				(
-					\T_CLOSURE !== $this->tokens[ $stackPtr ]['code']
+					\T_CLOSURE !== $this->tokens[ $stackPtr ][ 'code' ]
 					|| 1 === $this->spaces_before_closure_open_paren
 				)
 				&& ( $stackPtr + 1 ) === $parenthesisOpener
@@ -266,8 +266,8 @@ 
 			}
 		}
 
-		if ( \T_WHITESPACE === $this->tokens[ ( $stackPtr + 1 ) ]['code']
-			&& ' ' !== $this->tokens[ ( $stackPtr + 1 ) ]['content']
+		if ( \T_WHITESPACE === $this->tokens[ ( $stackPtr + 1 ) ][ 'code' ]
+			&& ' ' !== $this->tokens[ ( $stackPtr + 1 ) ][ 'content' ]
 		) {
 			// Checking this: if [*](...) {}.
 			$error = 'Expected exactly one space before opening parenthesis; "%s" found.';
@@ -275,7 +275,7 @@ 
 				$error,
 				$stackPtr,
 				'ExtraSpaceBeforeOpenParenthesis',
-				$this->tokens[ ( $stackPtr + 1 ) ]['content']
+				$this->tokens[ ( $stackPtr + 1 ) ][ 'content' ]
 			);
 
 			if ( true === $fix ) {
@@ -283,8 +283,8 @@ 
 			}
 		}
 
-		if ( \T_CLOSE_PARENTHESIS !== $this->tokens[ ( $parenthesisOpener + 1 ) ]['code'] ) {
-			if ( \T_WHITESPACE !== $this->tokens[ ( $parenthesisOpener + 1 ) ]['code'] ) {
+		if ( \T_CLOSE_PARENTHESIS !== $this->tokens[ ( $parenthesisOpener + 1 ) ][ 'code' ] ) {
+			if ( \T_WHITESPACE !== $this->tokens[ ( $parenthesisOpener + 1 ) ][ 'code' ] ) {
 				// Checking this: $value = my_function([*]...).
 				$error = 'No space after opening parenthesis is prohibited';
 				$fix   = $this->phpcsFile->addFixableError( $error, $stackPtr, 'NoSpaceAfterOpenParenthesis' );
@@ -292,10 +292,10 @@ 
 				if ( true === $fix ) {
 					$this->phpcsFile->fixer->addContent( $parenthesisOpener, ' ' );
 				}
-			} elseif ( ( ' ' !== $this->tokens[ ( $parenthesisOpener + 1 ) ]['content']
-				&& "\n" !== $this->tokens[ ( $parenthesisOpener + 1 ) ]['content']
-				&& "\r\n" !== $this->tokens[ ( $parenthesisOpener + 1 ) ]['content'] )
-				&& ! isset( $this->ignore_extra_space_after_open_paren[ $this->tokens[ $stackPtr ]['code'] ] )
+			} elseif ( ( ' ' !== $this->tokens[ ( $parenthesisOpener + 1 ) ][ 'content' ]
+				&& "\n" !== $this->tokens[ ( $parenthesisOpener + 1 ) ][ 'content' ]
+				&& "\r\n" !== $this->tokens[ ( $parenthesisOpener + 1 ) ][ 'content' ] )
+				&& ! isset( $this->ignore_extra_space_after_open_paren[ $this->tokens[ $stackPtr ][ 'code' ] ] )
 			) {
 				// Checking this: if ([*]...) {}.
 				$error = 'Expected exactly one space after opening parenthesis; "%s" found.';
@@ -303,7 +303,7 @@ 
 					$error,
 					$stackPtr,
 					'ExtraSpaceAfterOpenParenthesis',
-					$this->tokens[ ( $parenthesisOpener + 1 ) ]['content']
+					$this->tokens[ ( $parenthesisOpener + 1 ) ][ 'content' ]
 				);
 
 				if ( true === $fix ) {
@@ -312,29 +312,29 @@ 
 			}
 		}
 
-		if ( isset( $this->tokens[ $parenthesisOpener ]['parenthesis_closer'] ) ) {
+		if ( isset( $this->tokens[ $parenthesisOpener ][ 'parenthesis_closer' ] ) ) {
 
-			$parenthesisCloser = $this->tokens[ $parenthesisOpener ]['parenthesis_closer'];
+			$parenthesisCloser = $this->tokens[ $parenthesisOpener ][ 'parenthesis_closer' ];
 
-			if ( \T_CLOSE_PARENTHESIS !== $this->tokens[ ( $parenthesisOpener + 1 ) ]['code'] ) {
+			if ( \T_CLOSE_PARENTHESIS !== $this->tokens[ ( $parenthesisOpener + 1 ) ][ 'code' ] ) {
 
 				// Checking this: if (...[*]) {}.
-				if ( \T_WHITESPACE !== $this->tokens[ ( $parenthesisCloser - 1 ) ]['code'] ) {
+				if ( \T_WHITESPACE !== $this->tokens[ ( $parenthesisCloser - 1 ) ][ 'code' ] ) {
 					$error = 'No space before closing parenthesis is prohibited';
 					$fix   = $this->phpcsFile->addFixableError( $error, $parenthesisCloser, 'NoSpaceBeforeCloseParenthesis' );
 
 					if ( true === $fix ) {
 						$this->phpcsFile->fixer->addContentBefore( $parenthesisCloser, ' ' );
 					}
-				} elseif ( ' ' !== $this->tokens[ ( $parenthesisCloser - 1 ) ]['content'] ) {
+				} elseif ( ' ' !== $this->tokens[ ( $parenthesisCloser - 1 ) ][ 'content' ] ) {
 					$prevNonEmpty = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $parenthesisCloser - 1 ), null, true );
-					if ( $this->tokens[ ( $parenthesisCloser ) ]['line'] === $this->tokens[ ( $prevNonEmpty + 1 ) ]['line'] ) {
+					if ( $this->tokens[ ( $parenthesisCloser ) ][ 'line' ] === $this->tokens[ ( $prevNonEmpty + 1 ) ][ 'line' ] ) {
 						$error = 'Expected exactly one space before closing parenthesis; "%s" found.';
 						$fix   = $this->phpcsFile->addFixableError(
 							$error,
 							$stackPtr,
 							'ExtraSpaceBeforeCloseParenthesis',
-							$this->tokens[ ( $parenthesisCloser - 1 ) ]['content']
+							$this->tokens[ ( $parenthesisCloser - 1 ) ][ 'content' ]
 						);
 
 						if ( true === $fix ) {
@@ -343,12 +343,12 @@ 
 					}
 				}
 
-				if ( \T_WHITESPACE !== $this->tokens[ ( $parenthesisCloser + 1 ) ]['code']
+				if ( \T_WHITESPACE !== $this->tokens[ ( $parenthesisCloser + 1 ) ][ 'code' ]
 					&& ! ( // Do NOT flag : immediately following ) for return types declarations.
-						\T_COLON === $this->tokens[ ( $parenthesisCloser + 1 ) ]['code']
-						&& in_array( $this->tokens[ $this->tokens[ $parenthesisCloser ]['parenthesis_owner'] ]['code'], array( \T_FUNCTION, \T_CLOSURE ), true )
+						\T_COLON === $this->tokens[ ( $parenthesisCloser + 1 ) ][ 'code' ]
+						&& in_array( $this->tokens[ $this->tokens[ $parenthesisCloser ][ 'parenthesis_owner' ] ][ 'code' ], array( \T_FUNCTION, \T_CLOSURE ), true )
 					)
-					&& ( isset( $scopeOpener ) && \T_COLON !== $this->tokens[ $scopeOpener ]['code'] )
+					&& ( isset( $scopeOpener ) && \T_COLON !== $this->tokens[ $scopeOpener ][ 'code' ] )
 				) {
 					$error = 'Space between opening control structure and closing parenthesis is required';
 					$fix   = $this->phpcsFile->addFixableError( $error, $scopeOpener, 'NoSpaceAfterCloseParenthesis' );
@@ -360,11 +360,11 @@ 
 			}
 
 			// Ignore this for function declarations. Handled by the OpeningFunctionBraceKernighanRitchie sniff.
-			if ( \T_FUNCTION !== $this->tokens[ $stackPtr ]['code']
-				&& \T_CLOSURE !== $this->tokens[ $stackPtr ]['code']
-				&& isset( $this->tokens[ $parenthesisOpener ]['parenthesis_owner'] )
+			if ( \T_FUNCTION !== $this->tokens[ $stackPtr ][ 'code' ]
+				&& \T_CLOSURE !== $this->tokens[ $stackPtr ][ 'code' ]
+				&& isset( $this->tokens[ $parenthesisOpener ][ 'parenthesis_owner' ] )
 				&& ( isset( $scopeOpener )
-				&& $this->tokens[ $parenthesisCloser ]['line'] !== $this->tokens[ $scopeOpener ]['line'] )
+				&& $this->tokens[ $parenthesisCloser ][ 'line' ] !== $this->tokens[ $scopeOpener ][ 'line' ] )
 			) {
 				$error = 'Opening brace should be on the same line as the declaration';
 				$fix   = $this->phpcsFile->addFixableError( $error, $parenthesisOpener, 'OpenBraceNotSameLine' );
@@ -381,8 +381,8 @@ 
 				}
 				return;
 
-			} elseif ( \T_WHITESPACE === $this->tokens[ ( $parenthesisCloser + 1 ) ]['code']
-				&& ' ' !== $this->tokens[ ( $parenthesisCloser + 1 ) ]['content']
+			} elseif ( \T_WHITESPACE === $this->tokens[ ( $parenthesisCloser + 1 ) ][ 'code' ]
+				&& ' ' !== $this->tokens[ ( $parenthesisCloser + 1 ) ][ 'content' ]
 			) {
 
 				// Checking this: if (...) [*]{}.
@@ -391,7 +391,7 @@ 
 					$error,
 					$stackPtr,
 					'ExtraSpaceAfterCloseParenthesis',
-					$this->tokens[ ( $parenthesisCloser + 1 ) ]['content']
+					$this->tokens[ ( $parenthesisCloser + 1 ) ][ 'content' ]
 				);
 
 				if ( true === $fix ) {
@@ -404,7 +404,7 @@ 
 			$firstContent = $this->phpcsFile->findNext( \T_WHITESPACE, ( $scopeOpener + 1 ), null, true );
 
 			// We ignore spacing for some structures that tend to have their own rules.
-			$ignore  = array(
+			$ignore = array(
 				\T_FUNCTION             => true,
 				\T_CLOSURE              => true,
 				\T_DOC_COMMENT_OPEN_TAG => true,
@@ -413,8 +413,8 @@ 
 			);
 			$ignore += Tokens::$ooScopeTokens;
 
-			if ( ! isset( $ignore[ $this->tokens[ $firstContent ]['code'] ] )
-				&& $this->tokens[ $firstContent ]['line'] > ( $this->tokens[ $scopeOpener ]['line'] + 1 )
+			if ( ! isset( $ignore[ $this->tokens[ $firstContent ][ 'code' ] ] )
+				&& $this->tokens[ $firstContent ][ 'line' ] > ( $this->tokens[ $scopeOpener ][ 'line' ] + 1 )
 			) {
 				$error = 'Blank line found at start of control structure';
 				$fix   = $this->phpcsFile->addFixableError( $error, $scopeOpener, 'BlankLineAfterStart' );
@@ -423,7 +423,7 @@ 
 					$this->phpcsFile->fixer->beginChangeset();
 
 					for ( $i = ( $scopeOpener + 1 ); $i < $firstContent; $i++ ) {
-						if ( $this->tokens[ $i ]['line'] === $this->tokens[ $firstContent ]['line'] ) {
+						if ( $this->tokens[ $i ][ 'line' ] === $this->tokens[ $firstContent ][ 'line' ] ) {
 							break;
 						}
 						$this->phpcsFile->fixer->replaceToken( $i, '' );
@@ -440,16 +440,16 @@ 
 				$lastNonEmptyContent = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $scopeCloser - 1 ), null, true );
 
 				$checkToken = $lastContent;
-				if ( isset( $this->tokens[ $lastNonEmptyContent ]['scope_condition'] ) ) {
-					$checkToken = $this->tokens[ $lastNonEmptyContent ]['scope_condition'];
+				if ( isset( $this->tokens[ $lastNonEmptyContent ][ 'scope_condition' ] ) ) {
+					$checkToken = $this->tokens[ $lastNonEmptyContent ][ 'scope_condition' ];
 				}
 
-				if ( ! isset( $ignore[ $this->tokens[ $checkToken ]['code'] ] )
-					&& $this->tokens[ $lastContent ]['line'] <= ( $this->tokens[ $scopeCloser ]['line'] - 2 )
+				if ( ! isset( $ignore[ $this->tokens[ $checkToken ][ 'code' ] ] )
+					&& $this->tokens[ $lastContent ][ 'line' ] <= ( $this->tokens[ $scopeCloser ][ 'line' ] - 2 )
 				) {
 					for ( $i = ( $scopeCloser - 1 ); $i > $lastContent; $i-- ) {
-						if ( $this->tokens[ $i ]['line'] < $this->tokens[ $scopeCloser ]['line']
-							&& \T_OPEN_TAG !== $this->tokens[ $firstContent ]['code']
+						if ( $this->tokens[ $i ][ 'line' ] < $this->tokens[ $scopeCloser ][ 'line' ]
+							&& \T_OPEN_TAG !== $this->tokens[ $firstContent ][ 'code' ]
 						) {
 							// TODO: Reporting error at empty line won't highlight it in IDE.
 							$error = 'Blank line found at end of control structure';
@@ -459,7 +459,7 @@ 
 								$this->phpcsFile->fixer->beginChangeset();
 
 								for ( $j = ( $lastContent + 1 ); $j < $scopeCloser; $j++ ) {
-									if ( $this->tokens[ $j ]['line'] === $this->tokens[ $scopeCloser ]['line'] ) {
+									if ( $this->tokens[ $j ][ 'line' ] === $this->tokens[ $scopeCloser ][ 'line' ] ) {
 										break;
 									}
 									$this->phpcsFile->fixer->replaceToken( $j, '' );
@@ -470,8 +470,8 @@ 
 								 * the new line at the end, so don't add any extra as it would cause a fixer
 								 * conflict.
 								 */
-								if ( \T_COMMENT !== $this->tokens[ $lastContent ]['code']
-									&& ! isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastContent ]['code'] ] ) ) {
+								if ( \T_COMMENT !== $this->tokens[ $lastContent ][ 'code' ]
+									&& ! isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastContent ][ 'code' ] ] ) ) {
 									$this->phpcsFile->fixer->addNewlineBefore( $j );
 								}
 
@@ -496,53 +496,53 @@ 
 			return;
 		}
 
-		if ( \T_COMMENT === $this->tokens[ $trailingContent ]['code']
-			|| isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $trailingContent ]['code'] ] )
+		if ( \T_COMMENT === $this->tokens[ $trailingContent ][ 'code' ]
+			|| isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $trailingContent ][ 'code' ] ] )
 		) {
 			// Special exception for code where the comment about
 			// an ELSE or ELSEIF is written between the control structures.
 			$nextCode = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $scopeCloser + 1 ), null, true );
 
-			if ( \T_ELSE === $this->tokens[ $nextCode ]['code'] || \T_ELSEIF === $this->tokens[ $nextCode ]['code'] ) {
+			if ( \T_ELSE === $this->tokens[ $nextCode ][ 'code' ] || \T_ELSEIF === $this->tokens[ $nextCode ][ 'code' ] ) {
 				$trailingContent = $nextCode;
 			}
 
 			// Move past end comments.
-			if ( $this->tokens[ $trailingContent ]['line'] === $this->tokens[ $scopeCloser ]['line'] ) {
-				if ( preg_match( '`^//[ ]?end`i', $this->tokens[ $trailingContent ]['content'], $matches ) > 0 ) {
+			if ( $this->tokens[ $trailingContent ][ 'line' ] === $this->tokens[ $scopeCloser ][ 'line' ] ) {
+				if ( preg_match( '`^//[ ]?end`i', $this->tokens[ $trailingContent ][ 'content' ], $matches ) > 0 ) {
 					$scopeCloser     = $trailingContent;
 					$trailingContent = $this->phpcsFile->findNext( \T_WHITESPACE, ( $trailingContent + 1 ), null, true );
 				}
 			}
 		}
 
-		if ( \T_ELSE === $this->tokens[ $trailingContent ]['code'] && \T_IF === $this->tokens[ $stackPtr ]['code'] ) {
+		if ( \T_ELSE === $this->tokens[ $trailingContent ][ 'code' ] && \T_IF === $this->tokens[ $stackPtr ][ 'code' ] ) {
 			// IF with ELSE.
 			return;
 		}
 
-		if ( \T_WHILE === $this->tokens[ $trailingContent ]['code'] && \T_DO === $this->tokens[ $stackPtr ]['code'] ) {
+		if ( \T_WHILE === $this->tokens[ $trailingContent ][ 'code' ] && \T_DO === $this->tokens[ $stackPtr ][ 'code' ] ) {
 			// DO with WHILE.
 			return;
 		}
 
-		if ( \T_CLOSE_TAG === $this->tokens[ $trailingContent ]['code'] ) {
+		if ( \T_CLOSE_TAG === $this->tokens[ $trailingContent ][ 'code' ] ) {
 			// At the end of the script or embedded code.
 			return;
 		}
 
-		if ( isset( $this->tokens[ $trailingContent ]['scope_condition'] )
-			&& \T_CLOSE_CURLY_BRACKET === $this->tokens[ $trailingContent ]['code']
+		if ( isset( $this->tokens[ $trailingContent ][ 'scope_condition' ] )
+			&& \T_CLOSE_CURLY_BRACKET === $this->tokens[ $trailingContent ][ 'code' ]
 		) {
 			// Another control structure's closing brace.
-			$owner = $this->tokens[ $trailingContent ]['scope_condition'];
-			if ( \in_array( $this->tokens[ $owner ]['code'], array( \T_FUNCTION, \T_CLOSURE, \T_CLASS, \T_ANON_CLASS, \T_INTERFACE, \T_TRAIT ), true ) ) {
+			$owner = $this->tokens[ $trailingContent ][ 'scope_condition' ];
+			if ( \in_array( $this->tokens[ $owner ][ 'code' ], array( \T_FUNCTION, \T_CLOSURE, \T_CLASS, \T_ANON_CLASS, \T_INTERFACE, \T_TRAIT ), true ) ) {
 				// The next content is the closing brace of a function, class, interface or trait
 				// so normal function/class rules apply and we can ignore it.
 				return;
 			}
 
-			if ( ( $this->tokens[ $scopeCloser ]['line'] + 1 ) !== $this->tokens[ $trailingContent ]['line'] ) {
+			if ( ( $this->tokens[ $scopeCloser ][ 'line' ] + 1 ) !== $this->tokens[ $trailingContent ][ 'line' ] ) {
 				// TODO: Won't cover following case: "} echo 'OK';".
 				$error = 'Blank line found after control structure';
 				$fix   = $this->phpcsFile->addFixableError( $error, $scopeCloser, 'BlankLineAfterEnd' );
@@ -551,14 +551,14 @@ 
 					$this->phpcsFile->fixer->beginChangeset();
 
 					$i = ( $scopeCloser + 1 );
-					while ( $this->tokens[ $i ]['line'] !== $this->tokens[ $trailingContent ]['line'] ) {
+					while ( $this->tokens[ $i ][ 'line' ] !== $this->tokens[ $trailingContent ][ 'line' ] ) {
 						$this->phpcsFile->fixer->replaceToken( $i, '' );
 						$i++;
 					}
 
 					// TODO: Instead a separate error should be triggered when content comes right after closing brace.
-					if ( \T_COMMENT !== $this->tokens[ $scopeCloser ]['code']
-						&& isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $scopeCloser ]['code'] ] ) === false
+					if ( \T_COMMENT !== $this->tokens[ $scopeCloser ][ 'code' ]
+						&& isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $scopeCloser ][ 'code' ] ] ) === false
 					) {
 						$this->phpcsFile->fixer->addNewlineBefore( $trailingContent );
 					}

wpcs/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	 */
 	public function process_token( $stackPtr ) {
 
-		if ( \T_WHITESPACE !== $this->tokens[ ( $stackPtr - 1 ) ]['code'] ) {
+		if ( \T_WHITESPACE !== $this->tokens[ ( $stackPtr - 1 ) ][ 'code' ] ) {
 			$error = 'No space before opening casting parenthesis is prohibited';
 			$fix   = $this->phpcsFile->addFixableError( $error, $stackPtr, 'NoSpaceBeforeOpenParenthesis' );
 			if ( true === $fix ) {

wpcs/WordPress/Sniffs/WhiteSpace/PrecisionAlignmentSniff.php

Spacing +19 added lines, -19 removed lines

@@ -96,7 +96,7 @@ 
 		// Handle any custom ignore tokens received from a ruleset.
 		$ignoreAlignmentTokens = $this->merge_custom_array( $this->ignoreAlignmentTokens );
 
-		$check_tokens  = array(
+		$check_tokens = array(
 			\T_WHITESPACE             => true,
 			\T_INLINE_HTML            => true,
 			\T_DOC_COMMENT_WHITESPACE => true,
@@ -106,32 +106,32 @@ 
 
 		for ( $i = 0; $i < $this->phpcsFile->numTokens; $i++ ) {
 
-			if ( 1 !== $this->tokens[ $i ]['column'] ) {
+			if ( 1 !== $this->tokens[ $i ][ 'column' ] ) {
 				continue;
-			} elseif ( isset( $check_tokens[ $this->tokens[ $i ]['code'] ] ) === false
+			} elseif ( isset( $check_tokens[ $this->tokens[ $i ][ 'code' ] ] ) === false
 				|| ( isset( $this->tokens[ ( $i + 1 ) ] )
-					&& \T_WHITESPACE === $this->tokens[ ( $i + 1 ) ]['code'] )
-				|| $this->tokens[ $i ]['content'] === $this->phpcsFile->eolChar
-				|| isset( $ignoreAlignmentTokens[ $this->tokens[ $i ]['type'] ] )
+					&& \T_WHITESPACE === $this->tokens[ ( $i + 1 ) ][ 'code' ] )
+				|| $this->tokens[ $i ][ 'content' ] === $this->phpcsFile->eolChar
+				|| isset( $ignoreAlignmentTokens[ $this->tokens[ $i ][ 'type' ] ] )
 				|| ( isset( $this->tokens[ ( $i + 1 ) ] )
-					&& isset( $ignoreAlignmentTokens[ $this->tokens[ ( $i + 1 ) ]['type'] ] ) )
+					&& isset( $ignoreAlignmentTokens[ $this->tokens[ ( $i + 1 ) ][ 'type' ] ] ) )
 			) {
 				continue;
 			}
 
 			$spaces = 0;
-			switch ( $this->tokens[ $i ]['type'] ) {
+			switch ( $this->tokens[ $i ][ 'type' ] ) {
 				case 'T_WHITESPACE':
-					$spaces = ( $this->tokens[ $i ]['length'] % $this->tab_width );
+					$spaces = ( $this->tokens[ $i ][ 'length' ] % $this->tab_width );
 					break;
 
 				case 'T_DOC_COMMENT_WHITESPACE':
-					$length = $this->tokens[ $i ]['length'];
+					$length = $this->tokens[ $i ][ 'length' ];
 					$spaces = ( $length % $this->tab_width );
 
 					if ( isset( $this->tokens[ ( $i + 1 ) ] )
-						&& ( \T_DOC_COMMENT_STAR === $this->tokens[ ( $i + 1 ) ]['code']
-							|| \T_DOC_COMMENT_CLOSE_TAG === $this->tokens[ ( $i + 1 ) ]['code'] )
+						&& ( \T_DOC_COMMENT_STAR === $this->tokens[ ( $i + 1 ) ][ 'code' ]
+							|| \T_DOC_COMMENT_CLOSE_TAG === $this->tokens[ ( $i + 1 ) ][ 'code' ] )
 						&& 0 !== $spaces
 					) {
 						// One alignment space expected before the *.
@@ -149,25 +149,25 @@ 
 					 * Indentation whitespace for subsequent lines of multi-line comments
 					 * are tokenized as part of the comment.
 					 */
-					$comment    = ltrim( $this->tokens[ $i ]['content'] );
-					$whitespace = str_replace( $comment, '', $this->tokens[ $i ]['content'] );
+					$comment    = ltrim( $this->tokens[ $i ][ 'content' ] );
+					$whitespace = str_replace( $comment, '', $this->tokens[ $i ][ 'content' ] );
 					$length     = \strlen( $whitespace );
 					$spaces     = ( $length % $this->tab_width );
 
-					if ( isset( $comment[0] ) && '*' === $comment[0] && 0 !== $spaces ) {
+					if ( isset( $comment[ 0 ] ) && '*' === $comment[ 0 ] && 0 !== $spaces ) {
 						--$spaces;
 					}
 					break;
 
 				case 'T_INLINE_HTML':
-					if ( $this->tokens[ $i ]['content'] === $this->phpcsFile->eolChar ) {
+					if ( $this->tokens[ $i ][ 'content' ] === $this->phpcsFile->eolChar ) {
 						$spaces = 0;
 					} else {
 						/*
 						 * Indentation whitespace for inline HTML is part of the T_INLINE_HTML token.
 						 */
-						$content    = ltrim( $this->tokens[ $i ]['content'] );
-						$whitespace = str_replace( $content, '', $this->tokens[ $i ]['content'] );
+						$content    = ltrim( $this->tokens[ $i ][ 'content' ] );
+						$whitespace = str_replace( $content, '', $this->tokens[ $i ][ 'content' ] );
 						$spaces     = ( \strlen( $whitespace ) % $this->tab_width );
 					}
 
@@ -176,7 +176,7 @@ 
 					 * This may cause false negatives as there is no check for being in a
 					 * <script> tag, but that will be rare.
 					 */
-					if ( isset( $content[0] ) && '*' === $content[0] && 0 !== $spaces ) {
+					if ( isset( $content[ 0 ] ) && '*' === $content[ 0 ] && 0 !== $spaces ) {
 						--$spaces;
 					}
 					break;

Doc Comments +1 added lines, -1 removed lines

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

wpcs/WordPress/Sniffs/WhiteSpace/DisallowInlineTabsSniff.php

Spacing +7 added lines, -7 removed lines

@@ -62,16 +62,16 @@ 
 
 		for ( $i = ( $stackPtr + 1 ); $i < $this->phpcsFile->numTokens; $i++ ) {
 			// Skip all non-whitespace tokens and skip whitespace at the start of a new line.
-			if ( ! isset( $check_tokens[ $this->tokens[ $i ]['code'] ] ) || 1 === $this->tokens[ $i ]['column'] ) {
+			if ( ! isset( $check_tokens[ $this->tokens[ $i ][ 'code' ] ] ) || 1 === $this->tokens[ $i ][ 'column' ] ) {
 				continue;
 			}
 
 			// If tabs are being converted to spaces by the tokenizer, the
 			// original content should be checked instead of the converted content.
-			if ( isset( $this->tokens[ $i ]['orig_content'] ) ) {
-				$content = $this->tokens[ $i ]['orig_content'];
+			if ( isset( $this->tokens[ $i ][ 'orig_content' ] ) ) {
+				$content = $this->tokens[ $i ][ 'orig_content' ];
 			} else {
-				$content = $this->tokens[ $i ]['content'];
+				$content = $this->tokens[ $i ][ 'content' ];
 			}
 
 			if ( '' === $content || strpos( $content, "\t" ) === false ) {
@@ -84,14 +84,14 @@ 
 				'NonIndentTabsUsed'
 			);
 			if ( true === $fix ) {
-				if ( isset( $this->tokens[ $i ]['orig_content'] ) ) {
+				if ( isset( $this->tokens[ $i ][ 'orig_content' ] ) ) {
 					// Use the replacement that PHPCS has already done.
-					$this->phpcsFile->fixer->replaceToken( $i, $this->tokens[ $i ]['content'] );
+					$this->phpcsFile->fixer->replaceToken( $i, $this->tokens[ $i ][ 'content' ] );
 				} else {
 					// Replace tabs with spaces, using an indent of $tab_width.
 					// Other sniffs can then correct the indent if they need to.
 					$spaces     = str_repeat( ' ', $this->tab_width );
-					$newContent = str_replace( "\t", $spaces, $this->tokens[ $i ]['content'] );
+					$newContent = str_replace( "\t", $spaces, $this->tokens[ $i ][ 'content' ] );
 					$this->phpcsFile->fixer->replaceToken( $i, $newContent );
 				}
 			}

Doc Comments +1 added lines, -1 removed lines

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