Symplify / PHP7_CodeSniffer

CodeSniffer.php

Switch Indentation +21 added lines, -21 removed lines

@@ -1802,18 +1802,18 @@ 
             $input = trim($input);
 
             switch ($input) {
-            case 's':
-                break(2);
-            case 'q':
-                exit(0);
-                break;
-            default:
-                // Repopulate the sniffs because some of them save their state
-                // and only clear it when the file changes, but we are rechecking
-                // the same file.
-                $this->populateTokenListeners();
-                $phpcsFile = $this->_processFile($file, $contents);
-                break;
+                case 's':
+                    break(2);
+                case 'q':
+                    exit(0);
+                    break;
+                default:
+                    // Repopulate the sniffs because some of them save their state
+                    // and only clear it when the file changes, but we are rechecking
+                    // the same file.
+                    $this->populateTokenListeners();
+                    $phpcsFile = $this->_processFile($file, $contents);
+                    break;
             }
         }//end while
 
@@ -2075,15 +2075,15 @@ 
         } else {
             $lowerVarType = strtolower($varType);
             switch ($lowerVarType) {
-            case 'bool':
-                return 'boolean';
-            case 'double':
-            case 'real':
-                return 'float';
-            case 'int':
-                return 'integer';
-            case 'array()':
-                return 'array';
+                case 'bool':
+                    return 'boolean';
+                case 'double':
+                case 'real':
+                    return 'float';
+                case 'int':
+                    return 'integer';
+                case 'array()':
+                    return 'array';
             }//end switch
 
             if (strpos($lowerVarType, 'array(') !== false) {

CodeSniffer/Tokenizers/CSS.php

Switch Indentation +131 added lines, -131 removed lines

@@ -283,12 +283,32 @@ 
             }
 
             switch ($token['code']) {
-            case T_OPEN_CURLY_BRACKET:
-                // Opening curly brackets for an At-rule do not start a style
-                // definition. We also reset the asperand flag here because the next
-                // opening curly bracket could be indeed the start of a style
-                // definition.
-                if ($asperandStart === true) {
+                case T_OPEN_CURLY_BRACKET:
+                    // Opening curly brackets for an At-rule do not start a style
+                    // definition. We also reset the asperand flag here because the next
+                    // opening curly bracket could be indeed the start of a style
+                    // definition.
+                    if ($asperandStart === true) {
+                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                            if ($inStyleDef === true) {
+                                echo "\t\t* style definition closed *".PHP_EOL;
+                            }
+
+                            if ($asperandStart === true) {
+                                echo "\t\t* at-rule definition closed *".PHP_EOL;
+                            }
+                        }
+
+                        $inStyleDef    = false;
+                        $asperandStart = false;
+                    } else {
+                        $inStyleDef = true;
+                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                            echo "\t\t* style definition opened *".PHP_EOL;
+                        }
+                    }
+                    break;
+                case T_CLOSE_CURLY_BRACKET:
                     if (PHP_CODESNIFFER_VERBOSITY > 1) {
                         if ($inStyleDef === true) {
                             echo "\t\t* style definition closed *".PHP_EOL;
@@ -301,162 +321,142 @@ 
 
                     $inStyleDef    = false;
                     $asperandStart = false;
-                } else {
-                    $inStyleDef = true;
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo "\t\t* style definition opened *".PHP_EOL;
-                    }
-                }
-                break;
-            case T_CLOSE_CURLY_BRACKET:
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    if ($inStyleDef === true) {
-                        echo "\t\t* style definition closed *".PHP_EOL;
-                    }
-
-                    if ($asperandStart === true) {
-                        echo "\t\t* at-rule definition closed *".PHP_EOL;
-                    }
-                }
-
-                $inStyleDef    = false;
-                $asperandStart = false;
-                break;
-            case T_MINUS:
-                // Minus signs are often used instead of spaces inside
-                // class names, IDs and styles.
-                if ($finalTokens[($stackPtr + 1)]['code'] === T_STRING) {
-                    if ($finalTokens[($stackPtr - 1)]['code'] === T_STRING) {
-                        $newContent = $finalTokens[($stackPtr - 1)]['content'].'-'.$finalTokens[($stackPtr + 1)]['content'];
-
+                    break;
+                case T_MINUS:
+                    // Minus signs are often used instead of spaces inside
+                    // class names, IDs and styles.
+                    if ($finalTokens[($stackPtr + 1)]['code'] === T_STRING) {
+                        if ($finalTokens[($stackPtr - 1)]['code'] === T_STRING) {
+                            $newContent = $finalTokens[($stackPtr - 1)]['content'].'-'.$finalTokens[($stackPtr + 1)]['content'];
+
+                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                                echo "\t\t* token is a string joiner; ignoring this and previous token".PHP_EOL;
+                                $old = PHP_CodeSniffer::prepareForOutput($finalTokens[($stackPtr + 1)]['content']);
+                                $new = PHP_CodeSniffer::prepareForOutput($newContent);
+                                echo "\t\t=> token ".($stackPtr + 1)." content changed from \"$old\" to \"$new\"".PHP_EOL;
+                            }
+
+                            $finalTokens[($stackPtr + 1)]['content'] = $newContent;
+                            unset($finalTokens[$stackPtr]);
+                            unset($finalTokens[($stackPtr - 1)]);
+                        } else {
+                            $newContent = '-'.$finalTokens[($stackPtr + 1)]['content'];
+
+                            $finalTokens[($stackPtr + 1)]['content'] = $newContent;
+                            unset($finalTokens[$stackPtr]);
+                        }
+                    } else if ($finalTokens[($stackPtr + 1)]['code'] === T_LNUMBER) {
+                        // They can also be used to provide negative numbers.
                         if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            echo "\t\t* token is a string joiner; ignoring this and previous token".PHP_EOL;
-                            $old = PHP_CodeSniffer::prepareForOutput($finalTokens[($stackPtr + 1)]['content']);
-                            $new = PHP_CodeSniffer::prepareForOutput($newContent);
-                            echo "\t\t=> token ".($stackPtr + 1)." content changed from \"$old\" to \"$new\"".PHP_EOL;
+                            echo "\t\t* token is part of a negative number; adding content to next token and ignoring *".PHP_EOL;
+                            $content = PHP_CodeSniffer::prepareForOutput($finalTokens[($stackPtr + 1)]['content']);
+                            echo "\t\t=> token ".($stackPtr + 1)." content changed from \"$content\" to \"-$content\"".PHP_EOL;
                         }
 
-                        $finalTokens[($stackPtr + 1)]['content'] = $newContent;
+                        $finalTokens[($stackPtr + 1)]['content'] = '-'.$finalTokens[($stackPtr + 1)]['content'];
                         unset($finalTokens[$stackPtr]);
-                        unset($finalTokens[($stackPtr - 1)]);
-                    } else {
-                        $newContent = '-'.$finalTokens[($stackPtr + 1)]['content'];
+                    }//end if
 
