Completed
Pull Request — master (#11)
by Tomáš
04:10
created
src/Sniffs/AbstractPatternSniff.php 1 patch
Switch Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -890,26 +890,26 @@
 block discarded – undo
890 890
         $nestedBraces      = 0;
891 891
         for ($start = $from; $start >= 0; $start--) {
892 892
             switch ($pattern[$start]) {
893
-            case '(':
894
-                if ($nestedParenthesis === 0) {
895
-                    $skip['to'] = 'parenthesis_closer';
896
-                }
893
+                case '(':
894
+                    if ($nestedParenthesis === 0) {
895
+                        $skip['to'] = 'parenthesis_closer';
896
+                    }
897 897
 
898
-                $nestedParenthesis--;
899
-                break;
900
-            case '{':
901
-                if ($nestedBraces === 0) {
902
-                    $skip['to'] = 'scope_closer';
903
-                }
898
+                    $nestedParenthesis--;
899
+                    break;
900
+                case '{':
901
+                    if ($nestedBraces === 0) {
902
+                        $skip['to'] = 'scope_closer';
903
+                    }
904 904
 
905
-                $nestedBraces--;
906
-                break;
907
-            case '}':
908
-                $nestedBraces++;
909
-                break;
910
-            case ')':
911
-                $nestedParenthesis++;
912
-                break;
905
+                    $nestedBraces--;
906
+                    break;
907
+                case '}':
908
+                    $nestedBraces++;
909
+                    break;
910
+                case ')':
911
+                    $nestedParenthesis++;
912
+                    break;
913 913
             }//end switch
914 914
 
915 915
             if (isset($skip['to']) === true) {
Please login to merge, or discard this patch.
src/Files/File.php 1 patch
Switch Indentation   +112 added lines, -112 removed lines patch added patch discarded remove patch
@@ -1209,88 +1209,88 @@  discard block
 block discarded – undo
1209 1209
             }
1210 1210
 
1211 1211
             switch ($this->tokens[$i]['code']) {
1212
-            case T_BITWISE_AND:
1213
-                $passByReference = true;
1214
-                break;
1215
-            case T_VARIABLE:
1216
-                $currVar = $i;
1217
-                break;
1218
-            case T_ELLIPSIS:
1219
-                $variableLength = true;
1220
-                break;
1221
-            case T_ARRAY_HINT:
1222
-            case T_CALLABLE:
1223
-                $typeHint = $this->tokens[$i]['content'];
1224
-                break;
1225
-            case T_STRING:
1226
-                // This is a string, so it may be a type hint, but it could
1227
-                // also be a constant used as a default value.
1228
-                $prevComma = false;
1229
-                for ($t = $i; $t >= $opener; $t--) {
1230
-                    if ($this->tokens[$t]['code'] === T_COMMA) {
1231
-                        $prevComma = $t;
1232
-                        break;
1212
+                case T_BITWISE_AND:
1213
+                    $passByReference = true;
1214
+                    break;
1215
+                case T_VARIABLE:
1216
+                    $currVar = $i;
1217
+                    break;
1218
+                case T_ELLIPSIS:
1219
+                    $variableLength = true;
1220
+                    break;
1221
+                case T_ARRAY_HINT:
1222
+                case T_CALLABLE:
1223
+                    $typeHint = $this->tokens[$i]['content'];
1224
+                    break;
1225
+                case T_STRING:
1226
+                    // This is a string, so it may be a type hint, but it could
1227
+                    // also be a constant used as a default value.
1228
+                    $prevComma = false;
1229
+                    for ($t = $i; $t >= $opener; $t--) {
1230
+                        if ($this->tokens[$t]['code'] === T_COMMA) {
1231
+                            $prevComma = $t;
1232
+                            break;
1233
+                        }
1233 1234
                     }
1234
-                }
1235 1235
 
1236
-                if ($prevComma !== false) {
1237
-                    $nextEquals = false;
1238
-                    for ($t = $prevComma; $t < $i; $t++) {
1239
-                        if ($this->tokens[$t]['code'] === T_EQUAL) {
1240
-                            $nextEquals = $t;
1236
+                    if ($prevComma !== false) {
1237
+                        $nextEquals = false;
1238
+                        for ($t = $prevComma; $t < $i; $t++) {
1239
+                            if ($this->tokens[$t]['code'] === T_EQUAL) {
1240
+                                $nextEquals = $t;
1241
+                                break;
1242
+                            }
1243
+                        }
1244
+
1245
+                        if ($nextEquals !== false) {
1241 1246
                             break;
1242 1247
                         }
1243 1248
                     }
1244 1249
 
1245
-                    if ($nextEquals !== false) {
1246
-                        break;
1250
+                    if ($defaultStart === null) {
1251
+                        $typeHint .= $this->tokens[$i]['content'];
1252
+                    }
1253
+                    break;
1254
+                case T_NS_SEPARATOR:
1255
+                    // Part of a type hint or default value.
1256
+                    if ($defaultStart === null) {
1257
+                        $typeHint .= $this->tokens[$i]['content'];
1258
+                    }
1259
+                    break;
1260
+                case T_CLOSE_PARENTHESIS:
1261
+                case T_COMMA:
1262
+                    // If it's null, then there must be no parameters for this
1263
+                    // method.
1264
+                    if ($currVar === null) {
1265
+                        continue;
1247 1266
                     }
1248
-                }
1249
-
1250
-                if ($defaultStart === null) {
1251
-                    $typeHint .= $this->tokens[$i]['content'];
1252
-                }
1253
-                break;
1254
-            case T_NS_SEPARATOR:
1255
-                // Part of a type hint or default value.
1256
-                if ($defaultStart === null) {
1257
-                    $typeHint .= $this->tokens[$i]['content'];
1258
-                }
1259
-                break;
1260
-            case T_CLOSE_PARENTHESIS:
1261
-            case T_COMMA:
1262
-                // If it's null, then there must be no parameters for this
1263
-                // method.
1264
-                if ($currVar === null) {
1265
-                    continue;
1266
-                }
1267 1267
 
1268
-                $vars[$paramCount]         = array();
1269
-                $vars[$paramCount]['name'] = $this->tokens[$currVar]['content'];
1268
+                    $vars[$paramCount]         = array();
1269
+                    $vars[$paramCount]['name'] = $this->tokens[$currVar]['content'];
1270 1270
 
1271
-                if ($defaultStart !== null) {
1272
-                    $vars[$paramCount]['default']
1273
-                        = $this->getTokensAsString(
1274
-                            $defaultStart,
1275
-                            ($i - $defaultStart)
1276
-                        );
1277
-                }
1271
+                    if ($defaultStart !== null) {
1272
+                        $vars[$paramCount]['default']
1273
+                            = $this->getTokensAsString(
1274
+                                $defaultStart,
1275
+                                ($i - $defaultStart)
1276
+                            );
1277
+                    }
1278 1278
 
1279
-                $vars[$paramCount]['pass_by_reference'] = $passByReference;
1280
-                $vars[$paramCount]['variable_length']   = $variableLength;
1281
-                $vars[$paramCount]['type_hint']         = $typeHint;
1279
+                    $vars[$paramCount]['pass_by_reference'] = $passByReference;
1280
+                    $vars[$paramCount]['variable_length']   = $variableLength;
1281
+                    $vars[$paramCount]['type_hint']         = $typeHint;
1282 1282
 
1283
-                // Reset the vars, as we are about to process the next parameter.
1284
-                $defaultStart    = null;
1285
-                $passByReference = false;
1286
-                $variableLength  = false;
1287
-                $typeHint        = '';
1283
+                    // Reset the vars, as we are about to process the next parameter.
1284
+                    $defaultStart    = null;
1285
+                    $passByReference = false;
1286
+                    $variableLength  = false;
1287
+                    $typeHint        = '';
1288 1288
 
1289
-                $paramCount++;
1290
-                break;
1291
-            case T_EQUAL:
1292
-                $defaultStart = ($i + 1);
1293
-                break;
1289
+                    $paramCount++;
1290
+                    break;
1291
+                case T_EQUAL:
1292
+                    $defaultStart = ($i + 1);
1293
+                    break;
1294 1294
             }//end switch
1295 1295
         }//end for
1296 1296
 
@@ -1352,27 +1352,27 @@  discard block
 block discarded – undo
1352 1352
             }
1353 1353
 
1354 1354
             switch ($this->tokens[$i]['code']) {
1355
-            case T_PUBLIC:
1356
-                $scope          = 'public';
1357
-                $scopeSpecified = true;
1358
-                break;
1359
-            case T_PRIVATE:
1360
-                $scope          = 'private';
1361
-                $scopeSpecified = true;
1362
-                break;
1363
-            case T_PROTECTED:
1364
-                $scope          = 'protected';
1365
-                $scopeSpecified = true;
1366
-                break;
1367
-            case T_ABSTRACT:
1368
-                $isAbstract = true;
1369
-                break;
1370
-            case T_FINAL:
1371
-                $isFinal = true;
1372
-                break;
1373
-            case T_STATIC:
1374
-                $isStatic = true;
1375
-                break;
1355
+                case T_PUBLIC:
1356
+                    $scope          = 'public';
1357
+                    $scopeSpecified = true;
1358
+                    break;
1359
+                case T_PRIVATE:
1360
+                    $scope          = 'private';
1361
+                    $scopeSpecified = true;
1362
+                    break;
1363
+                case T_PROTECTED:
1364
+                    $scope          = 'protected';
1365
+                    $scopeSpecified = true;
1366
+                    break;
1367
+                case T_ABSTRACT:
1368
+                    $isAbstract = true;
1369
+                    break;
1370
+                case T_FINAL:
1371
+                    $isFinal = true;
1372
+                    break;
1373
+                case T_STATIC:
1374
+                    $isStatic = true;
1375
+                    break;
1376 1376
             }//end switch
1377 1377
         }//end for
1378 1378
 
@@ -1462,21 +1462,21 @@  discard block
 block discarded – undo
1462 1462
             }
1463 1463
 
1464 1464
             switch ($this->tokens[$i]['code']) {
1465
-            case T_PUBLIC:
1466
-                $scope          = 'public';
1467
-                $scopeSpecified = true;
1468
-                break;
1469
-            case T_PRIVATE:
1470
-                $scope          = 'private';
1471
-                $scopeSpecified = true;
1472
-                break;
1473
-            case T_PROTECTED:
1474
-                $scope          = 'protected';
1475
-                $scopeSpecified = true;
1476
-                break;
1477
-            case T_STATIC:
1478
-                $isStatic = true;
1479
-                break;
1465
+                case T_PUBLIC:
1466
+                    $scope          = 'public';
1467
+                    $scopeSpecified = true;
1468
+                    break;
1469
+                case T_PRIVATE:
1470
+                    $scope          = 'private';
1471
+                    $scopeSpecified = true;
1472
+                    break;
1473
+                case T_PROTECTED:
1474
+                    $scope          = 'protected';
1475
+                    $scopeSpecified = true;
1476
+                    break;
1477
+                case T_STATIC:
1478
+                    $isStatic = true;
1479
+                    break;
1480 1480
             }
1481 1481
         }//end for
1482 1482
 
@@ -1530,13 +1530,13 @@  discard block
 block discarded – undo
1530 1530
             }
