Merge pull request #2663 from rodrigoprimo/abstract-function-restrictions-improve-namespaced-names-tests

GaryJones · web-flow · commit b050cb46e3cc · 2026-04-23T14:45:33.000+01:00
diff --git a/WordPress/Tests/DB/RestrictedFunctionsUnitTest.inc b/WordPress/Tests/DB/RestrictedFunctionsUnitTest.inc
@@ -23,8 +23,8 @@ prefix_mysql_info(); // Ok.
 
 // MYSQL Extension.
 mysql_affected_rows();
-mysql_connect();
-mysql_close();
+Mysql_CONNECT();
+\MYSQL_close();
 mysql_fetch_row();
 mysql_info();
 mysql_numrows();
@@ -99,6 +99,7 @@ Myfictional(); // OK.
  * Safeguard correct handling of all types of namespaced function calls.
  */
 \mysql_connect();
-MyNamespace\mysql_connect();
-\MyNamespace\mysql_connect();
-namespace\mysql_connect(); // The sniff should start flagging this once it can resolve relative namespaces.
+MyNamespace\mysqli_init();
+\MyNamespace\mysqlnd_qc_clear_cache();
+namespace\maxdb_close(); // The sniff should start flagging this once it can resolve relative namespaces.
+namespace\Sub\mysqli_fetch();
diff --git a/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.inc b/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.inc
@@ -5,13 +5,15 @@ date_default_timezone_set( 'Foo/Bar' ); // Bad.
 $date = new DateTime();
 $date->setTimezone( new DateTimeZone( 'America/Toronto' ) ); // Yay!
 
-$post_data['post_title'] = sprintf( __( 'Draft created on %1$s at %2$s' ), date( __( 'F j, Y' ), $now ), date( __( 'g:i a' ), $now ) ); // Error.
+$post_data['post_title'] = sprintf( __( 'Draft created on %1$s at %2$s' ), date( __( 'F j, Y' ), $now ), DaTe( __( 'g:i a' ), $now ) ); // Error.
 $post_data['post_title'] = sprintf( __( 'Draft created on %1$s at %2$s' ), gmdate( __( 'F j, Y' ), $now ), gmdate( __( 'g:i a' ), $now ) ); // OK.
 
 /*
  * Safeguard correct handling of all types of namespaced function calls.
  */
 \date_default_timezone_set( 'Foo/Bar' );
-MyNamespace\date_default_timezone_set( 'Foo/Bar' );
+\DATE_default_timezone_SET( 'Foo/Bar' );
+MyNamespace\date( 'Y-m-d' );
 \MyNamespace\date_default_timezone_set( 'Foo/Bar' );
-namespace\date_default_timezone_set( 'Foo/Bar' ); // The sniff should start flagging this once it can resolve relative namespaces.
+namespace\date( 'Y-m-d' ); // The sniff should start flagging this once it can resolve relative namespaces.
+namespace\Sub\date_default_timezone_set( 'Foo/Bar' );
diff --git a/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php b/WordPress/Tests/DateTime/RestrictedFunctionsUnitTest.php
@@ -30,6 +30,7 @@ public function getErrorList() {
 			3  => 1,
 			8  => 2,
 			14 => 1,
+			15 => 1,
 		);
 	}
 
diff --git a/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.inc b/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.inc
@@ -30,7 +30,7 @@ phpinfo(); // Ok - within excluded group.
 
 // Reset group exclusions.
 // phpcs:set WordPress.PHP.DevelopmentFunctions exclude[]
-trigger_error(); // Error.
+\TRIGGER_ERROR(); // Error.
 phpinfo(); // Error.
 
 Wrapper_Class::var_dump(); // OK, not the native PHP function.
@@ -40,6 +40,7 @@ $wrapper ->var_dump(); // OK, not the native PHP function.
  * Safeguard correct handling of all types of namespaced function calls.
  */
 \var_dump( $value );
