From 5202918cd878bf2f1fb2954d3fe997d1f717c825 Mon Sep 17 00:00:00 2001
From: Gary Jones <gary.jones@automattic.com>
Date: Tue, 20 Dec 2022 01:40:24 +0000
Subject: [PATCH] Use PHPCSUtils MessageHelper::addMessage

This is more tested than the WPCS Sniff::addMessage().
---
 .../Sniffs/AbstractVariableRestrictionsSniff.php          | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/WordPressVIPMinimum/Sniffs/AbstractVariableRestrictionsSniff.php b/WordPressVIPMinimum/Sniffs/AbstractVariableRestrictionsSniff.php
index 89234f2e..1f1b04ee 100644
--- a/WordPressVIPMinimum/Sniffs/AbstractVariableRestrictionsSniff.php
+++ b/WordPressVIPMinimum/Sniffs/AbstractVariableRestrictionsSniff.php
@@ -9,7 +9,7 @@
 
 namespace WordPressVIPMinimum\Sniffs;
 
-use WordPressVIPMinimum\Sniffs\Sniff;
+use PHPCSUtils\Utils\MessageHelper;
 
 /**
  * Restricts usage of some variables.
@@ -200,11 +200,13 @@ public function process_token( $stackPtr ) {
 				continue;
 			}
 
-			$this->addMessage(
+			$code = MessageHelper::stringToErrorcode( $groupName . '_' . $match[1] );
+			MessageHelper::addMessage(
+				$this->phpcsFile,
 				$group['message'],
 				$stackPtr,
 				$group['type'] === 'error',
-				$this->string_to_errorcode( $groupName . '_' . $match[1] ),
+				$code,
 				[ $var ]
 			);