Changeset 51462 for trunk/tests/phpunit/tests/db.php

Timestamp:

07/19/2021 02:00:11 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Replace assertContains() with assertStringContainsString() when used with strings.

Using the assertContains() and assertNotContains() methods with string haystacks was deprecated in PHPUnit 8 and removed in PHPUnit 9.

While WordPress test suite currently only supports PHPUnit up to 7.5.x, this allows us to switch to newer assertions ahead of adding full support for PHPUnit 8+.

These methods introduced in PHPUnit 7.5 should be used as an alternative:

• assertStringContainsString()
• assertStringContainsStringIgnoringCase
• assertStringNotContainsString()
• assertStringNotContainsStringIgnoringCase

As WordPress currently uses PHPUnit 5.7.x to run tests on PHP 5.6, polyfills for these methods were added to the WP_UnitTestCase class for PHPUnit < 7.5.

Follow-up to [51331], [51451], [51461].

Props jrf, dd32, SergeyBiryukov.
See #53363, #46149.

File:

• trunk/tests/phpunit/tests/db.php (modified) (6 diffs)

trunk/tests/phpunit/tests/db.php

@@ -100 +100 @@
 
         // Ensure the float isn't 0,700.
-        $this->assertContains( '0.700', array_pop( $this->_queries ) );
+        $this->assertStringContainsString( '0.700', array_pop( $this->_queries ) );
 
         // Try a prepare.
         $sql = $wpdb->prepare( 'UPDATE test_table SET float_column = %f AND meta_id = %d', 0.7, 5 );
-        $this->assertContains( '0.700', $sql );
+        $this->assertStringContainsString( '0.700', $sql );
 
         // Restore locale settings.
@@ -271 +271 @@
         global $wpdb;
         $sql = $wpdb->prepare( "UPDATE test_table SET string_column = '%%f is a float, %%d is an int %d, %%s is a string', field = %s", 3, '4' );
-        $this->assertContains( $wpdb->placeholder_escape(), $sql );
+        $this->assertStringContainsString( $wpdb->placeholder_escape(), $sql );
 
         $sql = $wpdb->remove_placeholder_escape( $sql );
@@ -1609 +1609 @@
 
         $part = $wpdb->prepare( ' AND meta_value = %s', ' %s ' );
-        $this->assertNotContains( '%s', $part );
+        $this->assertStringNotContainsString( '%s', $part );
         // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.ReplacementsWrongNumber
         $query = $wpdb->prepare( 'SELECT * FROM {$wpdb->postmeta} WHERE meta_key = %s $part', array( 'foo', 'bar' ) );
@@ -1626 +1626 @@
 
         /* Floats can be right padded, need to assert differently */
-        $this->assertContains( ' first=1.1', $actual );
-        $this->assertContains( ' second=2.2', $actual );
+        $this->assertStringContainsString( ' first=1.1', $actual );
+        $this->assertStringContainsString( ' second=2.2', $actual );
     }
 
@@ -1640 +1640 @@
 
         /* Floats can be right padded, need to assert differently */
-        $this->assertContains( ' first=1.1', $actual );
-        $this->assertContains( ' second=2.2', $actual );
+        $this->assertStringContainsString( ' first=1.1', $actual );
+        $this->assertStringContainsString( ' second=2.2', $actual );
     }
 
@@ -1659 +1659 @@
         $wpdb->query( "DROP TABLE {$wpdb->prefix}test_placeholder" );
 
-        $this->assertNotContains( '%s', $sql );
+        $this->assertStringNotContainsString( '%s', $sql );
         $this->assertSame( $value, $actual );
     }