Changeset 42343 for trunk/src/wp-includes/class-wp-ajax-response.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/class-wp-ajax-response.php (modified) (8 diffs)

trunk/src/wp-includes/class-wp-ajax-response.php

@@ -24 +24 @@
      */
     public function __construct( $args = '' ) {
-        if ( !empty($args) )
-            $this->add($args);
+        if ( ! empty( $args ) ) {
+            $this->add( $args );
+        }
     }
 
@@ -64 +65 @@
     public function add( $args = '' ) {
         $defaults = array(
-            'what' => 'object', 'action' => false,
-            'id' => '0', 'old_id' => false,
-            'position' => 1,
-            'data' => '', 'supplemental' => array()
+            'what'         => 'object',
+            'action'       => false,
+            'id'           => '0',
+            'old_id'       => false,
+            'position'     => 1,
+            'data'         => '',
+            'supplemental' => array(),
         );
 
@@ -73 +77 @@
 
         $position = preg_replace( '/[^a-z0-9:_-]/i', '', $r['position'] );
-        $id = $r['id'];
-        $what = $r['what'];
-        $action = $r['action'];
-        $old_id = $r['old_id'];
-        $data = $r['data'];
+        $id       = $r['id'];
+        $what     = $r['what'];
+        $action   = $r['action'];
+        $old_id   = $r['old_id'];
+        $data     = $r['data'];
 
         if ( is_wp_error( $id ) ) {
             $data = $id;
-            $id = 0;
+            $id   = 0;
         }
 
@@ -87 +91 @@
         if ( is_wp_error( $data ) ) {
             foreach ( (array) $data->get_error_codes() as $code ) {
-                $response .= "<wp_error code='$code'><![CDATA[" . $data->get_error_message( $code ) . "]]></wp_error>";
+                $response .= "<wp_error code='$code'><![CDATA[" . $data->get_error_message( $code ) . ']]></wp_error>';
                 if ( ! $error_data = $data->get_error_data( $code ) ) {
                     continue;
@@ -93 +97 @@
                 $class = '';
                 if ( is_object( $error_data ) ) {
-                    $class = ' class="' . get_class( $error_data ) . '"';
+                    $class      = ' class="' . get_class( $error_data ) . '"';
                     $error_data = get_object_vars( $error_data );
                 }
@@ -107 +111 @@
                 }
 
-                $response .= "</wp_error_data>";
+                $response .= '</wp_error_data>';
             }
         } else {
@@ -124 +128 @@
             $action = $_POST['action'];
         }
-        $x = '';
+        $x  = '';
         $x .= "<response action='{$action}_$id'>"; // The action attribute in the xml output is formatted like a nonce action
-        $x .=   "<$what id='$id' " . ( false === $old_id ? '' : "old_id='$old_id' " ) . "position='$position'>";
-        $x .=       $response;
-        $x .=       $s;
-        $x .=   "</$what>";
-        $x .= "</response>";
+        $x .= "<$what id='$id' " . ( false === $old_id ? '' : "old_id='$old_id' " ) . "position='$position'>";
+        $x .= $response;
+        $x .= $s;
+        $x .= "</$what>";
+        $x .= '</response>';
 
         $this->responses[] = $x;
@@ -146 +150 @@
         header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ) );
         echo "<?xml version='1.0' encoding='" . get_option( 'blog_charset' ) . "' standalone='yes'?><wp_ajax>";
-        foreach ( (array) $this->responses as $response )
+        foreach ( (array) $this->responses as $response ) {
             echo $response;
+        }
         echo '</wp_ajax>';
-        if ( wp_doing_ajax() )
+        if ( wp_doing_ajax() ) {
             wp_die();
-        else
+        } else {
             die();
+        }
     }
 }