Skip to content

Add preliminary PHP 7.4 testing #276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 12, 2019
Merged

Add preliminary PHP 7.4 testing #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f748d54
Add preliminary testing for PHP 7.4
schlessera Nov 11, 2019
e870782
Satisfy PHPCS
schlessera Nov 12, 2019
4e94802
Fake new spam handling for WP < 5.3
schlessera Nov 12, 2019
358c265
Let PHPCS ignore core hooks
schlessera Nov 12, 2019
92748df
Avoid filtering solution and just swp from deprecated to new
schlessera Nov 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sudo: false
dist: trusty

language: php
php: 7.2
php: 7.3

notifications:
email:
Expand Down Expand Up @@ -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
Expand All @@ -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
22 changes: 16 additions & 6 deletions src/User_Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down Expand Up @@ -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';
}
Expand Down Expand Up @@ -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 !
Expand All @@ -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++;
}
Expand Down
4 changes: 2 additions & 2 deletions src/User_Session_Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
);

Expand Down