-                        $finalTokens[($stackPtr + 1)]['content'] = $newContent;
-                        unset($finalTokens[$stackPtr]);
-                    }
-                } else if ($finalTokens[($stackPtr + 1)]['code'] === T_LNUMBER) {
-                    // They can also be used to provide negative numbers.
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo "\t\t* token is part of a negative number; adding content to next token and ignoring *".PHP_EOL;
-                        $content = PHP_CodeSniffer::prepareForOutput($finalTokens[($stackPtr + 1)]['content']);
-                        echo "\t\t=> token ".($stackPtr + 1)." content changed from \"$content\" to \"-$content\"".PHP_EOL;
-                    }
-
-                    $finalTokens[($stackPtr + 1)]['content'] = '-'.$finalTokens[($stackPtr + 1)]['content'];
-                    unset($finalTokens[$stackPtr]);
-                }//end if
-
-                break;
-            case T_COLON:
-                // Only interested in colons that are defining styles.
-                if ($inStyleDef === false) {
                     break;
-                }
-
-                for ($x = ($stackPtr - 1); $x >= 0; $x--) {
-                    if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$finalTokens[$x]['code']]) === false) {
+                case T_COLON:
+                    // Only interested in colons that are defining styles.
+                    if ($inStyleDef === false) {
                         break;
                     }
-                }
 
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    $type = $finalTokens[$x]['type'];
-                    echo "\t\t=> token $x changed from $type to T_STYLE".PHP_EOL;
-                }
-
-                $finalTokens[$x]['type'] = 'T_STYLE';
-                $finalTokens[$x]['code'] = T_STYLE;
-                break;
-            case T_STRING:
-                if (strtolower($token['content']) === 'url') {
-                    // Find the next content.
-                    for ($x = ($stackPtr + 1); $x < $numTokens; $x++) {
+                    for ($x = ($stackPtr - 1); $x >= 0; $x--) {
                         if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$finalTokens[$x]['code']]) === false) {
                             break;
                         }
                     }
 
-                    // Needs to be in the format "url(" for it to be a URL.
-                    if ($finalTokens[$x]['code'] !== T_OPEN_PARENTHESIS) {
-                        continue;
+                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                        $type = $finalTokens[$x]['type'];
+                        echo "\t\t=> token $x changed from $type to T_STYLE".PHP_EOL;
                     }
 
