Merge pull request #28 from DanielSiepmann/feature/refactor-common-process-method
Feature/refactor common process method
This commit is contained in:
commit
85950cb181
7 changed files with 26 additions and 128 deletions
|
@ -21,7 +21,6 @@ namespace Typo3Update\Sniffs\LegacyClassnames;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use PHP_CodeSniffer_File as PhpcsFile;
|
use PHP_CodeSniffer_File as PhpcsFile;
|
||||||
use PHP_CodeSniffer_Tokens as Tokens;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provide common uses for all sniffs, regarding class name checks.
|
* Provide common uses for all sniffs, regarding class name checks.
|
||||||
|
@ -57,6 +56,32 @@ trait ClassnameCheckerTrait
|
||||||
$this->legacyClassnames = $legacyClassnames['aliasToClassNameMapping'];
|
$this->legacyClassnames = $legacyClassnames['aliasToClassNameMapping'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Processes the tokens that this sniff is interested in.
|
||||||
|
*
|
||||||
|
* This is the default implementation, as most of the time next T_STRING is
|
||||||
|
* the class name. This way only the register method has to be registered
|
||||||
|
* in default cases.
|
||||||
|
*
|
||||||
|
* @param PHP_CodeSniffer_File $phpcsFile The file where the token was found.
|
||||||
|
* @param int $stackPtr The position in the stack where
|
||||||
|
* the token was found.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function process(PhpcsFile $phpcsFile, $stackPtr)
|
||||||
|
{
|
||||||
|
$tokens = $phpcsFile->getTokens();
|
||||||
|
|
||||||
|
$classnamePosition = $phpcsFile->findNext(T_STRING, $stackPtr);
|
||||||
|
if ($classnamePosition === false) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$classname = $tokens[$classnamePosition]['content'];
|
||||||
|
$this->addFixableError($phpcsFile, $classnamePosition, $classname);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks whether a mapping exists for the given $classname,
|
* Checks whether a mapping exists for the given $classname,
|
||||||
* indicating it's legacy.
|
* indicating it's legacy.
|
||||||
|
|
|
@ -38,25 +38,4 @@ class Typo3Update_Sniffs_LegacyClassnames_InheritanceSniff implements PHP_CodeSn
|
||||||
T_IMPLEMENTS,
|
T_IMPLEMENTS,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Processes the tokens that this sniff is interested in.
|
|
||||||
*
|
|
||||||
* @param PHP_CodeSniffer_File $phpcsFile The file where the token was found.
|
|
||||||
* @param int $stackPtr The position in the stack where
|
|
||||||
* the token was found.
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
|
|
||||||
{
|
|
||||||
$tokens = $phpcsFile->getTokens();
|
|
||||||
$classnamePosition = $phpcsFile->findNext(T_STRING, $stackPtr);
|
|
||||||
if ($classnamePosition === false) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$classname = $tokens[$classnamePosition]['content'];
|
|
||||||
|
|
||||||
$this->addFixableError($phpcsFile, $classnamePosition, $classname);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,25 +37,4 @@ class Typo3Update_Sniffs_LegacyClassnames_InstanceofSniff implements PHP_CodeSni
|
||||||
T_INSTANCEOF,
|
T_INSTANCEOF,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Processes the tokens that this sniff is interested in.
|
|
||||||
*
|
|
||||||
* @param PHP_CodeSniffer_File $phpcsFile The file where the token was found.
|
|
||||||
* @param int $stackPtr The position in the stack where
|
|
||||||
* the token was found.
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
|
|
||||||
{
|
|
||||||
$tokens = $phpcsFile->getTokens();
|
|
||||||
$classnamePosition = $phpcsFile->findNext(T_STRING, $stackPtr);
|
|
||||||
if ($classnamePosition === false) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$classname = $tokens[$classnamePosition]['content'];
|
|
||||||
|
|
||||||
$this->addFixableError($phpcsFile, $classnamePosition, $classname);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,25 +35,4 @@ class Typo3Update_Sniffs_LegacyClassnames_InstantiationWithNewSniff implements P
|
||||||
{
|
{
|
||||||
return [T_NEW];
|
return [T_NEW];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Processes the tokens that this sniff is interested in.
|
|
||||||
*
|
|
||||||
* @param PHP_CodeSniffer_File $phpcsFile The file where the token was found.
|
|
||||||
* @param int $stackPtr The position in the stack where
|
|
||||||
* the token was found.
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
|
|
||||||
{
|
|
||||||
$tokens = $phpcsFile->getTokens();
|
|
||||||
$classnamePosition = $phpcsFile->findNext(T_STRING, $stackPtr);
|
|
||||||
if ($classnamePosition === false) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$classname = $tokens[$classnamePosition]['content'];
|
|
||||||
|
|
||||||
$this->addFixableError($phpcsFile, $classnamePosition, $classname);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,25 +35,4 @@ class Typo3Update_Sniffs_LegacyClassnames_StaticCallSniff implements PHP_CodeSni
|
||||||
{
|
{
|
||||||
return [T_DOUBLE_COLON];
|
return [T_DOUBLE_COLON];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Processes the tokens that this sniff is interested in.
|
|
||||||
*
|
|
||||||
* @param PHP_CodeSniffer_File $phpcsFile The file where the token was found.
|
|
||||||
* @param int $stackPtr The position in the stack where
|
|
||||||
* the token was found.
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
|
|
||||||
{
|
|
||||||
$tokens = $phpcsFile->getTokens();
|
|
||||||
$classnamePosition = $phpcsFile->findPrevious(T_STRING, $stackPtr);
|
|
||||||
if ($classnamePosition === false) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$classname = $tokens[$classnamePosition]['content'];
|
|
||||||
|
|
||||||
$this->addFixableError($phpcsFile, $classnamePosition, $classname);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,26 +37,4 @@ class Typo3Update_Sniffs_LegacyClassnames_TypehintCatchExceptionSniff implements
|
||||||
{
|
{
|
||||||
return [T_CATCH];
|
return [T_CATCH];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Processes the tokens that this sniff is interested in.
|
|
||||||
*
|
|
||||||
* @param PHP_CodeSniffer_File $phpcsFile The file where the token was found.
|
|
||||||
* @param int $stackPtr The position in the stack where
|
|
||||||
* the token was found.
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
|
|
||||||
{
|
|
||||||
$tokens = $phpcsFile->getTokens();
|
|
||||||
|
|
||||||
$classnamePosition = $phpcsFile->findNext(T_STRING, $stackPtr);
|
|
||||||
if ($classnamePosition === false) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$classname = $tokens[$classnamePosition]['content'];
|
|
||||||
$this->addFixableError($phpcsFile, $classnamePosition, $classname);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,25 +37,4 @@ class Typo3Update_Sniffs_LegacyClassnames_UseSniff implements PHP_CodeSniffer_Sn
|
||||||
{
|
{
|
||||||
return [T_USE];
|
return [T_USE];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Processes the tokens that this sniff is interested in.
|
|
||||||
*
|
|
||||||
* @param PHP_CodeSniffer_File $phpcsFile The file where the token was found.
|
|
||||||
* @param int $stackPtr The position in the stack where
|
|
||||||
* the token was found.
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
|
|
||||||
{
|
|
||||||
$tokens = $phpcsFile->getTokens();
|
|
||||||
$classnamePosition = $phpcsFile->findNext(T_STRING, $stackPtr);
|
|
||||||
if ($classnamePosition === false) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$classname = $tokens[$classnamePosition]['content'];
|
|
||||||
|
|
||||||
$this->addFixableError($phpcsFile, $classnamePosition, $classname);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue