Changeset 51587 for trunk/tests/phpunit/tests/multisite/site.php

Timestamp:

08/09/2021 07:08:09 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Replace strftime() and gmstrftime() usage in unit tests.

Since PHP 8.1, the strftime() and gmstrftime() functions are deprecated:

The strftime() and gmstrftime() functions exhibit similar issues as strptime(), in that the formats they support, as well as their behavior, is platform-dependent. Unlike strptime(), these functions are available on Windows, though with a different feature set than on Linux. Musl-based distributions like Alpine do not support timezone-related format specifiers correctly. These functions are also locale-based, and as such may exhibit thread-safety issues.

date() or DateTime::format() provide portable alternatives, and IntlDateFormatter::format() provides a more sophisticated, localization-aware alternative.

Reference: ​PHP RFC: Deprecations for PHP 8.1: strftime() and gmstrftime()

The strftime() and gmstrftime() functions have been deprecated in favor of
date()/DateTime::format() (for locale-independent formatting) or
IntlDateFormatter::format() (for locale-dependent formatting).

Reference: ​PHP 8.1 Upgrade Notes.

Aside from one instance in SimplePie, the strftime() and gmstrftime() functions are only used within the test suite of WordPress to create formatted timestamps.

As the function is used in test code, this leads to test warnings like this on PHP 8.1:

Deprecated: Function strftime() is deprecated in path/to/tests/phpunit/tests/canonical/postStatus.php on line 37

These calls can all be safely converted to use a pattern along the lines of:

<?php
date_format( date_create( 'time phrase or timestamp' ), $format )

Other references:

• ​PHP Manual: strftime() (for the old format string characters)
• ​PHP Manual: DateTime::format() (for the new format string characters)
• ​PHP Manual: DateTime::__construct() (see Example 2 for a Unix timestamp code sample)

Props jrf, SergeyBiryukov.
Fixes #53897.

File:

• trunk/tests/phpunit/tests/multisite/site.php (modified) (2 diffs)

trunk/tests/phpunit/tests/multisite/site.php

@@ -839 +839 @@
 
             $site = get_current_site();
+            $date = date_format( date_create( 'now' ), 'Y/m' );
 
             $info = wp_upload_dir();
-            $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/' . gmstrftime( '%Y/%m' ), $info['url'] );
-            $this->assertSame( ABSPATH . 'wp-content/uploads/' . gmstrftime( '%Y/%m' ), $info['path'] );
-            $this->assertSame( gmstrftime( '/%Y/%m' ), $info['subdir'] );
+            $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/' . $date, $info['url'] );
+            $this->assertSame( ABSPATH . 'wp-content/uploads/' . $date, $info['path'] );
+            $this->assertSame( '/' . $date, $info['subdir'] );
             $this->assertFalse( $info['error'] );
 
@@ -850 +851 @@
             switch_to_blog( $blog_id );
             $info = wp_upload_dir();
-            $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/sites/' . get_current_blog_id() . '/' . gmstrftime( '%Y/%m' ), $info['url'] );
-            $this->assertSame( ABSPATH . 'wp-content/uploads/sites/' . get_current_blog_id() . '/' . gmstrftime( '%Y/%m' ), $info['path'] );
-            $this->assertSame( gmstrftime( '/%Y/%m' ), $info['subdir'] );
+            $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/sites/' . get_current_blog_id() . '/' . $date, $info['url'] );
+            $this->assertSame( ABSPATH . 'wp-content/uploads/sites/' . get_current_blog_id() . '/' . $date, $info['path'] );
+            $this->assertSame( '/' . $date, $info['subdir'] );
             $this->assertFalse( $info['error'] );
             restore_current_blog();
 
             $info = wp_upload_dir();
-            $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/' . gmstrftime( '%Y/%m' ), $info['url'] );
-            $this->assertSame( ABSPATH . 'wp-content/uploads/' . gmstrftime( '%Y/%m' ), $info['path'] );
-            $this->assertSame( gmstrftime( '/%Y/%m' ), $info['subdir'] );
+            $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/' . $date, $info['url'] );
+            $this->assertSame( ABSPATH . 'wp-content/uploads/' . $date, $info['path'] );
+            $this->assertSame( '/' . $date, $info['subdir'] );
             $this->assertFalse( $info['error'] );
         }