-                    // Make sure the content isn't empty.
-                    for ($y = ($x + 1); $y < $numTokens; $y++) {
-                        if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$finalTokens[$y]['code']]) === false) {
-                            break;
+                    $finalTokens[$x]['type'] = 'T_STYLE';
+                    $finalTokens[$x]['code'] = T_STYLE;
+                    break;
+                case T_STRING:
+                    if (strtolower($token['content']) === 'url') {
+                        // Find the next content.
+                        for ($x = ($stackPtr + 1); $x < $numTokens; $x++) {
+                            if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$finalTokens[$x]['code']]) === false) {
+                                break;
+                            }
                         }
-                    }
 
-                    if ($finalTokens[$y]['code'] === T_CLOSE_PARENTHESIS) {
-                        continue;
-                    }
-
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        for ($i = ($stackPtr + 1); $i <= $y; $i++) {
-                            $type    = $finalTokens[$i]['type'];
-                            $content = PHP_CodeSniffer::prepareForOutput($finalTokens[$i]['content']);
-                            echo "\tProcess token $i: $type => $content".PHP_EOL;
+                        // Needs to be in the format "url(" for it to be a URL.
+                        if ($finalTokens[$x]['code'] !== T_OPEN_PARENTHESIS) {
+                            continue;
                         }
 
-                        echo "\t\t* token starts a URL *".PHP_EOL;
-                    }
+                        // Make sure the content isn't empty.
+                        for ($y = ($x + 1); $y < $numTokens; $y++) {
+                            if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$finalTokens[$y]['code']]) === false) {
+                                break;
+                            }
+                        }
 
-                    // Join all the content together inside the url() statement.
-                    $newContent = '';
-                    for ($i = ($x + 2); $i < $numTokens; $i++) {
-                        if ($finalTokens[$i]['code'] === T_CLOSE_PARENTHESIS) {
-                            break;
+                        if ($finalTokens[$y]['code'] === T_CLOSE_PARENTHESIS) {
+                            continue;
                         }
 
-                        $newContent .= $finalTokens[$i]['content'];
                         if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            $content = PHP_CodeSniffer::prepareForOutput($finalTokens[$i]['content']);
-                            echo "\t\t=> token $i added to URL string and ignored: $content".PHP_EOL;
+                            for ($i = ($stackPtr + 1); $i <= $y; $i++) {
+                                $type    = $finalTokens[$i]['type'];
+                                $content = PHP_CodeSniffer::prepareForOutput($finalTokens[$i]['content']);
+                                echo "\tProcess token $i: $type => $content".PHP_EOL;
+                            }
+
+                            echo "\t\t* token starts a URL *".PHP_EOL;
                         }
 
-                        unset($finalTokens[$i]);
-                    }
+                        // Join all the content together inside the url() statement.
+                        $newContent = '';
+                        for ($i = ($x + 2); $i < $numTokens; $i++) {
+                            if ($finalTokens[$i]['code'] === T_CLOSE_PARENTHESIS) {
+                                break;
+                            }
 
-                    $stackPtr = $i;
+                            $newContent .= $finalTokens[$i]['content'];
+                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                                $content = PHP_CodeSniffer::prepareForOutput($finalTokens[$i]['content']);
+                                echo "\t\t=> token $i added to URL string and ignored: $content".PHP_EOL;
+                            }
 
-                    // If the content inside the "url()" is in double quotes
-                    // there will only be one token and so we don't have to do
-                    // anything except change its type. If it is not empty,
-                    // we need to do some token merging.
-                    $finalTokens[($x + 1)]['type'] = 'T_URL';
-                    $finalTokens[($x + 1)]['code'] = T_URL;
+                            unset($finalTokens[$i]);
+                        }
 
-                    if ($newContent !== '') {
-                        $finalTokens[($x + 1)]['content'] .= $newContent;
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            $content = PHP_CodeSniffer::prepareForOutput($finalTokens[($x + 1)]['content']);
-                            echo "\t\t=> token content changed to: $content".PHP_EOL;
+                        $stackPtr = $i;
+
+                        // If the content inside the "url()" is in double quotes
+                        // there will only be one token and so we don't have to do
+                        // anything except change its type. If it is not empty,
+                        // we need to do some token merging.
+                        $finalTokens[($x + 1)]['type'] = 'T_URL';
+                        $finalTokens[($x + 1)]['code'] = T_URL;
+
+                        if ($newContent !== '') {
+                            $finalTokens[($x + 1)]['content'] .= $newContent;
+                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                                $content = PHP_CodeSniffer::prepareForOutput($finalTokens[($x + 1)]['content']);
+                                echo "\t\t=> token content changed to: $content".PHP_EOL;
+                            }
                         }
-                    }
-                }//end if
+                    }//end if
 
