From d0f9fb47cedaa0f59e18c36efbb142e796db69af Mon Sep 17 00:00:00 2001
Date: Wed, 20 Apr 2016 20:28:44 +0200
Subject: [PATCH] Deprecated notices should be classified as
E_(USER_)DEPRECATED.
---
src/wp-includes/compat.php | 5 +++++
src/wp-includes/functions.php | 40 ++++++++++++++++++++++------------------
2 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/src/wp-includes/compat.php b/src/wp-includes/compat.php
index cfb0f70..d2fd834 100644
--- a/src/wp-includes/compat.php
+++ b/src/wp-includes/compat.php
@@ -434,3 +434,8 @@ if ( ! interface_exists( 'JsonSerializable' ) ) {
if ( ! function_exists( 'random_int' ) ) {
require ABSPATH . WPINC . '/random_compat/random.php';
}
+
+// 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 ca1c4c9..f4ce840 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -3643,6 +3643,7 @@ function absint( $maybeint ) {
* This function is to be used in every function that is deprecated.
*
* @since 2.5.0
+ * @since 4.6.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.
@@ -3672,14 +3673,14 @@ function _deprecated_function( $function, $version, $replacement = null ) {
if ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) {
if ( function_exists( '__' ) ) {
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 );
} 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 );
}
}
}
@@ -3696,6 +3697,7 @@ function _deprecated_function( $function, $version, $replacement = null ) {
*
* @since 4.3.0
* @since 4.5.0 Added the `$parent_class` parameter.
+ * @since 4.6.0 The error type is now classified as E_USER_DEPRECATED (used to default to E_USER_NOTICE).
*
* @access private
*
@@ -3732,19 +3734,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 );
}
}
}
@@ -3763,6 +3765,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.6.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.
@@ -3796,14 +3799,14 @@ function _deprecated_file( $file, $version, $replacement = null, $message = '' )
$message = empty( $message ) ? '' : ' ' . $message;
if ( function_exists( '__' ) ) {
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 );
} 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 );
}
}
}
@@ -3827,6 +3830,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.6.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.
@@ -3856,14 +3860,14 @@ function _deprecated_argument( $function, $version, $message = null ) {
if ( WP_DEBUG && apply_filters( 'deprecated_argument_trigger_error', true ) ) {
if ( function_exists( '__' ) ) {
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 );
} 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 );
}
}
}
@@ -3911,13 +3915,13 @@ 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 );
} else {
$version = is_null( $version ) ? '' : sprintf( '(This message was added in version %s.)', $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 );
}
}
}
--
1.9.4.msysgit.2