Merge pull request #2361 from WordPress/feature/helpers-final-trait-methods

Author: GaryJones

.phpcs.xml.dist

@@ -80,6 +80,9 @@
 		<exclude-pattern>/WordPress/Sniffs/Security/(EscapeOutput|NonceVerification|ValidatedSanitizedInput)Sniff\.php$</exclude-pattern>
 	</rule>
 
+	<!-- Enforce that methods in traits are always final. -->
+	<rule ref="Universal.FunctionDeclarations.RequireFinalMethodsInTraits"/>
+
 
 	<!--
 	#############################################################################

WordPress/Helpers/EscapingFunctionsTrait.php

@@ -214,7 +214,7 @@ trait EscapingFunctionsTrait {
 	 *
 	 * @return bool
 	 */
-	public function is_escaping_function( $functionName ) {
+	final public function is_escaping_function( $functionName ) {
 		if ( array() === $this->allEscapingFunctions
 			|| $this->customEscapingFunctions !== $this->addedCustomEscapingFunctions['escape']
 		) {
@@ -238,7 +238,7 @@ public function is_escaping_function( $functionName ) {
 	 *
 	 * @return bool
 	 */
-	public function is_auto_escaped_function( $functionName ) {
+	final public function is_auto_escaped_function( $functionName ) {
 		if ( array() === $this->allAutoEscapedFunctions
 			|| $this->customAutoEscapedFunctions !== $this->addedCustomEscapingFunctions['autoescape']
 		) {

WordPress/Helpers/IsUnitTestTrait.php

@@ -127,7 +127,7 @@ trait IsUnitTestTrait {
 	 *
 	 * @return array<string, bool>
 	 */
-	protected function get_all_test_classes() {
+	final protected function get_all_test_classes() {
 		if ( array() === $this->all_test_classes
 			|| $this->custom_test_classes !== $this->added_custom_test_classes
 		) {
@@ -179,7 +179,7 @@ protected function get_all_test_classes() {
 	 *
 	 * @return bool True if the class is a unit test class, false otherwise.
 	 */
-	protected function is_test_class( File $phpcsFile, $stackPtr ) {
+	final protected function is_test_class( File $phpcsFile, $stackPtr ) {
 
 		$tokens = $phpcsFile->getTokens();
 

WordPress/Helpers/MinimumWPVersionTrait.php

@@ -95,7 +95,7 @@ trait MinimumWPVersionTrait {
 	 *
 	 * @return void
 	 */
-	protected function set_minimum_wp_version() {
+	final protected function set_minimum_wp_version() {
 		$minimum_wp_version = '';
 
 		// Use a ruleset provided value if available.
@@ -128,7 +128,7 @@ protected function set_minimum_wp_version() {
 	 *
 	 * @return bool
 	 */
-	protected function wp_version_compare( $version1, $version2, $operator ) {
+	final protected function wp_version_compare( $version1, $version2, $operator ) {
 		$version1 = $this->normalize_version_number( $version1 );
 		$version2 = $this->normalize_version_number( $version2 );
 

WordPress/Helpers/PrintingFunctionsTrait.php

@@ -92,7 +92,7 @@ trait PrintingFunctionsTrait {
 	 *
 	 * @return array<string, bool>
 	 */
-	public function get_printing_functions() {
+	final public function get_printing_functions() {
 		if ( array() === $this->allPrintingFunctions
 			|| $this->customPrintingFunctions !== $this->addedCustomPrintingFunctions
 		) {
@@ -116,7 +116,7 @@ public function get_printing_functions() {
 	 *
 	 * @return bool
 	 */
-	public function is_printing_function( $functionName ) {
+	final public function is_printing_function( $functionName ) {
 		return isset( $this->get_printing_functions()[ strtolower( $functionName ) ] );
 	}
 }

WordPress/Helpers/SanitizationHelperTrait.php

@@ -190,7 +190,7 @@ trait SanitizationHelperTrait {
 	 *
 	 * @return array<string, bool>
 	 */
-	public function get_sanitizing_functions() {
+	final public function get_sanitizing_functions() {
 		if ( array() === $this->allSanitizingFunctions
 			|| $this->customSanitizingFunctions !== $this->addedCustomSanitizingFunctions['sanitize']
 		) {
@@ -212,7 +212,7 @@ public function get_sanitizing_functions() {
 	 *
 	 * @return array<string, bool>
 	 */
-	public function get_sanitizing_and_unslashing_functions() {
+	final public function get_sanitizing_and_unslashing_functions() {
 		if ( array() === $this->allUnslashingSanitizingFunctions
 			|| $this->customUnslashingSanitizingFunctions !== $this->addedCustomSanitizingFunctions['unslashsanitize']
 		) {
@@ -236,7 +236,7 @@ public function get_sanitizing_and_unslashing_functions() {
 	 *
 	 * @return bool
 	 */
-	public function is_sanitizing_function( $functionName ) {
+	final public function is_sanitizing_function( $functionName ) {
 		return isset( $this->get_sanitizing_functions()[ strtolower( $functionName ) ] );
 	}
 
@@ -249,7 +249,7 @@ public function is_sanitizing_function( $functionName ) {
 	 *
 	 * @return bool
 	 */
-	public function is_sanitizing_and_unslashing_function( $functionName ) {
+	final public function is_sanitizing_and_unslashing_function( $functionName ) {
 		return isset( $this->get_sanitizing_and_unslashing_functions()[ strtolower( $functionName ) ] );
 	}
 
@@ -266,7 +266,7 @@ public function is_sanitizing_and_unslashing_function( $functionName ) {
 	 *
 	 * @return bool Whether the token is only within a sanitization.
 	 */
-	public function is_only_sanitized( File $phpcsFile, $stackPtr ) {
+	final public function is_only_sanitized( File $phpcsFile, $stackPtr ) {
 		$tokens = $phpcsFile->getTokens();
 
 		// If it isn't being sanitized at all.
@@ -317,7 +317,7 @@ public function is_only_sanitized( File $phpcsFile, $stackPtr ) {
 	 *
 	 * @return bool Whether the token is being sanitized.
 	 */
-	public function is_sanitized( File $phpcsFile, $stackPtr, $unslash_callback = null ) {
+	final public function is_sanitized( File $phpcsFile, $stackPtr, $unslash_callback = null ) {
 		$tokens          = $phpcsFile->getTokens();
 		$require_unslash = is_callable( $unslash_callback );
 

WordPress/Helpers/WPDBTrait.php

@@ -47,7 +47,7 @@ trait WPDBTrait {
 	 *
 	 * @return bool Whether this is a $wpdb method call.
 	 */
-	protected function is_wpdb_method_call( File $phpcsFile, $stackPtr, $target_methods ) {
+	final protected function is_wpdb_method_call( File $phpcsFile, $stackPtr, $target_methods ) {
 		$tokens = $phpcsFile->getTokens();
 		if ( isset( $tokens[ $stackPtr ] ) === false ) {
 			return false;