-                break;
-            case T_ASPERAND:
-                $asperandStart = true;
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    echo "\t\t* at-rule definition opened *".PHP_EOL;
-                }
-                break;
-            default:
-                // Nothing special to be done with this token.
-                break;
+                    break;
+                case T_ASPERAND:
+                    $asperandStart = true;
+                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                        echo "\t\t* at-rule definition opened *".PHP_EOL;
+                    }
+                    break;
+                default:
+                    // Nothing special to be done with this token.
+                    break;
             }//end switch
         }//end for
 

CodeSniffer/Tokenizers/PHP.php

Switch Indentation +99 added lines, -99 removed lines

@@ -1450,24 +1450,24 @@ 
 
         if ($token[0] === T_STRING) {
             switch ($cacheKey) {
-            case 'false':
-                $newToken['type'] = 'T_FALSE';
-                break;
-            case 'true':
-                $newToken['type'] = 'T_TRUE';
-                break;
-            case 'null':
-                $newToken['type'] = 'T_NULL';
-                break;
-            case 'self':
-                $newToken['type'] = 'T_SELF';
-                break;
-            case 'parent':
-                $newToken['type'] = 'T_PARENT';
-                break;
-            default:
-                $newToken['type'] = 'T_STRING';
-                break;
+                case 'false':
+                    $newToken['type'] = 'T_FALSE';
+                    break;
+                case 'true':
+                    $newToken['type'] = 'T_TRUE';
+                    break;
+                case 'null':
+                    $newToken['type'] = 'T_NULL';
+                    break;
+                case 'self':
+                    $newToken['type'] = 'T_SELF';
+                    break;
+                case 'parent':
+                    $newToken['type'] = 'T_PARENT';
+                    break;
+                default:
+                    $newToken['type'] = 'T_STRING';
+                    break;
             }
 
             $newToken['code'] = constant($newToken['type']);
@@ -1509,87 +1509,87 @@ 
         $newToken = array();
 
         switch ($token) {
-        case '{':
-            $newToken['type'] = 'T_OPEN_CURLY_BRACKET';
-            break;
-        case '}':
-            $newToken['type'] = 'T_CLOSE_CURLY_BRACKET';
-            break;
-        case '[':
-            $newToken['type'] = 'T_OPEN_SQUARE_BRACKET';
-            break;
-        case ']':
-            $newToken['type'] = 'T_CLOSE_SQUARE_BRACKET';
-            break;
-        case '(':
-            $newToken['type'] = 'T_OPEN_PARENTHESIS';
-            break;
-        case ')':
-            $newToken['type'] = 'T_CLOSE_PARENTHESIS';
-            break;
-        case ':':
-            $newToken['type'] = 'T_COLON';
-            break;
-        case '.':
-            $newToken['type'] = 'T_STRING_CONCAT';
-            break;
-        case '?':
-            $newToken['type'] = 'T_INLINE_THEN';
-            break;
-        case ';':
-            $newToken['type'] = 'T_SEMICOLON';
-            break;
-        case '=':
-            $newToken['type'] = 'T_EQUAL';
-            break;
-        case '*':
-            $newToken['type'] = 'T_MULTIPLY';
-            break;
-        case '/':
-            $newToken['type'] = 'T_DIVIDE';
-            break;
-        case '+':
-            $newToken['type'] = 'T_PLUS';
-            break;
-        case '-':
-            $newToken['type'] = 'T_MINUS';
-            break;
-        case '%':
-            $newToken['type'] = 'T_MODULUS';
-            break;
-        case '^':
-            $newToken['type'] = 'T_BITWISE_XOR';
-            break;
-        case '&':
-            $newToken['type'] = 'T_BITWISE_AND';
-            break;
-        case '|':
-            $newToken['type'] = 'T_BITWISE_OR';
-            break;
-        case '<':
-            $newToken['type'] = 'T_LESS_THAN';
-            break;
-        case '>':
-            $newToken['type'] = 'T_GREATER_THAN';
-            break;
-        case '!':
-            $newToken['type'] = 'T_BOOLEAN_NOT';
-            break;
-        case ',':
-            $newToken['type'] = 'T_COMMA';
-            break;
-        case '@':
-            $newToken['type'] = 'T_ASPERAND';
-            break;
-        case '$':
-            $newToken['type'] = 'T_DOLLAR';
-            break;
-        case '`':
-            $newToken['type'] = 'T_BACKTICK';
-            break;
-        default:
-            $newToken['type'] = 'T_NONE';
-            break;
+            case '{':
+                $newToken['type'] = 'T_OPEN_CURLY_BRACKET';
+                break;
+            case '}':
+                $newToken['type'] = 'T_CLOSE_CURLY_BRACKET';
+                break;
+            case '[':
+                $newToken['type'] = 'T_OPEN_SQUARE_BRACKET';
+                break;
+            case ']':
+                $newToken['type'] = 'T_CLOSE_SQUARE_BRACKET';
+                break;
+            case '(':
+                $newToken['type'] = 'T_OPEN_PARENTHESIS';
+                break;
+            case ')':
+                $newToken['type'] = 'T_CLOSE_PARENTHESIS';
+                break;
+            case ':':
+                $newToken['type'] = 'T_COLON';
+                break;
+            case '.':
+                $newToken['type'] = 'T_STRING_CONCAT';
+                break;
+            case '?':
+                $newToken['type'] = 'T_INLINE_THEN';
+                break;
+            case ';':
+                $newToken['type'] = 'T_SEMICOLON';
+                break;
+            case '=':
+                $newToken['type'] = 'T_EQUAL';
+                break;
+            case '*':
+                $newToken['type'] = 'T_MULTIPLY';
+                break;
+            case '/':
+                $newToken['type'] = 'T_DIVIDE';
+                break;
+            case '+':
+                $newToken['type'] = 'T_PLUS';
+                break;
+            case '-':
+                $newToken['type'] = 'T_MINUS';
+                break;
+            case '%':
+                $newToken['type'] = 'T_MODULUS';
+                break;
+            case '^':
+                $newToken['type'] = 'T_BITWISE_XOR';
+                break;
+            case '&':
+                $newToken['type'] = 'T_BITWISE_AND';
+                break;
+            case '|':
+                $newToken['type'] = 'T_BITWISE_OR';
+                break;
+            case '<':
+                $newToken['type'] = 'T_LESS_THAN';
+                break;
+            case '>':
+                $newToken['type'] = 'T_GREATER_THAN';
+                break;
+            case '!':
+                $newToken['type'] = 'T_BOOLEAN_NOT';
+                break;
+            case ',':
+                $newToken['type'] = 'T_COMMA';
+                break;
+            case '@':
+                $newToken['type'] = 'T_ASPERAND';
+                break;
+            case '$':
+                $newToken['type'] = 'T_DOLLAR';
+                break;
+            case '`':
+                $newToken['type'] = 'T_BACKTICK';
+                break;
+            default:
+                $newToken['type'] = 'T_NONE';
+                break;
         }//end switch
 
         $newToken['code']    = constant($newToken['type']);

CodeSniffer/Fixer.php

Switch Indentation +8 added lines, -8 removed lines

@@ -283,14 +283,14 @@
         foreach ($diffLines as $line) {
             if (isset($line[0]) === true) {
                 switch ($line[0]) {
-                case '-':
-                    $diff[] = "\033[31m$line\033[0m";
-                    break;
-                case '+':
-                    $diff[] = "\033[32m$line\033[0m";
-                    break;
-                default:
-                    $diff[] = $line;
+                    case '-':
+                        $diff[] = "\033[31m$line\033[0m";
+                        break;
+                    case '+':
+                        $diff[] = "\033[32m$line\033[0m";
+                        break;
+                    default:
+                        $diff[] = $line;
                 }
             }
         }

CodeSniffer/File.php

Switch Indentation +157 added lines, -157 removed lines

@@ -1704,60 +1704,60 @@ 
             */
 
             switch ($tokens[$i]['code']) {
-            case T_OPEN_SQUARE_BRACKET:
-                $squareOpeners[] = $i;
-
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    echo str_repeat("\t", count($squareOpeners));
-                    echo str_repeat("\t", count($curlyOpeners));
-                    echo "=> Found square bracket opener at $i".PHP_EOL;
-                }
-                break;
-            case T_OPEN_CURLY_BRACKET:
-                if (isset($tokens[$i]['scope_closer']) === false) {
-                    $curlyOpeners[] = $i;
+                case T_OPEN_SQUARE_BRACKET:
+                    $squareOpeners[] = $i;
 
                     if (PHP_CODESNIFFER_VERBOSITY > 1) {
                         echo str_repeat("\t", count($squareOpeners));
                         echo str_repeat("\t", count($curlyOpeners));
-                        echo "=> Found curly bracket opener at $i".PHP_EOL;
+                        echo "=> Found square bracket opener at $i".PHP_EOL;
                     }
-                }
-                break;
-            case T_CLOSE_SQUARE_BRACKET:
-                if (empty($squareOpeners) === false) {
-                    $opener = array_pop($squareOpeners);
-                    $tokens[$i]['bracket_opener']      = $opener;
-                    $tokens[$i]['bracket_closer']      = $i;
-                    $tokens[$opener]['bracket_opener'] = $opener;
-                    $tokens[$opener]['bracket_closer'] = $i;
+                    break;
+                case T_OPEN_CURLY_BRACKET:
+                    if (isset($tokens[$i]['scope_closer']) === false) {
+                        $curlyOpeners[] = $i;
 
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", count($squareOpeners));
-                        echo str_repeat("\t", count($curlyOpeners));
-                        echo "\t=> Found square bracket closer at $i for $opener".PHP_EOL;
+                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                            echo str_repeat("\t", count($squareOpeners));
+                            echo str_repeat("\t", count($curlyOpeners));
+                            echo "=> Found curly bracket opener at $i".PHP_EOL;
+                        }
                     }
-                }
-                break;
-            case T_CLOSE_CURLY_BRACKET:
-                if (empty($curlyOpeners) === false
-                    && isset($tokens[$i]['scope_opener']) === false
-                ) {
-                    $opener = array_pop($curlyOpeners);
-                    $tokens[$i]['bracket_opener']      = $opener;
-                    $tokens[$i]['bracket_closer']      = $i;
-                    $tokens[$opener]['bracket_opener'] = $opener;
-                    $tokens[$opener]['bracket_closer'] = $i;
+                    break;
+                case T_CLOSE_SQUARE_BRACKET:
+                    if (empty($squareOpeners) === false) {
+                        $opener = array_pop($squareOpeners);
+                        $tokens[$i]['bracket_opener']      = $opener;
+                        $tokens[$i]['bracket_closer']      = $i;
+                        $tokens[$opener]['bracket_opener'] = $opener;
+                        $tokens[$opener]['bracket_closer'] = $i;
 
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", count($squareOpeners));
-                        echo str_repeat("\t", count($curlyOpeners));
-                        echo "\t=> Found curly bracket closer at $i for $opener".PHP_EOL;
+                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                            echo str_repeat("\t", count($squareOpeners));
+                            echo str_repeat("\t", count($curlyOpeners));
+                            echo "\t=> Found square bracket closer at $i for $opener".PHP_EOL;
+                        }
                     }
