The patch fixes all phpcs issues. Marking RTBC!