From 9d9ee4fecb6286b09e20970764d50e7fd34b54c1 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 14 Sep 2023 04:51:41 +0200
Subject: [PATCH 1/4] Composer: add dependency on PHPCSUtils

By starting to use PHPCSUtils, we make YoastCS less dependent on WordPressCS.
PHPCSUtils brings added benefits of more stable, thoroughly tested utility methods, which all support modern PHP.

Along those lines, the utility functions in PHPCSUtils which mirror PHPCS native utility functions are generally compatible with new PHP syntaxes well before there is a PHPCS release available with such support for these utility functions.

This commit adds the dependency and updates relevant documentation and CI.

Includes removing the explicit dependency on the Composer PHPCS Installer plugin. This dependency will now be inherited from PHPCSUtils.
Letting PHPCSUtils manage the supported versions prevents conflicts.

Closes 157
---
 .github/workflows/basics.yml    | 1 +
 .github/workflows/quicktest.yml | 2 ++
 .github/workflows/test.yml      | 5 +++++
 composer.json                   | 2 +-
 phpunit-bootstrap.php           | 3 ++-
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/basics.yml b/.github/workflows/basics.yml
index 2ef7146a..344c629c 100644
--- a/.github/workflows/basics.yml
+++ b/.github/workflows/basics.yml
@@ -54,6 +54,7 @@ jobs:
         run: >
           composer require --no-update --no-scripts --no-interaction
           squizlabs/php_codesniffer:"dev-master"
+          phpcsstandards/phpcsutils:"dev-develop"
           phpcsstandards/phpcsextra:"dev-develop"
 
       # Install dependencies and handle caching in one go.
diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index 47e25929..91216b62 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -63,6 +63,7 @@ jobs:
         run: >
           composer require --no-update --no-scripts --no-interaction --ignore-platform-req=php+
           squizlabs/php_codesniffer:"dev-master"
+          phpcsstandards/phpcsutils:"dev-develop"
 
       # Install dependencies and handle caching in one go.
       # @link https://github.com/marketplace/actions/install-composer-dependencies
@@ -86,6 +87,7 @@ jobs:
         run: >
           composer update --prefer-lowest --no-scripts --no-interaction --ignore-platform-req=php+
           squizlabs/php_codesniffer
+          phpcsstandards/phpcsutils
           wp-coding-standards/wpcs
 
       - name: Verify installed standards
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 05715330..434d353a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,6 +23,7 @@ concurrency:
 # Once support for WPCS 3.0.0 has been added, the matrix should switch (back) using `dev-develop`.
 env:
   PHPCS_HIGHEST: 'dev-master'
+  UTILS_HIGHEST: 'dev-develop'
   WPCS_HIGHEST: '2.3.0'
 
 jobs:
@@ -96,6 +97,7 @@ jobs:
         run: >
           composer require --no-update --no-scripts --no-interaction --ignore-platform-req=php+
           squizlabs/php_codesniffer:"${{ env.PHPCS_HIGHEST }}"
+          phpcsstandards/phpcsutils:"${{ env.UTILS_HIGHEST }}"
 
       # Install dependencies and handle caching in one go.
       # @link https://github.com/marketplace/actions/install-composer-dependencies
@@ -119,6 +121,7 @@ jobs:
         run: >
           composer update --prefer-lowest --no-scripts --no-interaction --ignore-platform-req=php+
           squizlabs/php_codesniffer
+          phpcsstandards/phpcsutils
           wp-coding-standards/wpcs
 
       - name: Verify installed versions
@@ -191,6 +194,7 @@ jobs:
         run: >
           composer require --no-update --no-scripts --no-interaction
           squizlabs/php_codesniffer:"${{ env.PHPCS_HIGHEST }}"
+          phpcsstandards/phpcsutils:"${{ env.UTILS_HIGHEST }}"
 
       # Install dependencies and handle caching in one go.
       # @link https://github.com/marketplace/actions/install-composer-dependencies
@@ -205,6 +209,7 @@ jobs:
         run: >
           composer update --prefer-lowest --no-scripts --no-interaction
           squizlabs/php_codesniffer
+          phpcsstandards/phpcsutils
           wp-coding-standards/wpcs
 
       - name: Verify installed versions
