Commit 3a42e91d authored by webchick's avatar webchick

Issue #2089331 by grom358 | thedavidmeister: [meta] Replace calls to...

Issue #2089331 by grom358 | thedavidmeister: [meta] Replace calls to check_plain() with Drupal\Component\Utility\String::checkPlain().
parent 432b5a78
......@@ -195,7 +195,7 @@ public function form(array $form, array &$form_state) {
}
// Per-role visibility.
$role_options = array_map('check_plain', user_role_names());
$role_options = array_map(array('\Drupal\Component\Utility\String', 'checkPlain'), user_role_names());
$form['visibility']['role'] = array(
'#type' => 'details',
'#title' => $this->t('Roles'),
......
......@@ -65,7 +65,7 @@ public function viewMultiple(array $entities = array(), $view_mode = 'full', $la
// @todo Remove after fixing http://drupal.org/node/1989568.
'#block' => $entity,
);
$build[$entity_id]['#configuration']['label'] = check_plain($configuration['label']);
$build[$entity_id]['#configuration']['label'] = String::checkPlain($configuration['label']);
// Set cache tags; these always need to be set, whether the block is
// cacheable or not, so that the page cache is correctly informed.
......
......@@ -13,6 +13,7 @@
use Drupal\comment\CommentInterface;
use Drupal\comment\Entity\Comment;
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
use Drupal\Component\Utility\String;
use Drupal\Core\Entity\ContentEntityInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\entity\Entity\EntityViewDisplay;
......@@ -1265,7 +1266,7 @@ function comment_preview(CommentInterface $comment, array &$form_state) {
if (!empty($account) && $account->isAuthenticated()) {
$comment->setOwner($account);
$comment->setAuthorName(check_plain($account->getUsername()));
$comment->setAuthorName(String::checkPlain($account->getUsername()));
}
elseif (empty($author_name)) {
$comment->setAuthorName(\Drupal::config('user.settings')->get('anonymous'));
......
......@@ -5,6 +5,7 @@
* Builds placeholder replacement tokens for comment-related data.
*/
use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Xss;
/**
......@@ -141,12 +142,12 @@ function comment_tokens($type, $tokens, array $data = array(), array $options =
// Poster identity information for comments.
case 'hostname':
$replacements[$original] = $sanitize ? check_plain($comment->getHostname()) : $comment->getHostname();
$replacements[$original] = $sanitize ? String::checkPlain($comment->getHostname()) : $comment->getHostname();
break;
case 'mail':
$mail = $comment->getAuthorEmail();
$replacements[$original] = $sanitize ? check_plain($mail) : $mail;
$replacements[$original] = $sanitize ? String::checkPlain($mail) : $mail;
break;
case 'homepage':
......
......@@ -7,6 +7,7 @@
namespace Drupal\comment\Plugin\views\argument;
use Drupal\Component\Utility\String;
use Drupal\Core\Database\Connection;
use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
......@@ -64,7 +65,7 @@ function title() {
return t('No user');
}
return check_plain($title);
return String::checkPlain($title);
}
protected function defaultActions($which = NULL) {
......
......@@ -7,6 +7,7 @@
namespace Drupal\comment\Tests;
use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Xss;
/**
......@@ -53,10 +54,10 @@ function testCommentTokenReplacement() {
// Generate and test sanitized tokens.
$tests = array();
$tests['[comment:cid]'] = $comment->id();
$tests['[comment:hostname]'] = check_plain($comment->getHostname());
$tests['[comment:hostname]'] = String::checkPlain($comment->getHostname());
$tests['[comment:name]'] = Xss::filter($comment->getAuthorName());
$tests['[comment:author]'] = Xss::filter($comment->getAuthorName());
$tests['[comment:mail]'] = check_plain($this->admin_user->getEmail());
$tests['[comment:mail]'] = String::checkPlain($this->admin_user->getEmail());
$tests['[comment:homepage]'] = check_url($comment->getHomepage());
$tests['[comment:title]'] = Xss::filter($comment->getSubject());
$tests['[comment:body]'] = $comment->comment_body->processed;
......@@ -65,11 +66,11 @@ function testCommentTokenReplacement() {
$tests['[comment:created:since]'] = format_interval(REQUEST_TIME - $comment->getCreatedTime(), 2, $language_interface->id);
$tests['[comment:changed:since]'] = format_interval(REQUEST_TIME - $comment->getChangedTime(), 2, $language_interface->id);
$tests['[comment:parent:cid]'] = $comment->hasParentComment() ? $comment->getParentComment()->id() : NULL;
$tests['[comment:parent:title]'] = check_plain($parent_comment->getSubject());
$tests['[comment:parent:title]'] = String::checkPlain($parent_comment->getSubject());
$tests['[comment:node:nid]'] = $comment->getCommentedEntityId();
$tests['[comment:node:title]'] = check_plain($node->getTitle());
$tests['[comment:node:title]'] = String::checkPlain($node->getTitle());
$tests['[comment:author:uid]'] = $comment->getOwnerId();
$tests['[comment:author:name]'] = check_plain($this->admin_user->getUsername());
$tests['[comment:author:name]'] = String::checkPlain($this->admin_user->getUsername());
// Test to make sure that we generated something for each token.
$this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
......
......@@ -190,7 +190,7 @@ public function instanceSettingsForm(array $form, array &$form_state) {
// entity type specific plugins (e.g. 'default_node', 'default_user',
// ...).
if (in_array($plugin_id, $handler_groups)) {
$handlers_options[$plugin_id] = check_plain($plugin['label']);
$handlers_options[$plugin_id] = String::checkPlain($plugin['label']);
}
}
......
......@@ -7,6 +7,7 @@
namespace Drupal\entity_reference\Plugin\Field\FieldFormatter;
use Drupal\Component\Utility\String;
use Drupal\Core\Field\FieldItemListInterface;
/**
......@@ -77,7 +78,7 @@ public function viewElements(FieldItemListInterface $items) {
) + $uri->toRenderArray();
}
else {
$elements[$delta] = array('#markup' => check_plain($label));
$elements[$delta] = array('#markup' => String::checkPlain($label));
}
$elements[$delta]['#cache']['tags'] = $referenced_entity->getCacheTag();
}
......
......@@ -7,6 +7,7 @@
namespace Drupal\entity_reference\Plugin\entity_reference\selection;
use Drupal\Component\Utility\String;
use Drupal\Core\Database\Query\AlterableInterface;
use Drupal\Core\Database\Query\SelectInterface;
use Drupal\Core\Entity\EntityInterface;
......@@ -183,7 +184,7 @@ public function getReferenceableEntities($match = NULL, $match_operator = 'CONTA
$entities = entity_load_multiple($target_type, $result);
foreach ($entities as $entity_id => $entity) {
$bundle = $entity->bundle();
$options[$bundle][$entity_id] = check_plain($entity->label());
$options[$bundle][$entity_id] = String::checkPlain($entity->label());
}
return $options;
......
......@@ -7,6 +7,7 @@
namespace Drupal\entity_reference\Tests;
use Drupal\Component\Utility\String;
use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Core\Language\LanguageInterface;
use Drupal\comment\CommentInterface;
......@@ -114,7 +115,7 @@ public function testNodeHandler() {
$node = entity_create('node', $values);
$node->save();
$nodes[$key] = $node;
$node_labels[$key] = check_plain($node->label());
$node_labels[$key] = String::checkPlain($node->label());
}
// Test as a non-admin.
......@@ -260,7 +261,7 @@ public function testUserHandler() {
$account = $values;
}
$users[$key] = $account;
$user_labels[$key] = check_plain($account->getUsername());
$user_labels[$key] = String::checkPlain($account->getUsername());
}
// Test as a non-admin.
......@@ -439,7 +440,7 @@ public function testCommentHandler() {
$comment = entity_create('comment', $values);
$comment->save();
$comments[$key] = $comment;
$comment_labels[$key] = check_plain($comment->label());
$comment_labels[$key] = String::checkPlain($comment->label());
}
// Test as a non-admin.
......
......@@ -7,6 +7,7 @@
namespace Drupal\entity_reference\Tests;
use Drupal\Component\Utility\String;
use Drupal\simpletest\WebTestBase;
/**
......@@ -115,7 +116,7 @@ public function testSort() {
$node = entity_create('node', $values);
$node->save();
$nodes[$key] = $node;
$node_labels[$key] = check_plain($node->label());
$node_labels[$key] = String::checkPlain($node->label());
}
// Test as a non-admin.
......
......@@ -7,6 +7,7 @@
namespace Drupal\field\Plugin\views\argument;
use Drupal\Component\Utility\String;
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Plugin\views\argument\Numeric;
......@@ -69,7 +70,7 @@ public function summaryName($data) {
}
// else fallback to the key.
else {
return check_plain($value);
return String::checkPlain($value);
}
}
......
......@@ -7,6 +7,7 @@
namespace Drupal\field\Plugin\views\argument;
use Drupal\Component\Utility\String as UtilityString;
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Plugin\views\argument\String;
......@@ -71,7 +72,7 @@ public function summaryName($data) {
}
// else fallback to the key.
else {
return $this->caseTransform(check_plain($value), $this->options['case']);
return $this->caseTransform(UtilityString::checkPlain($value), $this->options['case']);
}
}
......
......@@ -7,6 +7,7 @@
namespace Drupal\field\Tests;
use Drupal\Component\Utility\String;
use Drupal\Core\Field\FieldDefinitionInterface;
/**
......@@ -107,7 +108,7 @@ function testFieldFormSingle() {
$this->drupalGet('entity_test/add');
// Create token value expected for description.
$token_description = check_plain(\Drupal::config('system.site')->get('name')) . '_description';
$token_description = String::checkPlain(\Drupal::config('system.site')->get('name')) . '_description';
$this->assertText($token_description, 'Token replacement for description is displayed');
$this->assertFieldByName("{$field_name}[0][value]", '', 'Widget is displayed');
$this->assertNoField("{$field_name}[1][value]", 'No extraneous widget is displayed');
......
......@@ -8,6 +8,7 @@
namespace Drupal\field_ui;
use Drupal\Component\Plugin\PluginManagerBase;
use Drupal\Component\Utility\String;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Entity\Display\EntityDisplayInterface;
use Drupal\Core\Entity\EntityManagerInterface;
......@@ -275,7 +276,7 @@ protected function buildFieldRow(FieldDefinitionInterface $field_definition, Ent
'defaultPlugin' => $this->getDefaultPlugin($field_definition->getType()),
),
'human_name' => array(
'#markup' => check_plain($label),
'#markup' => String::checkPlain($label),
),
'weight' => array(
'#type' => 'textfield',
......
......@@ -7,6 +7,7 @@
namespace Drupal\field_ui;
use Drupal\Component\Utility\String;
use Drupal\Core\Entity\EntityListBuilderInterface;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
......@@ -125,7 +126,7 @@ public function buildForm(array $form, array &$form_state, $entity_type_id = NUL
'id' => drupal_html_class($name),
),
'label' => array(
'#markup' => check_plain($instance->getLabel()),
'#markup' => String::checkPlain($instance->getLabel()),
),
'field_name' => array(
'#markup' => $instance->getName(),
......
......@@ -6,6 +6,7 @@
*/
use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\String;
use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Core\Render\Element;
......@@ -188,7 +189,7 @@ function theme_file_upload_help($variables) {
$descriptions[] = t('!size limit.', array('!size' => format_size($upload_validators['file_validate_size'][0])));
}
if (isset($upload_validators['file_validate_extensions'])) {
$descriptions[] = t('Allowed types: !extensions.', array('!extensions' => check_plain($upload_validators['file_validate_extensions'][0])));
$descriptions[] = t('Allowed types: !extensions.', array('!extensions' => String::checkPlain($upload_validators['file_validate_extensions'][0])));
}
if (isset($upload_validators['file_validate_image_resolution'])) {
......
......@@ -5,6 +5,7 @@
* Defines a "managed_file" Form API field and a "file" field for Field module.
*/
use Drupal\Component\Utility\String;
use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Core\Render\Element;
use Drupal\file\Entity\File;
......@@ -1048,15 +1049,15 @@ function file_tokens($type, $tokens, array $data = array(), array $options = arr
// Essential file data
case 'name':
$replacements[$original] = $sanitize ? check_plain($file->getFilename()) : $file->getFilename();
$replacements[$original] = $sanitize ? String::checkPlain($file->getFilename()) : $file->getFilename();
break;
case 'path':
$replacements[$original] = $sanitize ? check_plain($file->getFileUri()) : $file->getFileUri();
$replacements[$original] = $sanitize ? String::checkPlain($file->getFileUri()) : $file->getFileUri();
break;
case 'mime':
$replacements[$original] = $sanitize ? check_plain($file->getMimeType()) : $file->getMimeType();
$replacements[$original] = $sanitize ? String::checkPlain($file->getMimeType()) : $file->getMimeType();
break;
case 'size':
......@@ -1064,7 +1065,7 @@ function file_tokens($type, $tokens, array $data = array(), array $options = arr
break;
case 'url':
$replacements[$original] = $sanitize ? check_plain(file_create_url($file->getFileUri())) : file_create_url($file->getFileUri());
$replacements[$original] = $sanitize ? String::checkPlain(file_create_url($file->getFileUri())) : file_create_url($file->getFileUri());
break;
// These tokens are default variations on the chained tokens handled below.
......@@ -1078,7 +1079,7 @@ function file_tokens($type, $tokens, array $data = array(), array $options = arr
case 'owner':
$name = $file->getOwner()->label();
$replacements[$original] = $sanitize ? check_plain($name) : $name;
$replacements[$original] = $sanitize ? String::checkPlain($name) : $name;
break;
}
}
......@@ -1626,7 +1627,7 @@ function theme_file_link($variables) {
}
else {
$link_text = $variables['description'];
$options['attributes']['title'] = check_plain($file->getFilename());
$options['attributes']['title'] = String::checkPlain($file->getFilename());
}
$file_icon = array(
......@@ -1654,7 +1655,7 @@ function theme_file_icon($variables) {
$file = $variables['file'];
$icon_directory = $variables['icon_directory'];
$mime = check_plain($file->getMimeType());
$mime = String::checkPlain($file->getMimeType());
$icon_url = file_icon_url($file, $icon_directory);
return '<img class="file-icon" alt="" title="' . $mime . '" src="' . $icon_url . '" />';
}
......
......@@ -7,6 +7,7 @@
namespace Drupal\file\Plugin\Field\FieldWidget;
use Drupal\Component\Utility\String;
use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Core\Field\WidgetBase;
use Drupal\Core\Field\FieldItemListInterface;
......@@ -94,7 +95,7 @@ protected function formMultipleElements(FieldItemListInterface $items, array &$f
break;
}
$title = check_plain($this->fieldDefinition->getLabel());
$title = String::checkPlain($this->fieldDefinition->getLabel());
$description = field_filter_xss($this->fieldDefinition->getDescription());
$elements = array();
......
......@@ -7,6 +7,8 @@
namespace Drupal\file\Tests;
use Drupal\Component\Utility\String;
/**
* Tests the file token replacement in strings.
*/
......@@ -46,16 +48,16 @@ function testFileTokenReplacement() {
// Generate and test sanitized tokens.
$tests = array();
$tests['[file:fid]'] = $file->id();
$tests['[file:name]'] = check_plain($file->getFilename());
$tests['[file:path]'] = check_plain($file->getFileUri());
$tests['[file:mime]'] = check_plain($file->getMimeType());
$tests['[file:name]'] = String::checkPlain($file->getFilename());
$tests['[file:path]'] = String::checkPlain($file->getFileUri());
$tests['[file:mime]'] = String::checkPlain($file->getMimeType());
$tests['[file:size]'] = format_size($file->getSize());
$tests['[file:url]'] = check_plain(file_create_url($file->getFileUri()));
$tests['[file:url]'] = String::checkPlain(file_create_url($file->getFileUri()));
$tests['[file:created]'] = format_date($file->getCreatedTime(), 'medium', '', NULL, $language_interface->id);
$tests['[file:created:short]'] = format_date($file->getCreatedTime(), 'short', '', NULL, $language_interface->id);
$tests['[file:changed]'] = format_date($file->getChangedTime(), 'medium', '', NULL, $language_interface->id);
$tests['[file:changed:short]'] = format_date($file->getChangedTime(), 'short', '', NULL, $language_interface->id);
$tests['[file:owner]'] = check_plain(user_format_name($this->admin_user));
$tests['[file:owner]'] = String::checkPlain(user_format_name($this->admin_user));
$tests['[file:owner:uid]'] = $file->getOwnerId();
// Test to make sure that we generated something for each token.
......
......@@ -984,8 +984,8 @@ function _filter_url_parse_full_links($match) {
$i = 1;
$match[$i] = decode_entities($match[$i]);
$caption = check_plain(_filter_url_trim($match[$i]));
$match[$i] = check_plain($match[$i]);
$caption = String::checkPlain(_filter_url_trim($match[$i]));
$match[$i] = String::checkPlain($match[$i]);
return '<a href="' . $match[$i] . '">' . $caption . '</a>';
}
......@@ -999,8 +999,8 @@ function _filter_url_parse_email_links($match) {
$i = 0;
$match[$i] = decode_entities($match[$i]);
$caption = check_plain(_filter_url_trim($match[$i]));
$match[$i] = check_plain($match[$i]);
$caption = String::checkPlain(_filter_url_trim($match[$i]));
$match[$i] = String::checkPlain($match[$i]);
return '<a href="mailto:' . $match[$i] . '">' . $caption . '</a>';
}
......@@ -1014,8 +1014,8 @@ function _filter_url_parse_partial_links($match) {
$i = 1;
$match[$i] = decode_entities($match[$i]);
$caption = check_plain(_filter_url_trim($match[$i]));
$match[$i] = check_plain($match[$i]);
$caption = String::checkPlain(_filter_url_trim($match[$i]));
$match[$i] = String::checkPlain($match[$i]);
return '<a href="http://' . $match[$i] . '">' . $caption . '</a>';
}
......@@ -1147,7 +1147,7 @@ function _filter_autop($text) {
* Escapes all HTML tags, so they will be visible instead of being effective.
*/
function _filter_html_escape($text) {
return trim(check_plain($text));
return trim(String::checkPlain($text));
}
/**
......
......@@ -7,6 +7,7 @@
namespace Drupal\filter\Plugin\Filter;
use Drupal\Component\Utility\String;
use Drupal\filter\FilterProcessResult;
use Drupal\filter\Plugin\FilterBase;
......@@ -100,7 +101,7 @@ public function tips($long = FALSE) {
$output .= '<p>' . $this->t('This site allows HTML content. While learning all of HTML may feel intimidating, learning how to use a very small number of the most basic HTML "tags" is very easy. This table provides examples for each tag that is enabled on this site.') . '</p>';
$output .= '<p>' . $this->t('For more information see W3C\'s <a href="@html-specifications">HTML Specifications</a> or use your favorite search engine to find other sites that explain HTML.', array('@html-specifications' => 'http://www.w3.org/TR/html/')) . '</p>';
$tips = array(
'a' => array($this->t('Anchors are used to make links to other pages.'), '<a href="' . $base_url . '">' . check_plain(\Drupal::config('system.site')->get('name')) . '</a>'),
'a' => array($this->t('Anchors are used to make links to other pages.'), '<a href="' . $base_url . '">' . String::checkPlain(\Drupal::config('system.site')->get('name')) . '</a>'),
'br' => array($this->t('By default line break tags are automatically added, so use this tag to add additional ones. Use of this tag is different because it is not used with an open/close pair like all the others. Use the extra " /" inside the tag to maintain XHTML 1.0 compatibility'), $this->t('Text with <br />line break')),
'p' => array($this->t('By default paragraph tags are automatically added, so use this tag to add additional ones.'), '<p>' . $this->t('Paragraph one.') . '</p> <p>' . $this->t('Paragraph two.') . '</p>'),
'strong' => array($this->t('Strong', array(), array('context' => 'Font weight')), '<strong>' . $this->t('Strong', array(), array('context' => 'Font weight')) . '</strong>'),
......@@ -142,7 +143,7 @@ public function tips($long = FALSE) {
if (!empty($tips[$tag])) {
$rows[] = array(
array('data' => $tips[$tag][0], 'class' => array('description')),
array('data' => '<code>' . check_plain($tips[$tag][1]) . '</code>', 'class' => array('type')),
array('data' => '<code>' . String::checkPlain($tips[$tag][1]) . '</code>', 'class' => array('type')),
array('data' => $tips[$tag][1], 'class' => array('get'))
);
}
......@@ -173,7 +174,7 @@ public function tips($long = FALSE) {
foreach ($entities as $entity) {
$rows[] = array(
array('data' => $entity[0], 'class' => array('description')),
array('data' => '<code>' . check_plain($entity[1]) . '</code>', 'class' => array('type')),
array('data' => '<code>' . String::checkPlain($entity[1]) . '</code>', 'class' => array('type')),
array('data' => $entity[1], 'class' => array('get'))
);
}
......
......@@ -7,6 +7,7 @@
namespace Drupal\filter\Tests;
use Drupal\Component\Utility\String;
use Drupal\simpletest\WebTestBase;
/**
......@@ -304,7 +305,7 @@ function testFilterAdmin() {
$edit['body[0][format]'] = $plain;
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
$this->drupalGet('node/' . $node->id());
$this->assertText(check_plain($text), 'The "Plain text" text format escapes all HTML tags.');
$this->assertText(String::checkPlain($text), 'The "Plain text" text format escapes all HTML tags.');
\Drupal::config('filter.settings')
->set('always_show_fallback_choice', FALSE)
->save();
......
......@@ -8,6 +8,7 @@
namespace Drupal\filter\Tests;
use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\String;
use Drupal\simpletest\DrupalUnitTestBase;
use Drupal\filter\FilterBag;
......@@ -360,7 +361,7 @@ function testNoFollowFilter() {
/**
* Tests the HTML escaping filter.
*
* check_plain() is not tested here.
* \Drupal\Component\Utility\String::checkPlain() is not tested here.
*/
function testHtmlEscapeFilter() {
// Get FilterHtmlEscape object.
......@@ -726,10 +727,10 @@ function assertFilteredString($filter, $tests) {
)));
}
if (!$success) {
$this->verbose('Source:<pre>' . check_plain(var_export($source, TRUE)) . '</pre>'
. '<hr />' . 'Result:<pre>' . check_plain(var_export($result, TRUE)) . '</pre>'
$this->verbose('Source:<pre>' . String::checkPlain(var_export($source, TRUE)) . '</pre>'
. '<hr />' . 'Result:<pre>' . String::checkPlain(var_export($result, TRUE)) . '</pre>'
. '<hr />' . ($is_expected ? 'Expected:' : 'Not expected:')
. '<pre>' . check_plain(var_export($value, TRUE)) . '</pre>'
. '<pre>' . String::checkPlain(var_export($value, TRUE)) . '</pre>'
);
}
}
......
......@@ -5,6 +5,7 @@
* Builds placeholder replacement tokens for node-related data.
*/
use Drupal\Component\Utility\String;
use Drupal\Core\Language\LanguageInterface;
/**
......@@ -112,16 +113,16 @@ function node_tokens($type, $tokens, array $data = array(), array $options = arr
break;
case 'type':
$replacements[$original] = $sanitize ? check_plain($node->getType()) : $node->getType();
$replacements[$original] = $sanitize ? String::checkPlain($node->getType()) : $node->getType();
break;
case 'type-name':
$type_name = node_get_type_label($node);
$replacements[$original] = $sanitize ? check_plain($type_name) : $type_name;
$replacements[$original] = $sanitize ? String::checkPlain($type_name) : $type_name;
break;
case 'title':
$replacements[$original] = $sanitize ? check_plain($node->getTitle()) : $node->getTitle();
$replacements[$original] = $sanitize ? String::checkPlain($node->getTitle()) : $node->getTitle();
break;
case 'body':
......@@ -160,7 +161,7 @@ function node_tokens($type, $tokens, array $data = array(), array $options = arr
break;
case 'langcode':
$replacements[$original] = $sanitize ? check_plain($node->language()->id) : $node->language()->id;
$replacements[$original] = $sanitize ? String::checkPlain($node->language()->id) : $node->language()->id;
break;
case 'url':
......@@ -174,7 +175,7 @@ function node_tokens($type, $tokens, array $data = array(), array $options = arr
// Default values for the chained tokens handled below.
case 'author':
$account = $node->getOwner() ? $node->getOwner() : user_load(0);
$replacements[$original] = $sanitize ? check_plain($account->label()) : $account->label();
$replacements[$original] = $sanitize ? String::checkPlain($account->label()) : $account->label();
break;
case 'created':
......
......@@ -7,6 +7,7 @@
namespace Drupal\node\Plugin\Search;
use Drupal\Component\Utility\String;
use Drupal\Core\Config\Config;
use Drupal\Core\Database\Connection;
use Drupal\Core\Database\Query\SelectExtender;
......@@ -279,7 +280,7 @@ public function execute() {
);
$results[] = array(
'link' => $node->url('canonical', array('absolute' => TRUE, 'language' => $language)),
'type' => check_plain($this->entityManager->getStorage('node_type')->load($node->bundle())->label()),
'type' => String::checkPlain($this->entityManager->getStorage('node_type')->load($node->bundle())->label()),
'title' => $node->label(),
'user' => drupal_render($username),
'date' => $node->getChangedTime(),
......@@ -358,7 +359,7 @@ protected function indexNode(NodeInterface $node) {
unset($build['#theme']);
$node->rendered = drupal_render($build);
$text = '<h1>' . check_plain($node->label($language->id)) . '</h1>' . $node->rendered;
$text = '<h1>' . String::checkPlain($node->label($language->id)) . '</h1>' . $node->rendered;
// Fetch extra data normally not visible.
$extra = $this->moduleHandler->invokeAll('node_update_index', array($node, $language->id));
......@@ -430,7 +431,7 @@ public function searchFormAlter(array &$form, array &$form_state) {
);
// Add node types.
$types = array_map('check_plain', node_type_get_names());
$types = array_map(array('\Drupal\Component\Utility\String', 'checkPlain'), node_type_get_names());
$form['advanced']['types-fieldset'] = array(
'#type' => 'fieldset',
'#title' => t('Types'),
......
......@@ -7,6 +7,7 @@
namespace Drupal\node\Plugin\views\argument;
use Drupal\Component\Utility\String;
use Drupal\views\Plugin\views\argument\Numeric;
/**
......@@ -24,7 +25,7 @@ public function titleQuery() {
$nodes = node_load_multiple($this->value);
foreach ($nodes as $node) {
$titles[] = check_plain($node->label());
$titles[] = String::checkPlain($node->label());
}
return $titles;
}
......
......@@ -7,6 +7,7 @@
namespace Drupal\node\Plugin\views\argument;
use Drupal\Component\Utility\String as UtilityString;
use Drupal\views\Plugin\views\argument\String;
/**
......@@ -35,7 +36,7 @@ function title() {
function node_type($type_name) {
$type = entity_load('node_type', $type_name);
$output = $type ? $type->label() : t('Unknown content type');
return check_plain($output);
return UtilityString::checkPlain($output);
}
}
......@@ -7,6 +7,7 @@
namespace Drupal\node\Plugin\views\argument;
use Drupal\Component\Utility\String;
use Drupal\Core\Database\Connection;
use Drupal\views\Plugin\views\argument\Numeric;
use Symfony\Component\DependencyInjection\ContainerInterface;
......@@ -66,7 +67,7 @@ public function titleQuery() {