diff --git a/.travis.yml b/.travis.yml index 3b4e46ef6..c79375631 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: false dist: trusty language: php -php: 7.2 +php: 7.3 notifications: email: @@ -50,6 +50,9 @@ jobs: - composer lint - composer phpcs env: BUILD=sniff + - stage: test + php: 7.4snapshot + env: WP_VERSION=latest - stage: test php: 7.3 env: WP_VERSION=latest @@ -75,3 +78,7 @@ jobs: php: 5.4 dist: precise env: WP_VERSION=5.1 + allow_failures: + - stage: test + php: 7.4snapshot + env: WP_VERSION=latest diff --git a/src/User_Command.php b/src/User_Command.php index cc8249b9b..97269458a 100644 --- a/src/User_Command.php +++ b/src/User_Command.php @@ -378,7 +378,7 @@ public function create( $args, $assoc_args ) { $user->user_registered = Utils\get_flag_value( $assoc_args, 'user_registered', - strftime( '%F %T', current_time( 'timestamp' ) ) + strftime( '%F %T', current_time( 'timestamp' ) ) // phpcs:ignore WordPress.DateTime.CurrentTimeTimestamp ); $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 ) { WP_CLI::error( 'This is not a multisite installation.' ); } - if ( 'spam' === $pref && '1' === $value ) { + if ( 'spam' === $pref ) { $action = (int) $value ? 'marked as spam' : 'removed from spam'; $verb = (int) $value ? 'spam' : 'unspam'; } @@ -1220,8 +1220,8 @@ private function update_msuser_status( $user_ids, $pref, $value ) { } // Make that user's blog as spam too. - $blogs = get_blogs_of_user( $user_id, true ); - foreach ( (array) $blogs as $details ) { + $blogs = (array) get_blogs_of_user( $user_id, true ); + foreach ( $blogs as $details ) { $site = $this->sitefetcher->get_check( $details->site_id ); // Main blog shouldn't a spam ! @@ -1230,8 +1230,18 @@ private function update_msuser_status( $user_ids, $pref, $value ) { } } - // Set status and show message. - update_user_status( $user_id, $pref, $value ); + if ( Utils\wp_version_compare( '5.3', '<' ) ) { + // phpcs:ignore WordPress.WP.DeprecatedFunctions.update_user_statusFound -- Fallback for older versions. + update_user_status( $user_id, $pref, $value ); + } else { + wp_update_user( + [ + 'ID' => $user_id, + $pref => $value, + ] + ); + } + WP_CLI::log( "User {$user_id} {$action}." ); $successes++; } diff --git a/src/User_Session_Command.php b/src/User_Session_Command.php index 0cff19893..db1ed88d4 100644 --- a/src/User_Session_Command.php +++ b/src/User_Session_Command.php @@ -178,8 +178,8 @@ protected function get_all_sessions( WP_Session_Tokens $manager ) { $sessions, function( &$session, $token ) { $session['token'] = $token; - $session['login_time'] = date( 'Y-m-d H:i:s', $session['login'] ); - $session['expiration_time'] = date( 'Y-m-d H:i:s', $session['expiration'] ); + $session['login_time'] = date( 'Y-m-d H:i:s', $session['login'] ); // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date + $session['expiration_time'] = date( 'Y-m-d H:i:s', $session['expiration'] ); // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date } );