diff --git a/composer.json b/composer.json
index 3874d100..13539cdf 100644
--- a/composer.json
+++ b/composer.json
@@ -25,11 +25,11 @@
 	"require": {
 		"php": ">=5.4",
 		"ext-tokenizer": "*",
-		"dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0",
 		"php-parallel-lint/php-console-highlighter": "^1.0.0",
 		"php-parallel-lint/php-parallel-lint": "^1.3.2",
 		"phpcompatibility/phpcompatibility-wp": "^2.1.4",
 		"phpcsstandards/phpcsextra": "^1.1.2",
+		"phpcsstandards/phpcsutils": "^1.0.8",
 		"squizlabs/php_codesniffer": "^3.7.2",
 		"wp-coding-standards/wpcs": "^2.3.0"
 	},
diff --git a/phpunit-bootstrap.php b/phpunit-bootstrap.php
index c75a99e7..50bc6a59 100644
--- a/phpunit-bootstrap.php
+++ b/phpunit-bootstrap.php
@@ -49,7 +49,8 @@
 
 If you use Composer, please run `composer install`.
 Otherwise, make sure you set a `PHPCS_DIR` environment variable in your phpunit.xml file
-pointing to the PHPCS directory.
+pointing to the PHPCS directory and that PHPCSUtils is included in the `installed_paths`
+for that PHPCS install.
 ';
 
 	die( 1 );

From b680180e1de3ae9feb2cfefee9b996718fcc9bce Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 14 Sep 2023 04:59:27 +0200
Subject: [PATCH 2/4] YoastCS: add PHPCSUtils requirement

PHPCSUtils does not contain any sniffs, so adding this rule isn't strictly necessary, but by having the rule in the ruleset anyway, if PHPCSUtils is missing, the user will get a descriptive error message during the loading of the ruleset instead of a fatal "class not found" error once the sniffs start running.
---
 Yoast/ruleset.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Yoast/ruleset.xml b/Yoast/ruleset.xml
index 82a53fc3..4788adfc 100644
--- a/Yoast/ruleset.xml
+++ b/Yoast/ruleset.xml
@@ -26,6 +26,16 @@
 	add configuration for a sniff.
 	#############################################################################
 	-->
+
+	<!--
+		 Trigger error if PHPCSUtils cannot be found.
+		 PHPCSUtils does not contain any sniffs, so this rule isn't strictly necessary, but
+		 by having this here anyway, if PHPCSUtils is missing, the user will get a
+		 descriptive error message during the loading of the ruleset instead of
+		 a fatal "class not found" error once the sniffs start running.
+	-->
+	<rule ref="PHPCSUtils"/>
+
 	<rule ref="WordPress">
 		<!-- Set the minimum supported WP version for all sniff which use it in one go.
 			 Ref: https://github.com/WordPress/WordPress-Coding-Standards/wiki/Customizable-sniff-properties#minimum-wp-version-to-check-for-usage-of-deprecated-functions-classes-and-function-parameters

From f6fbe7b473638041123fcff17870bc3fe733075f Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 17 Sep 2023 19:56:49 +0200
Subject: [PATCH 3/4] Sniffs: switch over to using utilities from PHPCSUtils
 [1]

Initial switch over replacing function calls to PHPCS native utility functions with calls to the improved versions of the same in PHPCSUtils.
---
 Yoast/Sniffs/Commenting/CoversTagSniff.php              | 3 ++-
 Yoast/Sniffs/Commenting/TestsHaveCoversTagSniff.php     | 8 +++++---
 Yoast/Sniffs/Files/FileNameSniff.php                    | 3 ++-
 Yoast/Sniffs/Files/TestDoublesSniff.php                 | 5 +++--
 Yoast/Sniffs/NamingConventions/ObjectNameDepthSniff.php | 5 +++--
 Yoast/Sniffs/Tools/BrainMonkeyRaceConditionSniff.php    | 3 ++-
 Yoast/Sniffs/WhiteSpace/FunctionSpacingSniff.php        | 3 ++-
 7 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/Yoast/Sniffs/Commenting/CoversTagSniff.php b/Yoast/Sniffs/Commenting/CoversTagSniff.php
