Skip to content

Squiz/SwitchDeclaration: remove duplicate strtoupper($type) calls #1490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ntdiary wants to merge 1 commit into
base: 4.x
Choose a base branch
from
+9 −7
Open

Squiz/SwitchDeclaration: remove duplicate strtoupper($type) calls #1490

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,15 @@ public function process(File $phpcsFile, int $stackPtr)
$caseCount++;
}

$typeUc = strtoupper($type);

if ($tokens[$nextCase]['content'] !== strtolower($tokens[$nextCase]['content'])) {
$expected = strtolower($tokens[$nextCase]['content']);
$error = '%3$s keyword must be lowercase; expected "%1$s" but found "%2$s"';
$data = [
$expected,
$tokens[$nextCase]['content'],
strtoupper($type),
$typeUc,
];

$fix = $phpcsFile->addFixableError($error, $nextCase, $type . 'NotLower', $data);
Expand All @@ -110,7 +112,7 @@ public function process(File $phpcsFile, int $stackPtr)
$beforeCase = $phpcsFile->findPrevious(T_WHITESPACE, ($nextCase - 1), null, true);
if ($tokens[$beforeCase]['line'] === $tokens[$nextCase]['line']) {
$error = '%s statement must be on a line by itself. Found content before';
$fix = $phpcsFile->addFixableError($error, $nextCase, 'ContentBefore' . $type, [strtoupper($type)]);
$fix = $phpcsFile->addFixableError($error, $nextCase, 'ContentBefore' . $type, [$typeUc]);

if ($fix === true) {
$padding = str_repeat(' ', ($caseAlignment - 1));
Expand All @@ -123,7 +125,7 @@ public function process(File $phpcsFile, int $stackPtr)
} elseif ($tokens[$nextCase]['column'] !== $caseAlignment) {
$error = '%s keyword must be indented %s spaces from SWITCH keyword';
$data = [
strtoupper($type),
$typeUc,
$this->indent,
];
$fix = $phpcsFile->addFixableError($error, $nextCase, $type . 'Indent', $data);
Expand All @@ -150,7 +152,7 @@ public function process(File $phpcsFile, int $stackPtr)
if ($tokens[$opener]['code'] === T_CLOSE_TAG) {
$error = 'There should be a colon before the PHP close tag to end the %s statement';
$code = 'WrongOpener' . $type;
$data = [strtoupper($type)];
$data = [$typeUc];

$fix = $phpcsFile->addFixableError($error, $nextCase, $code, $data);
if ($fix === true) {
Expand All @@ -161,7 +163,7 @@ public function process(File $phpcsFile, int $stackPtr)

if ($tokens[($opener - 1)]['type'] === 'T_WHITESPACE') {
$error = 'There must be no space before the colon in a %s statement';
$fix = $phpcsFile->addFixableError($error, $nextCase, 'SpaceBeforeColon' . $type, [strtoupper($type)]);
$fix = $phpcsFile->addFixableError($error, $nextCase, 'SpaceBeforeColon' . $type, [$typeUc]);
if ($fix === true) {
$phpcsFile->fixer->replaceToken(($opener - 1), '');
}
Expand Down Expand Up @@ -307,7 +309,7 @@ public function process(File $phpcsFile, int $stackPtr)

if ($nextLine === $caseLine) {
$error = '%s statement must be on a line by itself. Found content after';
$fix = $phpcsFile->addFixableError($error, $opener, 'ContentAfter' . $type, [strtoupper($type)]);
$fix = $phpcsFile->addFixableError($error, $opener, 'ContentAfter' . $type, [$typeUc]);
if ($fix === true) {
$padding = str_repeat(' ', ($caseAlignment - 1 + $this->indent));
if ($tokens[($i - 1)]['code'] === T_WHITESPACE) {
Expand All @@ -318,7 +320,7 @@ public function process(File $phpcsFile, int $stackPtr)
}
} elseif (($nextLine - $caseLine) > 1) {
$error = 'Blank lines are not allowed after %s statements';
$phpcsFile->addError($error, $nextCase, 'SpacingAfter' . $type, [strtoupper($type)]);
$phpcsFile->addError($error, $nextCase, 'SpacingAfter' . $type, [$typeUc]);
}
}

Expand Down
Loading