Changeset 45603

Timestamp:

07/05/2019 05:42:57 AM (7 years ago)

Author:

pento

Message:

Coding Standards: Fix all WordPress.DB.PreparedSQLPlaceholders issues.

See #47632.

Location:

trunk

Files:

• src/wp-admin/includes/class-wp-importer.php (modified) (1 diff)
• src/wp-admin/includes/export.php (modified) (1 diff)
• src/wp-includes/class-wp-comment-query.php (modified) (2 diffs)
• src/wp-includes/class-wp-meta-query.php (modified) (1 diff)
• src/wp-includes/taxonomy.php (modified) (4 diffs)
• tests/phpunit/tests/db.php (modified) (3 diffs)

trunk/src/wp-admin/includes/class-wp-importer.php

@@ -65 +65 @@
                 // Get count of permalinks
                 $meta_key = $importer_name . '_' . $bid . '_permalink';
-                $sql      = $wpdb->prepare( "SELECT COUNT( post_id ) AS cnt FROM $wpdb->postmeta WHERE meta_key = '%s'", $meta_key );
+                $sql      = $wpdb->prepare( "SELECT COUNT( post_id ) AS cnt FROM $wpdb->postmeta WHERE meta_key = %s", $meta_key );
 
                 $result = $wpdb->get_results( $sql );

trunk/src/wp-admin/includes/export.php

@@ -107 +107 @@
                 $post_types = get_post_types( array( 'can_export' => true ) );
                 $esses      = array_fill( 0, count( $post_types ), '%s' );
-                $where      = $wpdb->prepare( "{$wpdb->posts}.post_type IN (" . implode( ',', $esses ) . ')', $post_types );
+
+                // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.UnfinishedPrepare
+                $where = $wpdb->prepare( "{$wpdb->posts}.post_type IN (" . implode( ',', $esses ) . ')', $post_types );
         }
 

trunk/src/wp-includes/class-wp-comment-query.php

@@ -772 +772 @@
                         foreach ( $post_fields as $field_name => $field_value ) {
                                 // $field_value may be an array.
-                                $esses                                     = array_fill( 0, count( (array) $field_value ), '%s' );
+                                $esses = array_fill( 0, count( (array) $field_value ), '%s' );
+
+                                // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.UnfinishedPrepare
                                 $this->sql_clauses['where'][ $field_name ] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} IN (" . implode( ',', $esses ) . ')', $field_value );
                         }
@@ -793 +795 @@
                                 $join_posts_table = true;
 
-                                $esses                                     = array_fill( 0, count( $q_values ), '%s' );
+                                $esses = array_fill( 0, count( $q_values ), '%s' );
+
+                                // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.UnfinishedPrepare
                                 $this->sql_clauses['where'][ $field_name ] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} IN (" . implode( ',', $esses ) . ')', $q_values );
                         }

trunk/src/wp-includes/class-wp-meta-query.php

@@ -624 +624 @@
                                 case 'BETWEEN':
                                 case 'NOT BETWEEN':
-                                        $meta_value = array_slice( $meta_value, 0, 2 );
-                                        $where      = $wpdb->prepare( '%s AND %s', $meta_value );
+                                        $where = $wpdb->prepare( '%s AND %s', $meta_value[0], $meta_value[1] );
                                         break;
 

trunk/src/wp-includes/taxonomy.php

@@ -1377 +1377 @@
                 $where = 't.term_id = %d';
                 if ( ! empty( $taxonomy ) ) {
+                        // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.ReplacementsWrongNumber
                         return $wpdb->get_row( $wpdb->prepare( $tax_select . $where . ' AND tt.taxonomy = %s', $term, $taxonomy ), ARRAY_A );
                 } else {
@@ -1412 +1413 @@
         }
 
+        // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.UnfinishedPrepare
         $result = $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms as t WHERE $where $orderby $limit", $where_fields ) );
         if ( $result ) {
@@ -1417 +1419 @@
         }
 
+        // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.UnfinishedPrepare
         return $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms as t WHERE $else_where $orderby $limit", $else_where_fields ) );
 }
@@ -3706 +3709 @@
 
                 if ( $object_types ) {
+                        // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.QuotedDynamicPlaceholderGeneration
                         $count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type IN ('" . implode( "', '", $object_types ) . "') AND term_taxonomy_id = %d", $term ) );
                 }

trunk/tests/phpunit/tests/db.php

@@ -1613 +1613 @@
                 $part = $wpdb->prepare( ' AND meta_value = %s', ' %s ' );
                 $this->assertNotContains( '%s', $part );
+                // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.ReplacementsWrongNumber
                 $query = $wpdb->prepare( 'SELECT * FROM {$wpdb->postmeta} WHERE meta_key = %s $part', array( 'foo', 'bar' ) );
                 $this->assertNull( $query );
@@ -1621 +1622 @@
 
                 $actual = $wpdb->prepare(
+                        // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.UnquotedComplexPlaceholder
                         'WHERE second=%2$f AND first=%1$f',
                         1.1,
@@ -1635 +1637 @@
 
                 $actual = $wpdb->prepare(
+                        // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.UnquotedComplexPlaceholder
                         'WHERE second=%2$f AND first=%1$f',
                         array( 1.1, 2.2 )