Skip to content

Commit 4e23faa

Browse files
authored
Merge pull request #276 from wp-cli/add-preliminary-php-7-4-testing
Add preliminary PHP 7.4 testing
2 parents 86baa1a + 92748df commit 4e23faa

File tree

3 files changed

+26
-9
lines changed

3 files changed

+26
-9
lines changed

.travis.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ sudo: false
22
dist: trusty
33

44
language: php
5-
php: 7.2
5+
php: 7.3
66

77
notifications:
88
email:
@@ -50,6 +50,9 @@ jobs:
5050
- composer lint
5151
- composer phpcs
5252
env: BUILD=sniff
53+
- stage: test
54+
php: 7.4snapshot
55+
env: WP_VERSION=latest
5356
- stage: test
5457
php: 7.3
5558
env: WP_VERSION=latest
@@ -75,3 +78,7 @@ jobs:
7578
php: 5.4
7679
dist: precise
7780
env: WP_VERSION=5.1
81+
allow_failures:
82+
- stage: test
83+
php: 7.4snapshot
84+
env: WP_VERSION=latest

src/User_Command.php

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ public function create( $args, $assoc_args ) {
378378
$user->user_registered = Utils\get_flag_value(
379379
$assoc_args,
380380
'user_registered',
381-
strftime( '%F %T', current_time( 'timestamp' ) )
381+
strftime( '%F %T', current_time( 'timestamp' ) ) // phpcs:ignore WordPress.DateTime.CurrentTimeTimestamp
382382
);
383383

384384
$user->display_name = Utils\get_flag_value( $assoc_args, 'display_name', false );
@@ -1185,7 +1185,7 @@ private function update_msuser_status( $user_ids, $pref, $value ) {
11851185
WP_CLI::error( 'This is not a multisite installation.' );
11861186
}
11871187

1188-
if ( 'spam' === $pref && '1' === $value ) {
1188+
if ( 'spam' === $pref ) {
11891189
$action = (int) $value ? 'marked as spam' : 'removed from spam';
11901190
$verb = (int) $value ? 'spam' : 'unspam';
11911191
}
@@ -1220,8 +1220,8 @@ private function update_msuser_status( $user_ids, $pref, $value ) {
12201220
}
12211221

12221222
// Make that user's blog as spam too.
1223-
$blogs = get_blogs_of_user( $user_id, true );
1224-
foreach ( (array) $blogs as $details ) {
1223+
$blogs = (array) get_blogs_of_user( $user_id, true );
1224+
foreach ( $blogs as $details ) {
12251225
$site = $this->sitefetcher->get_check( $details->site_id );
12261226

12271227
// Main blog shouldn't a spam !
@@ -1230,8 +1230,18 @@ private function update_msuser_status( $user_ids, $pref, $value ) {
12301230
}
12311231
}
12321232

1233-
// Set status and show message.
1234-
update_user_status( $user_id, $pref, $value );
1233+
if ( Utils\wp_version_compare( '5.3', '<' ) ) {
1234+
// phpcs:ignore WordPress.WP.DeprecatedFunctions.update_user_statusFound -- Fallback for older versions.
1235+
update_user_status( $user_id, $pref, $value );
1236+
} else {
1237+
wp_update_user(
1238+
[
1239+
'ID' => $user_id,
1240+
$pref => $value,
1241+
]
1242+
);
1243+
}
1244+
12351245
WP_CLI::log( "User {$user_id} {$action}." );
12361246
$successes++;
12371247
}

src/User_Session_Command.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ protected function get_all_sessions( WP_Session_Tokens $manager ) {
178178
$sessions,
179179
function( &$session, $token ) {
180180
$session['token'] = $token;
181-
$session['login_time'] = date( 'Y-m-d H:i:s', $session['login'] );
182-
$session['expiration_time'] = date( 'Y-m-d H:i:s', $session['expiration'] );
181+
$session['login_time'] = date( 'Y-m-d H:i:s', $session['login'] ); // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date
182+
$session['expiration_time'] = date( 'Y-m-d H:i:s', $session['expiration'] ); // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date
183183
}
184184
);
185185

0 commit comments

Comments
 (0)