eventespresso / event-espresso-core

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php

Indentation +283 added lines, -283 removed lines

@@ -16,289 +16,289 @@
 class SwitchDeclarationSniff implements Sniff
 {
 
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = [
-        'PHP',
-        'JS',
-    ];
-
-    /**
-     * The number of spaces code should be indented.
-     *
-     * @var integer
-     */
-    public $indent = 4;
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [T_SWITCH];
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token in the
-     *                                               stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // We can't process SWITCH statements unless we know where they start and end.
-        if (isset($tokens[$stackPtr]['scope_opener']) === false
-            || isset($tokens[$stackPtr]['scope_closer']) === false
-        ) {
-            return;
-        }
-
-        $switch        = $tokens[$stackPtr];
-        $nextCase      = $stackPtr;
-        $caseAlignment = ($switch['column'] + $this->indent);
-        $caseCount     = 0;
-        $foundDefault  = false;
-
-        while (($nextCase = $phpcsFile->findNext([T_CASE, T_DEFAULT, T_SWITCH], ($nextCase + 1), $switch['scope_closer'])) !== false) {
-            // Skip nested SWITCH statements; they are handled on their own.
-            if ($tokens[$nextCase]['code'] === T_SWITCH) {
-                $nextCase = $tokens[$nextCase]['scope_closer'];
-                continue;
-            }
-
-            if ($tokens[$nextCase]['code'] === T_DEFAULT) {
-                $type         = 'Default';
-                $foundDefault = true;
-            } else {
-                $type = 'Case';
-                $caseCount++;
-            }
-
-            if ($tokens[$nextCase]['content'] !== strtolower($tokens[$nextCase]['content'])) {
-                $expected = strtolower($tokens[$nextCase]['content']);
-                $error    = strtoupper($type).' keyword must be lowercase; expected "%s" but found "%s"';
-                $data     = [
-                    $expected,
-                    $tokens[$nextCase]['content'],
-                ];
-
-                $fix = $phpcsFile->addFixableError($error, $nextCase, $type.'NotLower', $data);
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken($nextCase, $expected);
-                }
-            }
-
-            if ($tokens[$nextCase]['column'] !== $caseAlignment) {
-                $error = strtoupper($type).' keyword must be indented '.$this->indent.' spaces from SWITCH keyword';
-                $fix   = $phpcsFile->addFixableError($error, $nextCase, $type.'Indent');
-
-                if ($fix === true) {
-                    $padding = str_repeat(' ', ($caseAlignment - 1));
-                    if ($tokens[$nextCase]['column'] === 1
-                        || $tokens[($nextCase - 1)]['code'] !== T_WHITESPACE
-                    ) {
-                        $phpcsFile->fixer->addContentBefore($nextCase, $padding);
-                    } else {
-                        $phpcsFile->fixer->replaceToken(($nextCase - 1), $padding);
-                    }
-                }
-            }
-
-            if ($type === 'Case'
-                && ($tokens[($nextCase + 1)]['type'] !== 'T_WHITESPACE'
-                || $tokens[($nextCase + 1)]['content'] !== ' ')
-            ) {
-                $error = 'CASE keyword must be followed by a single space';
-                $fix   = $phpcsFile->addFixableError($error, $nextCase, 'SpacingAfterCase');
-                if ($fix === true) {
-                    if ($tokens[($nextCase + 1)]['type'] !== 'T_WHITESPACE') {
-                        $phpcsFile->fixer->addContent($nextCase, ' ');
-                    } else {
-                        $phpcsFile->fixer->replaceToken(($nextCase + 1), ' ');
-                    }
-                }
-            }
-
-            if (isset($tokens[$nextCase]['scope_opener']) === false) {
-                $error = 'Possible parse error: CASE missing opening colon';
-                $phpcsFile->addWarning($error, $nextCase, 'MissingColon');
-                continue;
-            }
-
-            $opener = $tokens[$nextCase]['scope_opener'];
-            if ($tokens[($opener - 1)]['type'] === 'T_WHITESPACE') {
-                $error = 'There must be no space before the colon in a '.strtoupper($type).' statement';
-                $fix   = $phpcsFile->addFixableError($error, $nextCase, 'SpaceBeforeColon'.$type);
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken(($opener - 1), '');
-                }
-            }
-
-            $nextBreak = $tokens[$nextCase]['scope_closer'];
-            if ($tokens[$nextBreak]['code'] === T_BREAK
-                || $tokens[$nextBreak]['code'] === T_RETURN
-                || $tokens[$nextBreak]['code'] === T_CONTINUE
-                || $tokens[$nextBreak]['code'] === T_THROW
-                || $tokens[$nextBreak]['code'] === T_EXIT
-            ) {
-                if ($tokens[$nextBreak]['scope_condition'] === $nextCase) {
-                    // Only need to check a couple of things once, even if the
-                    // break is shared between multiple case statements, or even
-                    // the default case.
-                    if ($tokens[$nextBreak]['column'] !== $caseAlignment) {
-                        $error = 'Case breaking statement must be indented '.$this->indent.' spaces from SWITCH keyword';
-                        $fix   = $phpcsFile->addFixableError($error, $nextBreak, 'BreakIndent');
-
-                        if ($fix === true) {
-                            $padding = str_repeat(' ', ($caseAlignment - 1));
-                            if ($tokens[$nextBreak]['column'] === 1
-                                || $tokens[($nextBreak - 1)]['code'] !== T_WHITESPACE
-                            ) {
-                                $phpcsFile->fixer->addContentBefore($nextBreak, $padding);
-                            } else {
-                                $phpcsFile->fixer->replaceToken(($nextBreak - 1), $padding);
-                            }
-                        }
-                    }
-
-                    $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($nextBreak - 1), $stackPtr, true);
-                    if ($tokens[$prev]['line'] !== ($tokens[$nextBreak]['line'] - 1)) {
-                        $error = 'Blank lines are not allowed before case breaking statements';
-                        $phpcsFile->addError($error, $nextBreak, 'SpacingBeforeBreak');
-                    }
-
-                    $nextLine  = $tokens[$tokens[$stackPtr]['scope_closer']]['line'];
-                    $semicolon = $phpcsFile->findEndOfStatement($nextBreak);
-                    for ($i = ($semicolon + 1); $i < $tokens[$stackPtr]['scope_closer']; $i++) {
-                        if ($tokens[$i]['type'] !== 'T_WHITESPACE') {
-                            $nextLine = $tokens[$i]['line'];
-                            break;
-                        }
-                    }
-
-                    if ($type === 'Case') {
-                        // Ensure the BREAK statement is followed by
-                        // a single blank line, or the end switch brace.
-                        if ($nextLine !== ($tokens[$semicolon]['line'] + 2) && $i !== $tokens[$stackPtr]['scope_closer']) {
-                            $error = 'Case breaking statements must be followed by a single blank line';
-                            $fix   = $phpcsFile->addFixableError($error, $nextBreak, 'SpacingAfterBreak');
-                            if ($fix === true) {
-                                $phpcsFile->fixer->beginChangeset();
-                                for ($i = ($semicolon + 1); $i <= $tokens[$stackPtr]['scope_closer']; $i++) {
-                                    if ($tokens[$i]['line'] === $nextLine) {
-                                        $phpcsFile->fixer->addNewlineBefore($i);
-                                        break;
-                                    }
-
-                                    if ($tokens[$i]['line'] === $tokens[$semicolon]['line']) {
-                                        continue;
-                                    }
-
-                                    $phpcsFile->fixer->replaceToken($i, '');
-                                }
-
-                                $phpcsFile->fixer->endChangeset();
-                            }
-                        }//end if
-                    } else {
-                        // Ensure the BREAK statement is not followed by a blank line.
-                        if ($nextLine !== ($tokens[$semicolon]['line'] + 1)) {
-                            $error = 'Blank lines are not allowed after the DEFAULT case\'s breaking statement';
-                            $phpcsFile->addError($error, $nextBreak, 'SpacingAfterDefaultBreak');
-                        }
-                    }//end if
-
-                    $caseLine = $tokens[$nextCase]['line'];
-                    $nextLine = $tokens[$nextBreak]['line'];
-                    for ($i = ($opener + 1); $i < $nextBreak; $i++) {
-                        if ($tokens[$i]['type'] !== 'T_WHITESPACE') {
-                            $nextLine = $tokens[$i]['line'];
-                            break;
-                        }
-                    }
-
-                    if ($nextLine !== ($caseLine + 1)) {
-                        $error = 'Blank lines are not allowed after '.strtoupper($type).' statements';
-                        $phpcsFile->addError($error, $nextCase, 'SpacingAfter'.$type);
-                    }
-                }//end if
-
-                if ($tokens[$nextBreak]['code'] === T_BREAK) {
-                    if ($type === 'Case') {
-                        // Ensure empty CASE statements are not allowed.
-                        // They must have some code content in them. A comment is not enough.
-                        // But count RETURN statements as valid content if they also
-                        // happen to close the CASE statement.
-                        $foundContent = false;
-                        for ($i = ($tokens[$nextCase]['scope_opener'] + 1); $i < $nextBreak; $i++) {
-                            if ($tokens[$i]['code'] === T_CASE) {
-                                $i = $tokens[$i]['scope_opener'];
-                                continue;
-                            }
-
-                            if (isset(Tokens::$emptyTokens[$tokens[$i]['code']]) === false) {
-                                $foundContent = true;
-                                break;
-                            }
-                        }
-
-                        if ($foundContent === false) {
-                            $error = 'Empty CASE statements are not allowed';
-                            $phpcsFile->addError($error, $nextCase, 'EmptyCase');
-                        }
-                    } else {
-                        // Ensure empty DEFAULT statements are not allowed.
-                        // They must (at least) have a comment describing why
-                        // the default case is being ignored.
-                        $foundContent = false;
-                        for ($i = ($tokens[$nextCase]['scope_opener'] + 1); $i < $nextBreak; $i++) {
-                            if ($tokens[$i]['type'] !== 'T_WHITESPACE') {
-                                $foundContent = true;
-                                break;
-                            }
-                        }
-
-                        if ($foundContent === false) {
-                            $error = 'Comment required for empty DEFAULT case';
-                            $phpcsFile->addError($error, $nextCase, 'EmptyDefault');
-                        }
-                    }//end if
-                }//end if
-            } else if ($type === 'Default') {
-                $error = 'DEFAULT case must have a breaking statement';
-                $phpcsFile->addError($error, $nextCase, 'DefaultNoBreak');
-            }//end if
-        }//end while
-
-        if ($foundDefault === false) {
-            $error = 'All SWITCH statements must contain a DEFAULT case';
-            $phpcsFile->addError($error, $stackPtr, 'MissingDefault');
-        }
-
-        if ($tokens[$switch['scope_closer']]['column'] !== $switch['column']) {
-            $error = 'Closing brace of SWITCH statement must be aligned with SWITCH keyword';
-            $phpcsFile->addError($error, $switch['scope_closer'], 'CloseBraceAlign');
-        }
-
-        if ($caseCount === 0) {
-            $error = 'SWITCH statements must contain at least one CASE statement';
-            $phpcsFile->addError($error, $stackPtr, 'MissingCase');
-        }
-
-    }//end process()
+	/**
+	 * A list of tokenizers this sniff supports.
+	 *
+	 * @var array
+	 */
+	public $supportedTokenizers = [
+		'PHP',
+		'JS',
+	];
+
+	/**
+	 * The number of spaces code should be indented.
+	 *
+	 * @var integer
+	 */
+	public $indent = 4;
+
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return [T_SWITCH];
+
+	}//end register()
+
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the current token in the
+	 *                                               stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		// We can't process SWITCH statements unless we know where they start and end.
+		if (isset($tokens[$stackPtr]['scope_opener']) === false
+			|| isset($tokens[$stackPtr]['scope_closer']) === false
+		) {
+			return;
+		}
+
+		$switch        = $tokens[$stackPtr];
+		$nextCase      = $stackPtr;
+		$caseAlignment = ($switch['column'] + $this->indent);
+		$caseCount     = 0;
+		$foundDefault  = false;
+
+		while (($nextCase = $phpcsFile->findNext([T_CASE, T_DEFAULT, T_SWITCH], ($nextCase + 1), $switch['scope_closer'])) !== false) {
+			// Skip nested SWITCH statements; they are handled on their own.
+			if ($tokens[$nextCase]['code'] === T_SWITCH) {
+				$nextCase = $tokens[$nextCase]['scope_closer'];
+				continue;
+			}
+
+			if ($tokens[$nextCase]['code'] === T_DEFAULT) {
+				$type         = 'Default';
+				$foundDefault = true;
+			} else {
+				$type = 'Case';
+				$caseCount++;
+			}
+
+			if ($tokens[$nextCase]['content'] !== strtolower($tokens[$nextCase]['content'])) {
+				$expected = strtolower($tokens[$nextCase]['content']);
+				$error    = strtoupper($type).' keyword must be lowercase; expected "%s" but found "%s"';
+				$data     = [
+					$expected,
+					$tokens[$nextCase]['content'],
+				];
+
+				$fix = $phpcsFile->addFixableError($error, $nextCase, $type.'NotLower', $data);
+				if ($fix === true) {
+					$phpcsFile->fixer->replaceToken($nextCase, $expected);
+				}
+			}
+
+			if ($tokens[$nextCase]['column'] !== $caseAlignment) {
+				$error = strtoupper($type).' keyword must be indented '.$this->indent.' spaces from SWITCH keyword';
+				$fix   = $phpcsFile->addFixableError($error, $nextCase, $type.'Indent');
+
+				if ($fix === true) {
+					$padding = str_repeat(' ', ($caseAlignment - 1));
+					if ($tokens[$nextCase]['column'] === 1
+						|| $tokens[($nextCase - 1)]['code'] !== T_WHITESPACE
+					) {
+						$phpcsFile->fixer->addContentBefore($nextCase, $padding);
+					} else {
+						$phpcsFile->fixer->replaceToken(($nextCase - 1), $padding);
+					}
+				}
+			}
+
+			if ($type === 'Case'
+				&& ($tokens[($nextCase + 1)]['type'] !== 'T_WHITESPACE'
+				|| $tokens[($nextCase + 1)]['content'] !== ' ')
+			) {
+				$error = 'CASE keyword must be followed by a single space';
+				$fix   = $phpcsFile->addFixableError($error, $nextCase, 'SpacingAfterCase');
+				if ($fix === true) {
+					if ($tokens[($nextCase + 1)]['type'] !== 'T_WHITESPACE') {
+						$phpcsFile->fixer->addContent($nextCase, ' ');
+					} else {
+						$phpcsFile->fixer->replaceToken(($nextCase + 1), ' ');
+					}
+				}
+			}
+
+			if (isset($tokens[$nextCase]['scope_opener']) === false) {
+				$error = 'Possible parse error: CASE missing opening colon';
+				$phpcsFile->addWarning($error, $nextCase, 'MissingColon');
+				continue;
+			}
+
+			$opener = $tokens[$nextCase]['scope_opener'];
+			if ($tokens[($opener - 1)]['type'] === 'T_WHITESPACE') {
+				$error = 'There must be no space before the colon in a '.strtoupper($type).' statement';
+				$fix   = $phpcsFile->addFixableError($error, $nextCase, 'SpaceBeforeColon'.$type);
+				if ($fix === true) {
+					$phpcsFile->fixer->replaceToken(($opener - 1), '');
+				}
+			}
+
+			$nextBreak = $tokens[$nextCase]['scope_closer'];
+			if ($tokens[$nextBreak]['code'] === T_BREAK
+				|| $tokens[$nextBreak]['code'] === T_RETURN
+				|| $tokens[$nextBreak]['code'] === T_CONTINUE
+				|| $tokens[$nextBreak]['code'] === T_THROW
+				|| $tokens[$nextBreak]['code'] === T_EXIT
+			) {
+				if ($tokens[$nextBreak]['scope_condition'] === $nextCase) {
+					// Only need to check a couple of things once, even if the
+					// break is shared between multiple case statements, or even
+					// the default case.
+					if ($tokens[$nextBreak]['column'] !== $caseAlignment) {
+						$error = 'Case breaking statement must be indented '.$this->indent.' spaces from SWITCH keyword';
+						$fix   = $phpcsFile->addFixableError($error, $nextBreak, 'BreakIndent');
+
+						if ($fix === true) {
+							$padding = str_repeat(' ', ($caseAlignment - 1));
+							if ($tokens[$nextBreak]['column'] === 1
+								|| $tokens[($nextBreak - 1)]['code'] !== T_WHITESPACE
+							) {
+								$phpcsFile->fixer->addContentBefore($nextBreak, $padding);
+							} else {
+								$phpcsFile->fixer->replaceToken(($nextBreak - 1), $padding);
+							}
+						}
+					}
+
+					$prev = $phpcsFile->findPrevious(T_WHITESPACE, ($nextBreak - 1), $stackPtr, true);
+					if ($tokens[$prev]['line'] !== ($tokens[$nextBreak]['line'] - 1)) {
+						$error = 'Blank lines are not allowed before case breaking statements';
+						$phpcsFile->addError($error, $nextBreak, 'SpacingBeforeBreak');
+					}
+
+					$nextLine  = $tokens[$tokens[$stackPtr]['scope_closer']]['line'];
+					$semicolon = $phpcsFile->findEndOfStatement($nextBreak);
+					for ($i = ($semicolon + 1); $i < $tokens[$stackPtr]['scope_closer']; $i++) {
+						if ($tokens[$i]['type'] !== 'T_WHITESPACE') {
+							$nextLine = $tokens[$i]['line'];
+							break;
+						}
+					}
+
+					if ($type === 'Case') {
+						// Ensure the BREAK statement is followed by
+						// a single blank line, or the end switch brace.
+						if ($nextLine !== ($tokens[$semicolon]['line'] + 2) && $i !== $tokens[$stackPtr]['scope_closer']) {
+							$error = 'Case breaking statements must be followed by a single blank line';
+							$fix   = $phpcsFile->addFixableError($error, $nextBreak, 'SpacingAfterBreak');
+							if ($fix === true) {
+								$phpcsFile->fixer->beginChangeset();
+								for ($i = ($semicolon + 1); $i <= $tokens[$stackPtr]['scope_closer']; $i++) {
+									if ($tokens[$i]['line'] === $nextLine) {
+										$phpcsFile->fixer->addNewlineBefore($i);
+										break;
+									}
+
+									if ($tokens[$i]['line'] === $tokens[$semicolon]['line']) {
+										continue;
+									}
+
+									$phpcsFile->fixer->replaceToken($i, '');
+								}
+
+								$phpcsFile->fixer->endChangeset();
+							}
+						}//end if
+					} else {
+						// Ensure the BREAK statement is not followed by a blank line.
+						if ($nextLine !== ($tokens[$semicolon]['line'] + 1)) {
+							$error = 'Blank lines are not allowed after the DEFAULT case\'s breaking statement';
+							$phpcsFile->addError($error, $nextBreak, 'SpacingAfterDefaultBreak');
+						}
+					}//end if
+
+					$caseLine = $tokens[$nextCase]['line'];
+					$nextLine = $tokens[$nextBreak]['line'];
+					for ($i = ($opener + 1); $i < $nextBreak; $i++) {
+						if ($tokens[$i]['type'] !== 'T_WHITESPACE') {
+							$nextLine = $tokens[$i]['line'];
+							break;
+						}
+					}
+
+					if ($nextLine !== ($caseLine + 1)) {
+						$error = 'Blank lines are not allowed after '.strtoupper($type).' statements';
+						$phpcsFile->addError($error, $nextCase, 'SpacingAfter'.$type);
+					}
+				}//end if
+
+				if ($tokens[$nextBreak]['code'] === T_BREAK) {
+					if ($type === 'Case') {
+						// Ensure empty CASE statements are not allowed.
+						// They must have some code content in them. A comment is not enough.
+						// But count RETURN statements as valid content if they also
+						// happen to close the CASE statement.
+						$foundContent = false;
+						for ($i = ($tokens[$nextCase]['scope_opener'] + 1); $i < $nextBreak; $i++) {
+							if ($tokens[$i]['code'] === T_CASE) {
+								$i = $tokens[$i]['scope_opener'];
+								continue;
+							}
+
+							if (isset(Tokens::$emptyTokens[$tokens[$i]['code']]) === false) {
+								$foundContent = true;
+								break;
+							}
+						}
+
+						if ($foundContent === false) {
+							$error = 'Empty CASE statements are not allowed';
+							$phpcsFile->addError($error, $nextCase, 'EmptyCase');
+						}
+					} else {
+						// Ensure empty DEFAULT statements are not allowed.
+						// They must (at least) have a comment describing why
+						// the default case is being ignored.
+						$foundContent = false;
+						for ($i = ($tokens[$nextCase]['scope_opener'] + 1); $i < $nextBreak; $i++) {
+							if ($tokens[$i]['type'] !== 'T_WHITESPACE') {
+								$foundContent = true;
+								break;
+							}
+						}
+
+						if ($foundContent === false) {
+							$error = 'Comment required for empty DEFAULT case';
+							$phpcsFile->addError($error, $nextCase, 'EmptyDefault');
+						}
+					}//end if
+				}//end if
+			} else if ($type === 'Default') {
+				$error = 'DEFAULT case must have a breaking statement';
+				$phpcsFile->addError($error, $nextCase, 'DefaultNoBreak');
+			}//end if
+		}//end while
+
+		if ($foundDefault === false) {
+			$error = 'All SWITCH statements must contain a DEFAULT case';
+			$phpcsFile->addError($error, $stackPtr, 'MissingDefault');
+		}
+
+		if ($tokens[$switch['scope_closer']]['column'] !== $switch['column']) {
+			$error = 'Closing brace of SWITCH statement must be aligned with SWITCH keyword';
+			$phpcsFile->addError($error, $switch['scope_closer'], 'CloseBraceAlign');
+		}
+
+		if ($caseCount === 0) {
+			$error = 'SWITCH statements must contain at least one CASE statement';
+			$phpcsFile->addError($error, $stackPtr, 'MissingCase');
+		}
+
+	}//end process()
 
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php

