@@ -890,26 +890,26 @@ |
||
| 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) { |
@@ -1209,88 +1209,88 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | |
@@ -607,19 +607,19 @@ |
||
| 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 |
@@ -343,15 +343,15 @@ |
||
| 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) { |
@@ -283,14 +283,14 @@ |
||
| 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 | } |
@@ -1450,24 +1450,24 @@ discard block |
||
| 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 |
||
| 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']); |
@@ -406,60 +406,60 @@ |
||
| 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 | |
@@ -184,35 +184,35 @@ discard block |
||
| 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; |
@@ -471,68 +471,68 @@ discard block |
||
| 471 | 471 | public function processShortArgument($arg, $pos) |
| 472 | 472 | { |
| 473 | 473 | switch ($arg) { |
| 474 | - case 'h': |
|
| 475 | - case '?': |
|
| 476 | - $this->printUsage(); |
|
| 477 | - exit(0); |
|
| 478 | - case 'i' : |
|
| 479 | - Util\Standards::printInstalledStandards(); |
|
| 480 | - exit(0); |
|
| 481 | - case 'v' : |
|
| 482 | - $this->verbosity++; |
|
| 483 | - $this->overriddenDefaults['verbosity'] = true; |
|
| 484 | - break; |
|
| 485 | - case 'l' : |
|
| 486 | - $this->local = true; |
|
| 487 | - $this->overriddenDefaults['local'] = true; |
|
| 488 | - break; |
|
| 489 | - case 's' : |
|
| 490 | - $this->showSources = true; |
|
| 491 | - $this->overriddenDefaults['showSources'] = true; |
|
| 492 | - break; |
|
| 493 | - case 'a' : |
|
| 494 | - $this->interactive = true; |
|
| 495 | - $this->overriddenDefaults['interactive'] = true; |
|
| 496 | - break; |
|
| 497 | - case 'e': |
|
| 498 | - $this->explain = true; |
|
| 499 | - $this->overriddenDefaults['explain'] = true; |
|
| 500 | - break; |
|
| 501 | - case 'p' : |
|
| 502 | - $this->showProgress = true; |
|
| 503 | - $this->overriddenDefaults['showProgress'] = true; |
|
| 504 | - break; |
|
| 505 | - case 'm' : |
|
| 506 | - $this->recordErrors = false; |
|
| 507 | - $this->overriddenDefaults['recordErrors'] = true; |
|
| 508 | - break; |
|
| 509 | - case 'd' : |
|
| 510 | - $ini = explode('=', $this->cliArgs[($pos + 1)]); |
|
| 511 | - $this->cliArgs[($pos + 1)] = ''; |
|
| 512 | - if (isset($ini[1]) === true) { |
|
| 513 | - ini_set($ini[0], $ini[1]); |
|
| 514 | - } else { |
|
| 515 | - ini_set($ini[0], true); |
|
| 516 | - } |
|
| 517 | - break; |
|
| 518 | - case 'n' : |
|
| 519 | - if (isset($this->overriddenDefaults['warningSeverity']) === false) { |
|
| 520 | - $this->warningSeverity = 0; |
|
| 521 | - $this->overriddenDefaults['warningSeverity'] = true; |
|
| 522 | - } |
|
| 523 | - break; |
|
| 524 | - case 'w' : |
|
| 525 | - if (isset($this->overriddenDefaults['warningSeverity']) === false) { |
|
| 526 | - $this->warningSeverity = $this->errorSeverity; |
|
| 527 | - $this->overriddenDefaults['warningSeverity'] = true; |
|
| 528 | - } |
|
| 529 | - break; |
|
| 530 | - default: |
|
| 531 | - if ($this->dieOnUnknownArg === false) { |
|
| 532 | - $this->values[$arg] = $arg; |
|
| 533 | - } else { |
|
| 534 | - $this->processUnknownArgument('-'.$arg, $pos); |
|
| 535 | - } |
|
| 474 | + case 'h': |
|
| 475 | + case '?': |
|
| 476 | + $this->printUsage(); |
|
| 477 | + exit(0); |
|
| 478 | + case 'i' : |
|
| 479 | + Util\Standards::printInstalledStandards(); |
|
| 480 | + exit(0); |
|
| 481 | + case 'v' : |
|
| 482 | + $this->verbosity++; |
|
| 483 | + $this->overriddenDefaults['verbosity'] = true; |
|
| 484 | + break; |
|
| 485 | + case 'l' : |
|
| 486 | + $this->local = true; |
|
| 487 | + $this->overriddenDefaults['local'] = true; |
|
| 488 | + break; |
|
| 489 | + case 's' : |
|
| 490 | + $this->showSources = true; |
|
| 491 | + $this->overriddenDefaults['showSources'] = true; |
|
| 492 | + break; |
|
| 493 | + case 'a' : |
|
| 494 | + $this->interactive = true; |
|
| 495 | + $this->overriddenDefaults['interactive'] = true; |
|
| 496 | + break; |
|
| 497 | + case 'e': |
|
| 498 | + $this->explain = true; |
|
| 499 | + $this->overriddenDefaults['explain'] = true; |
|
| 500 | + break; |
|
| 501 | + case 'p' : |
|
| 502 | + $this->showProgress = true; |
|
| 503 | + $this->overriddenDefaults['showProgress'] = true; |
|
| 504 | + break; |
|
| 505 | + case 'm' : |
|
| 506 | + $this->recordErrors = false; |
|
| 507 | + $this->overriddenDefaults['recordErrors'] = true; |
|
| 508 | + break; |
|
| 509 | + case 'd' : |
|
| 510 | + $ini = explode('=', $this->cliArgs[($pos + 1)]); |
|
| 511 | + $this->cliArgs[($pos + 1)] = ''; |
|
| 512 | + if (isset($ini[1]) === true) { |
|
| 513 | + ini_set($ini[0], $ini[1]); |
|
| 514 | + } else { |
|
| 515 | + ini_set($ini[0], true); |
|
| 516 | + } |
|
| 517 | + break; |
|
| 518 | + case 'n' : |
|
| 519 | + if (isset($this->overriddenDefaults['warningSeverity']) === false) { |
|
| 520 | + $this->warningSeverity = 0; |
|
| 521 | + $this->overriddenDefaults['warningSeverity'] = true; |
|
| 522 | + } |
|
| 523 | + break; |
|
| 524 | + case 'w' : |
|
| 525 | + if (isset($this->overriddenDefaults['warningSeverity']) === false) { |
|
| 526 | + $this->warningSeverity = $this->errorSeverity; |
|
| 527 | + $this->overriddenDefaults['warningSeverity'] = true; |
|
| 528 | + } |
|
| 529 | + break; |
|
| 530 | + default: |
|
| 531 | + if ($this->dieOnUnknownArg === false) { |
|
| 532 | + $this->values[$arg] = $arg; |
|
| 533 | + } else { |
|
| 534 | + $this->processUnknownArgument('-'.$arg, $pos); |
|
| 535 | + } |
|
| 536 | 536 | }//end switch |
| 537 | 537 | |
| 538 | 538 | }//end processShortArgument() |
@@ -549,167 +549,167 @@ discard block |
||
| 549 | 549 | public function processLongArgument($arg, $pos) |
| 550 | 550 | { |
| 551 | 551 | switch ($arg) { |
| 552 | - case 'help': |
|
| 553 | - $this->printUsage(); |
|
| 554 | - exit(0); |
|
| 555 | - case 'version': |
|
| 556 | - echo 'Symplify\PHP7_CodeSniffer version '.self::VERSION; |
|
| 557 | - exit(0); |
|
| 558 | - case 'cache': |
|
| 559 | - if (defined('Symplify\PHP7_CodeSniffer_IN_TESTS') === false) { |
|
| 560 | - $this->cache = true; |
|
| 552 | + case 'help': |
|
| 553 | + $this->printUsage(); |
|
| 554 | + exit(0); |
|
| 555 | + case 'version': |
|
| 556 | + echo 'Symplify\PHP7_CodeSniffer version '.self::VERSION; |
|
| 557 | + exit(0); |
|
| 558 | + case 'cache': |
|
| 559 | + if (defined('Symplify\PHP7_CodeSniffer_IN_TESTS') === false) { |
|
| 560 | + $this->cache = true; |
|
| 561 | + $this->overriddenDefaults['cache'] = true; |
|
| 562 | + } |
|
| 563 | + break; |
|
| 564 | + case 'no-cache': |
|
| 565 | + $this->cache = false; |
|
| 561 | 566 | $this->overriddenDefaults['cache'] = true; |
| 562 | - } |
|
| 563 | - break; |
|
| 564 | - case 'no-cache': |
|
| 565 | - $this->cache = false; |
|
| 566 | - $this->overriddenDefaults['cache'] = true; |
|
| 567 | - break; |
|
| 568 | - default: |
|
| 569 | - if (substr($arg, 0, 7) === 'sniffs=') { |
|
| 570 | - $sniffs = explode(',', substr($arg, 7)); |
|
| 571 | - foreach ($sniffs as $sniff) { |
|
| 572 | - if (substr_count($sniff, '.') !== 2) { |
|
| 573 | - echo 'ERROR: The specified sniff code "'.$sniff.'" is invalid'.PHP_EOL.PHP_EOL; |
|
| 574 | - $this->printUsage(); |
|
| 575 | - exit(2); |
|
| 567 | + break; |
|
| 568 | + default: |
|
| 569 | + if (substr($arg, 0, 7) === 'sniffs=') { |
|
| 570 | + $sniffs = explode(',', substr($arg, 7)); |
|
| 571 | + foreach ($sniffs as $sniff) { |
|
| 572 | + if (substr_count($sniff, '.') !== 2) { |
|
| 573 | + echo 'ERROR: The specified sniff code "'.$sniff.'" is invalid'.PHP_EOL.PHP_EOL; |
|
| 574 | + $this->printUsage(); |
|
| 575 | + exit(2); |
|
| 576 | + } |
|
| 576 | 577 | } |
| 577 | - } |
|
| 578 | 578 | |
| 579 | - $this->sniffs = $sniffs; |
|
| 580 | - $this->overriddenDefaults['sniffs'] = true; |
|
| 581 | - } else if (substr($arg, 0, 10) === 'bootstrap=') { |
|
| 582 | - $files = explode(',', substr($arg, 10)); |
|
| 583 | - $bootstrap = array(); |
|
| 584 | - foreach ($files as $file) { |
|
| 585 | - $path = Util\Common::realpath($file); |
|
| 586 | - if ($path === false) { |
|
| 587 | - echo 'ERROR: The specified bootstrap file "'.$file.'" does not exist'.PHP_EOL.PHP_EOL; |
|
| 588 | - $this->printUsage(); |
|
| 589 | - exit(2); |
|
| 579 | + $this->sniffs = $sniffs; |
|
| 580 | + $this->overriddenDefaults['sniffs'] = true; |
|
| 581 | + } else if (substr($arg, 0, 10) === 'bootstrap=') { |
|
| 582 | + $files = explode(',', substr($arg, 10)); |
|
| 583 | + $bootstrap = array(); |
|
| 584 | + foreach ($files as $file) { |
|
| 585 | + $path = Util\Common::realpath($file); |
|
| 586 | + if ($path === false) { |
|
| 587 | + echo 'ERROR: The specified bootstrap file "'.$file.'" does not exist'.PHP_EOL.PHP_EOL; |
|
| 588 | + $this->printUsage(); |
|
| 589 | + exit(2); |
|
| 590 | + } |
|
| 591 | + |
|
| 592 | + $bootstrap[] = $path; |
|
| 590 | 593 | } |
| 591 | 594 | |
| 592 | - $bootstrap[] = $path; |
|
| 593 | - } |
|
| 595 | + $this->bootstrap = array_merge($this->bootstrap, $bootstrap); |
|
| 596 | + $this->overriddenDefaults['bootstrap'] = true; |
|
| 597 | + } else if (substr($arg, 0, 11) === 'stdin-path=') { |
|
| 598 | + $this->stdinPath = Util\Common::realpath(substr($arg, 11)); |
|
| 594 | 599 | |
| 595 | - $this->bootstrap = array_merge($this->bootstrap, $bootstrap); |
|
| 596 | - $this->overriddenDefaults['bootstrap'] = true; |
|
| 597 | - } else if (substr($arg, 0, 11) === 'stdin-path=') { |
|
| 598 | - $this->stdinPath = Util\Common::realpath(substr($arg, 11)); |
|
| 600 | + // It may not exist and return false instead, so use whatever they gave us. |
|
| 601 | + if ($this->stdinPath === false) { |
|
| 602 | + $this->stdinPath = trim(substr($arg, 11)); |
|
| 603 | + } |
|
| 599 | 604 | |
| 600 | - // It may not exist and return false instead, so use whatever they gave us. |
|
| 601 | - if ($this->stdinPath === false) { |
|
| 602 | - $this->stdinPath = trim(substr($arg, 11)); |
|
| 603 | - } |
|
| 605 | + $this->overriddenDefaults['stdinPath'] = true; |
|
| 606 | + } else if (substr($arg, 0, 9) === 'basepath=') { |
|
| 607 | + if (isset($this->overriddenDefaults['basepath']) === true) { |
|
| 608 | + break; |
|
| 609 | + } |
|
| 604 | 610 | |
| 605 | - $this->overriddenDefaults['stdinPath'] = true; |
|
| 606 | - } else if (substr($arg, 0, 9) === 'basepath=') { |
|
| 607 | - if (isset($this->overriddenDefaults['basepath']) === true) { |
|
| 608 | - break; |
|
| 609 | - } |
|
| 611 | + $this->basepath = Util\Common::realpath(substr($arg, 9)); |
|
| 610 | 612 | |
| 611 | - $this->basepath = Util\Common::realpath(substr($arg, 9)); |
|
| 613 | + // It may not exist and return false instead. |
|
| 614 | + if ($this->basepath === false) { |
|
| 615 | + $this->basepath = substr($arg, 9); |
|
| 616 | + } |
|
| 612 | 617 | |
| 613 | - // It may not exist and return false instead. |
|
| 614 | - if ($this->basepath === false) { |
|
| 615 | - $this->basepath = substr($arg, 9); |
|
| 616 | - } |
|
| 618 | + $this->overriddenDefaults['basepath'] = true; |
|
| 617 | 619 | |
| 618 | - $this->overriddenDefaults['basepath'] = true; |
|
| 620 | + if (is_dir($this->basepath) === false) { |
|
| 621 | + echo 'ERROR: The specified basepath "'.$this->basepath.'" points to a non-existent directory'.PHP_EOL.PHP_EOL; |
|
| 622 | + $this->printUsage(); |
|
| 623 | + exit(2); |
|
| 624 | + } |
|
| 625 | + } else if (substr($arg, 0, 7) === 'filter=') { |
|
| 626 | + if (isset($this->overriddenDefaults['filter']) === true) { |
|
| 627 | + break; |
|
| 628 | + } |
|
| 619 | 629 | |
| 620 | - if (is_dir($this->basepath) === false) { |
|
| 621 | - echo 'ERROR: The specified basepath "'.$this->basepath.'" points to a non-existent directory'.PHP_EOL.PHP_EOL; |
|
| 622 | - $this->printUsage(); |
|
| 623 | - exit(2); |
|
| 624 | - } |
|
| 625 | - } else if (substr($arg, 0, 7) === 'filter=') { |
|
| 626 | - if (isset($this->overriddenDefaults['filter']) === true) { |
|
| 627 | - break; |
|
| 628 | - } |
|
| 630 | + $this->filter = substr($arg, 7); |
|
| 631 | + $this->overriddenDefaults['filter'] = true; |
|
| 632 | + } else if (substr($arg, 0, 9) === 'standard=') { |
|
| 633 | + $standards = trim(substr($arg, 9)); |
|
| 634 | + if ($standards !== '') { |
|
| 635 | + $this->standards = explode(',', $standards); |
|
| 636 | + } |
|
| 629 | 637 | |
| 630 | - $this->filter = substr($arg, 7); |
|
| 631 | - $this->overriddenDefaults['filter'] = true; |
|
| 632 | - } else if (substr($arg, 0, 9) === 'standard=') { |
|
| 633 | - $standards = trim(substr($arg, 9)); |
|
| 634 | - if ($standards !== '') { |
|
| 635 | - $this->standards = explode(',', $standards); |
|
| 636 | - } |
|
| 638 | + $this->overriddenDefaults['standards'] = true; |
|
| 639 | + } else if (substr($arg, 0, 11) === 'extensions=') { |
|
| 640 | + $extensions = explode(',', substr($arg, 11)); |
|
| 641 | + $newExtensions = array(); |
|
| 642 | + foreach ($extensions as $ext) { |
|
| 643 | + $slash = strpos($ext, '/'); |
|
| 644 | + if ($slash !== false) { |
|
| 645 | + // They specified the tokenizer too. |
|
| 646 | + list($ext, $tokenizer) = explode('/', $ext); |
|
| 647 | + $newExtensions[$ext] = strtoupper($tokenizer); |
|
| 648 | + continue; |
|
| 649 | + } |
|
| 637 | 650 | |
| 638 | - $this->overriddenDefaults['standards'] = true; |
|
| 639 | - } else if (substr($arg, 0, 11) === 'extensions=') { |
|
| 640 | - $extensions = explode(',', substr($arg, 11)); |
|
| 641 | - $newExtensions = array(); |
|
| 642 | - foreach ($extensions as $ext) { |
|
| 643 | - $slash = strpos($ext, '/'); |
|
| 644 | - if ($slash !== false) { |
|
| 645 | - // They specified the tokenizer too. |
|
| 646 | - list($ext, $tokenizer) = explode('/', $ext); |
|
| 647 | - $newExtensions[$ext] = strtoupper($tokenizer); |
|
| 648 | - continue; |
|
| 651 | + if (isset($this->extensions[$ext]) === true) { |
|
| 652 | + $newExtensions[$ext] = $this->extensions[$ext]; |
|
| 653 | + } else { |
|
| 654 | + $newExtensions[$ext] = 'PHP'; |
|
| 655 | + } |
|
| 649 | 656 | } |
| 650 | 657 | |
| 651 | - if (isset($this->extensions[$ext]) === true) { |
|
| 652 | - $newExtensions[$ext] = $this->extensions[$ext]; |
|
| 653 | - } else { |
|
| 654 | - $newExtensions[$ext] = 'PHP'; |
|
| 655 | - } |
|
| 656 | - } |
|
| 658 | + $this->extensions = $newExtensions; |
|
| 659 | + $this->overriddenDefaults['extensions'] = true; |
|
| 660 | + } else if (substr($arg, 0, 7) === 'suffix=') { |
|
| 661 | + $this->suffix = explode(',', substr($arg, 7)); |
|
| 662 | + $this->overriddenDefaults['suffix'] = true; |
|
| 663 | + } else if (substr($arg, 0, 9) === 'severity=') { |
|
| 664 | + $this->errorSeverity = (int) substr($arg, 9); |
|
| 665 | + $this->warningSeverity = $this->errorSeverity; |
|
| 666 | + $this->overriddenDefaults['errorSeverity'] = true; |
|
| 667 | + $this->overriddenDefaults['warningSeverity'] = true; |
|
| 668 | + } else if (substr($arg, 0, 15) === 'error-severity=') { |
|
| 669 | + $this->errorSeverity = (int) substr($arg, 15); |
|
| 670 | + $this->overriddenDefaults['errorSeverity'] = true; |
|
| 671 | + } else if (substr($arg, 0, 17) === 'warning-severity=') { |
|
| 672 | + $this->warningSeverity = (int) substr($arg, 17); |
|
| 673 | + $this->overriddenDefaults['warningSeverity'] = true; |
|
| 674 | + } else if (substr($arg, 0, 7) === 'ignore=') { |
|
| 675 | + // Split the ignore string on commas, unless the comma is escaped |
|
| 676 | + // using 1 or 3 slashes (\, or \\\,). |
|
| 677 | + $patterns = preg_split( |
|
| 678 | + '/(?<=(?<!\\\\)\\\\\\\\),|(?<!\\\\),/', |
|
| 679 | + substr($arg, 7) |
|
| 680 | + ); |
|
| 681 | + |
|
| 682 | + $ignored = array(); |
|
| 683 | + foreach ($patterns as $pattern) { |
|
| 684 | + $pattern = trim($pattern); |
|
| 685 | + if ($pattern === '') { |
|
| 686 | + continue; |
|
| 687 | + } |
|
| 657 | 688 | |
| 658 | - $this->extensions = $newExtensions; |
|
| 659 | - $this->overriddenDefaults['extensions'] = true; |
|
| 660 | - } else if (substr($arg, 0, 7) === 'suffix=') { |
|
| 661 | - $this->suffix = explode(',', substr($arg, 7)); |
|
| 662 | - $this->overriddenDefaults['suffix'] = true; |
|
| 663 | - } else if (substr($arg, 0, 9) === 'severity=') { |
|
| 664 | - $this->errorSeverity = (int) substr($arg, 9); |
|
| 665 | - $this->warningSeverity = $this->errorSeverity; |
|
| 666 | - $this->overriddenDefaults['errorSeverity'] = true; |
|
| 667 | - $this->overriddenDefaults['warningSeverity'] = true; |
|
| 668 | - } else if (substr($arg, 0, 15) === 'error-severity=') { |
|
| 669 | - $this->errorSeverity = (int) substr($arg, 15); |
|
| 670 | - $this->overriddenDefaults['errorSeverity'] = true; |
|
| 671 | - } else if (substr($arg, 0, 17) === 'warning-severity=') { |
|
| 672 | - $this->warningSeverity = (int) substr($arg, 17); |
|
| 673 | - $this->overriddenDefaults['warningSeverity'] = true; |
|
| 674 | - } else if (substr($arg, 0, 7) === 'ignore=') { |
|
| 675 | - // Split the ignore string on commas, unless the comma is escaped |
|
| 676 | - // using 1 or 3 slashes (\, or \\\,). |
|
| 677 | - $patterns = preg_split( |
|
| 678 | - '/(?<=(?<!\\\\)\\\\\\\\),|(?<!\\\\),/', |
|
| 679 | - substr($arg, 7) |
|
| 680 | - ); |
|
| 681 | - |
|
| 682 | - $ignored = array(); |
|
| 683 | - foreach ($patterns as $pattern) { |
|
| 684 | - $pattern = trim($pattern); |
|
| 685 | - if ($pattern === '') { |
|
| 686 | - continue; |
|
| 689 | + $ignored[$pattern] = 'absolute'; |
|
| 687 | 690 | } |
| 688 | 691 | |
| 689 | - $ignored[$pattern] = 'absolute'; |
|
| 690 | - } |
|
| 691 | - |
|
| 692 | - $this->ignored = $ignored; |
|
| 693 | - $this->overriddenDefaults['ignored'] = true; |
|
| 694 | - } else if (substr($arg, 0, 10) === 'tab-width=') { |
|
| 695 | - $this->tabWidth = (int) substr($arg, 10); |
|
| 696 | - $this->overriddenDefaults['tabWidth'] = true; |
|
| 697 | - } else { |
|
| 698 | - if ($this->dieOnUnknownArg === false) { |
|
| 699 | - $eqPos = strpos($arg, '='); |
|
| 700 | - if ($eqPos === false) { |
|
| 701 | - $this->values[$arg] = $arg; |
|
| 692 | + $this->ignored = $ignored; |
|
| 693 | + $this->overriddenDefaults['ignored'] = true; |
|
| 694 | + } else if (substr($arg, 0, 10) === 'tab-width=') { |
|
| 695 | + $this->tabWidth = (int) substr($arg, 10); |
|
| 696 | + $this->overriddenDefaults['tabWidth'] = true; |
|
| 697 | + } else { |
|
| 698 | + if ($this->dieOnUnknownArg === false) { |
|
| 699 | + $eqPos = strpos($arg, '='); |
|
| 700 | + if ($eqPos === false) { |
|
| 701 | + $this->values[$arg] = $arg; |
|
| 702 | + } else { |
|
| 703 | + $value = substr($arg, ($eqPos + 1)); |
|
| 704 | + $arg = substr($arg, 0, $eqPos); |
|
| 705 | + $this->values[$arg] = $value; |
|
| 706 | + } |
|
| 702 | 707 | } else { |
| 703 | - $value = substr($arg, ($eqPos + 1)); |
|
| 704 | - $arg = substr($arg, 0, $eqPos); |
|
| 705 | - $this->values[$arg] = $value; |
|
| 708 | + $this->processUnknownArgument('--'.$arg, $pos); |
|
| 706 | 709 | } |
| 707 | - } else { |
|
| 708 | - $this->processUnknownArgument('--'.$arg, $pos); |
|
| 709 | - } |
|
| 710 | - }//end if |
|
| 710 | + }//end if |
|
| 711 | 711 | |
| 712 | - break; |
|
| 712 | + break; |
|
| 713 | 713 | }//end switch |
| 714 | 714 | |
| 715 | 715 | }//end processLongArgument() |