-MyNamespace\var_dump( $value );
-\MyNamespace\var_dump( $value );
-namespace\var_dump( $value ); // The sniff should start flagging this once it can resolve relative namespaces.
+MyNamespace\phpinfo();
+\MyNamespace\print_r( $value );
+namespace\error_reporting(); // The sniff should start flagging this once it can resolve relative namespaces.
+namespace\Sub\debug_backtrace();
diff --git a/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.inc b/WordPress/Tests/PHP/DiscouragedPHPFunctionsUnitTest.inc
@@ -1,13 +1,13 @@
 <?php
 
-// Safeguard against false positives on namespaced function calls.
-MyNamespace\serialize( $value );
-\MyNamespace\serialize( $value );
-namespace\serialize( $value ); // The sniff should start flagging this once it can resolve relative namespaces.
+
+
+
+
 
 serialize(); // Warning.
 \serialize( $value ); // Warning.
-unserialize(); // Warning.
+UNserialize(); // Warning.
 
 urlencode(); // Warning.
 rawurlencode(); // Ok.
@@ -19,7 +19,7 @@ ini_restore(); // Warning.
 magic_quotes_runtime(); // Warning.
 set_magic_quotes_runtime(); // Warning.
 apache_setenv(); // Warning.
-putenv(); // Warning.
+\PUTENV(); // Warning.
 set_include_path(); // Warning.
 restore_include_path(); // Warning.
 
@@ -41,3 +41,11 @@ $handle = popen( '/bin/ls', 'r' );
 // Issue #898.
 class System {}
 class Serialize {}
+
+/*
+ * Safeguard correct handling of all types of namespaced function calls.
+ */
+MyNamespace\urlencode( $value );
+\MyNamespace\putenv( $value );
+namespace\exec( $command ); // The sniff should start flagging this once it can resolve relative namespaces.
+namespace\Sub\base64_decode( $value );
diff --git a/WordPress/Tests/PHP/DontExtractUnitTest.inc b/WordPress/Tests/PHP/DontExtractUnitTest.inc
@@ -1,6 +1,7 @@
 <?php
 
 extract( array( 'a' => 1 ) ); // Bad.
+exTRAct( array( 'a' => 1 ) ); // Bad.
 
 // Similarly named functions or methods however are fine.
 my_extract(); // Ok.
@@ -12,6 +13,8 @@ $my_object->extract(); // Ok.
  * Safeguard correct handling of all types of namespaced function calls.
  */
 \extract( array( 'a' => 1 ) );
+\EXTRACT( array( 'a' => 1 ) );
 MyNamespace\extract( array( 'a' => 1 ) );
 \MyNamespace\extract( array( 'a' => 1 ) );
 namespace\extract( array( 'a' => 1 ) ); // The sniff should start flagging this once it can resolve relative namespaces.
