jazzsequence / games-collector

vendor/wp-coding-standards/wpcs/WordPress/Sniffs/WhiteSpace/CastStructureSpacingSniff.php

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
 	public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr ) {
 		$tokens = $phpcsFile->getTokens();
 
-		$content  = $tokens[ $stackPtr ]['content'];
+		$content  = $tokens[ $stackPtr ][ 'content' ];
 		$expected = str_replace( ' ', '', $content );
 		$expected = str_replace( "\t", '', $expected );
 
@@ -56,12 +56,12 @@ 
 			$phpcsFile->addWarning( $error, $stackPtr, 'ContainsWhiteSpace', $data );
 		}
 
-		if ( T_WHITESPACE !== $tokens[ ( $stackPtr - 1 ) ]['code'] ) {
+		if ( T_WHITESPACE !== $tokens[ ( $stackPtr - 1 ) ][ 'code' ] ) {
 			$error = 'No space before opening casting parenthesis is prohibited';
 			$phpcsFile->addWarning( $error, $stackPtr, 'NoSpaceBeforeOpenParenthesis' );
 		}
 
-		if ( T_WHITESPACE !== $tokens[ ( $stackPtr + 1 ) ]['code'] ) {
+		if ( T_WHITESPACE !== $tokens[ ( $stackPtr + 1 ) ][ 'code' ] ) {
 			$error = 'No space after closing casting parenthesis is prohibited';
 			$phpcsFile->addWarning( $error, $stackPtr, 'NoSpaceAfterCloseParenthesis' );
 		}

vendor/wp-coding-standards/wpcs/WordPress/Sniffs/WhiteSpace/OperatorSpacingSniff.php

Spacing +26 added lines, -26 removed lines

@@ -41,11 +41,11 @@ 
 	 */
 	public function register() {
 		$comparison = PHP_CodeSniffer_Tokens::$comparisonTokens;
-		$operators	= PHP_CodeSniffer_Tokens::$operators;
+		$operators = PHP_CodeSniffer_Tokens::$operators;
 		$assignment = PHP_CodeSniffer_Tokens::$assignmentTokens;
 
 		$tokens   = array_unique( array_merge( $comparison, $operators, $assignment ) );
-		$tokens[] = T_BOOLEAN_NOT;
+		$tokens[ ] = T_BOOLEAN_NOT;
 
 		return $tokens;
 
@@ -63,25 +63,25 @@ 
 	public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr ) {
 		$tokens = $phpcsFile->getTokens();
 
-		if ( T_EQUAL === $tokens[ $stackPtr ]['code'] ) {
+		if ( T_EQUAL === $tokens[ $stackPtr ][ 'code' ] ) {
 			// Skip for '=&' case.
-			if ( isset( $tokens[ ( $stackPtr + 1 ) ] ) && T_BITWISE_AND === $tokens[ ( $stackPtr + 1 ) ]['code'] ) {
+			if ( isset( $tokens[ ( $stackPtr + 1 ) ] ) && T_BITWISE_AND === $tokens[ ( $stackPtr + 1 ) ][ 'code' ] ) {
 				return;
 			}
 
 			// Skip default values in function declarations.
-			if ( isset( $tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
-				$bracket = end( $tokens[ $stackPtr ]['nested_parenthesis'] );
-				if ( isset( $tokens[ $bracket ]['parenthesis_owner'] ) ) {
-					$function = $tokens[ $bracket ]['parenthesis_owner'];
-					if ( T_FUNCTION === $tokens[ $function ]['code'] ) {
+			if ( isset( $tokens[ $stackPtr ][ 'nested_parenthesis' ] ) ) {
+				$bracket = end( $tokens[ $stackPtr ][ 'nested_parenthesis' ] );
+				if ( isset( $tokens[ $bracket ][ 'parenthesis_owner' ] ) ) {
+					$function = $tokens[ $bracket ][ 'parenthesis_owner' ];
+					if ( T_FUNCTION === $tokens[ $function ][ 'code' ] ) {
 						return;
 					}
 				}
 			}
 		}
 
-		if ( T_BITWISE_AND === $tokens[ $stackPtr ]['code'] ) {
+		if ( T_BITWISE_AND === $tokens[ $stackPtr ][ 'code' ] ) {
 			/*
 			// If it's not a reference, then we expect one space either side of the
 			// bitwise operator.
@@ -92,21 +92,21 @@ 
 			return;
 
 		} else {
-			if ( T_MINUS === $tokens[ $stackPtr ]['code'] ) {
+			if ( T_MINUS === $tokens[ $stackPtr ][ 'code' ] ) {
 				// Check minus spacing, but make sure we aren't just assigning
 				// a minus value or returning one.
 				$prev = $phpcsFile->findPrevious( T_WHITESPACE, ( $stackPtr - 1 ), null, true );
-				if ( T_RETURN === $tokens[ $prev ]['code'] ) {
+				if ( T_RETURN === $tokens[ $prev ][ 'code' ] ) {
 					// Just returning a negative value; eg. return -1.
 					return;
 				}
 
-				if ( in_array( $tokens[ $prev ]['code'], PHP_CodeSniffer_Tokens::$operators, true ) ) {
+				if ( in_array( $tokens[ $prev ][ 'code' ], PHP_CodeSniffer_Tokens::$operators, true ) ) {
 					// Just trying to operate on a negative value; eg. ($var * -1).
 					return;
 				}
 
-				if ( in_array( $tokens[ $prev ]['code'], PHP_CodeSniffer_Tokens::$comparisonTokens, true ) ) {
+				if ( in_array( $tokens[ $prev ][ 'code' ], PHP_CodeSniffer_Tokens::$comparisonTokens, true ) ) {
 					// Just trying to compare a negative value; eg. ($var === -1).
 					return;
 				}
@@ -119,16 +119,16 @@ 
 					T_OPEN_SQUARE_BRACKET,
 				);
 
-				if ( in_array( $tokens[ $prev ]['code'], $invalidTokens, true ) ) {
+				if ( in_array( $tokens[ $prev ][ 'code' ], $invalidTokens, true ) ) {
 					// Just trying to use a negative value; eg. myFunction($var, -2).
 					return;
 				}
 
 				$number = $phpcsFile->findNext( T_WHITESPACE, ( $stackPtr + 1 ), null, true );
-				if ( T_LNUMBER === $tokens[ $number ]['code'] ) {
+				if ( T_LNUMBER === $tokens[ $number ][ 'code' ] ) {
 					$semi = $phpcsFile->findNext( T_WHITESPACE, ( $number + 1 ), null, true );
-					if ( T_SEMICOLON === $tokens[ $semi ]['code'] ) {
-						if ( false !== $prev && in_array( $tokens[ $prev ]['code'], PHP_CodeSniffer_Tokens::$assignmentTokens, true ) ) {
+					if ( T_SEMICOLON === $tokens[ $semi ][ 'code' ] ) {
+						if ( false !== $prev && in_array( $tokens[ $prev ][ 'code' ], PHP_CodeSniffer_Tokens::$assignmentTokens, true ) ) {
 							// This is a negative assignment.
 							return;
 						}
@@ -136,9 +136,9 @@ 
 				}
 			} // end if
 
-			$operator = $tokens[ $stackPtr ]['content'];
+			$operator = $tokens[ $stackPtr ][ 'content' ];
 
-			if ( T_WHITESPACE !== $tokens[ ( $stackPtr - 1 ) ]['code'] ) {
+			if ( T_WHITESPACE !== $tokens[ ( $stackPtr - 1 ) ][ 'code' ] ) {
 				$error = 'Expected 1 space before "%s"; 0 found';
 				$data  = array( $operator );
 				if ( isset( $phpcsFile->fixer ) ) {
@@ -151,11 +151,11 @@ 
 				} else {
 					$phpcsFile->addError( $error, $stackPtr, 'NoSpaceBefore', $data );
 				}
-			} elseif ( 1 !== strlen( $tokens[ ( $stackPtr - 1 ) ]['content'] ) && 1 !== $tokens[ ( $stackPtr - 1 ) ]['column'] ) {
+			} elseif ( 1 !== strlen( $tokens[ ( $stackPtr - 1 ) ][ 'content' ] ) && 1 !== $tokens[ ( $stackPtr - 1 ) ][ 'column' ] ) {
 				// Don't throw an error for assignments, because other standards allow
 				// multiple spaces there to align multiple assignments.
-				if ( false === in_array( $tokens[ $stackPtr ]['code'], PHP_CodeSniffer_Tokens::$assignmentTokens, true )  ) {
-					$found = strlen( $tokens[ ( $stackPtr - 1 ) ]['content'] );
+				if ( false === in_array( $tokens[ $stackPtr ][ 'code' ], PHP_CodeSniffer_Tokens::$assignmentTokens, true ) ) {
+					$found = strlen( $tokens[ ( $stackPtr - 1 ) ][ 'content' ] );
 					$error = 'Expected 1 space before "%s"; %s found';
 					$data  = array(
 						$operator,
@@ -175,7 +175,7 @@ 
 			} // end if
 
 			if ( '-' !== $operator ) {
-				if ( T_WHITESPACE !== $tokens[ ( $stackPtr + 1 ) ]['code'] ) {
+				if ( T_WHITESPACE !== $tokens[ ( $stackPtr + 1 ) ][ 'code' ] ) {
 					$error = 'Expected 1 space after "%s"; 0 found';
 					$data  = array( $operator );
 					if ( isset( $phpcsFile->fixer ) ) {
@@ -188,8 +188,8 @@ 
 					} else {
 						$phpcsFile->addError( $error, $stackPtr, 'NoSpaceAfter', $data );
 					}
-				} elseif ( 1 !== strlen( $tokens[ ( $stackPtr + 1 ) ]['content'] ) ) {
-					$found = strlen( $tokens[ ( $stackPtr + 1 ) ]['content'] );
+				} elseif ( 1 !== strlen( $tokens[ ( $stackPtr + 1 ) ][ 'content' ] ) ) {
+					$found = strlen( $tokens[ ( $stackPtr + 1 ) ][ 'content' ] );
 					$error = 'Expected 1 space after "%s"; %s found';
 					$data  = array(
 						$operator,

vendor/wp-coding-standards/wpcs/WordPress/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php

Spacing +62 added lines, -62 removed lines

@@ -93,15 +93,15 @@ 
 	 * @return void
 	 */
 	public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr ) {
-		$this->blank_line_check 	  = (bool) $this->blank_line_check;
+		$this->blank_line_check = (bool) $this->blank_line_check;
 		$this->blank_line_after_check = (bool) $this->blank_line_after_check;
 
 		$this->init( $phpcsFile );
 
-		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'] )
+		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']
+				T_CLOSURE === $this->tokens[ $stackPtr ][ 'code' ]
 				&& (
 					0 === (int) $this->spaces_before_closure_open_paren
 					|| -1 === (int) $this->spaces_before_closure_open_paren
@@ -121,25 +121,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 = $phpcsFile->findNext( T_OPEN_CURLY_BRACKET, ( $stackPtr + 1 ) );
-				$scopeCloser = $this->tokens[ $scopeOpener ]['scope_closer'];
+				$scopeCloser = $this->tokens[ $scopeOpener ][ 'scope_closer' ];
 			} else {
 				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 ( T_COLON === $this->tokens[ $scopeOpener ]['code'] ) {
+		if ( 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';
 
 					if ( isset( $phpcsFile->fixer ) ) {
@@ -156,7 +156,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';
 
 					if ( isset( $phpcsFile->fixer ) ) {
@@ -177,13 +177,13 @@ 
 		$parenthesisOpener = $phpcsFile->findNext( PHP_CodeSniffer_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() {}).
 				$function_name_ptr = $parenthesisOpener = $phpcsFile->findNext(
@@ -209,7 +209,7 @@ 
 					$error,
 					$stackPtr,
 					'SpaceBeforeFunctionOpenParenthesis',
-					$this->tokens[ ( $function_name_ptr + 1 ) ]['content']
+					$this->tokens[ ( $function_name_ptr + 1 ) ][ 'content' ]
 				);
 
 				if ( true === $fix ) {
@@ -218,14 +218,14 @@ 
 					$phpcsFile->fixer->endChangeset();
 				}
 			}
-		} 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 = $phpcsFile->findNext(
 					PHP_CodeSniffer_Tokens::$emptyTokens,
-					( $this->tokens[ $parenthesisOpener ]['parenthesis_closer'] + 1 ),
+					( $this->tokens[ $parenthesisOpener ][ 'parenthesis_closer' ] + 1 ),
 					null,
 					true,
 					null,
@@ -233,23 +233,23 @@ 
 				);
 
 				// 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']
+			T_COLON !== $this->tokens[ $parenthesisOpener ][ 'code' ]
+			&& T_FUNCTION !== $this->tokens[ $stackPtr ][ 'code' ]
 		) {
 
 			if (
-				T_CLOSURE === $this->tokens[ $stackPtr ]['code']
+				T_CLOSURE === $this->tokens[ $stackPtr ][ 'code' ]
 				&& 0 === (int) $this->spaces_before_closure_open_paren
 			) {
 
-				if ( ( $stackPtr + 1) !== $parenthesisOpener ) {
+				if ( ( $stackPtr + 1 ) !== $parenthesisOpener ) {
 					// Checking this: function[*](...) {}.
 					$error = 'Space before closure opening parenthesis is prohibited';
 					$fix   = $phpcsFile->addFixableError( $error, $stackPtr, 'SpaceBeforeClosureOpenParenthesis' );
@@ -261,7 +261,7 @@ 
 				}
 			} elseif (
 				(
-					T_CLOSURE !== $this->tokens[ $stackPtr ]['code']
+					T_CLOSURE !== $this->tokens[ $stackPtr ][ 'code' ]
 					|| 1 === (int) $this->spaces_before_closure_open_paren
 				)
 				&& ( $stackPtr + 1 ) === $parenthesisOpener
@@ -283,8 +283,8 @@ 
 		}
 
 		if (
-			T_WHITESPACE === $this->tokens[ ( $stackPtr + 1 ) ]['code']
-			&& ' ' !== $this->tokens[ ( $stackPtr + 1 ) ]['content']
+			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.';
@@ -292,7 +292,7 @@ 
 				$error,
 				$stackPtr,
 				'ExtraSpaceBeforeOpenParenthesis',
-				$this->tokens[ ( $stackPtr + 1 ) ]['content']
+				$this->tokens[ ( $stackPtr + 1 ) ][ 'content' ]
 			);
 
 			if ( true === $fix ) {
@@ -302,8 +302,8 @@ 
 			}
 		}
 
-		if ( T_WHITESPACE !== $this->tokens[ ( $parenthesisOpener + 1) ]['code']
-			&& T_CLOSE_PARENTHESIS !== $this->tokens[ ( $parenthesisOpener + 1) ]['code']
+		if ( T_WHITESPACE !== $this->tokens[ ( $parenthesisOpener + 1 ) ][ 'code' ]
+			&& T_CLOSE_PARENTHESIS !== $this->tokens[ ( $parenthesisOpener + 1 ) ][ 'code' ]
 		) {
 			// Checking this: $value = my_function([*]...).
 			$error = 'No space after opening parenthesis is prohibited';
@@ -319,13 +319,13 @@ 
 			}
 		}
 
-		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' ] ) {
 
-				if ( T_WHITESPACE !== $this->tokens[ ( $parenthesisCloser - 1 ) ]['code'] ) {
+				if ( T_WHITESPACE !== $this->tokens[ ( $parenthesisCloser - 1 ) ][ 'code' ] ) {
 					$error = 'No space before closing parenthesis is prohibited';
 					if ( isset( $phpcsFile->fixer ) ) {
 						$fix = $phpcsFile->addFixableError( $error, $parenthesisCloser, 'NoSpaceBeforeCloseParenthesis' );
@@ -340,8 +340,8 @@ 
 				}
 
 				if (
-					T_WHITESPACE !== $this->tokens[ ( $parenthesisCloser + 1 ) ]['code']
-					&& T_COLON !== $this->tokens[ $scopeOpener ]['code']
+					T_WHITESPACE !== $this->tokens[ ( $parenthesisCloser + 1 ) ][ 'code' ]
+					&& T_COLON !== $this->tokens[ $scopeOpener ][ 'code' ]
 				) {
 					$error = 'Space between opening control structure and closing parenthesis is required';
 
@@ -359,8 +359,8 @@ 
 				}
 			}
 
-			if ( isset( $this->tokens[ $parenthesisOpener ]['parenthesis_owner'] )
-				&& $this->tokens[ $parenthesisCloser ]['line'] !== $this->tokens[ $scopeOpener ]['line']
+			if ( isset( $this->tokens[ $parenthesisOpener ][ 'parenthesis_owner' ] )
+				&& $this->tokens[ $parenthesisCloser ][ 'line' ] !== $this->tokens[ $scopeOpener ][ 'line' ]
 			) {
 				$error = 'Opening brace should be on the same line as the declaration';
 				if ( isset( $phpcsFile->fixer ) ) {
@@ -381,8 +381,8 @@ 
 				return;
 
 			} elseif (
-				T_WHITESPACE === $this->tokens[ ( $parenthesisCloser + 1 ) ]['code']
-				&& ' ' !== $this->tokens[ ( $parenthesisCloser + 1 ) ]['content']
+				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,8 +404,8 @@ 
 
 		if ( true === $this->blank_line_check ) {
 			$firstContent = $phpcsFile->findNext( T_WHITESPACE, ( $scopeOpener + 1 ), null, true );
-			if ( $this->tokens[ $firstContent ]['line'] > ( $this->tokens[ $scopeOpener ]['line'] + 1 )
-				&& false === in_array( $this->tokens[ $firstContent ]['code'], array( T_CLOSE_TAG, T_COMMENT ), true )
+			if ( $this->tokens[ $firstContent ][ 'line' ] > ( $this->tokens[ $scopeOpener ][ 'line' ] + 1 )
+				&& false === in_array( $this->tokens[ $firstContent ][ 'code' ], array( T_CLOSE_TAG, T_COMMENT ), true )
 			) {
 				$error = 'Blank line found at start of control structure';
 				if ( isset( $phpcsFile->fixer ) ) {
@@ -426,11 +426,11 @@ 
 			}
 
 			$lastContent = $phpcsFile->findPrevious( T_WHITESPACE, ( $scopeCloser - 1 ), null, true );
-			if ( ( $this->tokens[ $scopeCloser ]['line'] - 1 ) !== $this->tokens[ $lastContent ]['line'] ) {
+			if ( ( $this->tokens[ $scopeCloser ][ 'line' ] - 1 ) !== $this->tokens[ $lastContent ][ 'line' ] ) {
 				$errorToken = $scopeCloser;
 				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';
@@ -456,44 +456,44 @@ 
 		} // end if
 
 		$trailingContent = $phpcsFile->findNext( T_WHITESPACE, ( $scopeCloser + 1 ), null, true );
-		if ( T_ELSE === $this->tokens[ $trailingContent ]['code'] ) {
-			if ( T_IF === $this->tokens[ $stackPtr ]['code'] ) {
+		if ( T_ELSE === $this->tokens[ $trailingContent ][ 'code' ] ) {
+			if ( T_IF === $this->tokens[ $stackPtr ][ 'code' ] ) {
 				// IF with ELSE.
 				return;
 			}
 		}
 
-		if ( T_COMMENT === $this->tokens[ $trailingContent ]['code'] ) {
-			if ( $this->tokens[ $trailingContent ]['line'] === $this->tokens[ $scopeCloser ]['line'] ) {
-				if ( '//end' === substr( $this->tokens[ $trailingContent ]['content'], 0, 5 ) ) {
+		if ( T_COMMENT === $this->tokens[ $trailingContent ][ 'code' ] ) {
+			if ( $this->tokens[ $trailingContent ][ 'line' ] === $this->tokens[ $scopeCloser ][ 'line' ] ) {
+				if ( '//end' === substr( $this->tokens[ $trailingContent ][ 'content' ], 0, 5 ) ) {
 					// There is an end comment, so we have to get the next piece
 					// of content.
-					$trailingContent = $phpcsFile->findNext( T_WHITESPACE, ( $trailingContent + 1), null, true );
+					$trailingContent = $phpcsFile->findNext( T_WHITESPACE, ( $trailingContent + 1 ), null, true );
 				}
 			}
 		}
 
-		if ( T_BREAK === $this->tokens[ $trailingContent ]['code'] ) {
+		if ( T_BREAK === $this->tokens[ $trailingContent ][ 'code' ] ) {
 			// If this BREAK is closing a CASE, we don't need the
 			// blank line after this control structure.
-			if ( isset( $this->tokens[ $trailingContent ]['scope_condition'] ) ) {
-				$condition = $this->tokens[ $trailingContent ]['scope_condition'];
-				if ( T_CASE === $this->tokens[ $condition ]['code'] || T_DEFAULT === $this->tokens[ $condition ]['code'] ) {
+			if ( isset( $this->tokens[ $trailingContent ][ 'scope_condition' ] ) ) {
+				$condition = $this->tokens[ $trailingContent ][ 'scope_condition' ];
+				if ( T_CASE === $this->tokens[ $condition ][ 'code' ] || T_DEFAULT === $this->tokens[ $condition ][ 'code' ] ) {
 					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 ( T_CLOSE_CURLY_BRACKET === $this->tokens[ $trailingContent ]['code'] ) {
+		if ( T_CLOSE_CURLY_BRACKET === $this->tokens[ $trailingContent ][ 'code' ] ) {
 			// Another control structure's closing brace.
-			if ( isset( $this->tokens[ $trailingContent ]['scope_condition'] ) ) {
-				$owner = $this->tokens[ $trailingContent ]['scope_condition'];
-				if ( in_array( $this->tokens[ $owner ]['code'], array( T_FUNCTION, T_CLASS, T_INTERFACE, T_TRAIT ), true ) ) {
+			if ( isset( $this->tokens[ $trailingContent ][ 'scope_condition' ] ) ) {
+				$owner = $this->tokens[ $trailingContent ][ 'scope_condition' ];
+				if ( in_array( $this->tokens[ $owner ][ 'code' ], array( T_FUNCTION, T_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;
@@ -501,7 +501,7 @@ 
 			}
 
 			if ( true === $this->blank_line_after_check
-				&& ( $this->tokens[ $scopeCloser ]['line'] + 1 ) !== $this->tokens[ $trailingContent ]['line']
+				&& ( $this->tokens[ $scopeCloser ][ 'line' ] + 1 ) !== $this->tokens[ $trailingContent ][ 'line' ]
 			) {
 				// TODO: Won't cover following case: "} echo 'OK';".
 				$error = 'Blank line found after control structure';

vendor/wp-coding-standards/wpcs/WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php

Spacing +10 added lines, -10 removed lines

@@ -92,7 +92,7 @@ 
 		$this->mergeWhiteList();
 
 		$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 ( in_array( $var_name, $this->php_reserved_vars, true ) ) {
@@ -100,13 +100,13 @@ 
 		}
 
 		$obj_operator = $phpcs_file->findNext( array( T_WHITESPACE ), ( $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( array( T_WHITESPACE ), ( $obj_operator + 1 ), null, true );
-			if ( T_STRING === $tokens[ $var ]['code'] ) {
+			if ( T_STRING === $tokens[ $var ][ 'code' ] ) {
 				$bracket = $phpcs_file->findNext( array( T_WHITESPACE ), ( $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
@@ -127,7 +127,7 @@ 
 
 		$in_class     = false;
 		$obj_operator = $phpcs_file->findPrevious( array( T_WHITESPACE ), ( $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;
@@ -151,7 +151,7 @@ 
 			}
 
 			if ( isset( $error, $error_name ) ) {
-				$data  = array( $original_var_name );
+				$data = array( $original_var_name );
 				$phpcs_file->addError( $error, $stack_ptr, $error_name, $data );
 			}
 		}
@@ -174,7 +174,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
@@ -205,8 +205,8 @@ 
 
 		$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 ) {
-			foreach ( $matches[1] as $var_name ) {
+		if ( preg_match_all( '|[^\\\]\${?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)|', $tokens[ $stack_ptr ][ 'content' ], $matches ) > 0 ) {
+			foreach ( $matches[ 1 ] as $var_name ) {
 				// If it's a php reserved var, then its ok.
 				if ( in_array( $var_name, $this->php_reserved_vars, true ) ) {
 					continue;

vendor/wp-coding-standards/wpcs/WordPress/Sniffs/NamingConventions/ValidFunctionNameSniff.php

Spacing +4 added lines, -4 removed lines

@@ -117,7 +117,7 @@ 
 			return;
 		}
 
-		$className	= $phpcsFile->getDeclarationName( $currScope );
+		$className = $phpcsFile->getDeclarationName( $currScope );
 
 		// Ignore special functions.
 		if ( '' === ltrim( $methodName, '_' ) ) {
@@ -195,13 +195,13 @@ 
 		if ( ! isset( $tokens[ $stackPtr ] ) ) {
 			return false;
 		}
-		if ( T_CLASS !== $tokens[ $stackPtr ]['code'] ) {
+		if ( T_CLASS !== $tokens[ $stackPtr ][ 'code' ] ) {
 			return false;
 		}
-		if ( ! isset( $tokens[ $stackPtr ]['scope_closer'] ) ) {
+		if ( ! isset( $tokens[ $stackPtr ][ 'scope_closer' ] ) ) {
 			return false;
 		}
-		$classOpenerIndex = $tokens[ $stackPtr ]['scope_opener'];
+		$classOpenerIndex = $tokens[ $stackPtr ][ 'scope_opener' ];
 		$extendsIndex     = $phpcsFile->findNext( T_IMPLEMENTS, $stackPtr, $classOpenerIndex );
 		if ( false === $extendsIndex ) {
 			return false;

vendor/wp-coding-standards/wpcs/WordPress/Sniffs/Classes/ClassOpeningStatementSniff.php

Spacing +10 added lines, -10 removed lines

@@ -53,23 +53,23 @@ 
 		$tokens           = $phpcsFile->getTokens();
 		$scope_identifier = $phpcsFile->findNext( T_STRING, ( $stackPtr + 1 ) );
 		$errorData        = array(
-			strtolower( $tokens[ $stackPtr ]['content'] ) . ' ' . $tokens[ $scope_identifier ]['content']
+			strtolower( $tokens[ $stackPtr ][ 'content' ] ) . ' ' . $tokens[ $scope_identifier ][ 'content' ]
 		);
 
-		if ( ! isset( $tokens[ $stackPtr ]['scope_opener'] ) ) {
+		if ( ! isset( $tokens[ $stackPtr ][ 'scope_opener' ] ) ) {
 			$error = 'Possible parse error: %s missing opening or closing brace';
 			$phpcsFile->addWarning( $error, $stackPtr, 'MissingBrace', $errorData );
 			return;
 		}
 
-		$openingBrace = $tokens[ $stackPtr ]['scope_opener'];
+		$openingBrace = $tokens[ $stackPtr ][ 'scope_opener' ];
 
 		/*
 		 * Is the brace on the same line as the class/interface/trait declaration ?
 		 */
 		$lastClassLineToken = $phpcsFile->findPrevious( T_STRING, ( $openingBrace - 1 ), $stackPtr );
-		$lastClassLine      = $tokens[ $lastClassLineToken ]['line'];
-		$braceLine          = $tokens[ $openingBrace ]['line'];
+		$lastClassLine      = $tokens[ $lastClassLineToken ][ 'line' ];
+		$braceLine          = $tokens[ $openingBrace ][ 'line' ];
 		$lineDifference     = ( $braceLine - $lastClassLine );
 
 		if ( $lineDifference > 0 ) {
@@ -90,8 +90,8 @@ 
 		 * Is the opening brace the last thing on the line ?
 		 */
 		$next = $phpcsFile->findNext( T_WHITESPACE, ( $openingBrace + 1 ), null, true );
-		if ( $tokens[ $next ]['line'] === $tokens[ $openingBrace ]['line'] ) {
-			if ( $next === $tokens[ $stackPtr ]['scope_closer'] ) {
+		if ( $tokens[ $next ][ 'line' ] === $tokens[ $openingBrace ][ 'line' ] ) {
+			if ( $next === $tokens[ $stackPtr ][ 'scope_closer' ] ) {
 				// Ignore empty classes.
 				return;
 			}
@@ -111,12 +111,12 @@ 
 		/*
 		 * Is there precisely one space before the opening brace ?
 		 */
-		if ( T_WHITESPACE !== $tokens[ ( $openingBrace - 1 ) ]['code'] ) {
+		if ( T_WHITESPACE !== $tokens[ ( $openingBrace - 1 ) ][ 'code' ] ) {
 			$length = 0;
-		} elseif ( "\t" === $tokens[ ( $openingBrace - 1 ) ]['content'] ) {
+		} elseif ( "\t" === $tokens[ ( $openingBrace - 1 ) ][ 'content' ] ) {
 			$length = '\t';
 		} else {
-			$length = strlen( $tokens[ ( $openingBrace - 1 ) ]['content'] );
+			$length = strlen( $tokens[ ( $openingBrace - 1 ) ][ 'content' ] );
 		}
 
 		if ( 1 !== $length ) {

vendor/wp-coding-standards/wpcs/WordPress/AbstractFunctionRestrictionsSniff.php

Spacing +11 added lines, -11 removed lines

@@ -114,7 +114,7 @@ 
 				$items = array_map( array( $this, 'prepare_name_for_regex' ), $group[ $key ] );
 				$items = implode( '|', $items );
 
-				$this->groups[ $groupName ]['regex'] = sprintf( $this->regex_pattern, $items );
+				$this->groups[ $groupName ][ 'regex' ] = sprintf( $this->regex_pattern, $items );
 			}
 		}
 
@@ -140,21 +140,21 @@ 
 
 		// Exclude function definitions, class methods, and namespaced calls.
 		if (
-			T_STRING === $token['code']
+			T_STRING === $token[ 'code' ]
 			&&
 			( $prev = $phpcsFile->findPrevious( T_WHITESPACE, ( $stackPtr - 1 ), null, true ) )
 			&&
 			(
 				// Skip sniffing if calling a method, or on function definitions.
-				in_array( $tokens[ $prev ]['code'], array( T_FUNCTION, T_DOUBLE_COLON, T_OBJECT_OPERATOR ), true )
+				in_array( $tokens[ $prev ][ 'code' ], array( T_FUNCTION, T_DOUBLE_COLON, T_OBJECT_OPERATOR ), true )
 				||
 				(
 					// Skip namespaced functions, ie: \foo\bar() not \bar().
-					T_NS_SEPARATOR === $tokens[ $prev ]['code']
+					T_NS_SEPARATOR === $tokens[ $prev ][ 'code' ]
 					&&
 					( $pprev = $phpcsFile->findPrevious( T_WHITESPACE, ( $prev - 1 ), null, true ) )
 					&&
-					T_STRING === $tokens[ $pprev ]['code']
+					T_STRING === $tokens[ $pprev ][ 'code' ]
 				)
 			)
 			) {
@@ -169,15 +169,15 @@ 
 				continue;
 			}
 
-			if ( isset( $group['whitelist'][ $token['content'] ] ) ) {
+			if ( isset( $group[ 'whitelist' ][ $token[ 'content' ] ] ) ) {
 				continue;
 			}
 
-			if ( preg_match( $group['regex'], $token['content'] ) < 1 ) {
+			if ( preg_match( $group[ 'regex' ], $token[ 'content' ] ) < 1 ) {
 				continue;
 			}
 
-			if ( 'warning' === $group['type'] ) {
+			if ( 'warning' === $group[ 'type' ] ) {
 				$addWhat = array( $phpcsFile, 'addWarning' );
 			} else {
 				$addWhat = array( $phpcsFile, 'addError' );
@@ -185,10 +185,10 @@ 
 
 			call_user_func(
 				$addWhat,
-				$group['message'],
+				$group[ 'message' ],
 				$stackPtr,
 				$groupName,
-				array( $token['content'] )
+				array( $token[ 'content' ] )
 			);
 
 		}
@@ -206,7 +206,7 @@ 
 	 * @return string Regex escaped function name.
 	 */
 	protected function prepare_name_for_regex( $function ) {
-		$function = str_replace( array( '.*', '*' ) , '#', $function ); // Replace wildcards with placeholder.
+		$function = str_replace( array( '.*', '*' ), '#', $function ); // Replace wildcards with placeholder.
 		$function = preg_quote( $function, '`' );
 		$function = str_replace( '#', '.*', $function ); // Replace placeholder with regex wildcard.
 

vendor/cmb2/includes/CMB2.php

Spacing +69 added lines, -69 removed lines

@@ -113,19 +113,19 @@ 
 	 */
 	public function __construct( $config, $object_id = 0 ) {
 
-		if ( empty( $config['id'] ) ) {
+		if ( empty( $config[ 'id' ] ) ) {
 			wp_die( esc_html__( 'Metabox configuration is required to have an ID parameter.', 'cmb2' ) );
 		}
 
 		$this->meta_box = wp_parse_args( $config, $this->mb_defaults );
-		$this->meta_box['fields'] = array();
+		$this->meta_box[ 'fields' ] = array();
 
 		$this->object_id( $object_id );
 		$this->mb_object_type();
-		$this->cmb_id = $config['id'];
+		$this->cmb_id = $config[ 'id' ];
 
-		if ( ! empty( $config['fields'] ) && is_array( $config['fields'] ) ) {
-			$this->add_fields( $config['fields'] );
+		if ( ! empty( $config[ 'fields' ] ) && is_array( $config[ 'fields' ] ) ) {
+			$this->add_fields( $config[ 'fields' ] );
 		}
 
 		CMB2_Boxes::add( $this );
@@ -294,22 +294,22 @@ 
 	 * @return mixed CMB2_Field object if successful.
 	 */
 	public function render_field( $field_args ) {
-		$field_args['context'] = $this->prop( 'context' );
+		$field_args[ 'context' ] = $this->prop( 'context' );
 
-		if ( 'group' == $field_args['type'] ) {
+		if ( 'group' == $field_args[ 'type' ] ) {
 
-			if ( ! isset( $field_args['show_names'] ) ) {
-				$field_args['show_names'] = $this->prop( 'show_names' );
+			if ( ! isset( $field_args[ 'show_names' ] ) ) {
+				$field_args[ 'show_names' ] = $this->prop( 'show_names' );
 			}
 			$field = $this->render_group( $field_args );
 
-		} elseif ( 'hidden' == $field_args['type'] && $this->get_field( $field_args )->should_show() ) {
+		} elseif ( 'hidden' == $field_args[ 'type' ] && $this->get_field( $field_args )->should_show() ) {
 			// Save rendering for after the metabox
 			$field = $this->add_hidden_field( $field_args );
 
 		} else {
 
-			$field_args['show_names'] = $this->prop( 'show_names' );
+			$field_args[ 'show_names' ] = $this->prop( 'show_names' );
 
 			// Render default fields
 			$field = $this->get_field( $field_args )->render_field();
@@ -325,7 +325,7 @@ 
 	 */
 	public function render_group( $args ) {
 
-		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) {
+		if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) {
 			return;
 		}
 
@@ -435,15 +435,15 @@ 
 			<div class="inside cmb-td cmb-nested cmb-field-list">';
 				// Loop and render repeatable group fields
 				foreach ( array_values( $field_group->args( 'fields' ) ) as $field_args ) {
-					if ( 'hidden' == $field_args['type'] ) {
+					if ( 'hidden' == $field_args[ 'type' ] ) {
 
 						// Save rendering for after the metabox
 						$this->add_hidden_field( $field_args, $field_group );
 
 					} else {
 
-						$field_args['show_names'] = $field_group->args( 'show_names' );
-						$field_args['context']    = $field_group->args( 'context' );
+						$field_args[ 'show_names' ] = $field_group->args( 'show_names' );
+						$field_args[ 'context' ]    = $field_group->args( 'context' );
 
 						$field = $this->get_field( $field_args, $field_group )->render_field();
 					}
@@ -472,7 +472,7 @@ 
 	 * @param CMB2_Field|null $field_group CMB2_Field group field object
 	 */
 	public function add_hidden_field( $field_args, $field_group = null ) {
-		if ( isset( $field_args['field_args'] ) ) {
+		if ( isset( $field_args[ 'field_args' ] ) ) {
 			// For back-compatibility.
 			$field = new CMB2_Field( $field_args );
 		} else {
@@ -485,7 +485,7 @@ 
 			$type->iterator = $field_group->index;
 		}
 
-		$this->hidden_fields[] = $type;
+		$this->hidden_fields[ ] = $type;
 
 		return $field;
 	}
@@ -582,11 +582,11 @@ 
 	 */
 	public function process_field( $field_args ) {
 
-		switch ( $field_args['type'] ) {
+		switch ( $field_args[ 'type' ] ) {
 
 			case 'group':
 				if ( $this->save_group( $field_args ) ) {
-					$this->updated[] = $field_args['id'];
+					$this->updated[ ] = $field_args[ 'id' ];
 				}
 
 				break;
@@ -600,7 +600,7 @@ 
 				$field = $this->get_new_field( $field_args );
 
 				if ( $field->save_field_from_data( $this->data_to_save ) ) {
-					$this->updated[] = $field->id();
+					$this->updated[ ] = $field->id();
 				}
 
 				break;
@@ -667,7 +667,7 @@ 
 	 * @return mixed        Return of CMB2_Field::update_data()
 	 */
 	public function save_group( $args ) {
-		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) {
+		if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) {
 			return;
 		}
 
@@ -715,16 +715,16 @@ 
 						$_new_val = array();
 						foreach ( $new_val as $group_index => $grouped_data ) {
 							// Add the supporting data to the $saved array stack
-							$saved[ $field_group->index ][ $grouped_data['supporting_field_id'] ][] = $grouped_data['supporting_field_value'];
+							$saved[ $field_group->index ][ $grouped_data[ 'supporting_field_id' ] ][ ] = $grouped_data[ 'supporting_field_value' ];
 							// Reset var to the actual value
-							$_new_val[ $group_index ] = $grouped_data['value'];
+							$_new_val[ $group_index ] = $grouped_data[ 'value' ];
 						}
 						$new_val = $_new_val;
 					} else {
 						// Add the supporting data to the $saved array stack
-						$saved[ $field_group->index ][ $new_val['supporting_field_id'] ] = $new_val['supporting_field_value'];
+						$saved[ $field_group->index ][ $new_val[ 'supporting_field_id' ] ] = $new_val[ 'supporting_field_value' ];
 						// Reset var to the actual value
-						$new_val = $new_val['value'];
+						$new_val = $new_val[ 'value' ];
 					}
 				}
 
@@ -738,7 +738,7 @@ 
 
 				// Compare values and add to `$updated` array
 				if ( $is_updated || $is_removed ) {
-					$this->updated[] = $base_id . '::' . $field_group->index . '::' . $sub_id;
+					$this->updated[ ] = $base_id . '::' . $field_group->index . '::' . $sub_id;
 				}
 
 				// Add to `$saved` array
@@ -775,22 +775,22 @@ 
 		// Try to get our object ID from the global space
 		switch ( $this->object_type() ) {
 			case 'user':
-				$object_id = isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id;
-				$object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS['user_ID'] ) ? $GLOBALS['user_ID'] : $object_id;
+				$object_id = isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id;
+				$object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS[ 'user_ID' ] ) ? $GLOBALS[ 'user_ID' ] : $object_id;
 				break;
 
 			case 'comment':
-				$object_id = isset( $_REQUEST['c'] ) ? $_REQUEST['c'] : $object_id;
-				$object_id = ! $object_id && isset( $GLOBALS['comments']->comment_ID ) ? $GLOBALS['comments']->comment_ID : $object_id;
+				$object_id = isset( $_REQUEST[ 'c' ] ) ? $_REQUEST[ 'c' ] : $object_id;
+				$object_id = ! $object_id && isset( $GLOBALS[ 'comments' ]->comment_ID ) ? $GLOBALS[ 'comments' ]->comment_ID : $object_id;
 				break;
 
 			case 'term':
-				$object_id = isset( $_REQUEST['tag_ID'] ) ? $_REQUEST['tag_ID'] : $object_id;
+				$object_id = isset( $_REQUEST[ 'tag_ID' ] ) ? $_REQUEST[ 'tag_ID' ] : $object_id;
 				break;
 
 			default:
-				$object_id = isset( $GLOBALS['post']->ID ) ? $GLOBALS['post']->ID : $object_id;
-				$object_id = isset( $_REQUEST['post'] ) ? $_REQUEST['post'] : $object_id;
+				$object_id = isset( $GLOBALS[ 'post' ]->ID ) ? $GLOBALS[ 'post' ]->ID : $object_id;
+				$object_id = isset( $_REQUEST[ 'post' ] ) ? $_REQUEST[ 'post' ] : $object_id;
 				break;
 		}
 
@@ -861,7 +861,7 @@ 
 	 * @return boolean True/False
 	 */
 	public function is_options_page_mb() {
-		return ( isset( $this->meta_box['show_on']['key'] ) && 'options-page' === $this->meta_box['show_on']['key'] || array_key_exists( 'options-page', $this->meta_box['show_on'] ) );
+		return ( isset( $this->meta_box[ 'show_on' ][ 'key' ] ) && 'options-page' === $this->meta_box[ 'show_on' ][ 'key' ] || array_key_exists( 'options-page', $this->meta_box[ 'show_on' ] ) );
 	}
 
 	/**
@@ -948,7 +948,7 @@ 
 			return $field;
 		}
 
-		$field_id = is_string( $field ) ? $field : $field['id'];
+		$field_id = is_string( $field ) ? $field : $field[ 'id' ];
 
 		$parent_field_id = ! empty( $field_group ) ? $field_group->id() : '';
 		$ids = $this->get_field_ids( $field_id, $parent_field_id, true );
@@ -984,16 +984,16 @@ 
 		if ( $field_group && ( $sub_field_id || 0 === $sub_field_id ) ) {
 
 			// Update the fields array w/ any modified properties inherited from the group field
-			$this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] = $field_args;
+			$this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] = $field_args;
 
 			return $this->get_default_args( $field_args, $field_group );
 		}
 
 		if ( is_array( $field_args ) ) {
-			$this->meta_box['fields'][ $field_id ] = array_merge( $field_args, $this->meta_box['fields'][ $field_id ] );
+			$this->meta_box[ 'fields' ][ $field_id ] = array_merge( $field_args, $this->meta_box[ 'fields' ][ $field_id ] );
 		}
 
-		return $this->get_default_args( $this->meta_box['fields'][ $field_id ] );
+		return $this->get_default_args( $this->meta_box[ 'fields' ][ $field_id ] );
 	}
 
 	/**
@@ -1043,8 +1043,8 @@ 
 
 			$sub_fields = false;
 			if ( array_key_exists( 'fields', $field ) ) {
-				$sub_fields = $field['fields'];
-				unset( $field['fields'] );
+				$sub_fields = $field[ 'fields' ];
+				unset( $field[ 'fields' ] );
 			}
 
 			$field_id = $parent_field_id
@@ -1069,26 +1069,26 @@ 
 			return false;
 		}
 
-		if ( 'oembed' === $field['type'] ) {
+		if ( 'oembed' === $field[ 'type' ] ) {
 			// Initiate oembed Ajax hooks
 			cmb2_ajax();
 		}
 
-		if ( isset( $field['column'] ) && false !== $field['column'] ) {
+		if ( isset( $field[ 'column' ] ) && false !== $field[ 'column' ] ) {
 			$field = $this->define_field_column( $field );
 		}
 
-		if ( isset( $field['taxonomy'] ) && ! empty( $field['remove_default'] ) ) {
-			$this->tax_metaboxes_to_remove[ $field['taxonomy'] ] = $field['taxonomy'];
+		if ( isset( $field[ 'taxonomy' ] ) && ! empty( $field[ 'remove_default' ] ) ) {
+			$this->tax_metaboxes_to_remove[ $field[ 'taxonomy' ] ] = $field[ 'taxonomy' ];
 		}
 
 		$this->_add_field_to_array(
 			$field,
-			$this->meta_box['fields'],
+			$this->meta_box[ 'fields' ],
 			$position
 		);
 
-		return $field['id'];
+		return $field[ 'id' ];
 	}
 
 	/**
@@ -1100,10 +1100,10 @@ 
 	protected function define_field_column( array $field ) {
 		$this->has_columns = true;
 
-		$column = is_array( $field['column'] ) ? $field['column'] : array();
+		$column = is_array( $field[ 'column' ] ) ? $field[ 'column' ] : array();
 
-		$field['column'] = wp_parse_args( $column, array(
-			'name'     => isset( $field['name'] ) ? $field['name'] : '',
+		$field[ 'column' ] = wp_parse_args( $column, array(
+			'name'     => isset( $field[ 'name' ] ) ? $field[ 'name' ] : '',
 			'position' => false,
 		) );
 
@@ -1119,27 +1119,27 @@ 
 	 * @return mixed                   Array of parent/field ids or false
 	 */
 	public function add_group_field( $parent_field_id, array $field, $position = 0 ) {
-		if ( ! array_key_exists( $parent_field_id, $this->meta_box['fields'] ) ) {
+		if ( ! array_key_exists( $parent_field_id, $this->meta_box[ 'fields' ] ) ) {
 			return false;
 		}
 
-		$parent_field = $this->meta_box['fields'][ $parent_field_id ];
+		$parent_field = $this->meta_box[ 'fields' ][ $parent_field_id ];
 
-		if ( 'group' !== $parent_field['type'] ) {
+		if ( 'group' !== $parent_field[ 'type' ] ) {
 			return false;
 		}
 
-		if ( ! isset( $parent_field['fields'] ) ) {
-			$this->meta_box['fields'][ $parent_field_id ]['fields'] = array();
+		if ( ! isset( $parent_field[ 'fields' ] ) ) {
+			$this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ] = array();
 		}
 
 		$this->_add_field_to_array(
 			$field,
-			$this->meta_box['fields'][ $parent_field_id ]['fields'],
+			$this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ],
 			$position
 		);
 
-		return array( $parent_field_id, $field['id'] );
+		return array( $parent_field_id, $field[ 'id' ] );
 	}
 
 	/**
@@ -1151,9 +1151,9 @@ 
 	 */
 	protected function _add_field_to_array( $field, &$fields, $position = 0 ) {
 		if ( $position ) {
-			CMB2_Utils::array_insert( $fields, array( $field['id'] => $field ), $position );
+			CMB2_Utils::array_insert( $fields, array( $field[ 'id' ] => $field ), $position );
 		} else {
-			$fields[ $field['id'] ] = $field;
+			$fields[ $field[ 'id' ] ] = $field;
 		}
 	}
 
@@ -1176,15 +1176,15 @@ 
 		unset( $this->fields[ implode( '', $ids ) ] );
 
 		if ( ! $sub_field_id ) {
-			unset( $this->meta_box['fields'][ $field_id ] );
+			unset( $this->meta_box[ 'fields' ][ $field_id ] );
 			return true;
 		}
 
-		if ( isset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] ) ) {
-			unset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] );
+		if ( isset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] ) ) {
+			unset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] );
 		}
-		if ( isset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] ) ) {
-			unset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] );
+		if ( isset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] ) ) {
+			unset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] );
 		}
 		return true;
 	}
@@ -1208,11 +1208,11 @@ 
 		list( $field_id, $sub_field_id ) = $ids;
 
 		if ( ! $sub_field_id ) {
-			$this->meta_box['fields'][ $field_id ][ $property ] = $value;
+			$this->meta_box[ 'fields' ][ $field_id ][ $property ] = $value;
 			return $field_id;
 		}
 
-		$this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ][ $property ] = $value;
+		$this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ][ $property ] = $value;
 		return $field_id;
 	}
 
@@ -1226,7 +1226,7 @@ 
 	public function get_field_ids( $field_id, $parent_field_id = '' ) {
 		$sub_field_id = $parent_field_id ? $field_id : '';
 		$field_id     = $parent_field_id ? $parent_field_id : $field_id;
-		$fields       =& $this->meta_box['fields'];
+		$fields       = & $this->meta_box[ 'fields' ];
 
 		if ( ! array_key_exists( $field_id, $fields ) ) {
 			$field_id = $this->search_old_school_array( $field_id, $fields );
@@ -1240,12 +1240,12 @@ 
 			return array( $field_id, $sub_field_id );
 		}
 
-		if ( 'group' !== $fields[ $field_id ]['type'] ) {
+		if ( 'group' !== $fields[ $field_id ][ 'type' ] ) {
 			return false;
 		}
 
-		if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ]['fields'] ) ) {
-			$sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ]['fields'] );
+		if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ][ 'fields' ] ) ) {
+			$sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ][ 'fields' ] );
 		}
 
 		return false === $sub_field_id ? false : array( $field_id, $sub_field_id );

vendor/cmb2/includes/helper-functions.php

Spacing +23 added lines, -23 removed lines

@@ -90,18 +90,18 @@ 
 	$oembed = cmb2_ajax()->get_oembed_no_edit( $args );
 
 	// Send back our embed
-	if ( $oembed['embed'] && $oembed['embed'] != $oembed['fallback'] ) {
-		return '<div class="cmb2-oembed">' . $oembed['embed'] . '</div>';
+	if ( $oembed[ 'embed' ] && $oembed[ 'embed' ] != $oembed[ 'fallback' ] ) {
+		return '<div class="cmb2-oembed">' . $oembed[ 'embed' ] . '</div>';
 	}
 
 	$error = sprintf(
 		/* translators: 1: results for. 2: link to codex.wordpress.org/Embeds */
 		esc_html__( 'No oEmbed Results Found for %1$s. View more info at %2$s.', 'cmb2' ),
-		$oembed['fallback'],
+		$oembed[ 'fallback' ],
 		'<a href="https://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>'
 	);
 
-	if ( isset( $args['wp_error'] ) && $args['wp_error'] ) {
+	if ( isset( $args[ 'wp_error' ] ) && $args[ 'wp_error' ] ) {
 		return new WP_Error( 'cmb2_get_oembed_result', $error, compact( 'oembed', 'args' ) );
 	}
 
@@ -216,7 +216,7 @@ 
 		$cmb = CMB2_Boxes::get( $meta_box );
 	} else {
 		// See if we already have an instance of this metabox
-		$cmb = CMB2_Boxes::get( $meta_box['id'] );
+		$cmb = CMB2_Boxes::get( $meta_box[ 'id' ] );
 		// If not, we'll initate a new metabox
 		$cmb = $cmb ? $cmb : new CMB2( $meta_box, $object_id );
 	}
@@ -292,7 +292,7 @@ 
 	) );
 
 	// Set object type explicitly (rather than trying to guess from context)
-	$cmb->object_type( $args['object_type'] );
+	$cmb->object_type( $args[ 'object_type' ] );
 
 	// Save the metabox if it's been submitted
 	// check permissions
@@ -300,32 +300,32 @@ 
 	if (
 		$cmb->prop( 'save_fields' )
 		// check nonce
-		&& isset( $_POST['submit-cmb'], $_POST['object_id'], $_POST[ $cmb->nonce() ] )
+		&& isset( $_POST[ 'submit-cmb' ], $_POST[ 'object_id' ], $_POST[ $cmb->nonce() ] )
 		&& wp_verify_nonce( $_POST[ $cmb->nonce() ], $cmb->nonce() )
-		&& $object_id && $_POST['object_id'] == $object_id
+		&& $object_id && $_POST[ 'object_id' ] == $object_id
 	) {
 		$cmb->save_fields( $object_id, $cmb->object_type(), $_POST );
 	}
 
 	// Enqueue JS/CSS
-	if ( $args['cmb_styles'] ) {
+	if ( $args[ 'cmb_styles' ] ) {
 		CMB2_hookup::enqueue_cmb_css();
 	}
 
-	if ( $args['enqueue_js'] ) {
+	if ( $args[ 'enqueue_js' ] ) {
 		CMB2_hookup::enqueue_cmb_js();
 	}
 
-	$form_format = apply_filters( 'cmb2_get_metabox_form_format', $args['form_format'], $object_id, $cmb );
+	$form_format = apply_filters( 'cmb2_get_metabox_form_format', $args[ 'form_format' ], $object_id, $cmb );
 
 	$format_parts = explode( '%3$s', $form_format );
 
 	// Show cmb form
-	printf( $format_parts[0], $cmb->cmb_id, $object_id );
+	printf( $format_parts[ 0 ], $cmb->cmb_id, $object_id );
 	$cmb->show_form();
 
-	if ( isset( $format_parts[1] ) && $format_parts[1] ) {
-		printf( str_ireplace( '%4$s', '%1$s', $format_parts[1] ), $args['save_button'] );
+	if ( isset( $format_parts[ 1 ] ) && $format_parts[ 1 ] ) {
+		printf( str_ireplace( '%4$s', '%1$s', $format_parts[ 1 ] ), $args[ 'save_button' ] );
 	}
 
 }
@@ -338,7 +338,7 @@ 
  * @param  array   $args      Optional arguments array
  */
 function cmb2_metabox_form( $meta_box, $object_id = 0, $args = array() ) {
-	if ( ! isset( $args['echo'] ) || $args['echo'] ) {
+	if ( ! isset( $args[ 'echo' ] ) || $args[ 'echo' ] ) {
 		cmb2_print_metabox_form( $meta_box, $object_id, $args );
 	} else {
 		return cmb2_get_metabox_form( $meta_box, $object_id, $args );
@@ -360,7 +360,7 @@ 
 
 		$schedule_format = str_replace(
 			array( 'M', 'Y', 'm', 'd', 'H', 'i', 'a' ),
-			array('%b', '%Y', '%m', '%d', '%H', '%M', '%p' ),
+			array( '%b', '%Y', '%m', '%d', '%H', '%M', '%p' ),
 			$date_format
 		);
 
@@ -377,14 +377,14 @@ 
 			 * 4 or 2 characters, as needed
 			 */
 			'%04d-%02d-%02d %02d:%02d:%02d',
-			$parsed_time['tm_year'] + 1900,  // This will be "111", so we need to add 1900.
-			$parsed_time['tm_mon'] + 1,      // This will be the month minus one, so we add one.
-			$parsed_time['tm_mday'],
-			$parsed_time['tm_hour'],
-			$parsed_time['tm_min'],
-			$parsed_time['tm_sec']
+			$parsed_time[ 'tm_year' ] + 1900, // This will be "111", so we need to add 1900.
+			$parsed_time[ 'tm_mon' ] + 1, // This will be the month minus one, so we add one.
+			$parsed_time[ 'tm_mday' ],
+			$parsed_time[ 'tm_hour' ],
+			$parsed_time[ 'tm_min' ],
+			$parsed_time[ 'tm_sec' ]
 		);
 
-		return new DateTime($ymd);
+		return new DateTime( $ymd );
 	}
 }