vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-12 04:40:26 +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
tests/phpunit/tests/post/query.php
+29 -29
View File
@@ -319,13 +319,13 @@ class Tests_Post_Query extends WP_UnitTestCase {
$this->assertNotContains( 'auto-draft', $statuses3 );
$q1 = new WP_Query( array( 'post_status' => 'any' ) );
$this->assertContains( "post_status <> 'auto-draft'", $q1->request );
$this->assertStringContainsString( "post_status <> 'auto-draft'", $q1->request );
$q2 = new WP_Query( array( 'post_status' => 'any, auto-draft' ) );
$this->assertNotContains( "post_status <> 'auto-draft'", $q2->request );
$this->assertStringNotContainsString( "post_status <> 'auto-draft'", $q2->request );
$q3 = new WP_Query( array( 'post_status' => array( 'any', 'auto-draft' ) ) );
$this->assertNotContains( "post_status <> 'auto-draft'", $q3->request );
$this->assertStringNotContainsString( "post_status <> 'auto-draft'", $q3->request );
}
/**
@@ -342,23 +342,23 @@ class Tests_Post_Query extends WP_UnitTestCase {
),
)
);
$this->assertContains(
$this->assertStringContainsString(
"ORDER BY $wpdb->posts.post_type DESC, $wpdb->posts.post_name ASC",
$q1->request
);
$q2 = new WP_Query( array( 'orderby' => array() ) );
$this->assertNotContains( 'ORDER BY', $q2->request );
$this->assertNotContains( 'ORDER', $q2->request );
$this->assertStringNotContainsString( 'ORDER BY', $q2->request );
$this->assertStringNotContainsString( 'ORDER', $q2->request );
$q3 = new WP_Query( array( 'post_type' => 'post' ) );
$this->assertContains(
$this->assertStringContainsString(
"ORDER BY $wpdb->posts.post_date DESC",
$q3->request
);
$q4 = new WP_Query( array( 'post_type' => 'post' ) );
$this->assertContains(
$this->assertStringContainsString(
"ORDER BY $wpdb->posts.post_date DESC",
$q4->request
);
@@ -377,7 +377,7 @@ class Tests_Post_Query extends WP_UnitTestCase {
),
)
);
$this->assertContains(
$this->assertStringContainsString(
"ORDER BY $wpdb->posts.post_type DESC",
$q1->request
);
@@ -388,7 +388,7 @@ class Tests_Post_Query extends WP_UnitTestCase {
'order' => 'foo',
)
);
$this->assertContains(
$this->assertStringContainsString(
"ORDER BY $wpdb->posts.post_title DESC",
$q2->request
);
@@ -398,7 +398,7 @@ class Tests_Post_Query extends WP_UnitTestCase {
'order' => 'asc',
)
);
$this->assertContains(
$this->assertStringContainsString(
"ORDER BY $wpdb->posts.post_date ASC",
$q3->request
);
@@ -410,33 +410,33 @@ class Tests_Post_Query extends WP_UnitTestCase {
function test_orderby() {
// 'rand' is a valid value.
$q = new WP_Query( array( 'orderby' => 'rand' ) );
$this->assertContains( 'ORDER BY RAND()', $q->request );
$this->assertNotContains( 'ASC', $q->request );
$this->assertNotContains( 'DESC', $q->request );
$this->assertStringContainsString( 'ORDER BY RAND()', $q->request );
$this->assertStringNotContainsString( 'ASC', $q->request );
$this->assertStringNotContainsString( 'DESC', $q->request );
// This isn't allowed.
$q2 = new WP_Query( array( 'order' => 'rand' ) );
$this->assertContains( 'ORDER BY', $q2->request );
$this->assertNotContains( 'RAND()', $q2->request );
$this->assertContains( 'DESC', $q2->request );
$this->assertStringContainsString( 'ORDER BY', $q2->request );
$this->assertStringNotContainsString( 'RAND()', $q2->request );
$this->assertStringContainsString( 'DESC', $q2->request );
// 'none' is a valid value.
$q3 = new WP_Query( array( 'orderby' => 'none' ) );
$this->assertNotContains( 'ORDER BY', $q3->request );
$this->assertNotContains( 'DESC', $q3->request );
$this->assertNotContains( 'ASC', $q3->request );
$this->assertStringNotContainsString( 'ORDER BY', $q3->request );
$this->assertStringNotContainsString( 'DESC', $q3->request );
$this->assertStringNotContainsString( 'ASC', $q3->request );
// False is a valid value.
$q4 = new WP_Query( array( 'orderby' => false ) );
$this->assertNotContains( 'ORDER BY', $q4->request );
$this->assertNotContains( 'DESC', $q4->request );
$this->assertNotContains( 'ASC', $q4->request );
$this->assertStringNotContainsString( 'ORDER BY', $q4->request );
$this->assertStringNotContainsString( 'DESC', $q4->request );
$this->assertStringNotContainsString( 'ASC', $q4->request );
// Empty array() is a valid value.
$q5 = new WP_Query( array( 'orderby' => array() ) );
$this->assertNotContains( 'ORDER BY', $q5->request );
$this->assertNotContains( 'DESC', $q5->request );
$this->assertNotContains( 'ASC', $q5->request );
$this->assertStringNotContainsString( 'ORDER BY', $q5->request );
$this->assertStringNotContainsString( 'DESC', $q5->request );
$this->assertStringNotContainsString( 'ASC', $q5->request );
}
/**
@@ -449,7 +449,7 @@ class Tests_Post_Query extends WP_UnitTestCase {
)
);
$this->assertContains( 'ORDER BY RAND(5)', $q->request );
$this->assertStringContainsString( 'ORDER BY RAND(5)', $q->request );
}
/**
@@ -462,7 +462,7 @@ class Tests_Post_Query extends WP_UnitTestCase {
)
);
$this->assertNotContains( 'ORDER BY RAND', $q->request );
$this->assertStringNotContainsString( 'ORDER BY RAND', $q->request );
}
/**
@@ -475,7 +475,7 @@ class Tests_Post_Query extends WP_UnitTestCase {
)
);
$this->assertContains( 'ORDER BY RAND(5)', $q->request );
$this->assertStringContainsString( 'ORDER BY RAND(5)', $q->request );
}
/**