From c8aea02b38c9dbda46de74368aa833694c7428e9 Mon Sep 17 00:00:00 2001 From: hellofromTonya Date: Tue, 26 Sep 2023 11:51:19 +0000 Subject: [PATCH] General: Use wp_trigger_error() in _doing_it_wrong() and _deprecated_*(). Uses `wp_trigger_error()` in `_doing_it_wrong()` and each `_deprecated_*()` function, i.e. instead of `trigger_error()`. To avoid redundancy, uses `wp_trigger_error()` once. How? Saves each message to `$message` variable and then passes it to `wp_trigger_error()` at the end of the function. Functions: * _doing_it_wrong() * _deprecated_function() * _deprecated_constructor() * _deprecated_class() * _deprecated_file() * _deprecated_argument() * _deprecated_hook() Follow-up to [56530]. Props azaozz, costdev, flixos90, hellofromTonya, peterwilsoncc. See #57686. Built from https://develop.svn.wordpress.org/trunk@56705 git-svn-id: http://core.svn.wordpress.org/trunk@56217 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/functions.php | 348 ++++++++++++++++---------------------- wp-includes/version.php | 2 +- 2 files changed, 146 insertions(+), 204 deletions(-) diff --git a/wp-includes/functions.php b/wp-includes/functions.php index a86d8eaa27..d52bcde0be 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -5468,49 +5468,39 @@ function _deprecated_function( $function_name, $version, $replacement = '' ) { if ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) { if ( function_exists( '__' ) ) { if ( $replacement ) { - trigger_error( - sprintf( - /* translators: 1: PHP function name, 2: Version number, 3: Alternative function name. */ - __( 'Function %1$s is deprecated since version %2$s! Use %3$s instead.' ), - $function_name, - $version, - $replacement - ), - E_USER_DEPRECATED + $message = sprintf( + /* translators: 1: PHP function name, 2: Version number, 3: Alternative function name. */ + __( 'Function %1$s is deprecated since version %2$s! Use %3$s instead.' ), + $function_name, + $version, + $replacement ); } else { - trigger_error( - sprintf( - /* translators: 1: PHP function name, 2: Version number. */ - __( 'Function %1$s is deprecated since version %2$s with no alternative available.' ), - $function_name, - $version - ), - E_USER_DEPRECATED + $message = sprintf( + /* translators: 1: PHP function name, 2: Version number. */ + __( 'Function %1$s is deprecated since version %2$s with no alternative available.' ), + $function_name, + $version ); } } else { if ( $replacement ) { - trigger_error( - sprintf( - 'Function %1$s is deprecated since version %2$s! Use %3$s instead.', - $function_name, - $version, - $replacement - ), - E_USER_DEPRECATED + $message = sprintf( + 'Function %1$s is deprecated since version %2$s! Use %3$s instead.', + $function_name, + $version, + $replacement ); } else { - trigger_error( - sprintf( - 'Function %1$s is deprecated since version %2$s with no alternative available.', - $function_name, - $version - ), - E_USER_DEPRECATED + $message = sprintf( + 'Function %1$s is deprecated since version %2$s with no alternative available.', + $function_name, + $version ); } } + + wp_trigger_error( '', $message, E_USER_DEPRECATED ); } } @@ -5560,53 +5550,43 @@ function _deprecated_constructor( $class_name, $version, $parent_class = '' ) { if ( WP_DEBUG && apply_filters( 'deprecated_constructor_trigger_error', true ) ) { if ( function_exists( '__' ) ) { if ( $parent_class ) { - trigger_error( - sprintf( - /* translators: 1: PHP class name, 2: PHP parent class name, 3: Version number, 4: __construct() method. */ - __( 'The called constructor method for %1$s class in %2$s is deprecated since version %3$s! Use %4$s instead.' ), - $class_name, - $parent_class, - $version, - '__construct()' - ), - E_USER_DEPRECATED + $message = sprintf( + /* translators: 1: PHP class name, 2: PHP parent class name, 3: Version number, 4: __construct() method. */ + __( 'The called constructor method for %1$s class in %2$s is deprecated since version %3$s! Use %4$s instead.' ), + $class_name, + $parent_class, + $version, + '__construct()' ); } else { - trigger_error( - sprintf( - /* translators: 1: PHP class name, 2: Version number, 3: __construct() method. */ - __( 'The called constructor method for %1$s class is deprecated since version %2$s! Use %3$s instead.' ), - $class_name, - $version, - '__construct()' - ), - E_USER_DEPRECATED + $message = sprintf( + /* translators: 1: PHP class name, 2: Version number, 3: __construct() method. */ + __( 'The called constructor method for %1$s class is deprecated since version %2$s! Use %3$s instead.' ), + $class_name, + $version, + '__construct()' ); } } else { if ( $parent_class ) { - trigger_error( - sprintf( - 'The called constructor method for %1$s class in %2$s is deprecated since version %3$s! Use %4$s instead.', - $class_name, - $parent_class, - $version, - '__construct()' - ), - E_USER_DEPRECATED + $message = sprintf( + 'The called constructor method for %1$s class in %2$s is deprecated since version %3$s! Use %4$s instead.', + $class_name, + $parent_class, + $version, + '__construct()' ); } else { - trigger_error( - sprintf( - 'The called constructor method for %1$s class is deprecated since version %2$s! Use %3$s instead.', - $class_name, - $version, - '__construct()' - ), - E_USER_DEPRECATED + $message = sprintf( + 'The called constructor method for %1$s class is deprecated since version %2$s! Use %3$s instead.', + $class_name, + $version, + '__construct()' ); } } + + wp_trigger_error( '', $message, E_USER_DEPRECATED ); } } @@ -5651,49 +5631,39 @@ function _deprecated_class( $class_name, $version, $replacement = '' ) { if ( WP_DEBUG && apply_filters( 'deprecated_class_trigger_error', true ) ) { if ( function_exists( '__' ) ) { if ( $replacement ) { - trigger_error( - sprintf( - /* translators: 1: PHP class name, 2: Version number, 3: Alternative class or function name. */ - __( 'Class %1$s is deprecated since version %2$s! Use %3$s instead.' ), - $class_name, - $version, - $replacement - ), - E_USER_DEPRECATED + $message = sprintf( + /* translators: 1: PHP class name, 2: Version number, 3: Alternative class or function name. */ + __( 'Class %1$s is deprecated since version %2$s! Use %3$s instead.' ), + $class_name, + $version, + $replacement ); } else { - trigger_error( - sprintf( - /* translators: 1: PHP class name, 2: Version number. */ - __( 'Class %1$s is deprecated since version %2$s with no alternative available.' ), - $class_name, - $version - ), - E_USER_DEPRECATED + $message = sprintf( + /* translators: 1: PHP class name, 2: Version number. */ + __( 'Class %1$s is deprecated since version %2$s with no alternative available.' ), + $class_name, + $version ); } } else { if ( $replacement ) { - trigger_error( - sprintf( - 'Class %1$s is deprecated since version %2$s! Use %3$s instead.', - $class_name, - $version, - $replacement - ), - E_USER_DEPRECATED + $message = sprintf( + 'Class %1$s is deprecated since version %2$s! Use %3$s instead.', + $class_name, + $version, + $replacement ); } else { - trigger_error( - sprintf( - 'Class %1$s is deprecated since version %2$s with no alternative available.', - $class_name, - $version - ), - E_USER_DEPRECATED + $message = sprintf( + 'Class %1$s is deprecated since version %2$s with no alternative available.', + $class_name, + $version ); } } + + wp_trigger_error( '', $message, E_USER_DEPRECATED ); } } @@ -5743,49 +5713,39 @@ function _deprecated_file( $file, $version, $replacement = '', $message = '' ) { if ( function_exists( '__' ) ) { if ( $replacement ) { - trigger_error( - sprintf( - /* translators: 1: PHP file name, 2: Version number, 3: Alternative file name. */ - __( 'File %1$s is deprecated since version %2$s! Use %3$s instead.' ), - $file, - $version, - $replacement - ) . $message, - E_USER_DEPRECATED - ); + $message = sprintf( + /* translators: 1: PHP file name, 2: Version number, 3: Alternative file name. */ + __( 'File %1$s is deprecated since version %2$s! Use %3$s instead.' ), + $file, + $version, + $replacement + ) . $message; } else { - trigger_error( - sprintf( - /* translators: 1: PHP file name, 2: Version number. */ - __( 'File %1$s is deprecated since version %2$s with no alternative available.' ), - $file, - $version - ) . $message, - E_USER_DEPRECATED - ); + $message = sprintf( + /* translators: 1: PHP file name, 2: Version number. */ + __( 'File %1$s is deprecated since version %2$s with no alternative available.' ), + $file, + $version + ) . $message; } } else { if ( $replacement ) { - trigger_error( - sprintf( - 'File %1$s is deprecated since version %2$s! Use %3$s instead.', - $file, - $version, - $replacement - ) . $message, - E_USER_DEPRECATED + $message = sprintf( + 'File %1$s is deprecated since version %2$s! Use %3$s instead.', + $file, + $version, + $replacement ); } else { - trigger_error( - sprintf( - 'File %1$s is deprecated since version %2$s with no alternative available.', - $file, - $version - ) . $message, - E_USER_DEPRECATED - ); + $message = sprintf( + 'File %1$s is deprecated since version %2$s with no alternative available.', + $file, + $version + ) . $message; } } + + wp_trigger_error( '', $message, E_USER_DEPRECATED ); } } /** @@ -5837,49 +5797,39 @@ function _deprecated_argument( $function_name, $version, $message = '' ) { if ( WP_DEBUG && apply_filters( 'deprecated_argument_trigger_error', true ) ) { if ( function_exists( '__' ) ) { if ( $message ) { - trigger_error( - sprintf( - /* translators: 1: PHP function name, 2: Version number, 3: Optional message regarding the change. */ - __( 'Function %1$s was called with an argument that is deprecated since version %2$s! %3$s' ), - $function_name, - $version, - $message - ), - E_USER_DEPRECATED + $message = sprintf( + /* translators: 1: PHP function name, 2: Version number, 3: Optional message regarding the change. */ + __( 'Function %1$s was called with an argument that is deprecated since version %2$s! %3$s' ), + $function_name, + $version, + $message ); } else { - trigger_error( - sprintf( - /* translators: 1: PHP function name, 2: Version number. */ - __( 'Function %1$s was called with an argument that is deprecated since version %2$s with no alternative available.' ), - $function_name, - $version - ), - E_USER_DEPRECATED + $message = sprintf( + /* translators: 1: PHP function name, 2: Version number. */ + __( 'Function %1$s was called with an argument that is deprecated since version %2$s with no alternative available.' ), + $function_name, + $version ); } } else { if ( $message ) { - trigger_error( - sprintf( - 'Function %1$s was called with an argument that is deprecated since version %2$s! %3$s', - $function_name, - $version, - $message - ), - E_USER_DEPRECATED + $message = sprintf( + 'Function %1$s was called with an argument that is deprecated since version %2$s! %3$s', + $function_name, + $version, + $message ); } else { - trigger_error( - sprintf( - 'Function %1$s was called with an argument that is deprecated since version %2$s with no alternative available.', - $function_name, - $version - ), - E_USER_DEPRECATED + $message = sprintf( + 'Function %1$s was called with an argument that is deprecated since version %2$s with no alternative available.', + $function_name, + $version ); } } + + wp_trigger_error( '', $message, E_USER_DEPRECATED ); } } @@ -5928,27 +5878,23 @@ function _deprecated_hook( $hook, $version, $replacement = '', $message = '' ) { $message = empty( $message ) ? '' : ' ' . $message; if ( $replacement ) { - trigger_error( - sprintf( - /* translators: 1: WordPress hook name, 2: Version number, 3: Alternative hook name. */ - __( 'Hook %1$s is deprecated since version %2$s! Use %3$s instead.' ), - $hook, - $version, - $replacement - ) . $message, - E_USER_DEPRECATED - ); + $message = sprintf( + /* translators: 1: WordPress hook name, 2: Version number, 3: Alternative hook name. */ + __( 'Hook %1$s is deprecated since version %2$s! Use %3$s instead.' ), + $hook, + $version, + $replacement + ) . $message; } else { - trigger_error( - sprintf( - /* translators: 1: WordPress hook name, 2: Version number. */ - __( 'Hook %1$s is deprecated since version %2$s with no alternative available.' ), - $hook, - $version - ) . $message, - E_USER_DEPRECATED - ); + $message = sprintf( + /* translators: 1: WordPress hook name, 2: Version number. */ + __( 'Hook %1$s is deprecated since version %2$s with no alternative available.' ), + $hook, + $version + ) . $message; } + + wp_trigger_error( '', $message, E_USER_DEPRECATED ); } } @@ -6004,15 +5950,12 @@ function _doing_it_wrong( $function_name, $message, $version ) { __( 'https://wordpress.org/documentation/article/debugging-in-wordpress/' ) ); - trigger_error( - sprintf( - /* translators: Developer debugging message. 1: PHP function name, 2: Explanatory message, 3: WordPress version number. */ - __( 'Function %1$s was called incorrectly. %2$s %3$s' ), - $function_name, - $message, - $version - ), - E_USER_NOTICE + $message = sprintf( + /* translators: Developer debugging message. 1: PHP function name, 2: Explanatory message, 3: WordPress version number. */ + __( 'Function %1$s was called incorrectly. %2$s %3$s' ), + $function_name, + $message, + $version ); } else { if ( $version ) { @@ -6024,16 +5967,15 @@ function _doing_it_wrong( $function_name, $message, $version ) { 'https://wordpress.org/documentation/article/debugging-in-wordpress/' ); - trigger_error( - sprintf( - 'Function %1$s was called incorrectly. %2$s %3$s', - $function_name, - $message, - $version - ), - E_USER_NOTICE + $message = sprintf( + 'Function %1$s was called incorrectly. %2$s %3$s', + $function_name, + $message, + $version ); } + + wp_trigger_error( '', $message ); } } diff --git a/wp-includes/version.php b/wp-includes/version.php index 0d958f95bd..9da69a1742 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.4-alpha-56704'; +$wp_version = '6.4-alpha-56705'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.