From 8d8a8cc3309962d50c1efe3b508de32a800377b2 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Tue, 7 Mar 2017 13:52:40 +0100 Subject: [PATCH] TASK: Adjust flow * Reduce indentation by introducing guards to code. --- .../Sniffs/Legacy/ClassnamesSniff.php | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/src/Standards/Typo3Update/Sniffs/Legacy/ClassnamesSniff.php b/src/Standards/Typo3Update/Sniffs/Legacy/ClassnamesSniff.php index 2cf11d0..bae9950 100644 --- a/src/Standards/Typo3Update/Sniffs/Legacy/ClassnamesSniff.php +++ b/src/Standards/Typo3Update/Sniffs/Legacy/ClassnamesSniff.php @@ -72,32 +72,35 @@ class Typo3Update_Sniffs_Legacy_ClassnamesSniff implements PHP_CodeSniffer_Sniff { $tokens = $phpcsFile->getTokens(); $classnamePosition = $phpcsFile->findNext(T_STRING, $stackPtr); - $classname = $tokens[$classnamePosition]['content']; - if ($classnamePosition === false) { return; } + $classname = $tokens[$classnamePosition]['content']; - if ($this->isLegacyClassname($classname)) { - $fix = $phpcsFile->addFixableError( - 'Legacy classes are not allowed; found %s', - $classnamePosition, - 'legacyClassname', - [$classname] - ); + if ($this->isLegacyClassname($classname) === false) { + return; + } - if ($fix === true) { - switch ($tokens[$stackPtr]['code']) { - case T_EXTENDS: - case T_IMPLEMENTS: - $phpcsFile->fixer->replaceToken($classnamePosition, '\\' . $this->getNewClassname($classname)); - break; + $fix = $phpcsFile->addFixableError( + 'Legacy classes are not allowed; found %s', + $classnamePosition, + 'legacyClassname', + [$classname] + ); - default: + if ($fix === false) { + return; + } - break; - } - } + switch ($tokens[$stackPtr]['code']) { + case T_EXTENDS: + case T_IMPLEMENTS: + $phpcsFile->fixer->replaceToken($classnamePosition, '\\' . $this->getNewClassname($classname)); + break; + + default: + + break; } }