Indentation +30 added lines, -30 removed lines

@@ -16,36 +16,36 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [T_ELSEIF];
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token in the
-     *                                               stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $error = 'Usage of ELSEIF not allowed; use ELSE IF instead';
-        $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'NotAllowed');
-        if ($fix === true) {
-            $phpcsFile->fixer->replaceToken($stackPtr, 'else if');
-        }
-
-    }//end process()
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return [T_ELSEIF];
+
+	}//end register()
+
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the current token in the
+	 *                                               stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$error = 'Usage of ELSEIF not allowed; use ELSE IF instead';
+		$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'NotAllowed');
+		if ($fix === true) {
+			$phpcsFile->fixer->replaceToken($stackPtr, 'else if');
+		}
+
+	}//end process()
 
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php

Spacing +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
                     $this->requiredSpacesAfterOpen,
                     $spaceAfterOpen,
                 ];
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingAfterOpen', $data);
+                $fix = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingAfterOpen', $data);
                 if ($fix === true) {
                     $padding = str_repeat(' ', $this->requiredSpacesAfterOpen);
                     if ($spaceAfterOpen === 0) {
@@ -121,7 +121,7 @@ 
                     $this->requiredSpacesBeforeClose,
                     $spaceBeforeClose,
                 ];
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeClose', $data);
+                $fix = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeClose', $data);
                 if ($fix === true) {
                     $padding = str_repeat(' ', $this->requiredSpacesBeforeClose);
                     if ($spaceBeforeClose === 0) {

Indentation +216 added lines, -216 removed lines

@@ -15,222 +15,222 @@
 class ForEachLoopDeclarationSniff implements Sniff
 {
 
-    /**
-     * How many spaces should follow the opening bracket.
-     *
-     * @var integer
-     */
-    public $requiredSpacesAfterOpen = 0;
-
-    /**
-     * How many spaces should precede the closing bracket.
-     *
-     * @var integer
-     */
-    public $requiredSpacesBeforeClose = 0;
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [T_FOREACH];
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token in the
-     *                                               stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $this->requiredSpacesAfterOpen   = (int) $this->requiredSpacesAfterOpen;
-        $this->requiredSpacesBeforeClose = (int) $this->requiredSpacesBeforeClose;
-        $tokens = $phpcsFile->getTokens();
-
-        $openingBracket = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $stackPtr);
-        if ($openingBracket === false) {
-            $error = 'Possible parse error: FOREACH has no opening parenthesis';
-            $phpcsFile->addWarning($error, $stackPtr, 'MissingOpenParenthesis');
-            return;
-        }
-
-        if (isset($tokens[$openingBracket]['parenthesis_closer']) === false) {
-            $error = 'Possible parse error: FOREACH has no closing parenthesis';
-            $phpcsFile->addWarning($error, $stackPtr, 'MissingCloseParenthesis');
-            return;
-        }
-
-        $closingBracket = $tokens[$openingBracket]['parenthesis_closer'];
-
-        if ($this->requiredSpacesAfterOpen === 0 && $tokens[($openingBracket + 1)]['code'] === T_WHITESPACE) {
-            $error = 'Space found after opening bracket of FOREACH loop';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterOpen');
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken(($openingBracket + 1), '');
-            }
-        } else if ($this->requiredSpacesAfterOpen > 0) {
-            $spaceAfterOpen = 0;
-            if ($tokens[($openingBracket + 1)]['code'] === T_WHITESPACE) {
-                $spaceAfterOpen = $tokens[($openingBracket + 1)]['length'];
-            }
-
-            if ($spaceAfterOpen !== $this->requiredSpacesAfterOpen) {
-                $error = 'Expected %s spaces after opening bracket; %s found';
-                $data  = [
-                    $this->requiredSpacesAfterOpen,
-                    $spaceAfterOpen,
-                ];
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingAfterOpen', $data);
-                if ($fix === true) {
-                    $padding = str_repeat(' ', $this->requiredSpacesAfterOpen);
-                    if ($spaceAfterOpen === 0) {
-                        $phpcsFile->fixer->addContent($openingBracket, $padding);
-                    } else {
-                        $phpcsFile->fixer->replaceToken(($openingBracket + 1), $padding);
-                    }
-                }
-            }
-        }//end if
-
-        if ($this->requiredSpacesBeforeClose === 0 && $tokens[($closingBracket - 1)]['code'] === T_WHITESPACE) {
-            $error = 'Space found before closing bracket of FOREACH loop';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeClose');
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken(($closingBracket - 1), '');
-            }
-        } else if ($this->requiredSpacesBeforeClose > 0) {
-            $spaceBeforeClose = 0;
-            if ($tokens[($closingBracket - 1)]['code'] === T_WHITESPACE) {
-                $spaceBeforeClose = $tokens[($closingBracket - 1)]['length'];
-            }
-
-            if ($spaceBeforeClose !== $this->requiredSpacesBeforeClose) {
-                $error = 'Expected %s spaces before closing bracket; %s found';
-                $data  = [
-                    $this->requiredSpacesBeforeClose,
-                    $spaceBeforeClose,
-                ];
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeClose', $data);
-                if ($fix === true) {
-                    $padding = str_repeat(' ', $this->requiredSpacesBeforeClose);
-                    if ($spaceBeforeClose === 0) {
-                        $phpcsFile->fixer->addContentBefore($closingBracket, $padding);
-                    } else {
-                        $phpcsFile->fixer->replaceToken(($closingBracket - 1), $padding);
-                    }
-                }
-            }
-        }//end if
-
-        $asToken = $phpcsFile->findNext(T_AS, $openingBracket);
-        if ($asToken === false) {
-            $error = 'Possible parse error: FOREACH has no AS statement';
-            $phpcsFile->addWarning($error, $stackPtr, 'MissingAs');
-            return;
-        }
-
-        $content = $tokens[$asToken]['content'];
-        if ($content !== strtolower($content)) {
-            $expected = strtolower($content);
-            $error    = 'AS keyword must be lowercase; expected "%s" but found "%s"';
-            $data     = [
-                $expected,
-                $content,
-            ];
-
-            $fix = $phpcsFile->addFixableError($error, $asToken, 'AsNotLower', $data);
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken($asToken, $expected);
-            }
-        }
-
-        $doubleArrow = $phpcsFile->findNext(T_DOUBLE_ARROW, $asToken, $closingBracket);
-
-        if ($doubleArrow !== false) {
-            if ($tokens[($doubleArrow - 1)]['code'] !== T_WHITESPACE) {
-                $error = 'Expected 1 space before "=>"; 0 found';
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'NoSpaceBeforeArrow');
-                if ($fix === true) {
-                    $phpcsFile->fixer->addContentBefore($doubleArrow, ' ');
-                }
-            } else {
-                if ($tokens[($doubleArrow - 1)]['length'] !== 1) {
-                    $spaces = $tokens[($doubleArrow - 1)]['length'];
-                    $error  = 'Expected 1 space before "=>"; %s found';
-                    $data   = [$spaces];
-                    $fix    = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingBeforeArrow', $data);
-                    if ($fix === true) {
-                        $phpcsFile->fixer->replaceToken(($doubleArrow - 1), ' ');
-                    }
-                }
-            }
-
-            if ($tokens[($doubleArrow + 1)]['code'] !== T_WHITESPACE) {
-                $error = 'Expected 1 space after "=>"; 0 found';
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'NoSpaceAfterArrow');
-                if ($fix === true) {
-                    $phpcsFile->fixer->addContent($doubleArrow, ' ');
-                }
-            } else {
-                if ($tokens[($doubleArrow + 1)]['length'] !== 1) {
-                    $spaces = $tokens[($doubleArrow + 1)]['length'];
-                    $error  = 'Expected 1 space after "=>"; %s found';
-                    $data   = [$spaces];
-                    $fix    = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingAfterArrow', $data);
-                    if ($fix === true) {
-                        $phpcsFile->fixer->replaceToken(($doubleArrow + 1), ' ');
-                    }
-                }
-            }
-        }//end if
-
-        if ($tokens[($asToken - 1)]['code'] !== T_WHITESPACE) {
-            $error = 'Expected 1 space before "as"; 0 found';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'NoSpaceBeforeAs');
-            if ($fix === true) {
-                $phpcsFile->fixer->addContentBefore($asToken, ' ');
-            }
-        } else {
-            if ($tokens[($asToken - 1)]['length'] !== 1) {
-                $spaces = $tokens[($asToken - 1)]['length'];
-                $error  = 'Expected 1 space before "as"; %s found';
-                $data   = [$spaces];
-                $fix    = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingBeforeAs', $data);
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken(($asToken - 1), ' ');
-                }
-            }
-        }
-
-        if ($tokens[($asToken + 1)]['code'] !== T_WHITESPACE) {
-            $error = 'Expected 1 space after "as"; 0 found';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'NoSpaceAfterAs');
-            if ($fix === true) {
-                $phpcsFile->fixer->addContent($asToken, ' ');
-            }
-        } else {
-            if ($tokens[($asToken + 1)]['length'] !== 1) {
-                $spaces = $tokens[($asToken + 1)]['length'];
-                $error  = 'Expected 1 space after "as"; %s found';
-                $data   = [$spaces];
-                $fix    = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingAfterAs', $data);
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken(($asToken + 1), ' ');
-                }
-            }
-        }
-
-    }//end process()
+	/**
+	 * How many spaces should follow the opening bracket.
+	 *
+	 * @var integer
+	 */
+	public $requiredSpacesAfterOpen = 0;
+
+	/**
+	 * How many spaces should precede the closing bracket.
+	 *
+	 * @var integer
+	 */
+	public $requiredSpacesBeforeClose = 0;
+
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return [T_FOREACH];
+
+	}//end register()
+
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the current token in the
+	 *                                               stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$this->requiredSpacesAfterOpen   = (int) $this->requiredSpacesAfterOpen;
+		$this->requiredSpacesBeforeClose = (int) $this->requiredSpacesBeforeClose;
+		$tokens = $phpcsFile->getTokens();
+
+		$openingBracket = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $stackPtr);
+		if ($openingBracket === false) {
+			$error = 'Possible parse error: FOREACH has no opening parenthesis';
+			$phpcsFile->addWarning($error, $stackPtr, 'MissingOpenParenthesis');
+			return;
+		}
+
+		if (isset($tokens[$openingBracket]['parenthesis_closer']) === false) {
+			$error = 'Possible parse error: FOREACH has no closing parenthesis';
+			$phpcsFile->addWarning($error, $stackPtr, 'MissingCloseParenthesis');
+			return;
+		}
+
+		$closingBracket = $tokens[$openingBracket]['parenthesis_closer'];
+
+		if ($this->requiredSpacesAfterOpen === 0 && $tokens[($openingBracket + 1)]['code'] === T_WHITESPACE) {
+			$error = 'Space found after opening bracket of FOREACH loop';
+			$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterOpen');
+			if ($fix === true) {
+				$phpcsFile->fixer->replaceToken(($openingBracket + 1), '');
+			}
+		} else if ($this->requiredSpacesAfterOpen > 0) {
+			$spaceAfterOpen = 0;
+			if ($tokens[($openingBracket + 1)]['code'] === T_WHITESPACE) {
+				$spaceAfterOpen = $tokens[($openingBracket + 1)]['length'];
+			}
+
+			if ($spaceAfterOpen !== $this->requiredSpacesAfterOpen) {
+				$error = 'Expected %s spaces after opening bracket; %s found';
+				$data  = [
+					$this->requiredSpacesAfterOpen,
+					$spaceAfterOpen,
+				];
+				$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingAfterOpen', $data);
+				if ($fix === true) {
+					$padding = str_repeat(' ', $this->requiredSpacesAfterOpen);
+					if ($spaceAfterOpen === 0) {
+						$phpcsFile->fixer->addContent($openingBracket, $padding);
+					} else {
+						$phpcsFile->fixer->replaceToken(($openingBracket + 1), $padding);
+					}
+				}
+			}
+		}//end if
+
+		if ($this->requiredSpacesBeforeClose === 0 && $tokens[($closingBracket - 1)]['code'] === T_WHITESPACE) {
+			$error = 'Space found before closing bracket of FOREACH loop';
+			$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeClose');
+			if ($fix === true) {
+				$phpcsFile->fixer->replaceToken(($closingBracket - 1), '');
+			}
+		} else if ($this->requiredSpacesBeforeClose > 0) {
+			$spaceBeforeClose = 0;
+			if ($tokens[($closingBracket - 1)]['code'] === T_WHITESPACE) {
+				$spaceBeforeClose = $tokens[($closingBracket - 1)]['length'];
+			}
+
+			if ($spaceBeforeClose !== $this->requiredSpacesBeforeClose) {
+				$error = 'Expected %s spaces before closing bracket; %s found';
+				$data  = [
+					$this->requiredSpacesBeforeClose,
+					$spaceBeforeClose,
+				];
+				$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeClose', $data);
+				if ($fix === true) {
+					$padding = str_repeat(' ', $this->requiredSpacesBeforeClose);
+					if ($spaceBeforeClose === 0) {
+						$phpcsFile->fixer->addContentBefore($closingBracket, $padding);
+					} else {
+						$phpcsFile->fixer->replaceToken(($closingBracket - 1), $padding);
+					}
+				}
+			}
+		}//end if
+
+		$asToken = $phpcsFile->findNext(T_AS, $openingBracket);
+		if ($asToken === false) {
+			$error = 'Possible parse error: FOREACH has no AS statement';
+			$phpcsFile->addWarning($error, $stackPtr, 'MissingAs');
+			return;
+		}
+
+		$content = $tokens[$asToken]['content'];
+		if ($content !== strtolower($content)) {
+			$expected = strtolower($content);
+			$error    = 'AS keyword must be lowercase; expected "%s" but found "%s"';
+			$data     = [
+				$expected,
+				$content,
+			];
+
+			$fix = $phpcsFile->addFixableError($error, $asToken, 'AsNotLower', $data);
+			if ($fix === true) {
+				$phpcsFile->fixer->replaceToken($asToken, $expected);
+			}
+		}
+
+		$doubleArrow = $phpcsFile->findNext(T_DOUBLE_ARROW, $asToken, $closingBracket);
+
+		if ($doubleArrow !== false) {
+			if ($tokens[($doubleArrow - 1)]['code'] !== T_WHITESPACE) {
+				$error = 'Expected 1 space before "=>"; 0 found';
+				$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'NoSpaceBeforeArrow');
+				if ($fix === true) {
+					$phpcsFile->fixer->addContentBefore($doubleArrow, ' ');
+				}
+			} else {
+				if ($tokens[($doubleArrow - 1)]['length'] !== 1) {
+					$spaces = $tokens[($doubleArrow - 1)]['length'];
+					$error  = 'Expected 1 space before "=>"; %s found';
+					$data   = [$spaces];
+					$fix    = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingBeforeArrow', $data);
+					if ($fix === true) {
+						$phpcsFile->fixer->replaceToken(($doubleArrow - 1), ' ');
+					}
+				}
+			}
+
+			if ($tokens[($doubleArrow + 1)]['code'] !== T_WHITESPACE) {
+				$error = 'Expected 1 space after "=>"; 0 found';
+				$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'NoSpaceAfterArrow');
+				if ($fix === true) {
+					$phpcsFile->fixer->addContent($doubleArrow, ' ');
+				}
+			} else {
+				if ($tokens[($doubleArrow + 1)]['length'] !== 1) {
+					$spaces = $tokens[($doubleArrow + 1)]['length'];
+					$error  = 'Expected 1 space after "=>"; %s found';
+					$data   = [$spaces];
+					$fix    = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingAfterArrow', $data);
+					if ($fix === true) {
+						$phpcsFile->fixer->replaceToken(($doubleArrow + 1), ' ');
+					}
+				}
+			}
+		}//end if
+
+		if ($tokens[($asToken - 1)]['code'] !== T_WHITESPACE) {
+			$error = 'Expected 1 space before "as"; 0 found';
+			$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'NoSpaceBeforeAs');
+			if ($fix === true) {
+				$phpcsFile->fixer->addContentBefore($asToken, ' ');
+			}
+		} else {
+			if ($tokens[($asToken - 1)]['length'] !== 1) {
+				$spaces = $tokens[($asToken - 1)]['length'];
+				$error  = 'Expected 1 space before "as"; %s found';
+				$data   = [$spaces];
+				$fix    = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingBeforeAs', $data);
+				if ($fix === true) {
+					$phpcsFile->fixer->replaceToken(($asToken - 1), ' ');
+				}
+			}
+		}
+
+		if ($tokens[($asToken + 1)]['code'] !== T_WHITESPACE) {
+			$error = 'Expected 1 space after "as"; 0 found';
+			$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'NoSpaceAfterAs');
+			if ($fix === true) {
+				$phpcsFile->fixer->addContent($asToken, ' ');
+			}
+		} else {
+			if ($tokens[($asToken + 1)]['length'] !== 1) {
+				$spaces = $tokens[($asToken + 1)]['length'];
+				$error  = 'Expected 1 space after "as"; %s found';
+				$data   = [$spaces];
+				$fix    = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingAfterAs', $data);
+				if ($fix === true) {
+					$phpcsFile->fixer->replaceToken(($asToken + 1), ' ');
+				}
+			}
+		}
+
+	}//end process()
 
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php

