Changeset 42343 for trunk/src/wp-includes/rest-api/class-wp-rest-request.php

Timestamp:

11/30/2017 11:09:33 PM (7 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

• trunk/src/wp-includes/rest-api/class-wp-rest-request.php (modified) (13 diffs)

trunk/src/wp-includes/rest-api/class-wp-rest-request.php

@@ -112 +112 @@
     public function __construct( $method = '', $route = '', $attributes = array() ) {
         $this->params = array(
-            'URL'   => array(),
-            'GET'   => array(),
-            'POST'  => array(),
-            'FILES' => array(),
+            'URL'      => array(),
+            'GET'      => array(),
+            'POST'     => array(),
+            'FILES'    => array(),
 
             // See parse_json_params.
-            'JSON'  => null,
+            'JSON'     => null,
 
             'defaults' => array(),
@@ -236 +236 @@
      */
     public function set_header( $key, $value ) {
-        $key = $this->canonicalize_header_name( $key );
+        $key   = $this->canonicalize_header_name( $key );
         $value = (array) $value;
 
@@ -251 +251 @@
      */
     public function add_header( $key, $value ) {
-        $key = $this->canonicalize_header_name( $key );
+        $key   = $this->canonicalize_header_name( $key );
         $value = (array) $value;
 
@@ -369 +369 @@
          *    An array of types to check, in order of priority.
          *
-         *    @param string $type The type to check.
+         * @param string $type The type to check.
          * }
          * @param WP_REST_Request $this The request object.
@@ -406 +406 @@
      */
     public function set_param( $key, $value ) {
-        $order = $this->get_parameter_order();
+        $order                             = $this->get_parameter_order();
         $this->params[ $order[0] ][ $key ] = $value;
     }
@@ -588 +588 @@
 
         // Enable lazy parsing.
-        $this->parsed_json = false;
-        $this->parsed_body = false;
+        $this->parsed_json    = false;
+        $this->parsed_body    = false;
         $this->params['JSON'] = null;
     }
@@ -651 +651 @@
             );
             if ( function_exists( 'json_last_error' ) ) {
-                $error_data['json_error_code'] = json_last_error();
+                $error_data['json_error_code']    = json_last_error();
                 $error_data['json_error_message'] = json_last_error_msg();
             }
@@ -803 +803 @@
 
         if ( $invalid_params ) {
-            return new WP_Error( 'rest_invalid_param', sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ), array( 'status' => 400, 'params' => $invalid_params ) );
+            return new WP_Error(
+                'rest_invalid_param', sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ), array(
+                    'status' => 400,
+                    'params' => $invalid_params,
+                )
+            );
         }
 
@@ -825 +830 @@
 
         $attributes = $this->get_attributes();
-        $required = array();
+        $required   = array();
 
         // No arguments set, skip validation.
@@ -841 +846 @@
 
         if ( ! empty( $required ) ) {
-            return new WP_Error( 'rest_missing_callback_param', sprintf( __( 'Missing parameter(s): %s' ), implode( ', ', $required ) ), array( 'status' => 400, 'params' => $required ) );
+            return new WP_Error(
+                'rest_missing_callback_param', sprintf( __( 'Missing parameter(s): %s' ), implode( ', ', $required ) ), array(
+                    'status' => 400,
+                    'params' => $required,
+                )
+            );
         }
 
@@ -869 +879 @@
 
         if ( $invalid_params ) {
-            return new WP_Error( 'rest_invalid_param', sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ), array( 'status' => 400, 'params' => $invalid_params ) );
+            return new WP_Error(
+                'rest_invalid_param', sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ), array(
+                    'status' => 400,
+                    'params' => $invalid_params,
+                )
+            );
         }
 
@@ -946 +961 @@
      */
     public static function from_url( $url ) {
-        $bits = parse_url( $url );
+        $bits         = parse_url( $url );
         $query_params = array();
 
@@ -957 +972 @@
             // Pretty permalinks on, and URL is under the API root.
             $api_url_part = substr( $url, strlen( untrailingslashit( $api_root ) ) );
-            $route = parse_url( $api_url_part, PHP_URL_PATH );
+            $route        = parse_url( $api_url_part, PHP_URL_PATH );
         } elseif ( ! empty( $query_params['rest_route'] ) ) {
             // ?rest_route=... set directly