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

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

View file

@ -1408,7 +1408,7 @@ class core_competency_event_testcase extends advanced_testcase {
\core\event\competency_evidence_created::create($eventdata)->trigger();
$this->fail('Coding exception should have been thrown: ' . $errormsg);
} catch (coding_exception $e) {
$this->assertContains($errormsg, $e->getMessage());
$this->assertStringContainsString($errormsg, $e->getMessage());
}
$eventdata['relateduserid'] = 1;
@ -1418,7 +1418,7 @@ class core_competency_event_testcase extends advanced_testcase {
\core\event\competency_evidence_created::create($eventdata)->trigger();
$this->fail('Coding exception should have been thrown: ' . $errormsg);
} catch (coding_exception $e) {
$this->assertContains($errormsg, $e->getMessage());
$this->assertStringContainsString($errormsg, $e->getMessage());
}
$eventdata['other']['usercompetencyid'] = 1;
@ -1428,7 +1428,7 @@ class core_competency_event_testcase extends advanced_testcase {
\core\event\competency_evidence_created::create($eventdata)->trigger();
$this->fail('Coding exception should have been thrown: ' . $errormsg);
} catch (coding_exception $e) {
$this->assertContains($errormsg, $e->getMessage());
$this->assertStringContainsString($errormsg, $e->getMessage());
}
$eventdata['other']['competencyid'] = 1;
@ -1438,7 +1438,7 @@ class core_competency_event_testcase extends advanced_testcase {
\core\event\competency_evidence_created::create($eventdata)->trigger();
$this->fail('Coding exception should have been thrown: ' . $errormsg);
} catch (coding_exception $e) {
$this->assertContains($errormsg, $e->getMessage());
$this->assertStringContainsString($errormsg, $e->getMessage());
}
$eventdata['other']['action'] = 1;
@ -1448,7 +1448,7 @@ class core_competency_event_testcase extends advanced_testcase {
\core\event\competency_evidence_created::create($eventdata)->trigger();
$this->fail('Coding exception should have been thrown: ' . $errormsg);
} catch (coding_exception $e) {
$this->assertContains($errormsg, $e->getMessage());
$this->assertStringContainsString($errormsg, $e->getMessage());
}
$eventdata['other']['recommend'] = 1;

View file

@ -1758,7 +1758,7 @@ class core_competency_external_testcase extends externallib_advanced_testcase {
$resultduplicated = external::list_competencies_in_template($duplicatedtemplate->id);
$this->assertEquals(count($result), count($resultduplicated));
$this->assertContains($template->shortname, $duplicatedtemplate->shortname);
$this->assertStringContainsString($template->shortname, $duplicatedtemplate->shortname);
$this->assertEquals($duplicatedtemplate->description, $template->description);
$this->assertEquals($duplicatedtemplate->descriptionformat, $template->descriptionformat);
$this->assertEquals($duplicatedtemplate->visible, $template->visible);

View file

@ -99,7 +99,7 @@ class core_competency_lib_testcase extends advanced_testcase {
// Test customdata.
$customdata = json_decode($message->customdata);
$this->assertObjectHasAttribute('notificationiconurl', $customdata);
$this->assertContains('tokenpluginfile.php', $customdata->notificationiconurl);
$this->assertStringContainsString('tokenpluginfile.php', $customdata->notificationiconurl);
$userpicture = new \user_picture($u1);
$userpicture->size = 1; // Use f1 size.
$userpicture->includetoken = $u2->id;