1531 1531
 
1532 1532
             switch ($this->tokens[$i]['code']) {
1533
-            case T_ABSTRACT:
1534
-                $isAbstract = true;
1535
-                break;
1533
+                case T_ABSTRACT:
1534
+                    $isAbstract = true;
1535
+                    break;
1536 1536
 
1537
-            case T_FINAL:
1538
-                $isFinal = true;
1539
-                break;
1537
+                case T_FINAL:
1538
+                    $isFinal = true;
1539
+                    break;
1540 1540
             }
1541 1541
         }//end for
1542 1542
 
Please login to merge, or discard this patch.
src/Runner.php 1 patch
Switch Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -607,19 +607,19 @@
 block discarded – undo
607 607
                 $input = trim($input);
608 608
 
609 609
                 switch ($input) {
610
-                case 's':
611
-                    break(2);
612
-                case 'q':
613
-                    exit(0);
614
-                default:
615
-                    // Repopulate the sniffs because some of them save their state
616
-                    // and only clear it when the file changes, but we are rechecking
617
-                    // the same file.
618
-                    $file->ruleset->populateTokenListeners();
619
-                    $file->reloadContent();
620
-                    $file->process();
621
-                    $this->reporter->cacheFileReport($file, $this->config);
622
-                    break;
610
+                    case 's':
611
+                        break(2);
612
+                    case 'q':
613
+                        exit(0);
614
+                    default:
615
+                        // Repopulate the sniffs because some of them save their state
616
+                        // and only clear it when the file changes, but we are rechecking
617
+                        // the same file.
618
+                        $file->ruleset->populateTokenListeners();
619
+                        $file->reloadContent();
620
+                        $file->process();
621
+                        $this->reporter->cacheFileReport($file, $this->config);
622
+                        break;
623 623
                 }