-                }
-                break;
-            default:
-                continue;
+                    break;
+                case T_CLOSE_CURLY_BRACKET:
+                    if (empty($curlyOpeners) === false
+                        && isset($tokens[$i]['scope_opener']) === false
+                    ) {
+                        $opener = array_pop($curlyOpeners);
+                        $tokens[$i]['bracket_opener']      = $opener;
+                        $tokens[$i]['bracket_closer']      = $i;
+                        $tokens[$opener]['bracket_opener'] = $opener;
+                        $tokens[$opener]['bracket_closer'] = $i;
+
+                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                            echo str_repeat("\t", count($squareOpeners));
+                            echo str_repeat("\t", count($curlyOpeners));
+                            echo "\t=> Found curly bracket closer at $i for $opener".PHP_EOL;
+                        }
+                    }
+                    break;
+                default:
+                    continue;
             }//end switch
         }//end for
 
@@ -2787,88 +2787,88 @@ 
             }
 
             switch ($this->_tokens[$i]['code']) {
-            case T_BITWISE_AND:
-                $passByReference = true;
-                break;
-            case T_VARIABLE:
-                $currVar = $i;
-                break;
-            case T_ELLIPSIS:
-                $variableLength = true;
-                break;
-            case T_ARRAY_HINT:
-            case T_CALLABLE:
-                $typeHint = $this->_tokens[$i]['content'];
-                break;
-            case T_STRING:
-                // This is a string, so it may be a type hint, but it could
-                // also be a constant used as a default value.
-                $prevComma = false;
-                for ($t = $i; $t >= $opener; $t--) {
-                    if ($this->_tokens[$t]['code'] === T_COMMA) {
-                        $prevComma = $t;
-                        break;
+                case T_BITWISE_AND:
+                    $passByReference = true;
+                    break;
+                case T_VARIABLE:
+                    $currVar = $i;
+                    break;
+                case T_ELLIPSIS:
+                    $variableLength = true;
+                    break;
+                case T_ARRAY_HINT:
+                case T_CALLABLE:
+                    $typeHint = $this->_tokens[$i]['content'];
+                    break;
+                case T_STRING:
+                    // This is a string, so it may be a type hint, but it could
+                    // also be a constant used as a default value.
+                    $prevComma = false;
+                    for ($t = $i; $t >= $opener; $t--) {
+                        if ($this->_tokens[$t]['code'] === T_COMMA) {
+                            $prevComma = $t;
+                            break;
+                        }
                     }
-                }
 
-                if ($prevComma !== false) {
-                    $nextEquals = false;
-                    for ($t = $prevComma; $t < $i; $t++) {
-                        if ($this->_tokens[$t]['code'] === T_EQUAL) {
-                            $nextEquals = $t;
+                    if ($prevComma !== false) {
+                        $nextEquals = false;
+                        for ($t = $prevComma; $t < $i; $t++) {
+                            if ($this->_tokens[$t]['code'] === T_EQUAL) {
+                                $nextEquals = $t;
+                                break;
+                            }
+                        }
+
+                        if ($nextEquals !== false) {
                             break;
                         }
                     }
 
-                    if ($nextEquals !== false) {
-                        break;
+                    if ($defaultStart === null) {
+                        $typeHint .= $this->_tokens[$i]['content'];
+                    }
+                    break;
+                case T_NS_SEPARATOR:
+                    // Part of a type hint or default value.
+                    if ($defaultStart === null) {
+                        $typeHint .= $this->_tokens[$i]['content'];
+                    }
+                    break;
+                case T_CLOSE_PARENTHESIS:
+                case T_COMMA:
+                    // If it's null, then there must be no parameters for this
+                    // method.
+                    if ($currVar === null) {
+                        continue;
                     }
-                }
-
-                if ($defaultStart === null) {
-                    $typeHint .= $this->_tokens[$i]['content'];
-                }
-                break;
-            case T_NS_SEPARATOR:
-                // Part of a type hint or default value.
-                if ($defaultStart === null) {
-                    $typeHint .= $this->_tokens[$i]['content'];
-                }
-                break;
-            case T_CLOSE_PARENTHESIS:
-            case T_COMMA:
-                // If it's null, then there must be no parameters for this
-                // method.
-                if ($currVar === null) {
-                    continue;
-                }
 
-                $vars[$paramCount]         = array();
-                $vars[$paramCount]['name'] = $this->_tokens[$currVar]['content'];
+                    $vars[$paramCount]         = array();
+                    $vars[$paramCount]['name'] = $this->_tokens[$currVar]['content'];
 
-                if ($defaultStart !== null) {
-                    $vars[$paramCount]['default']
-                        = $this->getTokensAsString(
-                            $defaultStart,
-                            ($i - $defaultStart)
-                        );
-                }
+                    if ($defaultStart !== null) {
+                        $vars[$paramCount]['default']
+                            = $this->getTokensAsString(
+                                $defaultStart,
+                                ($i - $defaultStart)
+                            );
+                    }
 
-                $vars[$paramCount]['pass_by_reference'] = $passByReference;
-                $vars[$paramCount]['variable_length']   = $variableLength;
-                $vars[$paramCount]['type_hint']         = $typeHint;
+                    $vars[$paramCount]['pass_by_reference'] = $passByReference;
+                    $vars[$paramCount]['variable_length']   = $variableLength;
+                    $vars[$paramCount]['type_hint']         = $typeHint;
 
-                // Reset the vars, as we are about to process the next parameter.
-                $defaultStart    = null;
-                $passByReference = false;
-                $variableLength  = false;
-                $typeHint        = '';
+                    // Reset the vars, as we are about to process the next parameter.
+                    $defaultStart    = null;
+                    $passByReference = false;
+                    $variableLength  = false;
+                    $typeHint        = '';
 
-                $paramCount++;
-                break;
-            case T_EQUAL:
-                $defaultStart = ($i + 1);
-                break;
+                    $paramCount++;
+                    break;
+                case T_EQUAL:
+                    $defaultStart = ($i + 1);
+                    break;
             }//end switch
         }//end for
 
@@ -2930,27 +2930,27 @@ 
             }
 
             switch ($this->_tokens[$i]['code']) {
-            case T_PUBLIC:
-                $scope          = 'public';
-                $scopeSpecified = true;
-                break;
-            case T_PRIVATE:
-                $scope          = 'private';
-                $scopeSpecified = true;
-                break;
-            case T_PROTECTED:
-                $scope          = 'protected';
-                $scopeSpecified = true;
-                break;
-            case T_ABSTRACT:
-                $isAbstract = true;
-                break;
-            case T_FINAL:
-                $isFinal = true;
-                break;
-            case T_STATIC:
-                $isStatic = true;
-                break;
+                case T_PUBLIC:
+                    $scope          = 'public';
+                    $scopeSpecified = true;
+                    break;
+                case T_PRIVATE:
+                    $scope          = 'private';
+                    $scopeSpecified = true;
+                    break;
+                case T_PROTECTED:
+                    $scope          = 'protected';
+                    $scopeSpecified = true;
+                    break;
+                case T_ABSTRACT:
+                    $isAbstract = true;
+                    break;
+                case T_FINAL:
+                    $isFinal = true;
+                    break;
+                case T_STATIC:
+                    $isStatic = true;
+                    break;
             }//end switch
         }//end for
 
@@ -3040,21 +3040,21 @@ 
             }
 
             switch ($this->_tokens[$i]['code']) {
-            case T_PUBLIC:
-                $scope          = 'public';
-                $scopeSpecified = true;
-                break;
-            case T_PRIVATE:
-                $scope          = 'private';
-                $scopeSpecified = true;
-                break;
-            case T_PROTECTED:
-                $scope          = 'protected';
-                $scopeSpecified = true;
-                break;
-            case T_STATIC:
-                $isStatic = true;
-                break;
+                case T_PUBLIC:
+                    $scope          = 'public';
+                    $scopeSpecified = true;
+                    break;
+                case T_PRIVATE:
+                    $scope          = 'private';
+                    $scopeSpecified = true;
+                    break;
+                case T_PROTECTED:
+                    $scope          = 'protected';
+                    $scopeSpecified = true;
+                    break;
+                case T_STATIC:
+                    $isStatic = true;
+                    break;
             }
         }//end for
 
