Add interval check to wp_schedule_event() and differentiate errors in wp_reschedule_event()

Co-authored-by: John Blackbourn <[email protected]>

Author: westonruter

src/wp-includes/cron.php

@@ -298,6 +298,17 @@ function wp_schedule_event( $timestamp, $recurrence, $hook, $args = array(), $wp
 		return false;
 	}
 
+	if ( ! is_numeric( $event->interval ) || $event->interval <= 0 ) {
+		if ( $wp_error ) {
+			return new WP_Error(
+				'invalid_interval',
+				__( 'Event schedule has invalid interval.' )
+			);
+		}
+
+		return false;
+	}
+
 	$key = md5( serialize( $event->args ) );
 
 	$crons = _get_cron_array();
@@ -419,15 +430,17 @@ function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array(), $
 	// Now we assume something is wrong and fail to schedule.
 	if ( ! is_numeric( $interval ) || $interval <= 0 ) {
 		if ( $wp_error ) {
-			return new WP_Error(
-				'invalid_schedule',
-				sprintf(
-					/* translators: 1: the event schedule recurrence, 2: the interval encoded as JSON */
-					__( 'Event schedule with recurrence "%1$s" does not exist or has is invalid. Interval must be positive integer, but got: %2$s' ),
-					$recurrence,
-					wp_json_encode( $interval )
-				)
-			);
+			if ( ! isset( $schedules[ $recurrence ] ) ) {
+				return new WP_Error(
+					'invalid_schedule',
+					__( 'Event schedule does not exist.' )
+				);
+			} else {
+				return new WP_Error(
+					'invalid_interval',
+					__( 'Event schedule has invalid interval.' )
+				);
+			}
 		}
 
 		return false;

tests/phpunit/tests/cron.php

@@ -847,6 +847,7 @@ public function test_invalid_timestamp_for_event_returns_error() {
 
 	/**
 	 * @ticket 49961
+	 * @ticket 64404
 	 *
 	 * @covers ::wp_schedule_event
 	 * @covers ::wp_reschedule_event
@@ -862,6 +863,33 @@ public function test_invalid_recurrence_for_event_returns_error() {
 		$this->assertSame( 'invalid_schedule', $rescheduled_event->get_error_code() );
 	}
 
+	/**
+	 * @ticket 64404
+	 *
+	 * @covers ::wp_schedule_event
+	 * @covers ::wp_reschedule_event
+	 */
+	public function test_invalid_schedule_interval_returns_error() {
+		add_filter(
+			'cron_schedules',
+			static function ( $schedules ) {
+				$schedules['backwards_in_time'] = array(
+					'interval' => -3600,
+					'display'  => 'Back to the future!',
+				);
+				return $schedules;
+			}
+		);
+
+		$event = wp_schedule_event( time(), 'backwards_in_time', 'hook', array(), true );
+		$this->assertWPError( $event );
+		$this->assertSame( 'invalid_interval', $event->get_error_code() );
+
+		$rescheduled_event = wp_reschedule_event( time(), 'backwards_in_time', 'hook', array(), true );
+		$this->assertWPError( $rescheduled_event );
+		$this->assertSame( 'invalid_interval', $rescheduled_event->get_error_code() );
+	}
+
 	/**
 	 * @ticket 49961
 	 *