Changeset 42057 for branches/4.8/tests/phpunit/tests/date/query.php

Timestamp:

10/31/2017 12:22:07 PM (9 years ago)

Author:

pento

Message:

Database: Restore numbered placeholders in wpdb::prepare().

[41496] removed support for numbered placeholders in queries send through wpdb::prepare(), which, despite being undocumented, were quite commonly used.

This change restores support for numbered placeholders (as well as a subset of placeholder formatting), while also adding extra checks to ensure the correct number of arguments are being passed to wpdb::prepare(), given the number of placeholders.

Merges [41662], [42056] to the 4.8 branch.
See #41925.

Location:

branches/4.8

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/date/query.php (modified) (5 diffs)

branches/4.8/tests/phpunit/tests/date/query.php

@@ -513 +513 @@
          */
         public function test_build_time_query_should_not_discard_hour_0() {
+                global $wpdb;
                 $q = new WP_Date_Query( array() );
 
                 $found = $q->build_time_query( 'post_date', '=', 0, 10 );
 
-                $this->assertContains( '%H', $found );
+                $this->assertContains( '%H', $wpdb->remove_placeholder_escape( $found ) );
         }
 
@@ -613 +614 @@
 
         public function test_build_time_query_hour_minute() {
+                global $wpdb;
                 $q = new WP_Date_Query( array() );
 
@@ -619 +621 @@
                 // $compare value is floating point - use regex to account for
                 // varying precision on different PHP installations
-                $this->assertRegExp( "/DATE_FORMAT\( post_date, '%H\.%i' \) = 5\.150*/", $found );
+                $this->assertRegExp( "/DATE_FORMAT\( post_date, '%H\.%i' \) = 5\.150*/", $wpdb->remove_placeholder_escape( $found ) );
         }
 
         public function test_build_time_query_hour_minute_second() {
+                global $wpdb;
                 $q = new WP_Date_Query( array() );
 
@@ -629 +632 @@
                 // $compare value is floating point - use regex to account for
                 // varying precision on different PHP installations
-                $this->assertRegExp( "/DATE_FORMAT\( post_date, '%H\.%i%s' \) = 5\.15350*/", $found );
+                $this->assertRegExp( "/DATE_FORMAT\( post_date, '%H\.%i%s' \) = 5\.15350*/", $wpdb->remove_placeholder_escape( $found ) );
         }
 
         public function test_build_time_query_minute_second() {
+                global $wpdb;
                 $q = new WP_Date_Query( array() );
 
@@ -639 +643 @@
                 // $compare value is floating point - use regex to account for
                 // varying precision on different PHP installations
-                $this->assertRegExp( "/DATE_FORMAT\( post_date, '0\.%i%s' \) = 0\.15350*/", $found );
+                $this->assertRegExp( "/DATE_FORMAT\( post_date, '0\.%i%s' \) = 0\.15350*/", $wpdb->remove_placeholder_escape( $found ) );
         }