');
for ($index = 0; $index < 10; $index++) {
if ($index < 5) {
- $this->assertLink($topics[$index], 0, format_string('Forum topic @topic found in the "Active forum topics" block.', array('@topic' => $topics[$index])));
+ $this->assertLink($topics[$index], 0, SafeMarkup::format('Forum topic @topic found in the "Active forum topics" block.', array('@topic' => $topics[$index])));
}
else {
- $this->assertNoText($topics[$index], format_string('Forum topic @topic not found in the "Active forum topics" block.', array('@topic' => $topics[$index])));
+ $this->assertNoText($topics[$index], SafeMarkup::format('Forum topic @topic not found in the "Active forum topics" block.', array('@topic' => $topics[$index])));
}
}
diff --git a/core/modules/forum/src/Tests/ForumTest.php b/core/modules/forum/src/Tests/ForumTest.php
index e75507a..3040b2b 100644
--- a/core/modules/forum/src/Tests/ForumTest.php
+++ b/core/modules/forum/src/Tests/ForumTest.php
@@ -7,6 +7,7 @@
namespace Drupal\forum\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\Entity\EntityFormDisplay;
use Drupal\Core\Entity\Entity\EntityViewDisplay;
use Drupal\Core\Entity\EntityInterface;
@@ -416,7 +417,7 @@ function createForum($type, $parent = 0) {
'Created new @type %term.',
array('%term' => $name, '@type' => t($type))
),
- format_string('@type was created', array('@type' => ucfirst($type)))
+ SafeMarkup::format('@type was created', array('@type' => ucfirst($type)))
);
// Verify forum.
@@ -544,7 +545,7 @@ function createForumTopic($forum, $container = FALSE) {
// Retrieve node object, ensure that the topic was created and in the proper forum.
$node = $this->drupalGetNodeByTitle($title);
- $this->assertTrue($node != NULL, format_string('Node @title was loaded', array('@title' => $title)));
+ $this->assertTrue($node != NULL, SafeMarkup::format('Node @title was loaded', array('@title' => $title)));
$this->assertEqual($node->taxonomy_forums->target_id, $tid, 'Saved forum topic was in the expected forum');
// View forum topic.
diff --git a/core/modules/help/src/Tests/HelpTest.php b/core/modules/help/src/Tests/HelpTest.php
index f76e576..11c65d9 100644
--- a/core/modules/help/src/Tests/HelpTest.php
+++ b/core/modules/help/src/Tests/HelpTest.php
@@ -7,6 +7,7 @@
namespace Drupal\help\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\simpletest\WebTestBase;
/**
@@ -68,7 +69,7 @@ public function testHelp() {
// Make sure links are properly added for modules implementing hook_help().
foreach ($this->getModuleList() as $module => $name) {
- $this->assertLink($name, 0, format_string('Link properly added to @name (admin/help/@module)', array('@module' => $module, '@name' => $name)));
+ $this->assertLink($name, 0, SafeMarkup::format('Link properly added to @name (admin/help/@module)', array('@module' => $module, '@name' => $name)));
}
}
@@ -93,8 +94,8 @@ protected function verifyHelp($response = 200) {
$this->drupalGet('admin/help/' . $module);
$this->assertResponse($response);
if ($response == 200) {
- $this->assertTitle($name . ' | Drupal', format_string('%module title was displayed', array('%module' => $module)));
- $this->assertRaw('' . t($name) . '
', format_string('%module heading was displayed', array('%module' => $module)));
+ $this->assertTitle($name . ' | Drupal', SafeMarkup::format('%module title was displayed', array('%module' => $module)));
+ $this->assertRaw('' . t($name) . '
', SafeMarkup::format('%module heading was displayed', array('%module' => $module)));
}
}
}
diff --git a/core/modules/image/src/Form/ImageEffectFormBase.php b/core/modules/image/src/Form/ImageEffectFormBase.php
index 04516bf..4507374 100644
--- a/core/modules/image/src/Form/ImageEffectFormBase.php
+++ b/core/modules/image/src/Form/ImageEffectFormBase.php
@@ -61,7 +61,7 @@ public function buildForm(array $form, FormStateInterface $form_state, ImageStyl
$this->imageEffect = $this->prepareImageEffect($image_effect);
}
catch (PluginNotFoundException $e) {
- throw new NotFoundHttpException(String::format("Invalid effect id: '@id'.", array('@id' => $image_effect)));
+ throw new NotFoundHttpException(SafeMarkup::format("Invalid effect id: '@id'.", array('@id' => $image_effect)));
}
$request = $this->getRequest();
diff --git a/core/modules/image/src/Tests/ImageAdminStylesTest.php b/core/modules/image/src/Tests/ImageAdminStylesTest.php
index 3486e49..294ff6c 100644
--- a/core/modules/image/src/Tests/ImageAdminStylesTest.php
+++ b/core/modules/image/src/Tests/ImageAdminStylesTest.php
@@ -7,6 +7,7 @@
namespace Drupal\image\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\image\ImageStyleInterface;
use Drupal\node\Entity\Node;
@@ -56,7 +57,7 @@ function testNumericStyleName() {
$this->drupalPostForm('admin/config/media/image-styles/add', $edit, t('Create new style'));
$this->assertRaw(t('Style %name was created.', array('%name' => $style_label)));
$options = image_style_options();
- $this->assertTrue(array_key_exists($style_name, $options), format_string('Array key %key exists.', array('%key' => $style_name)));
+ $this->assertTrue(array_key_exists($style_name, $options), SafeMarkup::format('Array key %key exists.', array('%key' => $style_name)));
}
/**
@@ -148,13 +149,13 @@ function testStyle() {
$uuids[$effect->getPluginId()] = $uuid;
$effect_configuration = $effect->getConfiguration();
foreach ($effect_edits[$effect->getPluginId()] as $field => $value) {
- $this->assertEqual($value, $effect_configuration['data'][$field], String::format('The %field field in the %effect effect has the correct value of %value.', array('%field' => $field, '%effect' => $effect->getPluginId(), '%value' => $value)));
+ $this->assertEqual($value, $effect_configuration['data'][$field], SafeMarkup::format('The %field field in the %effect effect has the correct value of %value.', array('%field' => $field, '%effect' => $effect->getPluginId(), '%value' => $value)));
}
}
// Assert that every effect was saved.
foreach (array_keys($effect_edits) as $effect_name) {
- $this->assertTrue(isset($uuids[$effect_name]), format_string(
+ $this->assertTrue(isset($uuids[$effect_name]), SafeMarkup::format(
'A %effect_name effect was saved with ID %uuid',
array(
'%effect_name' => $effect_name,
@@ -193,7 +194,7 @@ function testStyle() {
// Create an image to make sure it gets flushed after saving.
$image_path = $this->createSampleImage($style);
- $this->assertEqual($this->getImageCount($style), 1, format_string('Image style %style image %file successfully generated.', array('%style' => $style->label(), '%file' => $image_path)));
+ $this->assertEqual($this->getImageCount($style), 1, SafeMarkup::format('Image style %style image %file successfully generated.', array('%style' => $style->label(), '%file' => $image_path)));
$this->drupalPostForm($style_path, $edit, t('Update style'));
@@ -203,12 +204,12 @@ function testStyle() {
// Check that the URL was updated.
$this->drupalGet($style_path);
$this->assertTitle(t('Edit style @name | Drupal', array('@name' => $style_label)));
- $this->assertResponse(200, format_string('Image style %original renamed to %new', array('%original' => $style->id(), '%new' => $style_name)));
+ $this->assertResponse(200, SafeMarkup::format('Image style %original renamed to %new', array('%original' => $style->id(), '%new' => $style_name)));
// Check that the image was flushed after updating the style.
// This is especially important when renaming the style. Make sure that
// the old image directory has been deleted.
- $this->assertEqual($this->getImageCount($style), 0, format_string('Image style %style was flushed after renaming the style and updating the order of effects.', array('%style' => $style->label())));
+ $this->assertEqual($this->getImageCount($style), 0, SafeMarkup::format('Image style %style was flushed after renaming the style and updating the order of effects.', array('%style' => $style->label())));
// Load the style by the new name with the new weights.
$style = entity_load('image_style', $style_name);
@@ -229,7 +230,7 @@ function testStyle() {
// Create an image to make sure it gets flushed after deleting an effect.
$image_path = $this->createSampleImage($style);
- $this->assertEqual($this->getImageCount($style), 1, format_string('Image style %style image %file successfully generated.', array('%style' => $style->label(), '%file' => $image_path)));
+ $this->assertEqual($this->getImageCount($style), 1, SafeMarkup::format('Image style %style image %file successfully generated.', array('%style' => $style->label(), '%file' => $image_path)));
// Delete the 'image_crop' effect from the style.
$this->drupalPostForm($style_path . '/effects/' . $uuids['image_crop'] . '/delete', array(), t('Delete'));
@@ -242,7 +243,7 @@ function testStyle() {
// Refresh the image style information and verify that the effect was
// actually deleted.
$style = entity_load_unchanged('image_style', $style->id());
- $this->assertFalse($style->getEffects()->has($uuids['image_crop']), format_string(
+ $this->assertFalse($style->getEffects()->has($uuids['image_crop']), SafeMarkup::format(
'Effect with ID %uuid no longer found on image style %style',
array(
'%uuid' => $uuids['image_crop'],
@@ -267,9 +268,9 @@ function testStyle() {
// Confirm the style directory has been removed.
$directory = file_default_scheme() . '://styles/' . $style_name;
- $this->assertFalse(is_dir($directory), format_string('Image style %style directory removed on style deletion.', array('%style' => $style->label())));
+ $this->assertFalse(is_dir($directory), SafeMarkup::format('Image style %style directory removed on style deletion.', array('%style' => $style->label())));
- $this->assertFalse(entity_load('image_style', $style_name), format_string('Image style %style successfully deleted.', array('%style' => $style->label())));
+ $this->assertFalse(entity_load('image_style', $style_name), SafeMarkup::format('Image style %style successfully deleted.', array('%style' => $style->label())));
}
@@ -305,7 +306,7 @@ function testStyleReplacement() {
// Test that image is displayed using newly created style.
$this->drupalGet('node/' . $nid);
- $this->assertRaw($style->buildUrl($original_uri), format_string('Image displayed using style @style.', array('@style' => $style_name)));
+ $this->assertRaw($style->buildUrl($original_uri), SafeMarkup::format('Image displayed using style @style.', array('@style' => $style_name)));
// Rename the style and make sure the image field is updated.
$new_style_name = strtolower($this->randomMachineName(10));
@@ -315,7 +316,7 @@ function testStyleReplacement() {
'label' => $new_style_label,
);
$this->drupalPostForm($style_path . $style_name, $edit, t('Update style'));
- $this->assertText(t('Changes to the style have been saved.'), format_string('Style %name was renamed to %new_name.', array('%name' => $style_name, '%new_name' => $new_style_name)));
+ $this->assertText(t('Changes to the style have been saved.'), SafeMarkup::format('Style %name was renamed to %new_name.', array('%name' => $style_name, '%new_name' => $new_style_name)));
$this->drupalGet('node/' . $nid);
// Reload the image style using the new name.
@@ -439,7 +440,7 @@ function testConfigImport() {
// Test that image is displayed using newly created style.
$this->drupalGet('node/' . $nid);
- $this->assertRaw($style->buildUrl($original_uri), format_string('Image displayed using style @style.', array('@style' => $style_name)));
+ $this->assertRaw($style->buildUrl($original_uri), SafeMarkup::format('Image displayed using style @style.', array('@style' => $style_name)));
// Copy config to staging, and delete the image style.
$staging = $this->container->get('config.storage.staging');
diff --git a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
index 6efc84d..004ca84 100644
--- a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
+++ b/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
@@ -6,6 +6,7 @@
*/
namespace Drupal\image\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\file\Entity\File;
@@ -112,7 +113,7 @@ public function testDefaultImages() {
$this->assertFieldByXpath(
'//input[@name="field_storage[settings][default_image][uuid][fids]"]',
$default_images['field']->id(),
- format_string(
+ SafeMarkup::format(
'Article image field default equals expected file ID of @fid.',
array('@fid' => $default_images['field']->id())
)
@@ -122,7 +123,7 @@ public function testDefaultImages() {
$this->assertFieldByXpath(
'//input[@name="field[settings][default_image][uuid][fids]"]',
$default_images['field']->id(),
- format_string(
+ SafeMarkup::format(
'Article image field field default equals expected file ID of @fid.',
array('@fid' => $default_images['field']->id())
)
@@ -133,7 +134,7 @@ public function testDefaultImages() {
$this->assertFieldByXpath(
'//input[@name="field_storage[settings][default_image][uuid][fids]"]',
$default_images['field']->id(),
- format_string(
+ SafeMarkup::format(
'Page image field default equals expected file ID of @fid.',
array('@fid' => $default_images['field']->id())
)
@@ -144,7 +145,7 @@ public function testDefaultImages() {
$this->assertFieldByXpath(
'//input[@name="field[settings][default_image][uuid][fids]"]',
$default_images['field2']->id(),
- format_string(
+ SafeMarkup::format(
'Page image field field default equals expected file ID of @fid.',
array('@fid' => $default_images['field2']->id())
)
@@ -156,7 +157,7 @@ public function testDefaultImages() {
$this->assertEqual(
$article_built[$field_name][0]['#item']->target_id,
$default_images['field']->id(),
- format_string(
+ SafeMarkup::format(
'A new article node without an image has the expected default image file ID of @fid.',
array('@fid' => $default_images['field']->id())
)
@@ -168,7 +169,7 @@ public function testDefaultImages() {
$this->assertEqual(
$page_built[$field_name][0]['#item']->target_id,
$default_images['field2']->id(),
- format_string(
+ SafeMarkup::format(
'A new page node without an image has the expected default image file ID of @fid.',
array('@fid' => $default_images['field2']->id())
)
@@ -185,7 +186,7 @@ public function testDefaultImages() {
$this->assertFieldByXpath(
'//input[@name="field_storage[settings][default_image][uuid][fids]"]',
$default_images['field_new']->id(),
- format_string(
+ SafeMarkup::format(
'Updated image field default equals expected file ID of @fid.',
array('@fid' => $default_images['field_new']->id())
)
@@ -198,7 +199,7 @@ public function testDefaultImages() {
$this->assertEqual(
$article_built[$field_name][0]['#item']->target_id,
$default_images['field']->id(),
- format_string(
+ SafeMarkup::format(
'An existing article node without an image has the expected default image file ID of @fid.',
array('@fid' => $default_images['field']->id())
)
@@ -206,7 +207,7 @@ public function testDefaultImages() {
$this->assertEqual(
$page_built[$field_name][0]['#item']->target_id,
$default_images['field2']->id(),
- format_string(
+ SafeMarkup::format(
'An existing page node without an image has the expected default image file ID of @fid.',
array('@fid' => $default_images['field2']->id())
)
@@ -222,7 +223,7 @@ public function testDefaultImages() {
$this->assertFieldByXpath(
'//input[@name="field[settings][default_image][uuid][fids]"]',
$default_images['field_new']->id(),
- format_string(
+ SafeMarkup::format(
'Updated article image field field default equals expected file ID of @fid.',
array('@fid' => $default_images['field_new']->id())
)
@@ -237,7 +238,7 @@ public function testDefaultImages() {
$this->assertEqual(
$article_built[$field_name][0]['#item']->target_id,
$default_images['field_new']->id(),
- format_string(
+ SafeMarkup::format(
'An existing article node without an image has the expected default image file ID of @fid.',
array('@fid' => $default_images['field_new']->id())
)
@@ -246,7 +247,7 @@ public function testDefaultImages() {
$this->assertEqual(
$page_built[$field_name][0]['#item']->target_id,
$default_images['field2']->id(),
- format_string(
+ SafeMarkup::format(
'An existing page node without an image has the expected default image file ID of @fid.',
array('@fid' => $default_images['field2']->id())
)
@@ -277,7 +278,7 @@ public function testDefaultImages() {
$this->assertEqual(
$article_built[$field_name][0]['#item']->target_id,
$default_images['field_new']->id(),
- format_string(
+ SafeMarkup::format(
'An existing article node without an image has the expected default image file ID of @fid.',
array('@fid' => $default_images['field_new']->id())
)
@@ -286,7 +287,7 @@ public function testDefaultImages() {
$this->assertEqual(
$page_built[$field_name][0]['#item']->target_id,
$default_images['field2']->id(),
- format_string(
+ SafeMarkup::format(
'An existing page node without an image has the expected default image file ID of @fid.',
array('@fid' => $default_images['field2']->id())
)
diff --git a/core/modules/image/src/Tests/ImageFieldDisplayTest.php b/core/modules/image/src/Tests/ImageFieldDisplayTest.php
index 29fbce3..945ec93 100644
--- a/core/modules/image/src/Tests/ImageFieldDisplayTest.php
+++ b/core/modules/image/src/Tests/ImageFieldDisplayTest.php
@@ -7,6 +7,7 @@
namespace Drupal\image\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\user\RoleInterface;
@@ -304,7 +305,7 @@ function testImageFieldSettings() {
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
// Add the required alt text.
$this->drupalPostForm(NULL, [$field_name . '[1][alt]' => $alt], t('Save and keep published'));
- $this->assertText(format_string('Article @title has been updated.', array('@title' => $node->getTitle())));
+ $this->assertText(SafeMarkup::format('Article @title has been updated.', array('@title' => $node->getTitle())));
// Assert ImageWidget::process() calls FieldWidget::process().
$this->drupalGet('node/' . $node->id() . '/edit');
diff --git a/core/modules/image/src/Tests/ImageStyleFlushTest.php b/core/modules/image/src/Tests/ImageStyleFlushTest.php
index 1ebe27b..d419d89 100644
--- a/core/modules/image/src/Tests/ImageStyleFlushTest.php
+++ b/core/modules/image/src/Tests/ImageStyleFlushTest.php
@@ -6,6 +6,7 @@
*/
namespace Drupal\image\Tests;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Tests flushing of image styles.
@@ -85,11 +86,11 @@ function testFlush() {
$image_path = $this->createSampleImage($style, 'public');
// Expecting to find 2 images, one is the sample.png image shown in
// image style preview.
- $this->assertEqual($this->getImageCount($style, 'public'), 2, format_string('Image style %style image %file successfully generated.', array('%style' => $style->label(), '%file' => $image_path)));
+ $this->assertEqual($this->getImageCount($style, 'public'), 2, SafeMarkup::format('Image style %style image %file successfully generated.', array('%style' => $style->label(), '%file' => $image_path)));
// Create an image for the 'private' wrapper.
$image_path = $this->createSampleImage($style, 'private');
- $this->assertEqual($this->getImageCount($style, 'private'), 1, format_string('Image style %style image %file successfully generated.', array('%style' => $style->label(), '%file' => $image_path)));
+ $this->assertEqual($this->getImageCount($style, 'private'), 1, SafeMarkup::format('Image style %style image %file successfully generated.', array('%style' => $style->label(), '%file' => $image_path)));
// Remove the 'image_scale' effect and updates the style, which in turn
// forces an image style flush.
@@ -104,9 +105,9 @@ function testFlush() {
$this->assertResponse(200);
// Post flush, expected 1 image in the 'public' wrapper (sample.png).
- $this->assertEqual($this->getImageCount($style, 'public'), 1, format_string('Image style %style flushed correctly for %wrapper wrapper.', array('%style' => $style->label(), '%wrapper' => 'public')));
+ $this->assertEqual($this->getImageCount($style, 'public'), 1, SafeMarkup::format('Image style %style flushed correctly for %wrapper wrapper.', array('%style' => $style->label(), '%wrapper' => 'public')));
// Post flush, expected no image in the 'private' wrapper.
- $this->assertEqual($this->getImageCount($style, 'private'), 0, format_string('Image style %style flushed correctly for %wrapper wrapper.', array('%style' => $style->label(), '%wrapper' => 'private')));
+ $this->assertEqual($this->getImageCount($style, 'private'), 0, SafeMarkup::format('Image style %style flushed correctly for %wrapper wrapper.', array('%style' => $style->label(), '%wrapper' => 'private')));
}
}
diff --git a/core/modules/language/src/Config/LanguageConfigCollectionNameTrait.php b/core/modules/language/src/Config/LanguageConfigCollectionNameTrait.php
index 6f7b1ad..5e36f74 100644
--- a/core/modules/language/src/Config/LanguageConfigCollectionNameTrait.php
+++ b/core/modules/language/src/Config/LanguageConfigCollectionNameTrait.php
@@ -7,6 +7,7 @@
namespace Drupal\language\Config;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
/**
@@ -45,7 +46,7 @@ protected function createConfigCollectionName($langcode) {
protected function getLangcodeFromCollectionName($collection) {
preg_match('/^language\.(.*)$/', $collection, $matches);
if (!isset($matches[1])) {
- throw new \InvalidArgumentException(String::format('!collection is not a valid language override collection', array('!collection' => $collection)));
+ throw new \InvalidArgumentException(SafeMarkup::format('!collection is not a valid language override collection', array('!collection' => $collection)));
}
return $matches[1];
}
diff --git a/core/modules/language/src/Entity/ContentLanguageSettings.php b/core/modules/language/src/Entity/ContentLanguageSettings.php
index 19ca584..d8da107 100644
--- a/core/modules/language/src/Entity/ContentLanguageSettings.php
+++ b/core/modules/language/src/Entity/ContentLanguageSettings.php
@@ -7,6 +7,7 @@
namespace Drupal\language\Entity;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\EntityStorageInterface;
@@ -200,7 +201,7 @@ public function calculateDependencies() {
// If the target entity type uses entities to manage its bundles then
// depend on the bundle entity.
if (!$bundle_entity = $this->entityManager()->getStorage($bundle_entity_type_id)->load($this->target_bundle)) {
- throw new \LogicException(String::format('Missing bundle entity, entity type %type, entity id %bundle.', array('%type' => $bundle_entity_type_id, '%bundle' => $this->target_bundle)));
+ throw new \LogicException(SafeMarkup::format('Missing bundle entity, entity type %type, entity id %bundle.', array('%type' => $bundle_entity_type_id, '%bundle' => $this->target_bundle)));
}
$this->addDependency('config', $bundle_entity->getConfigDependencyName());
}
diff --git a/core/modules/language/src/Tests/LanguageConfigurationTest.php b/core/modules/language/src/Tests/LanguageConfigurationTest.php
index dc522bc..87e6a16 100644
--- a/core/modules/language/src/Tests/LanguageConfigurationTest.php
+++ b/core/modules/language/src/Tests/LanguageConfigurationTest.php
@@ -7,6 +7,7 @@
namespace Drupal\language\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Language\LanguageInterface;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\simpletest\WebTestBase;
@@ -186,7 +187,7 @@ protected function checkConfigurableLanguageWeight($state = 'by default') {
$replacements = array('@event' => $state);
foreach (\Drupal::languageManager()->getLanguages(LanguageInterface::STATE_LOCKED) as $locked_language) {
$replacements['%language'] = $locked_language->getName();
- $this->assertTrue($locked_language->getWeight() > $max_configurable_language_weight, format_string('System language %language has higher weight than configurable languages @event', $replacements));
+ $this->assertTrue($locked_language->getWeight() > $max_configurable_language_weight, SafeMarkup::format('System language %language has higher weight than configurable languages @event', $replacements));
}
}
diff --git a/core/modules/language/src/Tests/LanguageDependencyInjectionTest.php b/core/modules/language/src/Tests/LanguageDependencyInjectionTest.php
index 1a7a815..ce6b438 100644
--- a/core/modules/language/src/Tests/LanguageDependencyInjectionTest.php
+++ b/core/modules/language/src/Tests/LanguageDependencyInjectionTest.php
@@ -7,6 +7,7 @@
namespace Drupal\language\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Core\Language\Language;
use Drupal\language\Entity\ConfigurableLanguage;
@@ -29,7 +30,7 @@ function testDependencyInjectedNewLanguage() {
$expected = $this->languageManager->getDefaultLanguage();
$result = $this->languageManager->getCurrentLanguage();
foreach ($expected as $property => $value) {
- $this->assertEqual($expected->$property, $result->$property, format_string('The dependency injected language object %prop property equals the new Language object %prop property.', array('%prop' => $property)));
+ $this->assertEqual($expected->$property, $result->$property, SafeMarkup::format('The dependency injected language object %prop property equals the new Language object %prop property.', array('%prop' => $property)));
}
}
diff --git a/core/modules/language/src/Tests/LanguageNegotiationInfoTest.php b/core/modules/language/src/Tests/LanguageNegotiationInfoTest.php
index d96e310..2cc7003 100644
--- a/core/modules/language/src/Tests/LanguageNegotiationInfoTest.php
+++ b/core/modules/language/src/Tests/LanguageNegotiationInfoTest.php
@@ -7,6 +7,7 @@
namespace Drupal\language\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Language\LanguageInterface;
use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUI;
use Drupal\simpletest\WebTestBase;
@@ -117,10 +118,10 @@ function testInfoAlterations() {
foreach ($this->languageManager()->getLanguageTypes() as $type) {
$form_field = $type . '[enabled][test_language_negotiation_method_ts]';
if ($type == $test_type) {
- $this->assertFieldByName($form_field, NULL, format_string('Type-specific test language negotiation method available for %type.', array('%type' => $type)));
+ $this->assertFieldByName($form_field, NULL, SafeMarkup::format('Type-specific test language negotiation method available for %type.', array('%type' => $type)));
}
else {
- $this->assertNoFieldByName($form_field, NULL, format_string('Type-specific test language negotiation method unavailable for %type.', array('%type' => $type)));
+ $this->assertNoFieldByName($form_field, NULL, SafeMarkup::format('Type-specific test language negotiation method unavailable for %type.', array('%type' => $type)));
}
}
@@ -130,7 +131,7 @@ function testInfoAlterations() {
foreach ($this->languageManager()->getDefinedLanguageTypes() as $type) {
$langcode = $last[$type];
$value = $type == LanguageInterface::TYPE_CONTENT || strpos($type, 'test') !== FALSE ? 'it' : 'en';
- $this->assertEqual($langcode, $value, format_string('The negotiated language for %type is %language', array('%type' => $type, '%language' => $value)));
+ $this->assertEqual($langcode, $value, SafeMarkup::format('The negotiated language for %type is %language', array('%type' => $type, '%language' => $value)));
}
// Uninstall language_test and check that everything is set back to the
@@ -140,7 +141,7 @@ function testInfoAlterations() {
// Check that only the core language types are available.
foreach ($this->languageManager()->getDefinedLanguageTypes() as $type) {
- $this->assertTrue(strpos($type, 'test') === FALSE, format_string('The %type language is still available', array('%type' => $type)));
+ $this->assertTrue(strpos($type, 'test') === FALSE, SafeMarkup::format('The %type language is still available', array('%type' => $type)));
}
// Check that fixed language types are properly configured, even those
@@ -170,7 +171,7 @@ protected function checkFixedLanguageTypes() {
list(, $info_id) = each($info['fixed']);
$equal = $info_id == $id;
}
- $this->assertTrue($equal, format_string('language negotiation for %type is properly set up', array('%type' => $type)));
+ $this->assertTrue($equal, SafeMarkup::format('language negotiation for %type is properly set up', array('%type' => $type)));
}
}
}
diff --git a/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php b/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
index f801b6a..116d55c 100644
--- a/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
+++ b/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
@@ -7,6 +7,7 @@
namespace Drupal\language\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Url;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationBrowser;
@@ -467,19 +468,19 @@ function testLanguageDomain() {
$italian_url = Url::fromRoute('system.admin', [], ['language' => $languages['it']])->toString();
$url_scheme = \Drupal::request()->isSecure() ? 'https://' : 'http://';
$correct_link = $url_scheme . $link;
- $this->assertEqual($italian_url, $correct_link, format_string('The right URL (@url) in accordance with the chosen language', array('@url' => $italian_url)));
+ $this->assertEqual($italian_url, $correct_link, SafeMarkup::format('The right URL (@url) in accordance with the chosen language', array('@url' => $italian_url)));
// Test HTTPS via options.
$italian_url = Url::fromRoute('system.admin', [], ['https' => TRUE, 'language' => $languages['it']])->toString();
$correct_link = 'https://' . $link;
- $this->assertTrue($italian_url == $correct_link, format_string('The right HTTPS URL (via options) (@url) in accordance with the chosen language', array('@url' => $italian_url)));
+ $this->assertTrue($italian_url == $correct_link, SafeMarkup::format('The right HTTPS URL (via options) (@url) in accordance with the chosen language', array('@url' => $italian_url)));
// Test HTTPS via current URL scheme.
$request = Request::create('', 'GET', array(), array(), array(), array('HTTPS' => 'on'));
$this->container->get('request_stack')->push($request);
$italian_url = Url::fromRoute('system.admin', [], ['language' => $languages['it']])->toString();
$correct_link = 'https://' . $link;
- $this->assertTrue($italian_url == $correct_link, format_string('The right URL (via current URL scheme) (@url) in accordance with the chosen language', array('@url' => $italian_url)));
+ $this->assertTrue($italian_url == $correct_link, SafeMarkup::format('The right URL (via current URL scheme) (@url) in accordance with the chosen language', array('@url' => $italian_url)));
}
/**
diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc
index 596df97..3da948c 100644
--- a/core/modules/locale/locale.pages.inc
+++ b/core/modules/locale/locale.pages.inc
@@ -61,7 +61,7 @@ function template_preprocess_locale_translation_update_info(array &$variables) {
if ($variables['updates']) {
foreach ($variables['updates'] as $update) {
$modules[] = $update['name'];
- $releases[] = String::format('@module (@date)', array(
+ $releases[] = SafeMarkup::format('@module (@date)', array(
'@module' => $update['name'],
'@date' => format_date($update['timestamp'], 'html_date'),
));
@@ -81,7 +81,7 @@ function template_preprocess_locale_translation_update_info(array &$variables) {
if ($variables['not_found']) {
foreach ($variables['not_found'] as $update) {
$version = $update['version'] ? $update['version'] : t('no version');
- $releases[] = String::format('@module (@version). !info', array(
+ $releases[] = SafeMarkup::format('@module (@version). !info', array(
'@module' => $update['name'],
'@version' => $version,
'!info' => $update['info'],
diff --git a/core/modules/locale/src/StringBase.php b/core/modules/locale/src/StringBase.php
index f6cfffd..6aa987d 100644
--- a/core/modules/locale/src/StringBase.php
+++ b/core/modules/locale/src/StringBase.php
@@ -7,6 +7,7 @@
namespace Drupal\locale;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
/**
@@ -190,7 +191,7 @@ public function save() {
$storage->save($this);
}
else {
- throw new StringStorageException(String::format('The string cannot be saved because its not bound to a storage: @string', array(
+ throw new StringStorageException(SafeMarkup::format('The string cannot be saved because its not bound to a storage: @string', array(
'@string' => $this->getString(),
)));
}
@@ -206,7 +207,7 @@ public function delete() {
$storage->delete($this);
}
else {
- throw new StringStorageException(String::format('The string cannot be deleted because its not bound to a storage: @string', array(
+ throw new StringStorageException(SafeMarkup::format('The string cannot be deleted because its not bound to a storage: @string', array(
'@string' => $this->getString(),
)));
}
diff --git a/core/modules/locale/src/StringDatabaseStorage.php b/core/modules/locale/src/StringDatabaseStorage.php
index d09e5a6..9619075 100644
--- a/core/modules/locale/src/StringDatabaseStorage.php
+++ b/core/modules/locale/src/StringDatabaseStorage.php
@@ -7,6 +7,7 @@
namespace Drupal\locale;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Database\Connection;
/**
@@ -199,7 +200,7 @@ public function delete($string) {
}
}
else {
- throw new StringStorageException(format_string('The string cannot be deleted because it lacks some key fields: @string', array(
+ throw new StringStorageException(SafeMarkup::format('The string cannot be deleted because it lacks some key fields: @string', array(
'@string' => $string->getString(),
)));
}
@@ -483,7 +484,7 @@ protected function dbStringInsert($string) {
->execute();
}
else {
- throw new StringStorageException(format_string('The string cannot be saved: @string', array(
+ throw new StringStorageException(SafeMarkup::format('The string cannot be saved: @string', array(
'@string' => $string->getString(),
)));
}
@@ -516,7 +517,7 @@ protected function dbStringUpdate($string) {
->execute();
}
else {
- throw new StringStorageException(format_string('The string cannot be updated: @string', array(
+ throw new StringStorageException(SafeMarkup::format('The string cannot be updated: @string', array(
'@string' => $string->getString(),
)));
}
diff --git a/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php b/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php
index 35c9a66..69823f2 100644
--- a/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php
+++ b/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php
@@ -7,6 +7,7 @@
namespace Drupal\locale\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\simpletest\WebTestBase;
use Drupal\Core\Language\LanguageInterface;
@@ -324,7 +325,7 @@ public function testConfigPoFile() {
'translation' => 'all',
);
$this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
- $this->assertText($config_string[1], format_string('Translation of @string found.', array('@string' => $config_string[0])));
+ $this->assertText($config_string[1], SafeMarkup::format('Translation of @string found.', array('@string' => $config_string[0])));
}
// Test that translations got recorded in the config system.
diff --git a/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php b/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php
index e8b9412..fcabdc9 100644
--- a/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php
+++ b/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php
@@ -7,6 +7,7 @@
namespace Drupal\locale\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Language\LanguageInterface;
use Drupal\simpletest\WebTestBase;
use Drupal\Component\Utility\String;
@@ -85,10 +86,10 @@ public function testFileParsing() {
$args = array('%source' => $str, '%context' => $context);
// Make sure that the string was found in the file.
- $this->assertTrue(isset($source_strings[$str]), String::format('Found source string: %source', $args));
+ $this->assertTrue(isset($source_strings[$str]), SafeMarkup::format('Found source string: %source', $args));
// Make sure that the proper context was matched.
- $message = $context ? String::format('Context for %source is %context', $args) : String::format('Context for %source is blank', $args);
+ $message = $context ? SafeMarkup::format('Context for %source is %context', $args) : SafeMarkup::format('Context for %source is blank', $args);
$this->assertTrue(isset($source_strings[$str]) && $source_strings[$str] === $context, $message);
}
diff --git a/core/modules/locale/src/Tests/LocaleStringTest.php b/core/modules/locale/src/Tests/LocaleStringTest.php
index 430b024..17ce85a 100644
--- a/core/modules/locale/src/Tests/LocaleStringTest.php
+++ b/core/modules/locale/src/Tests/LocaleStringTest.php
@@ -7,6 +7,7 @@
namespace Drupal\locale\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\simpletest\WebTestBase;
@@ -51,7 +52,7 @@ public function testStringCRUDAPI() {
// Create source string.
$source = $this->buildSourceString();
$source->save();
- $this->assertTrue($source->lid, format_string('Successfully created string %string', array('%string' => $source->source)));
+ $this->assertTrue($source->lid, SafeMarkup::format('Successfully created string %string', array('%string' => $source->source)));
// Load strings by lid and source.
$string1 = $this->storage->findString(array('lid' => $source->lid));
diff --git a/core/modules/locale/src/Tests/LocaleTranslationUiTest.php b/core/modules/locale/src/Tests/LocaleTranslationUiTest.php
index 83a967d..ba498e3 100644
--- a/core/modules/locale/src/Tests/LocaleTranslationUiTest.php
+++ b/core/modules/locale/src/Tests/LocaleTranslationUiTest.php
@@ -7,6 +7,7 @@
namespace Drupal\locale\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\simpletest\WebTestBase;
use Drupal\Core\Language\LanguageInterface;
@@ -251,13 +252,13 @@ public function testJavaScriptTranslation() {
$locale_javascripts = \Drupal::state()->get('locale.translation.javascript') ?: array();
$js_file = 'public://' . $config->get('javascript.directory') . '/' . $langcode . '_' . $locale_javascripts[$langcode] . '.js';
- $this->assertTrue($result = file_exists($js_file), String::format('JavaScript file created: %file', array('%file' => $result ? $js_file : 'not found')));
+ $this->assertTrue($result = file_exists($js_file), SafeMarkup::format('JavaScript file created: %file', array('%file' => $result ? $js_file : 'not found')));
// Test JavaScript translation rebuilding.
file_unmanaged_delete($js_file);
- $this->assertTrue($result = !file_exists($js_file), String::format('JavaScript file deleted: %file', array('%file' => $result ? $js_file : 'found')));
+ $this->assertTrue($result = !file_exists($js_file), SafeMarkup::format('JavaScript file deleted: %file', array('%file' => $result ? $js_file : 'found')));
_locale_rebuild_js($langcode);
- $this->assertTrue($result = file_exists($js_file), String::format('JavaScript file rebuilt: %file', array('%file' => $result ? $js_file : 'not found')));
+ $this->assertTrue($result = file_exists($js_file), SafeMarkup::format('JavaScript file rebuilt: %file', array('%file' => $result ? $js_file : 'not found')));
}
/**
diff --git a/core/modules/locale/src/Tests/LocaleUpdateBase.php b/core/modules/locale/src/Tests/LocaleUpdateBase.php
index 8397221..fd9813a 100644
--- a/core/modules/locale/src/Tests/LocaleUpdateBase.php
+++ b/core/modules/locale/src/Tests/LocaleUpdateBase.php
@@ -7,6 +7,7 @@
namespace Drupal\locale\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\StreamWrapper\PublicStream;
use Drupal\Core\Url;
use Drupal\simpletest\WebTestBase;
@@ -98,7 +99,7 @@ protected function addLanguage($langcode) {
$edit = array('predefined_langcode' => $langcode);
$this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
$this->container->get('language_manager')->reset();
- $this->assertTrue(\Drupal::languageManager()->getLanguage($langcode), String::format('Language %langcode added.', array('%langcode' => $langcode)));
+ $this->assertTrue(\Drupal::languageManager()->getLanguage($langcode), SafeMarkup::format('Language %langcode added.', array('%langcode' => $langcode)));
}
/**
@@ -308,6 +309,6 @@ protected function setCurrentTranslations() {
protected function assertTranslation($source, $translation, $langcode, $message = '') {
$db_translation = db_query('SELECT translation FROM {locales_target} lt INNER JOIN {locales_source} ls ON ls.lid = lt.lid WHERE ls.source = :source AND lt.language = :langcode', array(':source' => $source, ':langcode' => $langcode))->fetchField();
$db_translation = $db_translation == FALSE ? '' : $db_translation;
- $this->assertEqual($translation, $db_translation, $message ? $message : format_string('Correct translation of %source (%language)', array('%source' => $source, '%language' => $langcode)));
+ $this->assertEqual($translation, $db_translation, $message ? $message : SafeMarkup::format('Correct translation of %source (%language)', array('%source' => $source, '%language' => $langcode)));
}
}
diff --git a/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php b/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php
index d26a070..3411be0 100644
--- a/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php
+++ b/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php
@@ -7,6 +7,7 @@
namespace Drupal\locale\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
/**
@@ -87,7 +88,7 @@ public function testInterface() {
$this->assertRaw(t('Missing translations for: @languages. See the Available translation updates page for more information.', array('@languages' => t('German'), '@updates' => \Drupal::url('locale.translate_status'))), 'Missing translations message');
$this->drupalGet('admin/reports/translations');
$this->assertText(t('Missing translations for one project'), 'No translations found');
- $this->assertText(String::format('@module (@version). !info', array('@module' => 'Locale test translate', '@version' => '1.3-dev', '!info' => t('No translation files are provided for development releases.'))), 'Release details');
+ $this->assertText(SafeMarkup::format('@module (@version). !info', array('@module' => 'Locale test translate', '@version' => '1.3-dev', '!info' => t('No translation files are provided for development releases.'))), 'Release details');
$this->assertText(t('No translation files are provided for development releases.'), 'Release info');
// Override Drupal core translation status as 'no translations found'.
@@ -112,7 +113,7 @@ public function testInterface() {
// Check if translations are available for Drupal core.
$this->drupalGet('admin/reports/translations');
$this->assertText(t('Updates for: !project', array('!project' => t('Drupal core'))), 'Translations found');
- $this->assertText(String::format('@module (@date)', array('@module' => t('Drupal core'), '@date' => format_date(REQUEST_TIME, 'html_date'))), 'Core translation update');
+ $this->assertText(SafeMarkup::format('@module (@date)', array('@module' => t('Drupal core'), '@date' => format_date(REQUEST_TIME, 'html_date'))), 'Core translation update');
$update_button = $this->xpath('//input[@type="submit"][@value="' . t('Update translations') . '"]');
$this->assertTrue($update_button, 'Update translations button');
}
diff --git a/core/modules/locale/src/Tests/LocaleUpdateTest.php b/core/modules/locale/src/Tests/LocaleUpdateTest.php
index 0a13796..44bf5dc 100644
--- a/core/modules/locale/src/Tests/LocaleUpdateTest.php
+++ b/core/modules/locale/src/Tests/LocaleUpdateTest.php
@@ -7,6 +7,7 @@
namespace Drupal\locale\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Language\LanguageInterface;
/**
@@ -47,7 +48,7 @@ public function testUpdateProjects() {
$projects = locale_translation_project_list();
$this->assertFalse(isset($projects['locale_test_translate']), 'Hidden module not found');
$this->assertEqual($projects['locale_test']['info']['interface translation server pattern'], 'core/modules/locale/test/test.%language.po', 'Interface translation parameter found in project info.');
- $this->assertEqual($projects['locale_test']['name'], 'locale_test', format_string('%key found in project info.', array('%key' => 'interface translation project')));
+ $this->assertEqual($projects['locale_test']['name'], 'locale_test', SafeMarkup::format('%key found in project info.', array('%key' => 'interface translation project')));
}
/**
diff --git a/core/modules/menu_link_content/src/Plugin/Menu/MenuLinkContent.php b/core/modules/menu_link_content/src/Plugin/Menu/MenuLinkContent.php
index 8e3433b..5361875 100644
--- a/core/modules/menu_link_content/src/Plugin/Menu/MenuLinkContent.php
+++ b/core/modules/menu_link_content/src/Plugin/Menu/MenuLinkContent.php
@@ -8,6 +8,7 @@
namespace Drupal\menu_link_content\Plugin\Menu;
use Drupal\Component\Plugin\Exception\PluginException;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Language\LanguageManagerInterface;
@@ -138,7 +139,7 @@ protected function getEntity() {
$entity = reset($loaded_entities);
}
if (!$entity) {
- throw new PluginException(String::format('Entity not found through the menu link plugin definition and could not fallback on UUID @uuid', array('@uuid' => $uuid)));
+ throw new PluginException(SafeMarkup::format('Entity not found through the menu link plugin definition and could not fallback on UUID @uuid', array('@uuid' => $uuid)));
}
// Clone the entity object to avoid tampering with the static cache.
$this->entity = clone $entity;
diff --git a/core/modules/menu_link_content/src/Tests/LinksTest.php b/core/modules/menu_link_content/src/Tests/LinksTest.php
index 92f18b6..9661b9c 100644
--- a/core/modules/menu_link_content/src/Tests/LinksTest.php
+++ b/core/modules/menu_link_content/src/Tests/LinksTest.php
@@ -7,6 +7,7 @@
namespace Drupal\menu_link_content\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\locale\TranslationString;
use Drupal\simpletest\WebTestBase;
@@ -117,7 +118,7 @@ function assertMenuLinkParents($links, $expected_hierarchy) {
$menu_link_plugin = $this->menuLinkManager->createInstance($links[$id]);
$expected_parent = isset($links[$parent]) ? $links[$parent] : '';
- $this->assertEqual($menu_link_plugin->getParent(), $expected_parent, String::format('Menu link %id has parent of %parent, expected %expected_parent.', array('%id' => $id, '%parent' => $menu_link_plugin->getParent(), '%expected_parent' => $expected_parent)));
+ $this->assertEqual($menu_link_plugin->getParent(), $expected_parent, SafeMarkup::format('Menu link %id has parent of %parent, expected %expected_parent.', array('%id' => $id, '%parent' => $menu_link_plugin->getParent(), '%expected_parent' => $expected_parent)));
}
}
diff --git a/core/modules/menu_ui/src/Tests/MenuTest.php b/core/modules/menu_ui/src/Tests/MenuTest.php
index 5cb6563..0c29071 100644
--- a/core/modules/menu_ui/src/Tests/MenuTest.php
+++ b/core/modules/menu_ui/src/Tests/MenuTest.php
@@ -9,6 +9,7 @@
use Drupal\block\Entity\Block;
use Drupal\Component\Serialization\Json;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Menu\MenuLinkInterface;
@@ -569,7 +570,7 @@ public function testBlockContextualLinks() {
$id = 'block:block=' . $block->id() . ':|menu:menu=' . $custom_menu->id() . ':';
// @see \Drupal\contextual\Tests\ContextualDynamicContextTest:assertContextualLinkPlaceHolder()
- $this->assertRaw('', format_string('Contextual link placeholder with id @id exists.', array('@id' => $id)));
+ $this->assertRaw('', SafeMarkup::format('Contextual link placeholder with id @id exists.', array('@id' => $id)));
// Get server-rendered contextual links.
// @see \Drupal\contextual\Tests\ContextualDynamicContextTest:renderContextualLinks()
@@ -583,7 +584,7 @@ public function testBlockContextualLinks() {
$this->drupalPostForm('admin/structure/block/manage/' . $block->id(), ['settings[cache][max_age]' => Cache::PERMANENT], t('Save block'));
$this->drupalGet('test-page');
$id = 'block:block=' . $block->id() . ':|menu:menu=' . $custom_menu->id() . ':';
- $this->assertRaw('', format_string('Contextual link placeholder with id @id exists.', array('@id' => $id)));
+ $this->assertRaw('', SafeMarkup::format('Contextual link placeholder with id @id exists.', array('@id' => $id)));
}
/**
diff --git a/core/modules/migrate/src/Entity/Migration.php b/core/modules/migrate/src/Entity/Migration.php
index 9e8fe46..65b3aff 100644
--- a/core/modules/migrate/src/Entity/Migration.php
+++ b/core/modules/migrate/src/Entity/Migration.php
@@ -7,6 +7,7 @@
namespace Drupal\migrate\Entity;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\migrate\Exception\RequirementsException;
@@ -352,7 +353,7 @@ public function checkRequirements() {
}
}
if ($missing_migrations) {
- throw new RequirementsException(String::format('Missing migrations @requirements.', ['@requirements' => implode(', ', $missing_migrations)]), ['requirements' => $missing_migrations]);
+ throw new RequirementsException(SafeMarkup::format('Missing migrations @requirements.', ['@requirements' => implode(', ', $missing_migrations)]), ['requirements' => $missing_migrations]);
}
}
diff --git a/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php b/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
index 36c731f..7b141a9 100644
--- a/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
+++ b/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
@@ -7,6 +7,7 @@
namespace Drupal\Tests\migrate\Unit;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Database\Connection;
use Drupal\migrate\Entity\MigrationInterface;
@@ -61,7 +62,7 @@ protected function getFieldSchema(array $id_definition) {
'not null' => FALSE,
);
default:
- throw new MigrateException(String::format('@type not supported', array('@type' => $id_definition['type'])));
+ throw new MigrateException(SafeMarkup::format('@type not supported', array('@type' => $id_definition['type'])));
}
}
}
diff --git a/core/modules/migrate_drupal/src/MigrationStorage.php b/core/modules/migrate_drupal/src/MigrationStorage.php
index 7382605..2ce0d75 100644
--- a/core/modules/migrate_drupal/src/MigrationStorage.php
+++ b/core/modules/migrate_drupal/src/MigrationStorage.php
@@ -125,7 +125,7 @@ protected function getDynamicIds(array &$dynamic_ids, array $entities) {
*/
public function save(EntityInterface $entity) {
if (strpos($entity->id(), ':') !== FALSE) {
- throw new EntityStorageException(String::format("Dynamic migration %id can't be saved", array('$%id' => $entity->id())));
+ throw new EntityStorageException(SafeMarkup::format("Dynamic migration %id can't be saved", array('$%id' => $entity->id())));
}
return parent::save($entity);
}
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/load/LoadEntity.php b/core/modules/migrate_drupal/src/Plugin/migrate/load/LoadEntity.php
index f04672d..51e36b2 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/load/LoadEntity.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/load/LoadEntity.php
@@ -7,6 +7,7 @@
namespace Drupal\migrate_drupal\Plugin\migrate\load;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Plugin\PluginBase;
@@ -44,7 +45,7 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi
throw new MigrateException('Migrations with a load plugin using LoadEntity should have an entity as source.');
}
if ($source_plugin->bundleMigrationRequired() && empty($configuration['bundle_migration'])) {
- throw new MigrateException(String::format('Source plugin @plugin requires the bundle_migration key to be set.', array('@plugin' => $source_plugin->getPluginId())));
+ throw new MigrateException(SafeMarkup::format('Source plugin @plugin requires the bundle_migration key to be set.', array('@plugin' => $source_plugin->getPluginId())));
}
}
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
index 24b5067..2a83ac8 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
@@ -7,6 +7,7 @@
namespace Drupal\migrate_drupal\Plugin\migrate\source;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\migrate\Entity\MigrationInterface;
@@ -81,11 +82,11 @@ public function checkRequirements() {
if (isset($this->pluginDefinition['source_provider'])) {
if ($this->moduleExists($this->pluginDefinition['source_provider'])) {
if (isset($this->pluginDefinition['minimum_schema_version']) && !$this->getModuleSchemaVersion($this->pluginDefinition['source_provider']) < $this->pluginDefinition['minimum_schema_version']) {
- throw new RequirementsException(String::format('Required minimum schema version @minimum_schema_version', ['@minimum_schema_version' => $this->pluginDefinition['minimum_schema_version']]), ['minimum_schema_version' => $this->pluginDefinition['minimum_schema_version']]);
+ throw new RequirementsException(SafeMarkup::format('Required minimum schema version @minimum_schema_version', ['@minimum_schema_version' => $this->pluginDefinition['minimum_schema_version']]), ['minimum_schema_version' => $this->pluginDefinition['minimum_schema_version']]);
}
}
else {
- throw new RequirementsException(String::format('Missing source provider @provider', ['@provider' => $this->pluginDefinition['source_provider']]), ['source_provider' => $this->pluginDefinition['source_provider']]);
+ throw new RequirementsException(SafeMarkup::format('Missing source provider @provider', ['@provider' => $this->pluginDefinition['source_provider']]), ['source_provider' => $this->pluginDefinition['source_provider']]);
}
}
}
diff --git a/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php b/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php
index 8907986..cc36036 100644
--- a/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php
+++ b/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php
@@ -7,6 +7,7 @@
namespace Drupal\migrate_drupal\Tests\dependencies;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
@@ -62,7 +63,7 @@ public function testAggregatorMigrateDependencies() {
$executable = new MigrateExecutable($migration, $this);
$this->startCollectingMessages();
$executable->import();
- $this->assertIdentical($this->migrateMessages['error'], array(String::format('Migration @id did not meet the requirements. Missing migrations d6_aggregator_feed. requirements: d6_aggregator_feed.', array('@id' => $migration->id()))));
+ $this->assertIdentical($this->migrateMessages['error'], array(SafeMarkup::format('Migration @id did not meet the requirements. Missing migrations d6_aggregator_feed. requirements: d6_aggregator_feed.', array('@id' => $migration->id()))));
$this->collectMessages = FALSE;
}
diff --git a/core/modules/node/src/Tests/NodeAccessRecordsTest.php b/core/modules/node/src/Tests/NodeAccessRecordsTest.php
index 4b019c8..f4b7a34 100644
--- a/core/modules/node/src/Tests/NodeAccessRecordsTest.php
+++ b/core/modules/node/src/Tests/NodeAccessRecordsTest.php
@@ -7,6 +7,7 @@
namespace Drupal\node\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\node\Entity\Node;
/**
@@ -76,7 +77,7 @@ function testNodeAccessRecords() {
$grants = node_test_node_grants($web_user, $op);
$altered_grants = $grants;
\Drupal::moduleHandler()->alter('node_grants', $altered_grants, $web_user, $op);
- $this->assertNotEqual($grants, $altered_grants, format_string('Altered the %op grant for a user.', array('%op' => $op)));
+ $this->assertNotEqual($grants, $altered_grants, SafeMarkup::format('Altered the %op grant for a user.', array('%op' => $op)));
}
// Check that core does not grant access to an unpublished node when an
diff --git a/core/modules/node/src/Tests/NodeFieldAccessTest.php b/core/modules/node/src/Tests/NodeFieldAccessTest.php
index bc1ef76..430bbfd 100644
--- a/core/modules/node/src/Tests/NodeFieldAccessTest.php
+++ b/core/modules/node/src/Tests/NodeFieldAccessTest.php
@@ -6,6 +6,7 @@
namespace Drupal\node\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\node\Entity\Node;
use Drupal\node\Entity\NodeType;
@@ -105,35 +106,35 @@ function testAccessToAdministrativeFields() {
// Checks on view operations.
foreach ($test_users as $account) {
$may_view = $node1->{$field}->access('view', $account);
- $this->assertTrue($may_view, String::format('Any user may view the field @name.', array('@name' => $field)));
+ $this->assertTrue($may_view, SafeMarkup::format('Any user may view the field @name.', array('@name' => $field)));
}
// Checks on edit operations.
$may_update = $node1->{$field}->access('edit', $page_creator_user);
- $this->assertFalse($may_update, String::format('Users with permission "edit own page content" is not allowed to the field @name.', array('@name' => $field)));
+ $this->assertFalse($may_update, SafeMarkup::format('Users with permission "edit own page content" is not allowed to the field @name.', array('@name' => $field)));
$may_update = $node2->{$field}->access('edit', $page_creator_user);
- $this->assertFalse($may_update, String::format('Users with permission "edit own page content" is not allowed to the field @name.', array('@name' => $field)));
+ $this->assertFalse($may_update, SafeMarkup::format('Users with permission "edit own page content" is not allowed to the field @name.', array('@name' => $field)));
$may_update = $node2->{$field}->access('edit', $page_manager_user);
- $this->assertFalse($may_update, String::format('Users with permission "edit any page content" is not allowed to the field @name.', array('@name' => $field)));
+ $this->assertFalse($may_update, SafeMarkup::format('Users with permission "edit any page content" is not allowed to the field @name.', array('@name' => $field)));
$may_update = $node1->{$field}->access('edit', $page_manager_user);
- $this->assertFalse($may_update, String::format('Users with permission "edit any page content" is not allowed to the field @name.', array('@name' => $field)));
+ $this->assertFalse($may_update, SafeMarkup::format('Users with permission "edit any page content" is not allowed to the field @name.', array('@name' => $field)));
$may_update = $node2->{$field}->access('edit', $page_unrelated_user);
- $this->assertFalse($may_update, String::format('Users not having permission "edit any page content" is not allowed to the field @name.', array('@name' => $field)));
+ $this->assertFalse($may_update, SafeMarkup::format('Users not having permission "edit any page content" is not allowed to the field @name.', array('@name' => $field)));
$may_update = $node1->{$field}->access('edit', $content_admin_user) && $node3->status->access('edit', $content_admin_user);
- $this->assertTrue($may_update, String::format('Users with permission "administer nodes" may edit @name fields on all nodes.', array('@name' => $field)));
+ $this->assertTrue($may_update, SafeMarkup::format('Users with permission "administer nodes" may edit @name fields on all nodes.', array('@name' => $field)));
}
foreach ($this->readOnlyFields as $field) {
// Check view operation.
foreach ($test_users as $account) {
$may_view = $node1->{$field}->access('view', $account);
- $this->assertTrue($may_view, String::format('Any user may view the field @name.', array('@name' => $field)));
+ $this->assertTrue($may_view, SafeMarkup::format('Any user may view the field @name.', array('@name' => $field)));
}
// Check edit operation.
foreach ($test_users as $account) {
$may_view = $node1->{$field}->access('edit', $account);
- $this->assertFalse($may_view, String::format('No user is not allowed to edit the field @name.', array('@name' => $field)));
+ $this->assertFalse($may_view, SafeMarkup::format('No user is not allowed to edit the field @name.', array('@name' => $field)));
}
}
diff --git a/core/modules/node/src/Tests/NodeLoadMultipleTest.php b/core/modules/node/src/Tests/NodeLoadMultipleTest.php
index afb1d30..a9829ec 100644
--- a/core/modules/node/src/Tests/NodeLoadMultipleTest.php
+++ b/core/modules/node/src/Tests/NodeLoadMultipleTest.php
@@ -7,6 +7,7 @@
namespace Drupal\node\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\node\Entity\Node;
/**
@@ -50,12 +51,12 @@ function testNodeMultipleLoad() {
$this->assertEqual($node3->label(), $nodes[$node3->id()]->label(), 'Node was loaded.');
$this->assertEqual($node4->label(), $nodes[$node4->id()]->label(), 'Node was loaded.');
$count = count($nodes);
- $this->assertTrue($count == 2, format_string('@count nodes loaded.', array('@count' => $count)));
+ $this->assertTrue($count == 2, SafeMarkup::format('@count nodes loaded.', array('@count' => $count)));
// Load nodes by nid. Nodes 1, 2 and 4 will be loaded.
$nodes = Node::loadMultiple(array(1, 2, 4));
$count = count($nodes);
- $this->assertTrue(count($nodes) == 3, format_string('@count nodes loaded', array('@count' => $count)));
+ $this->assertTrue(count($nodes) == 3, SafeMarkup::format('@count nodes loaded', array('@count' => $count)));
$this->assertTrue(isset($nodes[$node1->id()]), 'Node is correctly keyed in the array');
$this->assertTrue(isset($nodes[$node2->id()]), 'Node is correctly keyed in the array');
$this->assertTrue(isset($nodes[$node4->id()]), 'Node is correctly keyed in the array');
diff --git a/core/modules/node/src/Tests/NodeTestBase.php b/core/modules/node/src/Tests/NodeTestBase.php
index 7d38bb5..35cfa6a 100644
--- a/core/modules/node/src/Tests/NodeTestBase.php
+++ b/core/modules/node/src/Tests/NodeTestBase.php
@@ -7,6 +7,7 @@
namespace Drupal\node\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Session\AccountInterface;
use Drupal\simpletest\WebTestBase;
@@ -105,7 +106,7 @@ function assertNodeCreateAccess($bundle, $result, AccountInterface $account, $la
* @return string
*/
function nodeAccessAssertMessage($operation, $result, $langcode = NULL) {
- return format_string(
+ return SafeMarkup::format(
'Node access returns @result with operation %op, language code %langcode.',
array(
'@result' => $result ? 'true' : 'false',
diff --git a/core/modules/node/src/Tests/NodeTokenReplaceTest.php b/core/modules/node/src/Tests/NodeTokenReplaceTest.php
index 7431f06..ee88bcc 100644
--- a/core/modules/node/src/Tests/NodeTokenReplaceTest.php
+++ b/core/modules/node/src/Tests/NodeTokenReplaceTest.php
@@ -81,7 +81,7 @@ function testNodeTokenReplacement() {
foreach ($tests as $input => $expected) {
$output = $this->tokenService->replace($input, array('node' => $node), array('langcode' => $this->interfaceLanguage->getId()));
- $this->assertEqual($output, $expected, format_string('Sanitized node token %token replaced.', array('%token' => $input)));
+ $this->assertEqual($output, $expected, SafeMarkup::format('Sanitized node token %token replaced.', array('%token' => $input)));
}
// Generate and test unsanitized tokens.
@@ -93,7 +93,7 @@ function testNodeTokenReplacement() {
foreach ($tests as $input => $expected) {
$output = $this->tokenService->replace($input, array('node' => $node), array('langcode' => $this->interfaceLanguage->getId(), 'sanitize' => FALSE));
- $this->assertEqual($output, $expected, format_string('Unsanitized node token %token replaced.', array('%token' => $input)));
+ $this->assertEqual($output, $expected, SafeMarkup::format('Unsanitized node token %token replaced.', array('%token' => $input)));
}
// Repeat for a node without a summary.
@@ -114,7 +114,7 @@ function testNodeTokenReplacement() {
foreach ($tests as $input => $expected) {
$output = $this->tokenService->replace($input, array('node' => $node), array('language' => $this->interfaceLanguage));
- $this->assertEqual($output, $expected, format_string('Sanitized node token %token replaced for node without a summary.', array('%token' => $input)));
+ $this->assertEqual($output, $expected, SafeMarkup::format('Sanitized node token %token replaced for node without a summary.', array('%token' => $input)));
}
// Generate and test unsanitized tokens.
@@ -122,7 +122,7 @@ function testNodeTokenReplacement() {
foreach ($tests as $input => $expected) {
$output = $this->tokenService->replace($input, array('node' => $node), array('language' => $this->interfaceLanguage, 'sanitize' => FALSE));
- $this->assertEqual($output, $expected, format_string('Unsanitized node token %token replaced for node without a summary.', array('%token' => $input)));
+ $this->assertEqual($output, $expected, SafeMarkup::format('Unsanitized node token %token replaced for node without a summary.', array('%token' => $input)));
}
}
diff --git a/core/modules/node/src/Tests/NodeTranslationUITest.php b/core/modules/node/src/Tests/NodeTranslationUITest.php
index 80a9d1e..6b73bcf 100644
--- a/core/modules/node/src/Tests/NodeTranslationUITest.php
+++ b/core/modules/node/src/Tests/NodeTranslationUITest.php
@@ -7,6 +7,7 @@
namespace Drupal\node\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityInterface;
use Drupal\content_translation\Tests\ContentTranslationUITest;
use Drupal\Core\Language\LanguageInterface;
@@ -316,7 +317,7 @@ protected function doTestTranslations($path, array $values) {
$languages = $this->container->get('language_manager')->getLanguages();
foreach ($this->langcodes as $langcode) {
$this->drupalGet($path, array('language' => $languages[$langcode]));
- $this->assertText($values[$langcode]['title'][0]['value'], format_string('The %langcode node translation is correctly displayed.', array('%langcode' => $langcode)));
+ $this->assertText($values[$langcode]['title'][0]['value'], SafeMarkup::format('The %langcode node translation is correctly displayed.', array('%langcode' => $langcode)));
}
}
@@ -340,7 +341,7 @@ protected function doTestAlternateHreflangLinks(Url $url) {
// Retrieve desired link elements from the HTML head.
$links = $this->xpath('head/link[@rel = "alternate" and @href = :href and @hreflang = :hreflang]',
array(':href' => $language_url->toString(), ':hreflang' => $alternate_langcode));
- $this->assert(isset($links[0]), format_string('The %langcode node translation has the correct alternate hreflang link for %alternate_langcode: %link.', array('%langcode' => $langcode, '%alternate_langcode' => $alternate_langcode, '%link' => $url->toString())));
+ $this->assert(isset($links[0]), SafeMarkup::format('The %langcode node translation has the correct alternate hreflang link for %alternate_langcode: %link.', array('%langcode' => $langcode, '%alternate_langcode' => $alternate_langcode, '%link' => $url->toString())));
}
}
}
diff --git a/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php b/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php
index fa7ed6e..667dce7 100644
--- a/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php
+++ b/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php
@@ -7,6 +7,7 @@
namespace Drupal\node\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Config\Entity\ConfigEntityStorage;
@@ -104,7 +105,7 @@ public function testConfigurationRename() {
$this->drupalGet('admin/config/development/configuration');
foreach ($expected as $rename) {
$names = $this->configImporter()->getStorageComparer()->extractRenameNames($rename);
- $this->assertText(String::format('!source_name to !target_name', array('!source_name' => $names['old_name'], '!target_name' => $names['new_name'])));
+ $this->assertText(SafeMarkup::format('!source_name to !target_name', array('!source_name' => $names['old_name'], '!target_name' => $names['new_name'])));
// Test that the diff link is present for each renamed item.
$href = \Drupal::urlGenerator()->getPathFromRoute('config.diff', array('source_name' => $names['old_name'], 'target_name' => $names['new_name']));
$this->assertLinkByHref($href);
diff --git a/core/modules/node/src/Tests/Views/BulkFormAccessTest.php b/core/modules/node/src/Tests/Views/BulkFormAccessTest.php
index d6ea016..36379a3 100644
--- a/core/modules/node/src/Tests/Views/BulkFormAccessTest.php
+++ b/core/modules/node/src/Tests/Views/BulkFormAccessTest.php
@@ -6,6 +6,7 @@
*/
namespace Drupal\node\Tests\Views;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\node\Entity\Node;
use Drupal\node\Entity\NodeType;
@@ -92,7 +93,7 @@ public function testNodeEditAccess() {
'action' => 'node_unpublish_action',
);
$this->drupalPostForm('test-node-bulk-form', $edit, t('Apply'));
- $this->assertRaw(String::format('No access to execute %action on the @entity_type_label %entity_label.', [
+ $this->assertRaw(SafeMarkup::format('No access to execute %action on the @entity_type_label %entity_label.', [
'%action' => 'Unpublish content',
'@entity_type_label' => 'Content',
'%entity_label' => $node->label(),
diff --git a/core/modules/node/src/Tests/Views/FrontPageTest.php b/core/modules/node/src/Tests/Views/FrontPageTest.php
index ed6fd3d..56eb798 100644
--- a/core/modules/node/src/Tests/Views/FrontPageTest.php
+++ b/core/modules/node/src/Tests/Views/FrontPageTest.php
@@ -7,6 +7,7 @@
namespace Drupal\node\Tests\Views;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Url;
use Drupal\node\Entity\Node;
@@ -80,7 +81,7 @@ public function testFrontPage() {
$this->executeView($view);
$view->preview();
- $this->assertEqual($view->getTitle(), format_string('Welcome to @site_name', array('@site_name' => $site_name)), 'The welcome title is used for the empty view.');
+ $this->assertEqual($view->getTitle(), SafeMarkup::format('Welcome to @site_name', array('@site_name' => $site_name)), 'The welcome title is used for the empty view.');
$view->destroy();
// Create some nodes on the frontpage view. Add more than 10 nodes in order
diff --git a/core/modules/options/src/Tests/OptionsFieldUITest.php b/core/modules/options/src/Tests/OptionsFieldUITest.php
index ef2b020..4199ae2 100644
--- a/core/modules/options/src/Tests/OptionsFieldUITest.php
+++ b/core/modules/options/src/Tests/OptionsFieldUITest.php
@@ -7,6 +7,7 @@
namespace Drupal\options\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\field\Tests\FieldTestBase;
@@ -326,7 +327,7 @@ function testNodeDisplay() {
);
$this->drupalPostForm($this->adminPath, $edit, t('Save field settings'));
- $this->assertText(format_string('Updated field !field_name field settings.', array('!field_name' => $this->fieldName)), "The 'On' and 'Off' form fields work for boolean fields.");
+ $this->assertText(SafeMarkup::format('Updated field !field_name field settings.', array('!field_name' => $this->fieldName)), "The 'On' and 'Off' form fields work for boolean fields.");
// Select a default value.
$edit = array(
diff --git a/core/modules/responsive_image/responsive_image.module b/core/modules/responsive_image/responsive_image.module
index 5717a2a..e96b895 100644
--- a/core/modules/responsive_image/responsive_image.module
+++ b/core/modules/responsive_image/responsive_image.module
@@ -374,7 +374,7 @@ function responsive_image_build_source_attributes(ImageInterface $image, array $
// this breakpoint should be merged into one srcset and the sizes
// attribute should be merged as well.
if (is_null($dimensions['width'])) {
- throw new \LogicException(String::format('Could not determine image width for @file using image style with ID: @image_style_name. This image style can not be used for a responsive image style mapping using the \'sizes\' attribute.', array('@file' => $image->getSource(), '@image_style_name' => $image_style_name)));
+ throw new \LogicException(SafeMarkup::format('Could not determine image width for @file using image style with ID: @image_style_name. This image style can not be used for a responsive image style mapping using the \'sizes\' attribute.', array('@file' => $image->getSource(), '@image_style_name' => $image_style_name)));
}
// Use the image width as key so we can sort the array later on.
// Images within a srcset should be sorted from small to large, since
diff --git a/core/modules/rest/src/Plugin/rest/resource/EntityResource.php b/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
index 1059bd4..fea59ff 100644
--- a/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
+++ b/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
@@ -7,6 +7,7 @@
namespace Drupal\rest\Plugin\rest\resource;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityStorageException;
use Drupal\rest\Plugin\ResourceBase;
@@ -93,7 +94,7 @@ public function post(EntityInterface $entity = NULL) {
// and 'update', so the 'edit' operation is used here.
foreach ($entity->_restSubmittedFields as $key => $field_name) {
if (!$entity->get($field_name)->access('edit')) {
- throw new AccessDeniedHttpException(String::format('Access denied on creating field @field', array('@field' => $field_name)));
+ throw new AccessDeniedHttpException(SafeMarkup::format('Access denied on creating field @field', array('@field' => $field_name)));
}
}
@@ -146,11 +147,11 @@ public function patch(EntityInterface $original_entity, EntityInterface $entity
continue;
}
if ($field->isEmpty() && !$original_entity->get($field_name)->access('delete')) {
- throw new AccessDeniedHttpException(String::format('Access denied on deleting field @field.', array('@field' => $field_name)));
+ throw new AccessDeniedHttpException(SafeMarkup::format('Access denied on deleting field @field.', array('@field' => $field_name)));
}
$original_entity->set($field_name, $field->getValue());
if (!$original_entity->get($field_name)->access('update')) {
- throw new AccessDeniedHttpException(String::format('Access denied on updating field @field.', array('@field' => $field_name)));
+ throw new AccessDeniedHttpException(SafeMarkup::format('Access denied on updating field @field.', array('@field' => $field_name)));
}
}
diff --git a/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php b/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php
index 33a64a7..2e79996 100644
--- a/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php
+++ b/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php
@@ -6,6 +6,7 @@
*/
namespace Drupal\search\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Url;
@@ -206,7 +207,7 @@ function testSearchModuleDisabling() {
$this->drupalGet($item['path'], $item['options']);
foreach ($plugins as $entity_id) {
$label = $entities[$entity_id]->label();
- $this->assertText($label, format_string('%label search tab is shown', array('%label' => $label)));
+ $this->assertText($label, SafeMarkup::format('%label search tab is shown', array('%label' => $label)));
}
}
}
diff --git a/core/modules/search/src/Tests/SearchNumberMatchingTest.php b/core/modules/search/src/Tests/SearchNumberMatchingTest.php
index 748596d..7e18425 100644
--- a/core/modules/search/src/Tests/SearchNumberMatchingTest.php
+++ b/core/modules/search/src/Tests/SearchNumberMatchingTest.php
@@ -7,6 +7,7 @@
namespace Drupal\search\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Language\LanguageInterface;
/**
@@ -82,7 +83,7 @@ function testNumberSearching() {
$this->drupalPostForm('search/node',
array('keys' => 'foo'),
t('Search'));
- $this->assertNoText($node->label(), format_string('%number: node title not shown in dummy search', array('%number' => $i)));
+ $this->assertNoText($node->label(), SafeMarkup::format('%number: node title not shown in dummy search', array('%number' => $i)));
// Now verify that we can find node i by searching for any of the
// numbers.
@@ -95,7 +96,7 @@ function testNumberSearching() {
$this->drupalPostForm('search/node',
array('keys' => $number),
t('Search'));
- $this->assertText($node->label(), format_string('%i: node title shown (search found the node) in search for number %number', array('%i' => $i, '%number' => $number)));
+ $this->assertText($node->label(), SafeMarkup::format('%i: node title shown (search found the node) in search for number %number', array('%i' => $i, '%number' => $number)));
}
}
diff --git a/core/modules/search/src/Tests/SearchNumbersTest.php b/core/modules/search/src/Tests/SearchNumbersTest.php
index 18e76ba..73c848d 100644
--- a/core/modules/search/src/Tests/SearchNumbersTest.php
+++ b/core/modules/search/src/Tests/SearchNumbersTest.php
@@ -7,6 +7,7 @@
namespace Drupal\search\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Language\LanguageInterface;
/**
@@ -102,7 +103,7 @@ function testNumberSearching() {
$this->drupalPostForm('search/node',
array('keys' => $number),
t('Search'));
- $this->assertText($node->label(), format_string('%type: node title shown (search found the node) in search for number %number.', array('%type' => $type, '%number' => $number)));
+ $this->assertText($node->label(), SafeMarkup::format('%type: node title shown (search found the node) in search for number %number.', array('%type' => $type, '%number' => $number)));
}
}
}
diff --git a/core/modules/search/src/Tests/SearchTestBase.php b/core/modules/search/src/Tests/SearchTestBase.php
index bac6974..5f1891f 100644
--- a/core/modules/search/src/Tests/SearchTestBase.php
+++ b/core/modules/search/src/Tests/SearchTestBase.php
@@ -7,6 +7,7 @@
namespace Drupal\search\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\simpletest\WebTestBase;
use Drupal\Component\Utility\String;
@@ -87,10 +88,10 @@ protected function submitGetForm($path, $edit, $submit, $form_html_id = NULL) {
// We have not found a form which contained all fields of $edit and
// the submit button.
foreach ($edit as $name => $value) {
- $this->fail(String::format('Failed to set field @name to @value', array('@name' => $name, '@value' => $value)));
+ $this->fail(SafeMarkup::format('Failed to set field @name to @value', array('@name' => $name, '@value' => $value)));
}
- $this->assertTrue($submit_matches, format_string('Found the @submit button', array('@submit' => $submit)));
- $this->fail(format_string('Found the requested form fields at @path', array('@path' => $path)));
+ $this->assertTrue($submit_matches, SafeMarkup::format('Found the @submit button', array('@submit' => $submit)));
+ $this->fail(SafeMarkup::format('Found the requested form fields at @path', array('@path' => $path)));
}
}
}
diff --git a/core/modules/serialization/src/Tests/EntitySerializationTest.php b/core/modules/serialization/src/Tests/EntitySerializationTest.php
index 04841a9..4106f15 100644
--- a/core/modules/serialization/src/Tests/EntitySerializationTest.php
+++ b/core/modules/serialization/src/Tests/EntitySerializationTest.php
@@ -7,6 +7,7 @@
namespace Drupal\serialization\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Language\LanguageInterface;
use Drupal\Component\Utility\String;
use Drupal\user\Entity\User;
@@ -206,7 +207,7 @@ public function testDenormalize() {
foreach (array('json', 'xml') as $type) {
$denormalized = $this->serializer->denormalize($normalized, $this->entityClass, $type, array('entity_type' => 'entity_test_mulrev'));
- $this->assertTrue($denormalized instanceof $this->entityClass, String::format('Denormalized entity is an instance of @class', array('@class' => $this->entityClass)));
+ $this->assertTrue($denormalized instanceof $this->entityClass, SafeMarkup::format('Denormalized entity is an instance of @class', array('@class' => $this->entityClass)));
$this->assertIdentical($denormalized->getEntityTypeId(), $this->entity->getEntityTypeId(), 'Expected entity type found.');
$this->assertIdentical($denormalized->bundle(), $this->entity->bundle(), 'Expected entity bundle found.');
$this->assertIdentical($denormalized->uuid(), $this->entity->uuid(), 'Expected entity UUID found.');
diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index 1414e0f..fb8123d 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -5,6 +5,7 @@
* Allows users to manage customizable lists of shortcut links.
*/
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Access\AccessResult;
use Drupal\Core\Cache\Cache;
@@ -349,7 +350,7 @@ function shortcut_preprocess_page(&$variables) {
),
'#prefix' => '',
'#type' => 'link',
- '#title' => String::format('@text', array('@text' => $link_text)),
+ '#title' => SafeMarkup::format('@text', array('@text' => $link_text)),
'#url' => Url::fromRoute($route_name, $route_parameters),
'#options' => array('query' => $query),
'#suffix' => '
',
diff --git a/core/modules/shortcut/src/Tests/ShortcutLinksTest.php b/core/modules/shortcut/src/Tests/ShortcutLinksTest.php
index bf98504..5b3a9d2 100644
--- a/core/modules/shortcut/src/Tests/ShortcutLinksTest.php
+++ b/core/modules/shortcut/src/Tests/ShortcutLinksTest.php
@@ -7,6 +7,7 @@
namespace Drupal\shortcut\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Url;
use Drupal\shortcut\Entity\Shortcut;
@@ -69,10 +70,10 @@ public function testShortcutLinkAdd() {
$this->assertTrue(in_array('internal:' . $test_path, $paths), 'Shortcut created: ' . $test_path);
if (in_array($test_path, $test_cases_non_access)) {
- $this->assertNoLink($title, String::format('Shortcut link %url not accessible on the page.', ['%url' => $test_path]));
+ $this->assertNoLink($title, SafeMarkup::format('Shortcut link %url not accessible on the page.', ['%url' => $test_path]));
}
else {
- $this->assertLink($title, 0, String::format('Shortcut link %url found on the page.', ['%url' => $test_path]));
+ $this->assertLink($title, 0, SafeMarkup::format('Shortcut link %url found on the page.', ['%url' => $test_path]));
}
}
$saved_set = ShortcutSet::load($set->id());
@@ -322,7 +323,7 @@ private function verifyAccessShortcutsPermissionForEditPages() {
foreach ($edit_paths as $path) {
$this->drupalGet($path);
- $message = format_string('Access is denied on %s', array('%s' => $path));
+ $message = SafeMarkup::format('Access is denied on %s', array('%s' => $path));
$this->assertResponse(403, $message);
}
}
diff --git a/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php b/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php
index 9f81cb5..7801031 100644
--- a/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php
+++ b/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php
@@ -7,6 +7,7 @@
namespace Drupal\shortcut\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\content_translation\Tests\ContentTranslationUITest;
use Drupal\Core\Language\Language;
@@ -74,7 +75,7 @@ protected function doTestBasicTranslation() {
$expected_path = \Drupal::urlGenerator()->generateFromRoute('user.page', array(), array('language' => $language));
$label = $entity->getTranslation($langcode)->label();
$elements = $this->xpath('//nav[contains(@class, "toolbar-lining")]/ul[@class="menu"]/li/a[contains(@href, :href) and normalize-space(text())=:label]', array(':href' => $expected_path, ':label' => $label));
- $this->assertTrue(!empty($elements), format_string('Translated @language shortcut link @label found.', array('@label' => $label, '@language' => $language->getName())));
+ $this->assertTrue(!empty($elements), SafeMarkup::format('Translated @language shortcut link @label found.', array('@label' => $label, '@language' => $language->getName())));
}
}
}
diff --git a/core/modules/simpletest/src/AssertContentTrait.php b/core/modules/simpletest/src/AssertContentTrait.php
index 9834417..fc9845f 100644
--- a/core/modules/simpletest/src/AssertContentTrait.php
+++ b/core/modules/simpletest/src/AssertContentTrait.php
@@ -8,6 +8,7 @@
namespace Drupal\simpletest;
use Drupal\Component\Serialization\Json;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Xss;
use Symfony\Component\CssSelector\CssSelector;
@@ -127,7 +128,7 @@ protected function parse() {
$html_dom = new \DOMDocument();
@$html_dom->loadHTML('' . $this->getRawContent());
if ($html_dom) {
- $this->pass(String::format('Valid HTML found on "@path"', array('@path' => $this->getUrl())), 'Browser');
+ $this->pass(SafeMarkup::format('Valid HTML found on "@path"', array('@path' => $this->getUrl())), 'Browser');
// It's much easier to work with simplexml than DOM, luckily enough
// we can just simply import our DOM tree.
$this->elements = simplexml_import_dom($html_dom);
@@ -282,8 +283,9 @@ protected function getAllOptions(\SimpleXMLElement $element) {
* Link position counting from zero.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The gorup this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -295,7 +297,7 @@ protected function getAllOptions(\SimpleXMLElement $element) {
*/
protected function assertLink($label, $index = 0, $message = '', $group = 'Other') {
$links = $this->xpath('//a[normalize-space(text())=:label]', array(':label' => $label));
- $message = ($message ? $message : String::format('Link with label %label found.', array('%label' => $label)));
+ $message = ($message ? $message : SafeMarkup::format('Link with label %label found.', array('%label' => $label)));
return $this->assert(isset($links[$index]), $message, $group);
}
@@ -306,8 +308,9 @@ protected function assertLink($label, $index = 0, $message = '', $group = 'Other
* Text between the anchor tags.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -319,7 +322,7 @@ protected function assertLink($label, $index = 0, $message = '', $group = 'Other
*/
protected function assertNoLink($label, $message = '', $group = 'Other') {
$links = $this->xpath('//a[normalize-space(text())=:label]', array(':label' => $label));
- $message = ($message ? $message : String::format('Link with label %label not found.', array('%label' => $label)));
+ $message = ($message ? $message : SafeMarkup::format('Link with label %label not found.', array('%label' => $label)));
return $this->assert(empty($links), $message, $group);
}
@@ -332,8 +335,9 @@ protected function assertNoLink($label, $message = '', $group = 'Other') {
* Link position counting from zero.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -345,7 +349,7 @@ protected function assertNoLink($label, $message = '', $group = 'Other') {
*/
protected function assertLinkByHref($href, $index = 0, $message = '', $group = 'Other') {
$links = $this->xpath('//a[contains(@href, :href)]', array(':href' => $href));
- $message = ($message ? $message : String::format('Link containing href %href found.', array('%href' => $href)));
+ $message = ($message ? $message : SafeMarkup::format('Link containing href %href found.', array('%href' => $href)));
return $this->assert(isset($links[$index]), $message, $group);
}
@@ -356,8 +360,9 @@ protected function assertLinkByHref($href, $index = 0, $message = '', $group = '
* The full or partial value of the 'href' attribute of the anchor tag.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -369,7 +374,7 @@ protected function assertLinkByHref($href, $index = 0, $message = '', $group = '
*/
protected function assertNoLinkByHref($href, $message = '', $group = 'Other') {
$links = $this->xpath('//a[contains(@href, :href)]', array(':href' => $href));
- $message = ($message ? $message : String::format('No link containing href %href found.', array('%href' => $href)));
+ $message = ($message ? $message : SafeMarkup::format('No link containing href %href found.', array('%href' => $href)));
return $this->assert(empty($links), $message, $group);
}
@@ -382,8 +387,9 @@ protected function assertNoLinkByHref($href, $message = '', $group = 'Other') {
* Raw (HTML) string to look for.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -395,7 +401,7 @@ protected function assertNoLinkByHref($href, $message = '', $group = 'Other') {
*/
protected function assertRaw($raw, $message = '', $group = 'Other') {
if (!$message) {
- $message = String::format('Raw "@raw" found', array('@raw' => $raw));
+ $message = SafeMarkup::format('Raw "@raw" found', array('@raw' => $raw));
}
return $this->assert(strpos($this->getRawContent(), $raw) !== FALSE, $message, $group);
}
@@ -409,8 +415,9 @@ protected function assertRaw($raw, $message = '', $group = 'Other') {
* Raw (HTML) string to look for.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -422,7 +429,7 @@ protected function assertRaw($raw, $message = '', $group = 'Other') {
*/
protected function assertNoRaw($raw, $message = '', $group = 'Other') {
if (!$message) {
- $message = String::format('Raw "@raw" not found', array('@raw' => $raw));
+ $message = SafeMarkup::format('Raw "@raw" not found', array('@raw' => $raw));
}
return $this->assert(strpos($this->getRawContent(), $raw) === FALSE, $message, $group);
}
@@ -436,8 +443,9 @@ protected function assertNoRaw($raw, $message = '', $group = 'Other') {
* Raw (HTML) string to look for.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -449,7 +457,7 @@ protected function assertNoRaw($raw, $message = '', $group = 'Other') {
*/
protected function assertEscaped($raw, $message = '', $group = 'Other') {
if (!$message) {
- $message = String::format('Escaped "@raw" found', array('@raw' => $raw));
+ $message = SafeMarkup::format('Escaped "@raw" found', array('@raw' => $raw));
}
return $this->assert(strpos($this->getRawContent(), String::checkPlain($raw)) !== FALSE, $message, $group);
}
@@ -464,8 +472,9 @@ protected function assertEscaped($raw, $message = '', $group = 'Other') {
* Raw (HTML) string to look for.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -477,7 +486,7 @@ protected function assertEscaped($raw, $message = '', $group = 'Other') {
*/
protected function assertNoEscaped($raw, $message = '', $group = 'Other') {
if (!$message) {
- $message = String::format('Escaped "@raw" not found', array('@raw' => $raw));
+ $message = SafeMarkup::format('Escaped "@raw" not found', array('@raw' => $raw));
}
return $this->assert(strpos($this->getRawContent(), String::checkPlain($raw)) === FALSE, $message, $group);
}
@@ -493,8 +502,9 @@ protected function assertNoEscaped($raw, $message = '', $group = 'Other') {
* Plain text to look for.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -519,8 +529,9 @@ protected function assertText($text, $message = '', $group = 'Other') {
* Plain text to look for.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -543,8 +554,9 @@ protected function assertNoText($text, $message = '', $group = 'Other') {
* Plain text to look for.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -559,7 +571,7 @@ protected function assertNoText($text, $message = '', $group = 'Other') {
*/
protected function assertTextHelper($text, $message = '', $group = 'Other', $not_exists = TRUE) {
if (!$message) {
- $message = !$not_exists ? String::format('"@text" found', array('@text' => $text)) : String::format('"@text" not found', array('@text' => $text));
+ $message = !$not_exists ? SafeMarkup::format('"@text" found', array('@text' => $text)) : SafeMarkup::format('"@text" not found', array('@text' => $text));
}
return $this->assert($not_exists == (strpos($this->getTextContent(), (string) $text) === FALSE), $message, $group);
}
@@ -575,8 +587,9 @@ protected function assertTextHelper($text, $message = '', $group = 'Other', $not
* Plain text to look for.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -601,8 +614,9 @@ protected function assertUniqueText($text, $message = '', $group = 'Other') {
* Plain text to look for.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -625,8 +639,9 @@ protected function assertNoUniqueText($text, $message = '', $group = 'Other') {
* Plain text to look for.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -659,8 +674,9 @@ protected function assertUniqueTextHelper($text, $message = '', $group = 'Other'
* Perl regex to look for including the regex delimiters.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -672,7 +688,7 @@ protected function assertUniqueTextHelper($text, $message = '', $group = 'Other'
*/
protected function assertPattern($pattern, $message = '', $group = 'Other') {
if (!$message) {
- $message = String::format('Pattern "@pattern" found', array('@pattern' => $pattern));
+ $message = SafeMarkup::format('Pattern "@pattern" found', array('@pattern' => $pattern));
}
return $this->assert((bool) preg_match($pattern, $this->getRawContent()), $message, $group);
}
@@ -684,8 +700,9 @@ protected function assertPattern($pattern, $message = '', $group = 'Other') {
* Perl regex to look for including the regex delimiters.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -697,7 +714,7 @@ protected function assertPattern($pattern, $message = '', $group = 'Other') {
*/
protected function assertNoPattern($pattern, $message = '', $group = 'Other') {
if (!$message) {
- $message = String::format('Pattern "@pattern" not found', array('@pattern' => $pattern));
+ $message = SafeMarkup::format('Pattern "@pattern" not found', array('@pattern' => $pattern));
}
return $this->assert(!preg_match($pattern, $this->getRawContent()), $message, $group);
}
@@ -720,7 +737,7 @@ protected function assertNoPattern($pattern, $message = '', $group = 'Other') {
*/
protected function assertTextPattern($pattern, $message = NULL, $group = 'Other') {
if (!isset($message)) {
- $message = String::format('Pattern "@pattern" found', array('@pattern' => $pattern));
+ $message = SafeMarkup::format('Pattern "@pattern" found', array('@pattern' => $pattern));
}
return $this->assert((bool) preg_match($pattern, $this->getTextContent()), $message, $group);
}
@@ -732,8 +749,9 @@ protected function assertTextPattern($pattern, $message = NULL, $group = 'Other'
* The string the title should be.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -746,7 +764,7 @@ protected function assertTextPattern($pattern, $message = NULL, $group = 'Other'
protected function assertTitle($title, $message = '', $group = 'Other') {
$actual = (string) current($this->xpath('//title'));
if (!$message) {
- $message = String::format('Page title @actual is equal to @expected.', array(
+ $message = SafeMarkup::format('Page title @actual is equal to @expected.', array(
'@actual' => var_export($actual, TRUE),
'@expected' => var_export($title, TRUE),
));
@@ -761,8 +779,9 @@ protected function assertTitle($title, $message = '', $group = 'Other') {
* The string the title should not be.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -775,7 +794,7 @@ protected function assertTitle($title, $message = '', $group = 'Other') {
protected function assertNoTitle($title, $message = '', $group = 'Other') {
$actual = (string) current($this->xpath('//title'));
if (!$message) {
- $message = String::format('Page title @actual is not equal to @unexpected.', array(
+ $message = SafeMarkup::format('Page title @actual is not equal to @unexpected.', array(
'@actual' => var_export($actual, TRUE),
'@unexpected' => var_export($title, TRUE),
));
@@ -794,8 +813,9 @@ protected function assertNoTitle($title, $message = '', $group = 'Other') {
* The expected themed output string.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -815,7 +835,7 @@ protected function assertThemeOutput($callback, array $variables = array(), $exp
if (!$message) {
$message = '%callback rendered correctly.';
}
- $message = format_string($message, array('%callback' => 'theme_' . $callback . '()'));
+ $message = SafeMarkup::format($message, array('%callback' => 'theme_' . $callback . '()'));
return $this->assertIdentical($output, $expected, $message, $group);
}
@@ -830,8 +850,9 @@ protected function assertThemeOutput($callback, array $variables = array(), $exp
* exists.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -911,8 +932,9 @@ protected function getSelectedItem(\SimpleXMLElement $element) {
* page does not match it.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -951,8 +973,9 @@ protected function assertNoFieldByXPath($xpath, $value = NULL, $message = '', $g
* exists.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -965,12 +988,12 @@ protected function assertNoFieldByXPath($xpath, $value = NULL, $message = '', $g
protected function assertFieldByName($name, $value = NULL, $message = NULL, $group = 'Browser') {
if (!isset($message)) {
if (!isset($value)) {
- $message = String::format('Found field with name @name', array(
+ $message = SafeMarkup::format('Found field with name @name', array(
'@name' => var_export($name, TRUE),
));
}
else {
- $message = String::format('Found field with name @name and value @value', array(
+ $message = SafeMarkup::format('Found field with name @name and value @value', array(
'@name' => var_export($name, TRUE),
'@value' => var_export($value, TRUE),
));
@@ -991,8 +1014,9 @@ protected function assertFieldByName($name, $value = NULL, $message = NULL, $gro
* default value ('') asserts that the field value is not an empty string.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -1003,7 +1027,7 @@ protected function assertFieldByName($name, $value = NULL, $message = NULL, $gro
* TRUE on pass, FALSE on fail.
*/
protected function assertNoFieldByName($name, $value = '', $message = '', $group = 'Browser') {
- return $this->assertNoFieldByXPath($this->constructFieldXpath('name', $name), $value, $message ? $message : String::format('Did not find field by name @name', array('@name' => $name)), $group);
+ return $this->assertNoFieldByXPath($this->constructFieldXpath('name', $name), $value, $message ? $message : SafeMarkup::format('Did not find field by name @name', array('@name' => $name)), $group);
}
/**
@@ -1018,8 +1042,9 @@ protected function assertNoFieldByName($name, $value = '', $message = '', $group
* string.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -1030,7 +1055,7 @@ protected function assertNoFieldByName($name, $value = '', $message = '', $group
* TRUE on pass, FALSE on fail.
*/
protected function assertFieldById($id, $value = '', $message = '', $group = 'Browser') {
- return $this->assertFieldByXPath($this->constructFieldXpath('id', $id), $value, $message ? $message : String::format('Found field by id @id', array('@id' => $id)), $group);
+ return $this->assertFieldByXPath($this->constructFieldXpath('id', $id), $value, $message ? $message : SafeMarkup::format('Found field by id @id', array('@id' => $id)), $group);
}
/**
@@ -1045,8 +1070,9 @@ protected function assertFieldById($id, $value = '', $message = '', $group = 'Br
* value ('') asserts that the field value is not an empty string.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -1057,7 +1083,7 @@ protected function assertFieldById($id, $value = '', $message = '', $group = 'Br
* TRUE on pass, FALSE on fail.
*/
protected function assertNoFieldById($id, $value = '', $message = '', $group = 'Browser') {
- return $this->assertNoFieldByXPath($this->constructFieldXpath('id', $id), $value, $message ? $message : String::format('Did not find field by id @id', array('@id' => $id)), $group);
+ return $this->assertNoFieldByXPath($this->constructFieldXpath('id', $id), $value, $message ? $message : SafeMarkup::format('Did not find field by id @id', array('@id' => $id)), $group);
}
/**
@@ -1067,8 +1093,9 @@ protected function assertNoFieldById($id, $value = '', $message = '', $group = '
* ID of field to assert.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -1080,7 +1107,7 @@ protected function assertNoFieldById($id, $value = '', $message = '', $group = '
*/
protected function assertFieldChecked($id, $message = '', $group = 'Browser') {
$elements = $this->xpath('//input[@id=:id]', array(':id' => $id));
- return $this->assertTrue(isset($elements[0]) && !empty($elements[0]['checked']), $message ? $message : String::format('Checkbox field @id is checked.', array('@id' => $id)), $group);
+ return $this->assertTrue(isset($elements[0]) && !empty($elements[0]['checked']), $message ? $message : SafeMarkup::format('Checkbox field @id is checked.', array('@id' => $id)), $group);
}
/**
@@ -1090,8 +1117,9 @@ protected function assertFieldChecked($id, $message = '', $group = 'Browser') {
* ID of field to assert.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -1103,7 +1131,7 @@ protected function assertFieldChecked($id, $message = '', $group = 'Browser') {
*/
protected function assertNoFieldChecked($id, $message = '', $group = 'Browser') {
$elements = $this->xpath('//input[@id=:id]', array(':id' => $id));
- return $this->assertTrue(isset($elements[0]) && empty($elements[0]['checked']), $message ? $message : String::format('Checkbox field @id is not checked.', array('@id' => $id)), $group);
+ return $this->assertTrue(isset($elements[0]) && empty($elements[0]['checked']), $message ? $message : SafeMarkup::format('Checkbox field @id is not checked.', array('@id' => $id)), $group);
}
/**
@@ -1115,8 +1143,9 @@ protected function assertNoFieldChecked($id, $message = '', $group = 'Browser')
* Option to assert.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -1128,7 +1157,7 @@ protected function assertNoFieldChecked($id, $message = '', $group = 'Browser')
*/
protected function assertOption($id, $option, $message = '', $group = 'Browser') {
$options = $this->xpath('//select[@id=:id]//option[@value=:option]', array(':id' => $id, ':option' => $option));
- return $this->assertTrue(isset($options[0]), $message ? $message : String::format('Option @option for field @id exists.', array('@option' => $option, '@id' => $id)), $group);
+ return $this->assertTrue(isset($options[0]), $message ? $message : SafeMarkup::format('Option @option for field @id exists.', array('@option' => $option, '@id' => $id)), $group);
}
/**
@@ -1140,8 +1169,9 @@ protected function assertOption($id, $option, $message = '', $group = 'Browser')
* Option to assert.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -1154,7 +1184,7 @@ protected function assertOption($id, $option, $message = '', $group = 'Browser')
protected function assertNoOption($id, $option, $message = '', $group = 'Browser') {
$selects = $this->xpath('//select[@id=:id]', array(':id' => $id));
$options = $this->xpath('//select[@id=:id]//option[@value=:option]', array(':id' => $id, ':option' => $option));
- return $this->assertTrue(isset($selects[0]) && !isset($options[0]), $message ? $message : String::format('Option @option for field @id does not exist.', array('@option' => $option, '@id' => $id)), $group);
+ return $this->assertTrue(isset($selects[0]) && !isset($options[0]), $message ? $message : SafeMarkup::format('Option @option for field @id does not exist.', array('@option' => $option, '@id' => $id)), $group);
}
/**
@@ -1166,8 +1196,9 @@ protected function assertNoOption($id, $option, $message = '', $group = 'Browser
* Option to assert.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -1181,7 +1212,7 @@ protected function assertNoOption($id, $option, $message = '', $group = 'Browser
*/
protected function assertOptionSelected($id, $option, $message = '', $group = 'Browser') {
$elements = $this->xpath('//select[@id=:id]//option[@value=:option]', array(':id' => $id, ':option' => $option));
- return $this->assertTrue(isset($elements[0]) && !empty($elements[0]['selected']), $message ? $message : String::format('Option @option for field @id is selected.', array('@option' => $option, '@id' => $id)), $group);
+ return $this->assertTrue(isset($elements[0]) && !empty($elements[0]['selected']), $message ? $message : SafeMarkup::format('Option @option for field @id is selected.', array('@option' => $option, '@id' => $id)), $group);
}
/**
@@ -1193,8 +1224,9 @@ protected function assertOptionSelected($id, $option, $message = '', $group = 'B
* Option to assert.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -1206,7 +1238,7 @@ protected function assertOptionSelected($id, $option, $message = '', $group = 'B
*/
protected function assertNoOptionSelected($id, $option, $message = '', $group = 'Browser') {
$elements = $this->xpath('//select[@id=:id]//option[@value=:option]', array(':id' => $id, ':option' => $option));
- return $this->assertTrue(isset($elements[0]) && empty($elements[0]['selected']), $message ? $message : String::format('Option @option for field @id is not selected.', array('@option' => $option, '@id' => $id)), $group);
+ return $this->assertTrue(isset($elements[0]) && empty($elements[0]['selected']), $message ? $message : SafeMarkup::format('Option @option for field @id is not selected.', array('@option' => $option, '@id' => $id)), $group);
}
/**
@@ -1216,8 +1248,9 @@ protected function assertNoOptionSelected($id, $option, $message = '', $group =
* Name or ID of field to assert.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -1238,8 +1271,9 @@ protected function assertField($field, $message = '', $group = 'Other') {
* Name or ID of field to assert.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -1258,8 +1292,9 @@ protected function assertNoField($field, $message = '', $group = 'Other') {
*
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+ * variables in the message text, not t(). If left blank, a default message
+ * will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -1281,7 +1316,7 @@ protected function assertNoDuplicateIds($message = '', $group = 'Other', $ids_to
foreach ($this->xpath('//*[@id]') as $element) {
$id = (string) $element['id'];
if (isset($seen_ids[$id]) && !in_array($id, $ids_to_skip)) {
- $this->fail(String::format('The HTML ID %id is unique.', array('%id' => $id)), $group);
+ $this->fail(SafeMarkup::format('The HTML ID %id is unique.', array('%id' => $id)), $group);
$status = FALSE;
}
$seen_ids[$id] = TRUE;
diff --git a/core/modules/simpletest/src/KernelTestBase.php b/core/modules/simpletest/src/KernelTestBase.php
index abc1f20..bd98425 100644
--- a/core/modules/simpletest/src/KernelTestBase.php
+++ b/core/modules/simpletest/src/KernelTestBase.php
@@ -370,13 +370,13 @@ public function containerBuild(ContainerBuilder $container) {
protected function installConfig(array $modules) {
foreach ($modules as $module) {
if (!$this->container->get('module_handler')->moduleExists($module)) {
- throw new \RuntimeException(format_string("'@module' module is not enabled.", array(
+ throw new \RuntimeException(SafeMarkup::format("'@module' module is not enabled.", array(
'@module' => $module,
)));
}
\Drupal::service('config.installer')->installDefaultConfig('module', $module);
}
- $this->pass(format_string('Installed default config: %modules.', array(
+ $this->pass(SafeMarkup::format('Installed default config: %modules.', array(
'%modules' => implode(', ', $modules),
)));
}
@@ -400,7 +400,7 @@ protected function installSchema($module, $tables) {
// behavior and non-reproducible test failures, we only allow the schema of
// explicitly loaded/enabled modules to be installed.
if (!$this->container->get('module_handler')->moduleExists($module)) {
- throw new \RuntimeException(format_string("'@module' module is not enabled.", array(
+ throw new \RuntimeException(SafeMarkup::format("'@module' module is not enabled.", array(
'@module' => $module,
)));
}
@@ -408,7 +408,7 @@ protected function installSchema($module, $tables) {
foreach ($tables as $table) {
$schema = drupal_get_schema_unprocessed($module, $table);
if (empty($schema)) {
- throw new \RuntimeException(format_string("Unknown '@table' table schema in '@module' module.", array(
+ throw new \RuntimeException(SafeMarkup::format("Unknown '@table' table schema in '@module' module.", array(
'@module' => $module,
'@table' => $table,
)));
@@ -419,7 +419,7 @@ protected function installSchema($module, $tables) {
// would not know of/return the schema otherwise.
// @todo Refactor Schema API to make this obsolete.
drupal_get_schema(NULL, TRUE);
- $this->pass(format_string('Installed %module tables: %tables.', array(
+ $this->pass(SafeMarkup::format('Installed %module tables: %tables.', array(
'%tables' => '{' . implode('}, {', $tables) . '}',
'%module' => $module,
)));
@@ -448,7 +448,7 @@ protected function installEntitySchema($entity_type_id) {
$all_tables_exist = TRUE;
foreach ($tables as $table) {
if (!$db_schema->tableExists($table)) {
- $this->fail(String::format('Installed entity type table for the %entity_type entity type: %table', array(
+ $this->fail(SafeMarkup::format('Installed entity type table for the %entity_type entity type: %table', array(
'%entity_type' => $entity_type_id,
'%table' => $table,
)));
@@ -456,7 +456,7 @@ protected function installEntitySchema($entity_type_id) {
}
}
if ($all_tables_exist) {
- $this->pass(String::format('Installed entity type tables for the %entity_type entity type: %tables', array(
+ $this->pass(SafeMarkup::format('Installed entity type tables for the %entity_type entity type: %tables', array(
'%entity_type' => $entity_type_id,
'%tables' => '{' . implode('}, {', $tables) . '}',
)));
@@ -496,7 +496,7 @@ protected function enableModules(array $modules) {
// Note that the kernel has rebuilt the container; this $module_handler is
// no longer the $module_handler instance from above.
$this->container->get('module_handler')->reload();
- $this->pass(format_string('Enabled modules: %modules.', array(
+ $this->pass(SafeMarkup::format('Enabled modules: %modules.', array(
'%modules' => implode(', ', $modules),
)));
}
@@ -530,7 +530,7 @@ protected function disableModules(array $modules) {
// no longer the $module_handler instance from above.
$module_handler = $this->container->get('module_handler');
$module_handler->reload();
- $this->pass(format_string('Disabled modules: %modules.', array(
+ $this->pass(SafeMarkup::format('Disabled modules: %modules.', array(
'%modules' => implode(', ', $modules),
)));
}
diff --git a/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php
index b621140..b4dbf39 100644
--- a/core/modules/simpletest/src/TestBase.php
+++ b/core/modules/simpletest/src/TestBase.php
@@ -371,7 +371,7 @@ protected function storeAssertion(array $assertion) {
* TRUE is a synonym for 'pass', FALSE for 'fail'.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -555,7 +555,7 @@ protected function getAssertionCall() {
* The value on which the assertion is to be done.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -568,7 +568,7 @@ protected function getAssertionCall() {
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertTrue($value, $message = '', $group = 'Other') {
- return $this->assert((bool) $value, $message ? $message : String::format('Value @value is TRUE.', array('@value' => var_export($value, TRUE))), $group);
+ return $this->assert((bool) $value, $message ? $message : SafeMarkup::format('Value @value is TRUE.', array('@value' => var_export($value, TRUE))), $group);
}
/**
@@ -580,7 +580,7 @@ protected function assertTrue($value, $message = '', $group = 'Other') {
* The value on which the assertion is to be done.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -593,7 +593,7 @@ protected function assertTrue($value, $message = '', $group = 'Other') {
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertFalse($value, $message = '', $group = 'Other') {
- return $this->assert(!$value, $message ? $message : String::format('Value @value is FALSE.', array('@value' => var_export($value, TRUE))), $group);
+ return $this->assert(!$value, $message ? $message : SafeMarkup::format('Value @value is FALSE.', array('@value' => var_export($value, TRUE))), $group);
}
/**
@@ -603,7 +603,7 @@ protected function assertFalse($value, $message = '', $group = 'Other') {
* The value on which the assertion is to be done.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -616,7 +616,7 @@ protected function assertFalse($value, $message = '', $group = 'Other') {
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertNull($value, $message = '', $group = 'Other') {
- return $this->assert(!isset($value), $message ? $message : String::format('Value @value is NULL.', array('@value' => var_export($value, TRUE))), $group);
+ return $this->assert(!isset($value), $message ? $message : SafeMarkup::format('Value @value is NULL.', array('@value' => var_export($value, TRUE))), $group);
}
/**
@@ -626,7 +626,7 @@ protected function assertNull($value, $message = '', $group = 'Other') {
* The value on which the assertion is to be done.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -639,7 +639,7 @@ protected function assertNull($value, $message = '', $group = 'Other') {
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertNotNull($value, $message = '', $group = 'Other') {
- return $this->assert(isset($value), $message ? $message : String::format('Value @value is not NULL.', array('@value' => var_export($value, TRUE))), $group);
+ return $this->assert(isset($value), $message ? $message : SafeMarkup::format('Value @value is not NULL.', array('@value' => var_export($value, TRUE))), $group);
}
/**
@@ -651,7 +651,7 @@ protected function assertNotNull($value, $message = '', $group = 'Other') {
* The second value to check.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -664,7 +664,7 @@ protected function assertNotNull($value, $message = '', $group = 'Other') {
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertEqual($first, $second, $message = '', $group = 'Other') {
- return $this->assert($first == $second, $message ? $message : String::format('Value @first is equal to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
+ return $this->assert($first == $second, $message ? $message : SafeMarkup::format('Value @first is equal to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
}
/**
@@ -676,7 +676,7 @@ protected function assertEqual($first, $second, $message = '', $group = 'Other')
* The second value to check.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -689,7 +689,7 @@ protected function assertEqual($first, $second, $message = '', $group = 'Other')
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertNotEqual($first, $second, $message = '', $group = 'Other') {
- return $this->assert($first != $second, $message ? $message : String::format('Value @first is not equal to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
+ return $this->assert($first != $second, $message ? $message : SafeMarkup::format('Value @first is not equal to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
}
/**
@@ -701,7 +701,7 @@ protected function assertNotEqual($first, $second, $message = '', $group = 'Othe
* The second value to check.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -714,7 +714,7 @@ protected function assertNotEqual($first, $second, $message = '', $group = 'Othe
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertIdentical($first, $second, $message = '', $group = 'Other') {
- return $this->assert($first === $second, $message ? $message : String::format('Value @first is identical to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
+ return $this->assert($first === $second, $message ? $message : SafeMarkup::format('Value @first is identical to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
}
/**
@@ -726,7 +726,7 @@ protected function assertIdentical($first, $second, $message = '', $group = 'Oth
* The second value to check.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -739,7 +739,7 @@ protected function assertIdentical($first, $second, $message = '', $group = 'Oth
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertNotIdentical($first, $second, $message = '', $group = 'Other') {
- return $this->assert($first !== $second, $message ? $message : String::format('Value @first is not identical to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
+ return $this->assert($first !== $second, $message ? $message : SafeMarkup::format('Value @first is not identical to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
}
/**
@@ -751,7 +751,7 @@ protected function assertNotIdentical($first, $second, $message = '', $group = '
* The second object to check.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -764,7 +764,7 @@ protected function assertNotIdentical($first, $second, $message = '', $group = '
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertIdenticalObject($object1, $object2, $message = '', $group = 'Other') {
- $message = $message ?: String::format('!object1 is identical to !object2', array(
+ $message = $message ?: SafeMarkup::format('!object1 is identical to !object2', array(
'!object1' => var_export($object1, TRUE),
'!object2' => var_export($object2, TRUE),
));
@@ -795,7 +795,7 @@ protected function assertNoErrorsLogged() {
*
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -816,7 +816,7 @@ protected function pass($message = NULL, $group = 'Other') {
*
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -837,7 +837,7 @@ protected function fail($message = NULL, $group = 'Other') {
*
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -1400,7 +1400,7 @@ protected function exceptionHandler($exception) {
// message through \Drupal\Component\Utility\String::checkPlain().
$decoded_exception = Error::decodeException($exception);
unset($decoded_exception['backtrace']);
- $message = String::format('%type: !message in %function (line %line of %file). !backtrace
', $decoded_exception + array(
+ $message = SafeMarkup::format('%type: !message in %function (line %line of %file). !backtrace
', $decoded_exception + array(
'!backtrace' => Error::formatBacktrace($verbose_backtrace),
));
$this->error($message, 'Uncaught exception', Error::getLastCaller($backtrace));
diff --git a/core/modules/simpletest/src/Tests/MailCaptureTest.php b/core/modules/simpletest/src/Tests/MailCaptureTest.php
index 00b4be8..34b518e 100644
--- a/core/modules/simpletest/src/Tests/MailCaptureTest.php
+++ b/core/modules/simpletest/src/Tests/MailCaptureTest.php
@@ -7,6 +7,7 @@
namespace Drupal\simpletest\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\simpletest\WebTestBase;
/**
@@ -45,7 +46,7 @@ function testMailSend() {
// Assert that the email was sent by iterating over the message properties
// and ensuring that they are captured intact.
foreach ($message as $field => $value) {
- $this->assertMail($field, $value, format_string('The email was sent and the value for property @field is intact.', array('@field' => $field)), 'Email');
+ $this->assertMail($field, $value, SafeMarkup::format('The email was sent and the value for property @field is intact.', array('@field' => $field)), 'Email');
}
// Send additional emails so more than one email is captured.
diff --git a/core/modules/simpletest/src/Tests/SimpleTestTest.php b/core/modules/simpletest/src/Tests/SimpleTestTest.php
index 20b5a75..b92dfb3 100644
--- a/core/modules/simpletest/src/Tests/SimpleTestTest.php
+++ b/core/modules/simpletest/src/Tests/SimpleTestTest.php
@@ -8,6 +8,7 @@
namespace Drupal\simpletest\Tests;
use Drupal\Component\Utility\Crypt;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\simpletest\WebTestBase;
/**
@@ -291,7 +292,7 @@ function assertAssertion($message, $type, $status, $file, $function) {
break;
}
}
- return $this->assertTrue($found, format_string('Found assertion {"@message", "@type", "@status", "@file", "@function"}.', array('@message' => $message, '@type' => $type, '@status' => $status, "@file" => $file, "@function" => $function)));
+ return $this->assertTrue($found, SafeMarkup::format('Found assertion {"@message", "@type", "@status", "@file", "@function"}.', array('@message' => $message, '@type' => $type, '@status' => $status, "@file" => $file, "@function" => $function)));
}
/**
diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php
index 7088456..eb014d1 100644
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -292,7 +292,7 @@ protected function drupalCreateContentType(array $values = array()) {
node_add_body_field($type);
\Drupal::service('router.builder')->rebuild();
- $this->assertEqual($status, SAVED_NEW, String::format('Created content type %type.', array('%type' => $type->id())));
+ $this->assertEqual($status, SAVED_NEW, SafeMarkup::format('Created content type %type.', array('%type' => $type->id())));
return $type;
}
@@ -419,7 +419,7 @@ protected function drupalPlaceBlock($plugin_id, array $settings = array()) {
*/
protected function assertBlockAppears(Block $block) {
$result = $this->findBlockInstance($block);
- $this->assertTrue(!empty($result), format_string('Ensure the block @id appears on the page', array('@id' => $block->id())));
+ $this->assertTrue(!empty($result), SafeMarkup::format('Ensure the block @id appears on the page', array('@id' => $block->id())));
}
/**
@@ -430,7 +430,7 @@ protected function assertBlockAppears(Block $block) {
*/
protected function assertNoBlockAppears(Block $block) {
$result = $this->findBlockInstance($block);
- $this->assertFalse(!empty($result), format_string('Ensure the block @id does not appear on the page', array('@id' => $block->id())));
+ $this->assertFalse(!empty($result), SafeMarkup::format('Ensure the block @id does not appear on the page', array('@id' => $block->id())));
}
/**
@@ -554,7 +554,7 @@ protected function drupalCreateUser(array $permissions = array(), $name = NULL)
$account = entity_create('user', $edit);
$account->save();
- $this->assertTrue($account->id(), String::format('User created with name %name and pass %pass', array('%name' => $edit['name'], '%pass' => $edit['pass'])), 'User login');
+ $this->assertTrue($account->id(), SafeMarkup::format('User created with name %name and pass %pass', array('%name' => $edit['name'], '%pass' => $edit['pass'])), 'User login');
if (!$account->id()) {
return FALSE;
}
@@ -607,7 +607,7 @@ protected function drupalCreateRole(array $permissions, $rid = NULL, $name = NUL
}
$result = $role->save();
- $this->assertIdentical($result, SAVED_NEW, String::format('Created role ID @rid with name @name.', array(
+ $this->assertIdentical($result, SAVED_NEW, SafeMarkup::format('Created role ID @rid with name @name.', array(
'@name' => var_export($role->label(), TRUE),
'@rid' => var_export($role->id(), TRUE),
)), 'Role');
@@ -619,10 +619,10 @@ protected function drupalCreateRole(array $permissions, $rid = NULL, $name = NUL
$assigned_permissions = Role::load($role->id())->getPermissions();
$missing_permissions = array_diff($permissions, $assigned_permissions);
if (!$missing_permissions) {
- $this->pass(String::format('Created permissions: @perms', array('@perms' => implode(', ', $permissions))), 'Role');
+ $this->pass(SafeMarkup::format('Created permissions: @perms', array('@perms' => implode(', ', $permissions))), 'Role');
}
else {
- $this->fail(String::format('Failed to create permissions: @perms', array('@perms' => implode(', ', $missing_permissions))), 'Role');
+ $this->fail(SafeMarkup::format('Failed to create permissions: @perms', array('@perms' => implode(', ', $missing_permissions))), 'Role');
}
}
return $role->id();
@@ -646,7 +646,7 @@ protected function checkPermissions(array $permissions) {
$valid = TRUE;
foreach ($permissions as $permission) {
if (!in_array($permission, $available)) {
- $this->fail(String::format('Invalid permission %permission.', array('%permission' => $permission)), 'Role');
+ $this->fail(SafeMarkup::format('Invalid permission %permission.', array('%permission' => $permission)), 'Role');
$valid = FALSE;
}
}
@@ -695,7 +695,7 @@ protected function drupalLogin(AccountInterface $account) {
if (isset($this->sessionId)) {
$account->session_id = $this->sessionId;
}
- $pass = $this->assert($this->drupalUserIsLoggedIn($account), format_string('User %name successfully logged in.', array('%name' => $account->getUsername())), 'User login');
+ $pass = $this->assert($this->drupalUserIsLoggedIn($account), SafeMarkup::format('User %name successfully logged in.', array('%name' => $account->getUsername())), 'User login');
if ($pass) {
$this->loggedInUser = $account;
$this->container->get('current_user')->setAccount($account);
@@ -939,7 +939,7 @@ protected function setUp() {
$modules = array_unique($modules);
try {
$success = $container->get('module_installer')->install($modules, TRUE);
- $this->assertTrue($success, String::format('Enabled modules: %modules', array('%modules' => implode(', ', $modules))));
+ $this->assertTrue($success, SafeMarkup::format('Enabled modules: %modules', array('%modules' => implode(', ', $modules))));
}
catch (\Drupal\Core\Extension\MissingDependencyException $e) {
// The exception message has all the details.
@@ -1396,7 +1396,7 @@ protected function curlExec($curl_options, $redirect = FALSE) {
'@status' => $status,
'!length' => format_size(strlen($this->getRawContent()))
);
- $message = String::format('!method @url returned @status (!length).', $message_vars);
+ $message = SafeMarkup::format('!method @url returned @status (!length).', $message_vars);
$this->assertTrue($this->getRawContent() !== FALSE, $message, 'Browser');
return $this->getRawContent();
}
@@ -1716,12 +1716,12 @@ protected function drupalPostForm($path, $edit, $submit, array $options = array(
}
// We have not found a form which contained all fields of $edit.
foreach ($edit as $name => $value) {
- $this->fail(String::format('Failed to set field @name to @value', array('@name' => $name, '@value' => $value)));
+ $this->fail(SafeMarkup::format('Failed to set field @name to @value', array('@name' => $name, '@value' => $value)));
}
if (!$ajax && isset($submit)) {
- $this->assertTrue($submit_matches, format_string('Found the @submit button', array('@submit' => $submit)));
+ $this->assertTrue($submit_matches, SafeMarkup::format('Found the @submit button', array('@submit' => $submit)));
}
- $this->fail(format_string('Found the requested form fields at @path', array('@path' => $path)));
+ $this->fail(SafeMarkup::format('Found the requested form fields at @path', array('@path' => $path)));
}
}
@@ -2302,10 +2302,10 @@ protected function clickLink($label, $index = 0) {
$urls = $this->xpath('//a[normalize-space()=:label]', array(':label' => $label));
if (isset($urls[$index])) {
$url_target = $this->getAbsoluteUrl($urls[$index]['href']);
- $this->pass(String::format('Clicked link %label (@url_target) from @url_before', array('%label' => $label, '@url_target' => $url_target, '@url_before' => $url_before)), 'Browser');
+ $this->pass(SafeMarkup::format('Clicked link %label (@url_target) from @url_before', array('%label' => $label, '@url_target' => $url_target, '@url_before' => $url_before)), 'Browser');
return $this->drupalGet($url_target);
}
- $this->fail(String::format('Link %label does not exist on @url_before', array('%label' => $label, '@url_before' => $url_before)), 'Browser');
+ $this->fail(SafeMarkup::format('Link %label does not exist on @url_before', array('%label' => $label, '@url_before' => $url_before)), 'Browser');
return FALSE;
}
@@ -2465,8 +2465,8 @@ protected function drupalGetMails($filter = array()) {
* (optional) Any additional options to pass for $path to the url generator.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use SafeMarkup::format() to embed variables in the message text,
+ * not t(). If left blank, a default message will be displayed.
* @param $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -2485,7 +2485,7 @@ protected function assertUrl($path, array $options = array(), $message = '', $gr
$url = $this->container->get('url_generator')->generateFromPath($path, $options);
}
if (!$message) {
- $message = String::format('Expected @url matches current URL (@current_url).', array(
+ $message = SafeMarkup::format('Expected @url matches current URL (@current_url).', array(
'@url' => var_export($url, TRUE),
'@current_url' => $this->getUrl(),
));
@@ -2505,8 +2505,8 @@ protected function assertUrl($path, array $options = array(), $message = '', $gr
* of all codes see http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use SafeMarkup::format() to embed variables in the message text,
+ * not t(). If left blank, a default message will be displayed.
* @param $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -2519,7 +2519,7 @@ protected function assertUrl($path, array $options = array(), $message = '', $gr
protected function assertResponse($code, $message = '', $group = 'Browser') {
$curl_code = curl_getinfo($this->curlHandle, CURLINFO_HTTP_CODE);
$match = is_array($code) ? in_array($curl_code, $code) : $curl_code == $code;
- return $this->assertTrue($match, $message ? $message : String::format('HTTP response expected !code, actual !curl_code', array('!code' => $code, '!curl_code' => $curl_code)), $group);
+ return $this->assertTrue($match, $message ? $message : SafeMarkup::format('HTTP response expected !code, actual !curl_code', array('!code' => $code, '!curl_code' => $curl_code)), $group);
}
/**
@@ -2530,8 +2530,8 @@ protected function assertResponse($code, $message = '', $group = 'Browser') {
* of all codes see http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use SafeMarkup::format() to embed variables in the message text,
+ * not t(). If left blank, a default message will be displayed.
* @param $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -2544,7 +2544,7 @@ protected function assertResponse($code, $message = '', $group = 'Browser') {
protected function assertNoResponse($code, $message = '', $group = 'Browser') {
$curl_code = curl_getinfo($this->curlHandle, CURLINFO_HTTP_CODE);
$match = is_array($code) ? in_array($curl_code, $code) : $curl_code == $code;
- return $this->assertFalse($match, $message ? $message : String::format('HTTP response not expected !code, actual !curl_code', array('!code' => $code, '!curl_code' => $curl_code)), $group);
+ return $this->assertFalse($match, $message ? $message : SafeMarkup::format('HTTP response not expected !code, actual !curl_code', array('!code' => $code, '!curl_code' => $curl_code)), $group);
}
/**
@@ -2559,8 +2559,8 @@ protected function assertNoResponse($code, $message = '', $group = 'Browser') {
* Value of the field to assert.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use SafeMarkup::format() to embed variables in the message text,
+ * not t(). If left blank, a default message will be displayed.
* @param $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -2587,8 +2587,8 @@ protected function assertMail($name, $value = '', $message = '', $group = 'Email
* Number of emails to search for string, starting with most recent.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use SafeMarkup::format() to embed variables in the message text,
+ * not t(). If left blank, a default message will be displayed.
* @param $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -2613,7 +2613,7 @@ protected function assertMailString($field_name, $string, $email_depth, $message
}
}
if (!$message) {
- $message = format_string('Expected text found in @field of email message: "@expected".', array('@field' => $field_name, '@expected' => $string));
+ $message = SafeMarkup::format('Expected text found in @field of email message: "@expected".', array('@field' => $field_name, '@expected' => $string));
}
return $this->assertTrue($string_found, $message, $group);
}
@@ -2627,8 +2627,8 @@ protected function assertMailString($field_name, $string, $email_depth, $message
* Pattern to search for.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
- * t(). If left blank, a default message will be displayed.
+ * messages: use SafeMarkup::format() to embed variables in the message text,
+ * not t(). If left blank, a default message will be displayed.
* @param $group
* (optional) The group this message is in, which is displayed in a column
* in test output. Use 'Debug' to indicate this is debugging output. Do not
@@ -2643,7 +2643,7 @@ protected function assertMailPattern($field_name, $regex, $message = '', $group
$mail = end($mails);
$regex_found = preg_match("/$regex/", $mail[$field_name]);
if (!$message) {
- $message = format_string('Expected text found in @field of email message: "@expected".', array('@field' => $field_name, '@expected' => $regex));
+ $message = SafeMarkup::format('Expected text found in @field of email message: "@expected".', array('@field' => $field_name, '@expected' => $regex));
}
return $this->assertTrue($regex_found, $message, $group);
}
diff --git a/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php b/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php
index d481f01..93ea929 100644
--- a/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php
+++ b/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php
@@ -6,6 +6,7 @@
*/
namespace Drupal\statistics\Tests;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Generates text using placeholders for dummy content to check statistics token
@@ -50,7 +51,7 @@ function testStatisticsTokenReplacement() {
foreach ($tests as $input => $expected) {
$output = \Drupal::token()->replace($input, array('node' => $node), array('langcode' => $language_interface->getId()));
- $this->assertEqual($output, $expected, format_string('Statistics token %token replaced.', array('%token' => $input)));
+ $this->assertEqual($output, $expected, SafeMarkup::format('Statistics token %token replaced.', array('%token' => $input)));
}
}
}
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Convert.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Convert.php
index 51d79aa..6e093e7 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Convert.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Convert.php
@@ -38,7 +38,7 @@ protected function arguments() {
*/
protected function validateArguments(array $arguments) {
if (!in_array($arguments['extension'], $this->getToolkit()->getSupportedExtensions())) {
- throw new \InvalidArgumentException(String::format("Invalid extension (@value) specified for the image 'convert' operation", array('@value' => $arguments['extension'])));
+ throw new \InvalidArgumentException(SafeMarkup::format("Invalid extension (@value) specified for the image 'convert' operation", array('@value' => $arguments['extension'])));
}
return $arguments;
}
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/CreateNew.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/CreateNew.php
index 126f53c..5c0136d 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/CreateNew.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/CreateNew.php
@@ -8,6 +8,7 @@
namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
use Drupal\Component\Utility\Color;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
/**
@@ -53,7 +54,7 @@ protected function arguments() {
protected function validateArguments(array $arguments) {
// Assure extension is supported.
if (!in_array($arguments['extension'], $this->getToolkit()->getSupportedExtensions())) {
- throw new \InvalidArgumentException(String::format("Invalid extension (@value) specified for the image 'convert' operation", array('@value' => $arguments['extension'])));
+ throw new \InvalidArgumentException(SafeMarkup::format("Invalid extension (@value) specified for the image 'convert' operation", array('@value' => $arguments['extension'])));
}
// Assure integers for width and height.
@@ -62,15 +63,15 @@ protected function validateArguments(array $arguments) {
// Fail when width or height are 0 or negative.
if ($arguments['width'] <= 0) {
- throw new \InvalidArgumentException(String::format("Invalid width (@value) specified for the image 'create_new' operation", array('@value' => $arguments['width'])));
+ throw new \InvalidArgumentException(SafeMarkup::format("Invalid width (@value) specified for the image 'create_new' operation", array('@value' => $arguments['width'])));
}
if ($arguments['height'] <= 0) {
- throw new \InvalidArgumentException(String::format("Invalid height (@value) specified for the image 'create_new' operation", array('@value' => $arguments['height'])));
+ throw new \InvalidArgumentException(SafeMarkup::format("Invalid height (@value) specified for the image 'create_new' operation", array('@value' => $arguments['height'])));
}
// Assure transparent color is a valid hex string.
if ($arguments['transparent_color'] && !Color::validateHex($arguments['transparent_color'])) {
- throw new \InvalidArgumentException(String::format("Invalid transparent color (@value) specified for the image 'create_new' operation", array('@value' => $arguments['transparent_color'])));
+ throw new \InvalidArgumentException(SafeMarkup::format("Invalid transparent color (@value) specified for the image 'create_new' operation", array('@value' => $arguments['transparent_color'])));
}
return $arguments;
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Crop.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Crop.php
index fbda1ec..1e76e53 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Crop.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Crop.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
/**
@@ -67,10 +68,10 @@ protected function validateArguments(array $arguments) {
// Fail when width or height are 0 or negative.
if ($arguments['width'] <= 0) {
- throw new \InvalidArgumentException(String::format("Invalid width (@value) specified for the image 'crop' operation", array('@value' => $arguments['width'])));
+ throw new \InvalidArgumentException(SafeMarkup::format("Invalid width (@value) specified for the image 'crop' operation", array('@value' => $arguments['width'])));
}
if ($arguments['height'] <= 0) {
- throw new \InvalidArgumentException(String::format("Invalid height (@value) specified for the image 'crop' operation", array('@value' => $arguments['height'])));
+ throw new \InvalidArgumentException(SafeMarkup::format("Invalid height (@value) specified for the image 'crop' operation", array('@value' => $arguments['height'])));
}
return $arguments;
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Resize.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Resize.php
index a5f6362..83557fe 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Resize.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Resize.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
/**
@@ -46,10 +47,10 @@ protected function validateArguments(array $arguments) {
// Fail when width or height are 0 or negative.
if ($arguments['width'] <= 0) {
- throw new \InvalidArgumentException(String::format("Invalid width (@value) specified for the image 'resize' operation", array('@value' => $arguments['width'])));
+ throw new \InvalidArgumentException(SafeMarkup::format("Invalid width (@value) specified for the image 'resize' operation", array('@value' => $arguments['width'])));
}
if ($arguments['height'] <= 0) {
- throw new \InvalidArgumentException(String::format("Invalid height (@value) specified for the image 'resize' operation", array('@value' => $arguments['height'])));
+ throw new \InvalidArgumentException(SafeMarkup::format("Invalid height (@value) specified for the image 'resize' operation", array('@value' => $arguments['height'])));
}
return $arguments;
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Scale.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Scale.php
index ee08c56..410ab13 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Scale.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Scale.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
/**
@@ -73,10 +74,10 @@ protected function validateArguments(array $arguments) {
// Fail when width or height are 0 or negative.
if ($arguments['width'] <= 0) {
- throw new \InvalidArgumentException(String::format("Invalid width (@value) specified for the image 'scale' operation", array('@value' => $arguments['width'])));
+ throw new \InvalidArgumentException(SafeMarkup::format("Invalid width (@value) specified for the image 'scale' operation", array('@value' => $arguments['width'])));
}
if ($arguments['height'] <= 0) {
- throw new \InvalidArgumentException(String::format("Invalid height (@value) specified for the image 'scale' operation", array('@value' => $arguments['height'])));
+ throw new \InvalidArgumentException(SafeMarkup::format("Invalid height (@value) specified for the image 'scale' operation", array('@value' => $arguments['height'])));
}
return $arguments;
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/ScaleAndCrop.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/ScaleAndCrop.php
index 832c5b4..743d6d5 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/ScaleAndCrop.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/ScaleAndCrop.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
/**
@@ -54,10 +55,10 @@ protected function validateArguments(array $arguments) {
// Fail when width or height are 0 or negative.
if ($arguments['width'] <= 0) {
- throw new \InvalidArgumentException(String::format("Invalid width (@value) specified for the image 'scale_and_crop' operation", array('@value' => $arguments['width'])));
+ throw new \InvalidArgumentException(SafeMarkup::format("Invalid width (@value) specified for the image 'scale_and_crop' operation", array('@value' => $arguments['width'])));
}
if ($arguments['height'] <= 0) {
- throw new \InvalidArgumentException(String::format("Invalid height (@value) specified for the image 'scale_and_crop' operation", array('@value' => $arguments['height'])));
+ throw new \InvalidArgumentException(SafeMarkup::format("Invalid height (@value) specified for the image 'scale_and_crop' operation", array('@value' => $arguments['height'])));
}
return $arguments;
diff --git a/core/modules/system/src/Tests/Ajax/FrameworkTest.php b/core/modules/system/src/Tests/Ajax/FrameworkTest.php
index 901db97..e509a6d 100644
--- a/core/modules/system/src/Tests/Ajax/FrameworkTest.php
+++ b/core/modules/system/src/Tests/Ajax/FrameworkTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Ajax;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Ajax\AddCssCommand;
use Drupal\Core\Ajax\AlertCommand;
use Drupal\Core\Ajax\AppendCommand;
@@ -114,9 +115,9 @@ public function testLazyLoad() {
// Verify that the base page doesn't have the settings and files that are to
// be lazy loaded as part of the next requests.
- $this->assertTrue(!isset($original_settings[$expected['setting_name']]), format_string('Page originally lacks the %setting, as expected.', array('%setting' => $expected['setting_name'])));
- $this->assertTrue(!in_array($expected['library_1'], $original_libraries), format_string('Page originally lacks the %library library, as expected.', array('%library' => $expected['library_1'])));
- $this->assertTrue(!in_array($expected['library_2'], $original_libraries), format_string('Page originally lacks the %library library, as expected.', array('%library' => $expected['library_2'])));
+ $this->assertTrue(!isset($original_settings[$expected['setting_name']]), SafeMarkup::format('Page originally lacks the %setting, as expected.', array('%setting' => $expected['setting_name'])));
+ $this->assertTrue(!in_array($expected['library_1'], $original_libraries), SafeMarkup::format('Page originally lacks the %library library, as expected.', array('%library' => $expected['library_1'])));
+ $this->assertTrue(!in_array($expected['library_2'], $original_libraries), SafeMarkup::format('Page originally lacks the %library library, as expected.', array('%library' => $expected['library_2'])));
// Calculate the expected CSS and JS.
$assets = new AttachedAssets();
@@ -138,9 +139,9 @@ public function testLazyLoad() {
$new_libraries = explode(',', $new_settings['ajaxPageState']['libraries']);
// Verify the setting was not added when not expected.
- $this->assertTrue(!isset($new_settings[$expected['setting_name']]), format_string('Page still lacks the %setting, as expected.', array('%setting' => $expected['setting_name'])));
- $this->assertTrue(!in_array($expected['library_1'], $new_libraries), format_string('Page still lacks the %library library, as expected.', array('%library' => $expected['library_1'])));
- $this->assertTrue(!in_array($expected['library_2'], $new_libraries), format_string('Page still lacks the %library library, as expected.', array('%library' => $expected['library_2'])));
+ $this->assertTrue(!isset($new_settings[$expected['setting_name']]), SafeMarkup::format('Page still lacks the %setting, as expected.', array('%setting' => $expected['setting_name'])));
+ $this->assertTrue(!in_array($expected['library_1'], $new_libraries), SafeMarkup::format('Page still lacks the %library library, as expected.', array('%library' => $expected['library_1'])));
+ $this->assertTrue(!in_array($expected['library_2'], $new_libraries), SafeMarkup::format('Page still lacks the %library library, as expected.', array('%library' => $expected['library_2'])));
// Verify a settings command does not add CSS or scripts to drupalSettings
// and no command inserts the corresponding tags on the page.
$found_settings_command = FALSE;
@@ -153,8 +154,8 @@ public function testLazyLoad() {
$found_markup_command = TRUE;
}
}
- $this->assertFalse($found_settings_command, format_string('Page state still lacks the %library_1 and %library_2 libraries, as expected.', array('%library_1' => $expected['library_1'], '%library_2' => $expected['library_2'])));
- $this->assertFalse($found_markup_command, format_string('Page still lacks the %library_1 and %library_2 libraries, as expected.', array('%library_1' => $expected['library_1'], '%library_2' => $expected['library_2'])));
+ $this->assertFalse($found_settings_command, SafeMarkup::format('Page state still lacks the %library_1 and %library_2 libraries, as expected.', array('%library_1' => $expected['library_1'], '%library_2' => $expected['library_2'])));
+ $this->assertFalse($found_markup_command, SafeMarkup::format('Page still lacks the %library_1 and %library_2 libraries, as expected.', array('%library_1' => $expected['library_1'], '%library_2' => $expected['library_2'])));
// Submit the AJAX request and trigger adding files.
$commands = $this->drupalPostAjaxForm(NULL, array('add_files' => TRUE), array('op' => t('Submit')));
@@ -163,14 +164,14 @@ public function testLazyLoad() {
// Verify the expected setting was added, both to drupalSettings, and as
// the first AJAX command.
- $this->assertIdentical($new_settings[$expected['setting_name']], $expected['setting_value'], format_string('Page now has the %setting.', array('%setting' => $expected['setting_name'])));
+ $this->assertIdentical($new_settings[$expected['setting_name']], $expected['setting_value'], SafeMarkup::format('Page now has the %setting.', array('%setting' => $expected['setting_name'])));
$expected_command = new SettingsCommand(array($expected['setting_name'] => $expected['setting_value']), TRUE);
- $this->assertCommand(array_slice($commands, 0, 1), $expected_command->render(), format_string('The settings command was first.'));
+ $this->assertCommand(array_slice($commands, 0, 1), $expected_command->render(), SafeMarkup::format('The settings command was first.'));
// Verify the expected CSS file was added, both to drupalSettings, and as
// the second AJAX command for inclusion into the HTML.
- $this->assertTrue(in_array($expected['library_1'], $new_libraries), format_string('Page state now has the %library library.', array('%library' => $expected['library_1'])));
- $this->assertCommand(array_slice($commands, 1, 1), array('data' => $expected_css_html), format_string('Page now has the %library library.', array('%library' => $expected['library_1'])));
+ $this->assertTrue(in_array($expected['library_1'], $new_libraries), SafeMarkup::format('Page state now has the %library library.', array('%library' => $expected['library_1'])));
+ $this->assertCommand(array_slice($commands, 1, 1), array('data' => $expected_css_html), SafeMarkup::format('Page now has the %library library.', array('%library' => $expected['library_1'])));
// Verify the expected JS file was added, both to drupalSettings, and as
// the third AJAX command for inclusion into the HTML. By testing for an
@@ -178,8 +179,8 @@ public function testLazyLoad() {
// unexpected JavaScript code, such as a jQuery.extend() that would
// potentially clobber rather than properly merge settings, didn't
// accidentally get added.
- $this->assertTrue(in_array($expected['library_2'], $new_libraries), format_string('Page state now has the %library library.', array('%library' => $expected['library_2'])));
- $this->assertCommand(array_slice($commands, 2, 1), array('data' => $expected_js_html), format_string('Page now has the %library library.', array('%library' => $expected['library_2'])));
+ $this->assertTrue(in_array($expected['library_2'], $new_libraries), SafeMarkup::format('Page state now has the %library library.', array('%library' => $expected['library_2'])));
+ $this->assertCommand(array_slice($commands, 2, 1), array('data' => $expected_js_html), SafeMarkup::format('Page now has the %library library.', array('%library' => $expected['library_2'])));
}
/**
diff --git a/core/modules/system/src/Tests/Block/SystemMenuBlockTest.php b/core/modules/system/src/Tests/Block/SystemMenuBlockTest.php
index 0361eb7..557f60f 100644
--- a/core/modules/system/src/Tests/Block/SystemMenuBlockTest.php
+++ b/core/modules/system/src/Tests/Block/SystemMenuBlockTest.php
@@ -5,6 +5,7 @@
namespace Drupal\system\Tests\Block;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Render\Element;
use Drupal\simpletest\KernelTestBase;
use Drupal\system\Tests\Routing\MockRouteProvider;
@@ -230,7 +231,7 @@ public function testConfigLevelDepth() {
foreach ($blocks as $id => $block) {
$block_build = $block->build();
$items = isset($block_build['#items']) ? $block_build['#items'] : [];
- $this->assertIdentical($no_active_trail_expectations[$id], $this->convertBuiltMenuToIdTree($items), format_string('Menu block %id with no active trail renders the expected tree.', ['%id' => $id]));
+ $this->assertIdentical($no_active_trail_expectations[$id], $this->convertBuiltMenuToIdTree($items), SafeMarkup::format('Menu block %id with no active trail renders the expected tree.', ['%id' => $id]));
}
// Scenario 2: test all block instances when there's an active trail.
@@ -278,7 +279,7 @@ public function testConfigLevelDepth() {
foreach ($blocks as $id => $block) {
$block_build = $block->build();
$items = isset($block_build['#items']) ? $block_build['#items'] : [];
- $this->assertIdentical($active_trail_expectations[$id], $this->convertBuiltMenuToIdTree($items), format_string('Menu block %id with an active trail renders the expected tree.', ['%id' => $id]));
+ $this->assertIdentical($active_trail_expectations[$id], $this->convertBuiltMenuToIdTree($items), SafeMarkup::format('Menu block %id with an active trail renders the expected tree.', ['%id' => $id]));
}
}
diff --git a/core/modules/system/src/Tests/Cache/ClearTest.php b/core/modules/system/src/Tests/Cache/ClearTest.php
index 1a152ed..b9f3d51 100644
--- a/core/modules/system/src/Tests/Cache/ClearTest.php
+++ b/core/modules/system/src/Tests/Cache/ClearTest.php
@@ -12,6 +12,7 @@
*
* @group Cache
*/
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Cache\Cache;
class ClearTest extends CacheTestBase {
@@ -40,7 +41,7 @@ function testFlushAllCaches() {
foreach ($bins as $bin => $cache_backend) {
$cid = 'test_cid_clear' . $bin;
- $this->assertFalse($this->checkCacheExists($cid, $this->default_value, $bin), format_string('All cache entries removed from @bin.', array('@bin' => $bin)));
+ $this->assertFalse($this->checkCacheExists($cid, $this->default_value, $bin), SafeMarkup::format('All cache entries removed from @bin.', array('@bin' => $bin)));
}
}
}
diff --git a/core/modules/system/src/Tests/Cache/PageCacheTagsTestBase.php b/core/modules/system/src/Tests/Cache/PageCacheTagsTestBase.php
index 3e3b1bc..96673a1 100644
--- a/core/modules/system/src/Tests/Cache/PageCacheTagsTestBase.php
+++ b/core/modules/system/src/Tests/Cache/PageCacheTagsTestBase.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Cache;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Url;
use Drupal\simpletest\WebTestBase;
use Drupal\Component\Utility\String;
@@ -50,7 +51,7 @@ protected function setUp() {
*/
protected function verifyPageCache(Url $url, $hit_or_miss, $tags = FALSE) {
$this->drupalGet($url);
- $message = String::format('Page cache @hit_or_miss for %path.', array('@hit_or_miss' => $hit_or_miss, '%path' => $url->toString()));
+ $message = SafeMarkup::format('Page cache @hit_or_miss for %path.', array('@hit_or_miss' => $hit_or_miss, '%path' => $url->toString()));
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), $hit_or_miss, $message);
if ($hit_or_miss === 'HIT' && is_array($tags)) {
diff --git a/core/modules/system/src/Tests/Common/AddFeedTest.php b/core/modules/system/src/Tests/Common/AddFeedTest.php
index 5da8ffb..5442964 100644
--- a/core/modules/system/src/Tests/Common/AddFeedTest.php
+++ b/core/modules/system/src/Tests/Common/AddFeedTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Common;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Url;
use Drupal\simpletest\WebTestBase;
@@ -65,7 +66,7 @@ function testBasicFeedAddNoTitle() {
$this->setRawContent(drupal_get_html_head());
foreach ($urls as $description => $feed_info) {
- $this->assertPattern($this->urlToRSSLinkPattern($feed_info['url'], $feed_info['title']), format_string('Found correct feed header for %description', array('%description' => $description)));
+ $this->assertPattern($this->urlToRSSLinkPattern($feed_info['url'], $feed_info['title']), SafeMarkup::format('Found correct feed header for %description', array('%description' => $description)));
}
}
diff --git a/core/modules/system/src/Tests/Common/RenderWebTest.php b/core/modules/system/src/Tests/Common/RenderWebTest.php
index 4bdb996..45a5449 100644
--- a/core/modules/system/src/Tests/Common/RenderWebTest.php
+++ b/core/modules/system/src/Tests/Common/RenderWebTest.php
@@ -155,7 +155,7 @@ protected function assertRenderedElement(array $element, $xpath, array $xpath_ar
// @see \Drupal\simpletest\WebTestBase::xpath()
$xpath = $this->buildXPathQuery($xpath, $xpath_args);
$element += array('#value' => NULL);
- $this->assertFieldByXPath($xpath, $element['#value'], format_string('#type @type was properly rendered.', array(
+ $this->assertFieldByXPath($xpath, $element['#value'], SafeMarkup::format('#type @type was properly rendered.', array(
'@type' => var_export($element['#type'], TRUE),
)));
}
diff --git a/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php b/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php
index ae419ff..5eee4f8 100644
--- a/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php
+++ b/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Common;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\simpletest\WebTestBase;
/**
@@ -88,11 +89,11 @@ protected function error($message = '', $group = 'Other', array $caller = NULL)
* Asserts that a collected error matches what we are expecting.
*/
function assertError($error, $group, $function, $file, $message = NULL) {
- $this->assertEqual($error['group'], $group, format_string("Group was %group", array('%group' => $group)));
- $this->assertEqual($error['caller']['function'], $function, format_string("Function was %function", array('%function' => $function)));
- $this->assertEqual(drupal_basename($error['caller']['file']), $file, format_string("File was %file", array('%file' => $file)));
+ $this->assertEqual($error['group'], $group, SafeMarkup::format("Group was %group", array('%group' => $group)));
+ $this->assertEqual($error['caller']['function'], $function, SafeMarkup::format("Function was %function", array('%function' => $function)));
+ $this->assertEqual(drupal_basename($error['caller']['file']), $file, SafeMarkup::format("File was %file", array('%file' => $file)));
if (isset($message)) {
- $this->assertEqual($error['message'], $message, format_string("Message was %message", array('%message' => $message)));
+ $this->assertEqual($error['message'], $message, SafeMarkup::format("Message was %message", array('%message' => $message)));
}
}
}
diff --git a/core/modules/system/src/Tests/Common/SystemListingTest.php b/core/modules/system/src/Tests/Common/SystemListingTest.php
index 861a1df..07c36bd 100644
--- a/core/modules/system/src/Tests/Common/SystemListingTest.php
+++ b/core/modules/system/src/Tests/Common/SystemListingTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Common;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Extension\ExtensionDiscovery;
use Drupal\simpletest\KernelTestBase;
@@ -37,7 +38,7 @@ function testDirectoryPrecedence() {
foreach ($expected_directories as $module => $directories) {
foreach ($directories as $directory) {
$filename = "$directory/$module/$module.info.yml";
- $this->assertTrue(file_exists(\Drupal::root() . '/' . $filename), format_string('@filename exists.', array('@filename' => $filename)));
+ $this->assertTrue(file_exists(DRUPAL_ROOT . '/' . $filename), SafeMarkup::format('@filename exists.', array('@filename' => $filename)));
}
}
@@ -49,7 +50,7 @@ function testDirectoryPrecedence() {
foreach ($expected_directories as $module => $directories) {
$expected_directory = array_shift($directories);
$expected_uri = "$expected_directory/$module/$module.info.yml";
- $this->assertEqual($files[$module]->getPathname(), $expected_uri, format_string('Module @actual was found at @expected.', array(
+ $this->assertEqual($files[$module]->getPathname(), $expected_uri, SafeMarkup::format('Module @actual was found at @expected.', array(
'@actual' => $files[$module]->getPathname(),
'@expected' => $expected_uri,
)));
diff --git a/core/modules/system/src/Tests/Common/UrlTest.php b/core/modules/system/src/Tests/Common/UrlTest.php
index 6beeb31..5b9e393 100644
--- a/core/modules/system/src/Tests/Common/UrlTest.php
+++ b/core/modules/system/src/Tests/Common/UrlTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Common;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Core\Language\Language;
use Drupal\Core\Url;
@@ -33,12 +34,12 @@ function testLinkXSS() {
$path = "";
$link = \Drupal::l($text, Url::fromUserInput('/' . $path));
$sanitized_path = check_url(Url::fromUri('base:' . $path)->toString());
- $this->assertTrue(strpos($link, $sanitized_path) !== FALSE, format_string('XSS attack @path was filtered by _l().', array('@path' => $path)));
+ $this->assertTrue(strpos($link, $sanitized_path) !== FALSE, SafeMarkup::format('XSS attack @path was filtered by _l().', array('@path' => $path)));
// Test \Drupal\Core\Url.
$link = Url::fromUri('base:' . $path)->toString();
$sanitized_path = check_url(Url::fromUri('base:' . $path)->toString());
- $this->assertTrue(strpos($link, $sanitized_path) !== FALSE, format_string('XSS attack @path was filtered by #theme', ['@path' => $path]));
+ $this->assertTrue(strpos($link, $sanitized_path) !== FALSE, SafeMarkup::format('XSS attack @path was filtered by #theme', ['@path' => $path]));
}
/**
@@ -63,10 +64,10 @@ function testLinkAttributes() {
$hreflang_override_link['#options']['attributes']['hreflang'] = 'foo';
$rendered = drupal_render($hreflang_link);
- $this->assertTrue($this->hasAttribute('hreflang', $rendered, $langcode), format_string('hreflang attribute with value @langcode is present on a rendered link when langcode is provided in the render array.', array('@langcode' => $langcode)));
+ $this->assertTrue($this->hasAttribute('hreflang', $rendered, $langcode), SafeMarkup::format('hreflang attribute with value @langcode is present on a rendered link when langcode is provided in the render array.', array('@langcode' => $langcode)));
$rendered = drupal_render($hreflang_override_link);
- $this->assertTrue($this->hasAttribute('hreflang', $rendered, 'foo'), format_string('hreflang attribute with value @hreflang is present on a rendered link when @hreflang is provided in the render array.', array('@hreflang' => 'foo')));
+ $this->assertTrue($this->hasAttribute('hreflang', $rendered, 'foo'), SafeMarkup::format('hreflang attribute with value @hreflang is present on a rendered link when @hreflang is provided in the render array.', array('@hreflang' => 'foo')));
// Test the active class in links produced by _l() and #type 'link'.
$options_no_query = array();
@@ -107,7 +108,7 @@ function testLinkAttributes() {
// Test _l().
$class_l = $this->randomMachineName();
$link_l = \Drupal::l($this->randomMachineName(), new Url('', [], ['attributes' => ['class' => [$class_l]]]));
- $this->assertTrue($this->hasAttribute('class', $link_l, $class_l), format_string('Custom class @class is present on link when requested by l()', array('@class' => $class_l)));
+ $this->assertTrue($this->hasAttribute('class', $link_l, $class_l), SafeMarkup::format('Custom class @class is present on link when requested by l()', array('@class' => $class_l)));
// Test #type.
$class_theme = $this->randomMachineName();
@@ -122,7 +123,7 @@ function testLinkAttributes() {
),
);
$link_theme = drupal_render($type_link);
- $this->assertTrue($this->hasAttribute('class', $link_theme, $class_theme), format_string('Custom class @class is present on link when requested by #type', array('@class' => $class_theme)));
+ $this->assertTrue($this->hasAttribute('class', $link_theme, $class_theme), SafeMarkup::format('Custom class @class is present on link when requested by #type', array('@class' => $class_theme)));
}
/**
diff --git a/core/modules/system/src/Tests/Condition/CurrentThemeConditionTest.php b/core/modules/system/src/Tests/Condition/CurrentThemeConditionTest.php
index 164b1e9..6027932 100644
--- a/core/modules/system/src/Tests/Condition/CurrentThemeConditionTest.php
+++ b/core/modules/system/src/Tests/Condition/CurrentThemeConditionTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Condition;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\simpletest\KernelTestBase;
@@ -44,8 +45,8 @@ public function testCurrentTheme() {
$condition_negated = $manager->createInstance('current_theme');
$condition_negated->setConfiguration(array('theme' => 'test_theme', 'negate' => TRUE));
- $this->assertEqual($condition->summary(), String::format('The current theme is @theme', array('@theme' => 'test_theme')));
- $this->assertEqual($condition_negated->summary(), String::format('The current theme is not @theme', array('@theme' => 'test_theme')));
+ $this->assertEqual($condition->summary(), SafeMarkup::format('The current theme is @theme', array('@theme' => 'test_theme')));
+ $this->assertEqual($condition_negated->summary(), SafeMarkup::format('The current theme is not @theme', array('@theme' => 'test_theme')));
// The expected theme has not been set up yet.
$this->assertFalse($condition->execute());
diff --git a/core/modules/system/src/Tests/Database/ConnectionUnitTest.php b/core/modules/system/src/Tests/Database/ConnectionUnitTest.php
index 74d0de7..8e121fc 100644
--- a/core/modules/system/src/Tests/Database/ConnectionUnitTest.php
+++ b/core/modules/system/src/Tests/Database/ConnectionUnitTest.php
@@ -8,6 +8,7 @@
namespace Drupal\system\Tests\Database;
use Doctrine\Common\Reflection\StaticReflectionProperty;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Database\Database;
use Drupal\Core\Site\Settings;
use Drupal\simpletest\KernelTestBase;
@@ -82,7 +83,7 @@ protected function getConnectionID() {
*/
protected function assertConnection($id) {
$list = $this->monitor->query('SHOW PROCESSLIST')->fetchAllKeyed(0, 0);
- return $this->assertTrue(isset($list[$id]), format_string('Connection ID @id found.', array('@id' => $id)));
+ return $this->assertTrue(isset($list[$id]), SafeMarkup::format('Connection ID @id found.', array('@id' => $id)));
}
/**
@@ -93,7 +94,7 @@ protected function assertConnection($id) {
*/
protected function assertNoConnection($id) {
$list = $this->monitor->query('SHOW PROCESSLIST')->fetchAllKeyed(0, 0);
- return $this->assertFalse(isset($list[$id]), format_string('Connection ID @id not found.', array('@id' => $id)));
+ return $this->assertFalse(isset($list[$id]), SafeMarkup::format('Connection ID @id not found.', array('@id' => $id)));
}
/**
diff --git a/core/modules/system/src/Tests/Database/InsertLobTest.php b/core/modules/system/src/Tests/Database/InsertLobTest.php
index 2fcf182..21d6d91 100644
--- a/core/modules/system/src/Tests/Database/InsertLobTest.php
+++ b/core/modules/system/src/Tests/Database/InsertLobTest.php
@@ -6,6 +6,7 @@
*/
namespace Drupal\system\Tests\Database;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Tests the Insert query builder with LOB fields.
@@ -24,7 +25,7 @@ function testInsertOneBlob() {
->fields(array('blob1' => $data))
->execute();
$r = db_query('SELECT * FROM {test_one_blob} WHERE id = :id', array(':id' => $id))->fetchAssoc();
- $this->assertTrue($r['blob1'] === $data, format_string('Can insert a blob: id @id, @data.', array('@id' => $id, '@data' => serialize($r))));
+ $this->assertTrue($r['blob1'] === $data, SafeMarkup::format('Can insert a blob: id @id, @data.', array('@id' => $id, '@data' => serialize($r))));
}
/**
diff --git a/core/modules/system/src/Tests/Database/SchemaTest.php b/core/modules/system/src/Tests/Database/SchemaTest.php
index 6b96e3d..9e20179 100644
--- a/core/modules/system/src/Tests/Database/SchemaTest.php
+++ b/core/modules/system/src/Tests/Database/SchemaTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Database;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Database\Database;
use Drupal\Core\Database\SchemaObjectDoesNotExistException;
use Drupal\Core\Database\SchemaObjectExistsException;
@@ -287,8 +288,8 @@ function testUnsignedColumns() {
// Finally, check each column and try to insert invalid values into them.
foreach ($table_spec['fields'] as $column_name => $column_spec) {
- $this->assertTrue(db_field_exists($table_name, $column_name), format_string('Unsigned @type column was created.', array('@type' => $column_spec['type'])));
- $this->assertFalse($this->tryUnsignedInsert($table_name, $column_name), format_string('Unsigned @type column rejected a negative value.', array('@type' => $column_spec['type'])));
+ $this->assertTrue(db_field_exists($table_name, $column_name), SafeMarkup::format('Unsigned @type column was created.', array('@type' => $column_spec['type'])));
+ $this->assertFalse($this->tryUnsignedInsert($table_name, $column_name), SafeMarkup::format('Unsigned @type column rejected a negative value.', array('@type' => $column_spec['type'])));
}
}
@@ -410,7 +411,7 @@ protected function assertFieldAdditionRemoval($field_spec) {
'primary key' => array('serial_column'),
);
db_create_table($table_name, $table_spec);
- $this->pass(format_string('Table %table created.', array('%table' => $table_name)));
+ $this->pass(SafeMarkup::format('Table %table created.', array('%table' => $table_name)));
// Check the characteristics of the field.
$this->assertFieldCharacteristics($table_name, 'test_field', $field_spec);
@@ -427,7 +428,7 @@ protected function assertFieldAdditionRemoval($field_spec) {
'primary key' => array('serial_column'),
);
db_create_table($table_name, $table_spec);
- $this->pass(format_string('Table %table created.', array('%table' => $table_name)));
+ $this->pass(SafeMarkup::format('Table %table created.', array('%table' => $table_name)));
// Insert some rows to the table to test the handling of initial values.
for ($i = 0; $i < 3; $i++) {
@@ -437,7 +438,7 @@ protected function assertFieldAdditionRemoval($field_spec) {
}
db_add_field($table_name, 'test_field', $field_spec);
- $this->pass(format_string('Column %column created.', array('%column' => 'test_field')));
+ $this->pass(SafeMarkup::format('Column %column created.', array('%column' => 'test_field')));
// Check the characteristics of the field.
$this->assertFieldCharacteristics($table_name, 'test_field', $field_spec);
@@ -520,7 +521,7 @@ protected function assertFieldChange($old_spec, $new_spec) {
'primary key' => array('serial_column'),
);
db_create_table($table_name, $table_spec);
- $this->pass(format_string('Table %table created.', array('%table' => $table_name)));
+ $this->pass(SafeMarkup::format('Table %table created.', array('%table' => $table_name)));
// Check the characteristics of the field.
$this->assertFieldCharacteristics($table_name, 'test_field', $old_spec);
diff --git a/core/modules/system/src/Tests/Database/SelectComplexTest.php b/core/modules/system/src/Tests/Database/SelectComplexTest.php
index 2b6b3db..4fefb3d 100644
--- a/core/modules/system/src/Tests/Database/SelectComplexTest.php
+++ b/core/modules/system/src/Tests/Database/SelectComplexTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Database;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Database\Database;
use Drupal\Core\Database\RowCountException;
@@ -103,7 +104,7 @@ function testGroupBy() {
);
foreach ($correct_results as $task => $count) {
- $this->assertEqual($records[$task], $count, format_string("Correct number of '@task' records found.", array('@task' => $task)));
+ $this->assertEqual($records[$task], $count, SafeMarkup::format("Correct number of '@task' records found.", array('@task' => $task)));
}
$this->assertEqual($num_records, 6, 'Returned the correct number of total rows.');
@@ -137,7 +138,7 @@ function testGroupByAndHaving() {
);
foreach ($correct_results as $task => $count) {
- $this->assertEqual($records[$task], $count, format_string("Correct number of '@task' records found.", array('@task' => $task)));
+ $this->assertEqual($records[$task], $count, SafeMarkup::format("Correct number of '@task' records found.", array('@task' => $task)));
}
$this->assertEqual($num_records, 1, 'Returned the correct number of total rows.');
diff --git a/core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php b/core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php
index 5a3455c..5895d75 100644
--- a/core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php
+++ b/core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php
@@ -6,6 +6,7 @@
*/
namespace Drupal\system\Tests\Database;
+use Drupal\Component\Utility\SafeMarkup;
use Symfony\Component\HttpFoundation\Request;
/**
@@ -45,7 +46,7 @@ function testEvenPagerQuery() {
$correct_number = $count - ($limit * $page);
}
- $this->assertEqual(count($data->names), $correct_number, format_string('Correct number of records returned by pager: @number', array('@number' => $correct_number)));
+ $this->assertEqual(count($data->names), $correct_number, SafeMarkup::format('Correct number of records returned by pager: @number', array('@number' => $correct_number)));
}
}
@@ -79,7 +80,7 @@ function testOddPagerQuery() {
$correct_number = $count - ($limit * $page);
}
- $this->assertEqual(count($data->names), $correct_number, format_string('Correct number of records returned by pager: @number', array('@number' => $correct_number)));
+ $this->assertEqual(count($data->names), $correct_number, SafeMarkup::format('Correct number of records returned by pager: @number', array('@number' => $correct_number)));
}
}
diff --git a/core/modules/system/src/Tests/Database/SelectTableSortDefaultTest.php b/core/modules/system/src/Tests/Database/SelectTableSortDefaultTest.php
index 4456701..bfd7d70 100644
--- a/core/modules/system/src/Tests/Database/SelectTableSortDefaultTest.php
+++ b/core/modules/system/src/Tests/Database/SelectTableSortDefaultTest.php
@@ -6,6 +6,7 @@
*/
namespace Drupal\system\Tests\Database;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Tests the tablesort query extender.
@@ -65,8 +66,8 @@ function testTableSortQueryFirst() {
$first = array_shift($data->tasks);
$last = array_pop($data->tasks);
- $this->assertEqual($first->task, $sort['first'], format_string('Items appear in the correct order sorting by @field @sort.', array('@field' => $sort['field'], '@sort' => $sort['sort'])));
- $this->assertEqual($last->task, $sort['last'], format_string('Items appear in the correct order sorting by @field @sort.', array('@field' => $sort['field'], '@sort' => $sort['sort'])));
+ $this->assertEqual($first->task, $sort['first'], SafeMarkup::format('Items appear in the correct order sorting by @field @sort.', array('@field' => $sort['field'], '@sort' => $sort['sort'])));
+ $this->assertEqual($last->task, $sort['last'], SafeMarkup::format('Items appear in the correct order sorting by @field @sort.', array('@field' => $sort['field'], '@sort' => $sort['sort'])));
}
}
diff --git a/core/modules/system/src/Tests/Database/TransactionTest.php b/core/modules/system/src/Tests/Database/TransactionTest.php
index 00ec458..d4ecbdb 100644
--- a/core/modules/system/src/Tests/Database/TransactionTest.php
+++ b/core/modules/system/src/Tests/Database/TransactionTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Database;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Database\Database;
use Drupal\Core\Database\TransactionOutOfOrderException;
use Drupal\Core\Database\TransactionNoActiveException;
@@ -359,7 +360,7 @@ protected function cleanUp() {
*/
function assertRowPresent($name, $message = NULL) {
if (!isset($message)) {
- $message = format_string('Row %name is present.', array('%name' => $name));
+ $message = SafeMarkup::format('Row %name is present.', array('%name' => $name));
}
$present = (boolean) db_query('SELECT 1 FROM {test} WHERE name = :name', array(':name' => $name))->fetchField();
return $this->assertTrue($present, $message);
@@ -375,7 +376,7 @@ function assertRowPresent($name, $message = NULL) {
*/
function assertRowAbsent($name, $message = NULL) {
if (!isset($message)) {
- $message = format_string('Row %name is absent.', array('%name' => $name));
+ $message = SafeMarkup::format('Row %name is absent.', array('%name' => $name));
}
$present = (boolean) db_query('SELECT 1 FROM {test} WHERE name = :name', array(':name' => $name))->fetchField();
return $this->assertFalse($present, $message);
diff --git a/core/modules/system/src/Tests/Database/UpdateLobTest.php b/core/modules/system/src/Tests/Database/UpdateLobTest.php
index 7b26fdf..782a190 100644
--- a/core/modules/system/src/Tests/Database/UpdateLobTest.php
+++ b/core/modules/system/src/Tests/Database/UpdateLobTest.php
@@ -6,6 +6,7 @@
*/
namespace Drupal\system\Tests\Database;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Tests the Update query builder with LOB fields.
@@ -31,7 +32,7 @@ function testUpdateOneBlob() {
->execute();
$r = db_query('SELECT * FROM {test_one_blob} WHERE id = :id', array(':id' => $id))->fetchAssoc();
- $this->assertTrue($r['blob1'] === $data, format_string('Can update a blob: id @id, @data.', array('@id' => $id, '@data' => serialize($r))));
+ $this->assertTrue($r['blob1'] === $data, SafeMarkup::format('Can update a blob: id @id, @data.', array('@id' => $id, '@data' => serialize($r))));
}
/**
diff --git a/core/modules/system/src/Tests/Entity/EntityAccessControlHandlerTest.php b/core/modules/system/src/Tests/Entity/EntityAccessControlHandlerTest.php
index d11a945..166de13 100644
--- a/core/modules/system/src/Tests/Entity/EntityAccessControlHandlerTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityAccessControlHandlerTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Entity;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Session\AccountInterface;
use Drupal\Core\Access\AccessibleInterface;
use Drupal\Core\Entity\EntityAccessControlHandler;
@@ -29,7 +30,7 @@ protected function setUp() {
*/
function assertEntityAccess($ops, AccessibleInterface $object, AccountInterface $account = NULL) {
foreach ($ops as $op => $result) {
- $message = format_string("Entity access returns @result with operation '@op'.", array(
+ $message = SafeMarkup::format("Entity access returns @result with operation '@op'.", array(
'@result' => !isset($result) ? 'null' : ($result ? 'true' : 'false'),
'@op' => $op,
));
diff --git a/core/modules/system/src/Tests/Entity/EntityApiTest.php b/core/modules/system/src/Tests/Entity/EntityApiTest.php
index decbcd0..2794ac4 100644
--- a/core/modules/system/src/Tests/Entity/EntityApiTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityApiTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Entity;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityStorageException;
use Drupal\user\UserInterface;
@@ -59,32 +60,32 @@ protected function assertCRUD($entity_type, UserInterface $user1) {
$entity->save();
$entities = array_values(entity_load_multiple_by_properties($entity_type, array('name' => 'test')));
- $this->assertEqual($entities[0]->name->value, 'test', format_string('%entity_type: Created and loaded entity', array('%entity_type' => $entity_type)));
- $this->assertEqual($entities[1]->name->value, 'test', format_string('%entity_type: Created and loaded entity', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entities[0]->name->value, 'test', SafeMarkup::format('%entity_type: Created and loaded entity', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entities[1]->name->value, 'test', SafeMarkup::format('%entity_type: Created and loaded entity', array('%entity_type' => $entity_type)));
// Test loading a single entity.
$loaded_entity = entity_load($entity_type, $entity->id());
- $this->assertEqual($loaded_entity->id(), $entity->id(), format_string('%entity_type: Loaded a single entity by id.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($loaded_entity->id(), $entity->id(), SafeMarkup::format('%entity_type: Loaded a single entity by id.', array('%entity_type' => $entity_type)));
// Test deleting an entity.
$entities = array_values(entity_load_multiple_by_properties($entity_type, array('name' => 'test2')));
$entities[0]->delete();
$entities = array_values(entity_load_multiple_by_properties($entity_type, array('name' => 'test2')));
- $this->assertEqual($entities, array(), format_string('%entity_type: Entity deleted.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entities, array(), SafeMarkup::format('%entity_type: Entity deleted.', array('%entity_type' => $entity_type)));
// Test updating an entity.
$entities = array_values(entity_load_multiple_by_properties($entity_type, array('name' => 'test')));
$entities[0]->name->value = 'test3';
$entities[0]->save();
$entity = entity_load($entity_type, $entities[0]->id());
- $this->assertEqual($entity->name->value, 'test3', format_string('%entity_type: Entity updated.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->name->value, 'test3', SafeMarkup::format('%entity_type: Entity updated.', array('%entity_type' => $entity_type)));
// Try deleting multiple test entities by deleting all.
$ids = array_keys(entity_load_multiple($entity_type));
entity_delete_multiple($entity_type, $ids);
$all = entity_load_multiple($entity_type);
- $this->assertTrue(empty($all), format_string('%entity_type: Deleted all entities.', array('%entity_type' => $entity_type)));
+ $this->assertTrue(empty($all), SafeMarkup::format('%entity_type: Deleted all entities.', array('%entity_type' => $entity_type)));
// Verify that all data got deleted.
$definition = \Drupal::entityManager()->getDefinition($entity_type);
diff --git a/core/modules/system/src/Tests/Entity/EntityFieldDefaultValueTest.php b/core/modules/system/src/Tests/Entity/EntityFieldDefaultValueTest.php
index 32861c7..fad3192 100644
--- a/core/modules/system/src/Tests/Entity/EntityFieldDefaultValueTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityFieldDefaultValueTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Entity;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Uuid\Uuid;
use Drupal\Component\Utility\String;
@@ -50,8 +51,8 @@ protected function assertDefaultValues($entity_type_id) {
$entity = entity_create($entity_type_id);
$definition = $this->entityManager->getDefinition($entity_type_id);
$langcode_key = $definition->getKey('langcode');
- $this->assertEqual($entity->{$langcode_key}->value, 'en', String::format('%entity_type: Default language', array('%entity_type' => $entity_type_id)));
- $this->assertTrue(Uuid::isValid($entity->uuid->value), String::format('%entity_type: Default UUID', array('%entity_type' => $entity_type_id)));
+ $this->assertEqual($entity->{$langcode_key}->value, 'en', SafeMarkup::format('%entity_type: Default language', array('%entity_type' => $entity_type_id)));
+ $this->assertTrue(Uuid::isValid($entity->uuid->value), SafeMarkup::format('%entity_type: Default UUID', array('%entity_type' => $entity_type_id)));
$this->assertEqual($entity->name->getValue(), array(), 'Field has one empty value by default.');
}
diff --git a/core/modules/system/src/Tests/Entity/EntityFieldTest.php b/core/modules/system/src/Tests/Entity/EntityFieldTest.php
index 8be7a1d..4351325 100644
--- a/core/modules/system/src/Tests/Entity/EntityFieldTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityFieldTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Entity;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Field\BaseFieldDefinition;
use Drupal\Core\Field\FieldDefinitionInterface;
@@ -108,66 +109,66 @@ protected function doTestReadWrite($entity_type) {
$langcode = 'en';
// Access the name field.
- $this->assertTrue($entity->name instanceof FieldItemListInterface, format_string('%entity_type: Field implements interface', array('%entity_type' => $entity_type)));
- $this->assertTrue($entity->name[0] instanceof FieldItemInterface, format_string('%entity_type: Field item implements interface', array('%entity_type' => $entity_type)));
+ $this->assertTrue($entity->name instanceof FieldItemListInterface, SafeMarkup::format('%entity_type: Field implements interface', array('%entity_type' => $entity_type)));
+ $this->assertTrue($entity->name[0] instanceof FieldItemInterface, SafeMarkup::format('%entity_type: Field item implements interface', array('%entity_type' => $entity_type)));
- $this->assertEqual($this->entity_name, $entity->name->value, format_string('%entity_type: Name value can be read.', array('%entity_type' => $entity_type)));
- $this->assertEqual($this->entity_name, $entity->name[0]->value, format_string('%entity_type: Name value can be read through list access.', array('%entity_type' => $entity_type)));
- $this->assertEqual($entity->name->getValue(), array(0 => array('value' => $this->entity_name)), format_string('%entity_type: Plain field value returned.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($this->entity_name, $entity->name->value, SafeMarkup::format('%entity_type: Name value can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($this->entity_name, $entity->name[0]->value, SafeMarkup::format('%entity_type: Name value can be read through list access.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->name->getValue(), array(0 => array('value' => $this->entity_name)), SafeMarkup::format('%entity_type: Plain field value returned.', array('%entity_type' => $entity_type)));
// Change the name.
$new_name = $this->randomMachineName();
$entity->name->value = $new_name;
- $this->assertEqual($new_name, $entity->name->value, format_string('%entity_type: Name can be updated and read.', array('%entity_type' => $entity_type)));
- $this->assertEqual($entity->name->getValue(), array(0 => array('value' => $new_name)), format_string('%entity_type: Plain field value reflects the update.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($new_name, $entity->name->value, SafeMarkup::format('%entity_type: Name can be updated and read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->name->getValue(), array(0 => array('value' => $new_name)), SafeMarkup::format('%entity_type: Plain field value reflects the update.', array('%entity_type' => $entity_type)));
$new_name = $this->randomMachineName();
$entity->name[0]->value = $new_name;
- $this->assertEqual($new_name, $entity->name->value, format_string('%entity_type: Name can be updated and read through list access.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($new_name, $entity->name->value, SafeMarkup::format('%entity_type: Name can be updated and read through list access.', array('%entity_type' => $entity_type)));
// Access the user field.
- $this->assertTrue($entity->user_id instanceof FieldItemListInterface, format_string('%entity_type: Field implements interface', array('%entity_type' => $entity_type)));
- $this->assertTrue($entity->user_id[0] instanceof FieldItemInterface, format_string('%entity_type: Field item implements interface', array('%entity_type' => $entity_type)));
+ $this->assertTrue($entity->user_id instanceof FieldItemListInterface, SafeMarkup::format('%entity_type: Field implements interface', array('%entity_type' => $entity_type)));
+ $this->assertTrue($entity->user_id[0] instanceof FieldItemInterface, SafeMarkup::format('%entity_type: Field item implements interface', array('%entity_type' => $entity_type)));
- $this->assertEqual($this->entity_user->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
- $this->assertEqual($this->entity_user->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($this->entity_user->id(), $entity->user_id->target_id, SafeMarkup::format('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($this->entity_user->getUsername(), $entity->user_id->entity->name->value, SafeMarkup::format('%entity_type: User name can be read.', array('%entity_type' => $entity_type)));
// Change the assigned user by entity.
$new_user1 = $this->createUser();
$entity->user_id->entity = $new_user1;
- $this->assertEqual($new_user1->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
- $this->assertEqual($new_user1->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated username value can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($new_user1->id(), $entity->user_id->target_id, SafeMarkup::format('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($new_user1->getUsername(), $entity->user_id->entity->name->value, SafeMarkup::format('%entity_type: Updated username value can be read.', array('%entity_type' => $entity_type)));
// Change the assigned user by id.
$new_user2 = $this->createUser();
$entity->user_id->target_id = $new_user2->id();
- $this->assertEqual($new_user2->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
- $this->assertEqual($new_user2->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated username value can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($new_user2->id(), $entity->user_id->target_id, SafeMarkup::format('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($new_user2->getUsername(), $entity->user_id->entity->name->value, SafeMarkup::format('%entity_type: Updated username value can be read.', array('%entity_type' => $entity_type)));
// Try unsetting a field property.
$entity->name->value = NULL;
$entity->user_id->target_id = NULL;
- $this->assertNull($entity->name->value, format_string('%entity_type: Name field is not set.', array('%entity_type' => $entity_type)));
- $this->assertNull($entity->user_id->target_id, format_string('%entity_type: User ID field is not set.', array('%entity_type' => $entity_type)));
- $this->assertNull($entity->user_id->entity, format_string('%entity_type: User entity field is not set.', array('%entity_type' => $entity_type)));
+ $this->assertNull($entity->name->value, SafeMarkup::format('%entity_type: Name field is not set.', array('%entity_type' => $entity_type)));
+ $this->assertNull($entity->user_id->target_id, SafeMarkup::format('%entity_type: User ID field is not set.', array('%entity_type' => $entity_type)));
+ $this->assertNull($entity->user_id->entity, SafeMarkup::format('%entity_type: User entity field is not set.', array('%entity_type' => $entity_type)));
// Test setting the values via the typed data API works as well.
// Change the assigned user by entity.
$entity->user_id->first()->get('entity')->setValue($new_user2);
- $this->assertEqual($new_user2->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
- $this->assertEqual($new_user2->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated user name value can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($new_user2->id(), $entity->user_id->target_id, SafeMarkup::format('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($new_user2->getUsername(), $entity->user_id->entity->name->value, SafeMarkup::format('%entity_type: Updated user name value can be read.', array('%entity_type' => $entity_type)));
// Change the assigned user by id.
$entity->user_id->first()->get('target_id')->setValue($new_user2->id());
- $this->assertEqual($new_user2->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
- $this->assertEqual($new_user2->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated user name value can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($new_user2->id(), $entity->user_id->target_id, SafeMarkup::format('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($new_user2->getUsername(), $entity->user_id->entity->name->value, SafeMarkup::format('%entity_type: Updated user name value can be read.', array('%entity_type' => $entity_type)));
// Try unsetting a field.
$entity->name->first()->get('value')->setValue(NULL);
$entity->user_id->first()->get('target_id')->setValue(NULL);
- $this->assertNull($entity->name->value, format_string('%entity_type: Name field is not set.', array('%entity_type' => $entity_type)));
- $this->assertNull($entity->user_id->target_id, format_string('%entity_type: User ID field is not set.', array('%entity_type' => $entity_type)));
- $this->assertNull($entity->user_id->entity, format_string('%entity_type: User entity field is not set.', array('%entity_type' => $entity_type)));
+ $this->assertNull($entity->name->value, SafeMarkup::format('%entity_type: Name field is not set.', array('%entity_type' => $entity_type)));
+ $this->assertNull($entity->user_id->target_id, SafeMarkup::format('%entity_type: User ID field is not set.', array('%entity_type' => $entity_type)));
+ $this->assertNull($entity->user_id->entity, SafeMarkup::format('%entity_type: User entity field is not set.', array('%entity_type' => $entity_type)));
// Create a fresh entity so target_id does not get its property object
// instantiated, then verify setting a new value via typed data API works.
@@ -176,38 +177,38 @@ protected function doTestReadWrite($entity_type) {
));
// Access the property object, and set a value.
$entity2->user_id->first()->get('target_id')->setValue($new_user2->id());
- $this->assertEqual($new_user2->id(), $entity2->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
- $this->assertEqual($new_user2->name->value, $entity2->user_id->entity->name->value, format_string('%entity_type: Updated user name value can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($new_user2->id(), $entity2->user_id->target_id, SafeMarkup::format('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($new_user2->name->value, $entity2->user_id->entity->name->value, SafeMarkup::format('%entity_type: Updated user name value can be read.', array('%entity_type' => $entity_type)));
// Test using isset(), empty() and unset().
$entity->name->value = 'test unset';
unset($entity->name->value);
- $this->assertFalse(isset($entity->name->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type)));
- $this->assertFalse(isset($entity->name[0]->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type)));
- $this->assertTrue(empty($entity->name->value), format_string('%entity_type: Name is empty.', array('%entity_type' => $entity_type)));
- $this->assertTrue(empty($entity->name[0]->value), format_string('%entity_type: Name is empty.', array('%entity_type' => $entity_type)));
+ $this->assertFalse(isset($entity->name->value), SafeMarkup::format('%entity_type: Name is not set.', array('%entity_type' => $entity_type)));
+ $this->assertFalse(isset($entity->name[0]->value), SafeMarkup::format('%entity_type: Name is not set.', array('%entity_type' => $entity_type)));
+ $this->assertTrue(empty($entity->name->value), SafeMarkup::format('%entity_type: Name is empty.', array('%entity_type' => $entity_type)));
+ $this->assertTrue(empty($entity->name[0]->value), SafeMarkup::format('%entity_type: Name is empty.', array('%entity_type' => $entity_type)));
$entity->name->value = 'a value';
- $this->assertTrue(isset($entity->name->value), format_string('%entity_type: Name is set.', array('%entity_type' => $entity_type)));
- $this->assertTrue(isset($entity->name[0]->value), format_string('%entity_type: Name is set.', array('%entity_type' => $entity_type)));
- $this->assertFalse(empty($entity->name->value), format_string('%entity_type: Name is not empty.', array('%entity_type' => $entity_type)));
- $this->assertFalse(empty($entity->name[0]->value), format_string('%entity_type: Name is not empty.', array('%entity_type' => $entity_type)));
- $this->assertTrue(isset($entity->name[0]), format_string('%entity_type: Name string item is set.', array('%entity_type' => $entity_type)));
- $this->assertFalse(isset($entity->name[1]), format_string('%entity_type: Second name string item is not set as it does not exist', array('%entity_type' => $entity_type)));
- $this->assertTrue(isset($entity->name), format_string('%entity_type: Name field is set.', array('%entity_type' => $entity_type)));
- $this->assertFalse(isset($entity->nameInvalid), format_string('%entity_type: Not existing field is not set.', array('%entity_type' => $entity_type)));
+ $this->assertTrue(isset($entity->name->value), SafeMarkup::format('%entity_type: Name is set.', array('%entity_type' => $entity_type)));
+ $this->assertTrue(isset($entity->name[0]->value), SafeMarkup::format('%entity_type: Name is set.', array('%entity_type' => $entity_type)));
+ $this->assertFalse(empty($entity->name->value), SafeMarkup::format('%entity_type: Name is not empty.', array('%entity_type' => $entity_type)));
+ $this->assertFalse(empty($entity->name[0]->value), SafeMarkup::format('%entity_type: Name is not empty.', array('%entity_type' => $entity_type)));
+ $this->assertTrue(isset($entity->name[0]), SafeMarkup::format('%entity_type: Name string item is set.', array('%entity_type' => $entity_type)));
+ $this->assertFalse(isset($entity->name[1]), SafeMarkup::format('%entity_type: Second name string item is not set as it does not exist', array('%entity_type' => $entity_type)));
+ $this->assertTrue(isset($entity->name), SafeMarkup::format('%entity_type: Name field is set.', array('%entity_type' => $entity_type)));
+ $this->assertFalse(isset($entity->nameInvalid), SafeMarkup::format('%entity_type: Not existing field is not set.', array('%entity_type' => $entity_type)));
unset($entity->name[0]);
- $this->assertFalse(isset($entity->name[0]), format_string('%entity_type: Name field item is not set.', array('%entity_type' => $entity_type)));
- $this->assertFalse(isset($entity->name[0]->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type)));
- $this->assertFalse(isset($entity->name->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type)));
+ $this->assertFalse(isset($entity->name[0]), SafeMarkup::format('%entity_type: Name field item is not set.', array('%entity_type' => $entity_type)));
+ $this->assertFalse(isset($entity->name[0]->value), SafeMarkup::format('%entity_type: Name is not set.', array('%entity_type' => $entity_type)));
+ $this->assertFalse(isset($entity->name->value), SafeMarkup::format('%entity_type: Name is not set.', array('%entity_type' => $entity_type)));
// Test emptying a field by assigning an empty value. NULL and array()
// behave the same.
foreach ([NULL, array(), 'unset'] as $empty) {
// Make sure a value is present
$entity->name->value = 'a value';
- $this->assertTrue(isset($entity->name->value), format_string('%entity_type: Name is set.', array('%entity_type' => $entity_type)));
+ $this->assertTrue(isset($entity->name->value), SafeMarkup::format('%entity_type: Name is set.', array('%entity_type' => $entity_type)));
// Now, empty the field.
if ($empty === 'unset') {
unset($entity->name);
@@ -215,36 +216,36 @@ protected function doTestReadWrite($entity_type) {
else {
$entity->name = $empty;
}
- $this->assertTrue(isset($entity->name), format_string('%entity_type: Name field is set.', array('%entity_type' => $entity_type)));
- $this->assertTrue($entity->name->isEmpty(), format_string('%entity_type: Name field is set.', array('%entity_type' => $entity_type)));
- $this->assertIdentical(count($entity->name), 0, format_string('%entity_type: Name field contains no items.', array('%entity_type' => $entity_type)));
- $this->assertIdentical($entity->name->getValue(), array(), format_string('%entity_type: Name field value is an empty array.', array('%entity_type' => $entity_type)));
- $this->assertFalse(isset($entity->name[0]), format_string('%entity_type: Name field item is not set.', array('%entity_type' => $entity_type)));
- $this->assertFalse(isset($entity->name[0]->value), format_string('%entity_type: First name item value is not set.', array('%entity_type' => $entity_type)));
- $this->assertFalse(isset($entity->name->value), format_string('%entity_type: Name value is not set.', array('%entity_type' => $entity_type)));
+ $this->assertTrue(isset($entity->name), SafeMarkup::format('%entity_type: Name field is set.', array('%entity_type' => $entity_type)));
+ $this->assertTrue($entity->name->isEmpty(), SafeMarkup::format('%entity_type: Name field is set.', array('%entity_type' => $entity_type)));
+ $this->assertIdentical(count($entity->name), 0, SafeMarkup::format('%entity_type: Name field contains no items.', array('%entity_type' => $entity_type)));
+ $this->assertIdentical($entity->name->getValue(), array(), SafeMarkup::format('%entity_type: Name field value is an empty array.', array('%entity_type' => $entity_type)));
+ $this->assertFalse(isset($entity->name[0]), SafeMarkup::format('%entity_type: Name field item is not set.', array('%entity_type' => $entity_type)));
+ $this->assertFalse(isset($entity->name[0]->value), SafeMarkup::format('%entity_type: First name item value is not set.', array('%entity_type' => $entity_type)));
+ $this->assertFalse(isset($entity->name->value), SafeMarkup::format('%entity_type: Name value is not set.', array('%entity_type' => $entity_type)));
}
// Access the language field.
$langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
- $this->assertEqual($langcode, $entity->{$langcode_key}->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
- $this->assertEqual(\Drupal::languageManager()->getLanguage($langcode), $entity->{$langcode_key}->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($langcode, $entity->{$langcode_key}->value, SafeMarkup::format('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(\Drupal::languageManager()->getLanguage($langcode), $entity->{$langcode_key}->language, SafeMarkup::format('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
// Change the language by code.
$entity->{$langcode_key}->value = \Drupal::languageManager()->getDefaultLanguage()->getId();
- $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage()->getId(), $entity->{$langcode_key}->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
- $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage(), $entity->{$langcode_key}->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage()->getId(), $entity->{$langcode_key}->value, SafeMarkup::format('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage(), $entity->{$langcode_key}->language, SafeMarkup::format('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
// Revert language by code then try setting it by language object.
$entity->{$langcode_key}->value = $langcode;
$entity->{$langcode_key}->language = \Drupal::languageManager()->getDefaultLanguage();
- $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage()->getId(), $entity->{$langcode_key}->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
- $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage(), $entity->{$langcode_key}->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage()->getId(), $entity->{$langcode_key}->value, SafeMarkup::format('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage(), $entity->{$langcode_key}->language, SafeMarkup::format('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
// Access the text field and test updating.
- $this->assertEqual($entity->field_test_text->value, $this->entity_field_text, format_string('%entity_type: Text field can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->field_test_text->value, $this->entity_field_text, SafeMarkup::format('%entity_type: Text field can be read.', array('%entity_type' => $entity_type)));
$new_text = $this->randomMachineName();
$entity->field_test_text->value = $new_text;
- $this->assertEqual($entity->field_test_text->value, $new_text, format_string('%entity_type: Updated text field can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->field_test_text->value, $new_text, SafeMarkup::format('%entity_type: Updated text field can be read.', array('%entity_type' => $entity_type)));
// Test creating the entity by passing in plain values.
$this->entity_name = $this->randomMachineName();
@@ -259,70 +260,70 @@ protected function doTestReadWrite($entity_type) {
'user_id' => $user_item,
'field_test_text' => $text_item,
));
- $this->assertEqual($this->entity_name, $entity->name->value, format_string('%entity_type: Name value can be read.', array('%entity_type' => $entity_type)));
- $this->assertEqual($this->entity_user->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
- $this->assertEqual($this->entity_user->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', array('%entity_type' => $entity_type)));
- $this->assertEqual($this->entity_field_text, $entity->field_test_text->value, format_string('%entity_type: Text field can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($this->entity_name, $entity->name->value, SafeMarkup::format('%entity_type: Name value can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($this->entity_user->id(), $entity->user_id->target_id, SafeMarkup::format('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($this->entity_user->getUsername(), $entity->user_id->entity->name->value, SafeMarkup::format('%entity_type: User name can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($this->entity_field_text, $entity->field_test_text->value, SafeMarkup::format('%entity_type: Text field can be read.', array('%entity_type' => $entity_type)));
// Tests copying field values by assigning the TypedData objects.
$entity2 = $this->createTestEntity($entity_type);
$entity2->name = $entity->name;
$entity2->user_id = $entity->user_id;
$entity2->field_test_text = $entity->field_test_text;
- $this->assertFalse($entity->name === $entity2->name, format_string('%entity_type: Copying properties results in a different field object.', array('%entity_type' => $entity_type)));
- $this->assertEqual($entity->name->value, $entity2->name->value, format_string('%entity_type: Name field copied.', array('%entity_type' => $entity_type)));
- $this->assertEqual($entity->user_id->target_id, $entity2->user_id->target_id, format_string('%entity_type: User id field copied.', array('%entity_type' => $entity_type)));
- $this->assertEqual($entity->field_test_text->value, $entity2->field_test_text->value, format_string('%entity_type: Text field copied.', array('%entity_type' => $entity_type)));
+ $this->assertFalse($entity->name === $entity2->name, SafeMarkup::format('%entity_type: Copying properties results in a different field object.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->name->value, $entity2->name->value, SafeMarkup::format('%entity_type: Name field copied.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->user_id->target_id, $entity2->user_id->target_id, SafeMarkup::format('%entity_type: User id field copied.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->field_test_text->value, $entity2->field_test_text->value, SafeMarkup::format('%entity_type: Text field copied.', array('%entity_type' => $entity_type)));
// Tests that assigning TypedData objects to non-field properties keeps the
// assigned value as is.
$entity2 = $this->createTestEntity($entity_type);
$entity2->_not_a_field = $entity->name;
- $this->assertTrue($entity2->_not_a_field === $entity->name, format_string('%entity_type: Typed data objects can be copied to non-field properties as is.', array('%entity_type' => $entity_type)));
+ $this->assertTrue($entity2->_not_a_field === $entity->name, SafeMarkup::format('%entity_type: Typed data objects can be copied to non-field properties as is.', array('%entity_type' => $entity_type)));
// Tests adding a value to a field item list.
$entity->name[] = 'Another name';
- $this->assertEqual($entity->name[1]->value, 'Another name', format_string('%entity_type: List item added via [] and the first property.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->name[1]->value, 'Another name', SafeMarkup::format('%entity_type: List item added via [] and the first property.', array('%entity_type' => $entity_type)));
$entity->name[] = array('value' => 'Third name');
- $this->assertEqual($entity->name[2]->value, 'Third name', format_string('%entity_type: List item added via [] and an array of properties.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->name[2]->value, 'Third name', SafeMarkup::format('%entity_type: List item added via [] and an array of properties.', array('%entity_type' => $entity_type)));
$entity->name[3] = array('value' => 'Fourth name');
- $this->assertEqual($entity->name[3]->value, 'Fourth name', format_string('%entity_type: List item added via offset and an array of properties.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->name[3]->value, 'Fourth name', SafeMarkup::format('%entity_type: List item added via offset and an array of properties.', array('%entity_type' => $entity_type)));
unset($entity->name[3]);
// Test removing and empty-ing list items.
- $this->assertEqual(count($entity->name), 3, format_string('%entity_type: List has 3 items.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(count($entity->name), 3, SafeMarkup::format('%entity_type: List has 3 items.', array('%entity_type' => $entity_type)));
unset($entity->name[1]);
- $this->assertEqual(count($entity->name), 2, format_string('%entity_type: Second list item has been removed.', array('%entity_type' => $entity_type)));
- $this->assertEqual($entity->name[1]->value, 'Third name', format_string('%entity_type: The subsequent items have been shifted up.', array('%entity_type' => $entity_type)));
- $this->assertEqual($entity->name[1]->getName(), 1, format_string('%entity_type: The items names have been updated to their new delta.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(count($entity->name), 2, SafeMarkup::format('%entity_type: Second list item has been removed.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->name[1]->value, 'Third name', SafeMarkup::format('%entity_type: The subsequent items have been shifted up.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->name[1]->getName(), 1, SafeMarkup::format('%entity_type: The items names have been updated to their new delta.', array('%entity_type' => $entity_type)));
$entity->name[1] = NULL;
- $this->assertEqual(count($entity->name), 2, format_string('%entity_type: Assigning NULL does not reduce array count.', array('%entity_type' => $entity_type)));
- $this->assertTrue($entity->name[1]->isEmpty(), format_string('%entity_type: Assigning NULL empties the item.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(count($entity->name), 2, SafeMarkup::format('%entity_type: Assigning NULL does not reduce array count.', array('%entity_type' => $entity_type)));
+ $this->assertTrue($entity->name[1]->isEmpty(), SafeMarkup::format('%entity_type: Assigning NULL empties the item.', array('%entity_type' => $entity_type)));
// Test using isEmpty().
unset($entity->name[1]);
- $this->assertFalse($entity->name[0]->isEmpty(), format_string('%entity_type: Name item is not empty.', array('%entity_type' => $entity_type)));
+ $this->assertFalse($entity->name[0]->isEmpty(), SafeMarkup::format('%entity_type: Name item is not empty.', array('%entity_type' => $entity_type)));
$entity->name->value = NULL;
- $this->assertTrue($entity->name[0]->isEmpty(), format_string('%entity_type: Name item is empty.', array('%entity_type' => $entity_type)));
- $this->assertTrue($entity->name->isEmpty(), format_string('%entity_type: Name field is empty.', array('%entity_type' => $entity_type)));
- $this->assertEqual(count($entity->name), 1, format_string('%entity_type: Empty item is considered when counting.', array('%entity_type' => $entity_type)));
- $this->assertEqual(count(iterator_to_array($entity->name->getIterator())), count($entity->name), format_string('%entity_type: Count matches iterator count.', array('%entity_type' => $entity_type)));
- $this->assertTrue($entity->name->getValue() === array(0 => array('value' => NULL)), format_string('%entity_type: Name field value contains a NULL value.', array('%entity_type' => $entity_type)));
+ $this->assertTrue($entity->name[0]->isEmpty(), SafeMarkup::format('%entity_type: Name item is empty.', array('%entity_type' => $entity_type)));
+ $this->assertTrue($entity->name->isEmpty(), SafeMarkup::format('%entity_type: Name field is empty.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(count($entity->name), 1, SafeMarkup::format('%entity_type: Empty item is considered when counting.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(count(iterator_to_array($entity->name->getIterator())), count($entity->name), SafeMarkup::format('%entity_type: Count matches iterator count.', array('%entity_type' => $entity_type)));
+ $this->assertTrue($entity->name->getValue() === array(0 => array('value' => NULL)), SafeMarkup::format('%entity_type: Name field value contains a NULL value.', array('%entity_type' => $entity_type)));
// Test using filterEmptyItems().
$entity->name = array(NULL, 'foo');
- $this->assertEqual(count($entity->name), 2, format_string('%entity_type: List has 2 items.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(count($entity->name), 2, SafeMarkup::format('%entity_type: List has 2 items.', array('%entity_type' => $entity_type)));
$entity->name->filterEmptyItems();
- $this->assertEqual(count($entity->name), 1, format_string('%entity_type: The empty item was removed.', array('%entity_type' => $entity_type)));
- $this->assertEqual($entity->name[0]->value, 'foo', format_string('%entity_type: The items were renumbered.', array('%entity_type' => $entity_type)));
- $this->assertEqual($entity->name[0]->getName(), 0, format_string('%entity_type: The deltas were updated in the items.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(count($entity->name), 1, SafeMarkup::format('%entity_type: The empty item was removed.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->name[0]->value, 'foo', SafeMarkup::format('%entity_type: The items were renumbered.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->name[0]->getName(), 0, SafeMarkup::format('%entity_type: The deltas were updated in the items.', array('%entity_type' => $entity_type)));
// Test get and set field values.
$entity->name = 'foo';
- $this->assertEqual($entity->name[0]->toArray(), array('value' => 'foo'), format_string('%entity_type: Field value has been retrieved via toArray()', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->name[0]->toArray(), array('value' => 'foo'), SafeMarkup::format('%entity_type: Field value has been retrieved via toArray()', array('%entity_type' => $entity_type)));
$values = $entity->toArray();
- $this->assertEqual($values['name'], array(0 => array('value' => 'foo')), format_string('%entity_type: Field value has been retrieved via toArray() from an entity.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($values['name'], array(0 => array('value' => 'foo')), SafeMarkup::format('%entity_type: Field value has been retrieved via toArray() from an entity.', array('%entity_type' => $entity_type)));
// Make sure the user id can be set to zero.
$user_item[0]['target_id'] = 0;
@@ -331,8 +332,8 @@ protected function doTestReadWrite($entity_type) {
'user_id' => $user_item,
'field_test_text' => $text_item,
));
- $this->assertNotNull($entity->user_id->target_id, format_string('%entity_type: User id is not NULL', array('%entity_type' => $entity_type)));
- $this->assertIdentical($entity->user_id->target_id, 0, format_string('%entity_type: User id has been set to 0', array('%entity_type' => $entity_type)));
+ $this->assertNotNull($entity->user_id->target_id, SafeMarkup::format('%entity_type: User id is not NULL', array('%entity_type' => $entity_type)));
+ $this->assertIdentical($entity->user_id->target_id, 0, SafeMarkup::format('%entity_type: User id has been set to 0', array('%entity_type' => $entity_type)));
// Test setting the ID with the value only.
$entity = entity_create($entity_type, array(
@@ -340,8 +341,8 @@ protected function doTestReadWrite($entity_type) {
'user_id' => 0,
'field_test_text' => $text_item,
));
- $this->assertNotNull($entity->user_id->target_id, format_string('%entity_type: User id is not NULL', array('%entity_type' => $entity_type)));
- $this->assertIdentical($entity->user_id->target_id, 0, format_string('%entity_type: User id has been set to 0', array('%entity_type' => $entity_type)));
+ $this->assertNotNull($entity->user_id->target_id, SafeMarkup::format('%entity_type: User id is not NULL', array('%entity_type' => $entity_type)));
+ $this->assertIdentical($entity->user_id->target_id, 0, SafeMarkup::format('%entity_type: User id has been set to 0', array('%entity_type' => $entity_type)));
}
/**
@@ -364,19 +365,19 @@ protected function doTestSave($entity_type) {
$langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
$entity = $this->createTestEntity($entity_type);
$entity->save();
- $this->assertTrue((bool) $entity->id(), format_string('%entity_type: Entity has received an id.', array('%entity_type' => $entity_type)));
+ $this->assertTrue((bool) $entity->id(), SafeMarkup::format('%entity_type: Entity has received an id.', array('%entity_type' => $entity_type)));
$entity = entity_load($entity_type, $entity->id());
- $this->assertTrue((bool) $entity->id(), format_string('%entity_type: Entity loaded.', array('%entity_type' => $entity_type)));
+ $this->assertTrue((bool) $entity->id(), SafeMarkup::format('%entity_type: Entity loaded.', array('%entity_type' => $entity_type)));
// Access the name field.
- $this->assertEqual(1, $entity->id->value, format_string('%entity_type: ID value can be read.', array('%entity_type' => $entity_type)));
- $this->assertTrue(is_string($entity->uuid->value), format_string('%entity_type: UUID value can be read.', array('%entity_type' => $entity_type)));
- $this->assertEqual('en', $entity->{$langcode_key}->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
- $this->assertEqual(\Drupal::languageManager()->getLanguage('en'), $entity->{$langcode_key}->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
- $this->assertEqual($this->entity_user->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
- $this->assertEqual($this->entity_user->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', array('%entity_type' => $entity_type)));
- $this->assertEqual($this->entity_field_text, $entity->field_test_text->value, format_string('%entity_type: Text field can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(1, $entity->id->value, SafeMarkup::format('%entity_type: ID value can be read.', array('%entity_type' => $entity_type)));
+ $this->assertTrue(is_string($entity->uuid->value), SafeMarkup::format('%entity_type: UUID value can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual('en', $entity->{$langcode_key}->value, SafeMarkup::format('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(\Drupal::languageManager()->getLanguage('en'), $entity->{$langcode_key}->language, SafeMarkup::format('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($this->entity_user->id(), $entity->user_id->target_id, SafeMarkup::format('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($this->entity_user->getUsername(), $entity->user_id->entity->name->value, SafeMarkup::format('%entity_type: User name can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($this->entity_field_text, $entity->field_test_text->value, SafeMarkup::format('%entity_type: Text field can be read.', array('%entity_type' => $entity_type)));
}
/**
@@ -516,8 +517,8 @@ protected function doTestIterator($entity_type) {
}
$fields = $entity->getFields();
- $this->assertEqual(array_keys($fields), array_keys($entity->getTypedData()->getDataDefinition()->getPropertyDefinitions()), format_string('%entity_type: All fields returned.', array('%entity_type' => $entity_type)));
- $this->assertEqual($fields, iterator_to_array($entity->getIterator()), format_string('%entity_type: Entity iterator iterates over all fields.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(array_keys($fields), array_keys($entity->getTypedData()->getDataDefinition()->getPropertyDefinitions()), SafeMarkup::format('%entity_type: All fields returned.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($fields, iterator_to_array($entity->getIterator()), SafeMarkup::format('%entity_type: Entity iterator iterates over all fields.', array('%entity_type' => $entity_type)));
}
/**
@@ -559,7 +560,7 @@ protected function doTestDataStructureInterfaces($entity_type) {
);
asort($strings);
asort($target_strings);
- $this->assertEqual(array_values($strings), array_values($target_strings), format_string('%entity_type: All contained strings found.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(array_values($strings), array_values($target_strings), SafeMarkup::format('%entity_type: All contained strings found.', array('%entity_type' => $entity_type)));
}
/**
@@ -727,12 +728,12 @@ protected function doTestComputedProperties($entity_type) {
$entity->field_test_text->format = filter_default_format();
$target = "The <strong>text</strong> text to filter.
\n";
- $this->assertEqual($entity->field_test_text->processed, $target, format_string('%entity_type: Text is processed with the default filter.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->field_test_text->processed, $target, SafeMarkup::format('%entity_type: Text is processed with the default filter.', array('%entity_type' => $entity_type)));
// Save and load entity and make sure it still works.
$entity->save();
$entity = entity_load($entity_type, $entity->id());
- $this->assertEqual($entity->field_test_text->processed, $target, format_string('%entity_type: Text is processed with the default filter.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->field_test_text->processed, $target, SafeMarkup::format('%entity_type: Text is processed with the default filter.', array('%entity_type' => $entity_type)));
}
}
diff --git a/core/modules/system/src/Tests/Entity/EntityFormTest.php b/core/modules/system/src/Tests/Entity/EntityFormTest.php
index 307b69a..8f955d7 100644
--- a/core/modules/system/src/Tests/Entity/EntityFormTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityFormTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Entity;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\simpletest\WebTestBase;
/**
@@ -67,21 +68,21 @@ protected function doTestFormCRUD($entity_type) {
$this->drupalPostForm($entity_type . '/add', $edit, t('Save'));
$entity = $this->loadEntityByName($entity_type, $name1);
- $this->assertTrue($entity, format_string('%entity_type: Entity found in the database.', array('%entity_type' => $entity_type)));
+ $this->assertTrue($entity, SafeMarkup::format('%entity_type: Entity found in the database.', array('%entity_type' => $entity_type)));
$edit['name[0][value]'] = $name2;
$this->drupalPostForm($entity_type . '/manage/' . $entity->id(), $edit, t('Save'));
$entity = $this->loadEntityByName($entity_type, $name1);
- $this->assertFalse($entity, format_string('%entity_type: The entity has been modified.', array('%entity_type' => $entity_type)));
+ $this->assertFalse($entity, SafeMarkup::format('%entity_type: The entity has been modified.', array('%entity_type' => $entity_type)));
$entity = $this->loadEntityByName($entity_type, $name2);
- $this->assertTrue($entity, format_string('%entity_type: Modified entity found in the database.', array('%entity_type' => $entity_type)));
- $this->assertNotEqual($entity->name->value, $name1, format_string('%entity_type: The entity name has been modified.', array('%entity_type' => $entity_type)));
+ $this->assertTrue($entity, SafeMarkup::format('%entity_type: Modified entity found in the database.', array('%entity_type' => $entity_type)));
+ $this->assertNotEqual($entity->name->value, $name1, SafeMarkup::format('%entity_type: The entity name has been modified.', array('%entity_type' => $entity_type)));
$this->drupalGet($entity_type . '/manage/' . $entity->id());
$this->clickLink(t('Delete'));
$this->drupalPostForm(NULL, array(), t('Delete'));
$entity = $this->loadEntityByName($entity_type, $name2);
- $this->assertFalse($entity, format_string('%entity_type: Entity not found in the database.', array('%entity_type' => $entity_type)));
+ $this->assertFalse($entity, SafeMarkup::format('%entity_type: Entity not found in the database.', array('%entity_type' => $entity_type)));
}
/**
diff --git a/core/modules/system/src/Tests/Entity/EntityOperationsTest.php b/core/modules/system/src/Tests/Entity/EntityOperationsTest.php
index 4593bd9..2f86207 100644
--- a/core/modules/system/src/Tests/Entity/EntityOperationsTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityOperationsTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Entity;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\simpletest\WebTestBase;
/**
@@ -44,7 +45,7 @@ public function testEntityOperationAlter() {
$roles = user_roles();
foreach ($roles as $role) {
$this->assertLinkByHref($role->url() . '/test_operation');
- $this->assertLink(format_string('Test Operation: @label', array('@label' => $role->label())));
+ $this->assertLink(SafeMarkup::format('Test Operation: @label', array('@label' => $role->label())));
}
}
diff --git a/core/modules/system/src/Tests/Entity/EntityQueryTest.php b/core/modules/system/src/Tests/Entity/EntityQueryTest.php
index f66ab4e..1590845 100644
--- a/core/modules/system/src/Tests/Entity/EntityQueryTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityQueryTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Entity;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\entity_test\Entity\EntityTestMulRev;
@@ -485,7 +486,7 @@ protected function assertBundleOrder($order) {
}
}
}
- $this->assertTrue($ok, format_string("$i is after all entities in bundle2"));
+ $this->assertTrue($ok, SafeMarkup::format("$i is after all entities in bundle2"));
}
}
diff --git a/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php b/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php
index b7bf65e..67477ab 100644
--- a/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php
@@ -52,7 +52,7 @@ protected function assertReferenceable(array $selection_options, $tests, $handle
foreach ($tests as $test) {
foreach ($test['arguments'] as $arguments) {
$result = call_user_func_array(array($handler, 'getReferenceableEntities'), $arguments);
- $this->assertEqual($result, $test['result'], format_string('Valid result set returned by @handler.', array('@handler' => $handler_name)));
+ $this->assertEqual($result, $test['result'], SafeMarkup::format('Valid result set returned by @handler.', array('@handler' => $handler_name)));
$result = call_user_func_array(array($handler, 'countReferenceableEntities'), $arguments);
if (!empty($test['result'])) {
@@ -63,7 +63,7 @@ protected function assertReferenceable(array $selection_options, $tests, $handle
$count = 0;
}
- $this->assertEqual($result, $count, format_string('Valid count returned by @handler.', array('@handler' => $handler_name)));
+ $this->assertEqual($result, $count, SafeMarkup::format('Valid count returned by @handler.', array('@handler' => $handler_name)));
}
}
}
diff --git a/core/modules/system/src/Tests/Entity/EntityRevisionsTest.php b/core/modules/system/src/Tests/Entity/EntityRevisionsTest.php
index 06168a2..f2ae956 100644
--- a/core/modules/system/src/Tests/Entity/EntityRevisionsTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityRevisionsTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Entity;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\simpletest\WebTestBase;
/**
@@ -82,9 +83,9 @@ protected function assertRevisions($entity_type) {
$revision_ids[] = $entity->revision_id->value;
// Check that the fields and properties contain new content.
- $this->assertTrue($entity->revision_id->value > $legacy_revision_id, format_string('%entity_type: Revision ID changed.', array('%entity_type' => $entity_type)));
- $this->assertNotEqual($entity->name->value, $legacy_name, format_string('%entity_type: Name changed.', array('%entity_type' => $entity_type)));
- $this->assertNotEqual($entity->field_test_text->value, $legacy_text, format_string('%entity_type: Text changed.', array('%entity_type' => $entity_type)));
+ $this->assertTrue($entity->revision_id->value > $legacy_revision_id, SafeMarkup::format('%entity_type: Revision ID changed.', array('%entity_type' => $entity_type)));
+ $this->assertNotEqual($entity->name->value, $legacy_name, SafeMarkup::format('%entity_type: Name changed.', array('%entity_type' => $entity_type)));
+ $this->assertNotEqual($entity->field_test_text->value, $legacy_text, SafeMarkup::format('%entity_type: Text changed.', array('%entity_type' => $entity_type)));
}
for ($i = 0; $i < $revision_count; $i++) {
@@ -92,19 +93,19 @@ protected function assertRevisions($entity_type) {
$entity_revision = entity_revision_load($entity_type, $revision_ids[$i]);
// Check if properties and fields contain the revision specific content.
- $this->assertEqual($entity_revision->revision_id->value, $revision_ids[$i], format_string('%entity_type: Revision ID matches.', array('%entity_type' => $entity_type)));
- $this->assertEqual($entity_revision->name->value, $names[$i], format_string('%entity_type: Name matches.', array('%entity_type' => $entity_type)));
- $this->assertEqual($entity_revision->field_test_text->value, $texts[$i], format_string('%entity_type: Text matches.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity_revision->revision_id->value, $revision_ids[$i], SafeMarkup::format('%entity_type: Revision ID matches.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity_revision->name->value, $names[$i], SafeMarkup::format('%entity_type: Name matches.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity_revision->field_test_text->value, $texts[$i], SafeMarkup::format('%entity_type: Text matches.', array('%entity_type' => $entity_type)));
// Check non-revisioned values are loaded.
- $this->assertTrue(isset($entity_revision->created->value), format_string('%entity_type: Non-revisioned field is loaded.', array('%entity_type' => $entity_type)));
- $this->assertEqual($entity_revision->created->value, $created[2], format_string('%entity_type: Non-revisioned field value is the same between revisions.', array('%entity_type' => $entity_type)));
+ $this->assertTrue(isset($entity_revision->created->value), SafeMarkup::format('%entity_type: Non-revisioned field is loaded.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity_revision->created->value, $created[2], SafeMarkup::format('%entity_type: Non-revisioned field value is the same between revisions.', array('%entity_type' => $entity_type)));
}
// Confirm the correct revision text appears in the edit form.
$entity = entity_load($entity_type, $entity->id->value);
$this->drupalGet($entity_type . '/manage/' . $entity->id->value);
- $this->assertFieldById('edit-name-0-value', $entity->name->value, format_string('%entity_type: Name matches in UI.', array('%entity_type' => $entity_type)));
- $this->assertFieldById('edit-field-test-text-0-value', $entity->field_test_text->value, format_string('%entity_type: Text matches in UI.', array('%entity_type' => $entity_type)));
+ $this->assertFieldById('edit-name-0-value', $entity->name->value, SafeMarkup::format('%entity_type: Name matches in UI.', array('%entity_type' => $entity_type)));
+ $this->assertFieldById('edit-field-test-text-0-value', $entity->field_test_text->value, SafeMarkup::format('%entity_type: Text matches in UI.', array('%entity_type' => $entity_type)));
}
}
diff --git a/core/modules/system/src/Tests/Entity/EntitySchemaTest.php b/core/modules/system/src/Tests/Entity/EntitySchemaTest.php
index 5bd22ed..5e88811 100644
--- a/core/modules/system/src/Tests/Entity/EntitySchemaTest.php
+++ b/core/modules/system/src/Tests/Entity/EntitySchemaTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Entity;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
/**
@@ -99,27 +100,27 @@ public function testEntitySchemaUpdate() {
// Initially only the base table and the dedicated field data table should
// exist.
foreach ($tables as $index => $table) {
- $this->assertEqual($schema_handler->tableExists($table), !$index, String::format('Entity schema correct for the @table table.', array('@table' => $table)));
+ $this->assertEqual($schema_handler->tableExists($table), !$index, SafeMarkup::format('Entity schema correct for the @table table.', array('@table' => $table)));
}
- $this->assertTrue($schema_handler->tableExists($dedicated_tables[0]), String::format('Field schema correct for the @table table.', array('@table' => $table)));
+ $this->assertTrue($schema_handler->tableExists($dedicated_tables[0]), SafeMarkup::format('Field schema correct for the @table table.', array('@table' => $table)));
// Update the entity type definition and check that the entity schema now
// supports translations and revisions.
$this->updateEntityType(TRUE);
foreach ($tables as $table) {
- $this->assertTrue($schema_handler->tableExists($table), String::format('Entity schema correct for the @table table.', array('@table' => $table)));
+ $this->assertTrue($schema_handler->tableExists($table), SafeMarkup::format('Entity schema correct for the @table table.', array('@table' => $table)));
}
foreach ($dedicated_tables as $table) {
- $this->assertTrue($schema_handler->tableExists($table), String::format('Field schema correct for the @table table.', array('@table' => $table)));
+ $this->assertTrue($schema_handler->tableExists($table), SafeMarkup::format('Field schema correct for the @table table.', array('@table' => $table)));
}
// Revert changes and check that the entity schema now does not support
// neither translations nor revisions.
$this->updateEntityType(FALSE);
foreach ($tables as $index => $table) {
- $this->assertEqual($schema_handler->tableExists($table), !$index, String::format('Entity schema correct for the @table table.', array('@table' => $table)));
+ $this->assertEqual($schema_handler->tableExists($table), !$index, SafeMarkup::format('Entity schema correct for the @table table.', array('@table' => $table)));
}
- $this->assertTrue($schema_handler->tableExists($dedicated_tables[0]), String::format('Field schema correct for the @table table.', array('@table' => $table)));
+ $this->assertTrue($schema_handler->tableExists($dedicated_tables[0]), SafeMarkup::format('Field schema correct for the @table table.', array('@table' => $table)));
}
/**
diff --git a/core/modules/system/src/Tests/Entity/EntityTranslationTest.php b/core/modules/system/src/Tests/Entity/EntityTranslationTest.php
index aab0d28..eb7b895 100644
--- a/core/modules/system/src/Tests/Entity/EntityTranslationTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityTranslationTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Entity;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Entity\ContentEntityInterface;
use Drupal\Core\Language\LanguageInterface;
@@ -42,55 +43,55 @@ protected function doTestEntityLanguageMethods($entity_type) {
'name' => 'test',
'user_id' => $this->container->get('current_user')->id(),
));
- $this->assertEqual($entity->language()->getId(), $this->languageManager->getDefaultLanguage()->getId(), format_string('%entity_type: Entity created with API has default language.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->language()->getId(), $this->languageManager->getDefaultLanguage()->getId(), SafeMarkup::format('%entity_type: Entity created with API has default language.', array('%entity_type' => $entity_type)));
$entity = entity_create($entity_type, array(
'name' => 'test',
'user_id' => \Drupal::currentUser()->id(),
$langcode_key => LanguageInterface::LANGCODE_NOT_SPECIFIED,
));
- $this->assertEqual($entity->language()->getId(), LanguageInterface::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Entity language not specified.', array('%entity_type' => $entity_type)));
- $this->assertFalse($entity->getTranslationLanguages(FALSE), format_string('%entity_type: No translations are available', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->language()->getId(), LanguageInterface::LANGCODE_NOT_SPECIFIED, SafeMarkup::format('%entity_type: Entity language not specified.', array('%entity_type' => $entity_type)));
+ $this->assertFalse($entity->getTranslationLanguages(FALSE), SafeMarkup::format('%entity_type: No translations are available', array('%entity_type' => $entity_type)));
// Set the value in default language.
$entity->set($this->field_name, array(0 => array('value' => 'default value')));
// Get the value.
$field = $entity->getTranslation(LanguageInterface::LANGCODE_DEFAULT)->get($this->field_name);
- $this->assertEqual($field->value, 'default value', format_string('%entity_type: Untranslated value retrieved.', array('%entity_type' => $entity_type)));
- $this->assertEqual($field->getLangcode(), LanguageInterface::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($field->value, 'default value', SafeMarkup::format('%entity_type: Untranslated value retrieved.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($field->getLangcode(), LanguageInterface::LANGCODE_NOT_SPECIFIED, SafeMarkup::format('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
// Set the value in a certain language. As the entity is not
// language-specific it should use the default language and so ignore the
// specified language.
$entity->getTranslation($this->langcodes[1])->set($this->field_name, array(0 => array('value' => 'default value2')));
- $this->assertEqual($entity->get($this->field_name)->value, 'default value2', format_string('%entity_type: Untranslated value updated.', array('%entity_type' => $entity_type)));
- $this->assertFalse($entity->getTranslationLanguages(FALSE), format_string('%entity_type: No translations are available', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->get($this->field_name)->value, 'default value2', SafeMarkup::format('%entity_type: Untranslated value updated.', array('%entity_type' => $entity_type)));
+ $this->assertFalse($entity->getTranslationLanguages(FALSE), SafeMarkup::format('%entity_type: No translations are available', array('%entity_type' => $entity_type)));
// Test getting a field value using a specific language for a not
// language-specific entity.
$field = $entity->getTranslation($this->langcodes[1])->get($this->field_name);
- $this->assertEqual($field->value, 'default value2', format_string('%entity_type: Untranslated value retrieved.', array('%entity_type' => $entity_type)));
- $this->assertEqual($field->getLangcode(), LanguageInterface::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($field->value, 'default value2', SafeMarkup::format('%entity_type: Untranslated value retrieved.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($field->getLangcode(), LanguageInterface::LANGCODE_NOT_SPECIFIED, SafeMarkup::format('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
// Now, make the entity language-specific by assigning a language and test
// translating it.
$default_langcode = $this->langcodes[0];
$entity->{$langcode_key}->value = $default_langcode;
$entity->{$this->field_name} = array();
- $this->assertEqual($entity->language(), \Drupal::languageManager()->getLanguage($this->langcodes[0]), format_string('%entity_type: Entity language retrieved.', array('%entity_type' => $entity_type)));
- $this->assertFalse($entity->getTranslationLanguages(FALSE), format_string('%entity_type: No translations are available', array('%entity_type' => $entity_type)));
+ $this->assertEqual($entity->language(), \Drupal::languageManager()->getLanguage($this->langcodes[0]), SafeMarkup::format('%entity_type: Entity language retrieved.', array('%entity_type' => $entity_type)));
+ $this->assertFalse($entity->getTranslationLanguages(FALSE), SafeMarkup::format('%entity_type: No translations are available', array('%entity_type' => $entity_type)));
// Set the value in default language.
$entity->set($this->field_name, array(0 => array('value' => 'default value')));
// Get the value.
$field = $entity->get($this->field_name);
- $this->assertEqual($field->value, 'default value', format_string('%entity_type: Untranslated value retrieved.', array('%entity_type' => $entity_type)));
- $this->assertEqual($field->getLangcode(), $default_langcode, format_string('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($field->value, 'default value', SafeMarkup::format('%entity_type: Untranslated value retrieved.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($field->getLangcode(), $default_langcode, SafeMarkup::format('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
// Set a translation.
$entity->getTranslation($this->langcodes[1])->set($this->field_name, array(0 => array('value' => 'translation 1')));
$field = $entity->getTranslation($this->langcodes[1])->{$this->field_name};
- $this->assertEqual($field->value, 'translation 1', format_string('%entity_type: Translated value set.', array('%entity_type' => $entity_type)));
- $this->assertEqual($field->getLangcode(), $this->langcodes[1], format_string('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($field->value, 'translation 1', SafeMarkup::format('%entity_type: Translated value set.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($field->getLangcode(), $this->langcodes[1], SafeMarkup::format('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
// Make sure the untranslated value stays.
$field = $entity->get($this->field_name);
@@ -101,7 +102,7 @@ protected function doTestEntityLanguageMethods($entity_type) {
$this->assertEqual($entity->getTranslationLanguages(FALSE), $translations, 'Translations retrieved.');
// Try to get a not available translation.
- $this->assertNull($entity->getTranslation($this->langcodes[2])->get($this->field_name)->value, format_string('%entity_type: A translation that is not available is NULL.', array('%entity_type' => $entity_type)));
+ $this->assertNull($entity->getTranslation($this->langcodes[2])->get($this->field_name)->value, SafeMarkup::format('%entity_type: A translation that is not available is NULL.', array('%entity_type' => $entity_type)));
// Try to get a value using an invalid language code.
try {
@@ -115,10 +116,10 @@ protected function doTestEntityLanguageMethods($entity_type) {
// Try to set a value using an invalid language code.
try {
$entity->getTranslation('invalid')->set($this->field_name, NULL);
- $this->fail(format_string('%entity_type: Setting a translation for an invalid language throws an exception.', array('%entity_type' => $entity_type)));
+ $this->fail(SafeMarkup::format('%entity_type: Setting a translation for an invalid language throws an exception.', array('%entity_type' => $entity_type)));
}
catch (\InvalidArgumentException $e) {
- $this->pass(format_string('%entity_type: Setting a translation for an invalid language throws an exception.', array('%entity_type' => $entity_type)));
+ $this->pass(SafeMarkup::format('%entity_type: Setting a translation for an invalid language throws an exception.', array('%entity_type' => $entity_type)));
}
// Set the value in default language.
@@ -126,8 +127,8 @@ protected function doTestEntityLanguageMethods($entity_type) {
$entity->getTranslation($this->langcodes[1])->set($field_name, array(0 => array('value' => 'default value2')));
// Get the value.
$field = $entity->get($field_name);
- $this->assertEqual($field->value, 'default value2', format_string('%entity_type: Untranslated value set into a translation in non-strict mode.', array('%entity_type' => $entity_type)));
- $this->assertEqual($field->getLangcode(), $default_langcode, format_string('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($field->value, 'default value2', SafeMarkup::format('%entity_type: Untranslated value set into a translation in non-strict mode.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($field->getLangcode(), $default_langcode, SafeMarkup::format('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
}
/**
@@ -159,19 +160,19 @@ protected function doTestMultilingualProperties($entity_type) {
$entity->save();
$entity = entity_load($entity_type, $entity->id());
$default_langcode = $entity->language()->getId();
- $this->assertEqual($default_langcode, LanguageInterface::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Entity created as language neutral.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($default_langcode, LanguageInterface::LANGCODE_NOT_SPECIFIED, SafeMarkup::format('%entity_type: Entity created as language neutral.', array('%entity_type' => $entity_type)));
$field = $entity->getTranslation(LanguageInterface::LANGCODE_DEFAULT)->get('name');
- $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name has been correctly stored as language neutral.', array('%entity_type' => $entity_type)));
- $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
- $this->assertEqual($uid, $entity->getTranslation(LanguageInterface::LANGCODE_DEFAULT)->get('user_id')->target_id, format_string('%entity_type: The entity author has been correctly stored as language neutral.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($name, $field->value, SafeMarkup::format('%entity_type: The entity name has been correctly stored as language neutral.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($default_langcode, $field->getLangcode(), SafeMarkup::format('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($uid, $entity->getTranslation(LanguageInterface::LANGCODE_DEFAULT)->get('user_id')->target_id, SafeMarkup::format('%entity_type: The entity author has been correctly stored as language neutral.', array('%entity_type' => $entity_type)));
$field = $entity->getTranslation($langcode)->get('name');
- $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name defaults to neutral language.', array('%entity_type' => $entity_type)));
- $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
- $this->assertEqual($uid, $entity->getTranslation($langcode)->get('user_id')->target_id, format_string('%entity_type: The entity author defaults to neutral language.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($name, $field->value, SafeMarkup::format('%entity_type: The entity name defaults to neutral language.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($default_langcode, $field->getLangcode(), SafeMarkup::format('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($uid, $entity->getTranslation($langcode)->get('user_id')->target_id, SafeMarkup::format('%entity_type: The entity author defaults to neutral language.', array('%entity_type' => $entity_type)));
$field = $entity->get('name');
- $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name can be retrieved without specifying a language.', array('%entity_type' => $entity_type)));
- $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
- $this->assertEqual($uid, $entity->get('user_id')->target_id, format_string('%entity_type: The entity author can be retrieved without specifying a language.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($name, $field->value, SafeMarkup::format('%entity_type: The entity name can be retrieved without specifying a language.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($default_langcode, $field->getLangcode(), SafeMarkup::format('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($uid, $entity->get('user_id')->target_id, SafeMarkup::format('%entity_type: The entity author can be retrieved without specifying a language.', array('%entity_type' => $entity_type)));
// Create a language-aware entity and check that properties are stored
// as language-aware.
@@ -179,21 +180,21 @@ protected function doTestMultilingualProperties($entity_type) {
$entity->save();
$entity = entity_load($entity_type, $entity->id());
$default_langcode = $entity->language()->getId();
- $this->assertEqual($default_langcode, $langcode, format_string('%entity_type: Entity created as language specific.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($default_langcode, $langcode, SafeMarkup::format('%entity_type: Entity created as language specific.', array('%entity_type' => $entity_type)));
$field = $entity->getTranslation($langcode)->get('name');
- $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name has been correctly stored as a language-aware property.', array('%entity_type' => $entity_type)));
- $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
- $this->assertEqual($uid, $entity->getTranslation($langcode)->get('user_id')->target_id, format_string('%entity_type: The entity author has been correctly stored as a language-aware property.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($name, $field->value, SafeMarkup::format('%entity_type: The entity name has been correctly stored as a language-aware property.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($default_langcode, $field->getLangcode(), SafeMarkup::format('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($uid, $entity->getTranslation($langcode)->get('user_id')->target_id, SafeMarkup::format('%entity_type: The entity author has been correctly stored as a language-aware property.', array('%entity_type' => $entity_type)));
// Translatable properties on a translatable entity should use default
// language if LanguageInterface::LANGCODE_NOT_SPECIFIED is passed.
$field = $entity->getTranslation(LanguageInterface::LANGCODE_NOT_SPECIFIED)->get('name');
- $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name defaults to the default language.', array('%entity_type' => $entity_type)));
- $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
- $this->assertEqual($uid, $entity->getTranslation(LanguageInterface::LANGCODE_NOT_SPECIFIED)->get('user_id')->target_id, format_string('%entity_type: The entity author defaults to the default language.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($name, $field->value, SafeMarkup::format('%entity_type: The entity name defaults to the default language.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($default_langcode, $field->getLangcode(), SafeMarkup::format('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($uid, $entity->getTranslation(LanguageInterface::LANGCODE_NOT_SPECIFIED)->get('user_id')->target_id, SafeMarkup::format('%entity_type: The entity author defaults to the default language.', array('%entity_type' => $entity_type)));
$field = $entity->get('name');
- $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name can be retrieved without specifying a language.', array('%entity_type' => $entity_type)));
- $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
- $this->assertEqual($uid, $entity->get('user_id')->target_id, format_string('%entity_type: The entity author can be retrieved without specifying a language.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($name, $field->value, SafeMarkup::format('%entity_type: The entity name can be retrieved without specifying a language.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($default_langcode, $field->getLangcode(), SafeMarkup::format('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($uid, $entity->get('user_id')->target_id, SafeMarkup::format('%entity_type: The entity author can be retrieved without specifying a language.', array('%entity_type' => $entity_type)));
// Create property translations.
$properties = array();
@@ -226,10 +227,10 @@ protected function doTestMultilingualProperties($entity_type) {
'%langcode' => $langcode,
);
$field = $entity->getTranslation($langcode)->get('name');
- $this->assertEqual($properties[$langcode]['name'][0], $field->value, format_string('%entity_type: The entity name has been correctly stored for language %langcode.', $args));
+ $this->assertEqual($properties[$langcode]['name'][0], $field->value, SafeMarkup::format('%entity_type: The entity name has been correctly stored for language %langcode.', $args));
$field_langcode = ($langcode == $entity->language()->getId()) ? $default_langcode : $langcode;
- $this->assertEqual($field_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expected langcode %langcode.', $args));
- $this->assertEqual($properties[$langcode]['user_id'][0], $entity->getTranslation($langcode)->get('user_id')->target_id, format_string('%entity_type: The entity author has been correctly stored for language %langcode.', $args));
+ $this->assertEqual($field_langcode, $field->getLangcode(), SafeMarkup::format('%entity_type: The field object has the expected langcode %langcode.', $args));
+ $this->assertEqual($properties[$langcode]['user_id'][0], $entity->getTranslation($langcode)->get('user_id')->target_id, SafeMarkup::format('%entity_type: The entity author has been correctly stored for language %langcode.', $args));
}
// Test query conditions (cache is reset at each call).
@@ -244,24 +245,24 @@ protected function doTestMultilingualProperties($entity_type) {
))->save();
$entities = entity_load_multiple($entity_type);
- $this->assertEqual(count($entities), 3, format_string('%entity_type: Three entities were created.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(count($entities), 3, SafeMarkup::format('%entity_type: Three entities were created.', array('%entity_type' => $entity_type)));
$entities = entity_load_multiple($entity_type, array($translated_id));
- $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity correctly loaded by id.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(count($entities), 1, SafeMarkup::format('%entity_type: One entity correctly loaded by id.', array('%entity_type' => $entity_type)));
$entities = entity_load_multiple_by_properties($entity_type, array('name' => $name));
- $this->assertEqual(count($entities), 2, format_string('%entity_type: Two entities correctly loaded by name.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(count($entities), 2, SafeMarkup::format('%entity_type: Two entities correctly loaded by name.', array('%entity_type' => $entity_type)));
// @todo The default language condition should go away in favor of an
// explicit parameter.
$entities = entity_load_multiple_by_properties($entity_type, array('name' => $properties[$langcode]['name'][0], $default_langcode_key => 0));
- $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity correctly loaded by name translation.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(count($entities), 1, SafeMarkup::format('%entity_type: One entity correctly loaded by name translation.', array('%entity_type' => $entity_type)));
$entities = entity_load_multiple_by_properties($entity_type, array($langcode_key => $default_langcode, 'name' => $name));
- $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity correctly loaded by name and language.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(count($entities), 1, SafeMarkup::format('%entity_type: One entity correctly loaded by name and language.', array('%entity_type' => $entity_type)));
$entities = entity_load_multiple_by_properties($entity_type, array($langcode_key => $langcode, 'name' => $properties[$langcode]['name'][0]));
- $this->assertEqual(count($entities), 0, format_string('%entity_type: No entity loaded by name translation specifying the translation language.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(count($entities), 0, SafeMarkup::format('%entity_type: No entity loaded by name translation specifying the translation language.', array('%entity_type' => $entity_type)));
$entities = entity_load_multiple_by_properties($entity_type, array($langcode_key => $langcode, 'name' => $properties[$langcode]['name'][0], $default_langcode_key => 0));
- $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity loaded by name translation and language specifying to look for translations.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(count($entities), 1, SafeMarkup::format('%entity_type: One entity loaded by name translation and language specifying to look for translations.', array('%entity_type' => $entity_type)));
$entities = entity_load_multiple_by_properties($entity_type, array('user_id' => $properties[$langcode]['user_id'][0], $default_langcode_key => NULL));
- $this->assertEqual(count($entities), 2, format_string('%entity_type: Two entities loaded by uid without caring about property translatability.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(count($entities), 2, SafeMarkup::format('%entity_type: Two entities loaded by uid without caring about property translatability.', array('%entity_type' => $entity_type)));
// Test property conditions and orders with multiple languages in the same
// query.
@@ -273,7 +274,7 @@ protected function doTestMultilingualProperties($entity_type) {
->condition($group)
->condition('name', $properties[$langcode]['name'][0], '=', $langcode)
->execute();
- $this->assertEqual(count($result), 1, format_string('%entity_type: One entity loaded by name and uid using different language meta conditions.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(count($result), 1, SafeMarkup::format('%entity_type: One entity loaded by name and uid using different language meta conditions.', array('%entity_type' => $entity_type)));
// Test mixed property and field conditions.
$entity = entity_load($entity_type, reset($result), TRUE);
@@ -292,7 +293,7 @@ protected function doTestMultilingualProperties($entity_type) {
->condition($default_langcode_group)
->condition($langcode_group)
->execute();
- $this->assertEqual(count($result), 1, format_string('%entity_type: One entity loaded by name, uid and field value using different language meta conditions.', array('%entity_type' => $entity_type)));
+ $this->assertEqual(count($result), 1, SafeMarkup::format('%entity_type: One entity loaded by name, uid and field value using different language meta conditions.', array('%entity_type' => $entity_type)));
}
/**
@@ -420,7 +421,7 @@ protected function doTestEntityTranslationAPI($entity_type) {
$translation = $entity->getTranslation($langcode2);
$entity->removeTranslation($langcode2);
foreach (array('get', 'set', '__get', '__set', 'createDuplicate') as $method) {
- $message = format_string('The @method method raises an exception when trying to manipulate a removed translation.', array('@method' => $method));
+ $message = SafeMarkup::format('The @method method raises an exception when trying to manipulate a removed translation.', array('@method' => $method));
try {
$translation->{$method}('name', $this->randomMachineName());
$this->fail($message);
@@ -442,7 +443,7 @@ protected function doTestEntityTranslationAPI($entity_type) {
// Check that removing an invalid translation causes an exception to be
// thrown.
foreach (array($default_langcode, LanguageInterface::LANGCODE_DEFAULT, $this->randomMachineName()) as $invalid_langcode) {
- $message = format_string('Removing an invalid translation (@langcode) causes an exception to be thrown.', array('@langcode' => $invalid_langcode));
+ $message = SafeMarkup::format('Removing an invalid translation (@langcode) causes an exception to be thrown.', array('@langcode' => $invalid_langcode));
try {
$entity->removeTranslation($invalid_langcode);
$this->fail($message);
@@ -644,7 +645,7 @@ function testFieldDefinitions() {
foreach ($translatable_fields as $name => $translatable) {
$this->state->set('entity_test.field_definitions.translatable', array($name => $translatable));
$this->entityManager->clearCachedFieldDefinitions();
- $message = format_string('Field %field cannot be translatable.', array('%field' => $name));
+ $message = SafeMarkup::format('Field %field cannot be translatable.', array('%field' => $name));
try {
$this->entityManager->getBaseFieldDefinitions($entity_type);
@@ -738,7 +739,7 @@ function testEntityAdapter() {
foreach ($langcodes as $langcode) {
$adapter = $entity->getTranslation($langcode)->getTypedData();
$name = $adapter->get('name')->value;
- $this->assertEqual($name, $values[$langcode]['name'], String::format('Name correctly retrieved from "@langcode" adapter', array('@langcode' => $langcode)));
+ $this->assertEqual($name, $values[$langcode]['name'], SafeMarkup::format('Name correctly retrieved from "@langcode" adapter', array('@langcode' => $langcode)));
}
}
diff --git a/core/modules/system/src/Tests/Extension/ModuleHandlerTest.php b/core/modules/system/src/Tests/Extension/ModuleHandlerTest.php
index d2d6fed..652443a 100644
--- a/core/modules/system/src/Tests/Extension/ModuleHandlerTest.php
+++ b/core/modules/system/src/Tests/Extension/ModuleHandlerTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Extension;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\simpletest\KernelTestBase;
use \Drupal\Core\Extension\ModuleUninstallValidatorException;
@@ -86,7 +87,7 @@ protected function assertModuleList(Array $expected_values, $condition) {
$expected_values = array_values(array_unique($expected_values));
$enabled_modules = array_keys($this->container->get('module_handler')->getModuleList());
$enabled_modules = sort($enabled_modules);
- $this->assertEqual($expected_values, $enabled_modules, format_string('@condition: extension handler returns correct results', array('@condition' => $condition)));
+ $this->assertEqual($expected_values, $enabled_modules, SafeMarkup::format('@condition: extension handler returns correct results', array('@condition' => $condition)));
}
/**
diff --git a/core/modules/system/src/Tests/File/DirectoryTest.php b/core/modules/system/src/Tests/File/DirectoryTest.php
index 0822063..148ab51 100644
--- a/core/modules/system/src/Tests/File/DirectoryTest.php
+++ b/core/modules/system/src/Tests/File/DirectoryTest.php
@@ -6,6 +6,7 @@
*/
namespace Drupal\system\Tests\File;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\PhpStorage\FileStorage;
@@ -109,14 +110,14 @@ function testFileCreateNewFilepath() {
$directory = 'core/misc';
$original = $directory . '/' . $basename;
$path = file_create_filename($basename, $directory);
- $this->assertEqual($path, $original, format_string('New filepath %new equals %original.', array('%new' => $path, '%original' => $original)), 'File');
+ $this->assertEqual($path, $original, SafeMarkup::format('New filepath %new equals %original.', array('%new' => $path, '%original' => $original)), 'File');
// Then we test against a file that already exists within that directory.
$basename = 'druplicon.png';
$original = $directory . '/' . $basename;
$expected = $directory . '/druplicon_0.png';
$path = file_create_filename($basename, $directory);
- $this->assertEqual($path, $expected, format_string('Creating a new filepath from %original equals %new (expected %expected).', array('%new' => $path, '%original' => $original, '%expected' => $expected)), 'File');
+ $this->assertEqual($path, $expected, SafeMarkup::format('Creating a new filepath from %original equals %new (expected %expected).', array('%new' => $path, '%original' => $original, '%expected' => $expected)), 'File');
// @TODO: Finally we copy a file into a directory several times, to ensure a properly iterating filename suffix.
}
diff --git a/core/modules/system/src/Tests/File/HtaccessUnitTest.php b/core/modules/system/src/Tests/File/HtaccessUnitTest.php
index 7d71a33..d998282 100644
--- a/core/modules/system/src/Tests/File/HtaccessUnitTest.php
+++ b/core/modules/system/src/Tests/File/HtaccessUnitTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\File;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\simpletest\KernelTestBase;
@@ -89,7 +90,7 @@ function testHtaccessSave() {
*/
protected function assertFilePermissions($uri, $expected) {
$actual = fileperms($uri) & 0777;
- return $this->assertIdentical($actual, $expected, String::format('@uri file permissions @actual are identical to @expected.', array(
+ return $this->assertIdentical($actual, $expected, SafeMarkup::format('@uri file permissions @actual are identical to @expected.', array(
'@uri' => $uri,
'@actual' => 0 . decoct($actual),
'@expected' => 0 . decoct($expected),
diff --git a/core/modules/system/src/Tests/File/MimeTypeTest.php b/core/modules/system/src/Tests/File/MimeTypeTest.php
index f09b60d..8cf22cd 100644
--- a/core/modules/system/src/Tests/File/MimeTypeTest.php
+++ b/core/modules/system/src/Tests/File/MimeTypeTest.php
@@ -6,6 +6,7 @@
*/
namespace Drupal\system\Tests\File;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Tests filename mimetype detection.
@@ -49,11 +50,11 @@ public function testFileMimeTypeDetection() {
foreach ($test_case as $input => $expected) {
// Test stream [URI].
$output = $guesser->guess($prefix . $input);
- $this->assertIdentical($output, $expected, format_string('Mimetype for %input is %output (expected: %expected).', array('%input' => $input, '%output' => $output, '%expected' => $expected)));
+ $this->assertIdentical($output, $expected, SafeMarkup::format('Mimetype for %input is %output (expected: %expected).', array('%input' => $input, '%output' => $output, '%expected' => $expected)));
// Test normal path equivalent
$output = $guesser->guess($input);
- $this->assertIdentical($output, $expected, format_string('Mimetype (using default mappings) for %input is %output (expected: %expected).', array('%input' => $input, '%output' => $output, '%expected' => $expected)));
+ $this->assertIdentical($output, $expected, SafeMarkup::format('Mimetype (using default mappings) for %input is %output (expected: %expected).', array('%input' => $input, '%output' => $output, '%expected' => $expected)));
}
// Now test the extension gusser by passing in a custom mapping.
@@ -88,7 +89,7 @@ public function testFileMimeTypeDetection() {
foreach ($test_case as $input => $expected) {
$output = $extension_guesser->guess($input);
- $this->assertIdentical($output, $expected, format_string('Mimetype (using passed-in mappings) for %input is %output (expected: %expected).', array('%input' => $input, '%output' => $output, '%expected' => $expected)));
+ $this->assertIdentical($output, $expected, SafeMarkup::format('Mimetype (using passed-in mappings) for %input is %output (expected: %expected).', array('%input' => $input, '%output' => $output, '%expected' => $expected)));
}
}
}
diff --git a/core/modules/system/src/Tests/File/NameMungingTest.php b/core/modules/system/src/Tests/File/NameMungingTest.php
index 06f44c8..cfd6d33 100644
--- a/core/modules/system/src/Tests/File/NameMungingTest.php
+++ b/core/modules/system/src/Tests/File/NameMungingTest.php
@@ -6,6 +6,7 @@
*/
namespace Drupal\system\Tests\File;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Tests filename munging and unmunging.
@@ -45,7 +46,7 @@ function testMunging() {
$munged_name = file_munge_filename($this->name, '', TRUE);
$messages = drupal_get_messages();
$this->assertTrue(in_array(t('For security reasons, your upload has been renamed to %filename.', array('%filename' => $munged_name)), $messages['status']), 'Alert properly set when a file is renamed.');
- $this->assertNotEqual($munged_name, $this->name, format_string('The new filename (%munged) has been modified from the original (%original)', array('%munged' => $munged_name, '%original' => $this->name)));
+ $this->assertNotEqual($munged_name, $this->name, SafeMarkup::format('The new filename (%munged) has been modified from the original (%original)', array('%munged' => $munged_name, '%original' => $this->name)));
}
/**
@@ -64,7 +65,7 @@ function testMungeNullByte() {
function testMungeIgnoreInsecure() {
$this->config('system.file')->set('allow_insecure_uploads', 1)->save();
$munged_name = file_munge_filename($this->name, '');
- $this->assertIdentical($munged_name, $this->name, format_string('The original filename (%original) matches the munged filename (%munged) when insecure uploads are enabled.', array('%munged' => $munged_name, '%original' => $this->name)));
+ $this->assertIdentical($munged_name, $this->name, SafeMarkup::format('The original filename (%original) matches the munged filename (%munged) when insecure uploads are enabled.', array('%munged' => $munged_name, '%original' => $this->name)));
}
/**
@@ -74,10 +75,10 @@ function testMungeIgnoreWhitelisted() {
// Declare our extension as whitelisted. The declared extensions should
// be case insensitive so test using one with a different case.
$munged_name = file_munge_filename($this->name_with_uc_ext, $this->bad_extension);
- $this->assertIdentical($munged_name, $this->name_with_uc_ext, format_string('The new filename (%munged) matches the original (%original) once the extension has been whitelisted.', array('%munged' => $munged_name, '%original' => $this->name_with_uc_ext)));
+ $this->assertIdentical($munged_name, $this->name_with_uc_ext, SafeMarkup::format('The new filename (%munged) matches the original (%original) once the extension has been whitelisted.', array('%munged' => $munged_name, '%original' => $this->name_with_uc_ext)));
// The allowed extensions should also be normalized.
$munged_name = file_munge_filename($this->name, strtoupper($this->bad_extension));
- $this->assertIdentical($munged_name, $this->name, format_string('The new filename (%munged) matches the original (%original) also when the whitelisted extension is in uppercase.', array('%munged' => $munged_name, '%original' => $this->name)));
+ $this->assertIdentical($munged_name, $this->name, SafeMarkup::format('The new filename (%munged) matches the original (%original) also when the whitelisted extension is in uppercase.', array('%munged' => $munged_name, '%original' => $this->name)));
}
/**
@@ -86,6 +87,6 @@ function testMungeIgnoreWhitelisted() {
function testUnMunge() {
$munged_name = file_munge_filename($this->name, '', FALSE);
$unmunged_name = file_unmunge_filename($munged_name);
- $this->assertIdentical($unmunged_name, $this->name, format_string('The unmunged (%unmunged) filename matches the original (%original)', array('%unmunged' => $unmunged_name, '%original' => $this->name)));
+ $this->assertIdentical($unmunged_name, $this->name, SafeMarkup::format('The unmunged (%unmunged) filename matches the original (%original)', array('%unmunged' => $unmunged_name, '%original' => $this->name)));
}
}
diff --git a/core/modules/system/src/Tests/Form/CheckboxTest.php b/core/modules/system/src/Tests/Form/CheckboxTest.php
index da53a79..eb819fb 100644
--- a/core/modules/system/src/Tests/Form/CheckboxTest.php
+++ b/core/modules/system/src/Tests/Form/CheckboxTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Form;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\simpletest\WebTestBase;
/**
@@ -53,7 +54,7 @@ function testFormCheckbox() {
$checked = ($default_value === '1foobar');
}
$checked_in_html = strpos($form, 'checked') !== FALSE;
- $message = format_string('#default_value is %default_value #return_value is %return_value.', array('%default_value' => var_export($default_value, TRUE), '%return_value' => var_export($return_value, TRUE)));
+ $message = SafeMarkup::format('#default_value is %default_value #return_value is %return_value.', array('%default_value' => var_export($default_value, TRUE), '%return_value' => var_export($return_value, TRUE)));
$this->assertIdentical($checked, $checked_in_html, $message);
}
}
@@ -75,7 +76,7 @@ function testFormCheckbox() {
foreach ($checkboxes as $checkbox) {
$checked = isset($checkbox['checked']);
$name = (string) $checkbox['name'];
- $this->assertIdentical($checked, $name == 'checkbox_zero_default[0]' || $name == 'checkbox_string_zero_default[0]', format_string('Checkbox %name correctly checked', array('%name' => $name)));
+ $this->assertIdentical($checked, $name == 'checkbox_zero_default[0]' || $name == 'checkbox_string_zero_default[0]', SafeMarkup::format('Checkbox %name correctly checked', array('%name' => $name)));
}
$edit = array('checkbox_off[0]' => '0');
$this->drupalPostForm('form-test/checkboxes-zero/0', $edit, 'Save');
@@ -83,7 +84,7 @@ function testFormCheckbox() {
foreach ($checkboxes as $checkbox) {
$checked = isset($checkbox['checked']);
$name = (string) $checkbox['name'];
- $this->assertIdentical($checked, $name == 'checkbox_off[0]' || $name == 'checkbox_zero_default[0]' || $name == 'checkbox_string_zero_default[0]', format_string('Checkbox %name correctly checked', array('%name' => $name)));
+ $this->assertIdentical($checked, $name == 'checkbox_off[0]' || $name == 'checkbox_zero_default[0]' || $name == 'checkbox_string_zero_default[0]', SafeMarkup::format('Checkbox %name correctly checked', array('%name' => $name)));
}
}
}
diff --git a/core/modules/system/src/Tests/Form/ConfirmFormTest.php b/core/modules/system/src/Tests/Form/ConfirmFormTest.php
index 9521176..edec0c0 100644
--- a/core/modules/system/src/Tests/Form/ConfirmFormTest.php
+++ b/core/modules/system/src/Tests/Form/ConfirmFormTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Form;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Url;
use Drupal\simpletest\WebTestBase;
@@ -79,7 +80,7 @@ public function testConfirmFormWithExternalDestination() {
*/
public function assertCancelLinkUrl(Url $url, $message = '', $group = 'Other') {
$links = $this->xpath('//a[@href=:url]', [':url' => $url->toString()]);
- $message = ($message ? $message : String::format('Cancel link with url %url found.', ['%url' => $url->toString()]));
+ $message = ($message ? $message : SafeMarkup::format('Cancel link with url %url found.', ['%url' => $url->toString()]));
return $this->assertTrue(isset($links[0]), $message, $group);
}
diff --git a/core/modules/system/src/Tests/Form/ElementTest.php b/core/modules/system/src/Tests/Form/ElementTest.php
index 9fa7eca..9b389ed 100644
--- a/core/modules/system/src/Tests/Form/ElementTest.php
+++ b/core/modules/system/src/Tests/Form/ElementTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Form;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\simpletest\WebTestBase;
/**
@@ -35,7 +36,7 @@ function testPlaceHolderText() {
':id' => 'edit-' . $type,
':expected' => $expected,
));
- $this->assertTrue(!empty($element), format_string('Placeholder text placed in @type.', array('@type' => $type)));
+ $this->assertTrue(!empty($element), SafeMarkup::format('Placeholder text placed in @type.', array('@type' => $type)));
}
// Test to make sure textarea has the proper placeholder text.
@@ -81,7 +82,7 @@ function testOptions() {
':id' => 'edit-' . $type . '-foo',
':class' => 'description',
));
- $this->assertTrue(count($elements), format_string('Custom %type option description found.', array(
+ $this->assertTrue(count($elements), SafeMarkup::format('Custom %type option description found.', array(
'%type' => $type,
)));
}
@@ -97,8 +98,8 @@ function testWrapperIds() {
foreach (array('checkboxes', 'radios') as $type) {
$element_ids = $this->xpath('//div[@id=:id]', array(':id' => 'edit-' . $type));
$wrapper_ids = $this->xpath('//fieldset[@id=:id]', array(':id' => 'edit-' . $type . '--wrapper'));
- $this->assertTrue(count($element_ids) == 1, format_string('A single element id found for type %type', array('%type' => $type)));
- $this->assertTrue(count($wrapper_ids) == 1, format_string('A single wrapper id found for type %type', array('%type' => $type)));
+ $this->assertTrue(count($element_ids) == 1, SafeMarkup::format('A single element id found for type %type', array('%type' => $type)));
+ $this->assertTrue(count($wrapper_ids) == 1, SafeMarkup::format('A single wrapper id found for type %type', array('%type' => $type)));
}
}
diff --git a/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php b/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
index 8d6cb65..5b3170c 100644
--- a/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
+++ b/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Form;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Form\FormState;
use Drupal\simpletest\WebTestBase;
use Drupal\Core\Form\FormStateInterface;
@@ -39,7 +40,7 @@ function testMultipleTrue() {
$rows = array('row1', 'row2', 'row3');
foreach ($rows as $row) {
- $this->assertFieldByXPath('//input[@type="checkbox"]', $row, format_string('Checkbox for value @row.', array('@row' => $row)));
+ $this->assertFieldByXPath('//input[@type="checkbox"]', $row, SafeMarkup::format('Checkbox for value @row.', array('@row' => $row)));
}
}
@@ -56,7 +57,7 @@ function testMultipleFalse() {
$rows = array('row1', 'row2', 'row3');
foreach ($rows as $row) {
- $this->assertFieldByXPath('//input[@type="radio"]', $row, format_string('Radio button for value @row.', array('@row' => $row)));
+ $this->assertFieldByXPath('//input[@type="radio"]', $row, SafeMarkup::format('Radio button for value @row.', array('@row' => $row)));
}
}
@@ -78,7 +79,7 @@ function testTableselectColSpan() {
// radio, one cell in the first column, one cell in the second column,
// and two cells in the third column which has colspan 2.
for ( $i = 0; $i <= 1; $i++) {
- $this->assertEqual(count($table_body[0]->tr[$i]->td), 5, format_string('There are five cells in row @row.', array('@row' => $i)));
+ $this->assertEqual(count($table_body[0]->tr[$i]->td), 5, SafeMarkup::format('There are five cells in row @row.', array('@row' => $i)));
}
// The third row should have 3 cells, one for the radio, one spanning the
// first and second column, and a third in column 3 (which has colspan 3).
diff --git a/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php b/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php
index a69da46..d4b5e44 100644
--- a/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php
+++ b/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Form;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\simpletest\WebTestBase;
use Drupal\Component\Serialization\Json;
@@ -74,6 +75,6 @@ function testDefaultTab() {
*/
function testDefaultTabCleaned() {
$values = Json::decode($this->drupalPostForm('form_test/form-state-values-clean', [], t('Submit')));
- $this->assertFalse(isset($values['vertical_tabs__active_tab']), String::format('%element was removed.', ['%element' => 'vertical_tabs__active_tab']));
+ $this->assertFalse(isset($values['vertical_tabs__active_tab']), SafeMarkup::format('%element was removed.', ['%element' => 'vertical_tabs__active_tab']));
}
}
diff --git a/core/modules/system/src/Tests/Form/FormTest.php b/core/modules/system/src/Tests/Form/FormTest.php
index 0197e8a..4cd985c 100644
--- a/core/modules/system/src/Tests/Form/FormTest.php
+++ b/core/modules/system/src/Tests/Form/FormTest.php
@@ -8,6 +8,7 @@
namespace Drupal\system\Tests\Form;
use Drupal\Component\Serialization\Json;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Form\FormState;
use Drupal\Core\Render\Element;
@@ -193,7 +194,7 @@ function testRequiredCheckboxesRadio() {
$expected_key = array_search($error[0], $expected);
// If the error message is not one of the expected messages, fail.
if ($expected_key === FALSE) {
- $this->fail(format_string("Unexpected error message: @error", array('@error' => $error[0])));
+ $this->fail(SafeMarkup::format("Unexpected error message: @error", array('@error' => $error[0])));
}
// Remove the expected message from the list once it is found.
else {
@@ -203,7 +204,7 @@ function testRequiredCheckboxesRadio() {
// Fail if any expected messages were not found.
foreach ($expected as $not_found) {
- $this->fail(format_string("Found error message: @error", array('@error' => $not_found)));
+ $this->fail(SafeMarkup::format("Found error message: @error", array('@error' => $not_found)));
}
// Verify that input elements are still empty.
@@ -285,7 +286,7 @@ function testCheckboxProcessing() {
'zero_checkbox_off' => '',
);
foreach ($expected_values as $widget => $expected_value) {
- $this->assertEqual($values[$widget], $expected_value, format_string('Checkbox %widget returns expected value (expected: %expected, got: %value)', array(
+ $this->assertEqual($values[$widget], $expected_value, SafeMarkup::format('Checkbox %widget returns expected value (expected: %expected, got: %value)', array(
'%widget' => var_export($widget, TRUE),
'%expected' => var_export($expected_value, TRUE),
'%value' => var_export($values[$widget], TRUE),
@@ -359,7 +360,7 @@ function testSelect() {
'multiple_no_default_required' => array('three' => 'three'),
);
foreach ($expected as $key => $value) {
- $this->assertIdentical($values[$key], $value, format_string('@name: @actual is equal to @expected.', array(
+ $this->assertIdentical($values[$key], $value, SafeMarkup::format('@name: @actual is equal to @expected.', array(
'@name' => $key,
'@actual' => var_export($values[$key], TRUE),
'@expected' => var_export($value, TRUE),
@@ -430,10 +431,10 @@ function testNumber() {
// Check if the error exists on the page, if the current message ID is
// expected. Otherwise ensure that the error message is not present.
if ($id === $error) {
- $this->assertRaw(format_string($message, $placeholders));
+ $this->assertRaw(SafeMarkup::format($message, $placeholders));
}
else {
- $this->assertNoRaw(format_string($message, $placeholders));
+ $this->assertNoRaw(SafeMarkup::format($message, $placeholders));
}
}
}
@@ -534,7 +535,7 @@ function testDisabledElements() {
// the disabled container.
$actual_count = count($disabled_elements);
$expected_count = 41;
- $this->assertEqual($actual_count, $expected_count, String::format('Found @actual elements with disabled property (expected @expected).', array(
+ $this->assertEqual($actual_count, $expected_count, SafeMarkup::format('Found @actual elements with disabled property (expected @expected).', array(
'@actual' => count($disabled_elements),
'@expected' => $expected_count,
)));
@@ -566,7 +567,7 @@ function assertFormValuesDefault($values, $form) {
// Checkboxes values are not filtered out.
$values[$key] = array_filter($values[$key]);
}
- $this->assertIdentical($expected_value, $values[$key], format_string('Default value for %type: expected %expected, returned %returned.', array('%type' => $key, '%expected' => var_export($expected_value, TRUE), '%returned' => var_export($values[$key], TRUE))));
+ $this->assertIdentical($expected_value, $values[$key], SafeMarkup::format('Default value for %type: expected %expected, returned %returned.', array('%type' => $key, '%expected' => var_export($expected_value, TRUE), '%returned' => var_export($values[$key], TRUE))));
}
// Recurse children.
@@ -620,7 +621,7 @@ function testDisabledMarkup() {
':div-class' => $class,
':value' => isset($item['#value']) ? $item['#value'] : '',
));
- $this->assertTrue(isset($element[0]), format_string('Disabled form element class found for #type %type.', array('%type' => $item['#type'])));
+ $this->assertTrue(isset($element[0]), SafeMarkup::format('Disabled form element class found for #type %type.', array('%type' => $item['#type'])));
}
// Verify special element #type text-format.
@@ -628,12 +629,12 @@ function testDisabledMarkup() {
':name' => 'text_format[value]',
':div-class' => 'form-disabled',
));
- $this->assertTrue(isset($element[0]), format_string('Disabled form element class found for #type %type.', array('%type' => 'text_format[value]')));
+ $this->assertTrue(isset($element[0]), SafeMarkup::format('Disabled form element class found for #type %type.', array('%type' => 'text_format[value]')));
$element = $this->xpath('//div[contains(@class, :div-class)]/descendant::select[@name=:name]', array(
':name' => 'text_format[format]',
':div-class' => 'form-disabled',
));
- $this->assertTrue(isset($element[0]), format_string('Disabled form element class found for #type %type.', array('%type' => 'text_format[format]')));
+ $this->assertTrue(isset($element[0]), SafeMarkup::format('Disabled form element class found for #type %type.', array('%type' => 'text_format[format]')));
}
/**
@@ -661,7 +662,7 @@ function testRequiredAttribute() {
':id' => 'edit-' . $type,
':expected' => $expected,
));
- $this->assertTrue(!empty($element), format_string('The @type has the proper required attribute.', array('@type' => $type)));
+ $this->assertTrue(!empty($element), SafeMarkup::format('The @type has the proper required attribute.', array('@type' => $type)));
}
// Test to make sure textarea has the proper required attribute.
diff --git a/core/modules/system/src/Tests/Form/LanguageSelectElementTest.php b/core/modules/system/src/Tests/Form/LanguageSelectElementTest.php
index 410d320..6f9611c 100644
--- a/core/modules/system/src/Tests/Form/LanguageSelectElementTest.php
+++ b/core/modules/system/src/Tests/Form/LanguageSelectElementTest.php
@@ -8,6 +8,7 @@
namespace Drupal\system\Tests\Form;
use Drupal\Component\Serialization\Json;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Language\LanguageInterface;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\simpletest\WebTestBase;
@@ -53,7 +54,7 @@ function testLanguageSelectElementOptions() {
'edit-languages-config-and-locked' => LanguageInterface::STATE_CONFIGURABLE | LanguageInterface::STATE_LOCKED
);
foreach ($ids as $id => $flags) {
- $this->assertField($id, format_string('The @id field was found on the page.', array('@id' => $id)));
+ $this->assertField($id, SafeMarkup::format('The @id field was found on the page.', array('@id' => $id)));
$options = array();
/* @var $language_manager \Drupal\Core\Language\LanguageManagerInterface */
$language_manager = $this->container->get('language_manager');
@@ -64,7 +65,7 @@ function testLanguageSelectElementOptions() {
}
// Test that the #options were not altered by #languages.
- $this->assertField('edit-language-custom-options', format_string('The @id field was found on the page.', array('@id' => 'edit-language-custom-options')));
+ $this->assertField('edit-language-custom-options', SafeMarkup::format('The @id field was found on the page.', array('@id' => 'edit-language-custom-options')));
$this->_testLanguageSelectElementOptions('edit-language-custom-options', array('opt1' => 'First option', 'opt2' => 'Second option', 'opt3' => 'Third option'));
}
@@ -81,7 +82,7 @@ function testHiddenLanguageSelectElement() {
// Check that the language fields were rendered on the page.
$ids = array('edit-languages-all', 'edit-languages-configurable', 'edit-languages-locked', 'edit-languages-config-and-locked');
foreach ($ids as $id) {
- $this->assertNoField($id, format_string('The @id field was not found on the page.', array('@id' => $id)));
+ $this->assertNoField($id, SafeMarkup::format('The @id field was not found on the page.', array('@id' => $id)));
}
// Check that the submitted values were the default values of the language
@@ -116,6 +117,6 @@ protected function _testLanguageSelectElementOptions($id, $options) {
$this->assertEqual((string) $option, $option_title);
next($options);
}
- $this->assertEqual($count, count($options), format_string('The number of languages and the number of options shown by the language element are the same: @languages languages, @number options', array('@languages' => count($options), '@number' => $count)));
+ $this->assertEqual($count, count($options), SafeMarkup::format('The number of languages and the number of options shown by the language element are the same: @languages languages, @number options', array('@languages' => count($options), '@number' => $count)));
}
}
diff --git a/core/modules/system/src/Tests/Form/ProgrammaticTest.php b/core/modules/system/src/Tests/Form/ProgrammaticTest.php
index ef8130c..1b8d1fa 100644
--- a/core/modules/system/src/Tests/Form/ProgrammaticTest.php
+++ b/core/modules/system/src/Tests/Form/ProgrammaticTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Form;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Form\FormState;
use Drupal\simpletest\WebTestBase;
@@ -82,14 +83,14 @@ private function submitForm($values, $valid_input) {
'%values' => print_r($values, TRUE),
'%errors' => $valid_form ? t('None') : implode(' ', $errors),
);
- $this->assertTrue($valid_input == $valid_form, format_string('Input values: %values
Validation handler errors: %errors', $args));
+ $this->assertTrue($valid_input == $valid_form, SafeMarkup::format('Input values: %values
Validation handler errors: %errors', $args));
// We check submitted values only if we have a valid input.
if ($valid_input) {
// Fetching the values that were set in the submission handler.
$stored_values = $form_state->get('programmatic_form_submit');
foreach ($values as $key => $value) {
- $this->assertEqual($stored_values[$key], $value, format_string('Submission handler correctly executed: %stored_key is %stored_value', array('%stored_key' => $key, '%stored_value' => print_r($value, TRUE))));
+ $this->assertEqual($stored_values[$key], $value, SafeMarkup::format('Submission handler correctly executed: %stored_key is %stored_value', array('%stored_key' => $key, '%stored_value' => print_r($value, TRUE))));
}
}
}
diff --git a/core/modules/system/src/Tests/Form/StateValuesCleanTest.php b/core/modules/system/src/Tests/Form/StateValuesCleanTest.php
index f07ae8c..72cea57 100644
--- a/core/modules/system/src/Tests/Form/StateValuesCleanTest.php
+++ b/core/modules/system/src/Tests/Form/StateValuesCleanTest.php
@@ -8,6 +8,7 @@
namespace Drupal\system\Tests\Form;
use Drupal\Component\Serialization\Json;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\simpletest\WebTestBase;
@@ -39,19 +40,19 @@ function testFormStateValuesClean() {
);
// Verify that all internal Form API elements were removed.
- $this->assertFalse(isset($values['form_id']), format_string('%element was removed.', array('%element' => 'form_id')));
- $this->assertFalse(isset($values['form_token']), format_string('%element was removed.', array('%element' => 'form_token')));
- $this->assertFalse(isset($values['form_build_id']), format_string('%element was removed.', array('%element' => 'form_build_id')));
- $this->assertFalse(isset($values['op']), format_string('%element was removed.', array('%element' => 'op')));
+ $this->assertFalse(isset($values['form_id']), SafeMarkup::format('%element was removed.', array('%element' => 'form_id')));
+ $this->assertFalse(isset($values['form_token']), SafeMarkup::format('%element was removed.', array('%element' => 'form_token')));
+ $this->assertFalse(isset($values['form_build_id']), SafeMarkup::format('%element was removed.', array('%element' => 'form_build_id')));
+ $this->assertFalse(isset($values['op']), SafeMarkup::format('%element was removed.', array('%element' => 'op')));
// Verify that all buttons were removed.
- $this->assertFalse(isset($values['foo']), format_string('%element was removed.', array('%element' => 'foo')));
- $this->assertFalse(isset($values['bar']), format_string('%element was removed.', array('%element' => 'bar')));
- $this->assertFalse(isset($values['baz']['foo']), format_string('%element was removed.', array('%element' => 'foo')));
- $this->assertFalse(isset($values['baz']['baz']), format_string('%element was removed.', array('%element' => 'baz')));
+ $this->assertFalse(isset($values['foo']), SafeMarkup::format('%element was removed.', array('%element' => 'foo')));
+ $this->assertFalse(isset($values['bar']), SafeMarkup::format('%element was removed.', array('%element' => 'bar')));
+ $this->assertFalse(isset($values['baz']['foo']), SafeMarkup::format('%element was removed.', array('%element' => 'foo')));
+ $this->assertFalse(isset($values['baz']['baz']), SafeMarkup::format('%element was removed.', array('%element' => 'baz')));
// Verify values manually added for cleaning were removed.
- $this->assertFalse(isset($values['wine']), String::format('%element was removed.', ['%element' => 'wine']));
+ $this->assertFalse(isset($values['wine']), SafeMarkup::format('%element was removed.', ['%element' => 'wine']));
// Verify that nested form value still exists.
$this->assertTrue(isset($values['baz']['beer']), 'Nested form value still exists.');
diff --git a/core/modules/system/src/Tests/Form/ValidationTest.php b/core/modules/system/src/Tests/Form/ValidationTest.php
index 7b6c9e8..9302a0e 100644
--- a/core/modules/system/src/Tests/Form/ValidationTest.php
+++ b/core/modules/system/src/Tests/Form/ValidationTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Form;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Render\Element;
use Drupal\simpletest\WebTestBase;
@@ -95,7 +96,7 @@ function testValidateLimitErrors() {
':id' => 'edit-' . $type,
':expected' => $expected,
));
- $this->assertTrue(!empty($element), format_string('The @type button has the proper formnovalidate attribute.', array('@type' => $type)));
+ $this->assertTrue(!empty($element), SafeMarkup::format('The @type button has the proper formnovalidate attribute.', array('@type' => $type)));
}
// The button with full server-side validation should not have the
// 'formnovalidate' attribute.
diff --git a/core/modules/system/src/Tests/Image/ToolkitGdTest.php b/core/modules/system/src/Tests/Image/ToolkitGdTest.php
index f4face0..5222c53 100644
--- a/core/modules/system/src/Tests/Image/ToolkitGdTest.php
+++ b/core/modules/system/src/Tests/Image/ToolkitGdTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Image;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Image\ImageInterface;
use \Drupal\simpletest\KernelTestBase;
use Drupal\Component\Utility\String;
@@ -262,14 +263,14 @@ function testManipulations() {
$image = $this->imageFactory->get(drupal_get_path('module', 'simpletest') . '/files/' . $file);
$toolkit = $image->getToolkit();
if (!$image->isValid()) {
- $this->fail(String::format('Could not load image %file.', array('%file' => $file)));
+ $this->fail(SafeMarkup::format('Could not load image %file.', array('%file' => $file)));
continue 2;
}
$image_original_type = $image->getToolkit()->getType();
// All images should be converted to truecolor when loaded.
$image_truecolor = imageistruecolor($toolkit->getResource());
- $this->assertTrue($image_truecolor, String::format('Image %file after load is a truecolor image.', array('%file' => $file)));
+ $this->assertTrue($image_truecolor, SafeMarkup::format('Image %file after load is a truecolor image.', array('%file' => $file)));
if ($image->getToolkit()->getType() == IMAGETYPE_GIF) {
if ($op == 'desaturate') {
@@ -312,8 +313,8 @@ function testManipulations() {
$file_path = $directory . '/' . $op . image_type_to_extension($image->getToolkit()->getType());
$image->save($file_path);
- $this->assertTrue($correct_dimensions_real, String::format('Image %file after %action action has proper dimensions.', array('%file' => $file, '%action' => $op)));
- $this->assertTrue($correct_dimensions_object, String::format('Image %file object after %action action is reporting the proper height and width values.', array('%file' => $file, '%action' => $op)));
+ $this->assertTrue($correct_dimensions_real, SafeMarkup::format('Image %file after %action action has proper dimensions.', array('%file' => $file, '%action' => $op)));
+ $this->assertTrue($correct_dimensions_object, SafeMarkup::format('Image %file object after %action action is reporting the proper height and width values.', array('%file' => $file, '%action' => $op)));
// JPEG colors will always be messed up due to compression. So we skip
// these tests if the original or the result is in jpeg format.
@@ -349,7 +350,7 @@ function testManipulations() {
// conversion. The convert operation cannot handle that correctly.
if ($image->getToolkit()->getType() == $image_original_type || $corner != $this->transparent) {
$correct_colors = $this->colorsAreEqual($color, $corner);
- $this->assertTrue($correct_colors, String::format('Image %file object after %action action has the correct color placement at corner %corner.',
+ $this->assertTrue($correct_colors, SafeMarkup::format('Image %file object after %action action has the correct color placement at corner %corner.',
array('%file' => $file, '%action' => $op, '%corner' => $key)));
}
}
@@ -367,25 +368,25 @@ function testManipulations() {
$image->createNew(50, 20, image_type_to_extension($type, FALSE), '#ffff00');
$file = 'from_null' . image_type_to_extension($type);
$file_path = $directory . '/' . $file ;
- $this->assertEqual(50, $image->getWidth(), String::format('Image file %file has the correct width.', array('%file' => $file)));
- $this->assertEqual(20, $image->getHeight(), String::format('Image file %file has the correct height.', array('%file' => $file)));
- $this->assertEqual(image_type_to_mime_type($type), $image->getMimeType(), String::format('Image file %file has the correct MIME type.', array('%file' => $file)));
- $this->assertTrue($image->save($file_path), String::format('Image %file created anew from a null image was saved.', array('%file' => $file)));
+ $this->assertEqual(50, $image->getWidth(), SafeMarkup::format('Image file %file has the correct width.', array('%file' => $file)));
+ $this->assertEqual(20, $image->getHeight(), SafeMarkup::format('Image file %file has the correct height.', array('%file' => $file)));
+ $this->assertEqual(image_type_to_mime_type($type), $image->getMimeType(), SafeMarkup::format('Image file %file has the correct MIME type.', array('%file' => $file)));
+ $this->assertTrue($image->save($file_path), SafeMarkup::format('Image %file created anew from a null image was saved.', array('%file' => $file)));
// Reload saved image.
$image_reloaded = $this->imageFactory->get($file_path);
if (!$image_reloaded->isValid()) {
- $this->fail(String::format('Could not load image %file.', array('%file' => $file)));
+ $this->fail(SafeMarkup::format('Could not load image %file.', array('%file' => $file)));
continue;
}
- $this->assertEqual(50, $image_reloaded->getWidth(), String::format('Image file %file has the correct width.', array('%file' => $file)));
- $this->assertEqual(20, $image_reloaded->getHeight(), String::format('Image file %file has the correct height.', array('%file' => $file)));
- $this->assertEqual(image_type_to_mime_type($type), $image_reloaded->getMimeType(), String::format('Image file %file has the correct MIME type.', array('%file' => $file)));
+ $this->assertEqual(50, $image_reloaded->getWidth(), SafeMarkup::format('Image file %file has the correct width.', array('%file' => $file)));
+ $this->assertEqual(20, $image_reloaded->getHeight(), SafeMarkup::format('Image file %file has the correct height.', array('%file' => $file)));
+ $this->assertEqual(image_type_to_mime_type($type), $image_reloaded->getMimeType(), SafeMarkup::format('Image file %file has the correct MIME type.', array('%file' => $file)));
if ($image_reloaded->getToolkit()->getType() == IMAGETYPE_GIF) {
- $this->assertEqual('#ffff00', $image_reloaded->getToolkit()->getTransparentColor(), String::format('Image file %file has the correct transparent color channel set.', array('%file' => $file)));
+ $this->assertEqual('#ffff00', $image_reloaded->getToolkit()->getTransparentColor(), SafeMarkup::format('Image file %file has the correct transparent color channel set.', array('%file' => $file)));
}
else {
- $this->assertEqual(NULL, $image_reloaded->getToolkit()->getTransparentColor(), String::format('Image file %file has no color channel set.', array('%file' => $file)));
+ $this->assertEqual(NULL, $image_reloaded->getToolkit()->getTransparentColor(), SafeMarkup::format('Image file %file has no color channel set.', array('%file' => $file)));
}
}
@@ -420,12 +421,12 @@ function testTransparentColorOutOfRange() {
$toolkit = $image->getToolkit();
if (!$image->isValid()) {
- $this->fail(String::format('Could not load image %file.', array('%file' => $file)));
+ $this->fail(SafeMarkup::format('Could not load image %file.', array('%file' => $file)));
}
else {
// All images should be converted to truecolor when loaded.
$image_truecolor = imageistruecolor($toolkit->getResource());
- $this->assertTrue($image_truecolor, String::format('Image %file after load is a truecolor image.', array('%file' => $file)));
+ $this->assertTrue($image_truecolor, SafeMarkup::format('Image %file after load is a truecolor image.', array('%file' => $file)));
}
}
@@ -443,7 +444,7 @@ function testMissingOperation() {
// Load up a fresh image.
$image = $this->imageFactory->get(drupal_get_path('module', 'simpletest') . '/files/' . $file);
if (!$image->isValid()) {
- $this->fail(String::format('Could not load image %file.', array('%file' => $file)));
+ $this->fail(SafeMarkup::format('Could not load image %file.', array('%file' => $file)));
}
// Try perform a missing toolkit operation.
diff --git a/core/modules/system/src/Tests/Image/ToolkitTestBase.php b/core/modules/system/src/Tests/Image/ToolkitTestBase.php
index 44b8437..72a3085 100644
--- a/core/modules/system/src/Tests/Image/ToolkitTestBase.php
+++ b/core/modules/system/src/Tests/Image/ToolkitTestBase.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Image;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\simpletest\WebTestBase;
use Drupal\Component\Utility\String;
@@ -104,10 +105,10 @@ function assertToolkitOperationsCalled(array $expected) {
// Determine if there were any expected that were not called.
$uncalled = array_diff($expected, $actual);
if (count($uncalled)) {
- $this->assertTrue(FALSE, String::format('Expected operations %expected to be called but %uncalled was not called.', array('%expected' => implode(', ', $expected), '%uncalled' => implode(', ', $uncalled))));
+ $this->assertTrue(FALSE, SafeMarkup::format('Expected operations %expected to be called but %uncalled was not called.', array('%expected' => implode(', ', $expected), '%uncalled' => implode(', ', $uncalled))));
}
else {
- $this->assertTrue(TRUE, String::format('All the expected operations were called: %expected', array('%expected' => implode(', ', $expected))));
+ $this->assertTrue(TRUE, SafeMarkup::format('All the expected operations were called: %expected', array('%expected' => implode(', ', $expected))));
}
// Determine if there were any unexpected calls.
@@ -115,7 +116,7 @@ function assertToolkitOperationsCalled(array $expected) {
// count it as an error.
$unexpected = array_diff($actual, $expected);
if (count($unexpected) && (!in_array('apply', $expected) || count(array_intersect($unexpected, $operations)) !== count($unexpected))) {
- $this->assertTrue(FALSE, String::format('Unexpected operations were called: %unexpected.', array('%unexpected' => implode(', ', $unexpected))));
+ $this->assertTrue(FALSE, SafeMarkup::format('Unexpected operations were called: %unexpected.', array('%unexpected' => implode(', ', $unexpected))));
}
else {
$this->assertTrue(TRUE, 'No unexpected operations were called.');
diff --git a/core/modules/system/src/Tests/Installer/InstallerLanguageTest.php b/core/modules/system/src/Tests/Installer/InstallerLanguageTest.php
index a025b35..b989655 100644
--- a/core/modules/system/src/Tests/Installer/InstallerLanguageTest.php
+++ b/core/modules/system/src/Tests/Installer/InstallerLanguageTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Installer;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\simpletest\KernelTestBase;
use Drupal\Core\StringTranslation\Translator\FileTranslation;
@@ -33,9 +34,9 @@ function testInstallerTranslationFiles() {
$file_translation = new FileTranslation(drupal_get_path('module', 'simpletest') . '/files/translations');
foreach ($expected_translation_files as $langcode => $files_expected) {
$files_found = $file_translation->findTranslationFiles($langcode);
- $this->assertTrue(count($files_found) == count($files_expected), format_string('@count installer languages found.', array('@count' => count($files_expected))));
+ $this->assertTrue(count($files_found) == count($files_expected), SafeMarkup::format('@count installer languages found.', array('@count' => count($files_expected))));
foreach ($files_found as $file) {
- $this->assertTrue(in_array($file->filename, $files_expected), format_string('@file found.', array('@file' => $file->filename)));
+ $this->assertTrue(in_array($file->filename, $files_expected), SafeMarkup::format('@file found.', array('@file' => $file->filename)));
}
}
}
diff --git a/core/modules/system/src/Tests/Menu/AssertBreadcrumbTrait.php b/core/modules/system/src/Tests/Menu/AssertBreadcrumbTrait.php
index a9d421a..55d67ab 100644
--- a/core/modules/system/src/Tests/Menu/AssertBreadcrumbTrait.php
+++ b/core/modules/system/src/Tests/Menu/AssertBreadcrumbTrait.php
@@ -89,7 +89,7 @@ protected function assertBreadcrumbParts($trail) {
// No parts must be left, or an expected "Home" will always pass.
$pass = ($pass && empty($parts));
- $this->assertTrue($pass, format_string('Breadcrumb %parts found on @path.', array(
+ $this->assertTrue($pass, SafeMarkup::format('Breadcrumb %parts found on @path.', array(
'%parts' => implode(' » ', $trail),
'@path' => $this->getUrl(),
)));
diff --git a/core/modules/system/src/Tests/Menu/AssertMenuActiveTrailTrait.php b/core/modules/system/src/Tests/Menu/AssertMenuActiveTrailTrait.php
index fba46d4..37ab35f 100644
--- a/core/modules/system/src/Tests/Menu/AssertMenuActiveTrailTrait.php
+++ b/core/modules/system/src/Tests/Menu/AssertMenuActiveTrailTrait.php
@@ -61,7 +61,7 @@ protected function assertMenuActiveTrail($tree, $last_active) {
':title' => $active_link_title,
);
$elements = $this->xpath($xpath, $args);
- $this->assertTrue(!empty($elements), format_string('Active link %title was found in menu tree, including active trail links %tree.', array(
+ $this->assertTrue(!empty($elements), SafeMarkup::format('Active link %title was found in menu tree, including active trail links %tree.', array(
'%title' => $active_link_title,
'%tree' => implode(' » ', $tree),
)));
diff --git a/core/modules/system/src/Tests/Menu/LocalTasksTest.php b/core/modules/system/src/Tests/Menu/LocalTasksTest.php
index 4edf30e..d88190c 100644
--- a/core/modules/system/src/Tests/Menu/LocalTasksTest.php
+++ b/core/modules/system/src/Tests/Menu/LocalTasksTest.php
@@ -38,7 +38,7 @@ protected function assertLocalTasks(array $routes, $level = 0) {
list($route_name, $route_parameters) = $route_info;
$expected = Url::fromRoute($route_name, $route_parameters)->toString();
$method = ($elements[$index]['href'] == $expected ? 'pass' : 'fail');
- $this->{$method}(format_string('Task @number href @value equals @expected.', array(
+ $this->{$method}(SafeMarkup::format('Task @number href @value equals @expected.', array(
'@number' => $index + 1,
'@value' => (string) $elements[$index]['href'],
'@expected' => $expected,
diff --git a/core/modules/system/src/Tests/Module/InstallTest.php b/core/modules/system/src/Tests/Module/InstallTest.php
index 1068b60..233491e 100644
--- a/core/modules/system/src/Tests/Module/InstallTest.php
+++ b/core/modules/system/src/Tests/Module/InstallTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Module;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Extension\ExtensionNameLengthException;
use Drupal\simpletest\WebTestBase;
@@ -60,7 +61,7 @@ public function testRequiredModuleSchemaVersions() {
*/
public function testModuleNameLength() {
$module_name = 'invalid_module_name_over_the_maximum_allowed_character_length';
- $message = format_string('Exception thrown when enabling module %name with a name length over the allowed maximum', array('%name' => $module_name));
+ $message = SafeMarkup::format('Exception thrown when enabling module %name with a name length over the allowed maximum', array('%name' => $module_name));
try {
$this->container->get('module_installer')->install(array($module_name));
$this->fail($message);
@@ -70,7 +71,7 @@ public function testModuleNameLength() {
}
// Since for the UI, the submit callback uses FALSE, test that too.
- $message = format_string('Exception thrown when enabling as if via the UI the module %name with a name length over the allowed maximum', array('%name' => $module_name));
+ $message = SafeMarkup::format('Exception thrown when enabling as if via the UI the module %name with a name length over the allowed maximum', array('%name' => $module_name));
try {
$this->container->get('module_installer')->install(array($module_name), FALSE);
$this->fail($message);
diff --git a/core/modules/system/src/Tests/Module/ModuleTestBase.php b/core/modules/system/src/Tests/Module/ModuleTestBase.php
index 4023b57..eb256f7 100644
--- a/core/modules/system/src/Tests/Module/ModuleTestBase.php
+++ b/core/modules/system/src/Tests/Module/ModuleTestBase.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Module;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Config\InstallStorage;
use Drupal\Core\Database\Database;
use Drupal\Core\Config\FileStorage;
@@ -47,9 +48,9 @@ function assertTableCount($base_table, $count = TRUE) {
$tables = db_find_tables(Database::getConnection()->prefixTables('{' . $base_table . '}') . '%');
if ($count) {
- return $this->assertTrue($tables, format_string('Tables matching "@base_table" found.', array('@base_table' => $base_table)));
+ return $this->assertTrue($tables, SafeMarkup::format('Tables matching "@base_table" found.', array('@base_table' => $base_table)));
}
- return $this->assertFalse($tables, format_string('Tables matching "@base_table" not found.', array('@base_table' => $base_table)));
+ return $this->assertFalse($tables, SafeMarkup::format('Tables matching "@base_table" not found.', array('@base_table' => $base_table)));
}
/**
@@ -67,7 +68,7 @@ function assertModuleTablesExist($module) {
$tables_exist = FALSE;
}
}
- return $this->assertTrue($tables_exist, format_string('All database tables defined by the @module module exist.', array('@module' => $module)));
+ return $this->assertTrue($tables_exist, SafeMarkup::format('All database tables defined by the @module module exist.', array('@module' => $module)));
}
/**
@@ -84,7 +85,7 @@ function assertModuleTablesDoNotExist($module) {
$tables_exist = TRUE;
}
}
- return $this->assertFalse($tables_exist, format_string('None of the database tables defined by the @module module exist.', array('@module' => $module)));
+ return $this->assertFalse($tables_exist, SafeMarkup::format('None of the database tables defined by the @module module exist.', array('@module' => $module)));
}
/**
@@ -126,7 +127,7 @@ function assertModuleConfig($module) {
}
// Verify that all configuration has been installed (which means that $names
// is empty).
- return $this->assertFalse($names, format_string('All default configuration of @module module found.', array('@module' => $module)));
+ return $this->assertFalse($names, SafeMarkup::format('All default configuration of @module module found.', array('@module' => $module)));
}
/**
@@ -140,7 +141,7 @@ function assertModuleConfig($module) {
*/
function assertNoModuleConfig($module) {
$names = \Drupal::configFactory()->listAll($module . '.');
- return $this->assertFalse($names, format_string('No configuration found for @module module.', array('@module' => $module)));
+ return $this->assertFalse($names, SafeMarkup::format('No configuration found for @module module.', array('@module' => $module)));
}
/**
@@ -160,7 +161,7 @@ function assertModules(array $modules, $enabled) {
else {
$message = 'Module "@module" is not enabled.';
}
- $this->assertEqual($this->container->get('module_handler')->moduleExists($module), $enabled, format_string($message, array('@module' => $module)));
+ $this->assertEqual($this->container->get('module_handler')->moduleExists($module), $enabled, SafeMarkup::format($message, array('@module' => $module)));
}
}
@@ -194,6 +195,6 @@ function assertLogMessage($type, $message, $variables = array(), $severity = Rfc
->countQuery()
->execute()
->fetchField();
- $this->assertTrue($count > 0, format_string('watchdog table contains @count rows for @message', array('@count' => $count, '@message' => format_string($message, $variables))));
+ $this->assertTrue($count > 0, SafeMarkup::format('watchdog table contains @count rows for @message', array('@count' => $count, '@message' => SafeMarkup::format($message, $variables))));
}
}
diff --git a/core/modules/system/src/Tests/Module/RequiredTest.php b/core/modules/system/src/Tests/Module/RequiredTest.php
index c14d293..b614157 100644
--- a/core/modules/system/src/Tests/Module/RequiredTest.php
+++ b/core/modules/system/src/Tests/Module/RequiredTest.php
@@ -6,6 +6,7 @@
*/
namespace Drupal\system\Tests\Module;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Attempt disabling of required modules.
@@ -25,7 +26,7 @@ function testDisableRequired() {
if (!empty($info['required'])) {
$field_name = "modules[{$info['package']}][$module][enable]";
if (empty($info['hidden'])) {
- $this->assertFieldByXPath("//input[@name='$field_name' and @disabled='disabled' and @checked='checked']", '', format_string('Field @name was disabled and checked.', array('@name' => $field_name)));
+ $this->assertFieldByXPath("//input[@name='$field_name' and @disabled='disabled' and @checked='checked']", '', SafeMarkup::format('Field @name was disabled and checked.', array('@name' => $field_name)));
}
else {
$this->assertNoFieldByName($field_name);
diff --git a/core/modules/system/src/Tests/Module/UninstallTest.php b/core/modules/system/src/Tests/Module/UninstallTest.php
index 4032a90..371e8f8 100644
--- a/core/modules/system/src/Tests/Module/UninstallTest.php
+++ b/core/modules/system/src/Tests/Module/UninstallTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Module;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Cache\Cache;
use Drupal\Component\Utility\String;
use Drupal\simpletest\WebTestBase;
@@ -66,7 +67,7 @@ function testUninstallPage() {
$this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
$this->assertNoText(\Drupal::translation()->translate('Configuration deletions'), 'No configuration deletions listed on the module install confirmation page.');
$this->assertText(\Drupal::translation()->translate('Configuration updates'), 'Configuration updates listed on the module install confirmation page.');
- $this->assertText($node_type->label(), String::format('The entity label "!label" found.', array('!label' => $node_type->label())));
+ $this->assertText($node_type->label(), SafeMarkup::format('The entity label "!label" found.', array('!label' => $node_type->label())));
$this->drupalPostForm(NULL, NULL, t('Uninstall'));
$this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.');
@@ -82,7 +83,7 @@ function testUninstallPage() {
$entity_types = array();
foreach ($node_dependencies as $entity) {
$label = $entity->label() ?: $entity->id();
- $this->assertText($label, String::format('The entity label "!label" found.', array('!label' => $label)));
+ $this->assertText($label, SafeMarkup::format('The entity label "!label" found.', array('!label' => $label)));
$entity_types[] = $entity->getEntityTypeId();
}
$entity_types = array_unique($entity_types);
@@ -97,7 +98,7 @@ function testUninstallPage() {
// cleared during the uninstall.
\Drupal::cache()->set('uninstall_test', 'test_uninstall_page', Cache::PERMANENT);
$cached = \Drupal::cache()->get('uninstall_test');
- $this->assertEqual($cached->data, 'test_uninstall_page', String::format('Cache entry found: @bin', array('@bin' => $cached->data)));
+ $this->assertEqual($cached->data, 'test_uninstall_page', SafeMarkup::format('Cache entry found: @bin', array('@bin' => $cached->data)));
$this->drupalPostForm(NULL, NULL, t('Uninstall'));
$this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.');
diff --git a/core/modules/system/src/Tests/Path/AliasTest.php b/core/modules/system/src/Tests/Path/AliasTest.php
index f1f6bf2..0fecb42 100644
--- a/core/modules/system/src/Tests/Path/AliasTest.php
+++ b/core/modules/system/src/Tests/Path/AliasTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Path;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Cache\MemoryCounterBackend;
use Drupal\Core\Path\AliasStorage;
use Drupal\Core\Database\Database;
@@ -37,7 +38,7 @@ function testCRUD() {
$result = $connection->query('SELECT * FROM {url_alias} WHERE source = :source AND alias= :alias AND langcode = :langcode', array(':source' => $alias['source'], ':alias' => $alias['alias'], ':langcode' => $alias['langcode']));
$rows = $result->fetchAll();
- $this->assertEqual(count($rows), 1, format_string('Created an entry for %alias.', array('%alias' => $alias['alias'])));
+ $this->assertEqual(count($rows), 1, SafeMarkup::format('Created an entry for %alias.', array('%alias' => $alias['alias'])));
//Cache the pid for further tests.
$aliases[$idx]['pid'] = $rows[0]->pid;
@@ -47,12 +48,12 @@ function testCRUD() {
foreach ($aliases as $alias) {
$pid = $alias['pid'];
$loadedAlias = $aliasStorage->load(array('pid' => $pid));
- $this->assertEqual($loadedAlias, $alias, format_string('Loaded the expected path with pid %pid.', array('%pid' => $pid)));
+ $this->assertEqual($loadedAlias, $alias, SafeMarkup::format('Loaded the expected path with pid %pid.', array('%pid' => $pid)));
}
// Load alias by source path.
$loadedAlias = $aliasStorage->load(array('source' => 'node/1'));
- $this->assertEqual($loadedAlias['alias'], 'alias_for_node_1_und', format_string('The last created alias loaded by default.'));
+ $this->assertEqual($loadedAlias['alias'], 'alias_for_node_1_und', SafeMarkup::format('The last created alias loaded by default.'));
//Update a few aliases
foreach ($aliases as $alias) {
@@ -63,7 +64,7 @@ function testCRUD() {
$result = $connection->query('SELECT pid FROM {url_alias} WHERE source = :source AND alias= :alias AND langcode = :langcode', array(':source' => $alias['source'], ':alias' => $alias['alias'] . '_updated', ':langcode' => $alias['langcode']));
$pid = $result->fetchField();
- $this->assertEqual($pid, $alias['pid'], format_string('Updated entry for pid %pid.', array('%pid' => $pid)));
+ $this->assertEqual($pid, $alias['pid'], SafeMarkup::format('Updated entry for pid %pid.', array('%pid' => $pid)));
}
//Delete a few aliases
@@ -74,7 +75,7 @@ function testCRUD() {
$result = $connection->query('SELECT * FROM {url_alias} WHERE pid = :pid', array(':pid' => $pid));
$rows = $result->fetchAll();
- $this->assertEqual(count($rows), 0, format_string('Deleted entry with pid %pid.', array('%pid' => $pid)));
+ $this->assertEqual(count($rows), 0, SafeMarkup::format('Deleted entry with pid %pid.', array('%pid' => $pid)));
}
}
diff --git a/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php b/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php
index 1988708..03d0720 100644
--- a/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php
+++ b/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php
@@ -89,7 +89,7 @@ protected function assertUrlOutboundAlter($original, $final) {
// Test outbound altering.
$result = $this->container->get('url_generator')->generateFromPath($original);
$final = Url::fromUri('internal:/' . $final)->toString();
- $this->assertIdentical($result, $final, format_string('Altered outbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result)));
+ $this->assertIdentical($result, $final, SafeMarkup::format('Altered outbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result)));
}
/**
@@ -105,6 +105,6 @@ protected function assertUrlOutboundAlter($original, $final) {
protected function assertUrlInboundAlter($original, $final) {
// Test inbound altering.
$result = $this->container->get('path.alias_manager')->getPathByAlias($original);
- $this->assertIdentical($result, $final, format_string('Altered inbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result)));
+ $this->assertIdentical($result, $final, SafeMarkup::format('Altered inbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result)));
}
}
diff --git a/core/modules/system/src/Tests/Session/SessionTest.php b/core/modules/system/src/Tests/Session/SessionTest.php
index 0921f66..2256882 100644
--- a/core/modules/system/src/Tests/Session/SessionTest.php
+++ b/core/modules/system/src/Tests/Session/SessionTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Session;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\simpletest\WebTestBase;
/**
@@ -66,7 +67,7 @@ function testSessionSaveRegenerate() {
);
$this->drupalPostForm('user/login', $edit, t('Log in'));
$this->drupalGet('user');
- $pass = $this->assertText($user->getUsername(), format_string('Found name: %name', array('%name' => $user->getUsername())), 'User login');
+ $pass = $this->assertText($user->getUsername(), SafeMarkup::format('Found name: %name', array('%name' => $user->getUsername())), 'User login');
$this->_logged_in = $pass;
$this->drupalGet('session-test/id');
diff --git a/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php b/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php
index 2960064..2fa1f1d 100644
--- a/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php
+++ b/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\System;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\simpletest\WebTestBase;
@@ -29,7 +30,7 @@ protected function setUp() {
public function testDefaultMetaTagsExist() {
$this->drupalGet('');
foreach ($this->default_metatags as $name => $metatag) {
- $this->assertRaw($metatag, String::format('Default Mobile meta tag "@name" displayed properly.', array('@name' => $name)), 'System');
+ $this->assertRaw($metatag, SafeMarkup::format('Default Mobile meta tag "@name" displayed properly.', array('@name' => $name)), 'System');
}
}
@@ -40,7 +41,7 @@ public function testRemovingDefaultMetaTags() {
\Drupal::service('module_installer')->install(array('system_module_test'));
$this->drupalGet('');
foreach ($this->default_metatags as $name => $metatag) {
- $this->assertNoRaw($metatag, String::format('Default Mobile meta tag "@name" removed properly.', array('@name' => $name)), 'System');
+ $this->assertNoRaw($metatag, SafeMarkup::format('Default Mobile meta tag "@name" removed properly.', array('@name' => $name)), 'System');
}
}
}
diff --git a/core/modules/system/src/Tests/System/ErrorHandlerTest.php b/core/modules/system/src/Tests/System/ErrorHandlerTest.php
index 9d1437f..5eda96e 100644
--- a/core/modules/system/src/Tests/System/ErrorHandlerTest.php
+++ b/core/modules/system/src/Tests/System/ErrorHandlerTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\System;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\simpletest\WebTestBase;
/**
@@ -144,10 +145,10 @@ function testExceptionHandler() {
$this->assertTrue(strpos($this->drupalGetHeader(':status'), '500 Service unavailable (with message)'), 'Received expected HTTP status line.');
// We cannot use assertErrorMessage() since the extact error reported
// varies from database to database. Check that the SQL string is displayed.
- $this->assertText($error_pdo_exception['%type'], format_string('Found %type in error page.', $error_pdo_exception));
- $this->assertText($error_pdo_exception['!message'], format_string('Found !message in error page.', $error_pdo_exception));
- $error_details = format_string('in %function (line ', $error_pdo_exception);
- $this->assertRaw($error_details, format_string("Found '!message' in error page.", array('!message' => $error_details)));
+ $this->assertText($error_pdo_exception['%type'], SafeMarkup::format('Found %type in error page.', $error_pdo_exception));
+ $this->assertText($error_pdo_exception['!message'], SafeMarkup::format('Found !message in error page.', $error_pdo_exception));
+ $error_details = SafeMarkup::format('in %function (line ', $error_pdo_exception);
+ $this->assertRaw($error_details, SafeMarkup::format("Found '!message' in error page.", array('!message' => $error_details)));
$this->drupalGet('error-test/trigger-renderer-exception');
$this->assertTrue(strpos($this->drupalGetHeader(':status'), '500 Service unavailable (with message)'), 'Received expected HTTP status line.');
@@ -179,7 +180,7 @@ function testExceptionHandler() {
*/
function assertErrorMessage(array $error) {
$message = t('%type: !message in %function (line ', $error);
- $this->assertRaw($message, format_string('Found error message: !message.', array('!message' => $message)));
+ $this->assertRaw($message, SafeMarkup::format('Found error message: !message.', array('!message' => $message)));
}
/**
@@ -187,6 +188,6 @@ function assertErrorMessage(array $error) {
*/
function assertNoErrorMessage(array $error) {
$message = t('%type: !message in %function (line ', $error);
- $this->assertNoRaw($message, format_string('Did not find error message: !message.', array('!message' => $message)));
+ $this->assertNoRaw($message, SafeMarkup::format('Did not find error message: !message.', array('!message' => $message)));
}
}
diff --git a/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php b/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php
index 8aa38aa..b517333 100644
--- a/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php
+++ b/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\System;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Form\FormState;
use Drupal\simpletest\WebTestBase;
@@ -62,7 +63,7 @@ public function testConfigForm() {
'%values' => print_r($values, TRUE),
'%errors' => $valid_form ? t('None') : implode(' ', $errors),
);
- $this->assertTrue($valid_form, format_string('Input values: %values
Validation handler errors: %errors', $args));
+ $this->assertTrue($valid_form, SafeMarkup::format('Input values: %values
Validation handler errors: %errors', $args));
foreach ($this->values as $data) {
$this->assertEqual($data['#value'], $this->config($data['#config_name'])->get($data['#config_key']));
diff --git a/core/modules/system/src/Tests/System/TokenReplaceUnitTest.php b/core/modules/system/src/Tests/System/TokenReplaceUnitTest.php
index f489c75..ac845a6 100644
--- a/core/modules/system/src/Tests/System/TokenReplaceUnitTest.php
+++ b/core/modules/system/src/Tests/System/TokenReplaceUnitTest.php
@@ -41,7 +41,7 @@ public function testSystemTokenRecognition() {
$input = $test['prefix'] . '[site:name]' . $test['suffix'];
$expected = $test['prefix'] . 'Drupal' . $test['suffix'];
$output = $this->tokenService->replace($input, array(), array('langcode' => $this->interfaceLanguage->getId()));
- $this->assertTrue($output == $expected, format_string('Token recognized in string %string', array('%string' => $input)));
+ $this->assertTrue($output == $expected, SafeMarkup::format('Token recognized in string %string', array('%string' => $input)));
}
// Test token replacement when the string contains no tokens.
@@ -107,7 +107,7 @@ public function testSystemSiteTokenReplacement() {
foreach ($tests as $input => $expected) {
$output = $this->tokenService->replace($input, array(), array('langcode' => $this->interfaceLanguage->getId()));
- $this->assertEqual($output, $expected, format_string('Sanitized system site information token %token replaced.', array('%token' => $input)));
+ $this->assertEqual($output, $expected, SafeMarkup::format('Sanitized system site information token %token replaced.', array('%token' => $input)));
}
// Generate and test unsanitized tokens.
@@ -116,7 +116,7 @@ public function testSystemSiteTokenReplacement() {
foreach ($tests as $input => $expected) {
$output = $this->tokenService->replace($input, array(), array('langcode' => $this->interfaceLanguage->getId(), 'sanitize' => FALSE));
- $this->assertEqual($output, $expected, format_string('Unsanitized system site information token %token replaced.', array('%token' => $input)));
+ $this->assertEqual($output, $expected, SafeMarkup::format('Unsanitized system site information token %token replaced.', array('%token' => $input)));
}
// Check that the results of Token::generate are sanitized properly. This
@@ -153,7 +153,7 @@ public function testSystemDateTokenReplacement() {
foreach ($tests as $input => $expected) {
$output = $this->tokenService->replace($input, array('date' => $date), array('langcode' => $this->interfaceLanguage->getId()));
- $this->assertEqual($output, $expected, format_string('Date token %token replaced.', array('%token' => $input)));
+ $this->assertEqual($output, $expected, SafeMarkup::format('Date token %token replaced.', array('%token' => $input)));
}
}
}
diff --git a/core/modules/system/src/Tests/Theme/FunctionsTest.php b/core/modules/system/src/Tests/Theme/FunctionsTest.php
index a5766fa..8ae4466 100644
--- a/core/modules/system/src/Tests/Theme/FunctionsTest.php
+++ b/core/modules/system/src/Tests/Theme/FunctionsTest.php
@@ -8,6 +8,7 @@
namespace Drupal\system\Tests\Theme;
use Drupal\Component\Serialization\Json;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Session\UserSession;
use Drupal\Core\Url;
@@ -197,7 +198,7 @@ function testLinks() {
'title' => 'Plain "text"',
),
'html text' => array(
- 'title' => String::format('@text', array('@text' => 'potentially unsafe text that be escaped')),
+ 'title' => SafeMarkup::format('@text', array('@text' => 'potentially unsafe text that be escaped')),
),
'front page' => array(
'title' => 'Front page',
diff --git a/core/modules/system/src/Tests/Theme/ThemeTest.php b/core/modules/system/src/Tests/Theme/ThemeTest.php
index 0cd4e4e..2cee8af 100644
--- a/core/modules/system/src/Tests/Theme/ThemeTest.php
+++ b/core/modules/system/src/Tests/Theme/ThemeTest.php
@@ -8,6 +8,7 @@
namespace Drupal\system\Tests\Theme;
use Drupal\Component\Serialization\Json;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\simpletest\WebTestBase;
use Drupal\test_theme\ThemeClass;
use Symfony\Cmf\Component\Routing\RouteObjectInterface;
@@ -64,7 +65,7 @@ function testThemeDataTypes() {
$foos = array('null' => NULL, 'false' => FALSE, 'integer' => 1, 'string' => 'foo');
foreach ($foos as $type => $example) {
$output = \Drupal::theme()->render('theme_test_foo', array('foo' => $example));
- $this->assertTrue(is_string($output), format_string('\Drupal::theme() returns a string for data type !type.', array('!type' => $type)));
+ $this->assertTrue(is_string($output), SafeMarkup::format('\Drupal::theme() returns a string for data type !type.', array('!type' => $type)));
}
// suggestionnotimplemented is not an implemented theme hook so \Drupal::theme() service
diff --git a/core/modules/system/tests/modules/entity_test/entity_test.module b/core/modules/system/tests/modules/entity_test/entity_test.module
index 64418c7..ff52303 100644
--- a/core/modules/system/tests/modules/entity_test/entity_test.module
+++ b/core/modules/system/tests/modules/entity_test/entity_test.module
@@ -5,6 +5,7 @@
* Test module for the entity API providing several entity types for testing.
*/
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Access\AccessResult;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\FieldableEntityInterface;
@@ -409,7 +410,7 @@ function entity_test_entity_operation_alter(array &$operations, EntityInterface
if (in_array($entity->getEntityTypeId(), $valid_entity_type_ids)) {
if (\Drupal::service('router.route_provider')->getRouteByName("entity.{$entity->getEntityTypeId()}.test_operation")) {
$operations['test_operation'] = [
- 'title' => format_string('Test Operation: @label', ['@label' => $entity->label()]),
+ 'title' => SafeMarkup::format('Test Operation: @label', ['@label' => $entity->label()]),
'url' => Url::fromRoute("entity.{$entity->getEntityTypeId()}.test_operation", [$entity->getEntityTypeId() => $entity->id()]),
'weight' => 50,
];
diff --git a/core/modules/system/tests/modules/menu_test/src/TestControllers.php b/core/modules/system/tests/modules/menu_test/src/TestControllers.php
index bbc4f1f..d7c7a2f 100644
--- a/core/modules/system/tests/modules/menu_test/src/TestControllers.php
+++ b/core/modules/system/tests/modules/menu_test/src/TestControllers.php
@@ -7,6 +7,7 @@
namespace Drupal\menu_test;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Entity\EntityInterface;
@@ -54,10 +55,10 @@ public function testDerived() {
*/
public function testDefaults($placeholder = NULL) {
if ($placeholder) {
- return ['#markup' => String::format("Sometimes there is a placeholder: '@placeholder'.", array('@placeholder' => $placeholder))];
+ return ['#markup' => SafeMarkup::format("Sometimes there is a placeholder: '@placeholder'.", array('@placeholder' => $placeholder))];
}
else {
- return ['#markup' => String::format('Sometimes there is no placeholder.')];
+ return ['#markup' => SafeMarkup::format('Sometimes there is no placeholder.')];
}
}
diff --git a/core/modules/system/tests/modules/session_test/src/Form/SessionTestForm.php b/core/modules/system/tests/modules/session_test/src/Form/SessionTestForm.php
index f8d5614..0fcf61a 100644
--- a/core/modules/system/tests/modules/session_test/src/Form/SessionTestForm.php
+++ b/core/modules/system/tests/modules/session_test/src/Form/SessionTestForm.php
@@ -7,6 +7,7 @@
namespace Drupal\session_test\Form;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
@@ -46,7 +47,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
* {@inheritdoc}
*/
public function submitForm(array &$form, FormStateInterface $form_state) {
- drupal_set_message(String::format('Ok: @input', array('@input' => $form_state->getValue('input'))));
+ drupal_set_message(SafeMarkup::format('Ok: @input', array('@input' => $form_state->getValue('input'))));
}
}
diff --git a/core/modules/taxonomy/src/Tests/EfqTest.php b/core/modules/taxonomy/src/Tests/EfqTest.php
index e8790cf..8ed7d71 100644
--- a/core/modules/taxonomy/src/Tests/EfqTest.php
+++ b/core/modules/taxonomy/src/Tests/EfqTest.php
@@ -62,7 +62,7 @@ function testTaxonomyEfq() {
->condition('vid', $vocabulary2->id())
->execute();
sort($result);
- $this->assertEqual(array_keys($terms2), $result, format_string('Taxonomy terms from the %name vocabulary were retrieved by entity query.', array('%name' => $vocabulary2->label())));
+ $this->assertEqual(array_keys($terms2), $result, SafeMarkup::format('Taxonomy terms from the %name vocabulary were retrieved by entity query.', array('%name' => $vocabulary2->label())));
$tid = reset($result);
$ids = (object) array(
'entity_type' => 'taxonomy_term',
diff --git a/core/modules/taxonomy/src/Tests/LoadMultipleTest.php b/core/modules/taxonomy/src/Tests/LoadMultipleTest.php
index 4a2c1ce..a271613 100644
--- a/core/modules/taxonomy/src/Tests/LoadMultipleTest.php
+++ b/core/modules/taxonomy/src/Tests/LoadMultipleTest.php
@@ -7,6 +7,7 @@
namespace Drupal\taxonomy\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\taxonomy\Entity\Term;
/**
@@ -38,7 +39,7 @@ function testTaxonomyTermMultipleLoad() {
// Load the terms from the vocabulary.
$terms = entity_load_multiple_by_properties('taxonomy_term', array('vid' => $vocabulary->id()));
$count = count($terms);
- $this->assertEqual($count, 5, format_string('Correct number of terms were loaded. !count terms.', array('!count' => $count)));
+ $this->assertEqual($count, 5, SafeMarkup::format('Correct number of terms were loaded. !count terms.', array('!count' => $count)));
// Load the same terms again by tid.
$terms2 = Term::loadMultiple(array_keys($terms));
diff --git a/core/modules/taxonomy/src/Tests/TermTest.php b/core/modules/taxonomy/src/Tests/TermTest.php
index 083e28b..8839296 100644
--- a/core/modules/taxonomy/src/Tests/TermTest.php
+++ b/core/modules/taxonomy/src/Tests/TermTest.php
@@ -287,28 +287,28 @@ function testNodeTermCreationAndDeletion() {
$this->drupalGet('node/' . $node->id());
foreach ($term_names as $term_name) {
- $this->assertText($term_name, format_string('The term %name appears on the node page after two terms, %deleted1 and %deleted2, were deleted.', array('%name' => $term_name, '%deleted1' => $term_objects['term1']->getName(), '%deleted2' => $term_objects['term2']->getName())));
+ $this->assertText($term_name, SafeMarkup::format('The term %name appears on the node page after two terms, %deleted1 and %deleted2, were deleted.', array('%name' => $term_name, '%deleted1' => $term_objects['term1']->getName(), '%deleted2' => $term_objects['term2']->getName())));
}
- $this->assertNoText($term_objects['term1']->getName(), format_string('The deleted term %name does not appear on the node page.', array('%name' => $term_objects['term1']->getName())));
- $this->assertNoText($term_objects['term2']->getName(), format_string('The deleted term %name does not appear on the node page.', array('%name' => $term_objects['term2']->getName())));
+ $this->assertNoText($term_objects['term1']->getName(), SafeMarkup::format('The deleted term %name does not appear on the node page.', array('%name' => $term_objects['term1']->getName())));
+ $this->assertNoText($term_objects['term2']->getName(), SafeMarkup::format('The deleted term %name does not appear on the node page.', array('%name' => $term_objects['term2']->getName())));
// Test autocomplete on term 3, which contains a comma.
// The term will be quoted, and the " will be encoded in unicode (\u0022).
$input = substr($term_objects['term3']->getName(), 0, 3);
$json = $this->drupalGet('taxonomy/autocomplete/node/taxonomy_' . $this->vocabulary->id(), array('query' => array('q' => $input)));
- $this->assertEqual($json, '[{"value":"\u0022' . $term_objects['term3']->getName() . '\u0022","label":"' . $term_objects['term3']->getName() . '"}]', format_string('Autocomplete returns term %term_name after typing the first 3 letters.', array('%term_name' => $term_objects['term3']->getName())));
+ $this->assertEqual($json, '[{"value":"\u0022' . $term_objects['term3']->getName() . '\u0022","label":"' . $term_objects['term3']->getName() . '"}]', SafeMarkup::format('Autocomplete returns term %term_name after typing the first 3 letters.', array('%term_name' => $term_objects['term3']->getName())));
// Test autocomplete on term 4 - it is alphanumeric only, so no extra
// quoting.
$input = substr($term_objects['term4']->getName(), 0, 3);
$this->drupalGet('taxonomy/autocomplete/node/taxonomy_' . $this->vocabulary->id(), array('query' => array('q' => $input)));
- $this->assertRaw('[{"value":"' . $term_objects['term4']->getName() . '","label":"' . $term_objects['term4']->getName() . '"}', format_string('Autocomplete returns term %term_name after typing the first 3 letters.', array('%term_name' => $term_objects['term4']->getName())));
+ $this->assertRaw('[{"value":"' . $term_objects['term4']->getName() . '","label":"' . $term_objects['term4']->getName() . '"}', SafeMarkup::format('Autocomplete returns term %term_name after typing the first 3 letters.', array('%term_name' => $term_objects['term4']->getName())));
// Test taxonomy autocomplete with a nonexistent field.
$field_name = $this->randomMachineName();
$tag = $this->randomMachineName();
$message = t("Taxonomy field @field_name not found.", array('@field_name' => $field_name));
- $this->assertFalse(FieldStorageConfig::loadByName('node', $field_name), format_string('Field %field_name does not exist.', array('%field_name' => $field_name)));
+ $this->assertFalse(FieldStorageConfig::loadByName('node', $field_name), SafeMarkup::format('Field %field_name does not exist.', array('%field_name' => $field_name)));
$this->drupalGet('taxonomy/autocomplete/node/' . $field_name, array('query' => array('q' => $tag)));
$this->assertRaw($message, 'Autocomplete returns correct error message when the taxonomy field does not exist.');
}
diff --git a/core/modules/taxonomy/src/Tests/TermValidationTest.php b/core/modules/taxonomy/src/Tests/TermValidationTest.php
index b369737..2d4bffb 100644
--- a/core/modules/taxonomy/src/Tests/TermValidationTest.php
+++ b/core/modules/taxonomy/src/Tests/TermValidationTest.php
@@ -7,6 +7,7 @@
namespace Drupal\taxonomy\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\system\Tests\Entity\EntityUnitTestBase;
/**
@@ -63,7 +64,7 @@ public function testValidation() {
$term->set('parent', 9999);
$violations = $term->validate();
$this->assertEqual(count($violations), 1, 'Violation found when term parent is invalid.');
- $this->assertEqual($violations[0]->getMessage(), format_string('The referenced entity (%type: %id) does not exist.', array('%type' => 'taxonomy_term', '%id' => 9999)));
+ $this->assertEqual($violations[0]->getMessage(), SafeMarkup::format('The referenced entity (%type: %id) does not exist.', array('%type' => 'taxonomy_term', '%id' => 9999)));
$term->set('parent', 0);
$violations = $term->validate();
diff --git a/core/modules/taxonomy/src/Tests/TokenReplaceTest.php b/core/modules/taxonomy/src/Tests/TokenReplaceTest.php
index 242a23e..ce092e9 100644
--- a/core/modules/taxonomy/src/Tests/TokenReplaceTest.php
+++ b/core/modules/taxonomy/src/Tests/TokenReplaceTest.php
@@ -105,7 +105,7 @@ function testTaxonomyTokenReplacement() {
foreach ($tests as $input => $expected) {
$output = $token_service->replace($input, array('term' => $term1), array('langcode' => $language_interface->getId()));
- $this->assertEqual($output, $expected, format_string('Sanitized taxonomy term token %token replaced.', array('%token' => $input)));
+ $this->assertEqual($output, $expected, SafeMarkup::format('Sanitized taxonomy term token %token replaced.', array('%token' => $input)));
}
// Generate and test sanitized tokens for term2.
@@ -125,7 +125,7 @@ function testTaxonomyTokenReplacement() {
foreach ($tests as $input => $expected) {
$output = $token_service->replace($input, array('term' => $term2), array('langcode' => $language_interface->getId()));
- $this->assertEqual($output, $expected, format_string('Sanitized taxonomy term token %token replaced.', array('%token' => $input)));
+ $this->assertEqual($output, $expected, SafeMarkup::format('Sanitized taxonomy term token %token replaced.', array('%token' => $input)));
}
// Generate and test unsanitized tokens.
@@ -136,7 +136,7 @@ function testTaxonomyTokenReplacement() {
foreach ($tests as $input => $expected) {
$output = $token_service->replace($input, array('term' => $term2), array('langcode' => $language_interface->getId(), 'sanitize' => FALSE));
- $this->assertEqual($output, $expected, format_string('Unsanitized taxonomy term token %token replaced.', array('%token' => $input)));
+ $this->assertEqual($output, $expected, SafeMarkup::format('Unsanitized taxonomy term token %token replaced.', array('%token' => $input)));
}
// Generate and test sanitized tokens.
@@ -152,7 +152,7 @@ function testTaxonomyTokenReplacement() {
foreach ($tests as $input => $expected) {
$output = $token_service->replace($input, array('vocabulary' => $this->vocabulary), array('langcode' => $language_interface->getId()));
- $this->assertEqual($output, $expected, format_string('Sanitized taxonomy vocabulary token %token replaced.', array('%token' => $input)));
+ $this->assertEqual($output, $expected, SafeMarkup::format('Sanitized taxonomy vocabulary token %token replaced.', array('%token' => $input)));
}
// Generate and test unsanitized tokens.
@@ -161,7 +161,7 @@ function testTaxonomyTokenReplacement() {
foreach ($tests as $input => $expected) {
$output = $token_service->replace($input, array('vocabulary' => $this->vocabulary), array('langcode' => $language_interface->getId(), 'sanitize' => FALSE));
- $this->assertEqual($output, $expected, format_string('Unsanitized taxonomy vocabulary token %token replaced.', array('%token' => $input)));
+ $this->assertEqual($output, $expected, SafeMarkup::format('Unsanitized taxonomy vocabulary token %token replaced.', array('%token' => $input)));
}
}
}
diff --git a/core/modules/text/src/Tests/Formatter/TextFormatterTest.php b/core/modules/text/src/Tests/Formatter/TextFormatterTest.php
index cae892e..69dba19 100644
--- a/core/modules/text/src/Tests/Formatter/TextFormatterTest.php
+++ b/core/modules/text/src/Tests/Formatter/TextFormatterTest.php
@@ -7,6 +7,7 @@
namespace Drupal\text\Tests\Formatter;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\filter\Entity\FilterFormat;
use Drupal\system\Tests\Entity\EntityUnitTestBase;
@@ -92,7 +93,7 @@ public function testFormatters() {
$build = $entity->get('formatted_text')->view(array('type' => $formatter));
drupal_render($build[0]);
$this->assertEqual($build[0]['#markup'], "Hello, world!
\n");
- $this->assertEqual($build[0]['#cache']['tags'], FilterFormat::load('my_text_format')->getCacheTags(), format_string('The @formatter formatter has the expected cache tags when formatting a formatted text field.', array('@formatter' => $formatter)));
+ $this->assertEqual($build[0]['#cache']['tags'], FilterFormat::load('my_text_format')->getCacheTags(), SafeMarkup::format('The @formatter formatter has the expected cache tags when formatting a formatted text field.', array('@formatter' => $formatter)));
}
}
diff --git a/core/modules/text/src/Tests/TextFieldTest.php b/core/modules/text/src/Tests/TextFieldTest.php
index 494d338..afe3ebc 100644
--- a/core/modules/text/src/Tests/TextFieldTest.php
+++ b/core/modules/text/src/Tests/TextFieldTest.php
@@ -77,6 +77,59 @@ function testTextfieldWidgets() {
}
/**
+ * Helper function for testTextfieldWidgets().
+ */
+ function _testTextfieldWidgets($field_type, $widget_type) {
+ // Create a field.
+ $field_name = Unicode::strtolower($this->randomMachineName());
+ $field_storage = entity_create('field_storage_config', array(
+ 'field_name' => $field_name,
+ 'entity_type' => 'entity_test',
+ 'type' => $field_type
+ ));
+ $field_storage->save();
+ entity_create('field_config', array(
+ 'field_storage' => $field_storage,
+ 'bundle' => 'entity_test',
+ 'label' => $this->randomMachineName() . '_label',
+ ))->save();
+ entity_get_form_display('entity_test', 'entity_test', 'default')
+ ->setComponent($field_name, array(
+ 'type' => $widget_type,
+ 'settings' => array(
+ 'placeholder' => 'A placeholder on ' . $widget_type,
+ ),
+ ))
+ ->save();
+ entity_get_display('entity_test', 'entity_test', 'full')
+ ->setComponent($field_name)
+ ->save();
+
+ // Display creation form.
+ $this->drupalGet('entity_test/add');
+ $this->assertFieldByName("{$field_name}[0][value]", '', 'Widget is displayed');
+ $this->assertNoFieldByName("{$field_name}[0][format]", '1', 'Format selector is not displayed');
+ $this->assertRaw(SafeMarkup::format('placeholder="A placeholder on !widget_type"', array('!widget_type' => $widget_type)));
+
+ // Submit with some value.
+ $value = $this->randomMachineName();
+ $edit = array(
+ "{$field_name}[0][value]" => $value,
+ );
+ $this->drupalPostForm(NULL, $edit, t('Save'));
+ preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
+ $id = $match[1];
+ $this->assertText(t('entity_test @id has been created.', array('@id' => $id)), 'Entity was created');
+
+ // Display the entity.
+ $entity = entity_load('entity_test', $id);
+ $display = entity_get_display($entity->getEntityTypeId(), $entity->bundle(), 'full');
+ $content = $display->build($entity);
+ $this->drupalSetContent(drupal_render($content));
+ $this->assertText($value, 'Filtered tags are not displayed');
+ }
+
+ /**
* Test widgets + 'formatted_text' setting.
*/
function testTextfieldWidgetsFormatted() {
diff --git a/core/modules/text/src/Tests/TextSummaryTest.php b/core/modules/text/src/Tests/TextSummaryTest.php
index 6936114..fd39b1c 100644
--- a/core/modules/text/src/Tests/TextSummaryTest.php
+++ b/core/modules/text/src/Tests/TextSummaryTest.php
@@ -212,7 +212,7 @@ function testLength() {
*/
function assertTextSummary($text, $expected, $format = NULL, $size = NULL) {
$summary = text_summary($text, $format, $size);
- $this->assertIdentical($summary, $expected, format_string('@actual
is identical to @expected
', array(
+ $this->assertIdentical($summary, $expected, SafeMarkup::format('@actual
is identical to @expected
', array(
'@actual' => $summary,
'@expected' => $expected,
)));
diff --git a/core/modules/tour/src/Tests/TourTestBase.php b/core/modules/tour/src/Tests/TourTestBase.php
index c6372cd..90d98b7 100644
--- a/core/modules/tour/src/Tests/TourTestBase.php
+++ b/core/modules/tour/src/Tests/TourTestBase.php
@@ -7,6 +7,7 @@
namespace Drupal\tour\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\simpletest\WebTestBase;
/**
@@ -56,11 +57,11 @@ public function assertTourTips($tips = array()) {
foreach ($tips as $tip) {
if (!empty($tip['data-id'])) {
$elements = \PHPUnit_Util_XML::cssSelect('#' . $tip['data-id'], TRUE, $this->content, TRUE);
- $this->assertTrue(!empty($elements) && count($elements) === 1, format_string('Found corresponding page element for tour tip with id #%data-id', array('%data-id' => $tip['data-id'])));
+ $this->assertTrue(!empty($elements) && count($elements) === 1, SafeMarkup::format('Found corresponding page element for tour tip with id #%data-id', array('%data-id' => $tip['data-id'])));
}
else if (!empty($tip['data-class'])) {
$elements = \PHPUnit_Util_XML::cssSelect('.' . $tip['data-class'], TRUE, $this->content, TRUE);
- $this->assertFalse(empty($elements), format_string('Found corresponding page element for tour tip with class .%data-class', array('%data-class' => $tip['data-class'])));
+ $this->assertFalse(empty($elements), SafeMarkup::format('Found corresponding page element for tour tip with class .%data-class', array('%data-class' => $tip['data-class'])));
}
else {
// It's a modal.
@@ -68,7 +69,7 @@ public function assertTourTips($tips = array()) {
}
$total++;
}
- $this->pass(format_string('Total %total Tips tested of which %modals modal(s).', array('%total' => $total, '%modals' => $modals)));
+ $this->pass(SafeMarkup::format('Total %total Tips tested of which %modals modal(s).', array('%total' => $total, '%modals' => $modals)));
}
}
diff --git a/core/modules/tracker/src/Tests/TrackerTest.php b/core/modules/tracker/src/Tests/TrackerTest.php
index 3ca1dc4..e63d927 100644
--- a/core/modules/tracker/src/Tests/TrackerTest.php
+++ b/core/modules/tracker/src/Tests/TrackerTest.php
@@ -327,7 +327,7 @@ function testTrackerCronIndexing() {
// Assert that all node titles are displayed.
foreach ($nodes as $i => $node) {
- $this->assertText($node->label(), format_string('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
+ $this->assertText($node->label(), SafeMarkup::format('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
}
$this->assertText('1 new', 'One new comment is counted on the tracker listing pages.');
$this->assertText('updated', 'Node is listed as updated');
@@ -337,7 +337,7 @@ function testTrackerCronIndexing() {
// Assert that all node titles are displayed.
foreach ($nodes as $i => $node) {
- $this->assertText($node->label(), format_string('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
+ $this->assertText($node->label(), SafeMarkup::format('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
}
$this->assertText('1 new', 'New comment is counted on the tracker listing pages.');
}
diff --git a/core/modules/user/src/PrivateTempStore.php b/core/modules/user/src/PrivateTempStore.php
index e99d5fc..f3fe9cf 100644
--- a/core/modules/user/src/PrivateTempStore.php
+++ b/core/modules/user/src/PrivateTempStore.php
@@ -7,6 +7,7 @@
namespace Drupal\user;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface;
use Drupal\Core\Lock\LockBackendInterface;
@@ -122,7 +123,7 @@ public function set($key, $value) {
if (!$this->lockBackend->acquire($key)) {
$this->lockBackend->wait($key);
if (!$this->lockBackend->acquire($key)) {
- throw new TempStoreException(String::format("Couldn't acquire lock to update item %key in %collection temporary storage.", array(
+ throw new TempStoreException(SafeMarkup::format("Couldn't acquire lock to update item %key in %collection temporary storage.", array(
'%key' => $key,
'%collection' => $this->storage->getCollectionName(),
)));
@@ -180,7 +181,7 @@ public function delete($key) {
if (!$this->lockBackend->acquire($key)) {
$this->lockBackend->wait($key);
if (!$this->lockBackend->acquire($key)) {
- throw new TempStoreException(String::format("Couldn't acquire lock to delete item %key from %collection temporary storage.", array(
+ throw new TempStoreException(SafeMarkup::format("Couldn't acquire lock to delete item %key from %collection temporary storage.", array(
'%key' => $key,
'%collection' => $this->storage->getCollectionName(),
)));
diff --git a/core/modules/user/src/SharedTempStore.php b/core/modules/user/src/SharedTempStore.php
index 0049d79..cd95b01 100644
--- a/core/modules/user/src/SharedTempStore.php
+++ b/core/modules/user/src/SharedTempStore.php
@@ -7,6 +7,7 @@
namespace Drupal\user;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface;
use Drupal\Core\Lock\LockBackendInterface;
@@ -185,7 +186,7 @@ public function set($key, $value) {
if (!$this->lockBackend->acquire($key)) {
$this->lockBackend->wait($key);
if (!$this->lockBackend->acquire($key)) {
- throw new TempStoreException(String::format("Couldn't acquire lock to update item %key in %collection temporary storage.", array(
+ throw new TempStoreException(SafeMarkup::format("Couldn't acquire lock to update item %key in %collection temporary storage.", array(
'%key' => $key,
'%collection' => $this->storage->getCollectionName(),
)));
@@ -231,7 +232,7 @@ public function delete($key) {
if (!$this->lockBackend->acquire($key)) {
$this->lockBackend->wait($key);
if (!$this->lockBackend->acquire($key)) {
- throw new TempStoreException(String::format("Couldn't acquire lock to delete item %key from %collection temporary storage.", array(
+ throw new TempStoreException(SafeMarkup::format("Couldn't acquire lock to delete item %key from %collection temporary storage.", array(
'%key' => $key,
'%collection' => $this->storage->getCollectionName(),
)));
diff --git a/core/modules/user/src/Tests/Condition/UserRoleConditionTest.php b/core/modules/user/src/Tests/Condition/UserRoleConditionTest.php
index f5dd8f2..707c354 100644
--- a/core/modules/user/src/Tests/Condition/UserRoleConditionTest.php
+++ b/core/modules/user/src/Tests/Condition/UserRoleConditionTest.php
@@ -155,7 +155,7 @@ public function testConditions() {
$condition->setConfig('roles', array($this->role->id() => $this->role->id()));
$condition->setConfig('negate', FALSE);
$this->assertTrue($condition->execute(), 'Authenticated user is a member of the custom role.');
- $this->assertEqual($condition->summary(), String::format('The user is a member of @roles', array('@roles' => $this->role->label())));
+ $this->assertEqual($condition->summary(), SafeMarkup::format('The user is a member of @roles', array('@roles' => $this->role->label())));
}
}
diff --git a/core/modules/user/src/Tests/UserDeleteTest.php b/core/modules/user/src/Tests/UserDeleteTest.php
index bfa6016..f116866 100644
--- a/core/modules/user/src/Tests/UserDeleteTest.php
+++ b/core/modules/user/src/Tests/UserDeleteTest.php
@@ -7,6 +7,7 @@
namespace Drupal\user\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\simpletest\WebTestBase;
/**
@@ -51,8 +52,8 @@ function testUserDeleteMultiple() {
->fetchField();
$this->assertTrue($roles_after_deletion == 0, 'Role assigments deleted along with users');
// Test if the users are deleted, user_load() will return FALSE.
- $this->assertFalse(user_load($user_a->id()), format_string('User with id @uid deleted.', array('@uid' => $user_a->id())));
- $this->assertFalse(user_load($user_b->id()), format_string('User with id @uid deleted.', array('@uid' => $user_b->id())));
- $this->assertFalse(user_load($user_c->id()), format_string('User with id @uid deleted.', array('@uid' => $user_c->id())));
+ $this->assertFalse(user_load($user_a->id()), SafeMarkup::format('User with id @uid deleted.', array('@uid' => $user_a->id())));
+ $this->assertFalse(user_load($user_b->id()), SafeMarkup::format('User with id @uid deleted.', array('@uid' => $user_b->id())));
+ $this->assertFalse(user_load($user_c->id()), SafeMarkup::format('User with id @uid deleted.', array('@uid' => $user_c->id())));
}
}
diff --git a/core/modules/user/src/Tests/UserRegistrationTest.php b/core/modules/user/src/Tests/UserRegistrationTest.php
index 447a7cb..03b7c23 100644
--- a/core/modules/user/src/Tests/UserRegistrationTest.php
+++ b/core/modules/user/src/Tests/UserRegistrationTest.php
@@ -7,6 +7,7 @@
namespace Drupal\user\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\simpletest\WebTestBase;
@@ -278,9 +279,9 @@ function testRegistrationWithUserFields() {
// Check user fields.
$accounts = entity_load_multiple_by_properties('user', array('name' => $name, 'mail' => $mail));
$new_user = reset($accounts);
- $this->assertEqual($new_user->test_user_field[0]->value, $value, format_string('@js : The field value was correclty saved.', array('@js' => $js)));
- $this->assertEqual($new_user->test_user_field[1]->value, $value + 1, format_string('@js : The field value was correclty saved.', array('@js' => $js)));
- $this->assertEqual($new_user->test_user_field[2]->value, $value + 2, format_string('@js : The field value was correclty saved.', array('@js' => $js)));
+ $this->assertEqual($new_user->test_user_field[0]->value, $value, SafeMarkup::format('@js : The field value was correclty saved.', array('@js' => $js)));
+ $this->assertEqual($new_user->test_user_field[1]->value, $value + 1, SafeMarkup::format('@js : The field value was correclty saved.', array('@js' => $js)));
+ $this->assertEqual($new_user->test_user_field[2]->value, $value + 2, SafeMarkup::format('@js : The field value was correclty saved.', array('@js' => $js)));
}
}
diff --git a/core/modules/user/src/Tests/UserTokenReplaceTest.php b/core/modules/user/src/Tests/UserTokenReplaceTest.php
index 897e2aa..4437a59 100644
--- a/core/modules/user/src/Tests/UserTokenReplaceTest.php
+++ b/core/modules/user/src/Tests/UserTokenReplaceTest.php
@@ -70,7 +70,7 @@ function testUserTokenReplacement() {
foreach ($tests as $input => $expected) {
$output = $token_service->replace($input, array('user' => $account), array('langcode' => $language_interface->getId()));
- $this->assertEqual($output, $expected, format_string('Sanitized user token %token replaced.', array('%token' => $input)));
+ $this->assertEqual($output, $expected, SafeMarkup::format('Sanitized user token %token replaced.', array('%token' => $input)));
}
// Generate and test unsanitized tokens.
@@ -80,7 +80,7 @@ function testUserTokenReplacement() {
foreach ($tests as $input => $expected) {
$output = $token_service->replace($input, array('user' => $account), array('langcode' => $language_interface->getId(), 'sanitize' => FALSE));
- $this->assertEqual($output, $expected, format_string('Unsanitized user token %token replaced.', array('%token' => $input)));
+ $this->assertEqual($output, $expected, SafeMarkup::format('Unsanitized user token %token replaced.', array('%token' => $input)));
}
// Generate login and cancel link.
diff --git a/core/modules/user/src/Tests/Views/BulkFormAccessTest.php b/core/modules/user/src/Tests/Views/BulkFormAccessTest.php
index 8f9b613..17ee4fc 100644
--- a/core/modules/user/src/Tests/Views/BulkFormAccessTest.php
+++ b/core/modules/user/src/Tests/Views/BulkFormAccessTest.php
@@ -58,7 +58,7 @@ public function testUserEditAccess() {
$this->drupalPostForm('test-user-bulk-form', $edit, t('Apply'));
$this->assertResponse(200);
- $this->assertRaw(String::format('No access to execute %action on the @entity_type_label %entity_label.', [
+ $this->assertRaw(SafeMarkup::format('No access to execute %action on the @entity_type_label %entity_label.', [
'%action' => 'Block the selected user(s)',
'@entity_type_label' => 'User',
'%entity_label' => $no_edit_user->label(),
diff --git a/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php b/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php
index 04cdef9..a0a9083 100644
--- a/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php
+++ b/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php
@@ -7,7 +7,7 @@
namespace Drupal\Tests\user\Unit;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Access\AccessResult;
use Drupal\Tests\UnitTestCase;
use Drupal\user\UserAccessControlHandler;
@@ -125,7 +125,7 @@ public function assertFieldAccess($field, $viewer, $target, $view, $edit) {
->will($this->returnValue($this->{$target}));
foreach (array('view' => $view, 'edit' => $edit) as $operation => $result) {
- $message = String::format("User @field field access returns @result with operation '@op' for @account accessing @target", array(
+ $message = SafeMarkup::format("User @field field access returns @result with operation '@op' for @account accessing @target", array(
'@field' => $field,
'@result' => !isset($result) ? 'null' : ($result ? 'true' : 'false'),
'@op' => $operation,
diff --git a/core/modules/views/src/Plugin/views/BrokenHandlerTrait.php b/core/modules/views/src/Plugin/views/BrokenHandlerTrait.php
index c579c2b..cad8507 100644
--- a/core/modules/views/src/Plugin/views/BrokenHandlerTrait.php
+++ b/core/modules/views/src/Plugin/views/BrokenHandlerTrait.php
@@ -7,6 +7,7 @@
namespace Drupal\views\Plugin\views;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Form\FormStateInterface;
@@ -60,7 +61,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
foreach ($this->definition['original_configuration'] as $key => $value) {
if (is_scalar($value)) {
- $items[] = String::format('@key: @value', array('@key' => $key, '@value' => $value));
+ $items[] = SafeMarkup::format('@key: @value', array('@key' => $key, '@value' => $value));
}
}
diff --git a/core/modules/views/src/Plugin/views/HandlerBase.php b/core/modules/views/src/Plugin/views/HandlerBase.php
index e277ac2..c806e47 100644
--- a/core/modules/views/src/Plugin/views/HandlerBase.php
+++ b/core/modules/views/src/Plugin/views/HandlerBase.php
@@ -7,6 +7,7 @@
namespace Drupal\views\Plugin\views;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Unicode;
use Drupal\Component\Utility\UrlHelper;
@@ -721,7 +722,7 @@ public function getEntityType() {
return $views_data['table']['entity type'];
}
else {
- throw new \Exception(String::format('No entity type for field @field on view @view', array('@field' => $this->options['id'], '@view' => $this->view->storage->id())));
+ throw new \Exception(SafeMarkup::format('No entity type for field @field on view @view', array('@field' => $this->options['id'], '@view' => $this->view->storage->id())));
}
}
diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
index 5a4bda2..46168e9 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -9,6 +9,7 @@
use Drupal\Component\Plugin\DependentPluginInterface;
use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Cache\Cache;
@@ -1023,7 +1024,7 @@ public function optionLink($text, $section, $class = '', $title = '') {
}
if (!empty($class)) {
- $text = String::format('@text', array('@text' => $text));
+ $text = SafeMarkup::format('@text', array('@text' => $text));
}
if (empty($title)) {
diff --git a/core/modules/views/src/Plugin/views/query/Sql.php b/core/modules/views/src/Plugin/views/query/Sql.php
index d39ad46..278026f 100644
--- a/core/modules/views/src/Plugin/views/query/Sql.php
+++ b/core/modules/views/src/Plugin/views/query/Sql.php
@@ -1449,7 +1449,7 @@ function execute(ViewExecutable $view) {
drupal_set_message($e->getMessage(), 'error');
}
else {
- throw new DatabaseExceptionWrapper(format_string('Exception in @label[@view_name]: @message', array('@label' => $view->storage->label(), '@view_name' => $view->storage->id(), '@message' => $e->getMessage())));
+ throw new DatabaseExceptionWrapper(SafeMarkup::format('Exception in @label[@view_name]: @message', array('@label' => $view->storage->label(), '@view_name' => $view->storage->id(), '@message' => $e->getMessage())));
}
}
diff --git a/core/modules/views/src/Routing/ViewPageController.php b/core/modules/views/src/Routing/ViewPageController.php
index fd3ac25..3878e44 100644
--- a/core/modules/views/src/Routing/ViewPageController.php
+++ b/core/modules/views/src/Routing/ViewPageController.php
@@ -7,6 +7,7 @@
namespace Drupal\views\Routing;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
use Drupal\Core\Entity\EntityStorageInterface;
@@ -74,7 +75,7 @@ public static function create(ContainerInterface $container) {
public function handle($view_id, $display_id, Request $request, RouteMatchInterface $route_match) {
$entity = $this->storage->load($view_id);
if (empty($entity)) {
- throw new NotFoundHttpException(String::format('Page controller for view %id requested, but view was not found.', array('%id' => $view_id)));
+ throw new NotFoundHttpException(SafeMarkup::format('Page controller for view %id requested, but view was not found.', array('%id' => $view_id)));
}
$view = $this->executableFactory->get($entity);
$view->setRequest($request);
diff --git a/core/modules/views/src/Tests/DefaultViewsTest.php b/core/modules/views/src/Tests/DefaultViewsTest.php
index 1d11868..b70d8fb 100644
--- a/core/modules/views/src/Tests/DefaultViewsTest.php
+++ b/core/modules/views/src/Tests/DefaultViewsTest.php
@@ -136,14 +136,14 @@ public function testDefaultViews() {
$view->preExecute($this->viewArgMap[$name]);
}
- $this->assert(TRUE, format_string('View @view will be executed.', array('@view' => $view->storage->id())));
+ $this->assert(TRUE, SafeMarkup::format('View @view will be executed.', array('@view' => $view->storage->id())));
$view->execute();
$tokens = array('@name' => $name, '@display_id' => $display_id);
- $this->assertTrue($view->executed, format_string('@name:@display_id has been executed.', $tokens));
+ $this->assertTrue($view->executed, SafeMarkup::format('@name:@display_id has been executed.', $tokens));
$count = count($view->result);
- $this->assertTrue($count > 0, format_string('@count results returned', array('@count' => $count)));
+ $this->assertTrue($count > 0, SafeMarkup::format('@count results returned', array('@count' => $count)));
$view->destroy();
}
}
diff --git a/core/modules/views/src/Tests/Handler/AreaEntityTest.php b/core/modules/views/src/Tests/Handler/AreaEntityTest.php
index bc3fe6e..2ee9b67 100644
--- a/core/modules/views/src/Tests/Handler/AreaEntityTest.php
+++ b/core/modules/views/src/Tests/Handler/AreaEntityTest.php
@@ -72,9 +72,9 @@ public function testEntityAreaData() {
// Test that all expected entity types have data.
foreach (array_keys($expected_entities) as $entity) {
- $this->assertTrue(!empty($data['entity_' . $entity]), format_string('Views entity area data found for @entity', array('@entity' => $entity)));
+ $this->assertTrue(!empty($data['entity_' . $entity]), SafeMarkup::format('Views entity area data found for @entity', array('@entity' => $entity)));
// Test that entity_type is set correctly in the area data.
- $this->assertEqual($entity, $data['entity_' . $entity]['area']['entity_type'], format_string('Correct entity_type set for @entity', array('@entity' => $entity)));
+ $this->assertEqual($entity, $data['entity_' . $entity]['area']['entity_type'], SafeMarkup::format('Correct entity_type set for @entity', array('@entity' => $entity)));
}
$expected_entities = array_filter($entity_types, function (EntityTypeInterface $type) {
@@ -83,7 +83,7 @@ public function testEntityAreaData() {
// Test that no configuration entity types have data.
foreach (array_keys($expected_entities) as $entity) {
- $this->assertTrue(empty($data['entity_' . $entity]), format_string('Views config entity area data not found for @entity', array('@entity' => $entity)));
+ $this->assertTrue(empty($data['entity_' . $entity]), SafeMarkup::format('Views config entity area data not found for @entity', array('@entity' => $entity)));
}
}
diff --git a/core/modules/views/src/Tests/Handler/FieldCounterTest.php b/core/modules/views/src/Tests/Handler/FieldCounterTest.php
index 1290e67..ba13079 100644
--- a/core/modules/views/src/Tests/Handler/FieldCounterTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldCounterTest.php
@@ -7,6 +7,7 @@
namespace Drupal\views\Tests\Handler;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\views\Tests\ViewUnitTestBase;
use Drupal\views\Views;
@@ -51,11 +52,11 @@ function testSimple() {
$view->preview();
$counter = $view->style_plugin->getField(0, 'counter');
- $this->assertEqual($counter, 1, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 1, '@counter' => $counter)));
+ $this->assertEqual($counter, 1, SafeMarkup::format('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 1, '@counter' => $counter)));
$counter = $view->style_plugin->getField(1, 'counter');
- $this->assertEqual($counter, 2, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 2, '@counter' => $counter)));
+ $this->assertEqual($counter, 2, SafeMarkup::format('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 2, '@counter' => $counter)));
$counter = $view->style_plugin->getField(2, 'counter');
- $this->assertEqual($counter, 3, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 3, '@counter' => $counter)));
+ $this->assertEqual($counter, 3, SafeMarkup::format('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 3, '@counter' => $counter)));
$view->destroy();
$view->setDisplay();
@@ -79,13 +80,13 @@ function testSimple() {
$counter = $view->style_plugin->getField(0, 'counter');
$expected_number = 0 + $rand_start;
- $this->assertEqual($counter, $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
+ $this->assertEqual($counter, $expected_number, SafeMarkup::format('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
$counter = $view->style_plugin->getField(1, 'counter');
$expected_number = 1 + $rand_start;
- $this->assertEqual($counter, $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
+ $this->assertEqual($counter, $expected_number, SafeMarkup::format('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
$counter = $view->style_plugin->getField(2, 'counter');
$expected_number = 2 + $rand_start;
- $this->assertEqual($counter, $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
+ $this->assertEqual($counter, $expected_number, SafeMarkup::format('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
}
// @TODO: Write tests for pager.
diff --git a/core/modules/views/src/Tests/Handler/FieldUnitTest.php b/core/modules/views/src/Tests/Handler/FieldUnitTest.php
index 5ddd05e..60dfeed 100644
--- a/core/modules/views/src/Tests/Handler/FieldUnitTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldUnitTest.php
@@ -98,7 +98,7 @@ public function testQuery() {
* The value to search for.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
+ * messages: use SafeMarkup::format() to embed variables in the message text, not
* t(). If left blank, a default message will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
@@ -122,7 +122,7 @@ protected function assertSubString($haystack, $needle, $message = '', $group = '
* The value to search for.
* @param string $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use format_string() to embed variables in the message text, not
+ * messages: use SafeMarkup::format() to embed variables in the message text, not
* t(). If left blank, a default message will be displayed.
* @param string $group
* (optional) The group this message is in, which is displayed in a column
@@ -183,19 +183,19 @@ public function testFieldTokens() {
$expected_output_2 = "$row->views_test_data_name $row->views_test_data_name $row->views_test_data_name";
$output = $name_field_0->advancedRender($row);
- $this->assertEqual($output, $expected_output_0, format_string('Test token replacement: "!token" gave "!output"', [
+ $this->assertEqual($output, $expected_output_0, SafeMarkup::format('Test token replacement: "!token" gave "!output"', [
'!token' => $name_field_0->options['alter']['text'],
'!output' => $output,
]));
$output = $name_field_1->advancedRender($row);
- $this->assertEqual($output, $expected_output_1, format_string('Test token replacement: "!token" gave "!output"', [
+ $this->assertEqual($output, $expected_output_1, SafeMarkup::format('Test token replacement: "!token" gave "!output"', [
'!token' => $name_field_1->options['alter']['text'],
'!output' => $output,
]));
$output = $name_field_2->advancedRender($row);
- $this->assertEqual($output, $expected_output_2, format_string('Test token replacement: "!token" gave "!output"', [
+ $this->assertEqual($output, $expected_output_2, SafeMarkup::format('Test token replacement: "!token" gave "!output"', [
'!token' => $name_field_2->options['alter']['text'],
'!output' => $output,
]));
@@ -208,7 +208,7 @@ public function testFieldTokens() {
$random_text = $this->randomMachineName();
$job_field->setTestValue($random_text);
$output = $job_field->advancedRender($row);
- $this->assertSubString($output, $random_text, format_string('Make sure the self token (!token => !value) appears in the output (!output)', [
+ $this->assertSubString($output, $random_text, SafeMarkup::format('Make sure the self token (!token => !value) appears in the output (!output)', [
'!value' => $random_text,
'!output' => $output,
'!token' => $job_field->options['alter']['text'],
@@ -220,7 +220,7 @@ public function testFieldTokens() {
$random_text = $this->randomMachineName();
$job_field->setTestValue($random_text);
$output = $job_field->advancedRender($row);
- $this->assertSubString($output, $old_token, format_string('Make sure the old token style (!token => !value) is not changed in the output (!output)', [
+ $this->assertSubString($output, $old_token, SafeMarkup::format('Make sure the old token style (!token => !value) is not changed in the output (!output)', [
'!value' => $random_text,
'!output' => $output,
'!token' => $job_field->options['alter']['text'],
diff --git a/core/modules/views/src/Tests/Handler/FieldWebTest.php b/core/modules/views/src/Tests/Handler/FieldWebTest.php
index ceb8881..681ba45 100644
--- a/core/modules/views/src/Tests/Handler/FieldWebTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldWebTest.php
@@ -490,12 +490,12 @@ public function testTextRendering() {
$trimmed_name = Unicode::substr($row->views_test_data_name, 0, 5);
$output = $name_field->advancedRender($row);
- $this->assertSubString($output, $trimmed_name, format_string('Make sure the trimmed output (!trimmed) appears in the rendered output (!output).', array('!trimmed' => $trimmed_name, '!output' => $output)));
- $this->assertNotSubString($output, $row->views_test_data_name, format_string("Make sure the untrimmed value (!untrimmed) shouldn't appear in the rendered output (!output).", array('!untrimmed' => $row->views_test_data_name, '!output' => $output)));
+ $this->assertSubString($output, $trimmed_name, SafeMarkup::format('Make sure the trimmed output (!trimmed) appears in the rendered output (!output).', array('!trimmed' => $trimmed_name, '!output' => $output)));
+ $this->assertNotSubString($output, $row->views_test_data_name, SafeMarkup::format("Make sure the untrimmed value (!untrimmed) shouldn't appear in the rendered output (!output).", array('!untrimmed' => $row->views_test_data_name, '!output' => $output)));
$name_field->options['alter']['max_length'] = 9;
$output = $name_field->advancedRender($row);
- $this->assertSubString($output, $trimmed_name, format_string('Make sure the untrimmed (!untrimmed) output appears in the rendered output (!output).', array('!trimmed' => $trimmed_name, '!output' => $output)));
+ $this->assertSubString($output, $trimmed_name, SafeMarkup::format('Make sure the untrimmed (!untrimmed) output appears in the rendered output (!output).', array('!trimmed' => $trimmed_name, '!output' => $output)));
// Take word_boundary into account for the tests.
$name_field->options['alter']['max_length'] = 5;
@@ -537,10 +537,10 @@ public function testTextRendering() {
$output = $name_field->advancedRender($row);
if ($touple['trimmed']) {
- $this->assertNotSubString($output, $touple['value'], format_string('The untrimmed value (!untrimmed) should not appear in the trimmed output (!output).', array('!untrimmed' => $touple['value'], '!output' => $output)));
+ $this->assertNotSubString($output, $touple['value'], SafeMarkup::format('The untrimmed value (!untrimmed) should not appear in the trimmed output (!output).', array('!untrimmed' => $touple['value'], '!output' => $output)));
}
if (!empty($touble['trimmed_value'])) {
- $this->assertSubString($output, $touple['trimmed_value'], format_string('The trimmed value (!trimmed) should appear in the trimmed output (!output).', array('!trimmed' => $touple['trimmed_value'], '!output' => $output)));
+ $this->assertSubString($output, $touple['trimmed_value'], SafeMarkup::format('The trimmed value (!trimmed) should appear in the trimmed output (!output).', array('!trimmed' => $touple['trimmed_value'], '!output' => $output)));
}
}
diff --git a/core/modules/views/src/Tests/Handler/HandlerAllTest.php b/core/modules/views/src/Tests/Handler/HandlerAllTest.php
index 018ec2b..be70021 100644
--- a/core/modules/views/src/Tests/Handler/HandlerAllTest.php
+++ b/core/modules/views/src/Tests/Handler/HandlerAllTest.php
@@ -8,6 +8,7 @@
namespace Drupal\views\Tests\Handler;
use Drupal\comment\Tests\CommentTestTrait;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\HandlerBase;
use Drupal\views\Plugin\views\filter\InOperator;
@@ -103,7 +104,7 @@ public function testHandlers() {
foreach ($object_types as $type) {
if (isset($view->{$type})) {
foreach ($view->{$type} as $handler) {
- $this->assertTrue($handler instanceof HandlerBase, format_string(
+ $this->assertTrue($handler instanceof HandlerBase, SafeMarkup::format(
'@type handler of class %class is an instance of HandlerBase',
array(
'@type' => $type,
diff --git a/core/modules/views/src/Tests/Handler/SortDateTest.php b/core/modules/views/src/Tests/Handler/SortDateTest.php
index 02d8807..0dcb892 100644
--- a/core/modules/views/src/Tests/Handler/SortDateTest.php
+++ b/core/modules/views/src/Tests/Handler/SortDateTest.php
@@ -7,6 +7,7 @@
namespace Drupal\views\Tests\Handler;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\views\Tests\ViewUnitTestBase;
use Drupal\views\Views;
@@ -198,7 +199,7 @@ public function testDateOrdering() {
$this->assertEqual(count($this->dataSet()), count($view->result), 'The number of returned rows match.');
$this->assertIdenticalResultset($view, $this->expectedResultSet($granularity, $reverse), array(
'views_test_data_name' => 'name',
- ), String::format('Result is returned correctly when ordering by granularity @granularity, @reverse.', array('@granularity' => $granularity, '@reverse' => $reverse ? 'reverse' : 'forward')));
+ ), SafeMarkup::format('Result is returned correctly when ordering by granularity @granularity, @reverse.', array('@granularity' => $granularity, '@reverse' => $reverse ? 'reverse' : 'forward')));
$view->destroy();
unset($view);
}
diff --git a/core/modules/views/src/Tests/ModuleTest.php b/core/modules/views/src/Tests/ModuleTest.php
index cbb067e..366cc69 100644
--- a/core/modules/views/src/Tests/ModuleTest.php
+++ b/core/modules/views/src/Tests/ModuleTest.php
@@ -12,6 +12,7 @@
*
* @group views
*/
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\views\Plugin\views\filter\Standard;
use Drupal\views\Views;
use Drupal\Component\Utility\String;
@@ -94,7 +95,7 @@ public function testViewsGetHandler() {
'field' => 'field_invalid',
);
$this->container->get('plugin.manager.views.field')->getHandler($item);
- $this->assertTrue(strpos($this->lastErrorMessage, format_string("Missing handler: @table @field @type", array('@table' => 'views_test_data', '@field' => 'field_invalid', '@type' => 'field'))) !== FALSE, 'An invalid field name throws a debug message.');
+ $this->assertTrue(strpos($this->lastErrorMessage, SafeMarkup::format("Missing handler: @table @field @type", array('@table' => 'views_test_data', '@field' => 'field_invalid', '@type' => 'field'))) !== FALSE, 'An invalid field name throws a debug message.');
unset($this->lastErrorMessage);
$item = array(
@@ -102,7 +103,7 @@ public function testViewsGetHandler() {
'field' => 'id',
);
$this->container->get('plugin.manager.views.filter')->getHandler($item);
- $this->assertEqual(strpos($this->lastErrorMessage, format_string("Missing handler: @table @field @type", array('@table' => 'table_invalid', '@field' => 'id', '@type' => 'filter'))) !== FALSE, 'An invalid table name throws a debug message.');
+ $this->assertEqual(strpos($this->lastErrorMessage, SafeMarkup::format("Missing handler: @table @field @type", array('@table' => 'table_invalid', '@field' => 'id', '@type' => 'filter'))) !== FALSE, 'An invalid table name throws a debug message.');
unset($this->lastErrorMessage);
$item = array(
@@ -110,7 +111,7 @@ public function testViewsGetHandler() {
'field' => 'id',
);
$this->container->get('plugin.manager.views.filter')->getHandler($item);
- $this->assertEqual(strpos($this->lastErrorMessage, format_string("Missing handler: @table @field @type", array('@table' => 'table_invalid', '@field' => 'id', '@type' => 'filter'))) !== FALSE, 'An invalid table name throws a debug message.');
+ $this->assertEqual(strpos($this->lastErrorMessage, SafeMarkup::format("Missing handler: @table @field @type", array('@table' => 'table_invalid', '@field' => 'id', '@type' => 'filter'))) !== FALSE, 'An invalid table name throws a debug message.');
unset($this->lastErrorMessage);
restore_error_handler();
@@ -258,7 +259,7 @@ public function testViewsPluginList() {
list($plugin_type, $plugin_id) = explode(':', $key);
$plugin_def = $this->container->get("plugin.manager.views.$plugin_type")->getDefinition($plugin_id);
- $this->assertTrue(isset($plugin_list[$key]), String::format('The expected @key plugin list key was found.', array('@key' => $key)));
+ $this->assertTrue(isset($plugin_list[$key]), SafeMarkup::format('The expected @key plugin list key was found.', array('@key' => $key)));
$plugin_details = $plugin_list[$key];
$this->assertEqual($plugin_details['type'], $plugin_type, 'The expected plugin type was found.');
diff --git a/core/modules/views/src/Tests/Plugin/FilterTest.php b/core/modules/views/src/Tests/Plugin/FilterTest.php
index 63d90ab..7bf1f6b 100644
--- a/core/modules/views/src/Tests/Plugin/FilterTest.php
+++ b/core/modules/views/src/Tests/Plugin/FilterTest.php
@@ -7,6 +7,7 @@
namespace Drupal\views\Tests\Plugin;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\views\Views;
use Drupal\views_test_data\Plugin\views\filter\FilterTest as FilterPlugin;
@@ -89,7 +90,7 @@ public function testFilterQuery() {
$this->assertIdentical($view->filter['test_filter']->value, 'John');
// Check that we have some results.
- $this->assertEqual(count($view->result), 1, format_string('Results were returned. @count results.', array('@count' => count($view->result))));
+ $this->assertEqual(count($view->result), 1, SafeMarkup::format('Results were returned. @count results.', array('@count' => count($view->result))));
$view->destroy();
@@ -115,7 +116,7 @@ public function testFilterQuery() {
// Test that no nodes have been returned (Only 'page' type nodes should
// exist).
- $this->assertEqual(count($view->result), 4, format_string('No results were returned. @count results.', array('@count' => count($view->result))));
+ $this->assertEqual(count($view->result), 4, SafeMarkup::format('No results were returned. @count results.', array('@count' => count($view->result))));
$view->destroy();
$view->initDisplay();
@@ -139,7 +140,7 @@ public function testFilterQuery() {
$this->executeView($view);
// Check if we have all 5 results.
- $this->assertEqual(count($view->result), 5, format_string('All @count results returned', array('@count' => count($view->displayHandlers))));
+ $this->assertEqual(count($view->result), 5, SafeMarkup::format('All @count results returned', array('@count' => count($view->displayHandlers))));
}
}
diff --git a/core/modules/views/src/Tests/Plugin/StyleMappingTest.php b/core/modules/views/src/Tests/Plugin/StyleMappingTest.php
index 24b06d2..8ebbf71 100644
--- a/core/modules/views/src/Tests/Plugin/StyleMappingTest.php
+++ b/core/modules/views/src/Tests/Plugin/StyleMappingTest.php
@@ -7,6 +7,7 @@
namespace Drupal\views\Tests\Plugin;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\views\Views;
/**
@@ -73,7 +74,7 @@ protected function mappedOutputHelper($view) {
// separated by ':'.
$expected_result = $name . ':' . $data_set[$count][$field_id];
$actual_result = (string) $field;
- $this->assertIdentical($expected_result, $actual_result, format_string('The fields were mapped successfully: %name => %field_id', array('%name' => $name, '%field_id' => $field_id)));
+ $this->assertIdentical($expected_result, $actual_result, SafeMarkup::format('The fields were mapped successfully: %name => %field_id', array('%name' => $name, '%field_id' => $field_id)));
}
$count++;
diff --git a/core/modules/views/src/Tests/PluginInstanceTest.php b/core/modules/views/src/Tests/PluginInstanceTest.php
index 1893432..87a0f92 100644
--- a/core/modules/views/src/Tests/PluginInstanceTest.php
+++ b/core/modules/views/src/Tests/PluginInstanceTest.php
@@ -7,6 +7,7 @@
namespace Drupal\views\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\views\Views;
/**
@@ -65,8 +66,8 @@ public function testPluginData() {
// Check all plugin types.
foreach ($this->pluginTypes as $type) {
- $this->assertTrue(array_key_exists($type, $this->definitions), format_string('Key for plugin type @type found.', array('@type' => $type)));
- $this->assertTrue(is_array($this->definitions[$type]) && !empty($this->definitions[$type]), format_string('Plugin type @type has an array of plugins.', array('@type' => $type)));
+ $this->assertTrue(array_key_exists($type, $this->definitions), SafeMarkup::format('Key for plugin type @type found.', array('@type' => $type)));
+ $this->assertTrue(is_array($this->definitions[$type]) && !empty($this->definitions[$type]), SafeMarkup::format('Plugin type @type has an array of plugins.', array('@type' => $type)));
}
// Tests that the plugin list has not missed any types.
@@ -92,7 +93,7 @@ public function testPluginInstances() {
// good to check they can be created but for throwing any notices for
// method signatures etc... too.
$instance = $manager->createInstance($id);
- $this->assertTrue($instance instanceof $definition['class'], format_string('Instance of @type:@id created', array('@type' => $type, '@id' => $id)));
+ $this->assertTrue($instance instanceof $definition['class'], SafeMarkup::format('Instance of @type:@id created', array('@type' => $type, '@id' => $id)));
}
}
}
diff --git a/core/modules/views/src/Tests/QueryGroupByTest.php b/core/modules/views/src/Tests/QueryGroupByTest.php
index b580e0a..4b23a54 100644
--- a/core/modules/views/src/Tests/QueryGroupByTest.php
+++ b/core/modules/views/src/Tests/QueryGroupByTest.php
@@ -7,6 +7,7 @@
namespace Drupal\views\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\views\Views;
/**
@@ -103,8 +104,8 @@ public function groupByTestHelper($aggregation_function, $values) {
foreach ($view->result as $item) {
$results[$item->entity_test_name] = $item->id;
}
- $this->assertEqual($results['name1'], $values[0], format_string('Aggregation with @aggregation_function and groupby name: name1 returned the expected amount of results', array('@aggregation_function' => $aggregation_function)));
- $this->assertEqual($results['name2'], $values[1], format_string('Aggregation with @aggregation_function and groupby name: name2 returned the expected amount of results', array('@aggregation_function' => $aggregation_function)));
+ $this->assertEqual($results['name1'], $values[0], SafeMarkup::format('Aggregation with @aggregation_function and groupby name: name1 returned the expected amount of results', array('@aggregation_function' => $aggregation_function)));
+ $this->assertEqual($results['name2'], $values[1], SafeMarkup::format('Aggregation with @aggregation_function and groupby name: name2 returned the expected amount of results', array('@aggregation_function' => $aggregation_function)));
}
/**
diff --git a/core/modules/views/src/Tests/TokenReplaceTest.php b/core/modules/views/src/Tests/TokenReplaceTest.php
index d4bcc67..9806a76 100644
--- a/core/modules/views/src/Tests/TokenReplaceTest.php
+++ b/core/modules/views/src/Tests/TokenReplaceTest.php
@@ -7,6 +7,7 @@
namespace Drupal\views\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\views\Views;
/**
@@ -56,7 +57,7 @@ function testTokenReplacement() {
foreach ($expected as $token => $expected_output) {
$output = $token_handler->replace($token, array('view' => $view));
- $this->assertIdentical($output, $expected_output, format_string('Token %token replaced correctly.', array('%token' => $token)));
+ $this->assertIdentical($output, $expected_output, SafeMarkup::format('Token %token replaced correctly.', array('%token' => $token)));
}
}
diff --git a/core/modules/views/src/Tests/ViewExecutableTest.php b/core/modules/views/src/Tests/ViewExecutableTest.php
index 6555c5b..b6de575 100644
--- a/core/modules/views/src/Tests/ViewExecutableTest.php
+++ b/core/modules/views/src/Tests/ViewExecutableTest.php
@@ -126,7 +126,7 @@ public function testInitMethods() {
if ($type == 'relationship') {
continue;
}
- $this->assertTrue(count($view->$type), format_string('Make sure a %type instance got instantiated.', array('%type' => $type)));
+ $this->assertTrue(count($view->$type), SafeMarkup::format('Make sure a %type instance got instantiated.', array('%type' => $type)));
}
// initHandlers() should create display handlers automatically as well.
@@ -423,7 +423,7 @@ public function testValidate() {
$match = function($value) use ($display) {
return strpos($value, $display->display['display_title']) !== false;
};
- $this->assertTrue(array_filter($validate[$id], $match), format_string('Error message found for @id display', array('@id' => $id)));
+ $this->assertTrue(array_filter($validate[$id], $match), SafeMarkup::format('Error message found for @id display', array('@id' => $id)));
$count++;
}
diff --git a/core/modules/views/src/Tests/ViewResultAssertionTrait.php b/core/modules/views/src/Tests/ViewResultAssertionTrait.php
index 222bf25..b38125b 100644
--- a/core/modules/views/src/Tests/ViewResultAssertionTrait.php
+++ b/core/modules/views/src/Tests/ViewResultAssertionTrait.php
@@ -7,6 +7,7 @@
namespace Drupal\views\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\views\Plugin\views\field\Field;
use Drupal\views\ViewExecutable;
@@ -127,7 +128,7 @@ protected function assertIdenticalResultsetHelper($view, $expected_result, $colu
// Do the actual comparison.
if (!isset($message)) {
$not = (strpos($assert_method, 'Not') ? 'not' : '');
- $message = format_string("Actual result \n@actual\n
is $not identical to expected \n@expected\n
", array(
+ $message = SafeMarkup::format("Actual result \n@actual\n
is $not identical to expected \n@expected\n
", array(
'@actual' => var_export($result, TRUE),
'@expected' => var_export($expected_result, TRUE),
));
diff --git a/core/modules/views/src/Tests/ViewStorageTest.php b/core/modules/views/src/Tests/ViewStorageTest.php
index 1a0f5ac..605cdb3 100644
--- a/core/modules/views/src/Tests/ViewStorageTest.php
+++ b/core/modules/views/src/Tests/ViewStorageTest.php
@@ -93,7 +93,7 @@ protected function loadTests() {
// expected properties.
$this->assertTrue($view instanceof View, 'Single View instance loaded.');
foreach ($this->configProperties as $property) {
- $this->assertTrue($view->get($property) !== NULL, format_string('Property: @property loaded onto View.', array('@property' => $property)));
+ $this->assertTrue($view->get($property) !== NULL, SafeMarkup::format('Property: @property loaded onto View.', array('@property' => $property)));
}
// Check the displays have been loaded correctly from config display data.
@@ -109,7 +109,7 @@ protected function loadTests() {
// exists.
$original_options = $data['display'][$key];
foreach ($original_options as $orig_key => $value) {
- $this->assertIdentical($display[$orig_key], $value, format_string('@key is identical to saved data', array('@key' => $key)));
+ $this->assertIdentical($display[$orig_key], $value, SafeMarkup::format('@key is identical to saved data', array('@key' => $key)));
}
}
@@ -128,7 +128,7 @@ protected function createTests() {
$this->assertTrue($created instanceof View, 'Created object is a View.');
// Check that the View contains all of the properties.
foreach ($this->configProperties as $property) {
- $this->assertTrue(property_exists($created, $property), format_string('Property: @property created on View.', array('@property' => $property)));
+ $this->assertTrue(property_exists($created, $property), SafeMarkup::format('Property: @property created on View.', array('@property' => $property)));
}
// Create a new View instance with config values.
@@ -145,8 +145,8 @@ protected function createTests() {
// Test all properties except displays.
foreach ($properties as $property) {
- $this->assertTrue($created->get($property) !== NULL, format_string('Property: @property created on View.', array('@property' => $property)));
- $this->assertIdentical($values[$property], $created->get($property), format_string('Property value: @property matches configuration value.', array('@property' => $property)));
+ $this->assertTrue($created->get($property) !== NULL, SafeMarkup::format('Property: @property created on View.', array('@property' => $property)));
+ $this->assertIdentical($values[$property], $created->get($property), SafeMarkup::format('Property value: @property matches configuration value.', array('@property' => $property)));
}
// Check the UUID of the loaded View.
@@ -218,14 +218,14 @@ protected function displayMethodTests() {
$random_title = $this->randomMachineName();
$id = $view->addDisplay('page', $random_title);
- $this->assertEqual($id, 'page_1', format_string('Make sure the first display (%id_new) has the expected ID (%id)', array('%id_new' => $id, '%id' => 'page_1')));
+ $this->assertEqual($id, 'page_1', SafeMarkup::format('Make sure the first display (%id_new) has the expected ID (%id)', array('%id_new' => $id, '%id' => 'page_1')));
$display = $view->get('display');
$this->assertEqual($display[$id]['display_title'], $random_title);
$random_title = $this->randomMachineName();
$id = $view->addDisplay('page', $random_title);
$display = $view->get('display');
- $this->assertEqual($id, 'page_2', format_string('Make sure the second display (%id_new) has the expected ID (%id)', array('%id_new' => $id, '%id' => 'page_2')));
+ $this->assertEqual($id, 'page_2', SafeMarkup::format('Make sure the second display (%id_new) has the expected ID (%id)', array('%id_new' => $id, '%id' => 'page_2')));
$this->assertEqual($display[$id]['display_title'], $random_title);
$id = $view->addDisplay('page');
@@ -348,14 +348,14 @@ public function testCreateDuplicate() {
);
foreach ($config_properties as $property) {
- $this->assertIdentical($view->storage->get($property), $copy->get($property), format_string('@property property is identical.', array('@property' => $property)));
+ $this->assertIdentical($view->storage->get($property), $copy->get($property), SafeMarkup::format('@property property is identical.', array('@property' => $property)));
}
// Check the displays are the same.
$copy_display = $copy->get('display');
foreach ($view->storage->get('display') as $id => $display) {
// assertIdentical will not work here.
- $this->assertEqual($display, $copy_display[$id], format_string('The @display display has been copied correctly.', array('@display' => $id)));
+ $this->assertEqual($display, $copy_display[$id], SafeMarkup::format('The @display display has been copied correctly.', array('@display' => $id)));
}
}
diff --git a/core/modules/views/src/Tests/ViewsHooksTest.php b/core/modules/views/src/Tests/ViewsHooksTest.php
index 534df07..4d8df00 100644
--- a/core/modules/views/src/Tests/ViewsHooksTest.php
+++ b/core/modules/views/src/Tests/ViewsHooksTest.php
@@ -7,6 +7,7 @@
namespace Drupal\views\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\views\Views;
/**
@@ -68,7 +69,7 @@ public function testHooks() {
// Test each hook is found in the implementations array and is invoked.
foreach (static::$hooks as $hook => $type) {
- $this->assertTrue($this->moduleHandler->implementsHook('views_test_data', $hook), format_string('The hook @hook was registered.', array('@hook' => $hook)));
+ $this->assertTrue($this->moduleHandler->implementsHook('views_test_data', $hook), SafeMarkup::format('The hook @hook was registered.', array('@hook' => $hook)));
switch ($type) {
case 'view':
@@ -84,7 +85,7 @@ public function testHooks() {
$this->moduleHandler->invoke('views_test_data', $hook);
}
- $this->assertTrue($this->container->get('state')->get('views_hook_test_' . $hook), format_string('The %hook hook was invoked.', array('%hook' => $hook)));
+ $this->assertTrue($this->container->get('state')->get('views_hook_test_' . $hook), SafeMarkup::format('The %hook hook was invoked.', array('%hook' => $hook)));
// Reset the module implementations cache, so we ensure that the
// .views.inc file is loaded actively.
$this->moduleHandler->resetImplementations();
diff --git a/core/modules/views/src/Tests/Wizard/BasicTest.php b/core/modules/views/src/Tests/Wizard/BasicTest.php
index 5871afc..d8f0b1a 100644
--- a/core/modules/views/src/Tests/Wizard/BasicTest.php
+++ b/core/modules/views/src/Tests/Wizard/BasicTest.php
@@ -8,6 +8,7 @@
namespace Drupal\views\Tests\Wizard;
use Drupal\Component\Serialization\Json;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Url;
use Drupal\views\Views;
@@ -207,7 +208,7 @@ public function testWizardDefaultValues() {
foreach ($displays as $display) {
foreach (array('query', 'exposed_form', 'pager', 'style', 'row') as $type) {
- $this->assertFalse(empty($display['display_options'][$type]['options']), String::format('Default options found for @plugin.', array('@plugin' => $type)));
+ $this->assertFalse(empty($display['display_options'][$type]['options']), SafeMarkup::format('Default options found for @plugin.', array('@plugin' => $type)));
}
}
}
diff --git a/core/modules/views/src/Tests/Wizard/MenuTest.php b/core/modules/views/src/Tests/Wizard/MenuTest.php
index 6f29329..fbb14f9 100644
--- a/core/modules/views/src/Tests/Wizard/MenuTest.php
+++ b/core/modules/views/src/Tests/Wizard/MenuTest.php
@@ -7,6 +7,7 @@
namespace Drupal\views\Tests\Wizard;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Url;
@@ -49,7 +50,7 @@ function testMenus() {
/** @var \Drupal\Core\Menu\MenuLinkInterface $link */
$link = $menu_link_manager->createInstance('views_view:views.' . $view['id'] . '.page_1');
$url = $link->getUrlObject();
- $this->assertEqual($url->getRouteName(), 'view.' . $view['id'] . '.page_1', String::format('Found a link to %path in the main menu', array('%path' => $view['page[path]'])));
+ $this->assertEqual($url->getRouteName(), 'view.' . $view['id'] . '.page_1', SafeMarkup::format('Found a link to %path in the main menu', array('%path' => $view['page[path]'])));
$metadata = $link->getMetaData();
$this->assertEqual(array('view_id' => $view['id'], 'display_id' => 'page_1'), $metadata);
}
diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php
index 11dce89..4c5d1c8 100644
--- a/core/modules/views/src/ViewExecutable.php
+++ b/core/modules/views/src/ViewExecutable.php
@@ -7,6 +7,7 @@
namespace Drupal\views;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Cache\Cache;
use Drupal\Core\DependencyInjection\DependencySerializationTrait;
@@ -720,7 +721,7 @@ public function setDisplay($display_id = NULL) {
// Ensure the requested display exists.
if (!$this->displayHandlers->has($display_id)) {
- debug(format_string('setDisplay() called with invalid display ID "@display".', array('@display' => $display_id)));
+ debug(SafeMarkup::format('setDisplay() called with invalid display ID "@display".', array('@display' => $display_id)));
return FALSE;
}
@@ -1859,7 +1860,7 @@ public function getUrl($args = NULL, $display_id = NULL) {
public function getUrlInfo($display_id = '') {
$this->initDisplay();
if (!$this->display_handler instanceof DisplayRouterInterface) {
- throw new \InvalidArgumentException(String::format('You cannot generate a URL for the display @display_id', ['@display_id' => $display_id]));
+ throw new \InvalidArgumentException(SafeMarkup::format('You cannot generate a URL for the display @display_id', ['@display_id' => $display_id]));
}
return $this->display_handler->getUrlInfo();
}
diff --git a/core/modules/views/src/ViewsDataHelper.php b/core/modules/views/src/ViewsDataHelper.php
index b986746..eed1dd1 100644
--- a/core/modules/views/src/ViewsDataHelper.php
+++ b/core/modules/views/src/ViewsDataHelper.php
@@ -7,8 +7,8 @@
namespace Drupal\views;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
-use Drupal\Component\Utility\String;
/**
* Defines a helper class for stuff related to views data.
@@ -116,7 +116,7 @@ public function fetchFields($base, $type, $grouping = FALSE, $sub_type = NULL) {
}
else {
if ($string != 'base' && $string != 'base') {
- $strings[$field][$key][$string] = String::format("Error: missing @component", array('@component' => $string));
+ $strings[$field][$key][$string] = SafeMarkup::format("Error: missing @component", array('@component' => $string));
}
}
}
diff --git a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
index ee3cb03..95fd6c7 100644
--- a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
+++ b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
@@ -868,11 +868,11 @@ public function setKey($key, $value) {
namespace {
- use Drupal\Component\Utility\String;
+ use Drupal\Component\Utility\SafeMarkup;
if (!function_exists('t')) {
function t($string, array $args = []) {
- return String::format($string, $args);
+ return SafeMarkup::format($string, $args);
}
}
}
diff --git a/core/modules/views/tests/src/Unit/Plugin/field/CounterTest.php b/core/modules/views/tests/src/Unit/Plugin/field/CounterTest.php
index 7b0c14d..2a968e3 100644
--- a/core/modules/views/tests/src/Unit/Plugin/field/CounterTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/field/CounterTest.php
@@ -7,6 +7,7 @@
namespace Drupal\Tests\views\Unit\Plugin\field;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Tests\UnitTestCase;
use Drupal\views\Entity\View;
@@ -126,12 +127,12 @@ public function testSimpleCounter($i) {
$expected = $i + 1;
$counter = $counter_handler->getValue($this->testData[$i]);
- $this->assertEquals($expected, $counter, String::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
+ $this->assertEquals($expected, $counter, SafeMarkup::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
'@expected' => $expected,
'@counter' => $counter
)));
$counter = $counter_handler->render($this->testData[$i]);
- $this->assertEquals($expected, $counter_handler->render($this->testData[$i]), String::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
+ $this->assertEquals($expected, $counter_handler->render($this->testData[$i]), SafeMarkup::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
'@expected' => $expected,
'@counter' => $counter
)));
@@ -158,12 +159,12 @@ public function testCounterRandomStart($i) {
$expected = $rand_start + $i;
$counter = $counter_handler->getValue($this->testData[$i]);
- $this->assertEquals($expected, $counter, String::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
+ $this->assertEquals($expected, $counter, SafeMarkup::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
'@expected' => $expected,
'@counter' => $counter
)));
$counter = $counter_handler->render($this->testData[$i]);
- $this->assertEquals($expected, $counter_handler->render($this->testData[$i]), String::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
+ $this->assertEquals($expected, $counter_handler->render($this->testData[$i]), SafeMarkup::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
'@expected' => $expected,
'@counter' => $counter
)));
@@ -193,12 +194,12 @@ public function testCounterRandomPagerOffset($i) {
$expected = $offset + $rand_start + $i;
$counter = $counter_handler->getValue($this->testData[$i]);
- $this->assertEquals($expected, $counter, String::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
+ $this->assertEquals($expected, $counter, SafeMarkup::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
'@expected' => $expected,
'@counter' => $counter
)));
$counter = $counter_handler->render($this->testData[$i]);
- $this->assertEquals($expected, $counter_handler->render($this->testData[$i]), String::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
+ $this->assertEquals($expected, $counter_handler->render($this->testData[$i]), SafeMarkup::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
'@expected' => $expected,
'@counter' => $counter
)));
@@ -232,12 +233,12 @@ public function testCounterSecondPage($i) {
$expected = $items_per_page + $offset + $rand_start + $i;
$counter = $counter_handler->getValue($this->testData[$i]);
- $this->assertEquals($expected, $counter, String::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
+ $this->assertEquals($expected, $counter, SafeMarkup::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
'@expected' => $expected,
'@counter' => $counter
)));
$counter = $counter_handler->render($this->testData[$i]);
- $this->assertEquals($expected, $counter_handler->render($this->testData[$i]), String::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
+ $this->assertEquals($expected, $counter_handler->render($this->testData[$i]), SafeMarkup::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
'@expected' => $expected,
'@counter' => $counter
)));
diff --git a/core/modules/views/tests/src/Unit/ViewsDataHelperTest.php b/core/modules/views/tests/src/Unit/ViewsDataHelperTest.php
index 9016dbf..bb10483 100644
--- a/core/modules/views/tests/src/Unit/ViewsDataHelperTest.php
+++ b/core/modules/views/tests/src/Unit/ViewsDataHelperTest.php
@@ -7,6 +7,7 @@
namespace Drupal\Tests\views\Unit;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Tests\UnitTestCase;
use Drupal\views\ViewsDataHelper;
@@ -106,7 +107,7 @@ public function testFetchFields() {
array_walk($expected_keys, function(&$item) {
$item = "views_test_data.$item";
});
- $this->assertEquals($expected_keys, array_keys($fields), String::format('Handlers of type @handler_type are not listed as expected.', array('@handler_type' => $handler_type)));
+ $this->assertEquals($expected_keys, array_keys($fields), SafeMarkup::format('Handlers of type @handler_type are not listed as expected.', array('@handler_type' => $handler_type)));
}
// Check for subtype filtering, so header and footer.
@@ -117,7 +118,7 @@ public function testFetchFields() {
array_walk($expected_keys, function(&$item) {
$item = "views_test_data.$item";
});
- $this->assertEquals($expected_keys, array_keys($fields), String::format('Sub_type @sub_type is not filtered as expected.', array('@sub_type' => $sub_type)));
+ $this->assertEquals($expected_keys, array_keys($fields), SafeMarkup::format('Sub_type @sub_type is not filtered as expected.', array('@sub_type' => $sub_type)));
}
}
diff --git a/core/modules/views_ui/src/Form/Ajax/Rearrange.php b/core/modules/views_ui/src/Form/Ajax/Rearrange.php
index 9e2259f..7c14944 100644
--- a/core/modules/views_ui/src/Form/Ajax/Rearrange.php
+++ b/core/modules/views_ui/src/Form/Ajax/Rearrange.php
@@ -7,6 +7,7 @@
namespace Drupal\views_ui\Form\Ajax;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
@@ -129,7 +130,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
'#id' => 'views-removed-' . $id,
'#attributes' => array('class' => array('views-remove-checkbox')),
'#default_value' => 0,
- '#suffix' => \Drupal::l(String::format('@text', array('@text' => $this->t('Remove'))),
+ '#suffix' => \Drupal::l(SafeMarkup::format('@text', array('@text' => $this->t('Remove'))),
Url::fromRoute('', array(), array('attributes' => array(
'id' => 'views-remove-link-' . $id,
'class' => array('views-hidden', 'views-button-remove', 'views-remove-link'),
diff --git a/core/modules/views_ui/src/Form/Ajax/ReorderDisplays.php b/core/modules/views_ui/src/Form/Ajax/ReorderDisplays.php
index c2415ff..72924d1 100644
--- a/core/modules/views_ui/src/Form/Ajax/ReorderDisplays.php
+++ b/core/modules/views_ui/src/Form/Ajax/ReorderDisplays.php
@@ -7,6 +7,7 @@
namespace Drupal\views_ui\Form\Ajax;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
@@ -121,7 +122,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
),
'link' => array(
'#type' => 'link',
- '#title' => String::format('@text', array('@text' => $this->t('Remove'))),
+ '#title' => SafeMarkup::format('@text', array('@text' => $this->t('Remove'))),
'#url' => Url::fromRoute(''),
'#attributes' => array(
'id' => 'display-remove-link-' . $id,
diff --git a/core/modules/views_ui/src/Tests/AnalyzeTest.php b/core/modules/views_ui/src/Tests/AnalyzeTest.php
index 0d82239..1469b02 100644
--- a/core/modules/views_ui/src/Tests/AnalyzeTest.php
+++ b/core/modules/views_ui/src/Tests/AnalyzeTest.php
@@ -7,6 +7,7 @@
namespace Drupal\views_ui\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\views\Tests\ViewTestBase;
/**
@@ -54,7 +55,7 @@ function testAnalyzeBasic() {
foreach (array('ok', 'warning', 'error') as $type) {
$xpath = $this->xpath('//div[contains(@class, :class)]', array(':class' => $type));
- $this->assertTrue(count($xpath), format_string('Analyse messages with @type found', array('@type' => $type)));
+ $this->assertTrue(count($xpath), SafeMarkup::format('Analyse messages with @type found', array('@type' => $type)));
}
// This redirects the user back to the main views edit page.
diff --git a/core/modules/views_ui/src/Tests/CustomBooleanTest.php b/core/modules/views_ui/src/Tests/CustomBooleanTest.php
index f9a990b..57f3e79 100644
--- a/core/modules/views_ui/src/Tests/CustomBooleanTest.php
+++ b/core/modules/views_ui/src/Tests/CustomBooleanTest.php
@@ -7,6 +7,7 @@
namespace Drupal\views_ui\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\views\Views;
/**
@@ -103,8 +104,8 @@ public function testCustomOption() {
$output = drupal_render($output);
$replacements = array('%type' => $type);
- $this->{$values['test']}(strpos($output, $values['true']), format_string('Expected custom boolean TRUE value in output for %type.', $replacements));
- $this->{$values['test']}(strpos($output, $values['false']), format_string('Expected custom boolean FALSE value in output for %type', $replacements));
+ $this->{$values['test']}(strpos($output, $values['true']), SafeMarkup::format('Expected custom boolean TRUE value in output for %type.', $replacements));
+ $this->{$values['test']}(strpos($output, $values['false']), SafeMarkup::format('Expected custom boolean FALSE value in output for %type', $replacements));
}
}
diff --git a/core/modules/views_ui/src/Tests/DefaultViewsTest.php b/core/modules/views_ui/src/Tests/DefaultViewsTest.php
index 8a88e3d..344e764 100644
--- a/core/modules/views_ui/src/Tests/DefaultViewsTest.php
+++ b/core/modules/views_ui/src/Tests/DefaultViewsTest.php
@@ -6,6 +6,7 @@
*/
namespace Drupal\views_ui\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Url;
use Drupal\user\Entity\Role;
@@ -216,7 +217,7 @@ function clickViewsOperationLink($label, $unique_href_part) {
break;
}
}
- $this->assertTrue(isset($index), format_string('Link to "@label" containing @part found.', array('@label' => $label, '@part' => $unique_href_part)));
+ $this->assertTrue(isset($index), SafeMarkup::format('Link to "@label" containing @part found.', array('@label' => $label, '@part' => $unique_href_part)));
if (isset($index)) {
return $this->clickLink($label, $index);
}
diff --git a/core/modules/views_ui/src/Tests/DisplayAttachmentTest.php b/core/modules/views_ui/src/Tests/DisplayAttachmentTest.php
index 68fa2b3..9f3d34d 100644
--- a/core/modules/views_ui/src/Tests/DisplayAttachmentTest.php
+++ b/core/modules/views_ui/src/Tests/DisplayAttachmentTest.php
@@ -7,6 +7,7 @@
namespace Drupal\views_ui\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\views\Views;
/**
@@ -35,7 +36,7 @@ public function testAttachmentUI() {
$this->drupalGet($attachment_display_url);
foreach (array('default', 'page-1') as $display_id) {
- $this->assertNoFieldChecked("edit-displays-$display_id", format_string('Make sure the @display_id can be marked as attached', array('@display_id' => $display_id)));
+ $this->assertNoFieldChecked("edit-displays-$display_id", SafeMarkup::format('Make sure the @display_id can be marked as attached', array('@display_id' => $display_id)));
}
// Save the attachments and test the value on the view.
diff --git a/core/modules/views_ui/src/Tests/DisplayTest.php b/core/modules/views_ui/src/Tests/DisplayTest.php
index 1b4d04c..db61882 100644
--- a/core/modules/views_ui/src/Tests/DisplayTest.php
+++ b/core/modules/views_ui/src/Tests/DisplayTest.php
@@ -8,6 +8,7 @@
namespace Drupal\views_ui\Tests;
use Drupal\Component\Serialization\Json;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\views\Views;
@@ -130,7 +131,7 @@ public function testDisplayAreas() {
// Assert that the expected text is found in each area category.
foreach ($areas as $type) {
$element = $this->xpath('//div[contains(@class, :class)]/div', array(':class' => $type));
- $this->assertEqual((string) $element[0], String::format('The selected display type does not use @type plugins', array('@type' => $type)));
+ $this->assertEqual((string) $element[0], SafeMarkup::format('The selected display type does not use @type plugins', array('@type' => $type)));
}
}
@@ -183,7 +184,7 @@ public function testPageContextualLinks() {
$this->drupalGet('test-display');
$id = 'entity.view.edit_form:view=test_display:location=page&name=test_display&display_id=page_1';
// @see \Drupal\contextual\Tests\ContextualDynamicContextTest:assertContextualLinkPlaceHolder()
- $this->assertRaw(' $id)) . '>', format_string('Contextual link placeholder with id @id exists.', array('@id' => $id)));
+ $this->assertRaw(' $id)) . '>', SafeMarkup::format('Contextual link placeholder with id @id exists.', array('@id' => $id)));
// Get server-rendered contextual links.
// @see \Drupal\contextual\Tests\ContextualDynamicContextTest:renderContextualLinks()
diff --git a/core/modules/views_ui/src/Tests/HandlerTest.php b/core/modules/views_ui/src/Tests/HandlerTest.php
index 4c9c786..42aba92 100644
--- a/core/modules/views_ui/src/Tests/HandlerTest.php
+++ b/core/modules/views_ui/src/Tests/HandlerTest.php
@@ -7,6 +7,7 @@
namespace Drupal\views_ui\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\views\ViewExecutable;
@@ -148,7 +149,7 @@ public function testBrokenHandlers() {
$href = "admin/structure/views/nojs/handler/test_view_broken/default/$type/id_broken";
$result = $this->xpath('//a[contains(@href, :href)]', array(':href' => $href));
- $this->assertEqual(count($result), 1, String::format('Handler (%type) edit link found.', array('%type' => $type)));
+ $this->assertEqual(count($result), 1, SafeMarkup::format('Handler (%type) edit link found.', array('%type' => $type)));
$text = t('Broken/missing handler');
@@ -167,7 +168,7 @@ public function testBrokenHandlers() {
];
foreach ($original_configuration as $key => $value) {
- $this->assertText(String::format('@key: @value', array('@key' => $key, '@value' => $value)));
+ $this->assertText(SafeMarkup::format('@key: @value', array('@key' => $key, '@value' => $value)));
}
}
}
diff --git a/core/modules/views_ui/src/Tests/StorageTest.php b/core/modules/views_ui/src/Tests/StorageTest.php
index 73fe632..2003af5 100644
--- a/core/modules/views_ui/src/Tests/StorageTest.php
+++ b/core/modules/views_ui/src/Tests/StorageTest.php
@@ -7,6 +7,7 @@
namespace Drupal\views_ui\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\views\Views;
@@ -54,7 +55,7 @@ public function testDetails() {
$view = Views::getView($view_name);
foreach (array('label', 'tag', 'description', 'langcode') as $property) {
- $this->assertEqual($view->storage->get($property), $edit[$property], format_string('Make sure the property @property got probably saved.', array('@property' => $property)));
+ $this->assertEqual($view->storage->get($property), $edit[$property], SafeMarkup::format('Make sure the property @property got probably saved.', array('@property' => $property)));
}
}
diff --git a/core/modules/views_ui/src/Tests/TagTest.php b/core/modules/views_ui/src/Tests/TagTest.php
index 673b91f..10238dd 100644
--- a/core/modules/views_ui/src/Tests/TagTest.php
+++ b/core/modules/views_ui/src/Tests/TagTest.php
@@ -7,6 +7,7 @@
namespace Drupal\views_ui\Tests;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\views\Tests\ViewUnitTestBase;
use Drupal\views_ui\Controller\ViewsUIController;
@@ -53,7 +54,7 @@ public function testViewsUiAutocompleteTag() {
$matches = (array) json_decode($result->getContent());
$this->assertEqual(count($matches), 8, 'Make sure that only a subset is returned.');
foreach ($matches as $tag) {
- $this->assertTrue(array_search($tag, $tags) !== FALSE, format_string('Make sure the returned tag @tag actually exists.', array('@tag' => $tag)));
+ $this->assertTrue(array_search($tag, $tags) !== FALSE, SafeMarkup::format('Make sure the returned tag @tag actually exists.', array('@tag' => $tag)));
}
// Make sure an invalid result doesn't return anything.
diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php
index 1205f28..d8fee12 100644
--- a/core/modules/views_ui/src/ViewEditForm.php
+++ b/core/modules/views_ui/src/ViewEditForm.php
@@ -8,6 +8,7 @@
namespace Drupal\views_ui;
use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Ajax\AjaxResponse;
@@ -1083,7 +1084,7 @@ public function getFormBucket(ViewUI $view, $type, $display) {
$build['fields'][$id]['#class'][] = Html::cleanCssIdentifier($display['id']. '-' . $type . '-' . $id);
if ($executable->display_handler->useGroupBy() && $handler->usesGroupBy()) {
- $build['fields'][$id]['#settings_links'][] = $this->l(String::format('@text', array('@text' => $this->t('Aggregation settings'))), new Url('views_ui.form_handler_group', array(
+ $build['fields'][$id]['#settings_links'][] = $this->l(SafeMarkup::format('@text', array('@text' => $this->t('Aggregation settings'))), new Url('views_ui.form_handler_group', array(
'js' => 'nojs',
'view' => $view->id(),
'display_id' => $display['id'],
@@ -1093,7 +1094,7 @@ public function getFormBucket(ViewUI $view, $type, $display) {
}
if ($handler->hasExtraOptions()) {
- $build['fields'][$id]['#settings_links'][] = $this->l(String::format('@text', array('@text' => $this->t('Settings'))), new Url('views_ui.form_handler_extra', array(
+ $build['fields'][$id]['#settings_links'][] = $this->l(SafeMarkup::format('@text', array('@text' => $this->t('Settings'))), new Url('views_ui.form_handler_extra', array(
'js' => 'nojs',
'view' => $view->id(),
'display_id' => $display['id'],
diff --git a/core/modules/views_ui/views_ui.theme.inc b/core/modules/views_ui/views_ui.theme.inc
index 2187076..b474693 100644
--- a/core/modules/views_ui/views_ui.theme.inc
+++ b/core/modules/views_ui/views_ui.theme.inc
@@ -158,7 +158,7 @@ function theme_views_ui_build_group_filter_form($variables) {
'value' => drupal_render($form['group_items'][$group_id]['value']),
'remove' => array(
'data' => array(
- '#markup' => drupal_render($form['group_items'][$group_id]['remove']) . \Drupal::l(String::format('@text', array('@text' => t('Remove'))), Url::fromRoute('', [], array('attributes' => array('id' => 'views-remove-link-' . $group_id, 'class' => array('views-hidden', 'views-button-remove', 'views-groups-remove-link', 'views-remove-link'), 'alt' => t('Remove this item'), 'title' => t('Remove this item'))))),
+ '#markup' => drupal_render($form['group_items'][$group_id]['remove']) . \Drupal::l(SafeMarkup::format('@text', array('@text' => t('Remove'))), Url::fromRoute('', [], array('attributes' => array('id' => 'views-remove-link-' . $group_id, 'class' => array('views-hidden', 'views-button-remove', 'views-groups-remove-link', 'views-remove-link'), 'alt' => t('Remove this item'), 'title' => t('Remove this item'))))),
),
),
);
@@ -282,7 +282,7 @@ function template_preprocess_views_ui_rearrange_filter_form(&$variables) {
$remove_link = array(
'#type' => 'link',
'#url' => Url::fromRoute(''),
- '#title' => String::format('@text', array('@text' => t('Remove'))),
+ '#title' => SafeMarkup::format('@text', array('@text' => t('Remove'))),
'#weight' => '1',
'#options' => array(
'attributes' => array(
diff --git a/core/tests/Drupal/Tests/Component/Utility/RandomTest.php b/core/tests/Drupal/Tests/Component/Utility/RandomTest.php
index 716059f..c784479 100644
--- a/core/tests/Drupal/Tests/Component/Utility/RandomTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/RandomTest.php
@@ -8,6 +8,7 @@
namespace Drupal\Tests\Component\Utility;
use Drupal\Component\Utility\Random;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Tests\UnitTestCase;
@@ -39,7 +40,7 @@ public function testRandomStringUniqueness() {
$random = new Random();
for ($i = 0; $i <= 50; $i++) {
$str = $random->string(1, TRUE);
- $this->assertFalse(isset($strings[$str]), String::format('Generated duplicate random string !string', array('!string' => $str)));
+ $this->assertFalse(isset($strings[$str]), SafeMarkup::format('Generated duplicate random string !string', array('!string' => $str)));
$strings[$str] = TRUE;
}
}
@@ -54,7 +55,7 @@ public function testRandomNamesUniqueness() {
$random = new Random();
for ($i = 0; $i <= 10; $i++) {
$str = $random->name(1, TRUE);
- $this->assertFalse(isset($names[$str]), String::format('Generated duplicate random name !name', array('!name' => $str)));
+ $this->assertFalse(isset($names[$str]), SafeMarkup::format('Generated duplicate random name !name', array('!name' => $str)));
$names[$str] = TRUE;
}
}
diff --git a/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php b/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
index 9480a7e..3113819 100644
--- a/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
@@ -7,6 +7,7 @@
namespace Drupal\Tests\Component\Utility;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Component\Utility\String;
use Drupal\Tests\UnitTestCase;
@@ -94,7 +95,7 @@ public function providerTestValidAbsoluteData() {
public function testValidAbsolute($url, $scheme) {
$test_url = $scheme . '://' . $url;
$valid_url = UrlHelper::isValid($test_url, TRUE);
- $this->assertTrue($valid_url, String::format('@url is a valid URL.', array('@url' => $test_url)));
+ $this->assertTrue($valid_url, SafeMarkup::format('@url is a valid URL.', array('@url' => $test_url)));
}
/**
@@ -125,7 +126,7 @@ public function providerTestInvalidAbsolute() {
public function testInvalidAbsolute($url, $scheme) {
$test_url = $scheme . '://' . $url;
$valid_url = UrlHelper::isValid($test_url, TRUE);
- $this->assertFalse($valid_url, String::format('@url is NOT a valid URL.', array('@url' => $test_url)));
+ $this->assertFalse($valid_url, SafeMarkup::format('@url is NOT a valid URL.', array('@url' => $test_url)));
}
/**
@@ -159,7 +160,7 @@ public function providerTestValidRelativeData() {
public function testValidRelative($url, $prefix) {
$test_url = $prefix . $url;
$valid_url = UrlHelper::isValid($test_url);
- $this->assertTrue($valid_url, String::format('@url is a valid URL.', array('@url' => $test_url)));
+ $this->assertTrue($valid_url, SafeMarkup::format('@url is a valid URL.', array('@url' => $test_url)));
}
/**
@@ -190,7 +191,7 @@ public function providerTestInvalidRelativeData() {
public function testInvalidRelative($url, $prefix) {
$test_url = $prefix . $url;
$valid_url = UrlHelper::isValid($test_url);
- $this->assertFalse($valid_url, String::format('@url is NOT a valid URL.', array('@url' => $test_url)));
+ $this->assertFalse($valid_url, SafeMarkup::format('@url is NOT a valid URL.', array('@url' => $test_url)));
}
/**
diff --git a/core/tests/Drupal/Tests/Core/Config/ConfigTest.php b/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
index 936287a..e248ad0 100644
--- a/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
@@ -7,6 +7,7 @@
namespace Drupal\Tests\Core\Config;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Tests\UnitTestCase;
use Drupal\Core\Config\Config;
@@ -413,14 +414,14 @@ public function validateNameProvider() {
// Name missing namespace (dot).
array(
'MissingNamespace',
- String::format('Missing namespace in Config object name MissingNamespace.', array(
+ SafeMarkup::format('Missing namespace in Config object name MissingNamespace.', array(
'@name' => 'MissingNamespace',
)),
),
// Exceeds length (max length plus an extra dot).
array(
str_repeat('a', Config::MAX_NAME_LENGTH) . ".",
- String::format('Config object name @name exceeds maximum allowed length of @length characters.', array(
+ SafeMarkup::format('Config object name @name exceeds maximum allowed length of @length characters.', array(
'@name' => str_repeat('a', Config::MAX_NAME_LENGTH) . ".",
'@length' => Config::MAX_NAME_LENGTH,
)),
@@ -431,7 +432,7 @@ public function validateNameProvider() {
$name = 'name.' . $char;
$return[] = array(
$name,
- String::format('Invalid character in Config object name @name.', array(
+ SafeMarkup::format('Invalid character in Config object name @name.', array(
'@name' => $name,
)),
);
diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php
index d3dfc25..e3950cc 100644
--- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php
@@ -7,6 +7,7 @@
namespace Drupal\Tests\Core\Config\Entity;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Tests\UnitTestCase;
use Drupal\Core\Config\Entity\ConfigEntityType;
use Drupal\Component\Utility\String;
@@ -50,7 +51,7 @@ public function testConfigPrefixLengthExceeds() {
'config_prefix' => $this->randomMachineName(59),
);
$config_entity = $this->setUpConfigEntityType($definition);
- $this->setExpectedException('\Drupal\Core\Config\ConfigPrefixLengthException', String::format($message_text, array(
+ $this->setExpectedException('\Drupal\Core\Config\ConfigPrefixLengthException', SafeMarkup::format($message_text, array(
'@config_prefix' => $definition['provider'] . '.' . $definition['config_prefix'],
'@max_char' => ConfigEntityType::PREFIX_LENGTH,
)));
diff --git a/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php b/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php
index b153d9f..fac7b1f 100644
--- a/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php
+++ b/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php
@@ -7,6 +7,7 @@
namespace Drupal\Tests\Core\Controller;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Controller\TitleResolver;
use Drupal\Tests\UnitTestCase;
@@ -151,7 +152,7 @@ class TitleCallback {
* Returns the example string.
*/
public function example($value) {
- return String::format('test @value', array('@value' => $value));
+ return SafeMarkup::format('test @value', array('@value' => $value));
}
}
diff --git a/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php b/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php
index cc49c2c..343844a 100644
--- a/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php
@@ -7,6 +7,7 @@
namespace Drupal\Tests\Core\Form;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Form\FormState;
use Drupal\Tests\UnitTestCase;
@@ -477,7 +478,7 @@ public function providerTestPerformRequiredValidation() {
'#maxlength' => 7,
'#value' => $this->randomMachineName(8),
),
- String::format('!name cannot be longer than %max characters but is currently %length characters long.', array('!name' => 'Test', '%max' => '7', '%length' => 8)),
+ SafeMarkup::format('!name cannot be longer than %max characters but is currently %length characters long.', array('!name' => 'Test', '%max' => '7', '%length' => 8)),
FALSE,
),
);
diff --git a/core/tests/Drupal/Tests/Core/Logger/LogMessageParserTest.php b/core/tests/Drupal/Tests/Core/Logger/LogMessageParserTest.php
index f361456..4f99423 100644
--- a/core/tests/Drupal/Tests/Core/Logger/LogMessageParserTest.php
+++ b/core/tests/Drupal/Tests/Core/Logger/LogMessageParserTest.php
@@ -54,12 +54,13 @@ public function providerTestParseMessagePlaceholders() {
array('message' => 'User {username} created', 'context' => array('username' => 'Dries')),
array('message' => 'User @username created', 'context' => array('@username' => 'Dries')),
),
- // PSR3 style mixed in a format_string style message.
+ // PSR3 style mixed in a \Drupal\Component\Utility\SafeMarkup::format style
+ // message.
array(
array('message' => 'User {username} created @time', 'context' => array('username' => 'Dries', '@time' => 'now')),
array('message' => 'User @username created @time', 'context' => array('@username' => 'Dries', '@time' => 'now')),
),
- // format_string style message only.
+ // \Drupal\Component\Utility\SafeMarkup::format style message only.
array(
array('message' => 'User @username created', 'context' => array('@username' => 'Dries')),
array('message' => 'User @username created', 'context' => array('@username' => 'Dries')),
diff --git a/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php b/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php
index 01c6ab9..357f677 100644
--- a/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php
+++ b/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php
@@ -7,6 +7,7 @@
namespace Drupal\Tests\Core\Path;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Path\PathMatcher;
use Drupal\Tests\UnitTestCase;
@@ -49,7 +50,7 @@ protected function setUp() {
public function testMatchPath($patterns, $paths) {
foreach ($paths as $path => $expected_result) {
$actual_result = $this->pathMatcher->matchPath($path, $patterns);
- $this->assertEquals($actual_result, $expected_result, String::format('Tried matching the path @path to the pattern @patterns
- expected @expected, got @actual.', array(
+ $this->assertEquals($actual_result, $expected_result, SafeMarkup::format('Tried matching the path @path to the pattern @patterns
- expected @expected, got @actual.', array(
'@path' => $path,
'@patterns' => $patterns,
'@expected' => var_export($expected_result, TRUE),
diff --git a/core/tests/Drupal/Tests/Core/Transliteration/PhpTransliterationTest.php b/core/tests/Drupal/Tests/Core/Transliteration/PhpTransliterationTest.php
index 44d5d95..f952a52 100644
--- a/core/tests/Drupal/Tests/Core/Transliteration/PhpTransliterationTest.php
+++ b/core/tests/Drupal/Tests/Core/Transliteration/PhpTransliterationTest.php
@@ -8,6 +8,7 @@
namespace Drupal\Tests\Core\Transliteration;
use Drupal\Component\Utility\Random;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\String;
use Drupal\Core\Transliteration\PhpTransliteration;
use Drupal\Tests\UnitTestCase;
@@ -59,7 +60,7 @@ public function testPhpTransliterationWithAlter($langcode, $original, $expected,
$transliteration = new PhpTransliteration(NULL, $module_handler);
$actual = $transliteration->transliterate($original, $langcode);
- $this->assertSame($expected, $actual, String::format('@original transliteration to @actual is identical to @expected for language @langcode in service instance.', array(
+ $this->assertSame($expected, $actual, SafeMarkup::format('@original transliteration to @actual is identical to @expected for language @langcode in service instance.', array(
'@original' => $printable,
'@langcode' => $langcode,
'@expected' => $expected,
diff --git a/core/tests/Drupal/Tests/UnitTestCase.php b/core/tests/Drupal/Tests/UnitTestCase.php
index e82c3a9..c15bff2 100644
--- a/core/tests/Drupal/Tests/UnitTestCase.php
+++ b/core/tests/Drupal/Tests/UnitTestCase.php
@@ -202,7 +202,7 @@ public function getStringTranslationStub() {
$translation = $this->getMock('Drupal\Core\StringTranslation\TranslationInterface');
$translation->expects($this->any())
->method('translate')
- ->will($this->returnCallback('Drupal\Component\Utility\String::format'));
+ ->will($this->returnCallback('Drupal\Component\Utility\SafeMarkup::format'));
return $translation;
}