<!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>[43050] trunk: Cron API: Return meaningful values from cron 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/43050">43050</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/43050","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-05-01 02:04:25 +0000 (Tue, 01 May 2018)</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'>Cron API: Return meaningful values from cron functions.
Return values added to Cron API functions to indicate outcome:
* `wp_schedule_single_event()`, `wp_schedule_event()`, `wp_reschedule_event()` and `wp_unschedule_event()`: boolean indicating success or failure,
* `wp_clear_scheduled_hook()`: integer indicating number of jobs cleared (zero or more), `false` if one or more jobs fail to clear,
* `wp_unschedule_hook()`: integer indicating number of jobs cleared (zero or more), `false` if the jobs fail to clear,
* `spawn_cron()`: boolean indicating whether job spawned,
* `wp_cron()`: integer indicating number of jobs spawned (zero or more), `false` if one or more jobs fail to spawned,
* `_set_cron_array()`: boolean outcome of `update_option()`.
Props evansolomon, jrf, peterwilsoncc, pento for code review.
Fixes <a href="https://core.trac.wordpress.org/ticket/21072">#21072</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescronphp">trunk/src/wp-includes/cron.php</a></li>
<li><a href="#trunktestsphpunittestscronphp">trunk/tests/phpunit/tests/cron.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescronphp"></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/cron.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/cron.php 2018-04-30 21:07:16 UTC (rev 43049)
+++ trunk/src/wp-includes/cron.php 2018-05-01 02:04:25 UTC (rev 43050)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,12 +21,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Use wp_schedule_event() to schedule a recurring event.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 Return value modified to boolean indicating success or failure.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @link https://codex.wordpress.org/Function_Reference/wp_schedule_single_event
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $timestamp Unix timestamp (UTC) for when to next run the event.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $hook Action hook to execute when the event is run.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Optional. Array containing each separate argument to pass to the hook's callback function.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return false|void False if the event did not get scheduled.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool True if event successfully scheduled. False for failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_schedule_single_event( $timestamp, $hook, $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure timestamp is a positive integer
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +79,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'args' => $event->args,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> uksort( $crons, 'strnatcasecmp' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _set_cron_array( $crons );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return _set_cron_array( $crons );
</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">@@ -99,6 +101,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Use wp_schedule_single_event() to schedule a non-recurring event.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 Return value modified to boolean indicating success or failure.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @link https://codex.wordpress.org/Function_Reference/wp_schedule_event
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $timestamp Unix timestamp (UTC) for when to next run the event.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +109,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $recurrence How often the event should subsequently recur. See wp_get_schedules() for accepted values.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $hook Action hook to execute when the event is run.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Optional. Array containing each separate argument to pass to the hook's callback function.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return false|void False if the event did not get scheduled.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool True if event successfully scheduled. False for failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_schedule_event( $timestamp, $recurrence, $hook, $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure timestamp is a positive integer
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +147,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'interval' => $event->interval,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> uksort( $crons, 'strnatcasecmp' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _set_cron_array( $crons );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return _set_cron_array( $crons );
</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">@@ -150,12 +154,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Reschedules a recurring event.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 Return value modified to boolean indicating success or failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $timestamp Unix timestamp (UTC) for when to next run the event.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $recurrence How often the event should subsequently recur. See wp_get_schedules() for accepted values.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $hook Action hook to execute when the event is run.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Optional. Array containing each separate argument to pass to the hook's callback function.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return false|void False if the event did not get rescheduled.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool True if event successfully rescheduled. False for failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure timestamp is a positive integer
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +194,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $timestamp = $now + ( $interval - ( ( $now - $timestamp ) % $interval ) );
</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">- wp_schedule_event( $timestamp, $recurrence, $hook, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return wp_schedule_event( $timestamp, $recurrence, $hook, $args );
</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">@@ -199,6 +204,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * identified.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 Return value modified to boolean indicating success or failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $timestamp Unix timestamp (UTC) of the event.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $hook Action hook of the event.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,7 +211,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Optional. Array containing each separate argument to pass to the hook's callback function.
</span><span class="cx" style="display: block; padding: 0 10px"> * Although not passed to a callback, these arguments are used to uniquely identify the
</span><span class="cx" style="display: block; padding: 0 10px"> * event, so they should be the same as those used when originally scheduling the event.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return false|void False if the event did not get unscheduled.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool True if event successfully unscheduled. False for failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_unschedule_event( $timestamp, $hook, $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure timestamp is a positive integer
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,16 +228,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $crons[ $timestamp ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $crons[ $timestamp ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _set_cron_array( $crons );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return _set_cron_array( $crons );
</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="cx" style="display: block; padding: 0 10px"> * Unschedules all events attached to the hook with the specified arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Warning: This function may return Boolean FALSE, but may also return a non-Boolean
+ * value which evaluates to FALSE. For information about casting to booleans see the
+ * {@link https://php.net/manual/en/language.types.boolean.php PHP documentation}. Use
+ * the `===` operator for testing the return value of this function.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 Return value modified to indicate success or failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $hook Action hook, the execution of which will be unscheduled.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Optional. Arguments that were to be passed to the hook's callback function.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool|int On success an integer indicating number of events unscheduled (0 indicates no
+ * events were registered with the hook and arguments combination), false if
+ * unscheduling one or more events fail.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_clear_scheduled_hook( $hook, $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Backward compatibility
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,15 +261,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // and, wp_next_scheduled() returns the same schedule in an infinite loop.
</span><span class="cx" style="display: block; padding: 0 10px"> $crons = _get_cron_array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $crons ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return 0;
</ins><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">- $key = md5( serialize( $args ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $results = array();
+ $key = md5( serialize( $args ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $crons as $timestamp => $cron ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $cron[ $hook ][ $key ] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_unschedule_event( $timestamp, $hook, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $results[] = wp_unschedule_event( $timestamp, $hook, $args );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( false, $results, true ) ) {
+ return false;
+ }
+ return count( $results );
</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">@@ -262,14 +282,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Can be useful for plugins when deactivating to clean up the cron queue.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Warning: This function may return Boolean FALSE, but may also return a non-Boolean
+ * value which evaluates to FALSE. For information about casting to booleans see the
+ * {@link https://php.net/manual/en/language.types.boolean.php PHP documentation}. Use
+ * the `===` operator for testing the return value of this function.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 Return value added to indicate success or failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $hook Action hook, the execution of which will be unscheduled.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool|int On success an integer indicating number of events unscheduled (0 indicates no
+ * events were registered on the hook), false if unscheduling fails.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_unschedule_hook( $hook ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $crons = _get_cron_array();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $crons ) ) {
+ return 0;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $results = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $crons as $timestamp => $args ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $crons[ $timestamp ][ $hook ] ) ) {
+ $results[] = count( $crons[ $timestamp ][ $hook ] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $crons[ $timestamp ][ $hook ] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $crons[ $timestamp ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,7 +312,17 @@
</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">- _set_cron_array( $crons );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If the results are empty (zero events to unschedule), no attempt
+ * to update the cron array is required.
+ */
+ if ( empty( $results ) ) {
+ return 0;
+ }
+ if ( _set_cron_array( $crons ) ) {
+ return array_sum( $results );
+ }
+ return false;
</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">@@ -309,8 +354,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Sends a request to run cron through HTTP request that doesn't halt page loading.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 Return values added.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $gmt_time Optional. Unix timestamp (UTC). Default 0 (current time is used).
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool True if spawned, false if no events spawned.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function spawn_cron( $gmt_time = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $gmt_time ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -318,7 +365,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"> if ( defined( 'DOING_CRON' ) || isset( $_GET['doing_wp_cron'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return false;
</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">@@ -336,23 +383,23 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // don't run if another process is currently running it or more than once every 60 sec.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $lock + WP_CRON_LOCK_TIMEOUT > $gmt_time ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return false;
</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"> //sanity check
</span><span class="cx" style="display: block; padding: 0 10px"> $crons = _get_cron_array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $crons ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return false;
</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"> $keys = array_keys( $crons );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $keys[0] ) && $keys[0] > $gmt_time ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return false;
</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"> if ( defined( 'ALTERNATE_WP_CRON' ) && ALTERNATE_WP_CRON ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'GET' !== $_SERVER['REQUEST_METHOD'] || defined( 'DOING_AJAX' ) || defined( 'XMLRPC_REQUEST' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return false;
</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"> $doing_wp_cron = sprintf( '%.22F', $gmt_time );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,7 +415,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> flush();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> WP_DEBUG ? include_once( ABSPATH . 'wp-cron.php' ) : @include_once( ABSPATH . 'wp-cron.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return true;
</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"> // Set the cron lock with the current unix timestamp, when the cron is being spawned.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -409,31 +456,43 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ), $doing_wp_cron
</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">- wp_remote_post( $cron_request['url'], $cron_request['args'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = wp_remote_post( $cron_request['url'], $cron_request['args'] );
+ return ! is_wp_error( $result );
</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="cx" style="display: block; padding: 0 10px"> * Run scheduled callbacks or spawn cron for all scheduled events.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Warning: This function may return Boolean FALSE, but may also return a non-Boolean
+ * value which evaluates to FALSE. For information about casting to booleans see the
+ * {@link https://php.net/manual/en/language.types.boolean.php PHP documentation}. Use
+ * the `===` operator for testing the return value of this function.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 Return value added to indicate success or failure.
+ *
+ * @return bool|int On success an integer indicating number of events spawned (0 indicates no
+ * events needed to be spawned), false if spawning fails for one or more events.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_cron() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Prevent infinite loops caused by lack of wp-cron.php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strpos( $_SERVER['REQUEST_URI'], '/wp-cron.php' ) !== false || ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return 0;
</ins><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">- if ( false === $crons = _get_cron_array() ) {
- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $crons = _get_cron_array();
+ if ( false === $crons ) {
+ return 0;
</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"> $gmt_time = microtime( true );
</span><span class="cx" style="display: block; padding: 0 10px"> $keys = array_keys( $crons );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $keys[0] ) && $keys[0] > $gmt_time ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return 0;
</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"> $schedules = wp_get_schedules();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $results = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $crons as $timestamp => $cronhooks ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $timestamp > $gmt_time ) {
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -442,10 +501,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $schedules[ $hook ]['callback'] ) && ! call_user_func( $schedules[ $hook ]['callback'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- spawn_cron( $gmt_time );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $results[] = spawn_cron( $gmt_time );
</ins><span class="cx" style="display: block; padding: 0 10px"> break 2;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( in_array( false, $results, true ) ) {
+ return false;
+ }
+ return count( $results );
</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">@@ -558,13 +622,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Updates the CRON option with the new CRON array.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 Return value modified to outcome of {@see update_option}.
+ *
</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 array $cron Cron info array from _get_cron_array().
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool True if cron array updated, false on failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _set_cron_array( $cron ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cron['version'] = 2;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'cron', $cron );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return update_option( 'cron', $cron );
</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="trunktestsphpunittestscronphp"></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/cron.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/cron.php 2018-04-30 21:07:16 UTC (rev 43049)
+++ trunk/tests/phpunit/tests/cron.php 2018-05-01 02:04:25 UTC (rev 43050)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $timestamp = strtotime( '+1 hour' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_schedule_single_event( $timestamp, $hook );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scheduled = wp_schedule_single_event( $timestamp, $hook );
+ $this->assertTrue( $scheduled );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $timestamp, wp_next_scheduled( $hook ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // it's a non recurring event
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +44,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $timestamp = strtotime( '+1 hour' );
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_schedule_single_event( $timestamp, $hook, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scheduled = wp_schedule_single_event( $timestamp, $hook, $args );
+ $this->assertTrue( $scheduled );
</ins><span class="cx" style="display: block; padding: 0 10px"> // this returns the timestamp only if we provide matching args
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $timestamp, wp_next_scheduled( $hook, $args ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // these don't match so return nothing
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +62,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $recur = 'hourly';
</span><span class="cx" style="display: block; padding: 0 10px"> $timestamp = strtotime( '+1 hour' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_schedule_event( $timestamp, $recur, $hook );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scheduled = wp_schedule_event( $timestamp, $recur, $hook );
+ $this->assertTrue( $scheduled );
</ins><span class="cx" style="display: block; padding: 0 10px"> // it's scheduled for the right time
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $timestamp, wp_next_scheduled( $hook ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // it's a recurring event
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +77,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $recur = 'hourly';
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_schedule_event( $timestamp, 'hourly', $hook, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scheduled = wp_schedule_event( $timestamp, 'hourly', $hook, $args );
+ $this->assertTrue( $scheduled );
</ins><span class="cx" style="display: block; padding: 0 10px"> // this returns the timestamp only if we provide matching args
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $timestamp, wp_next_scheduled( $hook, $args ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // these don't match so return nothing
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +98,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $timestamp, wp_next_scheduled( $hook ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // now unschedule it and make sure it's gone
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_unschedule_event( $timestamp, $hook );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $unscheduled = wp_unschedule_event( $timestamp, $hook );
+ $this->assertTrue( $unscheduled );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, wp_next_scheduled( $hook ) );
</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">@@ -113,7 +118,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_next_scheduled( $hook, $args ) > 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // clear the schedule for the no args events and make sure it's gone
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_clear_scheduled_hook( $hook );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $hook_unscheduled = wp_clear_scheduled_hook( $hook );
+ $this->assertSame( 2, $hook_unscheduled );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_next_scheduled( $hook ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // the args events should still be there
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_next_scheduled( $hook, $args ) > 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,6 +130,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_next_scheduled( $hook, $args ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_clear_undefined_schedule() {
+ $hook = __FUNCTION__;
+ $args = array( 'arg1' );
+
+ wp_schedule_single_event( strtotime( '+1 hour' ), $hook, $args );
+ wp_schedule_single_event( strtotime( '+2 hour' ), $hook, $args );
+
+ // clear the schedule for no args events and ensure no events are cleared.
+ $hook_unscheduled = wp_clear_scheduled_hook( $hook );
+ $this->assertSame( 0, $hook_unscheduled );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_clear_schedule_multiple_args() {
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'arg1', 'arg2' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,10 +224,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_next_scheduled( $hook, $args ) > 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // clear the schedule and make sure it's gone.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_unschedule_hook( $hook );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $unschedule_hook = wp_unschedule_hook( $hook );
+ $this->assertSame( 4, $unschedule_hook );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_next_scheduled( $hook ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_unschedule_undefined_hook() {
+ $hook = __FUNCTION__;
+ $unrelated_hook = __FUNCTION__ . '_two';
+
+ // Attempt to clear schedule on non-existant hook.
+ $unschedule_hook = wp_unschedule_hook( $hook );
+ $this->assertSame( 0, $unschedule_hook );
+ $this->assertFalse( wp_next_scheduled( $hook ) );
+
+ // Repeat tests with populated cron array.
+ wp_schedule_single_event( strtotime( '+1 hour' ), $unrelated_hook );
+ wp_schedule_single_event( strtotime( '+2 hour' ), $unrelated_hook );
+
+ $unschedule_hook = wp_unschedule_hook( $hook );
+ $this->assertSame( 0, $unschedule_hook );
+ $this->assertFalse( wp_next_scheduled( $hook ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 6966
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,9 +258,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ts2 = strtotime( '+3 minutes' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // first one works
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_schedule_single_event( $ts1, $hook, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( wp_schedule_single_event( $ts1, $hook, $args ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> // second one is ignored
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_schedule_single_event( $ts2, $hook, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( wp_schedule_single_event( $ts2, $hook, $args ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // the next event should be at +5 minutes, not +3
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $ts1, wp_next_scheduled( $hook, $args ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,9 +277,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ts2 = strtotime( '+3 minutes' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // first one works
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_schedule_single_event( $ts1, $hook, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( wp_schedule_single_event( $ts1, $hook, $args ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> // second works too
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_schedule_single_event( $ts2, $hook, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( wp_schedule_single_event( $ts2, $hook, $args ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // the next event should be at +3 minutes, even though that one was scheduled second
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $ts2, wp_next_scheduled( $hook, $args ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -259,9 +296,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ts2 = strtotime( '+30 minutes' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // first one works
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_schedule_single_event( $ts1, $hook, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( wp_schedule_single_event( $ts1, $hook, $args ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> // second works too
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_schedule_single_event( $ts2, $hook, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( wp_schedule_single_event( $ts2, $hook, $args ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // the next event should be at +3 minutes
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $ts1, wp_next_scheduled( $hook, $args ) );
</span></span></pre>
</div>
</div>
</body>
</html>