@@ -3108,13 +3108,13 @@ 
             }
 
             switch ($this->_tokens[$i]['code']) {
-            case T_ABSTRACT:
-                $isAbstract = true;
-                break;
+                case T_ABSTRACT:
+                    $isAbstract = true;
+                    break;
 
-            case T_FINAL:
-                $isFinal = true;
-                break;
+                case T_FINAL:
+                    $isFinal = true;
+                    break;
             }
         }//end for
 

CodeSniffer/Standards/PSR2/Sniffs/Methods/MethodDeclarationSniff.php

Switch Indentation +12 added lines, -12 removed lines

@@ -80,18 +80,18 @@
         $prefix = $stackPtr;
         while (($prefix = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$methodPrefixes, ($prefix - 1), $prev)) !== false) {
             switch ($tokens[$prefix]['code']) {
-            case T_STATIC:
-                $static = $prefix;
-                break;
-            case T_ABSTRACT:
-                $abstract = $prefix;
-                break;
-            case T_FINAL:
-                $final = $prefix;
-                break;
-            default:
-                $visibility = $prefix;
-                break;
+                case T_STATIC:
+                    $static = $prefix;
+                    break;
+                case T_ABSTRACT:
+                    $abstract = $prefix;
+                    break;
+                case T_FINAL:
+                    $final = $prefix;
+                    break;
+                default:
+                    $visibility = $prefix;
+                    break;
             }
         }
 

