vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-07-04 17:20:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.

git-svn-id: https://develop.svn.wordpress.org/trunk@51462 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov
2021-07-19 14:00:11 +00:00
parent bb3bf22547
commit c70fe62ed1
97 changed files with 811 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/phpunit/tests/db.php
View File

@@ -99,11 +99,11 @@ class Tests_DB extends WP_UnitTestCase {
$wpdb->suppress_errors( false );
// 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.
foreach ( $current_locales as $locale_setting ) {
@@ -270,7 +270,7 @@ class Tests_DB extends WP_UnitTestCase {
public function test_double_escaped_placeholders() {
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 );
$this->assertSame( "UPDATE test_table SET string_column = '%f is a float, %d is an int 3, %s is a string', field = '4'", $sql );
@@ -1608,7 +1608,7 @@ class Tests_DB extends WP_UnitTestCase {
global $wpdb;
$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' ) );
$this->assertNull( $query );
@@ -1625,8 +1625,8 @@ class Tests_DB extends WP_UnitTestCase {
);
/* 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 );
}
function test_prepare_numeric_placeholders_float_array() {
@@ -1639,8 +1639,8 @@ class Tests_DB extends WP_UnitTestCase {
);
/* 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 );
}
function test_query_unescapes_placeholders() {
@@ -1658,7 +1658,7 @@ class Tests_DB extends WP_UnitTestCase {
$wpdb->query( "DROP TABLE {$wpdb->prefix}test_placeholder" );
$this->assertNotContains( '%s', $sql );
$this->assertStringNotContainsString( '%s', $sql );
$this->assertSame( $value, $actual );
}