624 624
             }//end while
625 625
         }//end if
Please login to merge, or discard this patch.
src/Util/Common.php 1 patch
Switch Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -343,15 +343,15 @@
 block discarded – undo
343 343
         } else {
344 344
             $lowerVarType = strtolower($varType);
345 345
             switch ($lowerVarType) {
346
-            case 'bool':
347
-                return 'boolean';
348
-            case 'double':
349
-            case 'real':
350
-                return 'float';
351
-            case 'int':
352
-                return 'integer';
353
-            case 'array()':
354
-                return 'array';
346
+                case 'bool':
347
+                    return 'boolean';
348
+                case 'double':
349
+                case 'real':
350
+                    return 'float';
351
+                case 'int':
352
+                    return 'integer';
353
+                case 'array()':
354
+                    return 'array';
355 355
             }//end switch
356 356
 
357 357
             if (strpos($lowerVarType, 'array(') !== false) {
Please login to merge, or discard this patch.
src/Fixer.php 1 patch
Switch Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -283,14 +283,14 @@
 block discarded – undo
283 283
         foreach ($diffLines as $line) {
284 284
             if (isset($line[0]) === true) {
285 285
                 switch ($line[0]) {
286
-                case '-':
287
-                    $diff[] = "\033[31m$line\033[0m";
288
-                    break;
289
-                case '+':
290
-                    $diff[] = "\033[32m$line\033[0m";
291
-                    break;
292
-                default:
293
-                    $diff[] = $line;
286
+                    case '-':
287
+                        $diff[] = "\033[31m$line\033[0m";
288
+                        break;
289
+                    case '+':
290
+                        $diff[] = "\033[32m$line\033[0m";
291
+                        break;
292
+                    default:
293
+                        $diff[] = $line;
294 294
                 }
295 295
             }
296 296
         }
Please login to merge, or discard this patch.
src/Tokenizers/PHP.php 1 patch
Switch Indentation   +99 added lines, -99 removed lines patch added patch discarded remove patch
@@ -1450,24 +1450,24 @@  discard block
 block discarded – undo
1450 1450
 
1451 1451
         if ($token[0] === T_STRING) {
1452 1452
             switch ($cacheKey) {
1453
-            case 'false':
1454
-                $newToken['type'] = 'T_FALSE';
1455
-                break;
1456
-            case 'true':
1457
-                $newToken['type'] = 'T_TRUE';
1458
-                break;
1459
-            case 'null':
1460
-                $newToken['type'] = 'T_NULL';
1461
-                break;
1462
-            case 'self':
1463
-                $newToken['type'] = 'T_SELF';
1464
-                break;
1465
-            case 'parent':
1466
-                $newToken['type'] = 'T_PARENT';
1467
-                break;
1468
-            default:
1469
-                $newToken['type'] = 'T_STRING';
1470
-                break;
1453
+                case 'false':
1454
+                    $newToken['type'] = 'T_FALSE';
1455
+                    break;
1456
+                case 'true':
1457
+                    $newToken['type'] = 'T_TRUE';
1458
+                    break;
1459
+                case 'null':
1460
+                    $newToken['type'] = 'T_NULL';
1461
+                    break;
1462
+                case 'self':
1463
+                    $newToken['type'] = 'T_SELF';
1464
+                    break;
1465
+                case 'parent':
1466
+                    $newToken['type'] = 'T_PARENT';
1467
+                    break;
1468
+                default:
1469
+                    $newToken['type'] = 'T_STRING';
1470
+                    break;
1471 1471
             }
1472 1472
 
1473 1473
             $newToken['code'] = constant($newToken['type']);
@@ -1509,87 +1509,87 @@  discard block
 block discarded – undo
1509 1509
         $newToken = array();
1510 1510
 
1511 1511
         switch ($token) {
1512
-        case '{':
1513
-            $newToken['type'] = 'T_OPEN_CURLY_BRACKET';
1514
-            break;
1515
-        case '}':
1516
-            $newToken['type'] = 'T_CLOSE_CURLY_BRACKET';
1517
-            break;
1518
-        case '[':
1519
-            $newToken['type'] = 'T_OPEN_SQUARE_BRACKET';
1520
-            break;
1521
-        case ']':
1522
-            $newToken['type'] = 'T_CLOSE_SQUARE_BRACKET';
1523
-            break;
1524
-        case '(':
1525
-            $newToken['type'] = 'T_OPEN_PARENTHESIS';
1526
-            break;
1527
-        case ')':
1528
-            $newToken['type'] = 'T_CLOSE_PARENTHESIS';
1529
-            break;
1530
-        case ':':
1531
-            $newToken['type'] = 'T_COLON';
1532
-            break;
1533
-        case '.':
1534
-            $newToken['type'] = 'T_STRING_CONCAT';
1535
-            break;
1536
-        case '?':
1537
-            $newToken['type'] = 'T_INLINE_THEN';
1538
-            break;
1539
-        case ';':
1540
-            $newToken['type'] = 'T_SEMICOLON';
1541
-            break;
1542
-        case '=':
1543
-            $newToken['type'] = 'T_EQUAL';
1544
-            break;
1545
-        case '*':
1546
-            $newToken['type'] = 'T_MULTIPLY';
1547
-            break;
1548
-        case '/':
1549
-            $newToken['type'] = 'T_DIVIDE';
1550
-            break;
1551
-        case '+':
1552
-            $newToken['type'] = 'T_PLUS';
1553
-            break;
1554
-        case '-':
1555
-            $newToken['type'] = 'T_MINUS';
1556
-            break;
1557
-        case '%':
1558
-            $newToken['type'] = 'T_MODULUS';
1559
-            break;
1560
-        case '^':
1561
-            $newToken['type'] = 'T_BITWISE_XOR';
1562
-            break;
1563
-        case '&':
1564
-            $newToken['type'] = 'T_BITWISE_AND';
1565
-            break;
1566
-        case '|':
1567
-            $newToken['type'] = 'T_BITWISE_OR';
1568
-            break;
1569
-        case '<':
1570
-            $newToken['type'] = 'T_LESS_THAN';
1571
-            break;
1572
-        case '>':
1573
-            $newToken['type'] = 'T_GREATER_THAN';
1574
-            break;
1575
-        case '!':
1576
-            $newToken['type'] = 'T_BOOLEAN_NOT';
1577
-            break;
1578
-        case ',':
1579
-            $newToken['type'] = 'T_COMMA';
1580
-            break;
1581
-        case '@':
1582
-            $newToken['type'] = 'T_ASPERAND';
1583
-            break;
1584
-        case '$':
1585
-            $newToken['type'] = 'T_DOLLAR';
1586
-            break;
1587
-        case '`':
1588
-            $newToken['type'] = 'T_BACKTICK';
1589
-            break;
1590
-        default:
1591
-            $newToken['type'] = 'T_NONE';
1592
-            break;
1512
+            case '{':
1513
+                $newToken['type'] = 'T_OPEN_CURLY_BRACKET';
1514
+                break;
1515
+            case '}':
1516
+                $newToken['type'] = 'T_CLOSE_CURLY_BRACKET';
1517
+                break;
1518
+            case '[':
1519
+                $newToken['type'] = 'T_OPEN_SQUARE_BRACKET';
1520
+                break;
1521
+            case ']':
1522
+                $newToken['type'] = 'T_CLOSE_SQUARE_BRACKET';
1523
+                break;
1524
+            case '(':
1525
+                $newToken['type'] = 'T_OPEN_PARENTHESIS';
1526
+                break;
1527
+            case ')':
1528
+                $newToken['type'] = 'T_CLOSE_PARENTHESIS';
1529
+                break;
1530
+            case ':':
1531
+                $newToken['type'] = 'T_COLON';
1532
+                break;
1533
+            case '.':
1534
+                $newToken['type'] = 'T_STRING_CONCAT';
1535
+                break;
1536
+            case '?':
1537
+                $newToken['type'] = 'T_INLINE_THEN';
1538
+                break;
1539
+            case ';':
1540
+                $newToken['type'] = 'T_SEMICOLON';
1541
+                break;
1542
+            case '=':
1543
+                $newToken['type'] = 'T_EQUAL';
1544
+                break;
1545
+            case '*':
1546
+                $newToken['type'] = 'T_MULTIPLY';
1547
+                break;
1548
+            case '/':
1549
+                $newToken['type'] = 'T_DIVIDE';
1550
+                break;
1551
+            case '+':
1552
+                $newToken['type'] = 'T_PLUS';
1553
+                break;
1554
+            case '-':
1555
+                $newToken['type'] = 'T_MINUS';
1556
+                break;
1557
+            case '%':
1558
+                $newToken['type'] = 'T_MODULUS';
1559
+                break;
1560
+            case '^':
1561
+                $newToken['type'] = 'T_BITWISE_XOR';
1562
+                break;
1563
+            case '&':
1564
+                $newToken['type'] = 'T_BITWISE_AND';
1565
+                break;
1566
+            case '|':
1567
+                $newToken['type'] = 'T_BITWISE_OR';
1568
+                break;
1569
+            case '<':
1570
+                $newToken['type'] = 'T_LESS_THAN';
1571
+                break;
1572
+            case '>':
1573
+                $newToken['type'] = 'T_GREATER_THAN';
1574
+                break;
1575
+            case '!':
1576
+                $newToken['type'] = 'T_BOOLEAN_NOT';
1577
+                break;
1578
+            case ',':
1579
+                $newToken['type'] = 'T_COMMA';
1580
+                break;
1581
+            case '@':
1582
+                $newToken['type'] = 'T_ASPERAND';
1583
+                break;
1584
+            case '$':
1585
+                $newToken['type'] = 'T_DOLLAR';
1586
+                break;
1587
+            case '`':
1588
+                $newToken['type'] = 'T_BACKTICK';
1589
+                break;
1590
+            default:
1591
+                $newToken['type'] = 'T_NONE';
1592
+                break;
1593 1593
         }//end switch
1594 1594
 
1595 1595
         $newToken['code']    = constant($newToken['type']);
Please login to merge, or discard this patch.
src/Tokenizers/Tokenizer.php 1 patch
Switch Indentation   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -406,60 +406,60 @@
 block discarded – undo
406 406
             */
407 407
 
408 408
             switch ($this->tokens[$i]['code']) {
409
-            case T_OPEN_SQUARE_BRACKET:
410
-                $squareOpeners[] = $i;
411
-
412
-                if (PHP_CodeSniffer_VERBOSITY > 1) {
413
-                    echo str_repeat("\t", count($squareOpeners));
414
-                    echo str_repeat("\t", count($curlyOpeners));
415
-                    echo "=> Found square bracket opener at $i".PHP_EOL;
416
-                }
417
-                break;
418
-            case T_OPEN_CURLY_BRACKET:
419
-                if (isset($this->tokens[$i]['scope_closer']) === false) {
420
-                    $curlyOpeners[] = $i;
409
+                case T_OPEN_SQUARE_BRACKET:
410
+                    $squareOpeners[] = $i;
421 411
 
422 412
                     if (PHP_CodeSniffer_VERBOSITY > 1) {
423 413
                         echo str_repeat("\t", count($squareOpeners));
424 414
                         echo str_repeat("\t", count($curlyOpeners));
425
-                        echo "=> Found curly bracket opener at $i".PHP_EOL;
415
+                        echo "=> Found square bracket opener at $i".PHP_EOL;
426 416
                     }
427
-                }
428
-                break;
429
-            case T_CLOSE_SQUARE_BRACKET:
430
-                if (empty($squareOpeners) === false) {
431
-                    $opener = array_pop($squareOpeners);
432
-                    $this->tokens[$i]['bracket_opener']      = $opener;
433
-                    $this->tokens[$i]['bracket_closer']      = $i;
434
-                    $this->tokens[$opener]['bracket_opener'] = $opener;
435
-                    $this->tokens[$opener]['bracket_closer'] = $i;
417
+                    break;
418
+                case T_OPEN_CURLY_BRACKET:
419
+                    if (isset($this->tokens[$i]['scope_closer']) === false) {
420
+                        $curlyOpeners[] = $i;
436 421
 
437
-                    if (PHP_CodeSniffer_VERBOSITY > 1) {
438
-                        echo str_repeat("\t", count($squareOpeners));
439
-                        echo str_repeat("\t", count($curlyOpeners));
440
-                        echo "\t=> Found square bracket closer at $i for $opener".PHP_EOL;
422
+                        if (PHP_CodeSniffer_VERBOSITY > 1) {
423
+                            echo str_repeat("\t", count($squareOpeners));
424
+                            echo str_repeat("\t", count($curlyOpeners));
425
+                            echo "=> Found curly bracket opener at $i".PHP_EOL;
426
+                        }
441 427
                     }
442
-                }
443
-                break;
444
-            case T_CLOSE_CURLY_BRACKET:
445
-                if (empty($curlyOpeners) === false
446
-                    && isset($this->tokens[$i]['scope_opener']) === false
447
-                ) {
448
-                    $opener = array_pop($curlyOpeners);
449
-                    $this->tokens[$i]['bracket_opener']      = $opener;
450
-                    $this->tokens[$i]['bracket_closer']      = $i;
451
-                    $this->tokens[$opener]['bracket_opener'] = $opener;
452
-                    $this->tokens[$opener]['bracket_closer'] = $i;
428
+                    break;
429
+                case T_CLOSE_SQUARE_BRACKET:
430
+                    if (empty($squareOpeners) === false) {
431
+                        $opener = array_pop($squareOpeners);
432
+                        $this->tokens[$i]['bracket_opener']      = $opener;
433
+                        $this->tokens[$i]['bracket_closer']      = $i;
434
+                        $this->tokens[$opener]['bracket_opener'] = $opener;
435
+                        $this->tokens[$opener]['bracket_closer'] = $i;
453 436
 
454
-                    if (PHP_CodeSniffer_VERBOSITY > 1) {
455
-                        echo str_repeat("\t", count($squareOpeners));
456
-                        echo str_repeat("\t", count($curlyOpeners));
457
-                        echo "\t=> Found curly bracket closer at $i for $opener".PHP_EOL;
437
+                        if (PHP_CodeSniffer_VERBOSITY > 1) {
438
+                            echo str_repeat("\t", count($squareOpeners));
439
+                            echo str_repeat("\t", count($curlyOpeners));
440
+                            echo "\t=> Found square bracket closer at $i for $opener".PHP_EOL;
441
+                        }
458 442
                     }
459
-                }
460
-                break;
461
-            default:
462
-                continue;
443
+                    break;
444
+                case T_CLOSE_CURLY_BRACKET:
445
+                    if (empty($curlyOpeners) === false
446
+                        && isset($this->tokens[$i]['scope_opener']) === false
447
+                    ) {
448
+                        $opener = array_pop($curlyOpeners);
449
+                        $this->tokens[$i]['bracket_opener']      = $opener;
450
+                        $this->tokens[$i]['bracket_closer']      = $i;
451
+                        $this->tokens[$opener]['bracket_opener'] = $opener;
452
+                        $this->tokens[$opener]['bracket_closer'] = $i;
453
+
454
+                        if (PHP_CodeSniffer_VERBOSITY > 1) {
455
+                            echo str_repeat("\t", count($squareOpeners));
456
+                            echo str_repeat("\t", count($curlyOpeners));
457
+                            echo "\t=> Found curly bracket closer at $i for $opener".PHP_EOL;
458
+                        }
459
+                    }
460
+                    break;
461
+                default:
462
+                    continue;
463 463
             }//end switch
464 464
         }//end for
465 465
 
Please login to merge, or discard this patch.
src/Config.php 1 patch
Switch Indentation   +210 added lines, -210 removed lines patch added patch discarded remove patch
@@ -184,35 +184,35 @@  discard block
 block discarded – undo
184 184
         }
185 185
 
186 186
         switch ($name) {
187
-        case 'reportWidth' :
188
-            // Support auto terminal width.
189
-            if ($value === 'auto' && preg_match('|\d+ (\d+)|', shell_exec('stty size 2>&1'), $matches) === 1) {
190
-                $value = (int) $matches[1];
191
-            } else {
192
-                $value = (int) $value;
193
-            }
194
-            break;
195
-        case 'standards' :
196
-            $cleaned = array();
197
-
198
-            // Check if the standard name is valid, or if the case is invalid.
199
-            $installedStandards = Util\Standards::getInstalledStandards();
200
-            foreach ($value as $standard) {
201
-                foreach ($installedStandards as $validStandard) {
202
-                    if (strtolower($standard) === strtolower($validStandard)) {
203
-                        $standard = $validStandard;
204
-                        break;
205
-                    }
187
+            case 'reportWidth' :
188
+                // Support auto terminal width.
189
+                if ($value === 'auto' && preg_match('|\d+ (\d+)|', shell_exec('stty size 2>&1'), $matches) === 1) {
190
+                    $value = (int) $matches[1];
191
+                } else {
192
+                    $value = (int) $value;
206 193
                 }
194
+                break;
195
+            case 'standards' :
196
+                $cleaned = array();
197
+
198
+                // Check if the standard name is valid, or if the case is invalid.
199
+                $installedStandards = Util\Standards::getInstalledStandards();
200
+                foreach ($value as $standard) {
201
+                    foreach ($installedStandards as $validStandard) {
202
+                        if (strtolower($standard) === strtolower($validStandard)) {
203
+                            $standard = $validStandard;
204
+                            break;
205
+                        }
206
+                    }
207 207
 
208
-                $cleaned[] = $standard;
209
-            }
208
+                    $cleaned[] = $standard;
209
+                }
210 210
 
211
-            $value = $cleaned;
212
-            break;
213
-        default :
214
-            // No validation required.
215
-            break;
211
+                $value = $cleaned;
212
+                break;
213
+            default :
214
+                // No validation required.
215
+                break;
216 216
         }//end switch
217 217
 
218 218
         $this->settings[$name] = $value;
@@ -469,64 +469,64 @@  discard block
 block discarded – undo
469 469
     public function processShortArgument($arg, $pos)
470 470
     {
471 471
         switch ($arg) {
472
-        case 'h':
473
-        case '?':
474
-            $this->printUsage();
475
-            exit(0);
476
-        case 'i' :
477
-            Util\Standards::printInstalledStandards();
478
-            exit(0);
479
-        case 'v' :
480
-            $this->verbosity++;
481
-            $this->overriddenDefaults['verbosity'] = true;
482
-            break;
483
-        case 'l' :
484
-            $this->local = true;
485
-            $this->overriddenDefaults['local'] = true;
486
-            break;
487
-        case 's' :
488
-            $this->showSources = true;
489
-            $this->overriddenDefaults['showSources'] = true;
490
-            break;
491
-        case 'e':
492
-            $this->explain = true;
493
-            $this->overriddenDefaults['explain'] = true;
494
-            break;
495
-        case 'p' :
496
-            $this->showProgress = true;
497
-            $this->overriddenDefaults['showProgress'] = true;
498
-            break;
499
-        case 'm' :
500
-            $this->recordErrors = false;
501
-            $this->overriddenDefaults['recordErrors'] = true;
502
-            break;
503
-        case 'd' :
504
-            $ini = explode('=', $this->cliArgs[($pos + 1)]);
505
-            $this->cliArgs[($pos + 1)] = '';
506
-            if (isset($ini[1]) === true) {
507
-                ini_set($ini[0], $ini[1]);
508
-            } else {
509
-                ini_set($ini[0], true);
510
-            }
511
-            break;
512
-        case 'n' :
513
-            if (isset($this->overriddenDefaults['warningSeverity']) === false) {
514
-                $this->warningSeverity = 0;
515
-                $this->overriddenDefaults['warningSeverity'] = true;
516
-            }
517
-            break;
518
-        case 'w' :
519
-            if (isset($this->overriddenDefaults['warningSeverity']) === false) {
520
-                $this->warningSeverity = $this->errorSeverity;
521
-                $this->overriddenDefaults['warningSeverity'] = true;
522
-            }
523
-            break;
524
-        default:
525
-            if ($this->dieOnUnknownArg === false) {
526
-                $this->values[$arg] = $arg;
527
-            } else {
528
-                $this->processUnknownArgument('-'.$arg, $pos);
529
-            }
472
+            case 'h':
473
+            case '?':
474
+                $this->printUsage();
475
+                exit(0);
476
+            case 'i' :
477
+                Util\Standards::printInstalledStandards();
478
+                exit(0);
479
+            case 'v' :
480
+                $this->verbosity++;
481
+                $this->overriddenDefaults['verbosity'] = true;
482
+                break;
483
+            case 'l' :
484
+                $this->local = true;
485
+                $this->overriddenDefaults['local'] = true;
486
+                break;
487
+            case 's' :
488
+                $this->showSources = true;
489
+                $this->overriddenDefaults['showSources'] = true;
490
+                break;
491
+            case 'e':
492
+                $this->explain = true;
493
+                $this->overriddenDefaults['explain'] = true;
494
+                break;
495
+            case 'p' :
496
+                $this->showProgress = true;
497
+                $this->overriddenDefaults['showProgress'] = true;
498
+                break;
499
+            case 'm' :
500
+                $this->recordErrors = false;
501
+                $this->overriddenDefaults['recordErrors'] = true;
502
+                break;
503
+            case 'd' :
504
+                $ini = explode('=', $this->cliArgs[($pos + 1)]);
505
+                $this->cliArgs[($pos + 1)] = '';
506
+                if (isset($ini[1]) === true) {
507
+                    ini_set($ini[0], $ini[1]);
508
+                } else {
509
+                    ini_set($ini[0], true);
510
+                }
511
+                break;
512
+            case 'n' :
513
+                if (isset($this->overriddenDefaults['warningSeverity']) === false) {
514
+                    $this->warningSeverity = 0;
515
+                    $this->overriddenDefaults['warningSeverity'] = true;
516
+                }
517
+                break;
518
+            case 'w' :
519
+                if (isset($this->overriddenDefaults['warningSeverity']) === false) {
520
+                    $this->warningSeverity = $this->errorSeverity;
521
+                    $this->overriddenDefaults['warningSeverity'] = true;
522
+                }
523
+                break;
524
+            default:
525
+                if ($this->dieOnUnknownArg === false) {
526
+                    $this->values[$arg] = $arg;
527
+                } else {
528
+                    $this->processUnknownArgument('-'.$arg, $pos);
529
+                }
530 530
         }//end switch
531 531
 
532 532
     }//end processShortArgument()
@@ -543,151 +543,151 @@  discard block
 block discarded – undo
543 543
     public function processLongArgument($arg, $pos)
544 544
     {
545 545
         switch ($arg) {
546
-        case 'help':
547
-            $this->printUsage();
548
-            exit(0);
549
-        case 'version':
550
-            echo 'Symplify\PHP7_CodeSniffer version '.self::VERSION;
551
-            exit(0);
552
-        case 'cache':
553
-            if (defined('Symplify\PHP7_CodeSniffer_IN_TESTS') === false) {
554
-                $this->cache = true;
546
+            case 'help':
547
+                $this->printUsage();
548
+                exit(0);
549
+            case 'version':
550
+                echo 'Symplify\PHP7_CodeSniffer version '.self::VERSION;
551
+                exit(0);
552
+            case 'cache':
553
+                if (defined('Symplify\PHP7_CodeSniffer_IN_TESTS') === false) {
554
+                    $this->cache = true;
555
+                    $this->overriddenDefaults['cache'] = true;
556
+                }
557
+                break;
558
+            case 'no-cache':
559
+                $this->cache = false;
555 560
                 $this->overriddenDefaults['cache'] = true;
556
-            }
557
-            break;
558
-        case 'no-cache':
559
-            $this->cache = false;
560
-            $this->overriddenDefaults['cache'] = true;
561
-            break;
562
-        default:
563
-            if (substr($arg, 0, 7) === 'sniffs=') {
564
-                $sniffs = explode(',', substr($arg, 7));
565
-                foreach ($sniffs as $sniff) {
566
-                    if (substr_count($sniff, '.') !== 2) {
567
-                        echo 'ERROR: The specified sniff code "'.$sniff.'" is invalid'.PHP_EOL.PHP_EOL;
568
-                        $this->printUsage();
569
-                        exit(2);
561
+                break;
562
+            default:
563
+                if (substr($arg, 0, 7) === 'sniffs=') {
564
+                    $sniffs = explode(',', substr($arg, 7));
565
+                    foreach ($sniffs as $sniff) {
566
+                        if (substr_count($sniff, '.') !== 2) {
567
+                            echo 'ERROR: The specified sniff code "'.$sniff.'" is invalid'.PHP_EOL.PHP_EOL;
568
+                            $this->printUsage();
569
+                            exit(2);
570
+                        }
570 571
                     }
571
-                }
572
-
573
-                $this->sniffs = $sniffs;
574
-                $this->overriddenDefaults['sniffs'] = true;
575
-            } else if (substr($arg, 0, 11) === 'stdin-path=') {
576
-                $this->stdinPath = Util\Common::realpath(substr($arg, 11));
577 572
 
578
-                // It may not exist and return false instead, so use whatever they gave us.
579
-                if ($this->stdinPath === false) {
580
-                    $this->stdinPath = trim(substr($arg, 11));
581
-                }
582
-
583
-                $this->overriddenDefaults['stdinPath'] = true;
584
-            } else if (substr($arg, 0, 9) === 'basepath=') {
585
-                if (isset($this->overriddenDefaults['basepath']) === true) {
586
-                    break;
587
-                }
573
+                    $this->sniffs = $sniffs;
574
+                    $this->overriddenDefaults['sniffs'] = true;
575
+                } else if (substr($arg, 0, 11) === 'stdin-path=') {
576
+                    $this->stdinPath = Util\Common::realpath(substr($arg, 11));
588 577
 
589
-                $this->basepath = Util\Common::realpath(substr($arg, 9));
578
+                    // It may not exist and return false instead, so use whatever they gave us.
579
+                    if ($this->stdinPath === false) {
580
+                        $this->stdinPath = trim(substr($arg, 11));
581
+                    }
590 582
 
591
-                // It may not exist and return false instead.
592
-                if ($this->basepath === false) {
593
-                    $this->basepath = substr($arg, 9);
594
-                }
583
+                    $this->overriddenDefaults['stdinPath'] = true;
584
+                } else if (substr($arg, 0, 9) === 'basepath=') {
585
+                    if (isset($this->overriddenDefaults['basepath']) === true) {
586
+                        break;
587
+                    }
595 588
 
596
-                $this->overriddenDefaults['basepath'] = true;
589
+                    $this->basepath = Util\Common::realpath(substr($arg, 9));
597 590
 
598
-                if (is_dir($this->basepath) === false) {
599
-                    echo 'ERROR: The specified basepath "'.$this->basepath.'" points to a non-existent directory'.PHP_EOL.PHP_EOL;
600
-                    $this->printUsage();
601
-                    exit(2);
602
-                }
603
-            } else if (substr($arg, 0, 7) === 'filter=') {
604
-                if (isset($this->overriddenDefaults['filter']) === true) {
605
-                    break;
606
-                }
591
+                    // It may not exist and return false instead.
592
+                    if ($this->basepath === false) {
593
+                        $this->basepath = substr($arg, 9);
594
+                    }
607 595
 
608
-                $this->filter = substr($arg, 7);
609
-                $this->overriddenDefaults['filter'] = true;
610
-            } else if (substr($arg, 0, 9) === 'standard=') {
611
-                $standards = trim(substr($arg, 9));
612
-                if ($standards !== '') {
613
-                    $this->standards = explode(',', $standards);
614
-                }
596
+                    $this->overriddenDefaults['basepath'] = true;
615 597
 
616
-                $this->overriddenDefaults['standards'] = true;
617
-            } else if (substr($arg, 0, 11) === 'extensions=') {
618
-                $extensions    = explode(',', substr($arg, 11));
619
-                $newExtensions = array();
620
-                foreach ($extensions as $ext) {
621
-                    $slash = strpos($ext, '/');
622
-                    if ($slash !== false) {
623
-                        // They specified the tokenizer too.
624
-                        list($ext, $tokenizer) = explode('/', $ext);
625
-                        $newExtensions[$ext]   = strtoupper($tokenizer);
626
-                        continue;
598
+                    if (is_dir($this->basepath) === false) {
599
+                        echo 'ERROR: The specified basepath "'.$this->basepath.'" points to a non-existent directory'.PHP_EOL.PHP_EOL;
600
+                        $this->printUsage();
601
+                        exit(2);
602
+                    }
603
+                } else if (substr($arg, 0, 7) === 'filter=') {
604
+                    if (isset($this->overriddenDefaults['filter']) === true) {
605
+                        break;
627 606
                     }
628 607
 
629
-                    if (isset($this->extensions[$ext]) === true) {
630
-                        $newExtensions[$ext] = $this->extensions[$ext];
631
-                    } else {
632
-                        $newExtensions[$ext] = 'PHP';
608
+                    $this->filter = substr($arg, 7);
609
+                    $this->overriddenDefaults['filter'] = true;
610
+                } else if (substr($arg, 0, 9) === 'standard=') {
611
+                    $standards = trim(substr($arg, 9));
612
+                    if ($standards !== '') {
613
+                        $this->standards = explode(',', $standards);
633 614
                     }
634
-                }
635 615
 
636
-                $this->extensions = $newExtensions;
637
-                $this->overriddenDefaults['extensions'] = true;
638
-            } else if (substr($arg, 0, 7) === 'suffix=') {
639
-                $this->suffix = explode(',', substr($arg, 7));
640
-                $this->overriddenDefaults['suffix'] = true;
641
-            } else if (substr($arg, 0, 9) === 'severity=') {
642
-                $this->errorSeverity   = (int) substr($arg, 9);
643
-                $this->warningSeverity = $this->errorSeverity;
644
-                $this->overriddenDefaults['errorSeverity']   = true;
645
-                $this->overriddenDefaults['warningSeverity'] = true;
646
-            } else if (substr($arg, 0, 15) === 'error-severity=') {
647
-                $this->errorSeverity = (int) substr($arg, 15);
648
-                $this->overriddenDefaults['errorSeverity'] = true;
649
-            } else if (substr($arg, 0, 17) === 'warning-severity=') {
650
-                $this->warningSeverity = (int) substr($arg, 17);
651
-                $this->overriddenDefaults['warningSeverity'] = true;
652
-            } else if (substr($arg, 0, 7) === 'ignore=') {
653
-                // Split the ignore string on commas, unless the comma is escaped
654
-                // using 1 or 3 slashes (\, or \\\,).
655
-                $patterns = preg_split(
656
-                    '/(?<=(?<!\\\\)\\\\\\\\),|(?<!\\\\),/',
657
-                    substr($arg, 7)
658
-                );
659
-
660
-                $ignored = array();
661
-                foreach ($patterns as $pattern) {
662
-                    $pattern = trim($pattern);
663
-                    if ($pattern === '') {
664
-                        continue;
616
+                    $this->overriddenDefaults['standards'] = true;
617
+                } else if (substr($arg, 0, 11) === 'extensions=') {
618
+                    $extensions    = explode(',', substr($arg, 11));
619
+                    $newExtensions = array();
620
+                    foreach ($extensions as $ext) {
621
+                        $slash = strpos($ext, '/');
622
+                        if ($slash !== false) {
623
+                            // They specified the tokenizer too.
624
+                            list($ext, $tokenizer) = explode('/', $ext);
625
+                            $newExtensions[$ext]   = strtoupper($tokenizer);
626
+                            continue;
627
+                        }
628
+
629
+                        if (isset($this->extensions[$ext]) === true) {
630
+                            $newExtensions[$ext] = $this->extensions[$ext];
631
+                        } else {
632
+                            $newExtensions[$ext] = 'PHP';
633
+                        }
665 634
                     }
666 635
 
667
-                    $ignored[$pattern] = 'absolute';
668
-                }
636
+                    $this->extensions = $newExtensions;
637
+                    $this->overriddenDefaults['extensions'] = true;
638
+                } else if (substr($arg, 0, 7) === 'suffix=') {
639
+                    $this->suffix = explode(',', substr($arg, 7));
640
+                    $this->overriddenDefaults['suffix'] = true;
641
+                } else if (substr($arg, 0, 9) === 'severity=') {
642
+                    $this->errorSeverity   = (int) substr($arg, 9);
643
+                    $this->warningSeverity = $this->errorSeverity;
644
+                    $this->overriddenDefaults['errorSeverity']   = true;
645
+                    $this->overriddenDefaults['warningSeverity'] = true;
646
+                } else if (substr($arg, 0, 15) === 'error-severity=') {
647
+                    $this->errorSeverity = (int) substr($arg, 15);
648
+                    $this->overriddenDefaults['errorSeverity'] = true;
649
+                } else if (substr($arg, 0, 17) === 'warning-severity=') {
650
+                    $this->warningSeverity = (int) substr($arg, 17);
651
+                    $this->overriddenDefaults['warningSeverity'] = true;
652
+                } else if (substr($arg, 0, 7) === 'ignore=') {
653
+                    // Split the ignore string on commas, unless the comma is escaped
654
+                    // using 1 or 3 slashes (\, or \\\,).
655
+                    $patterns = preg_split(
656
+                        '/(?<=(?<!\\\\)\\\\\\\\),|(?<!\\\\),/',
657
+                        substr($arg, 7)
658
+                    );
659
+
660
+                    $ignored = array();
661
+                    foreach ($patterns as $pattern) {
662
+                        $pattern = trim($pattern);
663
+                        if ($pattern === '') {
664
+                            continue;
665
+                        }
669 666
 
670
-                $this->ignored = $ignored;
671
-                $this->overriddenDefaults['ignored'] = true;
672
-            } else if (substr($arg, 0, 10) === 'tab-width=') {
673
-                $this->tabWidth = (int) substr($arg, 10);
674
-                $this->overriddenDefaults['tabWidth'] = true;
675
-            } else {
676
-                if ($this->dieOnUnknownArg === false) {
677
-                    $eqPos = strpos($arg, '=');
678
-                    if ($eqPos === false) {
679
-                        $this->values[$arg] = $arg;
680
-                    } else {
681
-                        $value = substr($arg, ($eqPos + 1));
682
-                        $arg   = substr($arg, 0, $eqPos);
683
-                        $this->values[$arg] = $value;
667
+                        $ignored[$pattern] = 'absolute';
684 668
                     }
669
+
670
+                    $this->ignored = $ignored;
671
+                    $this->overriddenDefaults['ignored'] = true;
672
+                } else if (substr($arg, 0, 10) === 'tab-width=') {
673
+                    $this->tabWidth = (int) substr($arg, 10);
674
+                    $this->overriddenDefaults['tabWidth'] = true;
685 675
                 } else {
686
-                    $this->processUnknownArgument('--'.$arg, $pos);
687
-                }
688
-            }//end if
676
+                    if ($this->dieOnUnknownArg === false) {
677
+                        $eqPos = strpos($arg, '=');
678
+                        if ($eqPos === false) {
679
+                            $this->values[$arg] = $arg;
680
+                        } else {
681
+                            $value = substr($arg, ($eqPos + 1));
682
+                            $arg   = substr($arg, 0, $eqPos);
683
+                            $this->values[$arg] = $value;
684
+                        }
685
+                    } else {
686
+                        $this->processUnknownArgument('--'.$arg, $pos);
687
+                    }
688
+                }//end if
689 689
 
690
-            break;
690
+                break;
691 691
         }//end switch
692 692
 
693 693
     }//end processLongArgument()
Please login to merge, or discard this patch.