Changeset 56394

Timestamp:

08/12/2023 12:00:27 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict comparison in wp-includes/cron.php.

Includes minor code layout fixes for better readability.

Follow-up to [3634], [4189].

Props aristath, poena, afercia, SergeyBiryukov.
See #58831.

File:

• trunk/src/wp-includes/cron.php (modified) (17 diffs)

trunk/src/wp-includes/cron.php

@@ -140 +140 @@
                         continue;
                 }
+
                 if ( $event_timestamp > $max_timestamp ) {
                         break;
                 }
+
                 if ( isset( $cron[ $event->hook ][ $key ] ) ) {
                         $duplicate = true;
@@ -360 +362 @@
         if ( 0 === $interval ) {
                 $scheduled_event = wp_get_scheduled_event( $hook, $args, $timestamp );
+
                 if ( $scheduled_event && isset( $scheduled_event->interval ) ) {
                         $interval = $scheduled_event->interval;
@@ -415 +418 @@
 
         // Now we assume something is wrong and fail to schedule.
-        if ( 0 == $interval ) {
+        if ( 0 === $interval ) {
                 if ( $wp_error ) {
                         return new WP_Error(
@@ -507 +510 @@
         $crons = _get_cron_array();
         $key   = md5( serialize( $args ) );
+
         unset( $crons[ $timestamp ][ $hook ][ $key ] );
+
         if ( empty( $crons[ $timestamp ][ $hook ] ) ) {
                 unset( $crons[ $timestamp ][ $hook ] );
         }
+
         if ( empty( $crons[ $timestamp ] ) ) {
                 unset( $crons[ $timestamp ] );
@@ -547 +553 @@
          */
         if ( ! is_array( $args ) ) {
-                _deprecated_argument( __FUNCTION__, '3.0.0', __( 'This argument has changed to an array to match the behavior of the other cron functions.' ) );
+                _deprecated_argument(
+                        __FUNCTION__,
+                        '3.0.0',
+                        __( 'This argument has changed to an array to match the behavior of the other cron functions.' )
+                );
+
                 $args     = array_slice( func_get_args(), 1 ); // phpcs:ignore PHPCompatibility.FunctionUse.ArgumentFunctionsReportCurrentValue.NeedsInspection
                 $wp_error = false;
@@ -682 +693 @@
 
         $results = array();
+
         foreach ( $crons as $timestamp => $args ) {
                 if ( ! empty( $crons[ $timestamp ][ $hook ] ) ) {
                         $results[] = count( $crons[ $timestamp ][ $hook ] );
                 }
+
                 unset( $crons[ $timestamp ][ $hook ] );
 
@@ -755 +768 @@
          */
         $pre = apply_filters( 'pre_get_scheduled_event', null, $hook, $args, $timestamp );
+
         if ( null !== $pre ) {
                 return $pre;
@@ -779 +793 @@
                         }
                 }
+
                 if ( ! $next ) {
                         return false;
@@ -816 +831 @@
 function wp_next_scheduled( $hook, $args = array() ) {
         $next_event = wp_get_scheduled_event( $hook, $args );
+
         if ( ! $next_event ) {
                 return false;
@@ -931 +947 @@
 
         $result = wp_remote_post( $cron_request['url'], $cron_request['args'] );
+
         return ! is_wp_error( $result );
 }
@@ -977 +994 @@
 function _wp_cron() {
         // Prevent infinite loops caused by lack of wp-cron.php.
-        if ( str_contains( $_SERVER['REQUEST_URI'], '/wp-cron.php' ) || ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON ) ) {
+        if ( str_contains( $_SERVER['REQUEST_URI'], '/wp-cron.php' )
+                || ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON )
+        ) {
                 return 0;
         }
@@ -994 +1013 @@
         $schedules = wp_get_schedules();
         $results   = array();
+
         foreach ( $crons as $timestamp => $cronhooks ) {
                 if ( $timestamp > $gmt_time ) {
                         break;
                 }
+
                 foreach ( (array) $cronhooks as $hook => $args ) {
-                        if ( isset( $schedules[ $hook ]['callback'] ) && ! call_user_func( $schedules[ $hook ]['callback'] ) ) {
+                        if ( isset( $schedules[ $hook ]['callback'] )
+                                && ! call_user_func( $schedules[ $hook ]['callback'] )
+                        ) {
                                 continue;
                         }
+
                         $results[] = spawn_cron( $gmt_time );
                         break 2;
@@ -1010 +1034 @@
                 return false;
         }
+
         return count( $results );
 }
@@ -1214 +1239 @@
 
         $cron['version'] = 2;
-        $result          = update_option( 'cron', $cron );
+
+        $result = update_option( 'cron', $cron );
 
         if ( $wp_error && ! $result ) {
@@ -1238 +1264 @@
  */
 function _upgrade_cron_array( $cron ) {
-        if ( isset( $cron['version'] ) && 2 == $cron['version'] ) {
+        if ( isset( $cron['version'] ) && 2 === $cron['version'] ) {
                 return $cron;
         }
@@ -1246 +1272 @@
         foreach ( (array) $cron as $timestamp => $hooks ) {
                 foreach ( (array) $hooks as $hook => $args ) {
-                        $key                                     = md5( serialize( $args['args'] ) );
+                        $key = md5( serialize( $args['args'] ) );
+
                         $new_cron[ $timestamp ][ $hook ][ $key ] = $args;
                 }
@@ -1252 +1279 @@
 
         $new_cron['version'] = 2;
+
         update_option( 'cron', $new_cron );
+
         return $new_cron;
 }