Changeset 59959

Timestamp:

03/10/2025 02:57:21 PM (7 weeks ago)

Author:

johnbillion

Message:

Date/Time: Fix the recently introduced test for wp_timezone_override_offset() which failed to take into consideration daylight saving time for the America/St_Johns timezone.

Props debarghyabanerjee, johnbillion, mukesh27, audrasjb.

Fixes #63079

File:

• trunk/tests/phpunit/tests/functions/wpTimezoneOverrideOffset.php (modified) (1 diff)

trunk/tests/phpunit/tests/functions/wpTimezoneOverrideOffset.php

@@ -34 +34 @@
             'UTC option set'                => array( 'UTC', 0.0 ),
             'EST option set'                => array( 'EST', -5.0 ),
-            'NST option set'                => array( 'America/St_Johns', -3.5 ),
+            'NST option set'                => array( 'America/St_Johns', $this->is_timezone_in_dst( 'America/St_Johns' ) ? -2.5 : -3.5 ),
         );
     }
+
+    /**
+     * Determines whether the current timezone offset is observing daylight saving time (DST).
+     *
+     * @param string $timezone_string The timezone identifier (e.g., 'America/St_Johns').
+     * @return bool Whether the timezone is observing DST.
+     */
+    private function is_timezone_in_dst( $timezone_string ) {
+        $timezone    = new DateTimeZone( $timezone_string );
+        $timestamp   = time();
+        $transitions = $timezone->getTransitions( $timestamp, $timestamp );
+
+        if ( false === $transitions || ! is_array( $transitions ) || ! isset( $transitions[0]['isdst'] ) ) {
+            return false;
+        }
+
+        return $transitions[0]['isdst'];
+    }
 }