Clean up array args

Author: valendesigns

wp-includes/rest-api/auth/class-wp-rest-key-pair.php

@@ -85,78 +85,63 @@ public static function get_rest_uri() {
 	 */
 	public function register_routes() {
 		$args = array(
-			array(
-				'methods'  => WP_REST_Server::CREATABLE,
-				'callback' => array(
-					$this,
-					'generate_key_pair',
+			'methods'  => WP_REST_Server::CREATABLE,
+			'callback' => array( $this, 'generate_key_pair' ),
+			'args'     => array(
+				'name'    => array(
+					'description'       => esc_html__( 'The name of the key-pair.', 'jwt-auth' ),
+					'type'              => 'string',
+					'required'          => true,
+					'sanitize_callback' => 'sanitize_text_field',
+					'validate_callback' => 'rest_validate_request_arg',
 				),
-				'args'     => array(
-					'name'    => array(
-						'description'       => esc_html__( 'The name of the key-pair.', 'jwt-auth' ),
-						'type'              => 'string',
-						'required'          => true,
-						'sanitize_callback' => 'sanitize_text_field',
-						'validate_callback' => 'rest_validate_request_arg',
-					),
-					'user_id' => array(
-						'description'       => esc_html__( 'The ID of the user.', 'jwt-auth' ),
-						'type'              => 'integer',
-						'required'          => true,
-						'sanitize_callback' => 'absint',
-						'validate_callback' => 'rest_validate_request_arg',
-					),
+				'user_id' => array(
+					'description'       => esc_html__( 'The ID of the user.', 'jwt-auth' ),
+					'type'              => 'integer',
+					'required'          => true,
+					'sanitize_callback' => 'absint',
+					'validate_callback' => 'rest_validate_request_arg',
 				),
 			),
-			'schema' => array(
+			'schema'   => array(
 				$this,
 				'get_item_schema',
 			),
 		);
 		register_rest_route( self::_NAMESPACE_, '/' . self::_REST_BASE_ . '/(?P<user_id>[\d]+)', $args );
 
 		$args = array(
-			array(
-				'methods'  => WP_REST_Server::DELETABLE,
-				'callback' => array(
-					$this,
-					'delete_all_key_pairs',
-				),
-				'args'     => array(
-					'user_id' => array(
-						'description'       => esc_html__( 'The ID of the user.', 'jwt-auth' ),
-						'type'              => 'integer',
-						'required'          => true,
-						'sanitize_callback' => 'absint',
-						'validate_callback' => 'rest_validate_request_arg',
-					),
+			'methods'  => WP_REST_Server::DELETABLE,
+			'callback' => array( $this, 'delete_all_key_pairs' ),
+			'args'     => array(
+				'user_id' => array(
+					'description'       => esc_html__( 'The ID of the user.', 'jwt-auth' ),
+					'type'              => 'integer',
+					'required'          => true,
+					'sanitize_callback' => 'absint',
+					'validate_callback' => 'rest_validate_request_arg',
 				),
 			),
 		);
 		register_rest_route( self::_NAMESPACE_, '/' . self::_REST_BASE_ . '/(?P<user_id>[\d]+)/revoke-all', $args );
 
 		$args = array(
-			array(
-				'methods'  => WP_REST_Server::DELETABLE,
-				'callback' => array(
-					$this,
-					'delete_key_pair',
+			'methods'  => WP_REST_Server::DELETABLE,
+			'callback' => array( $this, 'delete_key_pair' ),
+			'args'     => array(
+				'user_id' => array(
+					'description'       => esc_html__( 'The ID of the user.', 'jwt-auth' ),
+					'type'              => 'integer',
+					'required'          => true,
+					'sanitize_callback' => 'absint',
+					'validate_callback' => 'rest_validate_request_arg',
 				),
-				'args'     => array(
-					'user_id' => array(
-						'description'       => esc_html__( 'The ID of the user.', 'jwt-auth' ),
-						'type'              => 'integer',
-						'required'          => true,
-						'sanitize_callback' => 'absint',
-						'validate_callback' => 'rest_validate_request_arg',
-					),
-					'api_key' => array(
-						'description'       => esc_html__( 'The API key being revoked.', 'jwt-auth' ),
-						'type'              => 'string',
-						'required'          => true,
-						'sanitize_callback' => 'sanitize_text_field',
-						'validate_callback' => 'rest_validate_request_arg',
-					),
+				'api_key' => array(
+					'description'       => esc_html__( 'The API key being revoked.', 'jwt-auth' ),
+					'type'              => 'string',
+					'required'          => true,
+					'sanitize_callback' => 'sanitize_text_field',
+					'validate_callback' => 'rest_validate_request_arg',
 				),
 			),
 		);