Indentation +134 added lines, -134 removed lines

@@ -16,140 +16,140 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [T_INLINE_THEN];
-
-    }//end register()
-
-
-    /**
-     * Processes this sniff, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token in the
-     *                                               stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $openBracket  = null;
-        $closeBracket = null;
-        if (isset($tokens[$stackPtr]['nested_parenthesis']) === true) {
-            $parens       = $tokens[$stackPtr]['nested_parenthesis'];
-            $openBracket  = array_pop($parens);
-            $closeBracket = $tokens[$openBracket]['parenthesis_closer'];
-        }
-
-        // Find the beginning of the statement. If we don't find a
-        // semicolon (end of statement) or comma (end of array value)
-        // then assume the content before the closing parenthesis is the end.
-        $else         = $phpcsFile->findNext(T_INLINE_ELSE, ($stackPtr + 1));
-        $statementEnd = $phpcsFile->findNext([T_SEMICOLON, T_COMMA], ($else + 1), $closeBracket);
-        if ($statementEnd === false) {
-            $statementEnd = $phpcsFile->findPrevious(T_WHITESPACE, ($closeBracket - 1), null, true);
-        }
-
-        // Make sure it's all on the same line.
-        if ($tokens[$statementEnd]['line'] !== $tokens[$stackPtr]['line']) {
-            $error = 'Inline shorthand IF statement must be declared on a single line';
-            $phpcsFile->addError($error, $stackPtr, 'NotSingleLine');
-            return;
-        }
-
-        // Make sure there are spaces around the question mark.
-        $contentBefore = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        $contentAfter  = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        if ($tokens[$contentBefore]['code'] !== T_CLOSE_PARENTHESIS) {
-            $error = 'Inline shorthand IF statement requires brackets around comparison';
-            $phpcsFile->addError($error, $stackPtr, 'NoBrackets');
-        }
-
-        $spaceBefore = ($tokens[$stackPtr]['column'] - ($tokens[$contentBefore]['column'] + $tokens[$contentBefore]['length']));
-        if ($spaceBefore !== 1) {
-            $error = 'Inline shorthand IF statement requires 1 space before THEN; %s found';
-            $data  = [$spaceBefore];
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingBeforeThen', $data);
-            if ($fix === true) {
-                if ($spaceBefore === 0) {
-                    $phpcsFile->fixer->addContentBefore($stackPtr, ' ');
-                } else {
-                    $phpcsFile->fixer->replaceToken(($stackPtr - 1), ' ');
-                }
-            }
-        }
-
-        // If there is no content between the ? and the : operators, then they are
-        // trying to replicate an elvis operator, even though PHP doesn't have one.
-        // In this case, we want no spaces between the two operators so ?: looks like
-        // an operator itself.
-        $next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        if ($tokens[$next]['code'] === T_INLINE_ELSE) {
-            $inlineElse = $next;
-            if ($inlineElse !== ($stackPtr + 1)) {
-                $error = 'Inline shorthand IF statement without THEN statement requires 0 spaces between THEN and ELSE';
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'ElvisSpacing');
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken(($stackPtr + 1), '');
-                }
-            }
-        } else {
-            $spaceAfter = (($tokens[$contentAfter]['column']) - ($tokens[$stackPtr]['column'] + 1));
-            if ($spaceAfter !== 1) {
-                $error = 'Inline shorthand IF statement requires 1 space after THEN; %s found';
-                $data  = [$spaceAfter];
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingAfterThen', $data);
-                if ($fix === true) {
-                    if ($spaceAfter === 0) {
-                        $phpcsFile->fixer->addContent($stackPtr, ' ');
-                    } else {
-                        $phpcsFile->fixer->replaceToken(($stackPtr + 1), ' ');
-                    }
-                }
-            }
-
-            // Make sure the ELSE has the correct spacing.
-            $inlineElse    = $phpcsFile->findNext(T_INLINE_ELSE, ($stackPtr + 1), $statementEnd, false);
-            $contentBefore = $phpcsFile->findPrevious(T_WHITESPACE, ($inlineElse - 1), null, true);
-            $spaceBefore   = ($tokens[$inlineElse]['column'] - ($tokens[$contentBefore]['column'] + $tokens[$contentBefore]['length']));
-            if ($spaceBefore !== 1) {
-                $error = 'Inline shorthand IF statement requires 1 space before ELSE; %s found';
-                $data  = [$spaceBefore];
-                $fix   = $phpcsFile->addFixableError($error, $inlineElse, 'SpacingBeforeElse', $data);
-                if ($fix === true) {
-                    if ($spaceBefore === 0) {
-                        $phpcsFile->fixer->addContentBefore($inlineElse, ' ');
-                    } else {
-                        $phpcsFile->fixer->replaceToken(($inlineElse - 1), ' ');
-                    }
-                }
-            }
-        }//end if
-
-        $contentAfter = $phpcsFile->findNext(T_WHITESPACE, ($inlineElse + 1), null, true);
-        $spaceAfter   = (($tokens[$contentAfter]['column']) - ($tokens[$inlineElse]['column'] + 1));
-        if ($spaceAfter !== 1) {
-            $error = 'Inline shorthand IF statement requires 1 space after ELSE; %s found';
-            $data  = [$spaceAfter];
-            $fix   = $phpcsFile->addFixableError($error, $inlineElse, 'SpacingAfterElse', $data);
-            if ($fix === true) {
-                if ($spaceAfter === 0) {
-                    $phpcsFile->fixer->addContent($inlineElse, ' ');
-                } else {
-                    $phpcsFile->fixer->replaceToken(($inlineElse + 1), ' ');
-                }
-            }
-        }
-
-    }//end process()
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return [T_INLINE_THEN];
+
+	}//end register()
+
+
+	/**
+	 * Processes this sniff, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the current token in the
+	 *                                               stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		$openBracket  = null;
+		$closeBracket = null;
+		if (isset($tokens[$stackPtr]['nested_parenthesis']) === true) {
+			$parens       = $tokens[$stackPtr]['nested_parenthesis'];
+			$openBracket  = array_pop($parens);
+			$closeBracket = $tokens[$openBracket]['parenthesis_closer'];
+		}
+
+		// Find the beginning of the statement. If we don't find a
+		// semicolon (end of statement) or comma (end of array value)
+		// then assume the content before the closing parenthesis is the end.
+		$else         = $phpcsFile->findNext(T_INLINE_ELSE, ($stackPtr + 1));
+		$statementEnd = $phpcsFile->findNext([T_SEMICOLON, T_COMMA], ($else + 1), $closeBracket);
+		if ($statementEnd === false) {
+			$statementEnd = $phpcsFile->findPrevious(T_WHITESPACE, ($closeBracket - 1), null, true);
+		}
+
+		// Make sure it's all on the same line.
+		if ($tokens[$statementEnd]['line'] !== $tokens[$stackPtr]['line']) {
+			$error = 'Inline shorthand IF statement must be declared on a single line';
+			$phpcsFile->addError($error, $stackPtr, 'NotSingleLine');
+			return;
+		}
+
+		// Make sure there are spaces around the question mark.
+		$contentBefore = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
+		$contentAfter  = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+		if ($tokens[$contentBefore]['code'] !== T_CLOSE_PARENTHESIS) {
+			$error = 'Inline shorthand IF statement requires brackets around comparison';
+			$phpcsFile->addError($error, $stackPtr, 'NoBrackets');
+		}
+
+		$spaceBefore = ($tokens[$stackPtr]['column'] - ($tokens[$contentBefore]['column'] + $tokens[$contentBefore]['length']));
+		if ($spaceBefore !== 1) {
+			$error = 'Inline shorthand IF statement requires 1 space before THEN; %s found';
+			$data  = [$spaceBefore];
+			$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingBeforeThen', $data);
+			if ($fix === true) {
+				if ($spaceBefore === 0) {
+					$phpcsFile->fixer->addContentBefore($stackPtr, ' ');
+				} else {
+					$phpcsFile->fixer->replaceToken(($stackPtr - 1), ' ');
+				}
+			}
+		}
+
+		// If there is no content between the ? and the : operators, then they are
+		// trying to replicate an elvis operator, even though PHP doesn't have one.
+		// In this case, we want no spaces between the two operators so ?: looks like
+		// an operator itself.
+		$next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+		if ($tokens[$next]['code'] === T_INLINE_ELSE) {
+			$inlineElse = $next;
+			if ($inlineElse !== ($stackPtr + 1)) {
+				$error = 'Inline shorthand IF statement without THEN statement requires 0 spaces between THEN and ELSE';
+				$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'ElvisSpacing');
+				if ($fix === true) {
+					$phpcsFile->fixer->replaceToken(($stackPtr + 1), '');
+				}
+			}
+		} else {
+			$spaceAfter = (($tokens[$contentAfter]['column']) - ($tokens[$stackPtr]['column'] + 1));
+			if ($spaceAfter !== 1) {
+				$error = 'Inline shorthand IF statement requires 1 space after THEN; %s found';
+				$data  = [$spaceAfter];
+				$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingAfterThen', $data);
+				if ($fix === true) {
+					if ($spaceAfter === 0) {
+						$phpcsFile->fixer->addContent($stackPtr, ' ');
+					} else {
+						$phpcsFile->fixer->replaceToken(($stackPtr + 1), ' ');
+					}
+				}
+			}
+
+			// Make sure the ELSE has the correct spacing.
+			$inlineElse    = $phpcsFile->findNext(T_INLINE_ELSE, ($stackPtr + 1), $statementEnd, false);
+			$contentBefore = $phpcsFile->findPrevious(T_WHITESPACE, ($inlineElse - 1), null, true);
+			$spaceBefore   = ($tokens[$inlineElse]['column'] - ($tokens[$contentBefore]['column'] + $tokens[$contentBefore]['length']));
+			if ($spaceBefore !== 1) {
+				$error = 'Inline shorthand IF statement requires 1 space before ELSE; %s found';
+				$data  = [$spaceBefore];
+				$fix   = $phpcsFile->addFixableError($error, $inlineElse, 'SpacingBeforeElse', $data);
+				if ($fix === true) {
+					if ($spaceBefore === 0) {
+						$phpcsFile->fixer->addContentBefore($inlineElse, ' ');
+					} else {
+						$phpcsFile->fixer->replaceToken(($inlineElse - 1), ' ');
+					}
+				}
+			}
+		}//end if
+
+		$contentAfter = $phpcsFile->findNext(T_WHITESPACE, ($inlineElse + 1), null, true);
+		$spaceAfter   = (($tokens[$contentAfter]['column']) - ($tokens[$inlineElse]['column'] + 1));
+		if ($spaceAfter !== 1) {
+			$error = 'Inline shorthand IF statement requires 1 space after ELSE; %s found';
+			$data  = [$spaceAfter];
+			$fix   = $phpcsFile->addFixableError($error, $inlineElse, 'SpacingAfterElse', $data);
+			if ($fix === true) {
+				if ($spaceAfter === 0) {
+					$phpcsFile->fixer->addContent($inlineElse, ' ');
+				} else {
+					$phpcsFile->fixer->replaceToken(($inlineElse + 1), ' ');
+				}
+			}
+		}
+
+	}//end process()
 
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php

Indentation +14 added lines, -14 removed lines

@@ -15,20 +15,20 @@
 {
 
 
-    /**
-     * Returns an array of patterns to check are correct.
-     *
-     * @return array
-     */
-    protected function getPatterns()
-    {
-        return [
-            'function abc(...);',
-            'function abc(...)',
-            'abstract function abc(...);',
-        ];
-
-    }//end getPatterns()
+	/**
+	 * Returns an array of patterns to check are correct.
+	 *
+	 * @return array
+	 */
+	protected function getPatterns()
+	{
+		return [
+			'function abc(...);',
+			'function abc(...)',
+			'abstract function abc(...);',
+		];
+
+	}//end getPatterns()
 
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php

