Changeset 59471

Timestamp:

11/28/2024 10:50:21 PM (3 days ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Cast gmdate( 'w' ) to int before using as integer.

This addresses several instances of gmdate( 'w' ) being used directly as an integer, when it's actually a numeric string. The issue is remediated by casting the value to int before use.

Affected functions:

• get_calendar()
• get_weekstartend()

Follow-up to [508], [1632].

Props justlevine.
See #52217.

Location:

trunk/src/wp-includes

Files:

• functions.php (modified) (2 diffs)
• general-template.php (modified) (2 diffs)

trunk/src/wp-includes/functions.php

@@ -595 +595 @@
 
     // The day of the week from the timestamp.
-    $weekday = gmdate( 'w', $day );
+    $weekday = (int) gmdate( 'w', $day );
 
     if ( ! is_numeric( $start_of_week ) ) {
-        $start_of_week = get_option( 'start_of_week' );
+        $start_of_week = (int) get_option( 'start_of_week' );
     }
 
@@ -610 +610 @@
     // $start + 1 week - 1 second.
     $end = $start + WEEK_IN_SECONDS - 1;
+
     return compact( 'start', 'end' );
 }

trunk/src/wp-includes/general-template.php

@@ -2374 +2374 @@
 
     // See how much we should pad in the beginning.
-    $pad = calendar_week_mod( gmdate( 'w', $unixmonth ) - $week_begins );
+    $pad = calendar_week_mod( (int) gmdate( 'w', $unixmonth ) - $week_begins );
     if ( 0 != $pad ) {
         $calendar_output .= "\n\t\t" . '<td colspan="' . esc_attr( $pad ) . '" class="pad">&nbsp;</td>';
@@ -2413 +2413 @@
         $calendar_output .= '</td>';
 
-        if ( 6 == calendar_week_mod( gmdate( 'w', mktime( 0, 0, 0, $thismonth, $day, $thisyear ) ) - $week_begins ) ) {
+        if ( 6 == calendar_week_mod( (int) gmdate( 'w', mktime( 0, 0, 0, $thismonth, $day, $thisyear ) ) - $week_begins ) ) {
             $newrow = true;
         }
     }
 
-    $pad = 7 - calendar_week_mod( gmdate( 'w', mktime( 0, 0, 0, $thismonth, $day, $thisyear ) ) - $week_begins );
+    $pad = 7 - calendar_week_mod( (int) gmdate( 'w', mktime( 0, 0, 0, $thismonth, $day, $thisyear ) ) - $week_begins );
     if ( 0 != $pad && 7 != $pad ) {
         $calendar_output .= "\n\t\t" . '<td class="pad" colspan="' . esc_attr( $pad ) . '">&nbsp;</td>';