Changeset 47550 for trunk/src/wp-includes/class-wp-xmlrpc-server.php

Timestamp:

04/05/2020 03:00:44 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict type check for in_array() and array_search() where strings are involved.

This reduces the number of WordPress.PHP.StrictInArray.MissingTrueStrict issues from 486 to 50.

Includes minor code layout fixes for better readability.

See #49542.

File:

• trunk/src/wp-includes/class-wp-xmlrpc-server.php (modified) (10 diffs)

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -758 +758 @@
         );
 
-        if ( in_array( 'labels', $fields ) ) {
+        if ( in_array( 'labels', $fields, true ) ) {
             $_taxonomy['labels'] = (array) $taxonomy->labels;
         }
 
-        if ( in_array( 'cap', $fields ) ) {
+        if ( in_array( 'cap', $fields, true ) ) {
             $_taxonomy['cap'] = (array) $taxonomy->cap;
         }
 
-        if ( in_array( 'menu', $fields ) ) {
+        if ( in_array( 'menu', $fields, true ) ) {
             $_taxonomy['show_in_menu'] = (bool) $_taxonomy->show_in_menu;
         }
 
-        if ( in_array( 'object_type', $fields ) ) {
+        if ( in_array( 'object_type', $fields, true ) ) {
             $_taxonomy['object_type'] = array_unique( (array) $taxonomy->object_type );
         }
@@ -903 +903 @@
 
         // Merge requested $post_fields fields into $_post.
-        if ( in_array( 'post', $fields ) ) {
+        if ( in_array( 'post', $fields, true ) ) {
             $_post = array_merge( $_post, $post_fields );
         } else {
@@ -910 +910 @@
         }
 
-        $all_taxonomy_fields = in_array( 'taxonomies', $fields );
-
-        if ( $all_taxonomy_fields || in_array( 'terms', $fields ) ) {
+        $all_taxonomy_fields = in_array( 'taxonomies', $fields, true );
+
+        if ( $all_taxonomy_fields || in_array( 'terms', $fields, true ) ) {
             $post_type_taxonomies = get_object_taxonomies( $post['post_type'], 'names' );
             $terms                = wp_get_object_terms( $post['ID'], $post_type_taxonomies );
@@ -921 +921 @@
         }
 
-        if ( in_array( 'custom_fields', $fields ) ) {
+        if ( in_array( 'custom_fields', $fields, true ) ) {
             $_post['custom_fields'] = $this->get_custom_fields( $post['ID'] );
         }
 
-        if ( in_array( 'enclosure', $fields ) ) {
+        if ( in_array( 'enclosure', $fields, true ) ) {
             $_post['enclosure'] = array();
             $enclosures         = (array) get_post_meta( $post['ID'], 'enclosure' );
@@ -970 +970 @@
         );
 
-        if ( in_array( 'labels', $fields ) ) {
+        if ( in_array( 'labels', $fields, true ) ) {
             $_post_type['labels'] = (array) $post_type->labels;
         }
 
-        if ( in_array( 'cap', $fields ) ) {
+        if ( in_array( 'cap', $fields, true ) ) {
             $_post_type['cap']          = (array) $post_type->cap;
             $_post_type['map_meta_cap'] = (bool) $post_type->map_meta_cap;
         }
 
-        if ( in_array( 'menu', $fields ) ) {
+        if ( in_array( 'menu', $fields, true ) ) {
             $_post_type['menu_position'] = (int) $post_type->menu_position;
             $_post_type['menu_icon']     = $post_type->menu_icon;
@@ -985 +985 @@
         }
 
-        if ( in_array( 'taxonomies', $fields ) ) {
+        if ( in_array( 'taxonomies', $fields, true ) ) {
             $_post_type['taxonomies'] = get_object_taxonomies( $post_type->name, 'names' );
         }
@@ -1191 +1191 @@
         );
 
-        if ( in_array( 'all', $fields ) ) {
+        if ( in_array( 'all', $fields, true ) ) {
             $_user = array_merge( $_user, $user_fields );
         } else {
-            if ( in_array( 'basic', $fields ) ) {
+            if ( in_array( 'basic', $fields, true ) ) {
                 $basic_fields = array( 'username', 'email', 'registered', 'display_name', 'nicename' );
                 $fields       = array_merge( $fields, $basic_fields );
@@ -1578 +1578 @@
                     $term_names = $post_data['terms_names'][ $taxonomy ];
                     foreach ( $term_names as $term_name ) {
-                        if ( in_array( $term_name, $ambiguous_terms ) ) {
+                        if ( in_array( $term_name, $ambiguous_terms, true ) ) {
                             return new IXR_Error( 401, __( 'Ambiguous term name used in a hierarchical taxonomy. Please use term ID instead.' ) );
                         }
@@ -3758 +3758 @@
             $statuses = array_keys( $statuses );
 
-            if ( ! in_array( $content_struct['status'], $statuses ) ) {
+            if ( ! in_array( $content_struct['status'], $statuses, true ) ) {
                 return new IXR_Error( 401, __( 'Invalid comment status.' ) );
             }
@@ -5669 +5669 @@
 
         // Use wp.editPost to edit post types other than post and page.
-        if ( ! in_array( $postdata['post_type'], array( 'post', 'page' ) ) ) {
+        if ( ! in_array( $postdata['post_type'], array( 'post', 'page' ), true ) ) {
             return new IXR_Error( 401, __( 'Invalid post type.' ) );
         }