CodeSniffer/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.inc

Switch Indentation +14 added lines, -14 removed lines

@@ -34,10 +34,10 @@ 
 }
 
 switch ($foo) {
-    case'Foo': {
-        echo 'foo';
-        break;
-        }
+        case'Foo': {
+            echo 'foo';
+            break;
+            }
 }
 
 while ($i < 10) {
@@ -52,10 +52,10 @@ 
 }
 
 switch (true) {
-    case is_resource($value):
-        throw new Exception('foo');
-    case is_object($value):
-        return 'object';
+        case is_resource($value):
+            throw new Exception('foo');
+        case is_object($value):
+            return 'object';
 }
 
 switch (0) {
@@ -105,13 +105,13 @@ 
 }
 
 switch ($foo) {
-    case 1: $bar = 1; break;
-    case 2:
+        case 1: $bar = 1; break;
+        case 2:
     
-        $bar = 2; break;
-    case 21:
-    case 3: return 3;
-    default: $bar = 0;
+            $bar = 2; break;
+        case 21:
+        case 3: return 3;
+        default: $bar = 0;
 }
 
 switch ($foo) {

CodeSniffer/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php

Switch Indentation +11 added lines, -11 removed lines

@@ -43,17 +43,17 @@
     public function getErrorList($testFile='')
     {
         switch ($testFile) {
-        case 'EndFileNewlineUnitTest.1.inc':
-        case 'EndFileNewlineUnitTest.3.inc':
-        case 'EndFileNewlineUnitTest.6.inc':
-        case 'EndFileNewlineUnitTest.7.inc':
-            return array(
-                    2 => 1,
-                   );
-            break;
-        default:
-            return array();
-            break;
+            case 'EndFileNewlineUnitTest.1.inc':
+            case 'EndFileNewlineUnitTest.3.inc':
+            case 'EndFileNewlineUnitTest.6.inc':
+            case 'EndFileNewlineUnitTest.7.inc':
+                return array(
+                        2 => 1,
+                       );
+                break;
+            default:
+                return array();
+                break;
         }//end switch
 
     }//end getErrorList()

CodeSniffer/Standards/PSR2/Tests/Files/ClosingTagUnitTest.php

Switch Indentation +7 added lines, -7 removed lines

@@ -43,15 +43,15 @@
     public function getErrorList($testFile='')
     {
         switch ($testFile) {
-        case 'ClosingTagUnitTest.1.inc':
-            return array(11 => 1);
+            case 'ClosingTagUnitTest.1.inc':
+                return array(11 => 1);
 
-        case 'ClosingTagUnitTest.4.inc':
-        case 'ClosingTagUnitTest.5.inc':
-            return array(1 => 1);
+            case 'ClosingTagUnitTest.4.inc':
+            case 'ClosingTagUnitTest.5.inc':
+                return array(1 => 1);
 
-        default:
-            return array();
+            default:
+                return array();
         }
 
     }//end getErrorList()