From 199f33246fc7af511b679d3ecfb2579a73361d90 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 9 Jan 2023 00:40:55 +0000 Subject: [PATCH] Code Modernization: Rename parameters that use reserved keywords in `phpunit/tests/cron.php`. While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names. This commit: * Renames the `$null` parameter to `$result` in `Tests_Cron::filter_pre_schedule_event_filter()`. * Amends the `$pre` parameter of the `pre_schedule_event` filter for consistency. Follow-up to [52946], [52996], [52997], [52998], [53003], [53014], [53029], [53039], [53116], [53117], [53137], [53174], [53184], [53185], [53192], [53193], [53198], [53203], [53207], [53215], [53216], [53220], [53230], [53232], [53236], [53239], [53240], [53242], [53243], [53245], [53246], [53257], [53269], [53270], [53271], [53272], [53273], [53274], [53275], [53276], [53277], [53281], [53283], [53284], [53285], [53287], [53364], [53365], [54927], [54929], [54930], [54931], [54932], [54933], [54938], [54943], [54944], [54945], [54946], [54947], [54948], [54950], [54951], [54952], [54956], [54959], [54960], [54961], [54962], [54964], [54965], [54969], [54970], [54971], [54972], [54996], [55000], [55011], [55013], [55014], [55015], [55016], [55017], [55020], [55021], [55023], [55027], [55028], [55034], [55036], [55037]. Props jrf, aristath, poena, justinahinon, SergeyBiryukov. See #56788. git-svn-id: https://develop.svn.wordpress.org/trunk@55038 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/cron.php | 2 +- tests/phpunit/tests/cron.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/cron.php b/src/wp-includes/cron.php index 8660e32267..4726a8d474 100644 --- a/src/wp-includes/cron.php +++ b/src/wp-includes/cron.php @@ -76,7 +76,7 @@ function wp_schedule_single_event( $timestamp, $hook, $args = array(), $wp_error * @since 5.1.0 * @since 5.7.0 The `$wp_error` parameter was added, and a `WP_Error` object can now be returned. * - * @param null|bool|WP_Error $pre Value to return instead. Default null to continue adding the event. + * @param null|bool|WP_Error $result The value to return instead. Default null to continue adding the event. * @param stdClass $event { * An object containing an event's data. * diff --git a/tests/phpunit/tests/cron.php b/tests/phpunit/tests/cron.php index ebb709fec9..e5ecee093b 100644 --- a/tests/phpunit/tests/cron.php +++ b/tests/phpunit/tests/cron.php @@ -456,7 +456,7 @@ class Tests_Cron extends WP_UnitTestCase { /** * Filter the scheduling of events to use the preflight array. */ - public function filter_pre_schedule_event_filter( $null, $event ) { + public function filter_pre_schedule_event_filter( $result, $event ) { $key = md5( serialize( $event->args ) ); $this->preflight_cron_array[ $event->timestamp ][ $event->hook ][ $key ] = array( @@ -465,6 +465,7 @@ class Tests_Cron extends WP_UnitTestCase { 'args' => $event->args, ); uksort( $this->preflight_cron_array, 'strnatcasecmp' ); + return true; }