From 6108526c9c87a257fbb3f8b99883901ae5791288 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sun, 12 Apr 2020 12:34:00 +0100
Subject: [PATCH] Issue #3113077 by mondrake, Hardik_Patel_12, Neslee Canil
Pinto, swatichouhan012, prabha1997, neelam_wadhwani, Berdir, longwave:
Replace assertContains() on strings with assertStringContainsString() or
assertStringContainsStringIgnoringCase()
---
.../tests/src/Kernel/AggregatorTitleTest.php | 16 ++--
.../tests/src/Functional/CommentTitleTest.php | 2 +-
...figInstallProfileUnmetDependenciesTest.php | 4 +-
.../src/Functional/ContactSitewideTest.php | 4 +-
.../ContentTranslationContextualLinksTest.php | 2 +-
.../ContextualDynamicContextTest.php | 10 +--
.../src/Functional/DateTimeFieldTest.php | 24 +++---
.../src/Functional/DateRangeFieldTest.php | 74 +++++++++----------
.../src/Kernel/SeparatorTranslationTest.php | 4 +-
.../src/Functional/Email/EmailFieldTest.php | 2 +-
.../src/Functional/String/StringFieldTest.php | 2 +-
.../src/Kernel/String/UuidFormatterTest.php | 6 +-
.../src/Functional/ManageDisplayTest.php | 9 ++-
.../ManageDisplayTest.php | 2 +-
.../src/Functional/FileFieldWidgetTest.php | 2 +-
.../src/Functional/MultipleFileUploadTest.php | 8 +-
.../tests/src/Functional/SaveUploadTest.php | 4 +-
.../src/Kernel/FilterCaptionTwigDebugTest.php | 4 +-
.../forum/tests/src/Functional/ForumTest.php | 2 +-
.../tests/src/Functional/HelpTopicTest.php | 2 +-
.../src/Functional/HelpTopicsSyntaxTest.php | 14 ++--
.../QuickEditImageControllerTest.php | 4 +-
.../tests/src/Kernel/ImageFormatterTest.php | 2 +-
.../Migrate/d6/MigrateImageCacheTest.php | 2 +-
.../src/Functional/JsonApiFunctionalTest.php | 6 +-
.../LayoutBuilderDisableInteractionsTest.php | 2 +-
.../tests/src/Functional/LinkFieldTest.php | 68 ++++++++---------
.../LocaleTranslationDownloadTest.php | 2 +-
.../Functional/LocaleTranslationUiTest.php | 2 +-
.../FieldFormatter/OEmbedFormatterTest.php | 2 +-
.../tests/src/Functional/UrlResolverTest.php | 2 +-
.../CKEditorIntegrationTest.php | 4 +-
.../FunctionalJavascript/MediaDisplayTest.php | 2 +-
.../MediaSourceImageTest.php | 2 +-
.../MediaStandardProfileTest.php | 4 +-
.../src/Kernel/MediaEmbedFilterTestBase.php | 8 +-
.../tests/src/Kernel/MediaSourceFileTest.php | 2 +-
.../CKEditorIntegrationTest.php | 2 +-
.../src/Functional/NodeRevisionsUiTest.php | 2 +-
.../tests/src/Kernel/NodeViewBuilderTest.php | 4 +-
.../tests/src/Functional/PageCacheTest.php | 6 +-
.../tests/src/Functional/PathLanguageTest.php | 2 +-
.../QuickEditCustomPipelineTest.php | 6 +-
.../EntityResource/EntityResourceTestBase.php | 14 ++--
.../OverriddenConfigurationTest.php | 2 +-
.../SettingsTrayBlockFormTest.php | 2 +-
.../src/Functional/Batch/ProcessingTest.php | 2 +-
.../AssertPageCacheContextsAndTagsTrait.php | 2 +-
.../System/SitesDirectoryHardeningTest.php | 4 +-
.../src/Functional/Theme/ThemeUiTest.php | 8 +-
.../Functional/Theme/TwigDebugMarkupTest.php | 2 +-
.../src/Functional/Theme/TwigTransTest.php | 2 +-
.../ModalRendererTest.php | 4 +-
.../InstallerDependenciesResolutionTest.php | 10 +--
.../src/Kernel/Scripts/DbDumpCommandTest.php | 32 ++++----
.../tests/src/Functional/TextFieldTest.php | 6 +-
.../src/Functional/UpdateContribTest.php | 2 +-
.../Functional/Plugin/ArgumentDefaultTest.php | 4 +-
.../src/Functional/Plugin/DisplayFeedTest.php | 6 +-
.../BlockExposedFilterAJAXTest.php | 18 ++---
.../ClickSortingAJAXTest.php | 8 +-
.../ExposedFilterAJAXTest.php | 28 +++----
.../PaginationAJAXTest.php | 12 +--
.../src/Kernel/Handler/ComputedFieldTest.php | 2 +-
.../src/Kernel/Handler/FieldCustomTest.php | 2 +-
.../Kernel/Handler/FieldDropbuttonTest.php | 16 ++--
.../Kernel/Plugin/FieldOrLanguageJoinTest.php | 20 ++---
.../tests/src/Kernel/Plugin/RssFieldsTest.php | 2 +-
.../src/Kernel/Plugin/StyleFieldsTest.php | 6 +-
.../tests/src/Kernel/Plugin/StyleTest.php | 8 +-
.../tests/src/Kernel/QueryGroupByTest.php | 6 +-
.../src/Kernel/RenderCacheIntegrationTest.php | 4 +-
.../tests/src/Kernel/ViewsPreprocessTest.php | 6 +-
.../tests/src/Kernel/ViewsTemplateTest.php | 2 +-
.../src/Functional/CustomBooleanTest.php | 14 ++--
.../tests/src/Functional/HandlerTest.php | 2 +-
.../tests/src/Functional/PreviewTest.php | 2 +-
.../tests/src/Functional/ViewEditTest.php | 2 +-
.../UninstallDefaultContentTest.php | 4 +-
.../BuildTests/Framework/BuildTestBase.php | 4 +-
.../Ajax/AjaxTest.php | 8 +-
.../Ajax/CommandsTest.php | 2 +-
.../Ajax/DialogTest.php | 2 +-
.../Ajax/FormValuesTest.php | 2 +-
.../Bootstrap/UncaughtExceptionTest.php | 4 +-
.../FunctionalTests/BrowserTestBaseTest.php | 10 +--
.../InstallProfileDependenciesTest.php | 2 +-
.../InstallerNonDefaultDatabaseDriverTest.php | 6 +-
.../Core/Asset/AttachedAssetsTest.php | 2 +-
.../KernelTests/Core/Database/SelectTest.php | 2 +-
.../Core/Entity/EntityViewBuilderTest.php | 4 +-
.../Core/File/StreamWrapperTest.php | 6 +-
.../Plugin/Scaffold/AssertUtilsTrait.php | 4 +-
.../Scaffold/Functional/ComposerHookTest.php | 6 +-
.../Scaffold/Functional/ScaffoldTest.php | 8 +-
.../Functional/ScaffoldUpgradeTest.php | 4 +-
.../Scaffold/Integration/AppendOpTest.php | 4 +-
.../Scaffold/Integration/ReplaceOpTest.php | 2 +-
.../Scaffold/Integration/SkipOpTest.php | 2 +-
.../Entity/ConfigEntityBaseUnitTest.php | 4 +-
.../Core/Test/AssertContentTraitTest.php | 6 +-
.../Tests/Scripts/TestSiteApplicationTest.php | 28 +++----
.../Drupal/Tests/Traits/PHPUnit8Warnings.php | 2 -
core/tests/Drupal/Tests/UnitTestCase.php | 1 +
104 files changed, 363 insertions(+), 361 deletions(-)
diff --git a/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php b/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php
index 4493c5c8d736..222d7bb49e52 100644
--- a/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php
+++ b/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php
@@ -65,25 +65,25 @@ public function testStringFormatter() {
$build = $aggregator_feed->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' => TRUE]]);
$result = $this->render($build);
- $this->assertContains('testing title', $result);
- $this->assertContains('href="' . $aggregator_feed->getUrl() . '"', $result);
+ $this->assertStringContainsString('testing title', $result);
+ $this->assertStringContainsString('href="' . $aggregator_feed->getUrl() . '"', $result);
$build = $aggregator_feed->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' => FALSE]]);
$result = $this->render($build);
- $this->assertContains('testing title', $result);
- $this->assertNotContains($aggregator_feed->getUrl(), $result);
+ $this->assertStringContainsString('testing title', $result);
+ $this->assertStringNotContainsString($aggregator_feed->getUrl(), $result);
// Verify aggregator item title with and without links.
$build = $aggregator_item->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' => TRUE]]);
$result = $this->render($build);
- $this->assertContains('test title', $result);
- $this->assertContains('href="' . $aggregator_item->getLink() . '"', $result);
+ $this->assertStringContainsString('test title', $result);
+ $this->assertStringContainsString('href="' . $aggregator_item->getLink() . '"', $result);
$build = $aggregator_item->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' => FALSE]]);
$result = $this->render($build);
- $this->assertContains('test title', $result);
- $this->assertNotContains($aggregator_item->getLink(), $result);
+ $this->assertStringContainsString('test title', $result);
+ $this->assertStringNotContainsString($aggregator_item->getLink(), $result);
}
}
diff --git a/core/modules/comment/tests/src/Functional/CommentTitleTest.php b/core/modules/comment/tests/src/Functional/CommentTitleTest.php
index a6af71fd0abc..0565d88a275c 100644
--- a/core/modules/comment/tests/src/Functional/CommentTitleTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentTitleTest.php
@@ -81,7 +81,7 @@ public function testCommentPopulatedTitles() {
$comment_permalink = $this->cssSelect('.permalink');
$comment_permalink = $comment_permalink[0]->getAttribute('href');
// Tests that the comment's title link contains the url fragment.
- $this->assertContains('#comment-' . $comment1->id(), $comment_permalink, "The comment's title link contains the url fragment.");
+ $this->assertStringContainsString('#comment-' . $comment1->id(), $comment_permalink, "The comment's title link contains the url fragment.");
$this->assertEqual($comment1->permalink()->toString(), $comment_permalink, "The comment's title has the correct link.");
}
diff --git a/core/modules/config/tests/src/Functional/ConfigInstallProfileUnmetDependenciesTest.php b/core/modules/config/tests/src/Functional/ConfigInstallProfileUnmetDependenciesTest.php
index b9ae7bc5c94e..7ea66a167faf 100644
--- a/core/modules/config/tests/src/Functional/ConfigInstallProfileUnmetDependenciesTest.php
+++ b/core/modules/config/tests/src/Functional/ConfigInstallProfileUnmetDependenciesTest.php
@@ -86,8 +86,8 @@ protected function copyTestingOverrides() {
*/
public function testInstalled() {
if ($this->expectedException) {
- $this->assertContains('Configuration objects provided by <em class="placeholder">testing_config_overrides</em> have unmet dependencies: <em class="placeholder">system.action.user_block_user_action (does_not_exist)</em>', $this->expectedException->getMessage());
- $this->assertContains('Drupal\Core\Config\UnmetDependenciesException', $this->expectedException->getMessage());
+ $this->assertStringContainsString('Configuration objects provided by <em class="placeholder">testing_config_overrides</em> have unmet dependencies: <em class="placeholder">system.action.user_block_user_action (does_not_exist)</em>', $this->expectedException->getMessage());
+ $this->assertStringContainsString('Drupal\Core\Config\UnmetDependenciesException', $this->expectedException->getMessage());
}
else {
$this->fail('Expected Drupal\Core\Config\UnmetDependenciesException exception not thrown');
diff --git a/core/modules/contact/tests/src/Functional/ContactSitewideTest.php b/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
index 7960c2dcb5f7..46e594343471 100644
--- a/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
+++ b/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
@@ -329,8 +329,8 @@ public function testSiteWideContact() {
$mails = $this->getMails();
$mail = array_pop($mails);
$this->assertEqual($mail['subject'], t('[@label] @subject', ['@label' => $label, '@subject' => $edit['subject[0][value]']]));
- $this->assertContains($field_label, $mail['body']);
- $this->assertContains($edit[$field_name . '[0][value]'], $mail['body']);
+ $this->assertStringContainsString($field_label, $mail['body']);
+ $this->assertStringContainsString($edit[$field_name . '[0][value]'], $mail['body']);
// Test messages and redirect.
/** @var \Drupal\contact\ContactFormInterface $form */
diff --git a/core/modules/content_translation/tests/src/FunctionalJavascript/ContentTranslationContextualLinksTest.php b/core/modules/content_translation/tests/src/FunctionalJavascript/ContentTranslationContextualLinksTest.php
index 4f8a1b557752..f9b3d999c546 100644
--- a/core/modules/content_translation/tests/src/FunctionalJavascript/ContentTranslationContextualLinksTest.php
+++ b/core/modules/content_translation/tests/src/FunctionalJavascript/ContentTranslationContextualLinksTest.php
@@ -71,7 +71,7 @@ public function testContentTranslationContextualLinks() {
$this->drupalLogin($this->translator);
$this->drupalGet('node/' . $node->id());
$link = $this->assertSession()->waitForElement('css', '[data-contextual-id^="node:node=1"] .contextual-links a:contains("Translate")');
- $this->assertContains('node/1/translations', $link->getAttribute('href'));
+ $this->assertStringContainsString('node/1/translations', $link->getAttribute('href'));
}
}
diff --git a/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php b/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php
index 4f0ab275ff52..63edf94022b0 100644
--- a/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php
+++ b/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php
@@ -97,7 +97,7 @@ public function testDifferentPermissions() {
}
$response = $this->renderContextualLinks([], 'node');
$this->assertSame(400, $response->getStatusCode());
- $this->assertContains('No contextual ids specified.', (string) $response->getBody());
+ $this->assertStringContainsString('No contextual ids specified.', (string) $response->getBody());
$response = $this->renderContextualLinks($ids, 'node');
$this->assertSame(200, $response->getStatusCode());
$json = Json::decode((string) $response->getBody());
@@ -120,7 +120,7 @@ public function testDifferentPermissions() {
}
$response = $this->renderContextualLinks([], 'node');
$this->assertSame(400, $response->getStatusCode());
- $this->assertContains('No contextual ids specified.', (string) $response->getBody());
+ $this->assertStringContainsString('No contextual ids specified.', (string) $response->getBody());
$response = $this->renderContextualLinks($ids, 'node');
$this->assertSame(200, $response->getStatusCode());
$json = Json::decode((string) $response->getBody());
@@ -177,7 +177,7 @@ public function testTokenProtection() {
'http_errors' => FALSE,
]);
$this->assertEquals('400', $response->getStatusCode());
- $this->assertContains('No contextual ID tokens specified.', (string) $response->getBody());
+ $this->assertStringContainsString('No contextual ID tokens specified.', (string) $response->getBody());
$response = $http_client->request('POST', $url, [
'cookies' => $this->getSessionCookies(),
@@ -185,7 +185,7 @@ public function testTokenProtection() {
'http_errors' => FALSE,
]);
$this->assertEquals('400', $response->getStatusCode());
- $this->assertContains('Invalid contextual ID specified.', (string) $response->getBody());
+ $this->assertStringContainsString('Invalid contextual ID specified.', (string) $response->getBody());
$response = $http_client->request('POST', $url, [
'cookies' => $this->getSessionCookies(),
@@ -193,7 +193,7 @@ public function testTokenProtection() {
'http_errors' => FALSE,
]);
$this->assertEquals('400', $response->getStatusCode());
- $this->assertContains('Invalid contextual ID specified.', (string) $response->getBody());
+ $this->assertStringContainsString('Invalid contextual ID specified.', (string) $response->getBody());
$response = $http_client->request('POST', $url, [
'cookies' => $this->getSessionCookies(),
diff --git a/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php b/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
index fd55a918f318..611472bb5b16 100644
--- a/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
+++ b/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
@@ -127,7 +127,7 @@ public function testDateField() {
$expected_iso = $date_formatter->format($date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', DateTimeItemInterface::STORAGE_TIMEZONE);
$output = $this->renderTestEntity($id);
$expected_markup = '<time datetime="' . $expected_iso . '" class="datetime">' . $expected . '</time>';
- $this->assertContains($expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute in %timezone.', [
+ $this->assertStringContainsString($expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute in %timezone.', [
'%value' => $new_value,
'%expected' => $expected,
'%expected_iso' => $expected_iso,
@@ -147,7 +147,7 @@ public function testDateField() {
->save();
$expected = $date->format(DateTimeItemInterface::DATE_STORAGE_FORMAT);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected in %timezone.', [
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected in %timezone.', [
'%expected' => $expected,
'%timezone' => $timezone,
]));
@@ -161,7 +161,7 @@ public function testDateField() {
->save();
$expected = $date->format($this->displayOptions['settings']['date_format']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using datetime_custom format displayed as %expected in %timezone.', [
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using datetime_custom format displayed as %expected in %timezone.', [
'%expected' => $expected,
'%timezone' => $timezone,
]));
@@ -174,7 +174,7 @@ public function testDateField() {
->save();
$expected = '<strong>' . $date->format('m/d/Y') . '</strong>alert(String.fromCharCode(88,83,83))';
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected in %timezone.', [
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected in %timezone.', [
'%expected' => $expected,
'%timezone' => $timezone,
]));
@@ -204,7 +204,7 @@ public function testDateField() {
'@interval' => $this->dateFormatter->formatTimeDiffSince($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']]),
]);
$output = $this->renderTestEntity($id);
- $this->assertContains((string) $expected, $output, new FormattableMarkup('Formatted date field using datetime_time_ago format displayed as %expected in %timezone.', [
+ $this->assertStringContainsString((string) $expected, $output, new FormattableMarkup('Formatted date field using datetime_time_ago format displayed as %expected in %timezone.', [
'%expected' => $expected,
'%timezone' => $timezone,
]));
@@ -228,7 +228,7 @@ public function testDateField() {
'@interval' => $this->dateFormatter->formatTimeDiffUntil($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']]),
]);
$output = $this->renderTestEntity($id);
- $this->assertContains((string) $expected, $output, new FormattableMarkup('Formatted date field using datetime_time_ago format displayed as %expected in %timezone.', [
+ $this->assertStringContainsString((string) $expected, $output, new FormattableMarkup('Formatted date field using datetime_time_ago format displayed as %expected in %timezone.', [
'%expected' => $expected,
'%timezone' => $timezone,
]));
@@ -299,7 +299,7 @@ public function testDatetimeField() {
$expected_iso = $date_formatter->format($date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', 'UTC');
$output = $this->renderTestEntity($id);
$expected_markup = '<time datetime="' . $expected_iso . '" class="datetime">' . $expected . '</time>';
- $this->assertContains($expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => $new_value, '%expected' => $expected, '%expected_iso' => $expected_iso]));
+ $this->assertStringContainsString($expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => $new_value, '%expected' => $expected, '%expected_iso' => $expected_iso]));
break;
}
}
@@ -314,7 +314,7 @@ public function testDatetimeField() {
->save();
$expected = $date->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
// Verify that the 'datetime_custom' formatter works.
$this->displayOptions['type'] = 'datetime_custom';
@@ -324,7 +324,7 @@ public function testDatetimeField() {
->save();
$expected = $date->format($this->displayOptions['settings']['date_format']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using datetime_custom format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using datetime_custom format displayed as %expected.', ['%expected' => $expected]));
// Verify that the 'timezone_override' setting works.
$this->displayOptions['type'] = 'datetime_custom';
@@ -334,7 +334,7 @@ public function testDatetimeField() {
->save();
$expected = $date->format($this->displayOptions['settings']['date_format'], ['timezone' => 'America/New_York']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using datetime_custom format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using datetime_custom format displayed as %expected.', ['%expected' => $expected]));
// Verify that the 'datetime_time_ago' formatter works for intervals in the
// past. First update the test entity so that the date difference always
@@ -361,7 +361,7 @@ public function testDatetimeField() {
'@interval' => $this->dateFormatter->formatTimeDiffSince($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']]),
]);
$output = $this->renderTestEntity($id);
- $this->assertContains((string) $expected, $output, new FormattableMarkup('Formatted date field using datetime_time_ago format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString((string) $expected, $output, new FormattableMarkup('Formatted date field using datetime_time_ago format displayed as %expected.', ['%expected' => $expected]));
// Verify that the 'datetime_time_ago' formatter works for intervals in the
// future. First update the test entity so that the date difference always
@@ -383,7 +383,7 @@ public function testDatetimeField() {
'@interval' => $this->dateFormatter->formatTimeDiffUntil($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']]),
]);
$output = $this->renderTestEntity($id);
- $this->assertContains((string) $expected, $output, new FormattableMarkup('Formatted date field using datetime_time_ago format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString((string) $expected, $output, new FormattableMarkup('Formatted date field using datetime_time_ago format displayed as %expected.', ['%expected' => $expected]));
}
/**
diff --git a/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php b/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php
index cdf95cce14b8..58d92c0e0a4c 100644
--- a/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php
+++ b/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php
@@ -143,19 +143,19 @@ public function testDateRangeField() {
$end_expected_iso = $this->dateFormatter->format($end_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', DateTimeItemInterface::STORAGE_TIMEZONE);
$end_expected_markup = '<time datetime="' . $end_expected_iso . '" class="datetime">' . $end_expected . '</time>';
$output = $this->renderTestEntity($id);
- $this->assertContains($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute in %timezone.', [
+ $this->assertStringContainsString($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute in %timezone.', [
'%value' => 'long',
'%expected' => $start_expected,
'%expected_iso' => $start_expected_iso,
'%timezone' => $timezone,
]));
- $this->assertContains($end_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute in %timezone.', [
+ $this->assertStringContainsString($end_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute in %timezone.', [
'%value' => 'long',
'%expected' => $end_expected,
'%expected_iso' => $end_expected_iso,
'%timezone' => $timezone,
]));
- $this->assertContains(' THESEPARATOR ', $output, 'Found proper separator');
+ $this->assertStringContainsString(' THESEPARATOR ', $output, 'Found proper separator');
// Verify that hook_entity_prepare_view can add attributes.
// @see entity_test_entity_prepare_view()
@@ -171,7 +171,7 @@ public function testDateRangeField() {
->save();
$expected = $start_date->format(DateTimeItemInterface::DATE_STORAGE_FORMAT) . ' - ' . $end_date->format(DateTimeItemInterface::DATE_STORAGE_FORMAT);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected in %timezone.', [
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected in %timezone.', [
'%expected' => $expected,
'%timezone' => $timezone,
]));
@@ -184,7 +184,7 @@ public function testDateRangeField() {
->save();
$expected = $start_date->format($this->displayOptions['settings']['date_format']) . ' - ' . $end_date->format($this->displayOptions['settings']['date_format']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected in %timezone.', [
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected in %timezone.', [
'%expected' => $expected,
'%timezone' => $timezone,
]));
@@ -197,7 +197,7 @@ public function testDateRangeField() {
->save();
$expected = '<strong>' . $start_date->format('m/d/Y') . '</strong>alert(String.fromCharCode(88,83,83)) - <strong>' . $end_date->format('m/d/Y') . '</strong>alert(String.fromCharCode(88,83,83))';
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected in %timezone.', [
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected in %timezone.', [
'%expected' => $expected,
'%timezone' => $timezone,
]));
@@ -239,13 +239,13 @@ public function testDateRangeField() {
$start_expected_iso = $this->dateFormatter->format($start_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', DateTimeItemInterface::STORAGE_TIMEZONE);
$start_expected_markup = '<time datetime="' . $start_expected_iso . '" class="datetime">' . $start_expected . '</time>';
$output = $this->renderTestEntity($id);
- $this->assertContains($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute in %timezone.', [
+ $this->assertStringContainsString($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute in %timezone.', [
'%value' => 'long',
'%expected' => $start_expected,
'%expected_iso' => $start_expected_iso,
'%timezone' => $timezone,
]));
- $this->assertNotContains(' THESEPARATOR ', $output, 'Separator not found on page in ' . $timezone);
+ $this->assertStringNotContainsString(' THESEPARATOR ', $output, 'Separator not found on page in ' . $timezone);
// Verify that hook_entity_prepare_view can add attributes.
// @see entity_test_entity_prepare_view()
@@ -260,11 +260,11 @@ public function testDateRangeField() {
->save();
$expected = $start_date->format(DateTimeItemInterface::DATE_STORAGE_FORMAT);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected in %timezone.', [
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected in %timezone.', [
'%expected' => $expected,
'%timezone' => $timezone,
]));
- $this->assertNotContains(' THESEPARATOR ', $output, 'Separator not found on page');
+ $this->assertStringNotContainsString(' THESEPARATOR ', $output, 'Separator not found on page');
$this->displayOptions['type'] = 'daterange_custom';
$this->displayOptions['settings'] = ['date_format' => 'm/d/Y'] + $this->defaultSettings;
@@ -273,11 +273,11 @@ public function testDateRangeField() {
->save();
$expected = $start_date->format($this->displayOptions['settings']['date_format']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected in %timezone.', [
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected in %timezone.', [
'%expected' => $expected,
'%timezone' => $timezone,
]));
- $this->assertNotContains(' THESEPARATOR ', $output, 'Separator not found on page');
+ $this->assertStringNotContainsString(' THESEPARATOR ', $output, 'Separator not found on page');
}
}
@@ -350,9 +350,9 @@ public function testDatetimeRangeField() {
$end_expected_iso = $this->dateFormatter->format($end_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', 'UTC');
$end_expected_markup = '<time datetime="' . $end_expected_iso . '" class="datetime">' . $end_expected . '</time>';
$output = $this->renderTestEntity($id);
- $this->assertContains($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $start_expected, '%expected_iso' => $start_expected_iso]));
- $this->assertContains($end_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $end_expected, '%expected_iso' => $end_expected_iso]));
- $this->assertContains(' THESEPARATOR ', $output, 'Found proper separator');
+ $this->assertStringContainsString($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $start_expected, '%expected_iso' => $start_expected_iso]));
+ $this->assertStringContainsString($end_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $end_expected, '%expected_iso' => $end_expected_iso]));
+ $this->assertStringContainsString(' THESEPARATOR ', $output, 'Found proper separator');
// Verify that hook_entity_prepare_view can add attributes.
// @see entity_test_entity_prepare_view()
@@ -368,7 +368,7 @@ public function testDatetimeRangeField() {
->save();
$expected = $start_date->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT) . ' - ' . $end_date->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
// Verify that the 'datetime_custom' formatter works.
$this->displayOptions['type'] = 'daterange_custom';
@@ -378,7 +378,7 @@ public function testDatetimeRangeField() {
->save();
$expected = $start_date->format($this->displayOptions['settings']['date_format']) . ' - ' . $end_date->format($this->displayOptions['settings']['date_format']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
// Verify that the 'timezone_override' setting works.
$this->displayOptions['type'] = 'daterange_custom';
@@ -389,7 +389,7 @@ public function testDatetimeRangeField() {
$expected = $start_date->format($this->displayOptions['settings']['date_format'], ['timezone' => 'America/New_York']);
$expected .= ' - ' . $end_date->format($this->displayOptions['settings']['date_format'], ['timezone' => 'America/New_York']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
// Test formatters when start date and end date are the same
$this->drupalGet('entity_test/add');
@@ -429,8 +429,8 @@ public function testDatetimeRangeField() {
$start_expected_iso = $this->dateFormatter->format($start_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', 'UTC');
$start_expected_markup = '<time datetime="' . $start_expected_iso . '" class="datetime">' . $start_expected . '</time>';
$output = $this->renderTestEntity($id);
- $this->assertContains($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $start_expected, '%expected_iso' => $start_expected_iso]));
- $this->assertNotContains(' THESEPARATOR ', $output, 'Separator not found on page');
+ $this->assertStringContainsString($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $start_expected, '%expected_iso' => $start_expected_iso]));
+ $this->assertStringNotContainsString(' THESEPARATOR ', $output, 'Separator not found on page');
// Verify that hook_entity_prepare_view can add attributes.
// @see entity_test_entity_prepare_view()
@@ -445,8 +445,8 @@ public function testDatetimeRangeField() {
->save();
$expected = $start_date->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
- $this->assertNotContains(' THESEPARATOR ', $output, 'Separator not found on page');
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringNotContainsString(' THESEPARATOR ', $output, 'Separator not found on page');
$this->displayOptions['type'] = 'daterange_custom';
$this->displayOptions['settings'] = ['date_format' => 'm/d/Y g:i:s A'] + $this->defaultSettings;
@@ -455,8 +455,8 @@ public function testDatetimeRangeField() {
->save();
$expected = $start_date->format($this->displayOptions['settings']['date_format']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
- $this->assertNotContains(' THESEPARATOR ', $output, 'Separator not found on page');
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringNotContainsString(' THESEPARATOR ', $output, 'Separator not found on page');
}
/**
@@ -523,9 +523,9 @@ public function testAlldayRangeField() {
$end_expected_iso = $this->dateFormatter->format($end_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', 'UTC');
$end_expected_markup = '<time datetime="' . $end_expected_iso . '" class="datetime">' . $end_expected . '</time>';
$output = $this->renderTestEntity($id);
- $this->assertContains($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $start_expected, '%expected_iso' => $start_expected_iso]));
- $this->assertContains($end_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $end_expected, '%expected_iso' => $end_expected_iso]));
- $this->assertContains(' THESEPARATOR ', $output, 'Found proper separator');
+ $this->assertStringContainsString($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $start_expected, '%expected_iso' => $start_expected_iso]));
+ $this->assertStringContainsString($end_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $end_expected, '%expected_iso' => $end_expected_iso]));
+ $this->assertStringContainsString(' THESEPARATOR ', $output, 'Found proper separator');
// Verify that hook_entity_prepare_view can add attributes.
// @see entity_test_entity_prepare_view()
@@ -541,7 +541,7 @@ public function testAlldayRangeField() {
->save();
$expected = $start_date->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT) . ' - ' . $end_date->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
// Verify that the custom formatter works.
$this->displayOptions['type'] = 'daterange_custom';
@@ -551,7 +551,7 @@ public function testAlldayRangeField() {
->save();
$expected = $start_date->format($this->displayOptions['settings']['date_format']) . ' - ' . $end_date->format($this->displayOptions['settings']['date_format']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
// Verify that the 'timezone_override' setting works.
$this->displayOptions['type'] = 'daterange_custom';
@@ -562,7 +562,7 @@ public function testAlldayRangeField() {
$expected = $start_date->format($this->displayOptions['settings']['date_format'], ['timezone' => 'America/New_York']);
$expected .= ' - ' . $end_date->format($this->displayOptions['settings']['date_format'], ['timezone' => 'America/New_York']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
// Test formatters when start date and end date are the same
$this->drupalGet('entity_test/add');
@@ -604,9 +604,9 @@ public function testAlldayRangeField() {
$end_expected_iso = $this->dateFormatter->format($end_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', 'UTC');
$end_expected_markup = '<time datetime="' . $end_expected_iso . '" class="datetime">' . $end_expected . '</time>';
$output = $this->renderTestEntity($id);
- $this->assertContains($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $start_expected, '%expected_iso' => $start_expected_iso]));
- $this->assertContains($end_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $end_expected, '%expected_iso' => $end_expected_iso]));
- $this->assertContains(' THESEPARATOR ', $output, 'Found proper separator');
+ $this->assertStringContainsString($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $start_expected, '%expected_iso' => $start_expected_iso]));
+ $this->assertStringContainsString($end_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $end_expected, '%expected_iso' => $end_expected_iso]));
+ $this->assertStringContainsString(' THESEPARATOR ', $output, 'Found proper separator');
// Verify that hook_entity_prepare_view can add attributes.
// @see entity_test_entity_prepare_view()
@@ -620,8 +620,8 @@ public function testAlldayRangeField() {
->save();
$expected = $start_date->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT) . ' THESEPARATOR ' . $end_date->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
- $this->assertContains(' THESEPARATOR ', $output, 'Found proper separator');
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString(' THESEPARATOR ', $output, 'Found proper separator');
$this->displayOptions['type'] = 'daterange_custom';
$this->displayOptions['settings']['date_format'] = 'm/d/Y';
@@ -630,8 +630,8 @@ public function testAlldayRangeField() {
->save();
$expected = $start_date->format($this->displayOptions['settings']['date_format']) . ' THESEPARATOR ' . $end_date->format($this->displayOptions['settings']['date_format']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
- $this->assertContains(' THESEPARATOR ', $output, 'Found proper separator');
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString(' THESEPARATOR ', $output, 'Found proper separator');
}
diff --git a/core/modules/datetime_range/tests/src/Kernel/SeparatorTranslationTest.php b/core/modules/datetime_range/tests/src/Kernel/SeparatorTranslationTest.php
index d92a313f39ba..68527bcba6af 100644
--- a/core/modules/datetime_range/tests/src/Kernel/SeparatorTranslationTest.php
+++ b/core/modules/datetime_range/tests/src/Kernel/SeparatorTranslationTest.php
@@ -107,7 +107,7 @@ public function testSeparatorTranslation() {
$build = $display->build($entity);
$output = $this->container->get('renderer')->renderRoot($build);
$this->verbose($output);
- $this->assertContains('UNTRANSLATED', (string) $output);
+ $this->assertStringContainsString('UNTRANSLATED', (string) $output);
// Translate the separator.
ConfigurableLanguage::createFromLangcode('nl')->save();
@@ -124,7 +124,7 @@ public function testSeparatorTranslation() {
$build = $display->build($entity);
$output = $this->container->get('renderer')->renderRoot($build);
$this->verbose($output);
- $this->assertContains('NL_TRANSLATED!', (string) $output);
+ $this->assertStringContainsString('NL_TRANSLATED!', (string) $output);
}
}
diff --git a/core/modules/field/tests/src/Functional/Email/EmailFieldTest.php b/core/modules/field/tests/src/Functional/Email/EmailFieldTest.php
index c044ba3c1c5a..5d87d24c783f 100644
--- a/core/modules/field/tests/src/Functional/Email/EmailFieldTest.php
+++ b/core/modules/field/tests/src/Functional/Email/EmailFieldTest.php
@@ -108,7 +108,7 @@ public function testEmailField() {
$display = $display_repository->getViewDisplay($entity->getEntityTypeId(), $entity->bundle(), 'full');
$content = $display->build($entity);
$rendered_content = (string) \Drupal::service('renderer')->renderRoot($content);
- $this->assertContains('href="mailto:test@example.com"', $rendered_content);
+ $this->assertStringContainsString('href="mailto:test@example.com"', $rendered_content);
}
}
diff --git a/core/modules/field/tests/src/Functional/String/StringFieldTest.php b/core/modules/field/tests/src/Functional/String/StringFieldTest.php
index d12fd33819d2..9be6e01b7b5b 100644
--- a/core/modules/field/tests/src/Functional/String/StringFieldTest.php
+++ b/core/modules/field/tests/src/Functional/String/StringFieldTest.php
@@ -105,7 +105,7 @@ public function _testTextfieldWidgets($field_type, $widget_type) {
$display = $display_repository->getViewDisplay($entity->getEntityTypeId(), $entity->bundle(), 'full');
$content = $display->build($entity);
$rendered_entity = \Drupal::service('renderer')->renderRoot($content);
- $this->assertContains($value, (string) $rendered_entity);
+ $this->assertStringContainsString($value, (string) $rendered_entity);
}
}
diff --git a/core/modules/field/tests/src/Kernel/String/UuidFormatterTest.php b/core/modules/field/tests/src/Kernel/String/UuidFormatterTest.php
index 0bcf2469fe74..91f43c6928c6 100644
--- a/core/modules/field/tests/src/Kernel/String/UuidFormatterTest.php
+++ b/core/modules/field/tests/src/Kernel/String/UuidFormatterTest.php
@@ -43,7 +43,7 @@ public function testUuidStringFormatter() {
// Verify default render.
$render_array = $uuid_field->view([]);
$this->assertIdentical($render_array[0]['#context']['value'], $entity->uuid(), 'The rendered UUID matches the entity UUID.');
- $this->assertContains($entity->uuid(), $this->render($render_array), 'The rendered UUID found.');
+ $this->assertStringContainsString($entity->uuid(), $this->render($render_array), 'The rendered UUID found.');
// Verify customized render.
$render_array = $uuid_field->view(['settings' => ['link_to_entity' => TRUE]]);
@@ -51,8 +51,8 @@ public function testUuidStringFormatter() {
$this->assertIdentical($render_array[0]['#title']['#context']['value'], $entity->uuid());
$this->assertIdentical($render_array[0]['#url']->toString(), $entity->toUrl()->toString());
$rendered = $this->render($render_array);
- $this->assertContains($entity->uuid(), $rendered, 'The rendered UUID found.');
- $this->assertContains($entity->toUrl()->toString(), $rendered, 'The rendered entity URL found.');
+ $this->assertStringContainsString($entity->uuid(), $rendered, 'The rendered UUID found.');
+ $this->assertStringContainsString($entity->toUrl()->toString(), $rendered, 'The rendered entity URL found.');
}
}
diff --git a/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php b/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
index 60ab7c03fdbc..7c3e718d9bff 100644
--- a/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
+++ b/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
@@ -254,9 +254,12 @@ public function assertNodeViewTextHelper(EntityInterface $node, $view_mode, $tex
$output = (string) \Drupal::service('renderer')->renderRoot($element);
$this->verbose(t('Rendered node - view mode: @view_mode', ['@view_mode' => $view_mode]) . '<hr />' . $output);
- $method = $not_exists ? 'assertNotContains' : 'assertContains';
-
- $this->{$method}((string) $text, $output, $message);
+ if ($not_exists) {
+ $this->assertStringNotContainsString((string) $text, $output, $message);
+ }
+ else {
+ $this->assertStringContainsString((string) $text, $output, $message);
+ }
}
/**
diff --git a/core/modules/field_ui/tests/src/FunctionalJavascript/ManageDisplayTest.php b/core/modules/field_ui/tests/src/FunctionalJavascript/ManageDisplayTest.php
index 45fa8e818e9f..0e1e6ab12f9b 100644
--- a/core/modules/field_ui/tests/src/FunctionalJavascript/ManageDisplayTest.php
+++ b/core/modules/field_ui/tests/src/FunctionalJavascript/ManageDisplayTest.php
@@ -143,7 +143,7 @@ public function testFormatterUI() {
$field_test_format_type->setValue('field_test_multiple');
$assert_session->assertWaitOnAjaxRequest();
$plugin_summary = $page->find('css', '#field-test .field-plugin-summary');
- $this->assertContains("test_formatter_setting_multiple: dummy test string", $plugin_summary->getText(), 'The expected summary is displayed.');
+ $this->assertStringContainsString("test_formatter_setting_multiple: dummy test string", $plugin_summary->getText(), 'The expected summary is displayed.');
// Submit the form and assert that
// hook_field_formatter_settings_summary_alter() is called.
diff --git a/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php b/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
index ff14143a650b..f9df46465330 100644
--- a/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
+++ b/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
@@ -422,7 +422,7 @@ public function testWidgetElement() {
]);
$this->assertNotEquals(500, $post_request->getStatusCode());
$body = Json::decode($post_request->getBody());
- $this->assertContains('Starting upload...', $body['message']);
+ $this->assertStringContainsString('Starting upload...', $body['message']);
}
/**
diff --git a/core/modules/file/tests/src/Functional/MultipleFileUploadTest.php b/core/modules/file/tests/src/Functional/MultipleFileUploadTest.php
index 8817a66d9c4c..3b0bb16b982e 100644
--- a/core/modules/file/tests/src/Functional/MultipleFileUploadTest.php
+++ b/core/modules/file/tests/src/Functional/MultipleFileUploadTest.php
@@ -55,10 +55,10 @@ public function testMultipleFileFieldWithAllFileExtensions() {
$client->request($form->getMethod(), $form->getUri(), $form->getPhpValues(), $edit);
$page = $this->getSession()->getPage();
- $this->assertNotContains('Only files with the following extensions are allowed', $page->getContent());
- $this->assertContains('The configuration options have been saved.', $page->getContent());
- $this->assertContains('file1.wtf', $page->getContent());
- $this->assertContains('file2.wtf', $page->getContent());
+ $this->assertStringNotContainsString('Only files with the following extensions are allowed', $page->getContent());
+ $this->assertStringContainsString('The configuration options have been saved.', $page->getContent());
+ $this->assertStringContainsString('file1.wtf', $page->getContent());
+ $this->assertStringContainsString('file2.wtf', $page->getContent());
}
}
diff --git a/core/modules/file/tests/src/Functional/SaveUploadTest.php b/core/modules/file/tests/src/Functional/SaveUploadTest.php
index 446b565dc13c..785ceb993da1 100644
--- a/core/modules/file/tests/src/Functional/SaveUploadTest.php
+++ b/core/modules/file/tests/src/Functional/SaveUploadTest.php
@@ -462,8 +462,8 @@ public function testInvalidUtf8FilenameUpload() {
$content = (string) $response->getBody();
$this->htmlOutput($content);
$error_text = new FormattableMarkup('The file %filename could not be uploaded because the name is invalid.', ['%filename' => $filename]);
- $this->assertContains((string) $error_text, $content);
- $this->assertContains('Epic upload FAIL!', $content);
+ $this->assertStringContainsString((string) $error_text, $content);
+ $this->assertStringContainsString('Epic upload FAIL!', $content);
$this->assertFileNotExists('temporary://' . $filename);
}
diff --git a/core/modules/filter/tests/src/Kernel/FilterCaptionTwigDebugTest.php b/core/modules/filter/tests/src/Kernel/FilterCaptionTwigDebugTest.php
index 495ba4d0ecae..26200118c716 100644
--- a/core/modules/filter/tests/src/Kernel/FilterCaptionTwigDebugTest.php
+++ b/core/modules/filter/tests/src/Kernel/FilterCaptionTwigDebugTest.php
@@ -55,8 +55,8 @@ public function testCaptionFilter() {
$input = '<img src="llama.jpg" data-caption="Loquacious llama!" />';
$expected = '<img src="llama.jpg" /><figcaption>Loquacious llama!</figcaption>';
$output = $test($input)->getProcessedText();
- $this->assertContains($expected, $output);
- $this->assertContains("<!-- THEME HOOK: 'filter_caption' -->", $output);
+ $this->assertStringContainsString($expected, $output);
+ $this->assertStringContainsString("<!-- THEME HOOK: 'filter_caption' -->", $output);
}
}
diff --git a/core/modules/forum/tests/src/Functional/ForumTest.php b/core/modules/forum/tests/src/Functional/ForumTest.php
index d906baf27890..0f69d8691d9f 100644
--- a/core/modules/forum/tests/src/Functional/ForumTest.php
+++ b/core/modules/forum/tests/src/Functional/ForumTest.php
@@ -209,7 +209,7 @@ public function testForum() {
$this->assertStringStartsWith('6 new posts', $elements[0]->getText(), 'Number of unread topics found.');
// Verify that the forum name is in the unread topics text.
$elements = $this->xpath('//tr[@id=:forum]//em[@class="placeholder"]', $forum_arg);
- $this->assertContains($this->forum['name'], $elements[0]->getText(), 'Forum name found in unread topics text.');
+ $this->assertStringContainsString($this->forum['name'], $elements[0]->getText(), 'Forum name found in unread topics text.');
// Verify total number of posts in forum.
$elements = $this->xpath('//tr[@id=:forum]//td[@class="forum__posts"]', $forum_arg);
diff --git a/core/modules/help_topics/tests/src/Functional/HelpTopicTest.php b/core/modules/help_topics/tests/src/Functional/HelpTopicTest.php
index 3dcbbd21c312..0bea9175f335 100644
--- a/core/modules/help_topics/tests/src/Functional/HelpTopicTest.php
+++ b/core/modules/help_topics/tests/src/Functional/HelpTopicTest.php
@@ -189,7 +189,7 @@ protected function verifyHelpLinks() {
// Verify theme provided help topics work and can be related.
$this->drupalGet('admin/help/topic/help_topics_test_theme.test');
$session->pageTextContains('This is a theme provided topic.');
- $this->assertContains('This is a theme provided topic.', $session->elementExists('css', 'article')->getText());
+ $this->assertStringContainsString('This is a theme provided topic.', $session->elementExists('css', 'article')->getText());
$this->clickLink('Additional topic');
$session->linkExists('XYZ Help Test theme');
diff --git a/core/modules/help_topics/tests/src/Functional/HelpTopicsSyntaxTest.php b/core/modules/help_topics/tests/src/Functional/HelpTopicsSyntaxTest.php
index f9b7a6794290..d8f048c7d845 100644
--- a/core/modules/help_topics/tests/src/Functional/HelpTopicsSyntaxTest.php
+++ b/core/modules/help_topics/tests/src/Functional/HelpTopicsSyntaxTest.php
@@ -192,31 +192,31 @@ protected function verifyBadTopic($id, $definitions) {
$message = $e->getMessage();
switch ($bad_topic_type) {
case 'related':
- $this->assertContains('only related to topics that exist', $message);
+ $this->assertStringContainsString('only related to topics that exist', $message);
break;
case 'bad_html':
- $this->assertContains('Unexpected end tag', $message);
+ $this->assertStringContainsString('Unexpected end tag', $message);
break;
case 'top_level':
- $this->assertContains('is either top-level or related to at least one other top-level topic', $message);
+ $this->assertStringContainsString('is either top-level or related to at least one other top-level topic', $message);
break;
case 'empty':
- $this->assertContains('contains some text outside of front matter', $message);
+ $this->assertStringContainsString('contains some text outside of front matter', $message);
break;
case 'translated':
- $this->assertContains('Twig file has all of its text translated', $message);
+ $this->assertStringContainsString('Twig file has all of its text translated', $message);
break;
case 'h1':
- $this->assertContains('has no H1 tag', $message);
+ $this->assertStringContainsString('has no H1 tag', $message);
break;
case 'hierarchy':
- $this->assertContains('has the correct H2-H6 heading hierarchy', $message);
+ $this->assertStringContainsString('has the correct H2-H6 heading hierarchy', $message);
break;
default:
diff --git a/core/modules/image/tests/src/Functional/QuickEditImageControllerTest.php b/core/modules/image/tests/src/Functional/QuickEditImageControllerTest.php
index 853a030b8979..5c8f33019994 100644
--- a/core/modules/image/tests/src/Functional/QuickEditImageControllerTest.php
+++ b/core/modules/image/tests/src/Functional/QuickEditImageControllerTest.php
@@ -135,7 +135,7 @@ public function testValidImageUpload() {
$this->drupalLogin($this->contentAuthorUser);
$this->uploadImage($valid_image, $node->id(), $this->fieldName, $node->language()->getId());
- $this->assertContains('"fid":"1"', $this->getSession()->getPage()->getContent(), 'Valid upload completed successfully.');
+ $this->assertStringContainsString('"fid":"1"', $this->getSession()->getPage()->getContent(), 'Valid upload completed successfully.');
}
/**
@@ -164,7 +164,7 @@ public function testInvalidUpload() {
$this->drupalLogin($this->contentAuthorUser);
$this->uploadImage($invalid_image, $node->id(), $this->fieldName, $node->language()->getId());
- $this->assertContains('"main_error":"The image failed validation."', $this->getSession()->getPage()->getContent(), 'Invalid upload returned errors.');
+ $this->assertStringContainsString('"main_error":"The image failed validation."', $this->getSession()->getPage()->getContent(), 'Invalid upload returned errors.');
}
/**
diff --git a/core/modules/image/tests/src/Kernel/ImageFormatterTest.php b/core/modules/image/tests/src/Kernel/ImageFormatterTest.php
index 5d97cdf77d28..1e5718357be5 100644
--- a/core/modules/image/tests/src/Kernel/ImageFormatterTest.php
+++ b/core/modules/image/tests/src/Kernel/ImageFormatterTest.php
@@ -196,7 +196,7 @@ public function testImageFormatterUrlOptions() {
$renderer = $this->container->get('renderer');
$output = $renderer->renderRoot($build[$this->fieldName][0]);
- $this->assertContains('<a href="' . $entity->toUrl()->toString() . '" data-attributes-test="test123"', (string) $output);
+ $this->assertStringContainsString('<a href="' . $entity->toUrl()->toString() . '" data-attributes-test="test123"', (string) $output);
}
/**
diff --git a/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php b/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php
index de7a276050f6..53ae63455dec 100644
--- a/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php
+++ b/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php
@@ -107,7 +107,7 @@ public function testMissingEffectPlugin() {
$this->executeMigration('d6_imagecache_presets');
$messages = iterator_to_array($this->migration->getIdMap()->getMessages());
$this->assertCount(1, $messages);
- $this->assertContains('The "image_deprecated_scale" plugin does not exist.', $messages[0]->message);
+ $this->assertStringContainsString('The "image_deprecated_scale" plugin does not exist.', $messages[0]->message);
$this->assertEqual($messages[0]->level, MigrationInterface::MESSAGE_ERROR);
}
diff --git a/core/modules/jsonapi/tests/src/Functional/JsonApiFunctionalTest.php b/core/modules/jsonapi/tests/src/Functional/JsonApiFunctionalTest.php
index 3acde839e798..37d2c457178c 100644
--- a/core/modules/jsonapi/tests/src/Functional/JsonApiFunctionalTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/JsonApiFunctionalTest.php
@@ -57,7 +57,7 @@ public function testRead() {
]));
$this->assertSession()->statusCodeEquals(200);
$this->assertEquals(OffsetPage::SIZE_MAX, count($collection_output['data']));
- $this->assertContains('page%5Boffset%5D=53', $collection_output['links']['next']['href']);
+ $this->assertStringContainsString('page%5Boffset%5D=53', $collection_output['links']['next']['href']);
// 3. Load all articles (1st page, 2 items)
$collection_output = Json::decode($this->drupalGet('/jsonapi/node/article', [
'query' => ['page' => ['limit' => 2]] + $default_sort,
@@ -75,7 +75,7 @@ public function testRead() {
]));
$this->assertSession()->statusCodeEquals(200);
$this->assertEquals(2, count($collection_output['data']));
- $this->assertContains('page%5Boffset%5D=4', $collection_output['links']['next']['href']);
+ $this->assertStringContainsString('page%5Boffset%5D=4', $collection_output['links']['next']['href']);
// 5. Single article.
$uuid = $this->nodes[0]->uuid();
$single_output = Json::decode($this->drupalGet('/jsonapi/node/article/' . $uuid));
@@ -123,7 +123,7 @@ public function testRead() {
$this->assertSession()->statusCodeEquals(200);
$this->assertEquals('taxonomy_term--tags', $single_output['data'][0]['type']);
$this->assertArrayNotHasKey('tid', $single_output['data'][0]['attributes']);
- $this->assertContains(
+ $this->assertStringContainsString(
'/taxonomy_term/tags/',
$single_output['data'][0]['links']['self']['href']
);
diff --git a/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php b/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php
index 4445b3ac9531..4a7fe607e79e 100644
--- a/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php
+++ b/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php
@@ -179,7 +179,7 @@ protected function assertElementUnclickable(NodeElement $element) {
$this->fail(new FormattableMarkup("@tag_name was clickable when it shouldn't have been", ['@tag_name' => $tag_name]));
}
catch (\Exception $e) {
- $this->assertContains('is not clickable at point', $e->getMessage());
+ $this->assertStringContainsString('is not clickable at point', $e->getMessage());
}
}
diff --git a/core/modules/link/tests/src/Functional/LinkFieldTest.php b/core/modules/link/tests/src/Functional/LinkFieldTest.php
index fda83fd5646e..a1d067dc9010 100644
--- a/core/modules/link/tests/src/Functional/LinkFieldTest.php
+++ b/core/modules/link/tests/src/Functional/LinkFieldTest.php
@@ -352,7 +352,7 @@ public function testLinkTitle() {
$output = $this->renderTestEntity($id);
$expected_link = (string) Link::fromTextAndUrl($value, Url::fromUri($value))->toString();
- $this->assertContains($expected_link, $output);
+ $this->assertStringContainsString($expected_link, $output);
// Verify that a link with text is rendered using the link text.
$title = $this->randomMachineName();
@@ -364,7 +364,7 @@ public function testLinkTitle() {
$output = $this->renderTestEntity($id);
$expected_link = (string) Link::fromTextAndUrl($title, Url::fromUri($value))->toString();
- $this->assertContains($expected_link, $output);
+ $this->assertStringContainsString($expected_link, $output);
}
/**
@@ -468,51 +468,51 @@ public function testLinkFormatter() {
case 'trim_length':
$url = $url1;
$title = isset($new_value) ? Unicode::truncate($title1, $new_value, FALSE, TRUE) : $title1;
- $this->assertContains('<a href="' . Html::escape($url) . '">' . Html::escape($title) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url) . '">' . Html::escape($title) . '</a>', $output);
$url = $url2;
$title = isset($new_value) ? Unicode::truncate($title2, $new_value, FALSE, TRUE) : $title2;
- $this->assertContains('<a href="' . Html::escape($url) . '">' . Html::escape($title) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url) . '">' . Html::escape($title) . '</a>', $output);
$url = $url3;
$title = isset($new_value) ? Unicode::truncate($title3, $new_value, FALSE, TRUE) : $title3;
- $this->assertContains('<a href="' . Html::escape($url) . '">' . Html::escape($title) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url) . '">' . Html::escape($title) . '</a>', $output);
break;
case 'rel':
$rel = isset($new_value) ? ' rel="' . $new_value . '"' : '';
- $this->assertContains('<a href="' . Html::escape($url1) . '"' . $rel . '>' . Html::escape($title1) . '</a>', $output);
- $this->assertContains('<a href="' . Html::escape($url2) . '"' . $rel . '>' . Html::escape($title2) . '</a>', $output);
- $this->assertContains('<a href="' . Html::escape($url3) . '"' . $rel . '>' . Html::escape($title3) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url1) . '"' . $rel . '>' . Html::escape($title1) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url2) . '"' . $rel . '>' . Html::escape($title2) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url3) . '"' . $rel . '>' . Html::escape($title3) . '</a>', $output);
break;
case 'target':
$target = isset($new_value) ? ' target="' . $new_value . '"' : '';
- $this->assertContains('<a href="' . Html::escape($url1) . '"' . $target . '>' . Html::escape($title1) . '</a>', $output);
- $this->assertContains('<a href="' . Html::escape($url2) . '"' . $target . '>' . Html::escape($title2) . '</a>', $output);
- $this->assertContains('<a href="' . Html::escape($url3) . '"' . $target . '>' . Html::escape($title3) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url1) . '"' . $target . '>' . Html::escape($title1) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url2) . '"' . $target . '>' . Html::escape($title2) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url3) . '"' . $target . '>' . Html::escape($title3) . '</a>', $output);
break;
case 'url_only':
// In this case, $new_value is an array.
if (!$new_value['url_only']) {
- $this->assertContains('<a href="' . Html::escape($url1) . '">' . Html::escape($title1) . '</a>', $output);
- $this->assertContains('<a href="' . Html::escape($url2) . '">' . Html::escape($title2) . '</a>', $output);
- $this->assertContains('<a href="' . Html::escape($url3) . '">' . Html::escape($title3) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url1) . '">' . Html::escape($title1) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url2) . '">' . Html::escape($title2) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url3) . '">' . Html::escape($title3) . '</a>', $output);
}
else {
if (empty($new_value['url_plain'])) {
- $this->assertContains('<a href="' . Html::escape($url1) . '">' . Html::escape($url1) . '</a>', $output);
- $this->assertContains('<a href="' . Html::escape($url2) . '">' . Html::escape($url2) . '</a>', $output);
- $this->assertContains('<a href="' . Html::escape($url3) . '">' . Html::escape($url3) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url1) . '">' . Html::escape($url1) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url2) . '">' . Html::escape($url2) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url3) . '">' . Html::escape($url3) . '</a>', $output);
}
else {
- $this->assertNotContains('<a href="' . Html::escape($url1) . '">' . Html::escape($url1) . '</a>', $output);
- $this->assertNotContains('<a href="' . Html::escape($url2) . '">' . Html::escape($url2) . '</a>', $output);
- $this->assertNotContains('<a href="' . Html::escape($url3) . '">' . Html::escape($url3) . '</a>', $output);
- $this->assertContains(Html::escape($url1), $output);
- $this->assertContains(Html::escape($url2), $output);
- $this->assertContains(Html::escape($url3), $output);
+ $this->assertStringNotContainsString('<a href="' . Html::escape($url1) . '">' . Html::escape($url1) . '</a>', $output);
+ $this->assertStringNotContainsString('<a href="' . Html::escape($url2) . '">' . Html::escape($url2) . '</a>', $output);
+ $this->assertStringNotContainsString('<a href="' . Html::escape($url3) . '">' . Html::escape($url3) . '</a>', $output);
+ $this->assertStringContainsString(Html::escape($url1), $output);
+ $this->assertStringContainsString(Html::escape($url2), $output);
+ $this->assertStringContainsString(Html::escape($url3), $output);
}
}
break;
@@ -607,7 +607,7 @@ public function testLinkSeparateFormatter() {
$expected = '<div class="link-item">';
$expected .= '<div class="link-url"><a href="' . Html::escape($url) . '">' . Html::escape($url_title) . '</a></div>';
$expected .= '</div>';
- $this->assertContains($expected, $output);
+ $this->assertStringContainsString($expected, $output);
$url = $url2;
$url_title = isset($new_value) ? Unicode::truncate($url, $new_value, FALSE, TRUE) : $url;
@@ -616,7 +616,7 @@ public function testLinkSeparateFormatter() {
$expected .= '<div class="link-title">' . Html::escape($title) . '</div>';
$expected .= '<div class="link-url"><a href="' . Html::escape($url) . '">' . Html::escape($url_title) . '</a></div>';
$expected .= '</div>';
- $this->assertContains($expected, $output);
+ $this->assertStringContainsString($expected, $output);
$url = $url3;
$url_title = isset($new_value) ? Unicode::truncate($url, $new_value, FALSE, TRUE) : $url;
@@ -625,21 +625,21 @@ public function testLinkSeparateFormatter() {
$expected .= '<div class="link-title">' . Html::escape($title) . '</div>';
$expected .= '<div class="link-url"><a href="' . Html::escape($url) . '">' . Html::escape($url_title) . '</a></div>';
$expected .= '</div>';
- $this->assertContains($expected, $output);
+ $this->assertStringContainsString($expected, $output);
break;
case 'rel':
$rel = isset($new_value) ? ' rel="' . $new_value . '"' : '';
- $this->assertContains('<div class="link-url"><a href="' . Html::escape($url1) . '"' . $rel . '>' . Html::escape($url1) . '</a></div>', $output);
- $this->assertContains('<div class="link-url"><a href="' . Html::escape($url2) . '"' . $rel . '>' . Html::escape($url2) . '</a></div>', $output);
- $this->assertContains('<div class="link-url"><a href="' . Html::escape($url3) . '"' . $rel . '>' . Html::escape($url3) . '</a></div>', $output);
+ $this->assertStringContainsString('<div class="link-url"><a href="' . Html::escape($url1) . '"' . $rel . '>' . Html::escape($url1) . '</a></div>', $output);
+ $this->assertStringContainsString('<div class="link-url"><a href="' . Html::escape($url2) . '"' . $rel . '>' . Html::escape($url2) . '</a></div>', $output);
+ $this->assertStringContainsString('<div class="link-url"><a href="' . Html::escape($url3) . '"' . $rel . '>' . Html::escape($url3) . '</a></div>', $output);
break;
case 'target':
$target = isset($new_value) ? ' target="' . $new_value . '"' : '';
- $this->assertContains('<div class="link-url"><a href="' . Html::escape($url1) . '"' . $target . '>' . Html::escape($url1) . '</a></div>', $output);
- $this->assertContains('<div class="link-url"><a href="' . Html::escape($url2) . '"' . $target . '>' . Html::escape($url2) . '</a></div>', $output);
- $this->assertContains('<div class="link-url"><a href="' . Html::escape($url3) . '"' . $target . '>' . Html::escape($url3) . '</a></div>', $output);
+ $this->assertStringContainsString('<div class="link-url"><a href="' . Html::escape($url1) . '"' . $target . '>' . Html::escape($url1) . '</a></div>', $output);
+ $this->assertStringContainsString('<div class="link-url"><a href="' . Html::escape($url2) . '"' . $target . '>' . Html::escape($url2) . '</a></div>', $output);
+ $this->assertStringContainsString('<div class="link-url"><a href="' . Html::escape($url3) . '"' . $target . '>' . Html::escape($url3) . '</a></div>', $output);
break;
}
}
@@ -800,7 +800,7 @@ public function testNoLinkUri() {
$id = $match[1];
$output = $this->renderTestEntity($id);
$expected_link = (string) $this->container->get('link_generator')->generate('Title, no link', Url::fromUri('route:<nolink>'));
- $this->assertContains($expected_link, $output);
+ $this->assertStringContainsString($expected_link, $output);
// Test a link with <none> uri.
$edit = [
@@ -813,7 +813,7 @@ public function testNoLinkUri() {
$id = $match[1];
$output = $this->renderTestEntity($id);
$expected_link = (string) $this->container->get('link_generator')->generate('Title, none', Url::fromUri('route:<none>'));
- $this->assertContains($expected_link, $output);
+ $this->assertStringContainsString($expected_link, $output);
}
/**
diff --git a/core/modules/locale/tests/src/Functional/LocaleTranslationDownloadTest.php b/core/modules/locale/tests/src/Functional/LocaleTranslationDownloadTest.php
index 7b727518a84a..3d377f08f4f3 100644
--- a/core/modules/locale/tests/src/Functional/LocaleTranslationDownloadTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleTranslationDownloadTest.php
@@ -64,7 +64,7 @@ public function testUpdateImportSourceRemote() {
$this->assertEquals('translations://contrib_module_one-8.x-1.1.de._po', $result->uri);
$this->assertFalse(file_exists('translations://contrib_module_one-8.x-1.1.de_0._po'));
$this->assertTrue(file_exists('translations://contrib_module_one-8.x-1.1.de._po'));
- $this->assertNotContains('__old_content__', file_get_contents('translations://contrib_module_one-8.x-1.1.de._po'));
+ $this->assertStringNotContainsString('__old_content__', file_get_contents('translations://contrib_module_one-8.x-1.1.de._po'));
}
}
diff --git a/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php b/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php
index f8fe9c6db1c3..4693a7885790 100644
--- a/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php
@@ -324,7 +324,7 @@ public function testStringValidation() {
$this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
// Check for a form error on the textarea.
$form_class = $this->xpath('//form[@id="locale-translate-edit-form"]//textarea/@class');
- $this->assertContains('error', $form_class[0]->getText(), 'The string was rejected as unsafe.');
+ $this->assertStringContainsString('error', $form_class[0]->getText(), 'The string was rejected as unsafe.');
$this->assertNoText(t('The string has been saved.'), 'The string was not saved.');
}
}
diff --git a/core/modules/media/tests/src/Functional/FieldFormatter/OEmbedFormatterTest.php b/core/modules/media/tests/src/Functional/FieldFormatter/OEmbedFormatterTest.php
index b4e576761496..fc6f2b28ff92 100644
--- a/core/modules/media/tests/src/Functional/FieldFormatter/OEmbedFormatterTest.php
+++ b/core/modules/media/tests/src/Functional/FieldFormatter/OEmbedFormatterTest.php
@@ -194,7 +194,7 @@ public function testRender($url, $resource_url, array $formatter_settings, array
$element = $assert->elementExists('css', $selector);
foreach ($attributes as $attribute => $value) {
if (isset($value)) {
- $this->assertContains($value, $element->getAttribute($attribute));
+ $this->assertStringContainsString($value, $element->getAttribute($attribute));
}
else {
$this->assertFalse($element->hasAttribute($attribute));
diff --git a/core/modules/media/tests/src/Functional/UrlResolverTest.php b/core/modules/media/tests/src/Functional/UrlResolverTest.php
index 5073625811c9..06906876eda6 100644
--- a/core/modules/media/tests/src/Functional/UrlResolverTest.php
+++ b/core/modules/media/tests/src/Functional/UrlResolverTest.php
@@ -85,7 +85,7 @@ public function testResourceUrlAlterHook() {
$resource_url = $this->container->get('media.oembed.url_resolver')
->getResourceUrl('https://vimeo.com/14782834');
- $this->assertContains('altered=1', parse_url($resource_url, PHP_URL_QUERY));
+ $this->assertStringContainsString('altered=1', parse_url($resource_url, PHP_URL_QUERY));
}
/**
diff --git a/core/modules/media/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php b/core/modules/media/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
index 1a0e7201d4cd..3909303322df 100644
--- a/core/modules/media/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
+++ b/core/modules/media/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
@@ -453,8 +453,8 @@ public function testEditableCaption() {
$this->pressEditorButton('source');
$source = $assert_session->elementExists('css', "textarea.cke_source");
$value = $source->getValue();
- $this->assertContains('https://www.drupal.org/project/drupal', $value);
- $this->assertNotContains('data-cke-saved-href', $value);
+ $this->assertStringContainsString('https://www.drupal.org/project/drupal', $value);
+ $this->assertStringNotContainsString('data-cke-saved-href', $value);
// Save the entity.
$assert_session->buttonExists('Save')->press();
diff --git a/core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php b/core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php
index 9c0856670571..3c860e47918d 100644
--- a/core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php
+++ b/core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php
@@ -110,7 +110,7 @@ public function testMediaDisplay() {
// visually hidden, and there is no link to the image file.
$media_image = $assert_session->elementExists('css', '.media--type-image img');
$expected_image_src = file_url_transform_relative(file_create_url(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/example_1.jpeg')));
- $this->assertContains($expected_image_src, $media_image->getAttribute('src'));
+ $this->assertStringContainsString($expected_image_src, $media_image->getAttribute('src'));
$field = $assert_session->elementExists('css', '.field--name-field-media-image');
$assert_session->elementExists('css', '.field__label.visually-hidden', $field);
$assert_session->elementNotExists('css', 'a', $field);
diff --git a/core/modules/media/tests/src/FunctionalJavascript/MediaSourceImageTest.php b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceImageTest.php
index 19233736cced..5b2a929d777f 100644
--- a/core/modules/media/tests/src/FunctionalJavascript/MediaSourceImageTest.php
+++ b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceImageTest.php
@@ -73,7 +73,7 @@ public function testMediaImageSource() {
// and there is no link to the image file.
$image_element = $assert_session->elementExists('css', '.field--name-field-media-image img');
$expected_image_src = file_url_transform_relative(file_create_url(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/example_1.jpeg')));
- $this->assertContains($expected_image_src, $image_element->getAttribute('src'));
+ $this->assertStringContainsString($expected_image_src, $image_element->getAttribute('src'));
$field = $assert_session->elementExists('css', '.field--name-field-media-image');
$assert_session->elementExists('css', '.field__label.visually-hidden', $field);
$assert_session->elementNotExists('css', 'a', $field);
diff --git a/core/modules/media/tests/src/FunctionalJavascript/MediaStandardProfileTest.php b/core/modules/media/tests/src/FunctionalJavascript/MediaStandardProfileTest.php
index 0453460ba517..c353ace4fbd2 100644
--- a/core/modules/media/tests/src/FunctionalJavascript/MediaStandardProfileTest.php
+++ b/core/modules/media/tests/src/FunctionalJavascript/MediaStandardProfileTest.php
@@ -239,7 +239,7 @@ protected function imageTest() {
// and there is no link to the image file.
$image_element = $assert_session->elementExists('css', 'article.media--type-image img');
$expected_image_src = file_url_transform_relative(file_create_url(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/' . $image_media_name)));
- $this->assertContains($expected_image_src, $image_element->getAttribute('src'));
+ $this->assertStringContainsString($expected_image_src, $image_element->getAttribute('src'));
$assert_session->elementExists('css', '.field--name-field-media-image .field__label.visually-hidden');
$assert_session->elementNotExists('css', '.field--name-field-media-image a');
@@ -271,7 +271,7 @@ protected function imageTest() {
// and there is no link to the image file.
$image_element = $assert_session->elementExists('css', 'article.media--type-image img');
$expected_image_src = file_url_transform_relative(file_create_url(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/' . $image_media_name_updated)));
- $this->assertContains($expected_image_src, $image_element->getAttribute('src'));
+ $this->assertStringContainsString($expected_image_src, $image_element->getAttribute('src'));
$assert_session->elementExists('css', '.field--name-field-media-image .field__label.visually-hidden');
$assert_session->elementNotExists('css', '.field--name-field-media-image a');
}
diff --git a/core/modules/media/tests/src/Kernel/MediaEmbedFilterTestBase.php b/core/modules/media/tests/src/Kernel/MediaEmbedFilterTestBase.php
index 675223c3d23c..99e637c63941 100644
--- a/core/modules/media/tests/src/Kernel/MediaEmbedFilterTestBase.php
+++ b/core/modules/media/tests/src/Kernel/MediaEmbedFilterTestBase.php
@@ -178,12 +178,12 @@ protected function createEmbedCode(array $attributes) {
* @see \Drupal\KernelTests\AssertContentTrait::setRawContent()
*/
protected function applyFilter($text, $langcode = 'en') {
- $this->assertContains('<drupal-media', $text);
- $this->assertContains('This placeholder should not be rendered.', $text);
+ $this->assertStringContainsString('<drupal-media', $text);
+ $this->assertStringContainsString('This placeholder should not be rendered.', $text);
$filter_result = $this->processText($text, $langcode);
$output = $filter_result->getProcessedText();
- $this->assertNotContains('<drupal-media', $output);
- $this->assertNotContains('This placeholder should not be rendered.', $output);
+ $this->assertStringNotContainsString('<drupal-media', $output);
+ $this->assertStringNotContainsString('This placeholder should not be rendered.', $output);
$this->setRawContent($output);
return $filter_result;
}
diff --git a/core/modules/media/tests/src/Kernel/MediaSourceFileTest.php b/core/modules/media/tests/src/Kernel/MediaSourceFileTest.php
index 973e7522465d..f2076ef94832 100644
--- a/core/modules/media/tests/src/Kernel/MediaSourceFileTest.php
+++ b/core/modules/media/tests/src/Kernel/MediaSourceFileTest.php
@@ -19,7 +19,7 @@ public function testFileExtensionConstraint() {
$result = $media->validate();
$this->assertCount(1, $result);
$this->assertSame('field_media_file.0', $result->get(0)->getPropertyPath());
- $this->assertContains('Only files with the following extensions are allowed:', (string) $result->get(0)->getMessage());
+ $this->assertStringContainsString('Only files with the following extensions are allowed:', (string) $result->get(0)->getMessage());
// Create a random file that should pass.
$media = $this->generateMedia('test.txt', $mediaType);
diff --git a/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php b/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
index 57a556fde645..d30e1bbf7835 100644
--- a/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
+++ b/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
@@ -187,7 +187,7 @@ public function testConfigurationValidation() {
$page->checkField('filters[filter_html][status]');
$expected = 'drupal-media data-entity-type data-entity-uuid data-view-mode data-align data-caption alt title';
$allowed_html = $assert_session->fieldExists('filters[filter_html][settings][allowed_html]')->getValue();
- $this->assertContains($expected, $allowed_html);
+ $this->assertStringContainsString($expected, $allowed_html);
$page->pressButton('Save configuration');
$assert_session->pageTextContains('The text format Sulaco has been updated.');
diff --git a/core/modules/node/tests/src/Functional/NodeRevisionsUiTest.php b/core/modules/node/tests/src/Functional/NodeRevisionsUiTest.php
index 861833a45dc3..6a3ad62e68a5 100644
--- a/core/modules/node/tests/src/Functional/NodeRevisionsUiTest.php
+++ b/core/modules/node/tests/src/Functional/NodeRevisionsUiTest.php
@@ -172,7 +172,7 @@ public function testNodeRevisionsTabWithDefaultRevision() {
$elements = $this->xpath('//tr[contains(@class, "revision-current")]/td/a[1]');
// The site may be installed in a subdirectory, so check if the URL is
// contained in the retrieved one.
- $this->assertContains('/node/1', current($elements)->getAttribute('href'));
+ $this->assertStringContainsString('/node/1', current($elements)->getAttribute('href'));
// Verify that the default revision can be an older revision than the latest
// one.
diff --git a/core/modules/node/tests/src/Kernel/NodeViewBuilderTest.php b/core/modules/node/tests/src/Kernel/NodeViewBuilderTest.php
index 3ef609b773bd..5499044a4714 100644
--- a/core/modules/node/tests/src/Kernel/NodeViewBuilderTest.php
+++ b/core/modules/node/tests/src/Kernel/NodeViewBuilderTest.php
@@ -91,11 +91,11 @@ public function testPendingRevisionLinks() {
$build = $this->viewBuilder->view($node, 'teaser');
$output = (string) $this->renderer->renderPlain($build);
- $this->assertContains("title=\"$title\"", $output);
+ $this->assertStringContainsString("title=\"$title\"", $output);
$build = $this->viewBuilder->view($pending_revision, 'teaser');
$output = (string) $this->renderer->renderPlain($build);
- $this->assertContains("title=\"$draft_title\"", $output);
+ $this->assertStringContainsString("title=\"$draft_title\"", $output);
}
}
diff --git a/core/modules/page_cache/tests/src/Functional/PageCacheTest.php b/core/modules/page_cache/tests/src/Functional/PageCacheTest.php
index fc0421de002b..e14cbdd42bbb 100644
--- a/core/modules/page_cache/tests/src/Functional/PageCacheTest.php
+++ b/core/modules/page_cache/tests/src/Functional/PageCacheTest.php
@@ -274,7 +274,7 @@ public function testPageCache() {
$this->drupalLogin($user);
$this->drupalGet('system-test/set-header', ['query' => ['name' => 'Foo', 'value' => 'bar']]);
$this->assertNull($this->drupalGetHeader('X-Drupal-Cache'), 'Caching was bypassed.');
- $this->assertNotContains('cookie', $this->drupalGetHeader('Vary'), 'Vary: Cookie header was not sent.', TRUE);
+ $this->assertStringNotContainsString('cookie', $this->drupalGetHeader('Vary'), 'Vary: Cookie header was not sent.', TRUE);
$this->assertEqual($this->drupalGetHeader('Cache-Control'), 'must-revalidate, no-cache, private', 'Cache-Control header was sent.');
$this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', 'Expires header was sent.');
$this->assertEqual($this->drupalGetHeader('Foo'), 'bar', 'Custom header was sent.');
@@ -441,13 +441,13 @@ public function testPageCacheWithoutVaryCookie() {
// Fill the cache.
$this->drupalGet('');
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS', 'Page was not cached.');
- $this->assertNotContains('cookie', $this->drupalGetHeader('Vary'), 'Vary: Cookie header was not sent.', TRUE);
+ $this->assertStringNotContainsString('cookie', $this->drupalGetHeader('Vary'), 'Vary: Cookie header was not sent.', TRUE);
$this->assertEqual($this->drupalGetHeader('Cache-Control'), 'max-age=300, public', 'Cache-Control header was sent.');
// Check cache.
$this->drupalGet('');
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', 'Page was cached.');
- $this->assertNotContains('cookie', $this->drupalGetHeader('Vary'), 'Vary: Cookie header was not sent.', TRUE);
+ $this->assertStringNotContainsString('cookie', $this->drupalGetHeader('Vary'), 'Vary: Cookie header was not sent.', TRUE);
$this->assertEqual($this->drupalGetHeader('Cache-Control'), 'max-age=300, public', 'Cache-Control header was sent.');
}
diff --git a/core/modules/path/tests/src/Functional/PathLanguageTest.php b/core/modules/path/tests/src/Functional/PathLanguageTest.php
index a5982e15d8b4..0d6b7c278506 100644
--- a/core/modules/path/tests/src/Functional/PathLanguageTest.php
+++ b/core/modules/path/tests/src/Functional/PathLanguageTest.php
@@ -124,7 +124,7 @@ public function testAliasTranslation() {
$languages = $this->container->get('language_manager')->getLanguages();
$url = $english_node_french_translation->toUrl('canonical', ['language' => $languages['fr']])->toString();
- $this->assertContains($edit['path[0][alias]'], $url, 'URL contains the path alias.');
+ $this->assertStringContainsString($edit['path[0][alias]'], $url, 'URL contains the path alias.');
// Confirm that the alias works even when changing language negotiation
// options. Enable User language detection and selection over URL one.
diff --git a/core/modules/quickedit/tests/src/Functional/QuickEditCustomPipelineTest.php b/core/modules/quickedit/tests/src/Functional/QuickEditCustomPipelineTest.php
index 90ae916873e6..c4a97968057f 100644
--- a/core/modules/quickedit/tests/src/Functional/QuickEditCustomPipelineTest.php
+++ b/core/modules/quickedit/tests/src/Functional/QuickEditCustomPipelineTest.php
@@ -98,10 +98,10 @@ public function testCustomPipeline() {
$ajax_commands = Json::decode($response->getBody());
$this->assertIdentical(1, count($ajax_commands), 'The field form HTTP request results in one AJAX command.');
$this->assertIdentical('quickeditFieldFormSaved', $ajax_commands[0]['command'], 'The first AJAX command is a quickeditFieldFormSaved command.');
- $this->assertContains('Fine thanks.', $ajax_commands[0]['data'], 'Form value saved and printed back.');
- $this->assertContains('<div class="quickedit-test-wrapper">', $ajax_commands[0]['data'], 'Custom render pipeline used to render the value.');
+ $this->assertStringContainsString('Fine thanks.', $ajax_commands[0]['data'], 'Form value saved and printed back.');
+ $this->assertStringContainsString('<div class="quickedit-test-wrapper">', $ajax_commands[0]['data'], 'Custom render pipeline used to render the value.');
$this->assertIdentical(array_keys($ajax_commands[0]['other_view_modes']), ['full'], 'Field was also rendered in the "full" view mode.');
- $this->assertContains('Fine thanks.', $ajax_commands[0]['other_view_modes']['full'], '"full" version of field contains the form value.');
+ $this->assertStringContainsString('Fine thanks.', $ajax_commands[0]['other_view_modes']['full'], '"full" version of field contains the form value.');
}
}
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
index 558ad92c9d31..3995fb5558af 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
@@ -752,7 +752,7 @@ public function testPost() {
$response = $this->request('POST', $url, $request_options);
$this->assertSame(415, $response->getStatusCode());
$this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
- $this->assertContains('A client error happened', (string) $response->getBody());
+ $this->assertStringContainsString('A client error happened', (string) $response->getBody());
$url->setOption('query', ['_format' => static::$format]);
@@ -858,7 +858,7 @@ public function testPost() {
$response = $this->request('POST', $url, $request_options);
$this->assertSame(500, $response->getStatusCode());
- $this->assertContains('Internal Server Error', (string) $response->getBody());
+ $this->assertStringContainsString('Internal Server Error', (string) $response->getBody());
// 201 when successfully creating an entity with a new UUID.
$normalized_entity = $this->getModifiedEntityForPostTesting();
@@ -920,7 +920,7 @@ public function testPatch() {
$this->assertSame(405, $response->getStatusCode());
$this->assertSame(['GET, POST, HEAD'], $response->getHeader('Allow'));
$this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
- $this->assertContains('A client error happened', (string) $response->getBody());
+ $this->assertStringContainsString('A client error happened', (string) $response->getBody());
}
else {
$this->assertSame(404, $response->getStatusCode());
@@ -946,7 +946,7 @@ public function testPatch() {
$response = $this->request('PATCH', $url, $request_options);
$this->assertSame(415, $response->getStatusCode());
$this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
- $this->assertContains('A client error happened', (string) $response->getBody());
+ $this->assertStringContainsString('A client error happened', (string) $response->getBody());
$url->setOption('query', ['_format' => static::$format]);
@@ -1146,7 +1146,7 @@ public function testDelete() {
$this->assertSame(405, $response->getStatusCode());
$this->assertSame(['GET, POST, HEAD'], $response->getHeader('Allow'));
$this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
- $this->assertContains('A client error happened', (string) $response->getBody());
+ $this->assertStringContainsString('A client error happened', (string) $response->getBody());
}
else {
$this->assertSame(404, $response->getStatusCode());
@@ -1368,8 +1368,8 @@ protected function assert406Response(ResponseInterface $response) {
if ($actual_link_header) {
$this->assertTrue(is_array($actual_link_header));
$expected_type = explode(';', static::$mimeType)[0];
- $this->assertContains('?_format=' . static::$format . '>; rel="alternate"; type="' . $expected_type . '"', $actual_link_header[0]);
- $this->assertContains('?_format=foobar>; rel="alternate"', $actual_link_header[0]);
+ $this->assertStringContainsString('?_format=' . static::$format . '>; rel="alternate"; type="' . $expected_type . '"', $actual_link_header[0]);
+ $this->assertStringContainsString('?_format=foobar>; rel="alternate"', $actual_link_header[0]);
}
}
}
diff --git a/core/modules/settings_tray/tests/src/FunctionalJavascript/OverriddenConfigurationTest.php b/core/modules/settings_tray/tests/src/FunctionalJavascript/OverriddenConfigurationTest.php
index ec8afac59cf9..6baacebdf8f7 100644
--- a/core/modules/settings_tray/tests/src/FunctionalJavascript/OverriddenConfigurationTest.php
+++ b/core/modules/settings_tray/tests/src/FunctionalJavascript/OverriddenConfigurationTest.php
@@ -166,7 +166,7 @@ protected function assertOverriddenBlockDisabled(Block $overridden_block, $overr
$contextual_links = $page->findAll('css', "$block_selector .contextual-links li a");
$this->assertNotEmpty($contextual_links);
foreach ($contextual_links as $link) {
- $this->assertNotContains("/admin/structure/block/manage/$block_id/off-canvas", $link->getAttribute('href'));
+ $this->assertStringNotContainsString("/admin/structure/block/manage/$block_id/off-canvas", $link->getAttribute('href'));
}
// Confirm the block is not marked as Settings Tray editable.
$this->assertFalse($page->find('css', $block_selector)
diff --git a/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayBlockFormTest.php b/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayBlockFormTest.php
index bad7a75d672a..4eafed47cf0e 100644
--- a/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayBlockFormTest.php
+++ b/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayBlockFormTest.php
@@ -76,7 +76,7 @@ protected function doTestBlocks($theme, $block_plugin, $new_page_text, $element_
$link = $web_assert->waitForElement('css', "$block_selector .contextual-links li a");
$this->assertEquals('Quick edit', $link->getHtml(), "'Quick edit' is the first contextual link for the block.");
$destination = (string) $this->loggedInUser->toUrl()->toString();
- $this->assertContains("/admin/structure/block/manage/$block_id/settings-tray?destination=$destination", $link->getAttribute('href'));
+ $this->assertStringContainsString("/admin/structure/block/manage/$block_id/settings-tray?destination=$destination", $link->getAttribute('href'));
if (isset($toolbar_item)) {
// Check that you can open a toolbar tray and it will be closed after
diff --git a/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php b/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php
index 6d73c1a8be87..2c92d1a81e20 100644
--- a/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php
+++ b/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php
@@ -143,7 +143,7 @@ public function testBatchFormMultistep() {
$this->drupalGet('batch-test/multistep', ['query' => ['big_tree' => 'small_axe']]);
$this->drupalPostForm(NULL, [], 'Submit');
$this->assertText('step 2', 'Form is displayed in step 2.');
- $this->assertContains('batch-test/multistep?big_tree=small_axe', $this->getUrl(), 'Query argument was persisted and another extra argument was added.');
+ $this->assertStringContainsString('batch-test/multistep?big_tree=small_axe', $this->getUrl(), 'Query argument was persisted and another extra argument was added.');
}
/**
diff --git a/core/modules/system/tests/src/Functional/Cache/AssertPageCacheContextsAndTagsTrait.php b/core/modules/system/tests/src/Functional/Cache/AssertPageCacheContextsAndTagsTrait.php
index e03a90f67955..6b4d3a958707 100644
--- a/core/modules/system/tests/src/Functional/Cache/AssertPageCacheContextsAndTagsTrait.php
+++ b/core/modules/system/tests/src/Functional/Cache/AssertPageCacheContextsAndTagsTrait.php
@@ -157,7 +157,7 @@ protected function assertCacheContexts(array $expected_contexts, $message = NULL
*/
protected function assertCacheMaxAge($max_age) {
$cache_control_header = $this->drupalGetHeader('Cache-Control');
- $this->assertContains('max-age:' . $max_age, $cache_control_header);
+ $this->assertStringContainsString('max-age:' . $max_age, $cache_control_header);
}
}
diff --git a/core/modules/system/tests/src/Functional/System/SitesDirectoryHardeningTest.php b/core/modules/system/tests/src/Functional/System/SitesDirectoryHardeningTest.php
index ce3ac2a835ab..2fc1c8f4aef2 100644
--- a/core/modules/system/tests/src/Functional/System/SitesDirectoryHardeningTest.php
+++ b/core/modules/system/tests/src/Functional/System/SitesDirectoryHardeningTest.php
@@ -62,8 +62,8 @@ public function testSitesDirectoryHardeningConfig() {
$this->assertEqual(REQUIREMENT_WARNING, $requirements['configuration_files']['severity'], 'Warning severity is properly set.');
$this->assertEquals('Protection disabled', (string) $requirements['configuration_files']['value']);
$description = strip_tags(\Drupal::service('renderer')->renderPlain($requirements['configuration_files']['description']));
- $this->assertContains('settings.php is not protected from modifications and poses a security risk.', $description);
- $this->assertContains('services.yml is not protected from modifications and poses a security risk.', $description);
+ $this->assertStringContainsString('settings.php is not protected from modifications and poses a security risk.', $description);
+ $this->assertStringContainsString('services.yml is not protected from modifications and poses a security risk.', $description);
$this->assertTrue(is_writable($site_path), 'Site directory remains writable when automatically fixing permissions is disabled.');
$this->assertTrue(is_writable($settings_file), 'settings.php remains writable when automatically fixing permissions is disabled.');
diff --git a/core/modules/system/tests/src/Functional/Theme/ThemeUiTest.php b/core/modules/system/tests/src/Functional/Theme/ThemeUiTest.php
index e2a98252768e..eb47d5f0908c 100644
--- a/core/modules/system/tests/src/Functional/Theme/ThemeUiTest.php
+++ b/core/modules/system/tests/src/Functional/Theme/ThemeUiTest.php
@@ -303,8 +303,8 @@ protected function assertUninstallableTheme(array $expected_requires_list_items,
public function testInstallModuleWithMissingDependencies() {
$this->drupalGet('admin/appearance');
$theme_container = $this->getSession()->getPage()->find('css', 'h3:contains("Test Theme Depending on Nonexisting Module")')->getParent();
- $this->assertContains('Requires: test_module_non_existing (missing)', $theme_container->getText());
- $this->assertContains('This theme requires the listed modules to operate correctly.', $theme_container->getText());
+ $this->assertStringContainsString('Requires: test_module_non_existing (missing)', $theme_container->getText());
+ $this->assertStringContainsString('This theme requires the listed modules to operate correctly.', $theme_container->getText());
}
/**
@@ -314,8 +314,8 @@ public function testInstallModuleWithIncompatibleDependencies() {
$this->container->get('module_installer')->install(['test_module_compatible_constraint', 'test_module_incompatible_constraint']);
$this->drupalGet('admin/appearance');
$theme_container = $this->getSession()->getPage()->find('css', 'h3:contains("Test Theme Depending on Version Constrained Modules")')->getParent();
- $this->assertContains('Requires: Test Module Theme Depends on with Compatible ConstraintTest Module Theme Depends on with Incompatible Constraint (>=8.x-2.x) (incompatible with version 8.x-1.8)', $theme_container->getText());
- $this->assertContains('This theme requires the listed modules to operate correctly.', $theme_container->getText());
+ $this->assertStringContainsString('Requires: Test Module Theme Depends on with Compatible ConstraintTest Module Theme Depends on with Incompatible Constraint (>=8.x-2.x) (incompatible with version 8.x-1.8)', $theme_container->getText());
+ $this->assertStringContainsString('This theme requires the listed modules to operate correctly.', $theme_container->getText());
}
}
diff --git a/core/modules/system/tests/src/Functional/Theme/TwigDebugMarkupTest.php b/core/modules/system/tests/src/Functional/Theme/TwigDebugMarkupTest.php
index 90e5cf842a93..1890ccb33223 100644
--- a/core/modules/system/tests/src/Functional/Theme/TwigDebugMarkupTest.php
+++ b/core/modules/system/tests/src/Functional/Theme/TwigDebugMarkupTest.php
@@ -54,7 +54,7 @@ public function testTwigDebugMarkup() {
$this->assertTrue(strpos($output, '<!-- THEME DEBUG -->') !== FALSE, 'Twig debug markup found in theme output when debug is enabled.');
$this->assertTrue(strpos($output, "THEME HOOK: 'node'") !== FALSE, 'Theme call information found.');
$this->assertTrue(strpos($output, '* node--1--full' . $extension . PHP_EOL . ' x node--1' . $extension . PHP_EOL . ' * node--page--full' . $extension . PHP_EOL . ' * node--page' . $extension . PHP_EOL . ' * node--full' . $extension . PHP_EOL . ' * node' . $extension) !== FALSE, 'Suggested template files found in order and node ID specific template shown as current template.');
- $this->assertContains(Html::escape('node--<script type="text/javascript">alert(\'yo\');</script>'), (string) $output);
+ $this->assertStringContainsString(Html::escape('node--<script type="text/javascript">alert(\'yo\');</script>'), (string) $output);
$template_filename = $templates['node__1']['path'] . '/' . $templates['node__1']['template'] . $extension;
$this->assertTrue(strpos($output, "BEGIN OUTPUT from '$template_filename'") !== FALSE, 'Full path to current template file found.');
diff --git a/core/modules/system/tests/src/Functional/Theme/TwigTransTest.php b/core/modules/system/tests/src/Functional/Theme/TwigTransTest.php
index d1cb99b0f8c2..c4d6b9c84c89 100644
--- a/core/modules/system/tests/src/Functional/Theme/TwigTransTest.php
+++ b/core/modules/system/tests/src/Functional/Theme/TwigTransTest.php
@@ -114,7 +114,7 @@ public function testEmptyTwigTransTags() {
$this->fail('{% trans %}{% endtrans %} did not throw an exception.');
}
catch (SyntaxError $e) {
- $this->assertContains('{% trans %} tag cannot be empty', $e->getMessage());
+ $this->assertStringContainsString('{% trans %} tag cannot be empty', $e->getMessage());
}
catch (\Exception $e) {
$this->fail('{% trans %}{% endtrans %} threw an unexpected exception.');
diff --git a/core/modules/system/tests/src/FunctionalJavascript/ModalRendererTest.php b/core/modules/system/tests/src/FunctionalJavascript/ModalRendererTest.php
index e7ce0429effe..3b09f353d493 100644
--- a/core/modules/system/tests/src/FunctionalJavascript/ModalRendererTest.php
+++ b/core/modules/system/tests/src/FunctionalJavascript/ModalRendererTest.php
@@ -30,8 +30,8 @@ public function testModalRenderer() {
$this->clickLink('Normal Modal!');
// Neither of the wide modals should have been used.
$style = $session_assert->waitForElementVisible('css', '.ui-dialog')->getAttribute('style');
- $this->assertNotContains('700px', $style);
- $this->assertNotContains('1000px', $style);
+ $this->assertStringNotContainsString('700px', $style);
+ $this->assertStringNotContainsString('1000px', $style);
$this->drupalGet('/dialog_renderer-test-links');
$this->clickLink('Wide Modal!');
$this->assertNotEmpty($session_assert->waitForElementVisible('css', '.ui-dialog[style*="width: 700px;"]'));
diff --git a/core/modules/system/tests/src/Kernel/Installer/InstallerDependenciesResolutionTest.php b/core/modules/system/tests/src/Kernel/Installer/InstallerDependenciesResolutionTest.php
index d4d4c3194a74..abe29c3ae9fa 100644
--- a/core/modules/system/tests/src/Kernel/Installer/InstallerDependenciesResolutionTest.php
+++ b/core/modules/system/tests/src/Kernel/Installer/InstallerDependenciesResolutionTest.php
@@ -32,11 +32,11 @@ public function testDependenciesResolution() {
]);
$message = $info['required_modules']['description']->render();
- $this->assertContains('Fictional', $message);
- $this->assertContains('Missing_module1', $message);
- $this->assertContains('Missing_module2', $message);
- $this->assertNotContains('Block', $message);
- $this->assertNotContains('Node', $message);
+ $this->assertStringContainsString('Fictional', $message);
+ $this->assertStringContainsString('Missing_module1', $message);
+ $this->assertStringContainsString('Missing_module2', $message);
+ $this->assertStringNotContainsString('Block', $message);
+ $this->assertStringNotContainsString('Node', $message);
}
}
diff --git a/core/modules/system/tests/src/Kernel/Scripts/DbDumpCommandTest.php b/core/modules/system/tests/src/Kernel/Scripts/DbDumpCommandTest.php
index a2ca86486200..b07bbaae682d 100644
--- a/core/modules/system/tests/src/Kernel/Scripts/DbDumpCommandTest.php
+++ b/core/modules/system/tests/src/Kernel/Scripts/DbDumpCommandTest.php
@@ -48,12 +48,12 @@ public function testDbDumpCommand() {
// Assert that insert exists and that some expected fields exist.
$output = $command_tester->getDisplay();
- $this->assertContains("createTable('router", $output, 'Table router found');
- $this->assertContains("insert('router", $output, 'Insert found');
- $this->assertContains("'name' => 'test", $output, 'Insert name field found');
- $this->assertContains("'path' => 'test", $output, 'Insert path field found');
- $this->assertContains("'pattern_outline' => 'test", $output, 'Insert pattern_outline field found');
- $this->assertContains("// @codingStandardsIgnoreFile", $output);
+ $this->assertStringContainsString("createTable('router", $output, 'Table router found');
+ $this->assertStringContainsString("insert('router", $output, 'Insert found');
+ $this->assertStringContainsString("'name' => 'test", $output, 'Insert name field found');
+ $this->assertStringContainsString("'path' => 'test", $output, 'Insert path field found');
+ $this->assertStringContainsString("'pattern_outline' => 'test", $output, 'Insert pattern_outline field found');
+ $this->assertStringContainsString("// @codingStandardsIgnoreFile", $output);
}
/**
@@ -66,20 +66,20 @@ public function testSchemaOnly() {
// Assert that insert statement doesn't exist for schema only table.
$output = $command_tester->getDisplay();
- $this->assertContains("createTable('router", $output, 'Table router found');
- $this->assertNotContains("insert('router", $output, 'Insert not found');
- $this->assertNotContains("'name' => 'test", $output, 'Insert name field not found');
- $this->assertNotContains("'path' => 'test", $output, 'Insert path field not found');
- $this->assertNotContains("'pattern_outline' => 'test", $output, 'Insert pattern_outline field not found');
+ $this->assertStringContainsString("createTable('router", $output, 'Table router found');
+ $this->assertStringNotContainsString("insert('router", $output, 'Insert not found');
+ $this->assertStringNotContainsString("'name' => 'test", $output, 'Insert name field not found');
+ $this->assertStringNotContainsString("'path' => 'test", $output, 'Insert path field not found');
+ $this->assertStringNotContainsString("'pattern_outline' => 'test", $output, 'Insert pattern_outline field not found');
// Assert that insert statement doesn't exist for wildcard schema only match.
$command_tester->execute(['--schema-only' => 'route.*']);
$output = $command_tester->getDisplay();
- $this->assertContains("createTable('router", $output, 'Table router found');
- $this->assertNotContains("insert('router", $output, 'Insert not found');
- $this->assertNotContains("'name' => 'test", $output, 'Insert name field not found');
- $this->assertNotContains("'path' => 'test", $output, 'Insert path field not found');
- $this->assertNotContains("'pattern_outline' => 'test", $output, 'Insert pattern_outline field not found');
+ $this->assertStringContainsString("createTable('router", $output, 'Table router found');
+ $this->assertStringNotContainsString("insert('router", $output, 'Insert not found');
+ $this->assertStringNotContainsString("'name' => 'test", $output, 'Insert name field not found');
+ $this->assertStringNotContainsString("'path' => 'test", $output, 'Insert path field not found');
+ $this->assertStringNotContainsString("'pattern_outline' => 'test", $output, 'Insert pattern_outline field not found');
}
}
diff --git a/core/modules/text/tests/src/Functional/TextFieldTest.php b/core/modules/text/tests/src/Functional/TextFieldTest.php
index 3eba8c7e574b..f273b3d2171c 100644
--- a/core/modules/text/tests/src/Functional/TextFieldTest.php
+++ b/core/modules/text/tests/src/Functional/TextFieldTest.php
@@ -214,8 +214,8 @@ public function _testTextfieldWidgetsFormatted($field_type, $widget_type) {
$display = $display_repository->getViewDisplay($entity->getEntityTypeId(), $entity->bundle(), 'full');
$content = $display->build($entity);
$rendered_entity = \Drupal::service('renderer')->renderRoot($content);
- $this->assertNotContains($value, (string) $rendered_entity);
- $this->assertContains(Html::escape($value), (string) $rendered_entity);
+ $this->assertStringNotContainsString($value, (string) $rendered_entity);
+ $this->assertStringContainsString(Html::escape($value), (string) $rendered_entity);
// Create a new text format that does not escape HTML, and grant the user
// access to it.
@@ -253,7 +253,7 @@ public function _testTextfieldWidgetsFormatted($field_type, $widget_type) {
$display = $display_repository->getViewDisplay($entity->getEntityTypeId(), $entity->bundle(), 'full');
$content = $display->build($entity);
$rendered_entity = \Drupal::service('renderer')->renderRoot($content);
- $this->assertContains($value, (string) $rendered_entity);
+ $this->assertStringContainsString($value, (string) $rendered_entity);
}
}
diff --git a/core/modules/update/tests/src/Functional/UpdateContribTest.php b/core/modules/update/tests/src/Functional/UpdateContribTest.php
index 0fff16789608..8bb27e471503 100644
--- a/core/modules/update/tests/src/Functional/UpdateContribTest.php
+++ b/core/modules/update/tests/src/Functional/UpdateContribTest.php
@@ -847,7 +847,7 @@ protected function assertCoreCompatibilityMessage($version, $expected_range, $ex
$update_element = $this->findUpdateElementByLabel($expected_release_title);
$this->assertTrue($update_element->hasLink($version));
$compatibility_details = $update_element->find('css', '.project-update__compatibility-details details');
- $this->assertContains("Requires Drupal core: $expected_range", $compatibility_details->getText());
+ $this->assertStringContainsString("Requires Drupal core: $expected_range", $compatibility_details->getText());
$details_summary_element = $compatibility_details->find('css', 'summary');
if ($is_compatible) {
$download_version = str_replace('.', '-', $version);
diff --git a/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php b/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
index 3fcc13a044e5..bf8aa316a1ca 100644
--- a/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
@@ -166,9 +166,9 @@ public function testArgumentDefaultNode() {
$this->drupalPlaceBlock("views_block:test_argument_default_node-block_1", ['id' => $id]);
$xpath = '//*[@id="block-' . $id . '"]';
$this->drupalGet('node/' . $node1->id());
- $this->assertContains($node1->getTitle(), $this->xpath($xpath)[0]->getText());
+ $this->assertStringContainsString($node1->getTitle(), $this->xpath($xpath)[0]->getText());
$this->drupalGet('node/' . $node2->id());
- $this->assertContains($node2->getTitle(), $this->xpath($xpath)[0]->getText());
+ $this->assertStringContainsString($node2->getTitle(), $this->xpath($xpath)[0]->getText());
}
/**
diff --git a/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php b/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php
index aaaeb50b9536..58b29eebc230 100644
--- a/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php
@@ -95,7 +95,7 @@ public function testFeedOutput() {
$this->drupalPlaceBlock('views_block:test_display_feed-test');
$this->drupalGet('<front>');
$feed_icon = $this->cssSelect('div.view-id-test_display_feed a.feed-icon');
- $this->assertContains('test-feed-display.xml', $feed_icon[0]->getAttribute('href'), 'The feed icon was found.');
+ $this->assertStringContainsString('test-feed-display.xml', $feed_icon[0]->getAttribute('href'), 'The feed icon was found.');
// Test feed display attached to page display with arguments.
$this->drupalGet('test-feed-icon/' . $node->id());
@@ -131,7 +131,7 @@ public function testFeedFieldOutput() {
$this->createPathAlias('/node/' . $node->id(), '/the-article-alias');
$node_link = $node->toUrl()->setAbsolute()->toString();
- $this->assertContains('/the-article-alias', $node_link);
+ $this->assertStringContainsString('/the-article-alias', $node_link);
$this->drupalGet('test-feed-display-fields.xml');
$this->assertEquals($node_title, $this->getSession()->getDriver()->getText('//item/title'));
@@ -167,7 +167,7 @@ public function testDisabledFeed() {
$this->drupalGet('/test-attached-disabled');
$feed_header = $this->xpath('//link[@rel="alternate"]');
$this->assertEqual($feed_header[0]->getAttribute('type'), 'application/rss+xml', 'The feed link has the type application/rss+xml.');
- $this->assertContains('test-attached-disabled.xml', $feed_header[0]->getAttribute('href'), 'Page display contains the correct feed URL.');
+ $this->assertStringContainsString('test-attached-disabled.xml', $feed_header[0]->getAttribute('href'), 'Page display contains the correct feed URL.');
// Disable the feed display.
$view->displayHandlers->get('feed_1')->setOption('enabled', FALSE);
diff --git a/core/modules/views/tests/src/FunctionalJavascript/BlockExposedFilterAJAXTest.php b/core/modules/views/tests/src/FunctionalJavascript/BlockExposedFilterAJAXTest.php
index e2000b3f9733..d59b3f31be69 100644
--- a/core/modules/views/tests/src/FunctionalJavascript/BlockExposedFilterAJAXTest.php
+++ b/core/modules/views/tests/src/FunctionalJavascript/BlockExposedFilterAJAXTest.php
@@ -58,9 +58,9 @@ public function testExposedFilteringAndReset() {
// Ensure that the Content we're testing for is present.
$html = $page->getHtml();
- $this->assertContains('Page A', $html);
- $this->assertContains('Page B', $html);
- $this->assertContains('Article A', $html);
+ $this->assertStringContainsString('Page A', $html);
+ $this->assertStringContainsString('Page B', $html);
+ $this->assertStringContainsString('Article A', $html);
// Filter by page type.
$this->submitForm(['type' => 'page'], t('Apply'));
@@ -68,18 +68,18 @@ public function testExposedFilteringAndReset() {
// Verify that only the page nodes are present.
$html = $page->getHtml();
- $this->assertContains('Page A', $html);
- $this->assertContains('Page B', $html);
- $this->assertNotContains('Article A', $html);
+ $this->assertStringContainsString('Page A', $html);
+ $this->assertStringContainsString('Page B', $html);
+ $this->assertStringNotContainsString('Article A', $html);
// Reset the form.
$this->submitForm([], t('Reset'));
// Assert we are still on the node page.
$html = $page->getHtml();
// Repeat the original tests.
- $this->assertContains('Page A', $html);
- $this->assertContains('Page B', $html);
- $this->assertContains('Article A', $html);
+ $this->assertStringContainsString('Page A', $html);
+ $this->assertStringContainsString('Page B', $html);
+ $this->assertStringContainsString('Article A', $html);
$this->assertSession()->addressEquals('node/' . $node->id());
$block->delete();
diff --git a/core/modules/views/tests/src/FunctionalJavascript/ClickSortingAJAXTest.php b/core/modules/views/tests/src/FunctionalJavascript/ClickSortingAJAXTest.php
index 19c48a7093c2..53c88c7c2e1d 100644
--- a/core/modules/views/tests/src/FunctionalJavascript/ClickSortingAJAXTest.php
+++ b/core/modules/views/tests/src/FunctionalJavascript/ClickSortingAJAXTest.php
@@ -67,16 +67,16 @@ public function testClickSorting() {
/** @var \Behat\Mink\Element\NodeElement[] $rows */
$rows = $page->findAll('css', 'tbody tr');
$this->assertCount(2, $rows);
- $this->assertContains('Page B', $rows[0]->getHtml());
- $this->assertContains('Page A', $rows[1]->getHtml());
+ $this->assertStringContainsString('Page B', $rows[0]->getHtml());
+ $this->assertStringContainsString('Page A', $rows[1]->getHtml());
// Now sort by title and check if the order changed.
$page->clickLink('Title');
$session_assert->assertWaitOnAjaxRequest();
$rows = $page->findAll('css', 'tbody tr');
$this->assertCount(2, $rows);
- $this->assertContains('Page A', $rows[0]->getHtml());
- $this->assertContains('Page B', $rows[1]->getHtml());
+ $this->assertStringContainsString('Page A', $rows[0]->getHtml());
+ $this->assertStringContainsString('Page B', $rows[1]->getHtml());
}
}
diff --git a/core/modules/views/tests/src/FunctionalJavascript/ExposedFilterAJAXTest.php b/core/modules/views/tests/src/FunctionalJavascript/ExposedFilterAJAXTest.php
index 0fa130156bb6..2e2515f38d69 100644
--- a/core/modules/views/tests/src/FunctionalJavascript/ExposedFilterAJAXTest.php
+++ b/core/modules/views/tests/src/FunctionalJavascript/ExposedFilterAJAXTest.php
@@ -63,8 +63,8 @@ public function testExposedFiltering() {
// Ensure that the Content we're testing for is present.
$html = $session->getPage()->getHtml();
- $this->assertContains('Page One', $html);
- $this->assertContains('Page Two', $html);
+ $this->assertStringContainsString('Page One', $html);
+ $this->assertStringContainsString('Page Two', $html);
// Search for "Page One".
$this->submitForm(['title' => 'Page One'], t('Filter'));
@@ -72,8 +72,8 @@ public function testExposedFiltering() {
// Verify that only the "Page One" Node is present.
$html = $session->getPage()->getHtml();
- $this->assertContains('Page One', $html);
- $this->assertNotContains('Page Two', $html);
+ $this->assertStringContainsString('Page One', $html);
+ $this->assertStringNotContainsString('Page Two', $html);
// Search for "Page Two".
$this->submitForm(['title' => 'Page Two'], t('Filter'));
@@ -81,8 +81,8 @@ public function testExposedFiltering() {
// Verify that only the "Page Two" Node is present.
$html = $session->getPage()->getHtml();
- $this->assertContains('Page Two', $html);
- $this->assertNotContains('Page One', $html);
+ $this->assertStringContainsString('Page Two', $html);
+ $this->assertStringNotContainsString('Page One', $html);
// Submit bulk actions form to ensure that the previous AJAX submit does not
// break it.
@@ -117,8 +117,8 @@ public function testExposedFiltersInModal() {
$session = $this->getSession();
// Ensure that the Content we're testing for is present.
$html = $session->getPage()->getHtml();
- $this->assertContains('Page One', $html);
- $this->assertContains('Page Two', $html);
+ $this->assertStringContainsString('Page One', $html);
+ $this->assertStringContainsString('Page Two', $html);
// Search for "Page One".
$session->getPage()->fillField('title', 'Page One');
@@ -127,8 +127,8 @@ public function testExposedFiltersInModal() {
// Verify that only the "Page One" Node is present.
$html = $session->getPage()->getHtml();
- $this->assertContains('Page One', $html);
- $this->assertNotContains('Page Two', $html);
+ $this->assertStringContainsString('Page One', $html);
+ $this->assertStringNotContainsString('Page Two', $html);
// Close and re-open the modal.
$assert->buttonExists('Close', $dialog)->press();
@@ -137,8 +137,8 @@ public function testExposedFiltersInModal() {
// Ensure that the Content we're testing for is present.
$html = $session->getPage()->getHtml();
- $this->assertContains('Page One', $html);
- $this->assertContains('Page Two', $html);
+ $this->assertStringContainsString('Page One', $html);
+ $this->assertStringContainsString('Page Two', $html);
// Search for "Page One".
$session->getPage()->fillField('title', 'Page One');
@@ -147,8 +147,8 @@ public function testExposedFiltersInModal() {
// Verify that only the "Page One" Node is present.
$html = $session->getPage()->getHtml();
- $this->assertContains('Page One', $html);
- $this->assertNotContains('Page Two', $html);
+ $this->assertStringContainsString('Page One', $html);
+ $this->assertStringNotContainsString('Page Two', $html);
}
}
diff --git a/core/modules/views/tests/src/FunctionalJavascript/PaginationAJAXTest.php b/core/modules/views/tests/src/FunctionalJavascript/PaginationAJAXTest.php
index 84f6936968e1..87a5c29ee0c9 100644
--- a/core/modules/views/tests/src/FunctionalJavascript/PaginationAJAXTest.php
+++ b/core/modules/views/tests/src/FunctionalJavascript/PaginationAJAXTest.php
@@ -90,13 +90,13 @@ public function testBasicPagination() {
/** @var \Behat\Mink\Element\NodeElement[] $rows */
$rows = $page->findAll('css', 'tbody tr');
$this->assertCount(5, $rows);
- $this->assertContains('Node 1 content', $rows[0]->getHtml());
+ $this->assertStringContainsString('Node 1 content', $rows[0]->getHtml());
$this->clickLink('Go to page 2');
$session_assert->assertWaitOnAjaxRequest();
$rows = $page->findAll('css', 'tbody tr');
$this->assertCount(5, $rows);
- $this->assertContains('Node 6 content', $rows[0]->getHtml());
+ $this->assertStringContainsString('Node 6 content', $rows[0]->getHtml());
$link = $page->findLink('Go to page 3');
// Test that no unwanted parameters are added to the URL.
$this->assertEquals('?status=All&type=All&langcode=All&items_per_page=5&order=changed&sort=asc&title=&page=2', $link->getAttribute('href'));
@@ -106,28 +106,28 @@ public function testBasicPagination() {
$session_assert->assertWaitOnAjaxRequest();
$rows = $page->findAll('css', 'tbody tr');
$this->assertCount(1, $rows);
- $this->assertContains('Node 11 content', $rows[0]->getHtml());
+ $this->assertStringContainsString('Node 11 content', $rows[0]->getHtml());
// Navigate back to the first page.
$this->clickLink('Go to first page');
$session_assert->assertWaitOnAjaxRequest();
$rows = $page->findAll('css', 'tbody tr');
$this->assertCount(5, $rows);
- $this->assertContains('Node 1 content', $rows[0]->getHtml());
+ $this->assertStringContainsString('Node 1 content', $rows[0]->getHtml());
// Navigate using the 'next' link.
$this->clickLink('Go to next page');
$session_assert->assertWaitOnAjaxRequest();
$rows = $page->findAll('css', 'tbody tr');
$this->assertCount(5, $rows);
- $this->assertContains('Node 6 content', $rows[0]->getHtml());
+ $this->assertStringContainsString('Node 6 content', $rows[0]->getHtml());
// Navigate using the 'last' link.
$this->clickLink('Go to last page');
$session_assert->assertWaitOnAjaxRequest();
$rows = $page->findAll('css', 'tbody tr');
$this->assertCount(1, $rows);
- $this->assertContains('Node 11 content', $rows[0]->getHtml());
+ $this->assertStringContainsString('Node 11 content', $rows[0]->getHtml());
// Make sure the AJAX calls don't change the view_path.
$settings = $this->getDrupalSettings();
diff --git a/core/modules/views/tests/src/Kernel/Handler/ComputedFieldTest.php b/core/modules/views/tests/src/Kernel/Handler/ComputedFieldTest.php
index ed00f68a066d..cf8f35049c20 100644
--- a/core/modules/views/tests/src/Kernel/Handler/ComputedFieldTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/ComputedFieldTest.php
@@ -50,7 +50,7 @@ public function testComputedFieldHandler() {
$rendered_view = $view->preview();
$output = $this->container->get('renderer')->renderRoot($rendered_view);
- $this->assertContains('computed string', (string) $output);
+ $this->assertStringContainsString('computed string', (string) $output);
}
}
diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldCustomTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldCustomTest.php
index 8f55e95d5f28..7e502529ff3c 100644
--- a/core/modules/views/tests/src/Kernel/Handler/FieldCustomTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/FieldCustomTest.php
@@ -86,7 +86,7 @@ public function testFieldCustomTokens() {
$output = $renderer->renderRoot($preview);
$expected_text = 'Amount of kittens: ' . $view->style_plugin->getField(0, 'age');
- $this->assertContains($expected_text, (string) $output, 'The views token has been successfully replaced.');
+ $this->assertStringContainsString($expected_text, (string) $output, 'The views token has been successfully replaced.');
}
/**
diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldDropbuttonTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldDropbuttonTest.php
index d764ea511c53..31b736037662 100644
--- a/core/modules/views/tests/src/Kernel/Handler/FieldDropbuttonTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/FieldDropbuttonTest.php
@@ -147,21 +147,21 @@ public function testDropbuttonMarkupShouldNotLeakBetweenRows() {
// The first row should contain edit links to node 3, as the user has
// access.
- $this->assertContains($this->node3->toUrl('edit-form')->toString(), (string) $dropbutton_output[0]);
- $this->assertContains($this->node3->toUrl('delete-form')->toString(), (string) $dropbutton_output[0]);
+ $this->assertStringContainsString($this->node3->toUrl('edit-form')->toString(), (string) $dropbutton_output[0]);
+ $this->assertStringContainsString($this->node3->toUrl('delete-form')->toString(), (string) $dropbutton_output[0]);
// Second row should be not contain links to edit/delete any content as user
// has no edit/delete permissions.
// It most certainly should not contain links to node 3, as node 2 is the
// entity that forms this row.
- $this->assertNotContains($this->node3->toUrl('edit-form')->toString(), (string) $dropbutton_output[1]);
- $this->assertNotContains($this->node3->toUrl('delete-form')->toString(), (string) $dropbutton_output[1]);
- $this->assertNotContains($this->node2->toUrl('edit-form')->toString(), (string) $dropbutton_output[1]);
- $this->assertNotContains($this->node2->toUrl('delete-form')->toString(), (string) $dropbutton_output[1]);
+ $this->assertStringNotContainsString($this->node3->toUrl('edit-form')->toString(), (string) $dropbutton_output[1]);
+ $this->assertStringNotContainsString($this->node3->toUrl('delete-form')->toString(), (string) $dropbutton_output[1]);
+ $this->assertStringNotContainsString($this->node2->toUrl('edit-form')->toString(), (string) $dropbutton_output[1]);
+ $this->assertStringNotContainsString($this->node2->toUrl('delete-form')->toString(), (string) $dropbutton_output[1]);
// Third row should contain links for node 1.
- $this->assertContains($this->node1->toUrl('edit-form')->toString(), (string) $dropbutton_output[2]);
- $this->assertContains($this->node1->toUrl('delete-form')->toString(), (string) $dropbutton_output[2]);
+ $this->assertStringContainsString($this->node1->toUrl('edit-form')->toString(), (string) $dropbutton_output[2]);
+ $this->assertStringContainsString($this->node1->toUrl('delete-form')->toString(), (string) $dropbutton_output[2]);
}
}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/FieldOrLanguageJoinTest.php b/core/modules/views/tests/src/Kernel/Plugin/FieldOrLanguageJoinTest.php
index 1b1982463617..533b102842e1 100644
--- a/core/modules/views/tests/src/Kernel/Plugin/FieldOrLanguageJoinTest.php
+++ b/core/modules/views/tests/src/Kernel/Plugin/FieldOrLanguageJoinTest.php
@@ -98,9 +98,9 @@ public function testBase() {
],
];
$join_info = $this->buildJoin($view, $configuration, 'users3');
- $this->assertContains('views_test_data.uid = users3.uid', $join_info['condition']);
- $this->assertContains('users3.name = :views_join_condition_0', $join_info['condition']);
- $this->assertContains('users3.name <> :views_join_condition_1', $join_info['condition']);
+ $this->assertStringContainsString('views_test_data.uid = users3.uid', $join_info['condition']);
+ $this->assertStringContainsString('users3.name = :views_join_condition_0', $join_info['condition']);
+ $this->assertStringContainsString('users3.name <> :views_join_condition_1', $join_info['condition']);
$this->assertSame(array_values($join_info['arguments']), [$random_name_1, $random_name_2]);
// Test that 'IN' conditions are properly built.
@@ -119,9 +119,9 @@ public function testBase() {
],
];
$join_info = $this->buildJoin($view, $configuration, 'users4');
- $this->assertContains('views_test_data.uid = users4.uid', $join_info['condition']);
- $this->assertContains('users4.name = :views_join_condition_0', $join_info['condition']);
- $this->assertContains('users4.name IN ( :views_join_condition_1[] )', $join_info['condition']);
+ $this->assertStringContainsString('views_test_data.uid = users4.uid', $join_info['condition']);
+ $this->assertStringContainsString('users4.name = :views_join_condition_0', $join_info['condition']);
+ $this->assertStringContainsString('users4.name IN ( :views_join_condition_1[] )', $join_info['condition']);
$this->assertSame($join_info['arguments'][':views_join_condition_1[]'], [$random_name_2, $random_name_3, $random_name_4]);
}
@@ -149,7 +149,7 @@ public function testLanguageBundleConditions() {
],
];
$join_info = $this->buildJoin($view, $configuration, 'node__field_tags');
- $this->assertContains('AND (node__field_tags.langcode = views_test_data.langcode)', $join_info['condition']);
+ $this->assertStringContainsString('AND (node__field_tags.langcode = views_test_data.langcode)', $join_info['condition']);
array_unshift($configuration['extra'], [
'field' => 'deleted',
@@ -157,7 +157,7 @@ public function testLanguageBundleConditions() {
'numeric' => TRUE,
]);
$join_info = $this->buildJoin($view, $configuration, 'node__field_tags');
- $this->assertContains('AND (node__field_tags.langcode = views_test_data.langcode)', $join_info['condition']);
+ $this->assertStringContainsString('AND (node__field_tags.langcode = views_test_data.langcode)', $join_info['condition']);
// Replace the language condition with a bundle condition.
$configuration['extra'][1] = [
@@ -165,7 +165,7 @@ public function testLanguageBundleConditions() {
'value' => ['page'],
];
$join_info = $this->buildJoin($view, $configuration, 'node__field_tags');
- $this->assertContains('AND (node__field_tags.bundle = :views_join_condition_1)', $join_info['condition']);
+ $this->assertStringContainsString('AND (node__field_tags.bundle = :views_join_condition_1)', $join_info['condition']);
// Now re-add a language condition to make sure the bundle and language
// conditions are combined with an OR.
@@ -174,7 +174,7 @@ public function testLanguageBundleConditions() {
'field' => 'langcode',
];
$join_info = $this->buildJoin($view, $configuration, 'node__field_tags');
- $this->assertContains('AND (node__field_tags.bundle = :views_join_condition_1 OR node__field_tags.langcode = views_test_data.langcode)', $join_info['condition']);
+ $this->assertStringContainsString('AND (node__field_tags.bundle = :views_join_condition_1 OR node__field_tags.langcode = views_test_data.langcode)', $join_info['condition']);
}
/**
diff --git a/core/modules/views/tests/src/Kernel/Plugin/RssFieldsTest.php b/core/modules/views/tests/src/Kernel/Plugin/RssFieldsTest.php
index fed34c9bdc15..b45ccee6c63c 100644
--- a/core/modules/views/tests/src/Kernel/Plugin/RssFieldsTest.php
+++ b/core/modules/views/tests/src/Kernel/Plugin/RssFieldsTest.php
@@ -71,7 +71,7 @@ public function testLink() {
$view = Views::getView('test_display_feed');
$output = $view->preview('feed_2');
$output = (string) $renderer->renderRoot($output);
- $this->assertContains('<link>' . $node_url . '</link>', $output);
+ $this->assertStringContainsString('<link>' . $node_url . '</link>', $output);
}
}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/StyleFieldsTest.php b/core/modules/views/tests/src/Kernel/Plugin/StyleFieldsTest.php
index 14fab241ffcf..a6b6fcadda0a 100644
--- a/core/modules/views/tests/src/Kernel/Plugin/StyleFieldsTest.php
+++ b/core/modules/views/tests/src/Kernel/Plugin/StyleFieldsTest.php
@@ -42,7 +42,7 @@ public function testInlineFields() {
$view->initStyle();
$output = $view->preview();
$output = $renderer->renderRoot($output);
- $this->assertContains('<div class="views-row"><span class="views-field views-field-age"><span class="field-content">25</span></span><br /><span class="views-field views-field-id"><span class="field-content">1</span></span><br /><span class="views-field views-field-name"><span class="field-content">John</span></span></div>', (string) $output);
+ $this->assertStringContainsString('<div class="views-row"><span class="views-field views-field-age"><span class="field-content">25</span></span><br /><span class="views-field views-field-id"><span class="field-content">1</span></span><br /><span class="views-field views-field-name"><span class="field-content">John</span></span></div>', (string) $output);
$view->destroy();
// Check that unsafe separators are stripped.
@@ -61,8 +61,8 @@ public function testInlineFields() {
$view->initStyle();
$output = $view->preview();
$output = $renderer->renderRoot($output);
- $this->assertNotContains('<script>', (string) $output);
- $this->assertContains('alert("escape me!")', (string) $output);
+ $this->assertStringNotContainsString('<script>', (string) $output);
+ $this->assertStringContainsString('alert("escape me!")', (string) $output);
}
}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/StyleTest.php b/core/modules/views/tests/src/Kernel/Plugin/StyleTest.php
index ded782b2fbd2..cfc2e38db25d 100644
--- a/core/modules/views/tests/src/Kernel/Plugin/StyleTest.php
+++ b/core/modules/views/tests/src/Kernel/Plugin/StyleTest.php
@@ -49,7 +49,7 @@ public function testStyle() {
$output = $view->preview();
$output = $renderer->renderRoot($output);
- $this->assertContains($random_text, (string) $output);
+ $this->assertStringContainsString($random_text, (string) $output);
// Test without row plugin support.
$view = Views::getView('test_view');
@@ -69,7 +69,7 @@ public function testStyle() {
$view->style_plugin->setOutput($random_text);
$output = $view->preview();
$output = $renderer->renderRoot($output);
- $this->assertContains($random_text, (string) $output);
+ $this->assertStringContainsString($random_text, (string) $output);
}
/**
@@ -258,11 +258,11 @@ public function testCustomRowClasses() {
foreach ($rows as $row) {
$attributes = $row->attributes();
$class = (string) $attributes['class'][0];
- $this->assertContains($random_name, $class);
+ $this->assertStringContainsString($random_name, $class);
// Check token replacement.
$name = $view->field['name']->getValue($view->result[$count]);
- $this->assertContains("test-token-$name", $class);
+ $this->assertStringContainsString("test-token-$name", $class);
$count++;
}
diff --git a/core/modules/views/tests/src/Kernel/QueryGroupByTest.php b/core/modules/views/tests/src/Kernel/QueryGroupByTest.php
index c4805a890b4a..4e198370ee90 100644
--- a/core/modules/views/tests/src/Kernel/QueryGroupByTest.php
+++ b/core/modules/views/tests/src/Kernel/QueryGroupByTest.php
@@ -187,8 +187,8 @@ public function testGroupByCountOnlyFilters() {
$view = Views::getView('test_group_by_in_filters');
$this->executeView($view);
- $this->assertContains('GROUP BY', (string) $view->build_info['query'], 'Make sure that GROUP BY is in the query');
- $this->assertContains('HAVING', (string) $view->build_info['query'], 'Make sure that HAVING is in the query');
+ $this->assertStringContainsString('GROUP BY', (string) $view->build_info['query'], 'Make sure that GROUP BY is in the query');
+ $this->assertStringContainsString('HAVING', (string) $view->build_info['query'], 'Make sure that HAVING is in the query');
}
/**
@@ -204,7 +204,7 @@ public function testGroupByBaseField() {
$view->displayHandlers->get('default')->options['fields']['name']['group_type'] = 'min';
unset($view->displayHandlers->get('default')->options['fields']['id']['group_type']);
$this->executeView($view);
- $this->assertContains('GROUP BY entity_test.id', (string) $view->build_info['query'], 'GROUP BY field includes the base table name when grouping on the base field.');
+ $this->assertStringContainsString('GROUP BY entity_test.id', (string) $view->build_info['query'], 'GROUP BY field includes the base table name when grouping on the base field.');
}
/**
diff --git a/core/modules/views/tests/src/Kernel/RenderCacheIntegrationTest.php b/core/modules/views/tests/src/Kernel/RenderCacheIntegrationTest.php
index 3102bdd8d361..e0ddb3c132d0 100644
--- a/core/modules/views/tests/src/Kernel/RenderCacheIntegrationTest.php
+++ b/core/modules/views/tests/src/Kernel/RenderCacheIntegrationTest.php
@@ -145,7 +145,7 @@ protected function assertCacheTagsForFieldBasedView($do_assert_views_caches) {
// @todo Static render arrays don't support different pages yet, see
// https://www.drupal.org/node/2500701.
// $this->assertViewsCacheTagsFromStaticRenderArray($view, $tags_page_2, $do_assert_views_caches);
- $this->assertContains($random_name, (string) $build['#markup']);
+ $this->assertStringContainsString($random_name, (string) $build['#markup']);
$view->destroy();
$this->pass('Page 1');
@@ -155,7 +155,7 @@ protected function assertCacheTagsForFieldBasedView($do_assert_views_caches) {
$entities[1]->save();
$build = $this->assertViewsCacheTags($view, $tags_page_1, $do_assert_views_caches, $tags_page_1);
$this->assertViewsCacheTagsFromStaticRenderArray($view, $tags_page_1, $do_assert_views_caches);
- $this->assertContains($random_name, (string) $build['#markup']);
+ $this->assertStringContainsString($random_name, (string) $build['#markup']);
$view->destroy();
// Setup arguments to ensure that render caching also varies by them.
diff --git a/core/modules/views/tests/src/Kernel/ViewsPreprocessTest.php b/core/modules/views/tests/src/Kernel/ViewsPreprocessTest.php
index f66be0ad2e45..1f6b4b954bf6 100644
--- a/core/modules/views/tests/src/Kernel/ViewsPreprocessTest.php
+++ b/core/modules/views/tests/src/Kernel/ViewsPreprocessTest.php
@@ -46,15 +46,15 @@ public function testCssClassCleaning() {
$view = Views::getview('test_preprocess');
$build = $view->buildRenderable();
$renderer->renderRoot($build);
- $this->assertContains('class="entity-test--default entity-test__default', (string) $build['#markup']);
+ $this->assertStringContainsString('class="entity-test--default entity-test__default', (string) $build['#markup']);
$view->destroy();
$view->setDisplay('display_2');
$build = $view->buildRenderable();
$renderer->renderRoot($build);
$markup = (string) $build['#markup'];
- $this->assertContains('css_class: entity-test--default and-another-class entity-test__default', $markup);
- $this->assertContains('attributes: class="entity-test--default and-another-class entity-test__default', $markup);
+ $this->assertStringContainsString('css_class: entity-test--default and-another-class entity-test__default', $markup);
+ $this->assertStringContainsString('attributes: class="entity-test--default and-another-class entity-test__default', $markup);
}
}
diff --git a/core/modules/views/tests/src/Kernel/ViewsTemplateTest.php b/core/modules/views/tests/src/Kernel/ViewsTemplateTest.php
index cca9edfd809a..0a4324ab0bbd 100644
--- a/core/modules/views/tests/src/Kernel/ViewsTemplateTest.php
+++ b/core/modules/views/tests/src/Kernel/ViewsTemplateTest.php
@@ -27,7 +27,7 @@ public function testTemplate() {
$renderer = $this->container->get('renderer');
// Check that the renderd output uses the correct template file.
- $this->assertContains('This module defines its own display template.', (string) $renderer->renderRoot($output));
+ $this->assertStringContainsString('This module defines its own display template.', (string) $renderer->renderRoot($output));
}
}
diff --git a/core/modules/views_ui/tests/src/Functional/CustomBooleanTest.php b/core/modules/views_ui/tests/src/Functional/CustomBooleanTest.php
index 77d2e0b35eef..cd3c36e2410e 100644
--- a/core/modules/views_ui/tests/src/Functional/CustomBooleanTest.php
+++ b/core/modules/views_ui/tests/src/Functional/CustomBooleanTest.php
@@ -73,17 +73,17 @@ public function testCustomOption() {
'plain' => [
'true' => $custom_true,
'false' => $custom_false,
- 'test' => 'assertContains',
+ 'test' => 'assertStringContainsString',
],
'allowed tag' => [
'true' => '<p>' . $custom_true . '</p>',
'false' => '<p>' . $custom_false . '</p>',
- 'test' => 'assertContains',
+ 'test' => 'assertStringContainsString',
],
'disallowed tag' => [
'true' => '<script>' . $custom_true . '</script>',
'false' => '<script>' . $custom_false . '</script>',
- 'test' => 'assertNotContains',
+ 'test' => 'assertStringNotContainsString',
],
];
@@ -145,17 +145,17 @@ public function testCustomOptionTemplate() {
'plain' => [
'true' => $custom_true,
'false' => $custom_false,
- 'test' => 'assertContains',
+ 'test' => 'assertStringContainsString',
],
'allowed tag' => [
'true' => '<p>' . $custom_true . '</p>',
'false' => '<p>' . $custom_false . '</p>',
- 'test' => 'assertContains',
+ 'test' => 'assertStringContainsString',
],
'disallowed tag' => [
'true' => '<script>' . $custom_true . '</script>',
'false' => '<script>' . $custom_false . '</script>',
- 'test' => 'assertNotContains',
+ 'test' => 'assertStringNotContainsString',
],
];
@@ -178,7 +178,7 @@ public function testCustomOptionTemplate() {
$this->{$values['test']}($values['false'], (string) $output, new FormattableMarkup('Expected custom boolean FALSE value %value in output for %type', ['%value' => $values['false'], '%type' => $type]));
// Assert that we are using the correct template.
- $this->assertContains('llama', (string) $output);
+ $this->assertStringContainsString('llama', (string) $output);
}
}
diff --git a/core/modules/views_ui/tests/src/Functional/HandlerTest.php b/core/modules/views_ui/tests/src/Functional/HandlerTest.php
index 557a9920274a..d6bf934ab599 100644
--- a/core/modules/views_ui/tests/src/Functional/HandlerTest.php
+++ b/core/modules/views_ui/tests/src/Functional/HandlerTest.php
@@ -219,7 +219,7 @@ public function testBrokenHandlers() {
$this->drupalGet($href);
$result = $this->xpath('//h1[@class="page-title"]');
- $this->assertContains($text, $result[0]->getText(), 'Ensure the broken handler text was found.');
+ $this->assertStringContainsString($text, $result[0]->getText(), 'Ensure the broken handler text was found.');
$original_configuration = [
'field' => 'id_broken',
diff --git a/core/modules/views_ui/tests/src/Functional/PreviewTest.php b/core/modules/views_ui/tests/src/Functional/PreviewTest.php
index b913d7b75808..22c9b0bec5e7 100644
--- a/core/modules/views_ui/tests/src/Functional/PreviewTest.php
+++ b/core/modules/views_ui/tests/src/Functional/PreviewTest.php
@@ -87,7 +87,7 @@ public function testPreviewUI() {
$this->clickLink(t('Feed'));
$this->drupalPostForm(NULL, [], t('Update preview'));
$result = $this->xpath('//div[@id="views-live-preview"]/pre');
- $this->assertContains('<title>' . $view['page[title]'] . '</title>', $result[0]->getText(), 'The Feed RSS preview was rendered.');
+ $this->assertStringContainsString('<title>' . $view['page[title]'] . '</title>', $result[0]->getText(), 'The Feed RSS preview was rendered.');
// Test the non-default UI display options.
// Statistics only, no query.
diff --git a/core/modules/views_ui/tests/src/Functional/ViewEditTest.php b/core/modules/views_ui/tests/src/Functional/ViewEditTest.php
index 82eec0b60d3c..2792feaca3f1 100644
--- a/core/modules/views_ui/tests/src/Functional/ViewEditTest.php
+++ b/core/modules/views_ui/tests/src/Functional/ViewEditTest.php
@@ -85,7 +85,7 @@ public function testOtherOptions() {
$this->fail('Expected error, when setDisplay() called with invalid display ID');
}
catch (\Exception $e) {
- $this->assertContains('setDisplay() called with invalid display ID "fake_display_name".', $e->getMessage());
+ $this->assertStringContainsString('setDisplay() called with invalid display ID "fake_display_name".', $e->getMessage());
}
$edit = ['display_id' => 'test 1'];
diff --git a/core/profiles/demo_umami/modules/demo_umami_content/tests/src/Functional/UninstallDefaultContentTest.php b/core/profiles/demo_umami/modules/demo_umami_content/tests/src/Functional/UninstallDefaultContentTest.php
index 9f2f50f6d9e0..3b97c5c33c29 100644
--- a/core/profiles/demo_umami/modules/demo_umami_content/tests/src/Functional/UninstallDefaultContentTest.php
+++ b/core/profiles/demo_umami/modules/demo_umami_content/tests/src/Functional/UninstallDefaultContentTest.php
@@ -90,7 +90,7 @@ protected function assertRecipesImported(EntityStorageInterface $node_storage) {
$nodes = $node_storage->loadByProperties(['title' => 'Gluten free pizza']);
$this->assertCount(1, $nodes);
$node = reset($nodes);
- $this->assertContains('Mix some of the milk and water in a jug', $node->field_recipe_instruction->value);
+ $this->assertStringContainsString('Mix some of the milk and water in a jug', $node->field_recipe_instruction->value);
}
/**
@@ -108,7 +108,7 @@ protected function assertArticlesImported(EntityStorageInterface $node_storage)
$nodes = $node_storage->loadByProperties(['title' => 'The umami guide to our favorite mushrooms']);
$this->assertCount(1, $nodes);
$node = reset($nodes);
- $this->assertContains('One of the best things about mushrooms is their versatility', $node->body->value);
+ $this->assertStringContainsString('One of the best things about mushrooms is their versatility', $node->body->value);
}
/**
diff --git a/core/tests/Drupal/BuildTests/Framework/BuildTestBase.php b/core/tests/Drupal/BuildTests/Framework/BuildTestBase.php
index 984c363c9f25..cddc6d58274e 100644
--- a/core/tests/Drupal/BuildTests/Framework/BuildTestBase.php
+++ b/core/tests/Drupal/BuildTests/Framework/BuildTestBase.php
@@ -268,7 +268,7 @@ public function getWorkspaceDirectory() {
* Text we expect to find in the error output of the command.
*/
public function assertErrorOutputContains($expected) {
- $this->assertContains($expected, $this->commandProcess->getErrorOutput());
+ $this->assertStringContainsString($expected, $this->commandProcess->getErrorOutput());
}
/**
@@ -278,7 +278,7 @@ public function assertErrorOutputContains($expected) {
* Text we expect to find in the output of the command.
*/
public function assertCommandOutputContains($expected) {
- $this->assertContains($expected, $this->commandProcess->getOutput());
+ $this->assertStringContainsString($expected, $this->commandProcess->getOutput());
}
/**
diff --git a/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxTest.php b/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxTest.php
index 87e2f88cd5b3..c8b784d48c11 100644
--- a/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxTest.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxTest.php
@@ -63,7 +63,7 @@ public function testDrupalSettingsCachingRegression() {
$libraries = $session->evaluateScript('drupalSettings.ajaxPageState.libraries');
// Test that the fake library is set.
- $this->assertContains($fake_library, $libraries);
+ $this->assertStringContainsString($fake_library, $libraries);
// Click on the AJAX link.
$this->clickLink('Link 8 (ajax)');
@@ -71,20 +71,20 @@ public function testDrupalSettingsCachingRegression() {
// Test that the fake library is still set after the AJAX call.
$libraries = $session->evaluateScript('drupalSettings.ajaxPageState.libraries');
- $this->assertContains($fake_library, $libraries);
+ $this->assertStringContainsString($fake_library, $libraries);
// Reload the page, this should reset the loaded libraries and remove the
// fake library.
$this->drupalGet('ajax-test/dialog');
$libraries = $session->evaluateScript('drupalSettings.ajaxPageState.libraries');
- $this->assertNotContains($fake_library, $libraries);
+ $this->assertStringNotContainsString($fake_library, $libraries);
// Click on the AJAX link again, and the libraries should still not contain
// the fake library.
$this->clickLink('Link 8 (ajax)');
$assert->assertWaitOnAjaxRequest();
$libraries = $session->evaluateScript('drupalSettings.ajaxPageState.libraries');
- $this->assertNotContains($fake_library, $libraries);
+ $this->assertStringNotContainsString($fake_library, $libraries);
}
/**
diff --git a/core/tests/Drupal/FunctionalJavascriptTests/Ajax/CommandsTest.php b/core/tests/Drupal/FunctionalJavascriptTests/Ajax/CommandsTest.php
index 8dee3fed6963..143c2161be8e 100644
--- a/core/tests/Drupal/FunctionalJavascriptTests/Ajax/CommandsTest.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/Ajax/CommandsTest.php
@@ -151,7 +151,7 @@ protected function assertWaitPageContains($text) {
$page->waitFor(10, function () use ($page, $text) {
return stripos($page->getContent(), $text) !== FALSE;
});
- $this->assertContains($text, $page->getContent());
+ $this->assertStringContainsString($text, $page->getContent());
}
}
diff --git a/core/tests/Drupal/FunctionalJavascriptTests/Ajax/DialogTest.php b/core/tests/Drupal/FunctionalJavascriptTests/Ajax/DialogTest.php
index e6f7c666e10b..3ea9d7aea030 100644
--- a/core/tests/Drupal/FunctionalJavascriptTests/Ajax/DialogTest.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/Ajax/DialogTest.php
@@ -72,7 +72,7 @@ public function testDialog() {
$dialog = $this->assertSession()->waitForElementVisible('css', 'div.ui-dialog');
$this->assertNotNull($dialog, 'Link was used to open a dialog ( non-modal, with options )');
$style = $dialog->getAttribute('style');
- $this->assertContains('width: 400px;', $style, new FormattableMarkup('Modal respected the dialog-options width parameter. Style = style', ['%style' => $style]));
+ $this->assertStringContainsString('width: 400px;', $style, new FormattableMarkup('Modal respected the dialog-options width parameter. Style = style', ['%style' => $style]));
// Reset: Return to the dialog links page.
$this->drupalGet('ajax-test/dialog');
diff --git a/core/tests/Drupal/FunctionalJavascriptTests/Ajax/FormValuesTest.php b/core/tests/Drupal/FunctionalJavascriptTests/Ajax/FormValuesTest.php
index 0911bbe1d7e2..ec0ae095a776 100644
--- a/core/tests/Drupal/FunctionalJavascriptTests/Ajax/FormValuesTest.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/Ajax/FormValuesTest.php
@@ -76,7 +76,7 @@ public function testSimpleAjaxFormValue() {
// The select element is enabled as the response is receieved.
$this->assertSession()->waitForElement('css', "select[name=\"$element_name\"]:enabled");
$this->assertTrue(file_exists(DRUPAL_ROOT . '/' . $this->siteDirectory . '/error.log'), 'PHP error.log is not empty.');
- $this->assertContains('"The specified #ajax callback is empty or not callable."', file_get_contents(DRUPAL_ROOT . '/' . $this->siteDirectory . '/error.log'));
+ $this->assertStringContainsString('"The specified #ajax callback is empty or not callable."', file_get_contents(DRUPAL_ROOT . '/' . $this->siteDirectory . '/error.log'));
// The exceptions are expected. Do not interpret them as a test failure.
// Not using File API; a potential error must trigger a PHP warning.
unlink(\Drupal::root() . '/' . $this->siteDirectory . '/error.log');
diff --git a/core/tests/Drupal/FunctionalTests/Bootstrap/UncaughtExceptionTest.php b/core/tests/Drupal/FunctionalTests/Bootstrap/UncaughtExceptionTest.php
index 61a6f2db04d0..7b7fe115182b 100644
--- a/core/tests/Drupal/FunctionalTests/Bootstrap/UncaughtExceptionTest.php
+++ b/core/tests/Drupal/FunctionalTests/Bootstrap/UncaughtExceptionTest.php
@@ -373,14 +373,14 @@ protected function assertResponse($code) {
* {@inheritdoc}
*/
protected function assertText($text) {
- $this->assertContains($text, $this->response);
+ $this->assertStringContainsString($text, $this->response);
}
/**
* {@inheritdoc}
*/
protected function assertNoText($text) {
- $this->assertNotContains($text, $this->response);
+ $this->assertStringNotContainsString($text, $this->response);
}
/**
diff --git a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
index 8bc8a5cb1670..de05572d8da7 100644
--- a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
+++ b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
@@ -47,8 +47,8 @@ public function testGoTo() {
// Check that returned plain text is correct.
$text = $this->getTextContent();
- $this->assertContains('Test page text.', $text);
- $this->assertNotContains('</html>', $text);
+ $this->assertStringContainsString('Test page text.', $text);
+ $this->assertStringNotContainsString('</html>', $text);
// Response includes cache tags that we can assert.
$this->assertSession()->responseHeaderEquals('X-Drupal-Cache-Tags', 'http_response rendered');
@@ -164,13 +164,13 @@ public function testForm() {
public function testClickLink() {
$this->drupalGet('test-page');
$this->clickLink('Visually identical test links');
- $this->assertContains('user/login', $this->getSession()->getCurrentUrl());
+ $this->assertStringContainsString('user/login', $this->getSession()->getCurrentUrl());
$this->drupalGet('test-page');
$this->clickLink('Visually identical test links', 0);
- $this->assertContains('user/login', $this->getSession()->getCurrentUrl());
+ $this->assertStringContainsString('user/login', $this->getSession()->getCurrentUrl());
$this->drupalGet('test-page');
$this->clickLink('Visually identical test links', 1);
- $this->assertContains('user/register', $this->getSession()->getCurrentUrl());
+ $this->assertStringContainsString('user/register', $this->getSession()->getCurrentUrl());
}
public function testError() {
diff --git a/core/tests/Drupal/FunctionalTests/Installer/InstallProfileDependenciesTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallProfileDependenciesTest.php
index 1e397e069ec8..b112840e3dae 100644
--- a/core/tests/Drupal/FunctionalTests/Installer/InstallProfileDependenciesTest.php
+++ b/core/tests/Drupal/FunctionalTests/Installer/InstallProfileDependenciesTest.php
@@ -44,7 +44,7 @@ public function testUninstallingModules() {
$this->fail('Uninstalled dblog module.');
}
catch (ModuleUninstallValidatorException $e) {
- $this->assertContains('The Testing install profile dependencies module is required', $e->getMessage());
+ $this->assertStringContainsString('The Testing install profile dependencies module is required', $e->getMessage());
}
}
diff --git a/core/tests/Drupal/FunctionalTests/Installer/InstallerNonDefaultDatabaseDriverTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerNonDefaultDatabaseDriverTest.php
index 82c73ceff7e9..fd2400a6cabe 100644
--- a/core/tests/Drupal/FunctionalTests/Installer/InstallerNonDefaultDatabaseDriverTest.php
+++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerNonDefaultDatabaseDriverTest.php
@@ -57,9 +57,9 @@ public function testInstalled() {
// Assert that in the settings.php the database connection array has the
// correct values set.
$contents = file_get_contents($this->container->getParameter('app.root') . '/' . $this->siteDirectory . '/settings.php');
- $this->assertContains("'namespace' => 'Drupal\\\\driver_test\\\\Driver\\\\Database\\\\{$this->testDriverName}',", $contents);
- $this->assertContains("'driver' => '{$this->testDriverName}',", $contents);
- $this->assertContains("'autoload' => 'core/modules/system/tests/modules/driver_test/src/Driver/Database/{$this->testDriverName}/',", $contents);
+ $this->assertStringContainsString("'namespace' => 'Drupal\\\\driver_test\\\\Driver\\\\Database\\\\{$this->testDriverName}',", $contents);
+ $this->assertStringContainsString("'driver' => '{$this->testDriverName}',", $contents);
+ $this->assertStringContainsString("'autoload' => 'core/modules/system/tests/modules/driver_test/src/Driver/Database/{$this->testDriverName}/',", $contents);
}
}
diff --git a/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php b/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php
index 5dad7286fb23..0d8f3ba9f8ff 100644
--- a/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php
@@ -418,7 +418,7 @@ public function testLibraryAlter() {
$js = $this->assetResolver->getJsAssets($assets, FALSE)[1];
$js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
$rendered_js = $this->renderer->renderPlain($js_render_array);
- $this->assertContains('core/assets/vendor/jquery-form/jquery.form.min.js', (string) $rendered_js, 'Altered library dependencies are added to the page.');
+ $this->assertStringContainsString('core/assets/vendor/jquery-form/jquery.form.min.js', (string) $rendered_js, 'Altered library dependencies are added to the page.');
}
/**
diff --git a/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php b/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php
index af40cb89cc62..9d809e97eb34 100644
--- a/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php
@@ -59,7 +59,7 @@ public function testVulnerableComment() {
// Check the returned number of rows.
$this->assertCount(4, $records);
// Check that the flattened query contains the sanitised comment string.
- $this->assertContains($expected, $query);
+ $this->assertStringContainsString($expected, $query);
$connection = Database::getConnection();
foreach ($this->makeCommentsProvider() as $test_set) {
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityViewBuilderTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityViewBuilderTest.php
index 5a82ee661208..216c70f8aafd 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityViewBuilderTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityViewBuilderTest.php
@@ -291,7 +291,7 @@ public function testViewField() {
$reference_field = $main_entity->get('reference_field');
$reference_field_array_english = $view_builder->viewField($reference_field, 'full');
$rendered_reference_field_english = $renderer->renderRoot($reference_field_array_english);
- $this->assertContains('Text in English', (string) $rendered_reference_field_english);
+ $this->assertStringContainsString('Text in English', (string) $rendered_reference_field_english);
// Change the default language to Spanish and render the reference
// field again. It should display the contents of the Spanish translation.
@@ -300,7 +300,7 @@ public function testViewField() {
\Drupal::languageManager()->getCurrentLanguage();
$reference_field_array_spanish = $view_builder->viewField($reference_field, 'full');
$rendered_reference_field_spanish = $renderer->renderRoot($reference_field_array_spanish);
- $this->assertContains('Text in Spanish', (string) $rendered_reference_field_spanish);
+ $this->assertStringContainsString('Text in Spanish', (string) $rendered_reference_field_spanish);
}
/**
diff --git a/core/tests/Drupal/KernelTests/Core/File/StreamWrapperTest.php b/core/tests/Drupal/KernelTests/Core/File/StreamWrapperTest.php
index ee438e581610..51aa657c4005 100644
--- a/core/tests/Drupal/KernelTests/Core/File/StreamWrapperTest.php
+++ b/core/tests/Drupal/KernelTests/Core/File/StreamWrapperTest.php
@@ -102,9 +102,9 @@ public function testUriFunctions() {
// TemporaryStream::getExternalUrl() uses Url::fromRoute(), which needs
// route information to work.
$this->container->get('router.builder')->rebuild();
- $this->assertContains('system/temporary?file=test.txt', file_create_url('temporary://test.txt'), 'Temporary external URL correctly built.');
- $this->assertContains(Settings::get('file_public_path') . '/test.txt', file_create_url('public://test.txt'), 'Public external URL correctly built.');
- $this->assertContains('system/files/test.txt', file_create_url('private://test.txt'), 'Private external URL correctly built.');
+ $this->assertStringContainsString('system/temporary?file=test.txt', file_create_url('temporary://test.txt'), 'Temporary external URL correctly built.');
+ $this->assertStringContainsString(Settings::get('file_public_path') . '/test.txt', file_create_url('public://test.txt'), 'Public external URL correctly built.');
+ $this->assertStringContainsString('system/files/test.txt', file_create_url('private://test.txt'), 'Private external URL correctly built.');
}
/**
diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/AssertUtilsTrait.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/AssertUtilsTrait.php
index f4164c7aedb6..96dab849123b 100644
--- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/AssertUtilsTrait.php
+++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/AssertUtilsTrait.php
@@ -23,7 +23,7 @@ trait AssertUtilsTrait {
protected function assertScaffoldedFile($path, $is_link, $contents_contains) {
$this->assertFileExists($path);
$contents = file_get_contents($path);
- $this->assertContains($contents_contains, basename($path) . ': ' . $contents);
+ $this->assertStringContainsString($contents_contains, basename($path) . ': ' . $contents);
$this->assertSame($is_link, is_link($path));
}
@@ -41,7 +41,7 @@ protected function assertScaffoldedFileDoesNotContain($path, $contents_not_conta
return;
}
$contents = file_get_contents($path);
- $this->assertNotContains($contents_not_contains, $contents, basename($path) . ' contains unexpected contents:');
+ $this->assertStringNotContainsString($contents_not_contains, $contents, basename($path) . ' contains unexpected contents:');
}
}
diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php
index c8e18e1b034c..fa22285e5244 100644
--- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php
+++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php
@@ -96,7 +96,7 @@ public function testComposerHooks() {
$this->assertScaffoldedFile($sut . '/sites/default/default.settings.php', FALSE, 'scaffolded from the scaffold-override-fixture');
// Make sure that the appropriate notice informing us that scaffolding
// is allowed was printed.
- $this->assertContains('Package fixtures/scaffold-override-fixture has scaffold operations, and is already allowed in the root-level composer.json file.', $stdout);
+ $this->assertStringContainsString('Package fixtures/scaffold-override-fixture has scaffold operations, and is already allowed in the root-level composer.json file.', $stdout);
// Delete one scaffold file, just for test purposes, then run
// 'composer update' and see if the scaffold file is replaced.
@unlink($sut . '/sites/default/default.settings.php');
@@ -123,7 +123,7 @@ public function testComposerHooks() {
$filesystem->remove($sut);
$stdout = $this->mustExec("composer create-project --repository=packages.json fixtures/drupal-drupal {$sut}", $this->fixturesDir, ['COMPOSER_MIRROR_PATH_REPOS' => 1]);
$this->assertDirectoryExists($sut);
- $this->assertContains('Scaffolding files for fixtures/drupal-drupal', $stdout);
+ $this->assertStringContainsString('Scaffolding files for fixtures/drupal-drupal', $stdout);
$this->assertScaffoldedFile($sut . '/index.php', FALSE, 'Test version of index.php from drupal/core');
$topLevelProjectDir = 'composer-hooks-nothing-allowed-fixture';
$sut = $this->fixturesDir . '/' . $topLevelProjectDir;
@@ -133,7 +133,7 @@ public function testComposerHooks() {
// get a warning, and it does not scaffold.
$stdout = $this->mustExec("composer require --no-ansi --no-interaction fixtures/scaffold-override-fixture:dev-master", $sut);
$this->assertFileNotExists($sut . '/sites/default/default.settings.php');
- $this->assertContains("Not scaffolding files for fixtures/scaffold-override-fixture, because it is not listed in the element 'extra.drupal-scaffold.allowed-packages' in the root-level composer.json file.", $stdout);
+ $this->assertStringContainsString("Not scaffolding files for fixtures/scaffold-override-fixture, because it is not listed in the element 'extra.drupal-scaffold.allowed-packages' in the root-level composer.json file.", $stdout);
}
}
diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldTest.php
index 948dd8aa12fd..fa79329cbf14 100644
--- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldTest.php
+++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldTest.php
@@ -182,7 +182,7 @@ public function testEmptyProject() {
$fixture_name = 'empty-fixture';
$result = $this->scaffoldSut($fixture_name, FALSE, FALSE);
- $this->assertContains('Nothing scaffolded because no packages are allowed in the top-level composer.json file', $result->scaffoldOutput());
+ $this->assertStringContainsString('Nothing scaffolded because no packages are allowed in the top-level composer.json file', $result->scaffoldOutput());
}
/**
@@ -192,7 +192,7 @@ public function testProjectThatScaffoldsEmptyProject() {
$fixture_name = 'project-allowing-empty-fixture';
$is_link = FALSE;
$result = $this->scaffoldSut($fixture_name, FALSE, FALSE);
- $this->assertContains('The allowed package fixtures/empty-fixture does not provide a file mapping for Composer Scaffold', $result->scaffoldOutput());
+ $this->assertStringContainsString('The allowed package fixtures/empty-fixture does not provide a file mapping for Composer Scaffold', $result->scaffoldOutput());
$this->assertCommonDrupalAssetsWereScaffolded($result->docroot(), FALSE);
$this->assertAutoloadFileCorrect($result->docroot());
}
@@ -343,7 +343,7 @@ protected function scaffoldAppendTestValuesToPermute($is_link) {
*/
public function testDrupalDrupalFileWasAppended($fixture_name, $is_link, $scaffold_file_path, $scaffold_file_contents, $scaffoldOutputContains) {
$result = $this->scaffoldSut($fixture_name, $is_link, FALSE);
- $this->assertContains($scaffoldOutputContains, $result->scaffoldOutput());
+ $this->assertStringContainsString($scaffoldOutputContains, $result->scaffoldOutput());
$this->assertScaffoldedFile($result->docroot() . '/' . $scaffold_file_path, FALSE, $scaffold_file_contents);
$this->assertCommonDrupalAssetsWereScaffolded($result->docroot(), $is_link);
@@ -422,7 +422,7 @@ protected function assertAutoloadFileCorrect($docroot, $relocated_docroot = FALS
$expected = "return require __DIR__ . '/../vendor/autoload.php';";
}
- $this->assertContains($expected, $contents);
+ $this->assertStringContainsString($expected, $contents);
}
}
diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldUpgradeTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldUpgradeTest.php
index f062a6b4f6a8..1d98b6cfadf7 100644
--- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldUpgradeTest.php
+++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldUpgradeTest.php
@@ -60,7 +60,7 @@ public function testScaffoldUpgrade() {
// line that disables it.
$this->mustExec("composer config --unset repositories.packagist.org", $sut);
$stdout = $this->mustExec("composer require drupal/core-composer-scaffold:8.8.0 --no-plugins 2>&1", $sut);
- $this->assertContains(" - Installing drupal/core-composer-scaffold (8.8.0):", $stdout);
+ $this->assertStringContainsString(" - Installing drupal/core-composer-scaffold (8.8.0):", $stdout);
// Disable packagist.org and upgrade back to the Scaffold plugin under test.
// This puts the `"packagist.org": false` config line back in composer.json
@@ -73,7 +73,7 @@ public function testScaffoldUpgrade() {
// scaffolding is still working.
unlink("$sut/index.php");
$stdout = $this->mustExec("composer scaffold", $sut);
- $this->assertContains("Scaffolding files for", $stdout);
+ $this->assertStringContainsString("Scaffolding files for", $stdout);
$this->assertFileExists("$sut/index.php");
}
diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/AppendOpTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/AppendOpTest.php
index 706ca674158e..e6f7bd67ece5 100644
--- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/AppendOpTest.php
+++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/AppendOpTest.php
@@ -53,8 +53,8 @@ public function testProcess() {
$this->assertEquals(trim($expected), $contents);
// Confirm that expected output was written to our io fixture.
$output = $fixtures->getOutput();
- $this->assertContains('Prepend to [web-root]/robots.txt from assets/prepend-to-robots.txt', $output);
- $this->assertContains('Append to [web-root]/robots.txt from assets/append-to-robots.txt', $output);
+ $this->assertStringContainsString('Prepend to [web-root]/robots.txt from assets/prepend-to-robots.txt', $output);
+ $this->assertStringContainsString('Append to [web-root]/robots.txt from assets/append-to-robots.txt', $output);
}
}
diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ReplaceOpTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ReplaceOpTest.php
index 0f3d6934f514..cb5d6c7c4bb9 100644
--- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ReplaceOpTest.php
+++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ReplaceOpTest.php
@@ -36,7 +36,7 @@ public function testProcess() {
$this->assertEquals('# Test version of robots.txt from drupal/core.', $contents);
// Confirm that expected output was written to our io fixture.
$output = $fixtures->getOutput();
- $this->assertContains('Copy [web-root]/robots.txt from assets/robots.txt', $output);
+ $this->assertStringContainsString('Copy [web-root]/robots.txt from assets/robots.txt', $output);
}
}
diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/SkipOpTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/SkipOpTest.php
index 77ece82c83d7..ba8313bbce6c 100644
--- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/SkipOpTest.php
+++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/SkipOpTest.php
@@ -32,7 +32,7 @@ public function testProcess() {
$this->assertFileNotExists($destination->fullPath());
// Confirm that expected output was written to our io fixture.
$output = $fixtures->getOutput();
- $this->assertContains('Skip [web-root]/robots.txt: disabled', $output);
+ $this->assertStringContainsString('Skip [web-root]/robots.txt: disabled', $output);
}
}
diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
index c0c67884c1dc..ae3434ba1f52 100644
--- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
@@ -175,8 +175,8 @@ public function testCalculateDependencies() {
// dependencies.
$this->entity->set('dependencies', ['module' => ['node'], 'enforced' => ['module' => 'views']]);
$dependencies = $this->entity->calculateDependencies()->getDependencies();
- $this->assertContains('views', $dependencies['module']);
- $this->assertNotContains('node', $dependencies['module']);
+ $this->assertStringContainsString('views', $dependencies['module']);
+ $this->assertStringNotContainsString('node', $dependencies['module']);
}
/**
diff --git a/core/tests/Drupal/Tests/Core/Test/AssertContentTraitTest.php b/core/tests/Drupal/Tests/Core/Test/AssertContentTraitTest.php
index 70f62245b992..3bc362b328da 100644
--- a/core/tests/Drupal/Tests/Core/Test/AssertContentTraitTest.php
+++ b/core/tests/Drupal/Tests/Core/Test/AssertContentTraitTest.php
@@ -28,9 +28,9 @@ public function testGetTextContent() {
</body>
EOT;
$test->_setRawContent($raw_content);
- $this->assertNotContains('foo', $test->_getTextContent());
- $this->assertNotContains('<body>', $test->_getTextContent());
- $this->assertContains('bar', $test->_getTextContent());
+ $this->assertStringNotContainsString('foo', $test->_getTextContent());
+ $this->assertStringNotContainsString('<body>', $test->_getTextContent());
+ $this->assertStringContainsString('bar', $test->_getTextContent());
}
}
diff --git a/core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php b/core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php
index 2762b8c68d60..4e6e731552fb 100644
--- a/core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php
+++ b/core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php
@@ -58,7 +58,7 @@ public function testInstallWithNonExistingFile() {
$process = new Process($command_line, $this->root);
$process->run();
- $this->assertContains('The file this-class-does-not-exist does not exist.', $process->getErrorOutput());
+ $this->assertStringContainsString('The file this-class-does-not-exist does not exist.', $process->getErrorOutput());
$this->assertSame(1, $process->getExitCode());
$this->assertCount($table_count, $connection->schema()->findTables('%'), 'No additional tables created in the database');
}
@@ -76,7 +76,7 @@ public function testInstallWithFileWithNoClass() {
$process = new Process($command_line, $this->root);
$process->run();
- $this->assertContains('The file core/tests/fixtures/empty_file.php.module does not contain a class', $process->getErrorOutput());
+ $this->assertStringContainsString('The file core/tests/fixtures/empty_file.php.module does not contain a class', $process->getErrorOutput());
$this->assertSame(1, $process->getExitCode());
$this->assertCount($table_count, $connection->schema()->findTables('%'), 'No additional tables created in the database');
}
@@ -96,8 +96,8 @@ public function testInstallWithNonSetupClass() {
$process = new Process($command_line, $this->root, ['COLUMNS' => PHP_INT_MAX]);
$process->run();
- $this->assertContains('The class Drupal\Tests\Scripts\TestSiteApplicationTest contained in', $process->getErrorOutput());
- $this->assertContains('needs to implement \Drupal\TestSite\TestSetupInterface', $process->getErrorOutput());
+ $this->assertStringContainsString('The class Drupal\Tests\Scripts\TestSiteApplicationTest contained in', $process->getErrorOutput());
+ $this->assertStringContainsString('needs to implement \Drupal\TestSite\TestSetupInterface', $process->getErrorOutput());
$this->assertSame(1, $process->getExitCode());
$this->assertCount($table_count, $connection->schema()->findTables('%'), 'No additional tables created in the database');
}
@@ -129,7 +129,7 @@ public function testInstallScript() {
$response = $http_client->send($request);
// Ensure the test_page_test module got installed.
- $this->assertContains('Test page | Drupal', (string) $response->getBody());
+ $this->assertStringContainsString('Test page | Drupal', (string) $response->getBody());
// Ensure that there are files and database tables for the tear down command
// to clean up.
@@ -149,7 +149,7 @@ public function testInstallScript() {
// Set the timeout to a value that allows debugging.
$process->setTimeout(500);
$process->run();
- $this->assertContains('Successfully installed a test site', $process->getOutput());
+ $this->assertStringContainsString('Successfully installed a test site', $process->getOutput());
$this->assertSame(0, $process->getExitCode());
$regex = '/Database prefix\s+([^\s]*)/';
$this->assertRegExp($regex, $process->getOutput());
@@ -168,7 +168,7 @@ public function testInstallScript() {
$process->setTimeout(500);
$process->run();
$this->assertSame(0, $process->getExitCode());
- $this->assertContains("Successfully uninstalled $db_prefix test site", $process->getOutput());
+ $this->assertStringContainsString("Successfully uninstalled $db_prefix test site", $process->getOutput());
// Ensure that all the tables and files for this DB prefix are gone.
$this->assertCount(0, Database::getConnection('default', $key)->schema()->findTables('%'));
@@ -190,7 +190,7 @@ public function testInstallScript() {
$process->setTimeout(500);
$process->run();
$this->assertSame(0, $process->getExitCode());
- $this->assertContains("Successfully uninstalled $other_db_prefix test site", $process->getOutput());
+ $this->assertStringContainsString("Successfully uninstalled $other_db_prefix test site", $process->getOutput());
// Ensure that all the tables and files for this DB prefix are gone.
$this->assertCount(0, Database::getConnection('default', $other_key)->schema()->findTables('%'));
@@ -225,8 +225,8 @@ public function testInstallInDifferentLanguage() {
$response = $http_client->send($request);
// Ensure the test_page_test module got installed.
- $this->assertContains('Test page | Drupal', (string) $response->getBody());
- $this->assertContains('lang="fr"', (string) $response->getBody());
+ $this->assertStringContainsString('Test page | Drupal', (string) $response->getBody());
+ $this->assertStringContainsString('lang="fr"', (string) $response->getBody());
// Now test the tear down process as well.
$command_line = $this->php . ' core/scripts/test-site.php tear-down ' . $db_prefix . ' --db-url "' . getenv('SIMPLETEST_DB') . '"';
@@ -248,7 +248,7 @@ public function testTearDownDbPrefixValidation() {
$process->setTimeout(500);
$process->run();
$this->assertSame(1, $process->getExitCode());
- $this->assertContains('Invalid database prefix: not-a-valid-prefix', $process->getErrorOutput());
+ $this->assertStringContainsString('Invalid database prefix: not-a-valid-prefix', $process->getErrorOutput());
}
/**
@@ -279,7 +279,7 @@ public function testUserLogin() {
$process = new Process($command_line, $this->root);
$process->run();
$this->assertSame(0, $process->getExitCode());
- $this->assertContains('/user/reset/1/', $process->getOutput());
+ $this->assertStringContainsString('/user/reset/1/', $process->getOutput());
$http_client = new Client();
$request = (new Request('GET', getenv('SIMPLETEST_BASE_URL') . trim($process->getOutput())))
@@ -295,7 +295,7 @@ public function testUserLogin() {
$process = new Process($command_line, $this->root);
$process->run();
$this->assertSame(1, $process->getExitCode());
- $this->assertContains('The "uid" argument needs to be an integer, but it is "invalid-uid".', $process->getErrorOutput());
+ $this->assertStringContainsString('The "uid" argument needs to be an integer, but it is "invalid-uid".', $process->getErrorOutput());
// Now tear down the test site.
$command_line = $this->php . ' core/scripts/test-site.php tear-down ' . $db_prefix . ' --db-url "' . getenv('SIMPLETEST_DB') . '"';
@@ -304,7 +304,7 @@ public function testUserLogin() {
$process->setTimeout(500);
$process->run();
$this->assertSame(0, $process->getExitCode());
- $this->assertContains("Successfully uninstalled $db_prefix test site", $process->getOutput());
+ $this->assertStringContainsString("Successfully uninstalled $db_prefix test site", $process->getOutput());
}
/**
diff --git a/core/tests/Drupal/Tests/Traits/PHPUnit8Warnings.php b/core/tests/Drupal/Tests/Traits/PHPUnit8Warnings.php
index c6ca4e8ade1e..8bb61e11730c 100644
--- a/core/tests/Drupal/Tests/Traits/PHPUnit8Warnings.php
+++ b/core/tests/Drupal/Tests/Traits/PHPUnit8Warnings.php
@@ -23,8 +23,6 @@ trait PHPUnit8Warnings {
* @var string[]
*/
private static $ignoredWarnings = [
- 'Using assertContains() with string haystacks is deprecated and will not be supported in PHPUnit 9. Refactor your test to use assertStringContainsString() or assertStringContainsStringIgnoringCase() instead.',
- 'Using assertNotContains() with string haystacks is deprecated and will not be supported in PHPUnit 9. Refactor your test to use assertStringNotContainsString() or assertStringNotContainsStringIgnoringCase() instead.',
'assertArraySubset() is deprecated and will be removed in PHPUnit 9.',
'readAttribute() is deprecated and will be removed in PHPUnit 9.',
'getObjectAttribute() is deprecated and will be removed in PHPUnit 9.',
diff --git a/core/tests/Drupal/Tests/UnitTestCase.php b/core/tests/Drupal/Tests/UnitTestCase.php
index 8f5b85640266..10167a028060 100644
--- a/core/tests/Drupal/Tests/UnitTestCase.php
+++ b/core/tests/Drupal/Tests/UnitTestCase.php
@@ -18,6 +18,7 @@
* @ingroup testing
*/
abstract class UnitTestCase extends TestCase {
+
use PHPUnit8Warnings;
/**
--
GitLab