Spacing +1 added lines, -1 removed lines

@@ -140,7 +140,7 @@
      *
      * @return void
      */
-    public function processBracket($phpcsFile, $openBracket, $tokens, $type='function')
+    public function processBracket($phpcsFile, $openBracket, $tokens, $type = 'function')
     {
         $errorPrefix = '';
         if ($type === 'use') {

Indentation +238 added lines, -238 removed lines

@@ -15,244 +15,244 @@
 class MultiLineFunctionDeclarationSniff extends PEARFunctionDeclarationSniff
 {
 
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = [
-        'PHP',
-        'JS',
-    ];
-
-
-    /**
-     * Determine if this is a multi-line function declaration.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being scanned.
-     * @param int                         $stackPtr    The position of the current token
-     *                                                 in the stack passed in $tokens.
-     * @param int                         $openBracket The position of the opening bracket
-     *                                                 in the stack passed in $tokens.
-     * @param array                       $tokens      The stack of tokens that make up
-     *                                                 the file.
-     *
-     * @return void
-     */
-    public function isMultiLineDeclaration($phpcsFile, $stackPtr, $openBracket, $tokens)
-    {
-        $bracketsToCheck = [$stackPtr => $openBracket];
-
-        // Closures may use the USE keyword and so be multi-line in this way.
-        if ($tokens[$stackPtr]['code'] === T_CLOSURE) {
-            $use = $phpcsFile->findNext(T_USE, ($tokens[$openBracket]['parenthesis_closer'] + 1), $tokens[$stackPtr]['scope_opener']);
-            if ($use !== false) {
-                $open = $phpcsFile->findNext(T_OPEN_PARENTHESIS, ($use + 1));
-                if ($open !== false) {
-                    $bracketsToCheck[$use] = $open;
-                }
-            }
-        }
-
-        foreach ($bracketsToCheck as $stackPtr => $openBracket) {
-            // If the first argument is on a new line, this is a multi-line
-            // function declaration, even if there is only one argument.
-            $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($openBracket + 1), null, true);
-            if ($tokens[$next]['line'] !== $tokens[$stackPtr]['line']) {
-                return true;
-            }
-
-            $closeBracket = $tokens[$openBracket]['parenthesis_closer'];
-
-            $end = $phpcsFile->findEndOfStatement($openBracket + 1);
-            while ($tokens[$end]['code'] === T_COMMA) {
-                // If the next bit of code is not on the same line, this is a
-                // multi-line function declaration.
-                $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($end + 1), $closeBracket, true);
-                if ($next === false) {
-                    continue(2);
-                }
-
-                if ($tokens[$next]['line'] !== $tokens[$end]['line']) {
-                    return true;
-                }
-
-                $end = $phpcsFile->findEndOfStatement($next);
-            }
-
-            // We've reached the last argument, so see if the next content
-            // (should be the close bracket) is also on the same line.
-            $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($end + 1), $closeBracket, true);
-            if ($next !== false && $tokens[$next]['line'] !== $tokens[$end]['line']) {
-                return true;
-            }
-        }//end foreach
-
-        return false;
-
-    }//end isMultiLineDeclaration()
-
-
-    /**
-     * Processes single-line declarations.
-     *
-     * Just uses the Generic BSD-Allman brace sniff.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token
-     *                                               in the stack passed in $tokens.
-     * @param array                       $tokens    The stack of tokens that make up
-     *                                               the file.
-     *
-     * @return void
-     */
-    public function processSingleLineDeclaration($phpcsFile, $stackPtr, $tokens)
-    {
-        // We do everything the parent sniff does, and a bit more because we
-        // define multi-line declarations a bit differently.
-        parent::processSingleLineDeclaration($phpcsFile, $stackPtr, $tokens);
-
-        $openingBracket = $tokens[$stackPtr]['parenthesis_opener'];
-        $closingBracket = $tokens[$stackPtr]['parenthesis_closer'];
-
-        $prevNonWhiteSpace = $phpcsFile->findPrevious(T_WHITESPACE, ($closingBracket - 1), $openingBracket, true);
-        if ($tokens[$prevNonWhiteSpace]['line'] !== $tokens[$closingBracket]['line']) {
-            $error = 'There must not be a newline before the closing parenthesis of a single-line function declaration';
-
-            if (isset(Tokens::$emptyTokens[$tokens[$prevNonWhiteSpace]['code']]) === true) {
-                $phpcsFile->addError($error, $closingBracket, 'CloseBracketNewLine');
-            } else {
-                $fix = $phpcsFile->addFixableError($error, $closingBracket, 'CloseBracketNewLine');
-                if ($fix === true) {
-                    $phpcsFile->fixer->beginChangeset();
-                    for ($i = ($closingBracket - 1); $i > $openingBracket; $i--) {
-                        if ($tokens[$i]['code'] !== T_WHITESPACE) {
-                            break;
-                        }
-
-                        $phpcsFile->fixer->replaceToken($i, '');
-                    }
-
-                    $phpcsFile->fixer->endChangeset();
-                }
-            }
-        }//end if
-
-    }//end processSingleLineDeclaration()
-
-
-    /**
-     * Processes multi-line declarations.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token
-     *                                               in the stack passed in $tokens.
-     * @param array                       $tokens    The stack of tokens that make up
-     *                                               the file.
-     *
-     * @return void
-     */
-    public function processMultiLineDeclaration($phpcsFile, $stackPtr, $tokens)
-    {
-        // We do everything the parent sniff does, and a bit more.
-        parent::processMultiLineDeclaration($phpcsFile, $stackPtr, $tokens);
-
-        $openBracket = $tokens[$stackPtr]['parenthesis_opener'];
-        $this->processBracket($phpcsFile, $openBracket, $tokens, 'function');
-
-        if ($tokens[$stackPtr]['code'] !== T_CLOSURE) {
-            return;
-        }
-
-        $use = $phpcsFile->findNext(T_USE, ($tokens[$stackPtr]['parenthesis_closer'] + 1), $tokens[$stackPtr]['scope_opener']);
-        if ($use === false) {
-            return;
-        }
-
-        $openBracket = $phpcsFile->findNext(T_OPEN_PARENTHESIS, ($use + 1), null);
-        $this->processBracket($phpcsFile, $openBracket, $tokens, 'use');
-
-    }//end processMultiLineDeclaration()
-
-
-    /**
-     * Processes the contents of a single set of brackets.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being scanned.
-     * @param int                         $openBracket The position of the open bracket
-     *                                                 in the stack passed in $tokens.
-     * @param array                       $tokens      The stack of tokens that make up
-     *                                                 the file.
-     * @param string                      $type        The type of the token the brackets
-     *                                                 belong to (function or use).
-     *
-     * @return void
-     */
-    public function processBracket($phpcsFile, $openBracket, $tokens, $type='function')
-    {
-        $errorPrefix = '';
-        if ($type === 'use') {
-            $errorPrefix = 'Use';
-        }
-
-        $closeBracket = $tokens[$openBracket]['parenthesis_closer'];
-
-        // The open bracket should be the last thing on the line.
-        if ($tokens[$openBracket]['line'] !== $tokens[$closeBracket]['line']) {
-            $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($openBracket + 1), null, true);
-            if ($tokens[$next]['line'] === $tokens[$openBracket]['line']) {
-                $error = 'The first parameter of a multi-line '.$type.' declaration must be on the line after the opening bracket';
-                $fix   = $phpcsFile->addFixableError($error, $next, $errorPrefix.'FirstParamSpacing');
-                if ($fix === true) {
-                    if ($tokens[$next]['line'] === $tokens[$openBracket]['line']) {
-                        $phpcsFile->fixer->addNewline($openBracket);
-                    } else {
-                        $phpcsFile->fixer->beginChangeset();
-                        for ($x = $openBracket; $x < $next; $x++) {
-                            if ($tokens[$x]['line'] === $tokens[$openBracket]['line']) {
-                                continue;
-                            }
-
-                            if ($tokens[$x]['line'] === $tokens[$next]['line']) {
-                                break;
-                            }
-                        }
-
-                        $phpcsFile->fixer->endChangeset();
-                    }
-                }
-            }//end if
-        }//end if
-
-        // Each line between the brackets should contain a single parameter.
-        $lastComma = null;
-        for ($i = ($openBracket + 1); $i < $closeBracket; $i++) {
-            // Skip brackets, like arrays, as they can contain commas.
-            if (isset($tokens[$i]['bracket_opener']) === true) {
-                $i = $tokens[$i]['bracket_closer'];
-                continue;
-            }
-
-            if (isset($tokens[$i]['parenthesis_opener']) === true) {
-                $i = $tokens[$i]['parenthesis_closer'];
-                continue;
-            }
-
-            if ($tokens[$i]['code'] !== T_COMMA) {
-                continue;
-            }
-
-            $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
-            if ($tokens[$next]['line'] === $tokens[$i]['line']) {
-                $error = 'Multi-line '.$type.' declarations must define one parameter per line';
-                $fix   = $phpcsFile->addFixableError($error, $next, $errorPrefix.'OneParamPerLine');
-                if ($fix === true) {
-                    $phpcsFile->fixer->addNewline($i);
-                }
-            }
-        }//end for
-
-    }//end processBracket()
+	/**
+	 * A list of tokenizers this sniff supports.
+	 *
+	 * @var array
+	 */
+	public $supportedTokenizers = [
+		'PHP',
+		'JS',
+	];
+
+
+	/**
+	 * Determine if this is a multi-line function declaration.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being scanned.
+	 * @param int                         $stackPtr    The position of the current token
+	 *                                                 in the stack passed in $tokens.
+	 * @param int                         $openBracket The position of the opening bracket
+	 *                                                 in the stack passed in $tokens.
+	 * @param array                       $tokens      The stack of tokens that make up
+	 *                                                 the file.
+	 *
+	 * @return void
+	 */
+	public function isMultiLineDeclaration($phpcsFile, $stackPtr, $openBracket, $tokens)
+	{
+		$bracketsToCheck = [$stackPtr => $openBracket];
+
+		// Closures may use the USE keyword and so be multi-line in this way.
+		if ($tokens[$stackPtr]['code'] === T_CLOSURE) {
+			$use = $phpcsFile->findNext(T_USE, ($tokens[$openBracket]['parenthesis_closer'] + 1), $tokens[$stackPtr]['scope_opener']);
+			if ($use !== false) {
+				$open = $phpcsFile->findNext(T_OPEN_PARENTHESIS, ($use + 1));
+				if ($open !== false) {
+					$bracketsToCheck[$use] = $open;
+				}
+			}
+		}
+
+		foreach ($bracketsToCheck as $stackPtr => $openBracket) {
+			// If the first argument is on a new line, this is a multi-line
+			// function declaration, even if there is only one argument.
+			$next = $phpcsFile->findNext(Tokens::$emptyTokens, ($openBracket + 1), null, true);
+			if ($tokens[$next]['line'] !== $tokens[$stackPtr]['line']) {
+				return true;
+			}
+
+			$closeBracket = $tokens[$openBracket]['parenthesis_closer'];
+
+			$end = $phpcsFile->findEndOfStatement($openBracket + 1);
+			while ($tokens[$end]['code'] === T_COMMA) {
+				// If the next bit of code is not on the same line, this is a
+				// multi-line function declaration.
+				$next = $phpcsFile->findNext(Tokens::$emptyTokens, ($end + 1), $closeBracket, true);
+				if ($next === false) {
+					continue(2);
+				}
+
+				if ($tokens[$next]['line'] !== $tokens[$end]['line']) {
+					return true;
+				}
+
+				$end = $phpcsFile->findEndOfStatement($next);
+			}
+
+			// We've reached the last argument, so see if the next content
+			// (should be the close bracket) is also on the same line.
+			$next = $phpcsFile->findNext(Tokens::$emptyTokens, ($end + 1), $closeBracket, true);
+			if ($next !== false && $tokens[$next]['line'] !== $tokens[$end]['line']) {
+				return true;
+			}
+		}//end foreach
+
+		return false;
+
+	}//end isMultiLineDeclaration()
+
+
+	/**
+	 * Processes single-line declarations.
+	 *
+	 * Just uses the Generic BSD-Allman brace sniff.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the current token
+	 *                                               in the stack passed in $tokens.
+	 * @param array                       $tokens    The stack of tokens that make up
+	 *                                               the file.
+	 *
+	 * @return void
+	 */
+	public function processSingleLineDeclaration($phpcsFile, $stackPtr, $tokens)
+	{
+		// We do everything the parent sniff does, and a bit more because we
+		// define multi-line declarations a bit differently.
+		parent::processSingleLineDeclaration($phpcsFile, $stackPtr, $tokens);
+
+		$openingBracket = $tokens[$stackPtr]['parenthesis_opener'];
+		$closingBracket = $tokens[$stackPtr]['parenthesis_closer'];
+
+		$prevNonWhiteSpace = $phpcsFile->findPrevious(T_WHITESPACE, ($closingBracket - 1), $openingBracket, true);
+		if ($tokens[$prevNonWhiteSpace]['line'] !== $tokens[$closingBracket]['line']) {
+			$error = 'There must not be a newline before the closing parenthesis of a single-line function declaration';
+
+			if (isset(Tokens::$emptyTokens[$tokens[$prevNonWhiteSpace]['code']]) === true) {
+				$phpcsFile->addError($error, $closingBracket, 'CloseBracketNewLine');
+			} else {
+				$fix = $phpcsFile->addFixableError($error, $closingBracket, 'CloseBracketNewLine');
+				if ($fix === true) {
+					$phpcsFile->fixer->beginChangeset();
+					for ($i = ($closingBracket - 1); $i > $openingBracket; $i--) {
+						if ($tokens[$i]['code'] !== T_WHITESPACE) {
+							break;
+						}
+
+						$phpcsFile->fixer->replaceToken($i, '');
+					}
+
+					$phpcsFile->fixer->endChangeset();
+				}
+			}
+		}//end if
+
+	}//end processSingleLineDeclaration()
+
+
+	/**
+	 * Processes multi-line declarations.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the current token
+	 *                                               in the stack passed in $tokens.
+	 * @param array                       $tokens    The stack of tokens that make up
+	 *                                               the file.
+	 *
+	 * @return void
+	 */
+	public function processMultiLineDeclaration($phpcsFile, $stackPtr, $tokens)
+	{
+		// We do everything the parent sniff does, and a bit more.
+		parent::processMultiLineDeclaration($phpcsFile, $stackPtr, $tokens);
+
+		$openBracket = $tokens[$stackPtr]['parenthesis_opener'];
+		$this->processBracket($phpcsFile, $openBracket, $tokens, 'function');
+
+		if ($tokens[$stackPtr]['code'] !== T_CLOSURE) {
+			return;
+		}
+
+		$use = $phpcsFile->findNext(T_USE, ($tokens[$stackPtr]['parenthesis_closer'] + 1), $tokens[$stackPtr]['scope_opener']);
+		if ($use === false) {
+			return;
+		}
+
+		$openBracket = $phpcsFile->findNext(T_OPEN_PARENTHESIS, ($use + 1), null);
+		$this->processBracket($phpcsFile, $openBracket, $tokens, 'use');
+
+	}//end processMultiLineDeclaration()
+
+
+	/**
+	 * Processes the contents of a single set of brackets.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being scanned.
+	 * @param int                         $openBracket The position of the open bracket
+	 *                                                 in the stack passed in $tokens.
+	 * @param array                       $tokens      The stack of tokens that make up
+	 *                                                 the file.
+	 * @param string                      $type        The type of the token the brackets
+	 *                                                 belong to (function or use).
+	 *
+	 * @return void
+	 */
+	public function processBracket($phpcsFile, $openBracket, $tokens, $type='function')
+	{
+		$errorPrefix = '';
+		if ($type === 'use') {
+			$errorPrefix = 'Use';
+		}
+
+		$closeBracket = $tokens[$openBracket]['parenthesis_closer'];
+
+		// The open bracket should be the last thing on the line.
+		if ($tokens[$openBracket]['line'] !== $tokens[$closeBracket]['line']) {
+			$next = $phpcsFile->findNext(Tokens::$emptyTokens, ($openBracket + 1), null, true);
+			if ($tokens[$next]['line'] === $tokens[$openBracket]['line']) {
+				$error = 'The first parameter of a multi-line '.$type.' declaration must be on the line after the opening bracket';
+				$fix   = $phpcsFile->addFixableError($error, $next, $errorPrefix.'FirstParamSpacing');
+				if ($fix === true) {
+					if ($tokens[$next]['line'] === $tokens[$openBracket]['line']) {
+						$phpcsFile->fixer->addNewline($openBracket);
+					} else {
+						$phpcsFile->fixer->beginChangeset();
+						for ($x = $openBracket; $x < $next; $x++) {
+							if ($tokens[$x]['line'] === $tokens[$openBracket]['line']) {
+								continue;
+							}
+
+							if ($tokens[$x]['line'] === $tokens[$next]['line']) {
+								break;
+							}
+						}
+
+						$phpcsFile->fixer->endChangeset();
+					}
+				}
+			}//end if
+		}//end if
+
+		// Each line between the brackets should contain a single parameter.
+		$lastComma = null;
+		for ($i = ($openBracket + 1); $i < $closeBracket; $i++) {
+			// Skip brackets, like arrays, as they can contain commas.
+			if (isset($tokens[$i]['bracket_opener']) === true) {
+				$i = $tokens[$i]['bracket_closer'];
+				continue;
+			}
+
+			if (isset($tokens[$i]['parenthesis_opener']) === true) {
+				$i = $tokens[$i]['parenthesis_closer'];
+				continue;
+			}
+
+			if ($tokens[$i]['code'] !== T_COMMA) {
+				continue;
+			}
+
+			$next = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
+			if ($tokens[$next]['line'] === $tokens[$i]['line']) {
+				$error = 'Multi-line '.$type.' declarations must define one parameter per line';
+				$fix   = $phpcsFile->addFixableError($error, $next, $errorPrefix.'OneParamPerLine');
+				if ($fix === true) {
+					$phpcsFile->fixer->addNewline($i);
+				}
+			}
+		}//end for
+
+	}//end processBracket()
 
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php