+namespace\Sub\extract( array( 'a' => 1 ) );
diff --git a/WordPress/Tests/PHP/DontExtractUnitTest.php b/WordPress/Tests/PHP/DontExtractUnitTest.php
@@ -30,7 +30,9 @@ final class DontExtractUnitTest extends AbstractSniffUnitTest {
 	public function getErrorList() {
 		return array(
 			3  => 1,
-			14 => 1,
+			4  => 1,
+			15 => 1,
+			16 => 1,
 		);
 	}
 
diff --git a/WordPress/Tests/PHP/POSIXFunctionsUnitTest.inc b/WordPress/Tests/PHP/POSIXFunctionsUnitTest.inc
@@ -13,9 +13,9 @@ $title = preg_split( 'cool', get_the_title() ); // Good.
 if ( ereg( '[A-Za-z]+', $title, $regs ) ) // Bad, ereg deprecated. Use preg_match instead.
 	die( $regs );
 
-if ( eregi( '[a-z]+', $title, $regs ) ) {} // Bad, eregi deprecated. Use preg_match instead.
+if ( \EREGI( '[a-z]+', $title, $regs ) ) {} // Bad, eregi deprecated. Use preg_match instead.
 
-$title = ereg_replace( 'cool', 'not cool', get_the_title() ); // Bad, ereg_replace has been deprecated. Use preg_replace instead.
+$title = ereg_REPLACE( 'cool', 'not cool', get_the_title() ); // Bad, ereg_replace has been deprecated. Use preg_replace instead.
 
 $title = eregi_replace( 'cool', 'not cool', get_the_title() ); // Bad, eregi_replace also deprecated. Use preg_replace instead.
 
@@ -29,6 +29,7 @@ sql_regcase( 'Foo - bar.'); // Bad. Deprecated.
  * Safeguard correct handling of all types of namespaced function calls.
  */
 \split( ':', $date );
-MyNamespace\split( ':', $date );
-\MyNamespace\split( ':', $date );
-namespace\split( ':', $date ); // The sniff should start flagging this once it can resolve relative namespaces.
+MyNamespace\ereg( 'pattern', $string );
+\MyNamespace\ereg_replace( 'pattern', 'replacement', $string );
+namespace\spliti( ':', $date ); // The sniff should start flagging this once it can resolve relative namespaces.
+namespace\Sub\sql_regcase( 'string' );
diff --git a/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.inc b/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.inc
@@ -3,11 +3,14 @@
 add_action( 'widgets_init', create_function( '', // Error.
 	'return register_widget( "time_more_on_time_widget" );'
 ) );
+CREATE_function( '', '' ); // Error.
 
 /*
  * Safeguard correct handling of all types of namespaced function calls.
  */
 \create_function('', 'return;');
+\Create_Function('', 'return;');
 MyNamespace\create_function('', 'return;');
 \MyNamespace\create_function('', 'return;');
 namespace\create_function('', 'return;'); // The sniff should start flagging this once it can resolve relative namespaces.
+namespace\Sub\create_function('', 'return;');
diff --git a/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php b/WordPress/Tests/PHP/RestrictedPHPFunctionsUnitTest.php
@@ -28,7 +28,9 @@ final class RestrictedPHPFunctionsUnitTest extends AbstractSniffUnitTest {
 	public function getErrorList() {
 		return array(
 			3  => 1,
-			10 => 1,
+			6  => 1,
+			11 => 1,
+			12 => 1,
 		);
 	}
 
diff --git a/WordPress/Tests/Security/SafeRedirectUnitTest.inc b/WordPress/Tests/Security/SafeRedirectUnitTest.inc
@@ -1,12 +1,15 @@
 <?php
 
 wp_redirect( $location ); // Warning.
+WP_redirect( $location ); // Warning.
 wp_safe_redirect( $location ); // OK.
 
 /*
  * Safeguard correct handling of all types of namespaced function calls.
  */
 \wp_redirect( $location );
+\wp_REDIRECT( $location );
 MyNamespace\wp_redirect( $location );
 \MyNamespace\wp_redirect( $location );
 namespace\wp_redirect( $location ); // The sniff should start flagging this once it can resolve relative namespaces.
+namespace\Sub\wp_redirect( $location );
diff --git a/WordPress/Tests/Security/SafeRedirectUnitTest.php b/WordPress/Tests/Security/SafeRedirectUnitTest.php
@@ -36,8 +36,10 @@ public function getErrorList() {
 	 */
 	public function getWarningList() {
 		return array(
-			3 => 1,
-			9 => 1,
+			3  => 1,
+			4  => 1,
+			10 => 1,
+			11 => 1,
 		);
 	}
 }
diff --git a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.2.inc b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.2.inc
@@ -4,6 +4,13 @@
  * Safeguard correct handling of all types of namespaced function calls.
  */
 \the_category_ID();
-MyNamespace\the_category_ID();
-\MyNamespace\the_category_ID();
-namespace\the_category_ID(); // The sniff should start flagging this once it can resolve relative namespaces.
+\THE_category_id();
+MyNamespace\permalink_link();
+\MyNamespace\get_postdata();
+namespace\create_user(); // The sniff should start flagging this once it can resolve relative namespaces.
+namespace\Sub\user_can_edit_post();
+
+/*
+ * Safeguard correct handling of non-standard case function call.
+ */
+wp_ADMIN_bar_HEADER();
diff --git a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
@@ -92,7 +92,9 @@ public function getErrorList( $testFile = '' ) {
 
 			case 'DeprecatedFunctionsUnitTest.2.inc':
 				return array(
-					6 => 1,
+					6  => 1,
+					7  => 1,
+					16 => 1,
 				);
 
 			default:
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.1.inc b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.1.inc
@@ -1,7 +1,7 @@
 <?php
 
 query_posts(); // Warning, use WP_Query instead.
-wp_reset_query(); // Warning, use wp_reset_postdata instead.
+WP_reset_QUERY(); // Warning, use wp_reset_postdata instead.
 
 /*
  * Tests which are more specifically for the AbstractFunctionRestrictionsSniff class and Helper methods.
@@ -12,12 +12,12 @@ $obj->query_posts(); // OK, not the global function.
 MyClass::wp_reset_query(); // OK, not the global function.
 $obj?->query_posts(); // OK, not the global function.
 
-// Ensure the sniff doesn't act on namespaced calls.
-MyNamespace\query_posts(); // OK, not the global function.
-\MyNamespace\query_posts(); // OK, not the global function.
-namespace\query_posts(); // OK, not the global function.
-// ... but does act on fully qualified function calls.
-\query_posts(); // Warning.
+
+
+
+
+
+
 
 // Ensure the sniff doesn't act on functions not listed in the target functions array.
 query_post(); // OK, not one of the target functions.
@@ -64,6 +64,11 @@ wp_reset_query(); // OK, excluded group.
 // Safeguard that a function used as a PHP 8.1+ first class callable is also flagged.
 call_user_func( query_posts(...), $param ); // Warning.
 
-// Live coding/parse error.
-// This has to be the last test in the file!!!
-\query_posts
+/*
+ * Safeguard correct handling of all types of namespaced function calls.
+ */
+\query_POSTS(); // Warning.
+MyNamespace\wp_reset_query(); // OK, not the global function.
+\MyNamespace\query_posts(); // OK, not the global function.
+namespace\wp_reset_query(); // OK, not the global function.
+namespace\Sub\query_posts(); // OK, not the global function.
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.2.inc b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.2.inc
@@ -0,0 +1,8 @@
+<?php
+
+/*
+ * Intentional parse error (missing opening parenthesis).
+ * This should be the only test in this file.
+ */
+
+\query_posts
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
@@ -36,18 +36,26 @@ public function getErrorList() {
 	/**
 	 * Returns the lines where warnings should occur.
 	 *
+	 * @param string $testFile The name of the test file being run.
+	 *
 	 * @return array<int, int> Key is the line number, value is the number of expected warnings.
 	 */
-	public function getWarningList() {
-		return array(
-			3  => 1,
-			4  => 1,
-			20 => 1,
-			33 => 1,
-			34 => 1,
-			53 => 1,
-			62 => 1,
-			65 => 1,
-		);
+	public function getWarningList( $testFile = '' ) {
+		switch ( $testFile ) {
+			case 'DiscouragedFunctionsUnitTest.1.inc':
+				return array(
+					3  => 1,
+					4  => 1,
+					33 => 1,
+					34 => 1,
+					53 => 1,
+					62 => 1,
+					65 => 1,
+					70 => 1,
+				);
+
+			default:
+				return array();
+		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ public function getErrorList() {`
`30`	`30`	`3 => 1,`
`31`	`31`	`8 => 2,`
`32`	`32`	`14 => 1,`
	`33`	`+ 15 => 1,`
`33`	`34`	`);`
`34`	`35`	`}`
`35`	`36`