Skip to content

Classes/DeclarationCompatibility: remove redundant code #768

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

Merged
GaryJones merged 1 commit into from
Aug 23, 2023
Merged

Classes/DeclarationCompatibility: remove redundant code #768

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
30 changes: 0 additions & 30 deletions WordPressVIPMinimum/Sniffs/Classes/DeclarationCompatibilitySniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@ class DeclarationCompatibilitySniff extends AbstractScopeSniff {
*/
private $currentClass = '';

/**
* A list of functions in the current class.
*
* @var string[]
*/
private $functionList = [];

/**
* A list of classes and methods to check.
*
Expand Down Expand Up @@ -211,7 +204,6 @@ protected function processTokenWithinScope( File $phpcsFile, $stackPtr, $currSco
$className = $phpcsFile->getDeclarationName( $currScope );

if ( $className !== $this->currentClass ) {
$this->loadFunctionNamesInScope( $phpcsFile, $currScope );
$this->currentClass = $className;
}

Expand Down Expand Up @@ -358,28 +350,6 @@ private function generateParamList( $methodSignature ) {
return $paramList;
}

/**
* Extracts all the function names found in the given scope.
*
* @param File $phpcsFile The current file being scanned.
* @param int $currScope A pointer to the start of the scope.
*
* @return void
*/
protected function loadFunctionNamesInScope( File $phpcsFile, $currScope ) {
$this->functionList = [];
$tokens = $phpcsFile->getTokens();

for ( $i = ( $tokens[ $currScope ]['scope_opener'] + 1 ); $i < $tokens[ $currScope ]['scope_closer']; $i++ ) {
if ( $tokens[ $i ]['code'] !== T_FUNCTION ) {
continue;
}

$next = $phpcsFile->findNext( T_STRING, $i );
$this->functionList[] = trim( $tokens[ $next ]['content'] );
}
}

/**
* Do nothing outside the scope. Has to be implemented accordingly to parent abstract class.
*
Expand Down