index 9c5fb2c7..27a800be 100644
--- a/Yoast/Sniffs/Commenting/CoversTagSniff.php
+++ b/Yoast/Sniffs/Commenting/CoversTagSniff.php
@@ -4,6 +4,7 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
+use PHPCSUtils\Utils\GetTokensAsString;
 
 /**
  * Verifies that a @covers tag annotation follows a format supported by PHPUnit.
@@ -327,7 +328,7 @@ protected function fixAnnotationToSplit( File $phpcsFile, $stackPtr, $errorCode,
 				$phpcsFile->fixer->replaceToken( $i, '' );
 			}
 
-			$stub        = $phpcsFile->getTokensAsString( $i, ( $stackPtr - $i ), true );
+			$stub        = GetTokensAsString::origContent( $phpcsFile, $i, ( $stackPtr - 1 ) );
 			$replacement = '';
 			foreach ( $annotations as $annotation ) {
 				$replacement .= $stub . $annotation;
diff --git a/Yoast/Sniffs/Commenting/TestsHaveCoversTagSniff.php b/Yoast/Sniffs/Commenting/TestsHaveCoversTagSniff.php
index 35623fee..462b8dde 100644
--- a/Yoast/Sniffs/Commenting/TestsHaveCoversTagSniff.php
+++ b/Yoast/Sniffs/Commenting/TestsHaveCoversTagSniff.php
@@ -5,6 +5,8 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\FunctionDeclarations;
+use PHPCSUtils\Utils\ObjectDeclarations;
 
 /**
  * Verifies that all test functions have at least one @covers tag.
@@ -59,7 +61,7 @@ public function process( File $phpcsFile, $stackPtr ) {
 	 */
 	protected function process_class( File $phpcsFile, $stackPtr ) {
 		$tokens = $phpcsFile->getTokens();
-		$name   = $phpcsFile->getDeclarationName( $stackPtr );
+		$name   = ObjectDeclarations::getName( $phpcsFile, $stackPtr );
 
 		if ( \substr( $name, -4 ) !== 'Test'
 			&& \substr( $name, -8 ) !== 'TestCase'
@@ -180,13 +182,13 @@ protected function process_function( File $phpcsFile, $stackPtr ) {
 			}
 		}
 
-		$name = $phpcsFile->getDeclarationName( $stackPtr );
+		$name = FunctionDeclarations::getName( $phpcsFile, $stackPtr );
 		if ( \stripos( $name, 'test' ) !== 0 && $foundTest === false ) {
 			// Not a test method.
 			return;
 		}
 
-		$method_props = $phpcsFile->getMethodProperties( $stackPtr );
+		$method_props = FunctionDeclarations::getProperties( $phpcsFile, $stackPtr );
 		if ( $method_props['is_abstract'] === true ) {
 			// Abstract test method, not implemented.
 			return;
diff --git a/Yoast/Sniffs/Files/FileNameSniff.php b/Yoast/Sniffs/Files/FileNameSniff.php
index 5f9a92e5..5c7efab1 100644
--- a/Yoast/Sniffs/Files/FileNameSniff.php
+++ b/Yoast/Sniffs/Files/FileNameSniff.php
@@ -5,6 +5,7 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Util\Common;
+use PHPCSUtils\Utils\ObjectDeclarations;
 
 /**
  * Ensures files comply with the Yoast file name rules.
@@ -121,7 +122,7 @@ public function process( File $phpcsFile, $stackPtr ) {
 			if ( $oo_structure !== false ) {
 
 				$tokens = $phpcsFile->getTokens();
-				$name   = $phpcsFile->getDeclarationName( $oo_structure );
+				$name   = ObjectDeclarations::getName( $phpcsFile, $oo_structure );
 
 				$prefixes = $this->clean_custom_array_property( $this->oo_prefixes );
 				if ( ! empty( $prefixes ) ) {
diff --git a/Yoast/Sniffs/Files/TestDoublesSniff.php b/Yoast/Sniffs/Files/TestDoublesSniff.php
index c352f206..2171de2a 100644
--- a/Yoast/Sniffs/Files/TestDoublesSniff.php
+++ b/Yoast/Sniffs/Files/TestDoublesSniff.php
@@ -4,6 +4,7 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
+use PHPCSUtils\Utils\ObjectDeclarations;
 
 /**
  * Check that all mock/doubles classes are in their own file and in a `doubles` directory.
@@ -123,7 +124,7 @@ public function process( File $phpcsFile, $stackPtr ) {
 			}
 		}
 
-		$object_name = $phpcsFile->getDeclarationName( $stackPtr );
+		$object_name = ObjectDeclarations::getName( $phpcsFile, $stackPtr );
 		if ( empty( $object_name ) ) {
 			return;
 		}
@@ -206,7 +207,7 @@ public function process( File $phpcsFile, $stackPtr ) {
 					$tokens[ $stackPtr ]['content'],
 					$object_name,
 					$tokens[ $more_objects_in_file ]['content'],
-					$phpcsFile->getDeclarationName( $more_objects_in_file ),
+					ObjectDeclarations::getName( $phpcsFile, $more_objects_in_file ),
 				];
 
 				$phpcsFile->addError(
diff --git a/Yoast/Sniffs/NamingConventions/ObjectNameDepthSniff.php b/Yoast/Sniffs/NamingConventions/ObjectNameDepthSniff.php
index bd902248..4b529f83 100644
--- a/Yoast/Sniffs/NamingConventions/ObjectNameDepthSniff.php
+++ b/Yoast/Sniffs/NamingConventions/ObjectNameDepthSniff.php
@@ -2,6 +2,7 @@
 
 namespace YoastCS\Yoast\Sniffs\NamingConventions;
 
+use PHPCSUtils\Utils\ObjectDeclarations;
 use WordPressCS\WordPress\Sniff as WPCS_Sniff;
 
 /**
@@ -77,7 +78,7 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		$object_name = $this->phpcsFile->getDeclarationName( $stackPtr );
+		$object_name = ObjectDeclarations::getName( $this->phpcsFile, $stackPtr );
 		if ( empty( $object_name ) ) {
 			return;
 		}
@@ -101,7 +102,7 @@ public function process_token( $stackPtr ) {
 				--$part_count;
 			}
 			else {
-				$extends = $this->phpcsFile->findExtendedClassName( $stackPtr );
+				$extends = ObjectDeclarations::findExtendedClassName( $this->phpcsFile, $stackPtr );
 				if ( \is_string( $extends ) ) {
 					--$part_count;
 				}
diff --git a/Yoast/Sniffs/Tools/BrainMonkeyRaceConditionSniff.php b/Yoast/Sniffs/Tools/BrainMonkeyRaceConditionSniff.php
index 655771ee..43f0eddd 100644
--- a/Yoast/Sniffs/Tools/BrainMonkeyRaceConditionSniff.php
+++ b/Yoast/Sniffs/Tools/BrainMonkeyRaceConditionSniff.php
@@ -3,6 +3,7 @@
 namespace YoastCS\Yoast\Sniffs\Tools;
 
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\FunctionDeclarations;
 use WordPressCS\WordPress\Sniff;
 
 /**
@@ -133,7 +134,7 @@ public function process_token( $stackPtr ) {
 			// Okay, we have found the race condition. Throw error.
 			$message = 'The %s() test method contains both a call to Monkey\Functions\expect( %s ), as well as a call to %s(). This causes a race condition which will cause the tests to fail. Only use one of these in a test.';
 			$data    = [
-				$this->phpcsFile->getDeclarationName( $functionToken ),
+				FunctionDeclarations::getName( $this->phpcsFile, $functionToken ),
 				$this->tokens[ $text ]['content'],
 				( $targetContent === 'expectdone' ) ? 'Monkey\Actions\expectDone' : 'Monkey\Filters\expectApplied',
 			];
diff --git a/Yoast/Sniffs/WhiteSpace/FunctionSpacingSniff.php b/Yoast/Sniffs/WhiteSpace/FunctionSpacingSniff.php
index 1b00bd37..3853dffc 100644
--- a/Yoast/Sniffs/WhiteSpace/FunctionSpacingSniff.php
+++ b/Yoast/Sniffs/WhiteSpace/FunctionSpacingSniff.php
@@ -5,6 +5,7 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\FunctionSpacingSniff as Squiz_FunctionSpacingSniff;
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\Conditions;
 
 /**
  * Verifies the space between methods.
@@ -54,7 +55,7 @@ final class FunctionSpacingSniff extends Squiz_FunctionSpacingSniff {
 	 */
 	public function process( File $phpcsFile, $stackPtr ) {
 		// Check that the function is nested in an OO structure (class, trait, interface).
-		if ( $phpcsFile->hasCondition( $stackPtr, Tokens::$ooScopeTokens ) === false ) {
+		if ( Conditions::hasCondition( $phpcsFile, $stackPtr, Tokens::$ooScopeTokens ) === false ) {
 			return;
 		}
 

From d1d6dc6773f796fd36bafc92adb40f7fd969716d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 17 Sep 2023 19:58:14 +0200
Subject: [PATCH 4/4] Sniffs: switch over to using utilities from PHPCSUtils
 [2]

Switch over replacing function calls to WPCS utility functions with calls to the improved versions of the same in PHPCSUtils.
These WPCS native utility functions no longer exist in WPCS 3.0.0 as WPCS is now also using PHPCSUtils.
---
 .../NamingConventions/ObjectNameDepthSniff.php      |  3 ++-
 .../Sniffs/NamingConventions/ValidHookNameSniff.php |  5 +++--
 .../Sniffs/Tools/BrainMonkeyRaceConditionSniff.php  | 12 +++++++-----
 Yoast/Sniffs/Yoast/AlternativeFunctionsSniff.php    | 13 ++++++++-----
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/Yoast/Sniffs/NamingConventions/ObjectNameDepthSniff.php b/Yoast/Sniffs/NamingConventions/ObjectNameDepthSniff.php
index 4b529f83..c986a17a 100644
--- a/Yoast/Sniffs/NamingConventions/ObjectNameDepthSniff.php
+++ b/Yoast/Sniffs/NamingConventions/ObjectNameDepthSniff.php
@@ -2,6 +2,7 @@
 
 namespace YoastCS\Yoast\Sniffs\NamingConventions;
 
+use PHPCSUtils\Utils\Namespaces;
 use PHPCSUtils\Utils\ObjectDeclarations;
 use WordPressCS\WordPress\Sniff as WPCS_Sniff;
 
@@ -74,7 +75,7 @@ public function register() {
 	public function process_token( $stackPtr ) {
 
 		// Check whether we are in a namespace or not.
-		if ( $this->determine_namespace( $stackPtr ) === '' ) {
+		if ( Namespaces::determineNamespace( $this->phpcsFile, $stackPtr ) === '' ) {
 			return;
 		}
 
diff --git a/Yoast/Sniffs/NamingConventions/ValidHookNameSniff.php b/Yoast/Sniffs/NamingConventions/ValidHookNameSniff.php
index 565c4860..ea6149c5 100644
--- a/Yoast/Sniffs/NamingConventions/ValidHookNameSniff.php
+++ b/Yoast/Sniffs/NamingConventions/ValidHookNameSniff.php
@@ -3,6 +3,7 @@
 namespace YoastCS\Yoast\Sniffs\NamingConventions;
 
 use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Sniffs\NamingConventions\ValidHookNameSniff as WPCS_ValidHookNameSniff;
 use YoastCS\Yoast\Utils\CustomPrefixesTrait;
 
@@ -118,7 +119,7 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 
 			if ( isset( Tokens::$stringTokens[ $this->tokens[ $first_non_empty ]['code'] ] ) ) {
 				$this->prefix_quote_style = $this->tokens[ $first_non_empty ]['content'][0];
-				$content                  = \trim( $this->strip_quotes( $this->tokens[ $first_non_empty ]['content'] ) );
+				$content                  = \trim( TextStrings::stripQuotes( $this->tokens[ $first_non_empty ]['content'] ) );
 
 				foreach ( $this->validated_prefixes as $prefix ) {
 					if ( \strpos( $prefix, '\\' ) === false
@@ -296,7 +297,7 @@ public function verify_yoast_hook_name( $stackPtr, $parameters ) {
 		 * Check the hook name depth.
 		 */
 		$hook_ptr  = $first_non_empty; // If no other tokens were found, the first non empty will be the hook name.
-		$hook_name = $this->strip_quotes( $this->tokens[ $hook_ptr ]['content'] );
+		$hook_name = TextStrings::stripQuotes( $this->tokens[ $hook_ptr ]['content'] );
 		$hook_name = \substr( $hook_name, \strlen( $this->found_prefix ) );
 
 		$parts      = \explode( '_', $hook_name );
diff --git a/Yoast/Sniffs/Tools/BrainMonkeyRaceConditionSniff.php b/Yoast/Sniffs/Tools/BrainMonkeyRaceConditionSniff.php
index 43f0eddd..0a733801 100644
--- a/Yoast/Sniffs/Tools/BrainMonkeyRaceConditionSniff.php
+++ b/Yoast/Sniffs/Tools/BrainMonkeyRaceConditionSniff.php
@@ -4,6 +4,8 @@
 
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\FunctionDeclarations;
+use PHPCSUtils\Utils\PassedParameters;
+use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\Sniff;
 
 /**
@@ -83,21 +85,21 @@ public function process_token( $stackPtr ) {
 		}
 
 		// Check that this is an expect() for one of the hook functions.
-		$params = $this->get_function_call_parameters( $stackPtr );
-		if ( empty( $params ) ) {
+		$param = PassedParameters::getParameter( $this->phpcsFile, $stackPtr, 1, 'function_name' );
+		if ( empty( $param ) ) {
 			return;
 		}
 
 		$expected   = Tokens::$emptyTokens;
 		$expected[] = \T_CONSTANT_ENCAPSED_STRING;
 
-		$hasUnexpected = $this->phpcsFile->findNext( $expected, $params[1]['start'], ( $params[1]['end'] + 1 ), true );
+		$hasUnexpected = $this->phpcsFile->findNext( $expected, $param['start'], ( $param['end'] + 1 ), true );
 		if ( $hasUnexpected !== false ) {
 			return;
 		}
 
-		$text        = $this->phpcsFile->findNext( Tokens::$emptyTokens, $params[1]['start'], ( $params[1]['end'] + 1 ), true );
-		$textContent = $this->strip_quotes( $this->tokens[ $text ]['content'] );
+		$text        = $this->phpcsFile->findNext( Tokens::$emptyTokens, $param['start'], ( $param['end'] + 1 ), true );
+		$textContent = TextStrings::stripQuotes( $this->tokens[ $text ]['content'] );
 		if ( $textContent !== 'apply_filters' && $textContent !== 'do_action' ) {
 			return;
 		}
diff --git a/Yoast/Sniffs/Yoast/AlternativeFunctionsSniff.php b/Yoast/Sniffs/Yoast/AlternativeFunctionsSniff.php
index aab45ae8..d628990a 100644
--- a/Yoast/Sniffs/Yoast/AlternativeFunctionsSniff.php
+++ b/Yoast/Sniffs/Yoast/AlternativeFunctionsSniff.php
@@ -2,6 +2,9 @@
 
 namespace YoastCS\Yoast\Sniffs\Yoast;
 
+use PHPCSUtils\Utils\MessageHelper;
+use PHPCSUtils\Utils\Namespaces;
+use PHPCSUtils\Utils\PassedParameters;
 use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
 
 /**
@@ -49,7 +52,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 		$fixable    = true;
 		$message    = $this->groups[ $group_name ]['message'];
 		$is_error   = ( $this->groups[ $group_name ]['type'] === 'error' );
-		$error_code = $this->string_to_errorcode( $group_name . '_' . $matched_content );
+		$error_code = MessageHelper::stringToErrorcode( $group_name . '_' . $matched_content );
 		$data       = [
 			$matched_content,
 			$replacement,
@@ -65,7 +68,7 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 				 * The function `WPSEO_Utils:format_json_encode()` is only a valid alternative
 				 * when only the first parameter is passed.
 				 */
-				if ( $this->get_function_call_parameter_count( $stackPtr ) !== 1 ) {
+				if ( PassedParameters::getParameterCount( $this->phpcsFile, $stackPtr ) !== 1 ) {
 					$fixable     = false;
 					$error_code .= 'WithAdditionalParams';
 				}
@@ -74,13 +77,13 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 		}
 
 		if ( $fixable === false ) {
-			$this->addMessage( $message, $stackPtr, $is_error, $error_code, $data );
+			MessageHelper::addMessage( $this->phpcsFile, $message, $stackPtr, $is_error, $error_code, $data );
 			return;
 		}
 
-		$fix = $this->addFixableMessage( $message, $stackPtr, $is_error, $error_code, $data );
+		$fix = MessageHelper::addFixableMessage( $this->phpcsFile, $message, $stackPtr, $is_error, $error_code, $data );
 		if ( $fix === true ) {
-			$namespaced = $this->determine_namespace( $stackPtr );
+			$namespaced = Namespaces::determineNamespace( $this->phpcsFile, $stackPtr );
 
 			if ( empty( $namespaced ) || empty( $replacement ) ) {
 				$this->phpcsFile->fixer->replaceToken( $stackPtr, $replacement );