moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-67673 phpunit: Remove deprecated assertContains() uses on strings

Browse source 
Both assertContains() and assertNotContains() are deprecated in PHPUnit 8
for operations on strings. Also the optional case parameter is. All uses
must be changed to one of:

- assertStringContainsString()
- assertStringContainsStringIgnoringCase()
- assertStringNotContainsString()
- assertStringNotContainsStringIgnoringCase()

More info: https://github.com/sebastianbergmann/phpunit/issues/3422

Regexp to find all uses:

ag 'assert(Not)?Contains\('
This commit is contained in:
Eloy Lafuente (stronk7) 2020-09-01 00:44:13 +02:00
parent 106c64ac24
commit 35bc26b516
113 changed files with 720 additions and 720 deletions
Download patch file Download diff file Expand all files Collapse all files

8
user/tests/externallib_test.php
View file

@ -1218,9 +1218,9 @@ class core_user_externallib_testcase extends externallib_advanced_testcase {
$result = external_api::clean_returnvalue(core_user_external::update_picture_returns(), $result);
$picture = $DB->get_field('user', 'picture', array('id' => $user->id));
// The new revision is in the url for the user.
$this->assertContains($picture, $result['profileimageurl']);
$this->assertStringContainsString($picture, $result['profileimageurl']);
// Check expected URL for serving the image.
$this->assertContains("/$contextid/user/icon", $result['profileimageurl']);
$this->assertStringContainsString("/$contextid/user/icon", $result['profileimageurl']);
// Delete image.
$result = core_user_external::update_picture(0, true);
@ -1241,8 +1241,8 @@ class core_user_externallib_testcase extends externallib_advanced_testcase {
$result = external_api::clean_returnvalue(core_user_external::update_picture_returns(), $result);
// The new revision is in the url for the user.
$picture = $DB->get_field('user', 'picture', array('id' => $user->id));
$this->assertContains($picture, $result['profileimageurl']);
$this->assertContains("/$contextid/user/icon", $result['profileimageurl']);
$this->assertStringContainsString($picture, $result['profileimageurl']);
$this->assertStringContainsString("/$contextid/user/icon", $result['profileimageurl']);
}
/**

4
user/tests/userroleseditable_test.php
View file

@ -77,8 +77,8 @@ class userroleseditable_testcase extends advanced_testcase {
$this->assertTrue($result instanceof \core_user\output\user_roles_editable);
$currentroles = get_user_roles_in_course($user2->id, $course1->id);
$this->assertContains('Non-editing teacher', $currentroles);
$this->assertContains('Student', $currentroles);
$this->assertStringContainsString('Non-editing teacher', $currentroles);
$this->assertStringContainsString('Student', $currentroles);
}