Indentation +40 added lines, -40 removed lines

@@ -16,46 +16,46 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [T_FUNCTION];
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token in the
-     *                                               stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if (empty($tokens[$stackPtr]['conditions']) === true) {
-            $functionName = $phpcsFile->getDeclarationName($stackPtr);
-            if ($functionName === null) {
-                return;
-            }
-
-            // Special exception for __autoload as it needs to be global.
-            if ($functionName !== '__autoload') {
-                $error = 'Consider putting global function "%s" in a static class';
-                $data  = [$functionName];
-                $phpcsFile->addWarning($error, $stackPtr, 'Found', $data);
-            }
-        }
-
-    }//end process()
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return [T_FUNCTION];
+
+	}//end register()
+
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the current token in the
+	 *                                               stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		if (empty($tokens[$stackPtr]['conditions']) === true) {
+			$functionName = $phpcsFile->getDeclarationName($stackPtr);
+			if ($functionName === null) {
+				return;
+			}
+
+			// Special exception for __autoload as it needs to be global.
+			if ($functionName !== '__autoload') {
+				$error = 'Consider putting global function "%s" in a static class';
+				$data  = [$functionName];
+				$phpcsFile->addWarning($error, $stackPtr, 'Found', $data);
+			}
+		}
+
+	}//end process()
 
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Objects/DisallowObjectStringIndexSniff.php

