Changeset 43571 for trunk/src/wp-includes/user.php

Timestamp:

08/17/2018 01:50:26 AM (6 years ago)

Author:

pento

Message:

Coding Standards: Upgrade WPCS to 1.0.0

WPCS 1.0.0 includes a bunch of new auto-fixers, which drops the number of coding standards issues across WordPress significantly. Prior to running the auto-fixers, there were 15,312 issues detected. With this commit, we now drop to 4,769 issues.

This change includes three notable additions:

• Multiline function calls must now put each parameter on a new line.
• Auto-formatting files is now part of the grunt precommit script.
• Auto-fixable coding standards issues will now cause Travis failures.

Fixes #44600.

File:

• trunk/src/wp-includes/user.php (modified) (11 diffs)

trunk/src/wp-includes/user.php

@@ -910 +910 @@
             INNER JOIN {$wpdb->users} ON user_id = ID
             WHERE meta_key = '{$blog_prefix}capabilities'
-        ", ARRAY_N
+        ",
+            ARRAY_N
         );
 
@@ -2607 +2608 @@
         WHERE meta_key = '{$prefix}capabilities'
         AND meta_value NOT REGEXP %s
-    ", $regex
+    ",
+            $regex
         )
     );
@@ -2708 +2710 @@
         if ( ! is_email( $_POST['email'] ) ) {
             $errors->add(
-                'user_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ), array(
+                'user_email',
+                __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ),
+                array(
                     'form-field' => 'email',
                 )
@@ -2718 +2722 @@
         if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_email FROM {$wpdb->users} WHERE user_email=%s", $_POST['email'] ) ) ) {
             $errors->add(
-                'user_email', __( '<strong>ERROR</strong>: The email address is already used.' ), array(
+                'user_email',
+                __( '<strong>ERROR</strong>: The email address is already used.' ),
+                array(
                     'form-field' => 'email',
                 )
@@ -2941 +2947 @@
 
     update_post_meta( $request_id, '_wp_user_request_confirmed_timestamp', time() );
-    wp_update_post( array(
-        'ID'          => $request_id,
-        'post_status' => 'request-confirmed',
-    ) );
+    wp_update_post(
+        array(
+            'ID'          => $request_id,
+            'post_status' => 'request-confirmed',
+        )
+    );
 }
 
@@ -3127 +3135 @@
     );
 
-    $subject  = sprintf(
+    $subject = sprintf(
         /* translators: %s: Site name. */
         __( '[%s] Erasure Request Fulfilled' ),
@@ -3236 +3244 @@
     $request = wp_get_user_request_data( $request_id );
 
-    $message = '<p class="success">' . __( 'Action has been confirmed.' ) . '</p>';
+    $message  = '<p class="success">' . __( 'Action has been confirmed.' ) . '</p>';
     $message .= '<p>' . __( 'The site administrator has been notified and will fulfill your request as soon as possible.' ) . '</p>';
 
     if ( $request && in_array( $request->action_name, _wp_privacy_action_request_types(), true ) ) {
         if ( 'export_personal_data' === $request->action_name ) {
-            $message = '<p class="success">' . __( 'Thanks for confirming your export request.' ) . '</p>';
+            $message  = '<p class="success">' . __( 'Thanks for confirming your export request.' ) . '</p>';
             $message .= '<p>' . __( 'The site administrator has been notified. You will receive a link to download your export via email when they fulfill your request.' ) . '</p>';
         } elseif ( 'remove_personal_data' === $request->action_name ) {
-            $message = '<p class="success">' . __( 'Thanks for confirming your erasure request.' ) . '</p>';
+            $message  = '<p class="success">' . __( 'Thanks for confirming your erasure request.' ) . '</p>';
             $message .= '<p>' . __( 'The site administrator has been notified. You will receive an email confirmation when they erase your data.' ) . '</p>';
         }
@@ -3291 +3299 @@
 
     // Check for duplicates.
-    $requests_query = new WP_Query( array(
-        'post_type'     => 'user_request',
-        'post_name__in' => array( $action_name ),  // Action name stored in post_name column.
-        'title'         => $email_address, // Email address stored in post_title column.
-        'post_status'   => 'any',
-        'fields'        => 'ids',
-    ) );
+    $requests_query = new WP_Query(
+        array(
+            'post_type'     => 'user_request',
+            'post_name__in' => array( $action_name ),  // Action name stored in post_name column.
+            'title'         => $email_address, // Email address stored in post_title column.
+            'post_status'   => 'any',
+            'fields'        => 'ids',
+        )
+    );
 
     if ( $requests_query->found_posts ) {
@@ -3303 +3313 @@
     }
 
-    $request_id = wp_insert_post( array(
-        'post_author'   => $user_id,
-        'post_name'     => $action_name,
-        'post_title'    => $email_address,
-        'post_content'  => wp_json_encode( $request_data ),
-        'post_status'   => 'request-pending',
-        'post_type'     => 'user_request',
-        'post_date'     => current_time( 'mysql', false ),
-        'post_date_gmt' => current_time( 'mysql', true ),
-    ), true );
+    $request_id = wp_insert_post(
+        array(
+            'post_author'   => $user_id,
+            'post_name'     => $action_name,
+            'post_title'    => $email_address,
+            'post_content'  => wp_json_encode( $request_data ),
+            'post_status'   => 'request-pending',
+            'post_type'     => 'user_request',
+            'post_date'     => current_time( 'mysql', false ),
+            'post_date_gmt' => current_time( 'mysql', true ),
+        ),
+        true
+    );
 
     return $request_id;
@@ -3381 +3394 @@
         'email'       => $request->email,
         'description' => wp_user_request_action_description( $request->action_name ),
-        'confirm_url' => add_query_arg( array(
-            'action'      => 'confirmaction',
-            'request_id'  => $request_id,
-            'confirm_key' => wp_generate_user_request_key( $request_id ),
-        ), wp_login_url() ),
+        'confirm_url' => add_query_arg(
+            array(
+                'action'      => 'confirmaction',
+                'request_id'  => $request_id,
+                'confirm_key' => wp_generate_user_request_key( $request_id ),
+            ),
+            wp_login_url()
+        ),
         'sitename'    => wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ),
         'siteurl'     => home_url(),
@@ -3497 +3513 @@
     }
 
-    wp_update_post( array(
-        'ID'                => $request_id,
-        'post_status'       => 'request-pending',
-        'post_password'     => $wp_hasher->HashPassword( $key ),
-        'post_modified'     => current_time( 'mysql', false ),
-        'post_modified_gmt' => current_time( 'mysql', true ),
-    ) );
+    wp_update_post(
+        array(
+            'ID'                => $request_id,
+            'post_status'       => 'request-pending',
+            'post_password'     => $wp_hasher->HashPassword( $key ),
+            'post_modified'     => current_time( 'mysql', false ),
+            'post_modified_gmt' => current_time( 'mysql', true ),
+        )
+    );
 
     return $key;