diff --git a/WordPressVIPMinimum/Sniffs/Classes/DeclarationCompatibilitySniff.php b/WordPressVIPMinimum/Sniffs/Classes/DeclarationCompatibilitySniff.php
index 9a930319..10381feb 100644
--- a/WordPressVIPMinimum/Sniffs/Classes/DeclarationCompatibilitySniff.php
+++ b/WordPressVIPMinimum/Sniffs/Classes/DeclarationCompatibilitySniff.php
@@ -10,35 +10,54 @@
 namespace WordPressVIPMinimum\Sniffs\Classes;
 
 use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\AbstractScopeSniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
 use PHPCSUtils\Utils\FunctionDeclarations;
 use PHPCSUtils\Utils\ObjectDeclarations;
 
 /**
  * Class WordPressVIPMinimum_Sniffs_Classes_DeclarationCompatibilitySniff
  */
-class DeclarationCompatibilitySniff extends AbstractScopeSniff {
+class DeclarationCompatibilitySniff implements Sniff {
 
 	/**
-	 * The name of the class we are currently checking.
+	 * A list of classes and methods to check.
+	 *
+	 * @deprecated 3.1.0 This should never have been a public property.
 	 *
-	 * @var string
+	 * @var array<string, array<string, array<int|string, string|array<string, bool|string>>>>
 	 */
-	private $currentClass = '';
+	public $checkClasses = [];
 
 	/**
-	 * A list of classes and methods to check.
+	 * List of grouped classes with same methods (as they extend the same parent class).
 	 *
-	 * @var array<string, array<string, array<int|string, string|array<string, bool|string>>>>
+	 * @deprecated 3.1.0 This should never have been a public property.
+	 *
+	 * @var array<string, string[]>
+	 */
+	public $checkClassesGroups = [];
+
+	/**
+	 * A list of classes and information on the methods to check for those classes.
+	 *
+	 * @var array<string, array<string, array<string, array<string, bool|string>>>>
 	 */
-	public $checkClasses = [
+	private $methodSignatures = [
 		'WP_Widget' => [
-			'widget'                => [ 'args', 'instance' ],
-			'update'                => [ 'new_instance', 'old_instance' ],
-			'form'                  => [ 'instance' ],
+			'widget'                => [
+				'args'     => [],
+				'instance' => [],
+			],
+			'update'                => [
+				'new_instance' => [],
+				'old_instance' => [],
+			],
+			'form'                  => [
+				'instance' => [],
+			],
 			'WP_Widget'             => [
-				'id_base',
-				'name',
+				'id_base'         => [],
+				'name'            => [],
 				'widget_options'  => [
 					'default' => 'array()',
 				],
@@ -46,16 +65,22 @@ class DeclarationCompatibilitySniff extends AbstractScopeSniff {
 					'default' => 'array()',
 				],
 			],
-			'get_field_name'        => [ 'field_name' ],
-			'get_field_id'          => [ 'field_name' ],
+			'get_field_name'        => [
+				'field_name' => [],
+			],
+			'get_field_id'          => [
+				'field_name' => [],
+			],
 			'_register'             => [],
-			'_set'                  => [ 'number' ],
+			'_set'                  => [
+				'number' => [],
+			],
 			'_get_display_callback' => [],
 			'_get_update_callback'  => [],
 			'_get_form_callback'    => [],
 			'is_preview'            => [],
 			'display_callback'      => [
-				'args',
+				'args'        => [],
 				'widget_args' => [
 					'default' => '1',
 				],
@@ -70,14 +95,17 @@ class DeclarationCompatibilitySniff extends AbstractScopeSniff {
 					'default' => '1',
 				],
 			],
-			'register_one'          => [
+			'_register_one'         => [
 				'number' => [
 					'default' => '-1',
 				],
 			],
-			'save_settings'         => [ 'settings' ],
+			'save_settings'         => [
+				'settings' => [],
+			],
 			'get_settings'          => [],
 		],
+
 		'Walker'    => [
 			'start_lvl'                   => [
 				'output' => [
@@ -105,7 +133,7 @@ class DeclarationCompatibilitySniff extends AbstractScopeSniff {
 				'output'            => [
 					'pass_by_reference' => true,
 				],
-				'data_object',
+				'data_object'       => [],
 				'depth'             => [
 					'default' => '0',
 				],
@@ -117,50 +145,50 @@ class DeclarationCompatibilitySniff extends AbstractScopeSniff {
 				],
 			],
 			'end_el'                      => [
-				'output' => [
+				'output'      => [
 					'pass_by_reference' => true,
 				],
-				'data_object',
-				'depth'  => [
+				'data_object' => [],
+				'depth'       => [
 					'default' => '0',
 				],
-				'args'   => [
+				'args'        => [
 					'default' => 'array()',
 				],
 			],
 			'display_element'             => [
-				'element',
+				'element'           => [],
 				'children_elements' => [
 					'pass_by_reference' => true,
 				],
-				'max_depth',
-				'depth',
-				'args',
+				'max_depth'         => [],
+				'depth'             => [],
+				'args'              => [],
 				'output'            => [
 					'pass_by_reference' => true,
 				],
 			],
 			'walk'                        => [
-				'elements',
-				'max_depth',
-				'args' => [
+				'elements'  => [],
+				'max_depth' => [],
+				'args'      => [
 					'variable_length' => true,
 				],
 			],
 			'paged_walk'                  => [
-				'elements',
-				'max_depth',
-				'page_num',
-				'per_page',
-				'args' => [
+				'elements'  => [],
+				'max_depth' => [],
+				'page_num'  => [],
+				'per_page'  => [],
+				'args'      => [
 					'variable_length' => true,
 				],
 			],
 			'get_number_of_root_elements' => [
-				'elements',
+				'elements' => [],
 			],
 			'unset_children'              => [
-				'element',
+				'element'           => [],
 				'children_elements' => [
 					'pass_by_reference' => true,
 				],
@@ -169,143 +197,213 @@ class DeclarationCompatibilitySniff extends AbstractScopeSniff {
 	];
 
 	/**
-	 * List of grouped classes with same methods (as they extend the same parent class)
+	 * Classes this sniff checks for being extended.
 	 *
-	 * @var array<string, string[]>
+	 * @var array<string, string> Key is the name of a potentially extended class,
+	 *                            value the canonical name for the method signatures definition.
 	 */
-	public $checkClassesGroups = [
-		'Walker' => [
-			'Walker_Category_Checklist',
-			'Walker_Category',
-			'Walker_CategoryDropdown',
-			'Walker_PageDropdown',
-			'Walker_Nav_Menu',
-			'Walker_Page',
-			'Walker_Comment',
-		],
+	private $extendedClassToSignatures = [
+		'WP_Widget'                 => 'WP_Widget',
+		'Walker'                    => 'Walker',
+		'Walker_Category_Checklist' => 'Walker',
+		'Walker_Category'           => 'Walker',
+		'Walker_CategoryDropdown'   => 'Walker',
+		'Walker_PageDropdown'       => 'Walker',
+		'Walker_Nav_Menu'           => 'Walker',
+		'Walker_Page'               => 'Walker',
+		'Walker_Comment'            => 'Walker',
 	];
 
 	/**
-	 * Constructs the test with the tokens it wishes to listen for.
+	 * Translate from case-insensitive names to proper case method names.
+	 *
+	 * @var array<string, array<string, string>> Primary key is the class name in proper case.
+	 *                                           Value is an array with method names in lowercase as keys
+	 *                                           and these same method names in proper case as values.
 	 */
-	public function __construct() {
-		parent::__construct( [ T_CLASS ], [ T_FUNCTION ], true );
-	}
+	private $methodToProperCase = [];
 
 	/**
-	 * Processes this test when one of its tokens is encountered.
-	 *
-	 * @param File $phpcsFile The PHP_CodeSniffer file where the token was found.
-	 * @param int  $stackPtr  The position of the current token in the stack passed in $tokens.
-	 * @param int  $currScope A pointer to the start of the scope.
+	 * Translate from case-insensitive names to proper case class names.
 	 *
-	 * @return void
+	 * @var array<string, string> Key is the lowercase name of a class, value the proper case.
 	 */
-	protected function processTokenWithinScope( File $phpcsFile, $stackPtr, $currScope ) {
-
-		$className = ObjectDeclarations::getName( $phpcsFile, $currScope );
+	private $classToProperCase = [];
 
-		if ( $className !== $this->currentClass ) {
-			$this->currentClass = $className;
+	/**
+	 * Returns the token types that this sniff is interested in.
+	 *
+	 * @return array<int|string>
+	 */
+	public function register() {
+		// Lowercase all names to allow for correct comparisons, as PHP treats class/function names case-insensitively.
+		// But also store translation tables to be able to get the proper case.
+		foreach ( $this->methodSignatures as $key => $value ) {
+			$methodNames                      = array_keys( $value );
+			$this->methodToProperCase[ $key ] = array_change_key_case( array_combine( $methodNames, $methodNames ), CASE_LOWER );
+
+			$this->methodSignatures[ $key ] = array_change_key_case( $value, CASE_LOWER );
 		}
 
-		$methodName = FunctionDeclarations::getName( $phpcsFile, $stackPtr );
+		$classNames                      = array_keys( $this->extendedClassToSignatures );
+		$this->classToProperCase         = array_change_key_case( array_combine( $classNames, $classNames ), CASE_LOWER );
+		$this->extendedClassToSignatures = array_change_key_case( $this->extendedClassToSignatures, CASE_LOWER );
+
+		return [
+			T_CLASS,
+			T_ANON_CLASS,
+		];
+	}
 
-		$parentClassName = ObjectDeclarations::findExtendedClassName( $phpcsFile, $currScope );
+	/**
+	 * Processes the tokens that this sniff is interested in.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the current token
+	 *                                               in the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process( File $phpcsFile, $stackPtr ) {
+		$parentClassName = ObjectDeclarations::findExtendedClassName( $phpcsFile, $stackPtr );
 		if ( $parentClassName === false ) {
 			// This class does not extend any other class.
 			return;
 		}
 
-		// Need to define the originalParentClassName since we might override the parentClassName due to signature notations grouping.
-		$originalParentClassName = $parentClassName;
-
-		if ( array_key_exists( $parentClassName, $this->checkClasses ) === false ) {
+		$parentClassNameLC = ltrim( strtolower( $parentClassName ), '\\' ); // Trim off potential FQN indicator.
+		if ( isset( $this->extendedClassToSignatures[ $parentClassNameLC ] ) === false ) {
 			// This class does not extend a class we are interested in.
-			foreach ( $this->checkClassesGroups as $parent => $children ) {
-				// But it might be one of the grouped classes.
-				foreach ( $children as $child ) {
-					if ( $child === $parentClassName ) {
-						$parentClassName = $parent;
-						break 2;
-					}
-				}
-			}
-			if ( array_key_exists( $parentClassName, $this->checkClasses ) === false ) {
-				// This class really does not extend a class we are interested in.
-				return;
-			}
+			return;
 		}
 
-		if ( array_key_exists( $methodName, $this->checkClasses[ $parentClassName ] ) === false &&
-			in_array( $methodName, $this->checkClasses[ $parentClassName ], true ) === false
-		) {
-			// This method is not a one we are interested in.
+		// Store the originalParentClassName since we might override the parentClassName due to signature notations grouping.
+		$originalParentClassNamePC = $this->classToProperCase[ $parentClassNameLC ];
+		$parentClassName           = $this->extendedClassToSignatures[ $parentClassNameLC ];
+
+		$methods = ObjectDeclarations::getDeclaredMethods( $phpcsFile, $stackPtr );
+		if ( empty( $methods ) ) {
 			return;
 		}
 
-		$signatureParams = FunctionDeclarations::getParameters( $phpcsFile, $stackPtr );
+		foreach ( $methods as $methodName => $functionPtr ) {
+			$methodNameLC = strtolower( $methodName );
+			if ( isset( $this->methodSignatures[ $parentClassName ][ $methodNameLC ] ) === false ) {
+				// This method is not one we are interested in.
+				continue;
+			}
+
+			$methodNamePC = $this->methodToProperCase[ $parentClassName ][ $methodNameLC ];
+
+			$childParams     = FunctionDeclarations::getParameters( $phpcsFile, $functionPtr );
+			$childParamCount = count( $childParams );
 
-		$parentSignature = $this->checkClasses[ $parentClassName ][ $methodName ];
+			$parentParams     = $this->methodSignatures[ $parentClassName ][ $methodNameLC ];
+			$parentParamCount = count( $parentParams );
 
-		if ( count( $signatureParams ) > count( $parentSignature ) ) {
-			$extra_params                  = array_slice( $signatureParams, count( $parentSignature ) - count( $signatureParams ) );
-			$all_extra_params_have_default = true;
-			foreach ( $extra_params as $extra_param ) {
-				if ( array_key_exists( 'default', $extra_param ) === false || $extra_param['default'] !== 'true' ) {
-					$all_extra_params_have_default = false;
+			/*
+			 * If there are parameters, verify if the last parameter of both the parent and the child are variadic.
+			 * Only the last parameter can be variadic and if the parent has this, the child must also,
+			 * independently of potential extra optional parameters having been inserted before that last parameter.
+			 *
+			 * Also note that a child can make the last parameter variadic, even if the parent parameter was not.
+			 * This will no longer trigger a warning since PHP 8.0.
+			 */
+			if ( $childParamCount > 0 && $parentParamCount > 0 ) {
+				$childLastParam  = $childParams[ $childParamCount - 1 ];
+				$parentLastParam = $parentParams[ array_keys( $parentParams )[ $parentParamCount - 1 ] ];
+
+				if ( ( isset( $parentLastParam['variable_length'] ) === true && $parentLastParam['variable_length'] === true )
+					&& $childLastParam['variable_length'] !== true
+				) {
+					$this->addError( $phpcsFile, $functionPtr, $stackPtr, $originalParentClassNamePC, $methodNamePC, $childParams, $parentParams );
+					continue;
 				}
 			}
-			if ( $all_extra_params_have_default === true ) {
-				return; // We're good.
+
+			if ( $childParamCount > 0 ) {
+				// Check that no other parameters in the child signature are declared as variadic.
+				for ( $i = 0; $i < ( $childParamCount - 1 ); $i++ ) {
+					if ( $childParams[ $i ]['variable_length'] === true ) {
+						$this->addError( $phpcsFile, $functionPtr, $stackPtr, $originalParentClassNamePC, $methodNamePC, $childParams, $parentParams );
+						continue 2;
+					}
+				}
 			}
-		}
 
-		if ( count( $signatureParams ) !== count( $parentSignature ) ) {
-			$this->addError( $originalParentClassName, $methodName, $signatureParams, $parentSignature, $phpcsFile, $stackPtr );
-			return;
-		}
+			if ( $childParamCount > $parentParamCount ) {
+				$extra_params                  = array_slice( $childParams, $parentParamCount - $childParamCount );
+				$all_extra_params_have_default = true;
+				foreach ( $extra_params as $extra_param ) {
+					if ( isset( $extra_param['default'] ) === false
+						&& $extra_param['variable_length'] === false
+					) {
+						$all_extra_params_have_default = false;
+						break;
+					}
+				}
 
-		$i = 0;
-		foreach ( $parentSignature as $key => $param ) {
-			if ( is_array( $param ) === true ) {
+				if ( $all_extra_params_have_default === false ) {
+					$this->addError( $phpcsFile, $functionPtr, $stackPtr, $originalParentClassNamePC, $methodNamePC, $childParams, $parentParams );
+					continue;
+				}
+			} elseif ( $childParamCount !== $parentParamCount ) {
+				$this->addError( $phpcsFile, $functionPtr, $stackPtr, $originalParentClassNamePC, $methodNamePC, $childParams, $parentParams );
+				continue;
+			}
+
+			$i = 0;
+			foreach ( $parentParams as $param ) {
 				if (
 					(
-						array_key_exists( 'default', $param ) === true &&
-						array_key_exists( 'default', $signatureParams[ $i ] ) === false
+						isset( $param['default'] ) === true
+						&& isset( $childParams[ $i ]['default'] ) === false
+						&& $childParams[ $i ]['variable_length'] === false
 					) || (
-						array_key_exists( 'pass_by_reference', $param ) === true &&
-						$param['pass_by_reference'] !== $signatureParams[ $i ]['pass_by_reference']
+						// Parameter in parent class has reference, child does not.
+						isset( $param['pass_by_reference'] ) === true
+						&& $param['pass_by_reference'] !== $childParams[ $i ]['pass_by_reference']
 					) || (
-						array_key_exists( 'variable_length', $param ) === true &&
-						$param['variable_length'] !== $signatureParams[ $i ]['variable_length']
+						// Parameter in parent class does *not* have reference, child does.
+						( isset( $param['pass_by_reference'] ) === false
+						|| $param['pass_by_reference'] === false )
+						&& $childParams[ $i ]['pass_by_reference'] === true
 					)
 				) {
-					$this->addError( $originalParentClassName, $methodName, $signatureParams, $parentSignature, $phpcsFile, $stackPtr );
-					return;
+					$this->addError( $phpcsFile, $functionPtr, $stackPtr, $originalParentClassNamePC, $methodNamePC, $childParams, $parentParams );
+					continue 2;
 				}
+				++$i;
 			}
-			++$i;
 		}
 	}
 
 	/**
-	 * Generates an error with nice current and parent class method notations
+	 * Generates an error with nice current and parent class method notations.
 	 *
-	 * @param string $parentClassName        The name of the extended (parent) class.
-	 * @param string $methodName             The name of the method currently being examined.
-	 * @param array  $currentMethodSignature The list of params and their options of the method which is being examined.
-	 * @param array  $parentMethodSignature  The list of params and their options of the parent class method.
-	 * @param File   $phpcsFile              The PHP_CodeSniffer file where the token was found.
-	 * @param int    $stackPtr               The position of the current token in the stack.
+	 * @param File                                      $phpcsFile              The PHP_CodeSniffer file where the token was found.
+	 * @param int                                       $stackPtr               The position of the current T_FUNCTION token in the stack.
+	 * @param int                                       $currScope              A pointer to the start of the OO scope.
+	 * @param string                                    $parentClassName        The name of the extended (parent) class.
+	 * @param string                                    $methodName             The name of the method currently being examined.
+	 * @param array<int, array<string, mixed>>          $currentMethodSignature The list of params and their options of the method
+	 *                                                                          which is being examined.
+	 * @param array<string, array<string, bool|string>> $parentMethodSignature  The list of params and their options of the parent class method.
 	 *
 	 * @return void
 	 */
-	private function addError( $parentClassName, $methodName, $currentMethodSignature, $parentMethodSignature, $phpcsFile, $stackPtr ) {
+	private function addError( File $phpcsFile, $stackPtr, $currScope, $parentClassName, $methodName, $currentMethodSignature, $parentMethodSignature ) {
+		$tokens           = $phpcsFile->getTokens();
+		$currentClassName = '[AnonymousClass]';
+		if ( $tokens[ $currScope ]['code'] !== T_ANON_CLASS ) {
+			$currentClassName = ObjectDeclarations::getName( $phpcsFile, $currScope );
+		}
 
-		$currentSignature = sprintf( '%s::%s(%s)', $this->currentClass, $methodName, implode( ', ', $this->generateParamList( $currentMethodSignature ) ) );
+		$currentSignature = implode( ', ', $this->generateParamList( $currentMethodSignature ) );
+		$currentSignature = sprintf( '%s::%s(%s)', $currentClassName, $methodName, $currentSignature );
 
-		$parentSignature = sprintf( '%s::%s(%s)', $parentClassName, $methodName, implode( ', ', $this->generateParamList( $parentMethodSignature ) ) );
+		$parentSignature = implode( ', ', $this->generateParamList( $parentMethodSignature ) );
+		$parentSignature = sprintf( '%s::%s(%s)', $parentClassName, $methodName, $parentSignature );
 
 		$message = 'Declaration of `%s` should be compatible with `%s`.';
 		$data    = [ $currentSignature, $parentSignature ];
@@ -323,26 +421,26 @@ private function generateParamList( $methodSignature ) {
 		$paramList = [];
 		foreach ( $methodSignature as $param => $options ) {
 			$paramName = '$';
-			if ( is_array( $options ) === false ) {
-				$paramList[] = '$' . $options;
+			if ( empty( $options ) === true ) {
+				$paramList[] = '$' . $param;
 				continue;
 			}
 
-			if ( array_key_exists( 'name', $options ) === true ) {
+			if ( isset( $options['name'] ) === true ) {
 				$paramName = $options['name'];
 			} else {
 				$paramName .= $param;
 			}
 
-			if ( array_key_exists( 'variable_length', $options ) === true && $options['variable_length'] === true ) {
+			if ( isset( $options['variable_length'] ) === true && $options['variable_length'] === true ) {
 				$paramName = '...' . $paramName;
 			}
 
-			if ( array_key_exists( 'pass_by_reference', $options ) === true && $options['pass_by_reference'] === true ) {
+			if ( isset( $options['pass_by_reference'] ) === true && $options['pass_by_reference'] === true ) {
 				$paramName = '&' . $paramName;
 			}
 
-			if ( array_key_exists( 'default', $options ) === true && empty( $options['default'] ) === false ) {
+			if ( isset( $options['default'] ) === true && empty( $options['default'] ) === false ) {
 				$paramName .= ' = ' . trim( $options['default'] );
 			}
 
@@ -351,12 +449,4 @@ private function generateParamList( $methodSignature ) {
 
 		return $paramList;
 	}
-
-	/**
-	 * Do nothing outside the scope. Has to be implemented accordingly to parent abstract class.
-	 *
-	 * @param File $phpcsFile PHPCS File.
-	 * @param int  $stackPtr  Stack position.
-	 */
-	public function processTokenOutsideScope( File $phpcsFile, $stackPtr ) {}
 }
diff --git a/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.1.inc b/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.1.inc
new file mode 100644
index 00000000..8ae13ced
--- /dev/null
+++ b/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.1.inc
@@ -0,0 +1,189 @@
+<?php
+
+// Test case file for the WP_Widget child class declarations.
+
+class WidgetOkay extends WP_Widget {
+	// Not a method we're interested in. Should be ignored.
+	public function register_one($whatever, &$you, $want = null) {}
+
+	// Methods which are being checked.
+	public function widget( $args, $instance ) {}
+	public function update( $new_instance, $old_instance ) {}
+	public function form( $instance ) {}
+	public function WP_Widget( $id_base, $name, $widget_options = array(), $control_options = array() ) {}
+	public function get_field_name( $field_name ) {}
+	public function get_field_id( $field_name ) {}
+	public function _register() {}
+	public function _set( $number ) {}
+	public function _get_display_callback() {}
+	public function _get_update_callback() {}
+	public function _get_form_callback() {}
+	public function is_preview() {}
+	public function display_callback( $args, $widget_args = 1 ) {}
+	public function update_callback( $deprecated = 1 ) {}
+	public function form_callback( $widget_args = 1 ) {}
+	public function _register_one( $number = -1 ) {}
+	public function save_settings( $settings ) {}
+	public function get_settings() {}
+}
+
+// These methods all change required parameters from the parent class into optional ones by adding a default value.
+// This will not cause a signature mismatch in PHP since PHP 5.3.
+readonly class WidgetOkayDefaultValueWhereParentHasNone extends WP_Widget {
+	public function widget( $args = array(), $instance = array(), ) {}
+	public function update( $new_instance = array(), $old_instance = array()) {}
+	public function form( $instance = array() ) {}
+	public function WP_Widget( $id_base = '', $name = '', $widget_options = array(), $control_options = array() ) {}
+	public function get_field_name( $field_name = '' ) {}
+	public function get_field_id( $field_name = '' ) {}
+	public function _set( $number = 10 ) {}
+	public function display_callback( $args = 2, $widget_args = 1 ) {}
+	public function save_settings( $settings = array() ) {}
+}
+
+$WidgetOkayDifferentDefaultValue = new #[MyAttribute] readonly class extends \WP_Widget {
+	public function WP_Widget( $id_base, $name, $widget_options = null, $control_options = null ) {}
+	public function display_callback( $args, $widget_args = [] ) {}
+	public function update_callback( $deprecated = true, ) {}
+	public function form_callback( $widget_args = 2 ) {}
+	public function _register_one( $number = 100 ) {}
+};
+
+class WidgetBadTooFewParamsNoParam extends WP_Widget {
+	public function widget() {} // Bad, missing $args and $instance params.
+	public function update() {} // Bad, missing $new_instance $old_instance params.
+	public function form() {} // Bad, missing $instance param.
+	public function WP_Widget() {} // Bad, missing $id_base, $name, $widget_options, $control_options params.
+	public function get_field_name() {} // Bad, missing $field_name param.
+	public function get_field_id() {} // Bad, missing $field_name param.
+	public function _set() {} // Bad, missing $number param.
+	public function display_callback() {} // Bad, missing $args, and $widget_args params.
+	public function update_callback() {} // Bad, missing $depracated param.
+	public function form_callback() {} // Bad, missing $widget_args param.
+	public function _register_one() {} // Bad, missing $number param.
+	public function save_settings() {} // Bad, missing $settings param.
+}
+
+final class WidgetBadTooFewParamsNotAllParams extends WP_WIDGET {
+	public function widget( $args ) {} // Bad, missing $instance param.
+	public function update( $new_instance ) {} // Bad, missing $old_instance param.
+	public function WP_Widget( $id_base, $name, ) {} // Bad, missing $widget_options and $control_options params.
+	public function display_callback( $args ) {} // Bad, missing $widget_args param.
+}
+
+$WidgetBadExtraRequiredParamsAndMethodNamesAreCaseInsensitive = new class() extends WP_Widget {
+	public function Widget( $args, $instance, $extra_param ) {}
+	public function Update( $new_instance, $old_instance, $extra_param ) {}
+	public function Form( $intance, $extra_param ) {}
+	public function wp_widget( $id_base, $name, $widget_options = array(), $control_options = array(), $extra_param) {}
+	public function Get_Field_Name( $field_name, $extra_param ) {}
+	public function Get_Field_ID( $field_name, $extra_param ) {}
+	public function _Register( $extra_param ) {}
+	public function _Set( $number, $extra_param ) {}
+	public function _Get_Display_Callback($extra_paramA, $extra_paramB) {}
+	public function _Get_Update_Callback( $extra_paramA, $extra_paramB ) {}
+	public function _Get_Form_Callback($extra_param) {}
+	public function is_Preview($extra_param) {}
+	public function display_Callback( $args, $widget_args = 1, $extra_param ) {}
+	public function update_Callback( $deprecated = 1, $extra_param, ) {}
+	public function form_Callback( $widget_args = 1, $extra_param ) {}
+	public function _register_ONE( $number = -1, $extra_param ) {}
+	public function SAVE_SETTINGS( $settings, $extra_param) {}
+	public function get_Settings( $extra_paramA, $extra_paramB, $extra_paramC ) {}
+};
+
+class WidgetBadOptionalParamChangedToRequiredMissingDefaultValue extends wp_widget {
+	public function WP_Widget( $id_base, $name, $widget_options, $control_options = array() ) {} // Bad, missing default value for $widget_options.
+	public function display_callback( $args, $widget_args ) {} // Bad, missing default value for $widget_args.
+	public function update_callback( $deprecated ) {}
+	public function form_callback( $widget_args ) {}
+	public function _register_one( $number ) {}
+}
+
+class WidgetBadChildHasParamReferenceParentDoesNot extends \WP_Widget {
+	public function widget( $args, &$instance ) {}
+	public function update( &$new_instance, $old_instance ) {}
+	public function form( &$instance ) {}
+	public function WP_Widget( $id_base, &$name, $widget_options = array(), &$control_options = array() ) {}
+	public function get_field_name( &$field_name ) {}
+	public function get_field_id( &$field_name ) {}
+	public function _set( &$number ) {}
+	public function display_callback( &$args, $widget_args = 1 ) {}
+	public function update_callback( &$deprecated = 1 ) {}
+	public function form_callback( &$widget_args = 1 ) {}
+	public function _register_one( &$number = -1 ) {}
+	public function save_settings( &$settings ) {}
+}
+
+// It's perfectly valid for child classes to declare extra optional parameters.
+class WidgetOkayExtraOptionalParams extends WP_Widget {
+	public function widget( $args, $instance, $extra_param = array() ) {}
+	public function update( $new_instance, $old_instance, ...$extra_param ) {}
+	public function form( $instance, $extra_param = true ) {}
+	public function WP_Widget( $id_base, $name, $widget_options = array(), $control_options = array(), $extra_param = array() ) {}
+	public function get_field_name( $field_name, $extra_param = 'default') {}
+	public function get_field_id( $field_name, $extra_param = 'id') {}
+	public function _register( $extra_param = false ) {}
+	public function _set( $number, $extra_param = 5 ) {}
+	public function _get_display_callback($paramA = 'A', $paramB = 'B' ) {}
+	public function _get_update_callback( $my_param = true, $my_param2 = 10) {}
+	public function _get_form_callback(...$extra_param) {}
+	public function is_preview( $is_preview = true ) {}
+	public function display_callback( $args, $widget_args = 1, $extra_param = [] ) {}
+	public function update_callback( $deprecated = 1, ...$extra_param ) {}
+	public function form_callback( $widget_args = 1, ...$extra_param ) {}
+	public function _register_one( $number = -1, $extra_param = []) {}
+	public function save_settings( $settings, $extra_param = 10.5) {}
+	public function get_settings( $settings = 'foo', $setting = self::BAR, ...$my_param ) {}
+}
+
+class WidgetOkayChildCanMakeLastParamVariadic extends WP_Widget {
+	public function widget( $args, ...$instance ) {}
+	public function update( $new_instance, ...$old_instance ) {}
+	public function form( ...$instance ) {}
+	public function WP_Widget( $id_base, $name, $widget_options = array(), ...$control_options ) {}
+	public function get_field_name( ...$field_name ) {}
+	public function get_field_id( ...$field_name ) {}
+	public function _set( ...$number ) {}
+	public function display_callback( $args, ...$widget_args ) {}
+	public function update_callback( ...$deprecated ) {}
+	public function form_callback( ...$widget_args ) {}
+	public function _register_one( ...$number ) {}
+	public function save_settings( ...$settings ) {}
+}
+
+class WidgetBadVariadicParamNotLast extends Wp_widget {
+	public function widget( ...$args, $instance ) {}
+	public function update( ...$new_instance, $old_instance ) {}
+	public function WP_Widget( $id_base, $name, ...$widget_options = array(), $control_options = array() ) {}
+	public function get_field_name( ...$field_name, $extra_param = null ) {}
+	public function get_field_id( ...$field_name, $extra_param = null ) {}
+	public function _set( ...$number, $extra_param = null ) {}
+	public function display_callback( ...$args, $widget_args = 1 ) {}
+	public function update_callback( ...$deprecated, $extra_param = null ) {}
+	public function form_callback( ...$widget_args, $extra_param = null ) {}
+	public function _register_one( ...$number, $extra_param = null ) {}
+	public function save_settings( ...$settings, $extra_param = null ) {}
+}
+
+// The fact that all extra parameters are optional, should not hide other errors.
+class WidgetBadExtraOptionalParamsANDOtherError extends WP_Widget {
+	public function update_callback( $deprecated, $extra_param = [] ) {} // Missing default value for $deprecated.
+	public function form_callback( &$widget_args, ...$extra_param ) {} // Invalid reference for $widget_args.
+}
+
+class WidgetBadNestedClassExtends {
+	function nested() {
+		return new class extends WP_Widget {
+			public function display_callback() {}
+		};
+	}
+}
+
+class WidgetBadNestedClassAlsoExtends extends WP_Widget {
+	function nested() {
+		return new class extends WP_Widget {
+			public function display_callback() {}
+		};
+	}
+}
diff --git a/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.2.inc b/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.2.inc
new file mode 100644
index 00000000..8317e84d
--- /dev/null
+++ b/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.2.inc
@@ -0,0 +1,145 @@
+<?php
+
+// Test case file for the Walker child class declarations.
+
+class WalkerOkay extends Walker {
+	// Not a method we're interested in. Should be ignored.
+	public function custom_method($whatever, &$you, $want = null) {}
+
+	// Methods which are being checked.
+	public function start_lvl( &$output, $depth = 0, $args = array() ) {}
+	public function end_lvl( &$output, $depth = 0, $args = array() ) {}
+	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) {}
+	public function end_el( &$output, $data_object, $depth = 0, $args = array(), ) {}
+	public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) {}
+	public function walk( $elements, $max_depth, ...$args ) {}
+	public function paged_walk( $elements, $max_depth, $page_num, $per_page, ...$args ) {}
+	public function get_number_of_root_elements( $elements, ) {}
+	public function unset_children( $element, &$children_elements ) {}
+}
+
+// These methods all change required parameters from the parent class into optional ones by adding a default value.
+// This will not cause a signature mismatch in PHP since PHP 5.3.
+final class WalkerOkayDefaultValueWhereParentHasNone extends \Walker_Page {
+	public function start_lvl( &$output = '', $depth = 0, $args = array() ) {}
+	public function end_lvl( &$output = '', $depth = 0, $args = array() ) {}
+	public function start_el( &$output = '', $data_object = new stdClass, $depth = 0, $args = array(), $current_object_id = 0 ) {}
+	public function end_el( &$output = '', $data_object = new stdClass(), $depth = 0, $args = array() ) {}
+	public function display_element( $element = new stdClass(), &$children_elements = array(), $max_depth = 0, $depth = 0, $args = array(), &$output = '' ) {}
+	public function walk( $elements = array(), $max_depth = 0, ...$args ) {}
+	public function paged_walk( $elements = array(), $max_depth = 0, $page_num = 1, $per_page = 10, ...$args ) {}
+	public function get_number_of_root_elements( $elements = array() ) {}
+	public function unset_children( $element = new stdClass, &$children_elements = array(), ) {}
+}
+
+$WalkerOkayDifferentDefaultValue = new class() extends Walker_Category_Checklist {
+	public function start_lvl( &$output, $depth = 2, $args = null ) {}
+	public function end_lvl( &$output, $depth = 1, $args = new stdClass ) {}
+	public function start_el( &$output, $data_object, $depth = 5, $args = null, $current_object_id = 10 ) {}
+	public function end_el( &$output, $data_object, $depth = 10, $args = '' ) {}
+};
+
+class WalkerBadTooFewParamsNoParamAndMethodNamesAreCaseInsensitive extends Walker_Category {
+	public function start_LVL() {}
+	public function End_Lvl() {}
+	public function START_EL() {}
+	public function end_EL() {}
+	public function Display_Element() {}
+	public function WalK() {}
+	public function paged_WALK() {}
+	public function get_Number_Of_Root_Elements() {}
+	public function unset_Children() {}
+}
+
+readonly class WalkerBadTooFewParamsNotAllParams extends walker_categorydropdown {
+	public function start_lvl( &$output, $depth = 0 ) {} // Bad, missing $args param.
+	public function end_lvl( &$output ) {} // Bad, missing $depth and $args params.
+	public function start_el( &$output, $data_object, $depth = 0, ) {} // Bad, missing $args and $current_object_id params.
+	public function end_el( &$output, $data_object ) {} // Bad, missing $depth and $args params.
+	public function display_element( $element, &$children_elements, $max_depth, $depth, $args, ) {} // Bad, missing $output param.
+	public function walk( $elements, $max_depth ) {} // Bad, missing $args param.
+	public function paged_walk( $elements, $max_depth, $page_num ) {} // Bad, missing $per_page and $args params.
+	public function unset_children( $element ) {} // Bad, missing $children_elements param.
+}
+
+$WalkerBadExtraRequiredParams = new #[MyAttribute] readonly class extends \Walker_PageDropdown {
+	public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output, $extra_param ) {}
+	public function get_number_of_root_elements( $elements, $extra_param, ) {}
+	public function unset_children( $element, &$children_elements, $extra_paramA, $extra_paramB ) {}
+}
+
+class WalkerBadOptionalParamChangedToRequiredMissingDefaultValue extends Walker_Nav_Menu {
+	public function start_lvl( &$output, $depth, $args ) {}
+	public function end_lvl( &$output, $depth, $args = array() ) {}
+	public function start_el( &$output, $data_object, $depth, $args, $current_object_id ) {}
+	public function end_el( &$output, $data_object, $depth, $args ) {}
+}
+
+class WalkerBadMissingReferences extends Walker_Comment {
+	public function start_lvl( $output, $depth = 0, $args = array() ) {}
+	public function end_lvl( $output, $depth = 0, $args = array() ) {}
+	public function start_el( $output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) {}
+	public function end_el( $output, $data_object, $depth = 0, $args = array() ) {}
+	public function display_element( $element, $children_elements, $max_depth, $depth, $args, &$output ) {}
+	public function unset_children( $element, $children_elements, ) {}
+}
+
+class WalkerBadMissingReferencesToo extends Walker_Comment {
+	public function display_element( $element, &$children_elements, $max_depth, $depth, $args, $output ) {}
+}
+
+class WalkerBadVariadicArgumentNotDeclaredAsVariadic extends Walker {
+	public function walk( $elements, $max_depth, $args ) {}
+	public function paged_walk( $elements, $max_depth, $page_num, $per_page, $args ) {}
+}
+
+class WalkerBadChildHasParamReferenceParentDoesNot extends Walker_Category {
+	public function start_lvl( &$output, &$depth = 0, $args = array() ) {}
+	public function end_lvl( &$output, $depth = 0, &$args = array() ) {}
+	public function start_el( &$output, $data_object, $depth = 0, $args = array(), &$current_object_id = 0 ) {}
+	public function end_el( &$output, $data_object, &$depth = 0, $args = array(), ) {}
+	public function display_element( &$element, &$children_elements, $max_depth, $depth, $args, &$output ) {}
+	public function walk( $elements, &$max_depth, ...$args ) {}
+	public function paged_walk( $elements, $max_depth, &$page_num, $per_page, ...$args ) {}
+	public function get_number_of_root_elements( &$elements, ) {}
+	public function unset_children( &$element, &$children_elements ) {}
+}
+
+// It's perfectly valid for child classes to declare extra optional parameters.
+class WalkerOkayExtraOptionalParams extends Walker_CategoryDropdown {
+	public function start_lvl( &$output, $depth = 0, $args = array(), $extra_param = true ) {}
+	public function end_lvl( &$output, $depth = 0, $args = array(), ...$extra_param ) {}
+	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0, $extra_param = array() ) {}
+	public function end_el( &$output, $data_object, $depth = 0, $args = array(), $extra_param = [], ) {}
+	public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output, $extra_param = 'default' ) {}
+	public function walk( $elements, $max_depth, $extra_param = null, ...$args ) {}
+	public function paged_walk( $elements, $max_depth, $page_num, $per_page, $extra_param = null, ...$args ) {}
+	public function get_number_of_root_elements( $elements, $extra_param = 10, ) {}
+	public function unset_children( $element, &$children_elements, $extra_param = '', ) {}
+}
+
+class WalkerOkayChildCanMakeLastParamVariadic extends Walker_Page {
+	public function start_lvl( &$output, $depth = 0, ...$args ) {}
+	public function end_lvl( &$output, $depth = 0, ...$args ) {}
+	public function start_el( &$output, $data_object, $depth = 0, $args = array(), ...$current_object_id ) {}
+	public function end_el( &$output, $data_object, $depth = 0, ...$args, ) {}
+	public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &...$output ) {}
+	public function get_number_of_root_elements( ...$elements, ) {}
+	public function unset_children( $element, &...$children_elements ) {}
+}
+
+class WalkerBadVariadicParamNotLast extends WALKER_NAV_MENU {
+	public function start_lvl( &$output, ...$depth, $args = array() ) {}
+	public function end_lvl( &...$output, $depth = 0, $args = array() ) {}
+	public function start_el( &$output, ...$data_object, $depth = 0, $args = array(), $current_object_id = 0 ) {}
+	public function end_el( &$output, $data_object, ...$depth, $args = array(), ) {}
+	public function display_element( $element, &$children_elements, ...$max_depth, $depth, $args, &$output ) {}
+	public function get_number_of_root_elements( ...$elements, $extra_param = 10, ) {}
+	public function unset_children( ...$element, &$children_elements ) {}
+}
+
+// The fact that all extra parameters are optional, should not hide other errors.
+class WalkerBadExtraOptionalParamsANDOtherError extends Walker_Category_Checklist {
+	public function start_lvl( $output, $depth = 0, $args = array(), $extra_param = true ) {} // Missing reference for $output.
+	public function end_lvl( &$output, $depth, $args = array(), ...$extra_param ) {} // Missing default value for $depth.
+}
diff --git a/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.3.inc b/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.3.inc
new file mode 100644
index 00000000..b82b03c0
--- /dev/null
+++ b/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.3.inc
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Not our targets.
+ */
+class DoesNotExtend {
+	function foo() {}
+}
+
+class ExtendsDifferentClass extends FooBar {
+	function foo() {}
+}
+
+class ExtendsFullyQualifiedClass extends \Different\NS\WP_Widget {
+	function save_settings() {}
+}
+
+class ExtendsPartiallyQualifiedClass extends Also\Different\NS\Walker_Page {
+	function save_settings() {}
+}
+
+class NoMethods extends WP_Widget {}
+
+class WidgetOkayNestedFunctionIsNotMethod extends WP_Widget {
+	public function hasNested() {
+		// Functions can be declared nested within other functions. That doesn't make them methods.
+		function is_preview($extra_param) {}
+	}
+}
+
+class WidgetOkayNestedClassDoesNotExtend extends WP_Widget {
+	function hasNestedClass() {
+		return new class {
+			public function display_callback() {}
+		};
+	}
+}
diff --git a/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.inc b/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.inc
deleted file mode 100644
index 740a7883..00000000
--- a/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.inc
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-
-class MyWidget extends WP_Widget {
-	function widget() {
-	} // Bad, missing $args and $instance params.
-
-	function update() {
-	} // Bad, missing $new_instance $old_instance params.
-
-	function form() {
-	} // Bad, missing $instance param.
-
-	function WP_Widget() {
-	} // Bad, missing $id_base, $name, $widget_options, $control_options params.
-
-	function get_field_name() {
-	} // Bad, missing $field_name param.
-
-	function get_field_id() {
-	} // Bad, missing $field_name param.
-
-	function _register() {
-	} // OK, no params.
-
-	function _set() {
-	} // Bad, missing $number param.
-
-	function _get_display_callback() {
-	} // OK, no params.
-
-	function _get_update_callback() {
-	} // Ok, no params.
-
-	function _get_form_callback() {
-	} // OK, no params.
-
-	function is_preview() {
-	} // OK, no params.
-
-	function display_callback() {
-	} // Bad, missing $args, and $widget_args params.
-
-	function update_callback() {
-	} // Bad, missing $depracated param.
-
-	function form_callback() {
-	} // Bad, missing $widget_args param.
-
-	function register_one() {
-	} // Bad, missing $number param.
-
-	function save_settings() {
-	} // Bad, missing $settings param.
-
-	function get_settings() {
-	} // OK, no params.
-
-}
-
-class MyWidget2 extends WP_Widget {
-	function widget( $args ) {
-	} // Bad, missing $instance param.
-
-	function update( $new_instance, $old_instance ) {
-	} // OK.
-
-	function form( $intance, $my_param ) {
-	} // Bad, extra $my_param param.
-
-	function WP_Widget( $id_base, $name, $widget_options, $control_options = array() ) {
-	} // Bad, missing default value for $widget_options.
-
-	function get_field_name( $field_name ) {
-	} // Ok.
-
-	function get_field_id( $field_name, $my_param ) {
-	} // Bad, extra $my_param param.
-
-	function _register( $my_param ) {
-	} // Bad, extra $my_param param.
-
-	function _set( $number ) {
-	} // Ok.
-
-	function _get_display_callback() {
-	} // OK, no params.
-
-	function _get_update_callback( $my_param, $my_param2 ) {
-	} // Bad, extra $my_param and $my_param2 params.
-
-	function _get_form_callback() {
-	} // OK, no params.
-
-	function is_preview( $is_preview = true ) {
-	} // OK, extra $is_preview param, but with default value.
-
-	function display_callback( $args = 2, $widget_args = 1 ) {
-	} // Ok, despite $args having a default value.
-
-	function update_callback( $depracated = true ) {
-	} // Ok.
-
-	function form_callback( $widget_args = 2 ) {
-	} // Ok, despite having different default value.
-
-	function register_one( $number ) {
-	} // Bad, the param should have a default value. Should be $number.
-
-	function save_settings( $setting ) {
-	} // Ok, despite wrong param name, which should be $settings.
-
-	function get_settings( $settings, $setting, $my_param ) {
-	} // Bad, 3 extra params.
-
-}
-
-class MyWalker extends Walker {
-
-	function start_lvl( $output, $depth, $args = array() ) {
-	} // Bad. $output should be passed by reference, $depth should have a default value.
-
-	function end_lvl( &$output, $depth = 0, $args = array() ) {
-	} // Ok.
-
-	function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) {
-	} // Ok.
-
-	function unset_children( $element, $children_elements ) {
-	} // Bad. $children_elements should be passed by reference
-
-	function walk( $elements, $max_depth, ...$args ) {
-	} // Ok.
-
-	function paged_walk( $elements, $max_depth, $page_num, $per_page ) {
-	} // Bad. Missing $args.
-
-	function paged_walk( $elements, $max_depth, $page_num, $per_page, $args ) {
-	} // Bad. $args is not variadic.
-
-	function start_el( $output, $data_object, $depth, $args = array(), $current_object_id = 0 ) {
-	} // Bad. $output should be passed by reference, $depth should have a default value.
-
-	function end_el( &$output, $data_object, $depth = 0, $args = array() ) {
-	} // Ok.
-}
diff --git a/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.php b/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.php
index 817bc324..7f38c00c 100644
--- a/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Classes/DeclarationCompatibilityUnitTest.php
@@ -19,36 +19,140 @@ class DeclarationCompatibilityUnitTest extends AbstractSniffUnitTest {
 	/**
 	 * Returns the lines where errors should occur.
 	 *
+	 * @param string $testFile The name of the file being tested.
+	 *
 	 * @return array<int, int> Key is the line number, value is the number of expected errors.
 	 */
-	public function getErrorList() {
-		return [
-			4   => 1,
-			7   => 1,
-			10  => 1,
-			13  => 1,
-			16  => 1,
-			19  => 1,
-			25  => 1,
-			40  => 1,
-			43  => 1,
-			46  => 1,
-			49  => 1,
-			52  => 1,
-			61  => 1,
-			67  => 1,
-			70  => 1,
-			76  => 1,
-			79  => 1,
-			88  => 1,
-			106 => 1,
-			112 => 1,
-			119 => 1,
-			128 => 1,
-			134 => 1,
-			137 => 1,
-			140 => 1,
-		];
+	public function getErrorList( $testFile = '' ) {
+		switch ( $testFile ) {
+			case 'DeclarationCompatibilityUnitTest.1.inc':
+				return [
+					53  => 1,
+					54  => 1,
+					55  => 1,
+					56  => 1,
+					57  => 1,
+					58  => 1,
+					59  => 1,
+					60  => 1,
+					61  => 1,
+					62  => 1,
+					63  => 1,
+					64  => 1,
+					68  => 1,
+					69  => 1,
+					70  => 1,
+					71  => 1,
+					75  => 1,
+					76  => 1,
+					77  => 1,
+					78  => 1,
+					79  => 1,
+					80  => 1,
+					81  => 1,
+					82  => 1,
+					83  => 1,
+					84  => 1,
+					85  => 1,
+					86  => 1,
+					87  => 1,
+					88  => 1,
+					89  => 1,
+					90  => 1,
+					91  => 1,
+					92  => 1,
+					96  => 1,
+					97  => 1,
+					98  => 1,
+					99  => 1,
+					100 => 1,
+					104 => 1,
+					105 => 1,
+					106 => 1,
+					107 => 1,
+					108 => 1,
+					109 => 1,
+					110 => 1,
+					111 => 1,
+					112 => 1,
+					113 => 1,
+					114 => 1,
+					115 => 1,
+					156 => 1,
+					157 => 1,
+					158 => 1,
+					159 => 1,
+					160 => 1,
+					161 => 1,
+					162 => 1,
+					163 => 1,
+					164 => 1,
+					165 => 1,
+					166 => 1,
+					171 => 1,
+					172 => 1,
+					178 => 1,
+					186 => 1,
+				];
+
+			case 'DeclarationCompatibilityUnitTest.2.inc':
+				return [
+					43  => 1,
+					44  => 1,
+					45  => 1,
+					46  => 1,
+					47  => 1,
+					48  => 1,
+					49  => 1,
+					50  => 1,
+					51  => 1,
+					55  => 1,
+					56  => 1,
+					57  => 1,
+					58  => 1,
+					59  => 1,
+					60  => 1,
+					61  => 1,
+					62  => 1,
+					66  => 1,
+					67  => 1,
+					68  => 1,
+					72  => 1,
+					73  => 1,
+					74  => 1,
+					75  => 1,
+					79  => 1,
+					80  => 1,
+					81  => 1,
+					82  => 1,
+					83  => 1,
+					84  => 1,
+					88  => 1,
+					92  => 1,
+					93  => 1,
+					97  => 1,
+					98  => 1,
+					99  => 1,
+					100 => 1,
+					101 => 1,
+					102 => 1,
+					103 => 1,
+					104 => 1,
+					105 => 1,
+					132 => 1,
+					133 => 1,
+					134 => 1,
+					135 => 1,
+					136 => 1,
+					137 => 1,
+					138 => 1,
+					143 => 1,
+					144 => 1,
+				];
+
+			default:
+				return [];
+		}
 	}
 
 	/**