Indentation +65 added lines, -65 removed lines

@@ -15,71 +15,71 @@
 class DisallowObjectStringIndexSniff implements Sniff
 {
 
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = ['JS'];
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [T_OPEN_SQUARE_BRACKET];
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token
-     *                                               in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Check if the next non whitespace token is a string.
-        $index = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        if ($tokens[$index]['code'] !== T_CONSTANT_ENCAPSED_STRING) {
-            return;
-        }
-
-        // Make sure it is the only thing in the square brackets.
-        $next = $phpcsFile->findNext(T_WHITESPACE, ($index + 1), null, true);
-        if ($tokens[$next]['code'] !== T_CLOSE_SQUARE_BRACKET) {
-            return;
-        }
-
-        // Allow indexes that have dots in them because we can't write
-        // them in dot notation.
-        $content = trim($tokens[$index]['content'], '"\' ');
-        if (strpos($content, '.') !== false) {
-            return;
-        }
-
-        // Also ignore reserved words.
-        if ($content === 'super') {
-            return;
-        }
-
-        // Token before the opening square bracket cannot be a var name.
-        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if ($tokens[$prev]['code'] === T_STRING) {
-            $error = 'Object indexes must be written in dot notation';
-            $phpcsFile->addError($error, $prev, 'Found');
-        }
-
-    }//end process()
+	/**
+	 * A list of tokenizers this sniff supports.
+	 *
+	 * @var array
+	 */
+	public $supportedTokenizers = ['JS'];
+
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return [T_OPEN_SQUARE_BRACKET];
+
+	}//end register()
+
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the current token
+	 *                                               in the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		// Check if the next non whitespace token is a string.
+		$index = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+		if ($tokens[$index]['code'] !== T_CONSTANT_ENCAPSED_STRING) {
+			return;
+		}
+
+		// Make sure it is the only thing in the square brackets.
+		$next = $phpcsFile->findNext(T_WHITESPACE, ($index + 1), null, true);
+		if ($tokens[$next]['code'] !== T_CLOSE_SQUARE_BRACKET) {
+			return;
+		}
+
+		// Allow indexes that have dots in them because we can't write
+		// them in dot notation.
+		$content = trim($tokens[$index]['content'], '"\' ');
+		if (strpos($content, '.') !== false) {
+			return;
+		}
+
+		// Also ignore reserved words.
+		if ($content === 'super') {
+			return;
+		}
+
+		// Token before the opening square bracket cannot be a var name.
+		$prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
+		if ($tokens[$prev]['code'] === T_STRING) {
+			$error = 'Object indexes must be written in dot notation';
+			$phpcsFile->addError($error, $prev, 'Found');
+		}
+
+	}//end process()
 
 
 }//end class

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/CSS/ForbiddenStylesSniff.php

