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

Timestamp:

11/30/2017 11:09:33 PM (9 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-server.php (modified) (14 diffs)

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

@@ -89 +89 @@
                         '/' => array(
                                 'callback' => array( $this, 'get_index' ),
-                                'methods' => 'GET',
-                                'args' => array(
+                                'methods'  => 'GET',
+                                'args'     => array(
                                         'context' => array(
                                                 'default' => 'view',
@@ -161 +161 @@
                 foreach ( (array) $error->errors as $code => $messages ) {
                         foreach ( (array) $messages as $message ) {
-                                $errors[] = array( 'code' => $code, 'message' => $message, 'data' => $error->get_error_data( $code ) );
+                                $errors[] = array(
+                                        'code'    => $code,
+                                        'message' => $message,
+                                        'data'    => $error->get_error_data( $code ),
+                                );
                         }
                 }
@@ -261 +265 @@
                  * @param bool $rest_enabled Whether the REST API is enabled. Default true.
                  */
-                apply_filters_deprecated( 'rest_enabled', array( true ), '4.7.0', 'rest_authentication_errors',
+                apply_filters_deprecated(
+                        'rest_enabled', array( true ), '4.7.0', 'rest_authentication_errors',
                         __( 'The REST API can no longer be completely disabled, the rest_authentication_errors filter can be used to restrict access to the API, instead.' )
                 );
@@ -399 +404 @@
                         if ( $json_error_message ) {
                                 $json_error_obj = new WP_Error( 'rest_encode_error', $json_error_message, array( 'status' => 500 ) );
-                                $result = $this->error_to_response( $json_error_obj );
-                                $result = wp_json_encode( $result->data[0] );
+                                $result         = $this->error_to_response( $json_error_obj );
+                                $result         = wp_json_encode( $result->data[0] );
                         }
 
@@ -472 +477 @@
 
                         foreach ( $items as $item ) {
-                                $attributes = $item['attributes'];
+                                $attributes         = $item['attributes'];
                                 $attributes['href'] = $item['href'];
-                                $data[ $rel ][] = $attributes;
+                                $data[ $rel ][]     = $attributes;
                         }
                 }
@@ -500 +505 @@
                 }
 
-                $curies = $response->get_curies();
+                $curies      = $response->get_curies();
                 $used_curies = array();
 
@@ -516 +521 @@
                                 preg_match( '!' . $rel_regex . '!', $rel, $matches );
                                 if ( $matches ) {
-                                        $new_rel = $curie['name'] . ':' . $matches[1];
+                                        $new_rel                       = $curie['name'] . ':' . $matches[1];
                                         $used_curies[ $curie['name'] ] = $curie;
-                                        $links[ $new_rel ] = $items;
+                                        $links[ $new_rel ]             = $items;
                                         unset( $links[ $rel ] );
                                         break;
@@ -653 +658 @@
                         $this->namespaces[ $namespace ] = array();
 
-                        $this->register_route( $namespace, '/' . $namespace, array(
-                                array(
-                                        'methods' => self::READABLE,
-                                        'callback' => array( $this, 'get_namespace_index' ),
-                                        'args' => array(
-                                                'namespace' => array(
-                                                        'default' => $namespace,
-                                                ),
-                                                'context' => array(
-                                                        'default' => 'view',
+                        $this->register_route(
+                                $namespace, '/' . $namespace, array(
+                                        array(
+                                                'methods'  => self::READABLE,
+                                                'callback' => array( $this, 'get_namespace_index' ),
+                                                'args'     => array(
+                                                        'namespace' => array(
+                                                                'default' => $namespace,
+                                                        ),
+                                                        'context'   => array(
+                                                                'default' => 'view',
+                                                        ),
                                                 ),
                                         ),
-                                ),
-                        ) );
+                                )
+                        );
                 }
 
                 // Associative to avoid double-registration.
                 $this->namespaces[ $namespace ][ $route ] = true;
-                $route_args['namespace'] = $namespace;
+                $route_args['namespace']                  = $namespace;
 
                 if ( $override || empty( $this->endpoints[ $route ] ) ) {
@@ -757 +764 @@
 
                                 foreach ( $methods as $method ) {
-                                        $method = strtoupper( trim( $method ) );
+                                        $method                        = strtoupper( trim( $method ) );
                                         $handler['methods'][ $method ] = true;
                                 }
@@ -839 +846 @@
 
                         foreach ( $handlers as $handler ) {
-                                $callback  = $handler['callback'];
+                                $callback = $handler['callback'];
                                 $response = null;
 
@@ -1064 +1071 @@
                 }
 
-                $routes = $this->namespaces[ $namespace ];
+                $routes    = $this->namespaces[ $namespace ];
                 $endpoints = array_intersect_key( $this->get_routes(), $routes );
 
-                $data = array(
+                $data     = array(
                         'namespace' => $namespace,
-                        'routes' => $this->get_data_for_routes( $endpoints, $request['context'] ),
+                        'routes'    => $this->get_data_for_routes( $endpoints, $request['context'] ),
                 );
                 $response = rest_ensure_response( $data );
@@ -1147 +1154 @@
                 $data = array(
                         'namespace' => '',
-                        'methods' => array(),
+                        'methods'   => array(),
                         'endpoints' => array(),
                 );
@@ -1172 +1179 @@
 
                         $data['methods'] = array_merge( $data['methods'], array_keys( $callback['methods'] ) );
-                        $endpoint_data = array(
+                        $endpoint_data   = array(
                                 'methods' => array_keys( $callback['methods'] ),
                         );
@@ -1321 +1328 @@
 
                 // CONTENT_* headers are not prefixed with HTTP_.
-                $additional = array( 'CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true );
+                $additional = array(
+                        'CONTENT_LENGTH' => true,
+                        'CONTENT_MD5'    => true,
+                        'CONTENT_TYPE'   => true,
+                );
 
                 foreach ( $server as $key => $value ) {