CS: Fix violations in VIPCS code

Mostly `PSR2.Classes.PropertyDeclaration.Underscore` issues.

Author: GaryJones

WordPressVIPMinimum/Sniffs/Classes/DeclarationCompatibilitySniff.php

@@ -22,14 +22,14 @@ class DeclarationCompatibilitySniff extends AbstractScopeSniff {
 	 *
 	 * @var string
 	 */
-	private $_currentClass = '';
+	private $currentClass = '';
 
 	/**
 	 * A list of functions in the current class.
 	 *
 	 * @var string[]
 	 */
-	private $_functionList = [];
+	private $functionList = [];
 
 	/**
 	 * A list of classes and methods to check.
@@ -204,9 +204,9 @@ protected function processTokenWithinScope( File $phpcsFile, $stackPtr, $currSco
 
 		$className = $phpcsFile->getDeclarationName( $currScope );
 
-		if ( $className !== $this->_currentClass ) {
+		if ( $className !== $this->currentClass ) {
 			$this->loadFunctionNamesInScope( $phpcsFile, $currScope );
-			$this->_currentClass = $className;
+			$this->currentClass = $className;
 		}
 
 		$methodName = $phpcsFile->getDeclarationName( $stackPtr );
@@ -300,7 +300,7 @@ protected function processTokenWithinScope( File $phpcsFile, $stackPtr, $currSco
 	 */
 	private function addError( $parentClassName, $methodName, $currentMethodSignature, $parentMethodSignature, $phpcsFile, $stackPtr ) {
 
-		$currentSignature = sprintf( '%s::%s(%s)', $this->_currentClass, $methodName, implode( ', ', $this->generateParamList( $currentMethodSignature ) ) );
+		$currentSignature = sprintf( '%s::%s(%s)', $this->currentClass, $methodName, implode( ', ', $this->generateParamList( $currentMethodSignature ) ) );
 
 		$parentSignature = sprintf( '%s::%s(%s)', $parentClassName, $methodName, implode( ', ', $this->generateParamList( $parentMethodSignature ) ) );
 
@@ -354,16 +354,16 @@ private function generateParamList( $methodSignature ) {
 	 * @return void
 	 */
 	protected function loadFunctionNamesInScope( File $phpcsFile, $currScope ) {
-		$this->_functionList = [];
-		$tokens              = $phpcsFile->getTokens();
+		$this->functionList = [];
+		$tokens             = $phpcsFile->getTokens();
 
 		for ( $i = ( $tokens[ $currScope ]['scope_opener'] + 1 ); $i < $tokens[ $currScope ]['scope_closer']; $i++ ) {
 			if ( T_FUNCTION !== $tokens[ $i ]['code'] ) {
 				continue;
 			}
 
-			$next                  = $phpcsFile->findNext( T_STRING, $i );
-			$this->_functionList[] = trim( $tokens[ $next ]['content'] );
+			$next                 = $phpcsFile->findNext( T_STRING, $i );
+			$this->functionList[] = trim( $tokens[ $next ]['content'] );
 		}
 	}
 

WordPressVIPMinimum/Sniffs/Functions/CheckReturnValueSniff.php

@@ -7,7 +7,6 @@
 
 namespace WordPressVIPMinimum\Sniffs\Functions;
 
-use PHP_CodeSniffer\Files\File;
 use WordPressVIPMinimum\Sniffs\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
 
@@ -22,13 +21,6 @@
  */
 class CheckReturnValueSniff extends Sniff {
 
-	/**
-	 * Tokens of the whole file.
-	 *
-	 * @var array
-	 */
-	private $_tokens = [];
-
 	/**
 	 * Pairs we are about to check.
 	 *

WordPressVIPMinimum/Sniffs/Functions/DynamicCallsSniff.php

@@ -31,7 +31,7 @@ class DynamicCallsSniff extends Sniff {
 	 *
 	 * @var array
 	 */
-	private $_blacklisted_functions = [
+	private $blacklisted_functions = [
 		'assert',
 		'compact',
 		'extract',
@@ -49,14 +49,14 @@ class DynamicCallsSniff extends Sniff {
 	 *
 	 * @var array
 	 */
-	private $_variables_arr = [];
+	private $variables_arr = [];
 
 	/**
 	 * The position in the stack where the token was found.
 	 *
 	 * @var int
 	 */
-	private $_stackPtr;
+	private $stackPtr;
 
 	/**
 	 * Returns the token types that this sniff is interested in.
@@ -77,7 +77,7 @@ public function register() {
 	 * @return void
 	 */
 	public function process_token( $stackPtr ) {
-		$this->_stackPtr = $stackPtr;
+		$this->stackPtr = $stackPtr;
 
 		// First collect all variables encountered and their values.
 		$this->collect_variables();
@@ -101,13 +101,13 @@ private function collect_variables() {
 
 		if (
 			'T_VARIABLE' !==
-				$this->tokens[ $this->_stackPtr ]['type']
+				$this->tokens[ $this->stackPtr ]['type']
 		) {
 			return;
 		}
 
 		$current_var_name = $this->tokens[
-			$this->_stackPtr
+			$this->stackPtr
 		]['content'];
 
 		/*
@@ -118,7 +118,7 @@ private function collect_variables() {
 
 		$t_item_key = $this->phpcsFile->findNext(
 			[ T_WHITESPACE ],
-			$this->_stackPtr + 1,
+			$this->stackPtr + 1,
 			null,
 			true,
 			null,
@@ -162,7 +162,7 @@ private function collect_variables() {
 		$current_var_value =
 			$this->tokens[ $t_item_key ]['content'];
 
-		$this->_variables_arr[ $current_var_name ] =
+		$this->variables_arr[ $current_var_name ] =
 			str_replace( "'", '', $current_var_value );
 	}
 
@@ -179,7 +179,7 @@ private function find_dynamic_calls() {
 		 * anything
 		 */
 
-		if ( empty( $this->_variables_arr ) ) {
+		if ( empty( $this->variables_arr ) ) {
 			return;
 		}
 
@@ -189,7 +189,7 @@ private function find_dynamic_calls() {
 
 		if (
 			'T_VARIABLE' !==
-				$this->tokens[ $this->_stackPtr ]['type']
+				$this->tokens[ $this->stackPtr ]['type']
 		) {
 			return;
 		}
@@ -202,8 +202,8 @@ private function find_dynamic_calls() {
 		 */
 
 		if ( ! isset(
-			$this->_variables_arr[
-				$this->tokens[ $this->_stackPtr ]['content']
+			$this->variables_arr[
+				$this->tokens[ $this->stackPtr ]['content']
 			]
 		) ) {
 			return;
@@ -221,39 +221,39 @@ private function find_dynamic_calls() {
 		} while (
 			'T_WHITESPACE' ===
 				$this->tokens[
-					$this->_stackPtr + $i
+					$this->stackPtr + $i
 				]['type']
 		);
 
 		if (
 			'T_OPEN_PARENTHESIS' !==
 				$this->tokens[
-					$this->_stackPtr + $i
+					$this->stackPtr + $i
 				]['type']
 		) {
 			return;
 		}
 
-		$t_item_key = $this->_stackPtr + $i;
+		$t_item_key = $this->stackPtr + $i;
 
 		/*
 		 * We have a variable match, but make sure it contains name
 		 * of a function which is on our blacklist.
 		 */
 
 		if ( ! in_array(
-			$this->_variables_arr[
-				$this->tokens[ $this->_stackPtr ]['content']
+			$this->variables_arr[
+				$this->tokens[ $this->stackPtr ]['content']
 			],
-			$this->_blacklisted_functions,
+			$this->blacklisted_functions,
 			true
 		) ) {
 			return;
 		}
 
 		// We do, so report.
 		$message = 'Dynamic calling is not recommended in the case of %s.';
-		$data    = [ $this->_variables_arr[ $this->tokens[ $this->_stackPtr ]['content'] ] ];
+		$data    = [ $this->variables_arr[ $this->tokens[ $this->stackPtr ]['content'] ] ];
 		$this->phpcsFile->addError( $message, $t_item_key, 'DynamicCalls', $data );
 	}
 }