Spacing +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
      *
      * @return void
      */
-    protected function addError($phpcsFile, $stackPtr, $style, $pattern=null)
+    protected function addError($phpcsFile, $stackPtr, $style, $pattern = null)
     {
         $data  = [$style];
         $error = 'The use of style %s is ';

Indentation +157 added lines, -157 removed lines

@@ -15,163 +15,163 @@
 class ForbiddenStylesSniff implements Sniff
 {
 
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = ['CSS'];
-
-    /**
-     * A list of forbidden styles with their alternatives.
-     *
-     * The value is NULL if no alternative exists. i.e., the
-     * style should just not be used.
-     *
-     * @var array<string, string|null>
-     */
-    protected $forbiddenStyles = [
-        '-moz-border-radius'             => 'border-radius',
-        '-webkit-border-radius'          => 'border-radius',
-        '-moz-border-radius-topleft'     => 'border-top-left-radius',
-        '-moz-border-radius-topright'    => 'border-top-right-radius',
-        '-moz-border-radius-bottomright' => 'border-bottom-right-radius',
-        '-moz-border-radius-bottomleft'  => 'border-bottom-left-radius',
-        '-moz-box-shadow'                => 'box-shadow',
-        '-webkit-box-shadow'             => 'box-shadow',
-    ];
-
-    /**
-     * A cache of forbidden style names, for faster lookups.
-     *
-     * @var string[]
-     */
-    protected $forbiddenStyleNames = [];
-
-    /**
-     * If true, forbidden styles will be considered regular expressions.
-     *
-     * @var boolean
-     */
-    protected $patternMatch = false;
-
-    /**
-     * If true, an error will be thrown; otherwise a warning.
-     *
-     * @var boolean
-     */
-    public $error = true;
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        $this->forbiddenStyleNames = array_keys($this->forbiddenStyles);
-
-        if ($this->patternMatch === true) {
-            foreach ($this->forbiddenStyleNames as $i => $name) {
-                $this->forbiddenStyleNames[$i] = '/'.$name.'/i';
-            }
-        }
-
-        return [T_STYLE];
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token in
-     *                                               the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens  = $phpcsFile->getTokens();
-        $style   = strtolower($tokens[$stackPtr]['content']);
-        $pattern = null;
-
-        if ($this->patternMatch === true) {
-            $count   = 0;
-            $pattern = preg_replace(
-                $this->forbiddenStyleNames,
-                $this->forbiddenStyleNames,
-                $style,
-                1,
-                $count
-            );
-
-            if ($count === 0) {
-                return;
-            }
-
-            // Remove the pattern delimiters and modifier.
-            $pattern = substr($pattern, 1, -2);
-        } else {
-            if (in_array($style, $this->forbiddenStyleNames, true) === false) {
-                return;
-            }
-        }//end if
-
-        $this->addError($phpcsFile, $stackPtr, $style, $pattern);
-
-    }//end process()
-
-
-    /**
-     * Generates the error or warning for this sniff.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the forbidden style
-     *                                               in the token array.
-     * @param string                      $style     The name of the forbidden style.
-     * @param string                      $pattern   The pattern used for the match.
-     *
-     * @return void
-     */
-    protected function addError($phpcsFile, $stackPtr, $style, $pattern=null)
-    {
-        $data  = [$style];
-        $error = 'The use of style %s is ';
-        if ($this->error === true) {
-            $type   = 'Found';
-            $error .= 'forbidden';
-        } else {
-            $type   = 'Discouraged';
-            $error .= 'discouraged';
-        }
-
-        if ($pattern === null) {
-            $pattern = $style;
-        }
-
-        if ($this->forbiddenStyles[$pattern] !== null) {
-            $data[] = $this->forbiddenStyles[$pattern];
-            if ($this->error === true) {
-                $fix = $phpcsFile->addFixableError($error.'; use %s instead', $stackPtr, $type.'WithAlternative', $data);
-            } else {
-                $fix = $phpcsFile->addFixableWarning($error.'; use %s instead', $stackPtr, $type.'WithAlternative', $data);
-            }
-
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken($stackPtr, $this->forbiddenStyles[$pattern]);
-            }
-        } else {
-            if ($this->error === true) {
-                $phpcsFile->addError($error, $stackPtr, $type, $data);
-            } else {
-                $phpcsFile->addWarning($error, $stackPtr, $type, $data);
-            }
-        }
-
-    }//end addError()
+	/**
+	 * A list of tokenizers this sniff supports.
+	 *
+	 * @var array
+	 */
+	public $supportedTokenizers = ['CSS'];
+
+	/**
+	 * A list of forbidden styles with their alternatives.
+	 *
+	 * The value is NULL if no alternative exists. i.e., the
+	 * style should just not be used.
+	 *
+	 * @var array<string, string|null>
+	 */
+	protected $forbiddenStyles = [
+		'-moz-border-radius'             => 'border-radius',
+		'-webkit-border-radius'          => 'border-radius',
+		'-moz-border-radius-topleft'     => 'border-top-left-radius',
+		'-moz-border-radius-topright'    => 'border-top-right-radius',
+		'-moz-border-radius-bottomright' => 'border-bottom-right-radius',
+		'-moz-border-radius-bottomleft'  => 'border-bottom-left-radius',
+		'-moz-box-shadow'                => 'box-shadow',
+		'-webkit-box-shadow'             => 'box-shadow',
+	];
+
+	/**
+	 * A cache of forbidden style names, for faster lookups.
+	 *
+	 * @var string[]
+	 */
+	protected $forbiddenStyleNames = [];
+
+	/**
+	 * If true, forbidden styles will be considered regular expressions.
+	 *
+	 * @var boolean
+	 */
+	protected $patternMatch = false;
+
+	/**
+	 * If true, an error will be thrown; otherwise a warning.
+	 *
+	 * @var boolean
+	 */
+	public $error = true;
+
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		$this->forbiddenStyleNames = array_keys($this->forbiddenStyles);
+
+		if ($this->patternMatch === true) {
+			foreach ($this->forbiddenStyleNames as $i => $name) {
+				$this->forbiddenStyleNames[$i] = '/'.$name.'/i';
+			}
+		}
+
+		return [T_STYLE];
+
+	}//end register()
+
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the current token in
+	 *                                               the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$tokens  = $phpcsFile->getTokens();
+		$style   = strtolower($tokens[$stackPtr]['content']);
+		$pattern = null;
+
+		if ($this->patternMatch === true) {
+			$count   = 0;
+			$pattern = preg_replace(
+				$this->forbiddenStyleNames,
+				$this->forbiddenStyleNames,
+				$style,
+				1,
+				$count
+			);
+
+			if ($count === 0) {
+				return;
+			}
+
+			// Remove the pattern delimiters and modifier.
+			$pattern = substr($pattern, 1, -2);
+		} else {
+			if (in_array($style, $this->forbiddenStyleNames, true) === false) {
+				return;
+			}
+		}//end if
+
+		$this->addError($phpcsFile, $stackPtr, $style, $pattern);
+
+	}//end process()
+
+
+	/**
+	 * Generates the error or warning for this sniff.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the forbidden style
+	 *                                               in the token array.
+	 * @param string                      $style     The name of the forbidden style.
+	 * @param string                      $pattern   The pattern used for the match.
+	 *
+	 * @return void
+	 */
+	protected function addError($phpcsFile, $stackPtr, $style, $pattern=null)
+	{
+		$data  = [$style];
+		$error = 'The use of style %s is ';
+		if ($this->error === true) {
+			$type   = 'Found';
+			$error .= 'forbidden';
+		} else {
+			$type   = 'Discouraged';
+			$error .= 'discouraged';
+		}
+
+		if ($pattern === null) {
+			$pattern = $style;
+		}
+
+		if ($this->forbiddenStyles[$pattern] !== null) {
+			$data[] = $this->forbiddenStyles[$pattern];
+			if ($this->error === true) {
+				$fix = $phpcsFile->addFixableError($error.'; use %s instead', $stackPtr, $type.'WithAlternative', $data);
+			} else {
+				$fix = $phpcsFile->addFixableWarning($error.'; use %s instead', $stackPtr, $type.'WithAlternative', $data);
+			}
+
+			if ($fix === true) {
+				$phpcsFile->fixer->replaceToken($stackPtr, $this->forbiddenStyles[$pattern]);
+			}
+		} else {
+			if ($this->error === true) {
+				$phpcsFile->addError($error, $stackPtr, $type, $data);
+			} else {
+				$phpcsFile->addWarning($error, $stackPtr, $type, $data);
+			}
+		}
+
+	}//end addError()
 
 
 }//end class