Reorder statement to make phpcs happy

Author: rmccue

inc/admin/class-listtable.php

@@ -17,12 +17,6 @@ public function prepare_items() {
 		$args = [
 			'post_type'   => Client::POST_TYPE,
 			'post_status' => 'any',
-//			'meta_query'  => [
-//				[
-//					'key'   => 'type',
-//					'value' => 'oauth2',
-//				],
-//			],
 			'paged'       => $paged,
 		];
 
@@ -32,7 +26,7 @@ public function prepare_items() {
 		$pagination_args = [
 			'total_items' => $query->found_posts,
 			'total_pages' => $query->max_num_pages,
-			'per_page'    => $query->get( 'posts_per_page' )
+			'per_page'    => $query->get( 'posts_per_page' ),
 		];
 		$this->set_pagination_args( $pagination_args );
 	}
@@ -62,10 +56,10 @@ public function get_columns() {
 	public function column_cb( $item ) {
 		?>
 		<label class="screen-reader-text"
-		       for="cb-select-<?php echo esc_attr( $item->ID ) ?>"><?php esc_html_e( 'Select consumer', 'oauth2' ); ?></label>
+			   for="cb-select-<?php echo esc_attr( $item->ID ) ?>"><?php esc_html_e( 'Select consumer', 'oauth2' ); ?></label>
 
 		<input id="cb-select-<?php echo esc_attr( $item->ID ) ?>" type="checkbox"
-		       name="consumers[]" value="<?php echo esc_attr( $item->ID ) ?>"/>
+			   name="consumers[]" value="<?php echo esc_attr( $item->ID ) ?>"/>
 
 		<?php
 	}

inc/admin/namespace.php

@@ -110,7 +110,7 @@ function render() {
 			<?php
 			esc_html_e( 'Registered Applications', 'oauth2' );
 
-			if ( current_user_can( 'create_users' ) ): ?>
+			if ( current_user_can( 'create_users' ) ) : ?>
 				<a href="<?php echo esc_url( get_url( 'action=add' ) ) ?>"
 				   class="add-new-h2"><?php echo esc_html_x( 'Add New', 'application', 'oauth2' ); ?></a>
 				<?php

inc/admin/profile/namespace.php

@@ -28,7 +28,7 @@ function render_profile_section( WP_User $user ) {
 	$tokens = Access_Token::get_for_user( $user );
 	?>
 	<h2><?php _e( 'Authorized Applications', 'oauth2' ) ?></h2>
-	<?php if ( ! empty( $tokens ) ): ?>
+	<?php if ( ! empty( $tokens ) ) : ?>
 		<table class="widefat">
 			<thead>
 			<tr>
@@ -44,7 +44,7 @@ function render_profile_section( WP_User $user ) {
 			?>
 			</tbody>
 		</table>
-	<?php else: ?>
+	<?php else : ?>
 		<p class="description"><?php esc_html_e( 'No applications authorized.', 'oauth2' ) ?></p>
 	<?php endif ?>
 	<?php

inc/namespace.php

@@ -72,7 +72,7 @@ function get_grant_types() {
  * @return array Grant types with additional types registered.
  */
 function register_grant_types( $types ) {
-	$types['authorization_code'] = new Types\AuthorizationCode();
+	$types['authorization_code'] = new Types\Authorization_Code();
 	$types['implicit'] = new Types\Implicit();
 
 	return $types;

inc/types/class-authorization-code.php

@@ -5,7 +5,7 @@
 use WP_Error;
 use WP\OAuth2\Client;
 
-class AuthorizationCode extends Base {
+class Authorization_Code extends Base {
 	/**
 	 * Get response_type code for authorisation page.
 	 *

inc/types/class-base.php

@@ -69,8 +69,8 @@ public function handle_authorisation() {
 		}
 
 		// Check nonce.
-		$nonce = wp_unslash( $_POST['_wpnonce'] );
-		if ( ! wp_verify_nonce( $nonce, $this->get_nonce_action( $client ) ) ) {
+		$nonce_action = $this->get_nonce_action( $client );
+		if ( ! wp_verify_nonce( wp_unslash( $_POST['_wpnonce'] ), $none_action ) ) {
 			return new WP_Error(
 				'oauth2.types.authorization_code.handle_authorisation.invalid_nonce',
 				__( 'Invalid nonce.', 'oauth2' )