Update ignore code duplication

Author: rmccue

HM/Sniffs/ExtraSniffCode.php

@@ -2,6 +2,7 @@
 
 namespace HM\Sniffs;
 
+use PHP_CodeSniffer\Files\File as PhpcsFile;
 use PHP_CodeSniffer\Util;
 
 trait ExtraSniffCode {
@@ -11,13 +12,14 @@ trait ExtraSniffCode {
 	 * This allows overriding an existing sniff and retaining the existing
 	 * ignore statements.
 	 *
+	 * @param PhpcsFile $file File being checked.
 	 * @param string $legacy Legacy sniff code
 	 */
-	protected function duplicate_ignores( $legacy ) {
+	protected function duplicate_ignores( PhpcsFile $file, $legacy ) {
 		$expression = sprintf( '/^%s(\..+)?$/', preg_quote( $legacy ) );
 		$base_code = Util\Common::getSniffCode( get_class( $this ) );
 
-		foreach ( $this->phpcsFile->tokenizer->ignoredLines as $line => $ignored ) {
+		foreach ( $file->tokenizer->ignoredLines as $line => $ignored ) {
 			$additional = [];
 
 			if ( empty( $ignored ) ) {
@@ -38,7 +40,7 @@ protected function duplicate_ignores( $legacy ) {
 			}
 
 			if ( ! empty( $additional ) ) {
-				$this->phpcsFile->tokenizer->ignoredLines[ $line ] = array_merge( $ignored, $additional );
+				$file->tokenizer->ignoredLines[ $line ] = array_merge( $ignored, $additional );
 			}
 		}
 

HM/Sniffs/Security/EscapeOutputSniff.php

@@ -56,13 +56,13 @@ public function __construct() {
 	}
 
 	/**
-	 * Override init to duplicate any ignores.
+	 * Override process to duplicate any ignores.
 	 *
-	 * @param PhpcsFile $phpcsFile
+	 * @param PhpcsFile $file
+	 * @param int $stackPtr
 	 */
-	protected function init( PhpcsFile $phpcsFile ) {
-		parent::init( $phpcsFile );
-
-		$this->duplicate_ignores( 'WordPress.Security.EscapeOutput' );
+	public function process( PhpcsFile $file, $stackPtr ) {
+		$this->duplicate_ignores( $file, 'WordPress.Security.EscapeOutput' );
+		return parent::process( $file, $stackPtr );
 	}
 }

HM/Sniffs/Security/NonceVerificationSniff.php

@@ -27,17 +27,17 @@ class NonceVerificationSniff extends WPCSNonceVerificationSniff {
 	public $allowQueryVariables = false;
 
 	/**
-	 * Override init to override config and duplicate any ignores.
+	 * Override process to override config and duplicate any ignores.
 	 *
 	 * @param PhpcsFile $phpcsFile
+	 * @param int $stackPtr
 	 */
-	public function init( PhpcsFile $file ) {
-		parent::init( $file );
-
+	public function process( PhpcsFile $file, $stackPtr ) {
 		if ( $this->allowQueryVariables ) {
 			unset( $this->superglobals[ '$_GET' ] );
 		}
 
-		$this->duplicate_ignores( 'WordPress.Security.NonceVerification' );
+		$this->duplicate_ignores( $file, 'WordPress.Security.NonceVerification' );
+		return parent::process( $file, $stackPtr );
 	}
 }

HM/Sniffs/Security/ValidatedSanitizedInputSniff.php

@@ -36,14 +36,14 @@ class ValidatedSanitizedInputSniff extends WPCSValidatedSanitizedInputSniff {
 	];
 
 	/**
-	 * Override init to duplicate any ignores.
+	 * Override process to duplicate any ignores.
 	 *
 	 * @param PhpcsFile $phpcsFile
+	 * @param int $stackPtr
 	 */
-	protected function init( PhpcsFile $phpcsFile ) {
-		parent::init( $phpcsFile );
-
-		$this->duplicate_ignores( 'WordPress.Security.ValidatedSanitizedInput' );
+	public function process( PhpcsFile $file, $stackPtr ) {
+		$this->duplicate_ignores( $file, 'WordPress.Security.ValidatedSanitizedInput' );
+		return parent::process( $file, $stackPtr );
 	}
 
 	/**