From 807fed793f9c6842baa4eb7e4c5b6d87781fe7d2 Mon Sep 17 00:00:00 2001
Date: Sun, 18 Jun 2017 15:49:43 +0200
Subject: [PATCH] Deprecated notices should be classified as
E_(USER_)DEPRECATED.
---
src/wp-includes/compat.php | 5 +++++
src/wp-includes/functions.php | 45 ++++++++++++++++++++++++-------------------
2 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/src/wp-includes/compat.php b/src/wp-includes/compat.php
index 0ccee2d..24227d2 100644
--- a/src/wp-includes/compat.php
+++ b/src/wp-includes/compat.php
@@ -578,3 +578,8 @@ if ( ! function_exists( 'spl_autoload_register' ) ):
return $GLOBALS['_wp_spl_autoloaders'];
}
endif;
+
+// E_USER_DEPRECATED was introduced in PHP 5.3
+if ( ! defined( 'E_USER_DEPRECATED' ) ) {
+ define( 'E_USER_DEPRECATED', E_USER_WARNING );
+}
diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index 828f123..20f5a24 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -3800,6 +3800,7 @@ function absint( $maybeint ) {
* This function is to be used in every function that is deprecated.
*
* @since 2.5.0
+ * @since 4.9.0 The error type is now classified as E_USER_DEPRECATED (used to default to E_USER_NOTICE).
* @access private
*
* @param string $function The function that was called.
@@ -3830,16 +3831,16 @@ function _deprecated_function( $function, $version, $replacement = null ) {
if ( function_exists( '__' ) ) {
if ( ! is_null( $replacement ) ) {
/* translators: 1: PHP function name, 2: version number, 3: alternative function name */
- trigger_error( sprintf( __('%1$s is deprecated since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
+ trigger_error( sprintf( __('%1$s is deprecated since version %2$s! Use %3$s instead.'), $function, $version, $replacement ), E_USER_DEPRECATED );
} else {
/* translators: 1: PHP function name, 2: version number */
- trigger_error( sprintf( __('%1$s is deprecated since version %2$s with no alternative available.'), $function, $version ) );
+ trigger_error( sprintf( __('%1$s is deprecated since version %2$s with no alternative available.'), $function, $version ), E_USER_DEPRECATED );
}
} else {
if ( ! is_null( $replacement ) ) {
- trigger_error( sprintf( '%1$s is deprecated since version %2$s! Use %3$s instead.', $function, $version, $replacement ) );
+ trigger_error( sprintf( '%1$s is deprecated since version %2$s! Use %3$s instead.', $function, $version, $replacement ), E_USER_DEPRECATED );
} else {
- trigger_error( sprintf( '%1$s is deprecated since version %2$s with no alternative available.', $function, $version ) );
+ trigger_error( sprintf( '%1$s is deprecated since version %2$s with no alternative available.', $function, $version ), E_USER_DEPRECATED );
}
}
}
@@ -3857,6 +3858,7 @@ function _deprecated_function( $function, $version, $replacement = null ) {
*
* @since 4.3.0
* @since 4.5.0 Added the `$parent_class` parameter.
+ * @since 4.9.0 The error type is now classified as E_USER_DEPRECATED (used to default to E_USER_NOTICE).
*
* @access private
*
@@ -3893,19 +3895,19 @@ function _deprecated_constructor( $class, $version, $parent_class = '' ) {
if ( ! empty( $parent_class ) ) {
/* translators: 1: PHP class name, 2: PHP parent class name, 3: version number, 4: __construct() method */
trigger_error( sprintf( __( 'The called constructor method for %1$s in %2$s is deprecated since version %3$s! Use %4$s instead.' ),
- $class, $parent_class, $version, '__construct()
' ) );
+ $class, $parent_class, $version, '__construct()
' ), E_USER_DEPRECATED );
} else {
/* translators: 1: PHP class name, 2: version number, 3: __construct() method */
trigger_error( sprintf( __( 'The called constructor method for %1$s is deprecated since version %2$s! Use %3$s instead.' ),
- $class, $version, '__construct()
' ) );
+ $class, $version, '__construct()
' ), E_USER_DEPRECATED );
}
} else {
if ( ! empty( $parent_class ) ) {
trigger_error( sprintf( 'The called constructor method for %1$s in %2$s is deprecated since version %3$s! Use %4$s instead.',
- $class, $parent_class, $version, '__construct()
' ) );
+ $class, $parent_class, $version, '__construct()
' ), E_USER_DEPRECATED );
} else {
trigger_error( sprintf( 'The called constructor method for %1$s is deprecated since version %2$s! Use %3$s instead.',
- $class, $version, '__construct()
' ) );
+ $class, $version, '__construct()
' ), E_USER_DEPRECATED );
}
}
}
@@ -3924,6 +3926,7 @@ function _deprecated_constructor( $class, $version, $parent_class = '' ) {
* This function is to be used in every file that is deprecated.
*
* @since 2.5.0
+ * @since 4.9.0 The error type is now classified as E_USER_DEPRECATED (used to default to E_USER_NOTICE).
* @access private
*
* @param string $file The file that was included.
@@ -3958,16 +3961,16 @@ function _deprecated_file( $file, $version, $replacement = null, $message = '' )
if ( function_exists( '__' ) ) {
if ( ! is_null( $replacement ) ) {
/* translators: 1: PHP file name, 2: version number, 3: alternative file name */
- trigger_error( sprintf( __('%1$s is deprecated since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message );
+ trigger_error( sprintf( __('%1$s is deprecated since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message, E_USER_DEPRECATED );
} else {
/* translators: 1: PHP file name, 2: version number */
- trigger_error( sprintf( __('%1$s is deprecated since version %2$s with no alternative available.'), $file, $version ) . $message );
+ trigger_error( sprintf( __('%1$s is deprecated since version %2$s with no alternative available.'), $file, $version ) . $message, E_USER_DEPRECATED );
}
} else {
if ( ! is_null( $replacement ) ) {
- trigger_error( sprintf( '%1$s is deprecated since version %2$s! Use %3$s instead.', $file, $version, $replacement ) . $message );
+ trigger_error( sprintf( '%1$s is deprecated since version %2$s! Use %3$s instead.', $file, $version, $replacement ) . $message, E_USER_DEPRECATED );
} else {
- trigger_error( sprintf( '%1$s is deprecated since version %2$s with no alternative available.', $file, $version ) . $message );
+ trigger_error( sprintf( '%1$s is deprecated since version %2$s with no alternative available.', $file, $version ) . $message, E_USER_DEPRECATED );
}
}
}
@@ -3992,6 +3995,7 @@ function _deprecated_file( $file, $version, $replacement = null, $message = '' )
* The current behavior is to trigger a user error if WP_DEBUG is true.
*
* @since 3.0.0
+ * @since 4.9.0 The error type is now classified as E_USER_DEPRECATED (used to default to E_USER_NOTICE).
* @access private
*
* @param string $function The function that was called.
@@ -4022,16 +4026,16 @@ function _deprecated_argument( $function, $version, $message = null ) {
if ( function_exists( '__' ) ) {
if ( ! is_null( $message ) ) {
/* translators: 1: PHP function name, 2: version number, 3: optional message regarding the change */
- trigger_error( sprintf( __('%1$s was called with an argument that is deprecated since version %2$s! %3$s'), $function, $version, $message ) );
+ trigger_error( sprintf( __('%1$s was called with an argument that is deprecated since version %2$s! %3$s'), $function, $version, $message ), E_USER_DEPRECATED );
} else {
/* translators: 1: PHP function name, 2: version number */
- trigger_error( sprintf( __('%1$s was called with an argument that is deprecated since version %2$s with no alternative available.'), $function, $version ) );
+ trigger_error( sprintf( __('%1$s was called with an argument that is deprecated since version %2$s with no alternative available.'), $function, $version ), E_USER_DEPRECATED );
}
} else {
if ( ! is_null( $message ) ) {
- trigger_error( sprintf( '%1$s was called with an argument that is deprecated since version %2$s! %3$s', $function, $version, $message ) );
+ trigger_error( sprintf( '%1$s was called with an argument that is deprecated since version %2$s! %3$s', $function, $version, $message ), E_USER_DEPRECATED );
} else {
- trigger_error( sprintf( '%1$s was called with an argument that is deprecated since version %2$s with no alternative available.', $function, $version ) );
+ trigger_error( sprintf( '%1$s was called with an argument that is deprecated since version %2$s with no alternative available.', $function, $version ), E_USER_DEPRECATED );
}
}
}
@@ -4049,6 +4053,7 @@ function _deprecated_argument( $function, $version, $message = null ) {
* functions, and so generally does not need to be called directly.
*
* @since 4.6.0
+ * @since 4.9.0 The error type is now classified as E_USER_DEPRECATED (used to default to E_USER_NOTICE).
* @access private
*
* @param string $hook The hook that was used.
@@ -4081,10 +4086,10 @@ function _deprecated_hook( $hook, $version, $replacement = null, $message = null
$message = empty( $message ) ? '' : ' ' . $message;
if ( ! is_null( $replacement ) ) {
/* translators: 1: WordPress hook name, 2: version number, 3: alternative hook name */
- trigger_error( sprintf( __( '%1$s is deprecated since version %2$s! Use %3$s instead.' ), $hook, $version, $replacement ) . $message );
+ trigger_error( sprintf( __( '%1$s is deprecated since version %2$s! Use %3$s instead.' ), $hook, $version, $replacement ) . $message, E_USER_DEPRECATED );
} else {
/* translators: 1: WordPress hook name, 2: version number */
- trigger_error( sprintf( __( '%1$s is deprecated since version %2$s with no alternative available.' ), $hook, $version ) . $message );
+ trigger_error( sprintf( __( '%1$s is deprecated since version %2$s with no alternative available.' ), $hook, $version ) . $message, E_USER_DEPRECATED );
}
}
}
@@ -4138,7 +4143,7 @@ function _doing_it_wrong( $function, $message, $version ) {
__( 'https://codex.wordpress.org/Debugging_in_WordPress' )
);
/* translators: Developer debugging message. 1: PHP function name, 2: Explanatory message, 3: Version information message */
- trigger_error( sprintf( __( '%1$s was called incorrectly. %2$s %3$s' ), $function, $message, $version ) );
+ trigger_error( sprintf( __( '%1$s was called incorrectly. %2$s %3$s' ), $function, $message, $version ), E_USER_NOTICE );
} else {
if ( is_null( $version ) ) {
$version = '';
@@ -4148,7 +4153,7 @@ function _doing_it_wrong( $function, $message, $version ) {
$message .= sprintf( ' Please see Debugging in WordPress for more information.',
'https://codex.wordpress.org/Debugging_in_WordPress'
);
- trigger_error( sprintf( '%1$s was called incorrectly. %2$s %3$s', $function, $message, $version ) );
+ trigger_error( sprintf( '%1$s was called incorrectly. %2$s %3$s', $function, $message, $version ), E_USER_NOTICE );
}
}
}
--
2.10.1.windows.1