Merge pull request #733 from Automattic/fix/cs

Author: GaryJones

WordPressVIPMinimum/Sniffs/Classes/DeclarationCompatibilitySniff.php

@@ -291,7 +291,7 @@ protected function processTokenWithinScope( File $phpcsFile, $stackPtr, $currSco
 					return;
 				}
 			}
-			$i++;
+			++$i;
 		}
 	}
 

WordPressVIPMinimum/Sniffs/Compatibility/ZoninatorSniff.php

@@ -80,11 +80,11 @@ public function process_token( $stackPtr ) {
 	/**
 	 * Removes the quotation marks around T_CONSTANT_ENCAPSED_STRING.
 	 *
-	 * @param string $string T_CONSTANT_ENCAPSED_STRING containing wrapping quotation marks.
+	 * @param string $text_string T_CONSTANT_ENCAPSED_STRING containing wrapping quotation marks.
 	 *
 	 * @return string String w/o wrapping quotation marks.
 	 */
-	public function remove_wrapping_quotation_marks( $string ) {
-		return trim( str_replace( '"', "'", $string ), "'" );
+	public function remove_wrapping_quotation_marks( $text_string ) {
+		return trim( str_replace( '"', "'", $text_string ), "'" );
 	}
 }

WordPressVIPMinimum/Sniffs/Hooks/AlwaysReturnInFilterSniff.php

@@ -218,9 +218,9 @@ private function processFunctionBody( $stackPtr ) {
 
 		while ( $returnTokenPtr ) {
 			if ( $this->isInsideIfConditonal( $returnTokenPtr ) ) {
-				$insideIfConditionalReturn++;
+				++$insideIfConditionalReturn;
 			} else {
-				$outsideConditionalReturn++;
+				++$outsideConditionalReturn;
 			}
 			if ( $this->isReturningVoid( $returnTokenPtr ) ) {
 				$message = 'Please, make sure that a callback to `%s` filter is returning void intentionally.';