<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[46625] trunk: Code Modernization: Pass an appropriate error level to `trigger_error()` in `_doing_it_wrong()` and related functions:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/46625">46625</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/46625","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-11-01 00:39:04 +0000 (Fri, 01 Nov 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Code Modernization: Pass an appropriate error level to `trigger_error()` in `_doing_it_wrong()` and related functions:
* `_deprecated_function()`
* `_deprecated_argument()`
* `_deprecated_constructor()`
* `_deprecated_file()`
The error level passed is `E_USER_DEPRECATED` for the deprecated function group and `E_USER_NOTICE` for `_doing_it_wrong()`.
Props jrf.
Fixes <a href="https://core.trac.wordpress.org/ticket/36561">#36561</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunktestsphpunitincludesphpunit6compatphp">trunk/tests/phpunit/includes/phpunit6/compat.php</a></li>
<li><a href="#trunktestsphpunittestscompatphp">trunk/tests/phpunit/tests/compat.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2019-10-31 21:18:01 UTC (rev 46624)
+++ trunk/src/wp-includes/functions.php 2019-11-01 00:39:04 UTC (rev 46625)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4548,6 +4548,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.4.0 This function is no longer marked as "private".
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.4.0 The error type is now classified as E_USER_DEPRECATED (used to default to E_USER_NOTICE).
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $function The function that was called.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $version The version of WordPress that deprecated the function.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4576,17 +4577,47 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( '__' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $replacement ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: PHP function name, 2: Version number, 3: Alternative function name. */
- trigger_error( sprintf( __( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ), $function, $version, $replacement ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ trigger_error(
+ sprintf(
+ /* translators: 1: PHP function name, 2: Version number, 3: Alternative function name. */
+ __( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ),
+ $function,
+ $version,
+ $replacement
+ ),
+ E_USER_DEPRECATED
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: PHP function name, 2: Version number. */
- trigger_error( sprintf( __( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.' ), $function, $version ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ trigger_error(
+ sprintf(
+ /* translators: 1: PHP function name, 2: Version number. */
+ __( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.' ),
+ $function,
+ $version
+ ),
+ E_USER_DEPRECATED
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $replacement ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $function, $version, $replacement ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ trigger_error(
+ sprintf(
+ '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.',
+ $function,
+ $version,
+ $replacement
+ ),
+ E_USER_DEPRECATED
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ trigger_error(
+ sprintf(
+ '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.',
+ $function,
+ $version
+ ),
+ E_USER_DEPRECATED
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4605,6 +4636,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.5.0 Added the `$parent_class` parameter.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.4.0 This function is no longer marked as "private".
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.4.0 The error type is now classified as E_USER_DEPRECATED (used to default to E_USER_NOTICE).
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $class The class containing the deprecated constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $version The version of WordPress that deprecated the function.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4645,7 +4677,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_class,
</span><span class="cx" style="display: block; padding: 0 10px"> $version,
</span><span class="cx" style="display: block; padding: 0 10px"> '<pre>__construct()</pre>'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ E_USER_DEPRECATED
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4655,7 +4688,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $class,
</span><span class="cx" style="display: block; padding: 0 10px"> $version,
</span><span class="cx" style="display: block; padding: 0 10px"> '<pre>__construct()</pre>'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ E_USER_DEPRECATED
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4667,7 +4701,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_class,
</span><span class="cx" style="display: block; padding: 0 10px"> $version,
</span><span class="cx" style="display: block; padding: 0 10px"> '<pre>__construct()</pre>'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ E_USER_DEPRECATED
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4676,7 +4711,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $class,
</span><span class="cx" style="display: block; padding: 0 10px"> $version,
</span><span class="cx" style="display: block; padding: 0 10px"> '<pre>__construct()</pre>'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ E_USER_DEPRECATED
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4697,6 +4733,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.4.0 This function is no longer marked as "private".
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.4.0 The error type is now classified as E_USER_DEPRECATED (used to default to E_USER_NOTICE).
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $file The file that was included.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $version The version of WordPress that deprecated the file.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4727,19 +4764,50 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = empty( $message ) ? '' : ' ' . $message;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( '__' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $replacement ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: PHP file name, 2: Version number, 3: Alternative file name. */
- trigger_error( sprintf( __( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ), $file, $version, $replacement ) . $message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ trigger_error(
+ sprintf(
+ /* translators: 1: PHP file name, 2: Version number, 3: Alternative file name. */
+ __( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ),
+ $file,
+ $version,
+ $replacement
+ ) . $message,
+ E_USER_DEPRECATED
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: PHP file name, 2: Version number. */
- trigger_error( sprintf( __( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.' ), $file, $version ) . $message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ trigger_error(
+ sprintf(
+ /* translators: 1: PHP file name, 2: Version number. */
+ __( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.' ),
+ $file,
+ $version
+ ) . $message,
+ E_USER_DEPRECATED
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $replacement ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $file, $version, $replacement ) . $message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ trigger_error(
+ sprintf(
+ '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.',
+ $file,
+ $version,
+ $replacement
+ ) . $message,
+ E_USER_DEPRECATED
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $file, $version ) . $message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ trigger_error(
+ sprintf(
+ '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.',
+ $file,
+ $version
+ ) . $message,
+ E_USER_DEPRECATED
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4764,6 +4832,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.4.0 This function is no longer marked as "private".
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.4.0 The error type is now classified as E_USER_DEPRECATED (used to default to E_USER_NOTICE).
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $function The function that was called.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $version The version of WordPress that deprecated the argument used.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4792,17 +4861,47 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( WP_DEBUG && apply_filters( 'deprecated_argument_trigger_error', true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( '__' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $message ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* 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 <strong>deprecated</strong> since version %2$s! %3$s' ), $function, $version, $message ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ trigger_error(
+ sprintf(
+ /* translators: 1: PHP function name, 2: Version number, 3: Optional message regarding the change. */
+ __( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s' ),
+ $function,
+ $version,
+ $message
+ ),
+ E_USER_DEPRECATED
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: PHP function name, 2: Version number. */
- trigger_error( sprintf( __( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.' ), $function, $version ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ trigger_error(
+ sprintf(
+ /* translators: 1: PHP function name, 2: Version number. */
+ __( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.' ),
+ $function,
+ $version
+ ),
+ E_USER_DEPRECATED
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $message ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ trigger_error(
+ sprintf(
+ '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s',
+ $function,
+ $version,
+ $message
+ ),
+ E_USER_DEPRECATED
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ trigger_error(
+ sprintf(
+ '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.',
+ $function,
+ $version
+ ),
+ E_USER_DEPRECATED
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4820,6 +4919,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * functions, and so generally does not need to be called directly.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.4.0 The error type is now classified as E_USER_DEPRECATED (used to default to E_USER_NOTICE).
</ins><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $hook The hook that was used.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4850,12 +4950,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( WP_DEBUG && apply_filters( 'deprecated_hook_trigger_error', true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = empty( $message ) ? '' : ' ' . $message;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $replacement ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: WordPress hook name, 2: Version number, 3: Alternative hook name. */
- trigger_error( sprintf( __( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ), $hook, $version, $replacement ) . $message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ trigger_error(
+ sprintf(
+ /* translators: 1: WordPress hook name, 2: Version number, 3: Alternative hook name. */
+ __( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ),
+ $hook,
+ $version,
+ $replacement
+ ) . $message,
+ E_USER_DEPRECATED
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: WordPress hook name, 2: Version number. */
- trigger_error( sprintf( __( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.' ), $hook, $version ) . $message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ trigger_error(
+ sprintf(
+ /* translators: 1: WordPress hook name, 2: Version number. */
+ __( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.' ),
+ $hook,
+ $version
+ ) . $message,
+ E_USER_DEPRECATED
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4908,13 +5024,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Version number. */
</span><span class="cx" style="display: block; padding: 0 10px"> $version = sprintf( __( '(This message was added in version %s.)' ), $version );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $message .= ' ' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Documentation URL. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Please see <a href="%s">Debugging in WordPress</a> for more information.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://wordpress.org/support/article/debugging-in-wordpress/' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Developer debugging message. 1: PHP function name, 2: Explanatory message, 3: Version information message. */
- trigger_error( sprintf( __( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s' ), $function, $message, $version ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ trigger_error(
+ sprintf(
+ /* translators: Developer debugging message. 1: PHP function name, 2: Explanatory message, 3: Version information message. */
+ __( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s' ),
+ $function,
+ $message,
+ $version
+ ),
+ E_USER_NOTICE
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_null( $version ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $version = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4921,11 +5047,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $version = sprintf( '(This message was added in version %s.)', $version );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $message .= sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> ' Please see <a href="%s">Debugging in WordPress</a> for more information.',
</span><span class="cx" style="display: block; padding: 0 10px"> 'https://wordpress.org/support/article/debugging-in-wordpress/'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- trigger_error( sprintf( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s', $function, $message, $version ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ trigger_error(
+ sprintf(
+ '%1$s was called <strong>incorrectly</strong>. %2$s %3$s',
+ $function,
+ $message,
+ $version
+ ),
+ E_USER_NOTICE
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitincludesphpunit6compatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/phpunit6/compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/phpunit6/compat.php 2019-10-31 21:18:01 UTC (rev 46624)
+++ trunk/tests/phpunit/includes/phpunit6/compat.php 2019-11-01 00:39:04 UTC (rev 46625)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,6 +5,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class_alias( 'PHPUnit\Framework\TestCase', 'PHPUnit_Framework_TestCase' );
</span><span class="cx" style="display: block; padding: 0 10px"> class_alias( 'PHPUnit\Framework\Exception', 'PHPUnit_Framework_Exception' );
</span><span class="cx" style="display: block; padding: 0 10px"> class_alias( 'PHPUnit\Framework\ExpectationFailedException', 'PHPUnit_Framework_ExpectationFailedException' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ class_alias( 'PHPUnit\Framework\Error\Deprecated', 'PHPUnit_Framework_Error_Deprecated' );
</ins><span class="cx" style="display: block; padding: 0 10px"> class_alias( 'PHPUnit\Framework\Error\Notice', 'PHPUnit_Framework_Error_Notice' );
</span><span class="cx" style="display: block; padding: 0 10px"> class_alias( 'PHPUnit\Framework\Error\Warning', 'PHPUnit_Framework_Error_Warning' );
</span><span class="cx" style="display: block; padding: 0 10px"> class_alias( 'PHPUnit\Framework\Test', 'PHPUnit_Framework_Test' );
</span></span></pre></div>
<a id="trunktestsphpunittestscompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/compat.php 2019-10-31 21:18:01 UTC (rev 46624)
+++ trunk/tests/phpunit/tests/compat.php 2019-11-01 00:39:04 UTC (rev 46625)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,7 +180,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @expectedException PHPUnit_Framework_Error_Notice
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @expectedException PHPUnit_Framework_Error_Deprecated
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_json_encode_decode() {
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . WPINC . '/class-json.php' );
</span></span></pre>
</div>
</div>
</body>
</html>