' . 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.') . '
'; $output .= '' . t('For more information see W3C\'s HTML Specifications or use your favorite search engine to find other sites that explain HTML.', array('@html-specifications' => 'http://www.w3.org/TR/html/')) . '
'; $tips = array( - 'a' => array(t('Anchors are used to make links to other pages.'), '' . check_plain(\Drupal::config('system.site')->get('name')) . ''), + 'a' => array(t('Anchors are used to make links to other pages.'), '' . String::checkPlain(\Drupal::config('system.site')->get('name')) . ''), 'br' => array(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'), t('Text with' . t('Paragraph one.') . '
' . t('Paragraph two.') . '
'), 'strong' => array(t('Strong', array(), array('context' => 'Font weight')), '' . t('Strong', array(), array('context' => 'Font weight')) . ''), @@ -141,7 +142,7 @@ public function tips($long = FALSE) { if (!empty($tips[$tag])) { $rows[] = array( array('data' => $tips[$tag][0], 'class' => array('description')), - array('data' => '' . check_plain($tips[$tag][1]) . '', 'class' => array('type')),
+ array('data' => '' . String::checkPlain($tips[$tag][1]) . '', 'class' => array('type')),
array('data' => $tips[$tag][1], 'class' => array('get'))
);
}
@@ -172,7 +173,7 @@ public function tips($long = FALSE) {
foreach ($entities as $entity) {
$rows[] = array(
array('data' => $entity[0], 'class' => array('description')),
- array('data' => '' . check_plain($entity[1]) . '', 'class' => array('type')),
+ array('data' => '' . String::checkPlain($entity[1]) . '', 'class' => array('type')),
array('data' => $entity[1], 'class' => array('get'))
);
}
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php
index e10c5ca..8d13d86 100644
--- a/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php
+++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php
@@ -7,6 +7,7 @@
namespace Drupal\filter\Tests;
+use Drupal\Component\Utility\String;
use Drupal\simpletest\WebTestBase;
/**
@@ -254,7 +255,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();
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterUnitTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterUnitTest.php
index a51d6b9..ee92929 100644
--- a/core/modules/filter/lib/Drupal/filter/Tests/FilterUnitTest.php
+++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterUnitTest.php
@@ -8,8 +8,9 @@
namespace Drupal\filter\Tests;
use Drupal\Component\Utility\Html;
-use Drupal\simpletest\DrupalUnitTestBase;
+use Drupal\Component\Utility\String;
use Drupal\filter\FilterBag;
+use Drupal\simpletest\DrupalUnitTestBase;
/**
* Unit tests for core filters.
@@ -692,10 +693,10 @@ function assertFilteredString($filter, $tests) {
)));
}
if (!$success) {
- $this->verbose('Source:' . check_plain(var_export($source, TRUE)) . '' - . '
' . check_plain(var_export($result, TRUE)) . '' + $this->verbose('Source:
' . String::checkPlain(var_export($source, TRUE)) . '' + . '
' . String::checkPlain(var_export($result, TRUE)) . '' . '
' . check_plain(var_export($value, TRUE)) . '' + . '
' . String::checkPlain(var_export($value, TRUE)) . '' ); } } diff --git a/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php b/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php index 1e9e7ff..aa99f62 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php +++ b/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php @@ -7,16 +7,17 @@ namespace Drupal\node\Plugin\Search; +use Drupal\Component\Utility\String; +use Drupal\Core\Access\AccessibleInterface; use Drupal\Core\Config\Config; use Drupal\Core\Database\Connection; +use Drupal\Core\Database\Query\Condition; use Drupal\Core\Database\Query\SelectExtender; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\KeyValueStore\StateInterface; use Drupal\Core\Language\Language; use Drupal\Core\Session\AccountInterface; -use Drupal\Core\Access\AccessibleInterface; -use Drupal\Core\Database\Query\Condition; use Drupal\node\NodeInterface; use Drupal\search\Plugin\ConfigurableSearchPluginBase; use Drupal\search\Plugin\SearchIndexingInterface; @@ -254,7 +255,7 @@ public function execute() { ); $results[] = array( 'link' => $node->url('canonical', array('absolute' => TRUE, 'language' => $language)), - 'type' => check_plain($this->entityManager->getStorageController('node_type')->load($node->bundle())->label()), + 'type' => String::checkPlain($this->entityManager->getStorageController('node_type')->load($node->bundle())->label()), 'title' => $node->label(), 'user' => drupal_render($username), 'date' => $node->getChangedTime(), @@ -339,7 +340,7 @@ protected function indexNode(NodeInterface $node) { unset($build['#theme']); $node->rendered = drupal_render($build); - $text = '
';
- $build['#markup'] = check_plain($build['#markup']);
+ $build['#markup'] = String::checkPlain($build['#markup']);
$build['#suffix'] = '';
}
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php b/core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php
index 5903780..646f2ac 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php
@@ -7,6 +7,7 @@
namespace Drupal\rest\Tests\Views;
+use Drupal\Component\Utility\String;
use Drupal\views\Tests\Plugin\PluginTestBase;
use Drupal\views\Tests\ViewTestData;
@@ -279,7 +280,7 @@ public function testPreview() {
$entities[] = $row->_entity;
}
- $expected = check_plain($serializer->serialize($entities, 'json'));
+ $expected = String::checkPlain($serializer->serialize($entities, 'json'));
$view->display_handler->setContentType('json');
$view->live_preview = TRUE;
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchCommentTest.php b/core/modules/search/lib/Drupal/search/Tests/SearchCommentTest.php
index e3977cb..702577b 100644
--- a/core/modules/search/lib/Drupal/search/Tests/SearchCommentTest.php
+++ b/core/modules/search/lib/Drupal/search/Tests/SearchCommentTest.php
@@ -7,6 +7,7 @@
namespace Drupal\search\Tests;
+use Drupal\Component\Utility\String;
use Drupal\field\Field;
/**
@@ -110,7 +111,7 @@ function testSearchResultsComment() {
// Verify that comment is rendered using proper format.
$this->assertText($comment_body, 'Comment body text found in search results.');
$this->assertNoRaw(t('n/a'), 'HTML in comment body is not hidden.');
- $this->assertNoRaw(check_plain($edit_comment['comment_body[0][value]']), 'HTML in comment body is not escaped.');
+ $this->assertNoRaw(String::checkPlain($edit_comment['comment_body[0][value]']), 'HTML in comment body is not escaped.');
// Hide comments.
$this->drupalLogin($this->admin_user);
diff --git a/core/modules/search/search.module b/core/modules/search/search.module
index 600dc83..bb154b2 100644
--- a/core/modules/search/search.module
+++ b/core/modules/search/search.module
@@ -5,6 +5,7 @@
* Enables site-wide keyword searching.
*/
+use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Unicode;
/**
@@ -719,7 +720,7 @@ function search_excerpt($keys, $text, $langcode = NULL) {
// We didn't find any keyword matches, so just return the first part of the
// text. We also need to re-encode any HTML special characters that we
// entity-decoded above.
- return check_plain(truncate_utf8($text, 256, TRUE, TRUE));
+ return String::checkPlain(truncate_utf8($text, 256, TRUE, TRUE));
}
// Sort the text ranges by starting position.
@@ -760,7 +761,7 @@ function search_excerpt($keys, $text, $langcode = NULL) {
// translated. Let translators have the ... separator text as one chunk.
$dots = explode('!excerpt', t('... !excerpt ... !excerpt ...'));
$text = (isset($new_ranges[0]) ? '' : $dots[0]) . implode($dots[1], $out) . (($max_end < strlen($text) - 1) ? $dots[2] : '');
- $text = check_plain($text);
+ $text = String::checkPlain($text);
// Highlight keywords. Must be done at once to prevent conflicts ('strong'
// and '').
diff --git a/core/modules/search/search.pages.inc b/core/modules/search/search.pages.inc
index ec71855..9fe5efb 100644
--- a/core/modules/search/search.pages.inc
+++ b/core/modules/search/search.pages.inc
@@ -5,6 +5,7 @@
* User page callbacks for the Search module.
*/
+use Drupal\Component\Utility\String;
use Drupal\Core\Language\Language;
/**
@@ -35,7 +36,7 @@ function template_preprocess_search_result(&$variables) {
$result = $variables['result'];
$variables['url'] = check_url($result['link']);
- $variables['title'] = check_plain($result['title']);
+ $variables['title'] = String::checkPlain($result['title']);
if (isset($result['language']) && $result['language'] != $language_interface->id && $result['language'] != Language::LANGCODE_NOT_SPECIFIED) {
$variables['title_attributes']['lang'] = $result['language'];
$variables['content_attributes']['lang'] = $result['language'];
@@ -43,7 +44,7 @@ function template_preprocess_search_result(&$variables) {
$info = array();
if (!empty($result['plugin_id'])) {
- $info['plugin_id'] = check_plain($result['plugin_id']);
+ $info['plugin_id'] = String::checkPlain($result['plugin_id']);
}
if (!empty($result['user'])) {
$info['user'] = $result['user'];
diff --git a/core/modules/shortcut/shortcut.admin.inc b/core/modules/shortcut/shortcut.admin.inc
index 8e8b721..74d8486 100644
--- a/core/modules/shortcut/shortcut.admin.inc
+++ b/core/modules/shortcut/shortcut.admin.inc
@@ -5,6 +5,8 @@
* Administrative page callbacks for the shortcut module.
*/
+use Drupal\Component\Utility\String;
+
/**
* Form callback: builds the form for switching shortcut sets.
*
@@ -39,7 +41,7 @@ function shortcut_set_switch($form, &$form_state, $account = NULL) {
$options = array();
foreach ($sets as $name => $set) {
- $options[$name] = check_plain($set->label());
+ $options[$name] = String::checkPlain($set->label());
}
// Only administrators can add shortcut sets.
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
index ccefb31..e899a92 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
@@ -9,15 +9,16 @@
use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\NestedArray;
+use Drupal\Component\Utility\String as StringUtil;
use Drupal\Component\Utility\String;
-use Drupal\Core\DrupalKernel;
-use Drupal\Core\Database\Database;
use Drupal\Core\Database\ConnectionNotDefinedException;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Datetime\DrupalDateTime;
+use Drupal\Core\DrupalKernel;
use Drupal\Core\Language\Language;
use Drupal\Core\Session\AccountInterface;
use Drupal\Core\Session\UserSession;
use Drupal\Core\StreamWrapper\PublicStream;
-use Drupal\Core\Datetime\DrupalDateTime;
use Drupal\block\Entity\Block;
use Symfony\Component\HttpFoundation\Request;
@@ -1402,7 +1403,7 @@ protected function drupalGet($path, array $options = array(), array $headers = a
$verbose = 'GET request to: ' . $path .
'' . check_plain(var_export(array_map('trim', $this->headers), TRUE)) . '';
+ $verbose .= '' . StringUtil::checkPlain(var_export(array_map('trim', $this->headers), TRUE)) . '';
}
$verbose .= '' . check_plain(var_export(array_map('trim', $this->headers), TRUE)) . '';
+ $verbose .= '' . StringUtil::checkPlain(var_export(array_map('trim', $this->headers), TRUE)) . '';
}
$verbose .= '' . check_plain(var_export(array_map('trim', $this->headers), TRUE)) . '');
+ '' . StringUtil::checkPlain(var_export(array_map('trim', $this->headers), TRUE)) . '');
}
return $out;
@@ -2995,9 +2996,9 @@ protected function assertNoTitle($title, $message = '', $group = 'Other') {
*/
protected function assertThemeOutput($callback, array $variables = array(), $expected, $message = '', $group = 'Other') {
$output = _theme($callback, $variables);
- $this->verbose('Variables:' . '' . check_plain(var_export($variables, TRUE)) . '' - . '
' . check_plain(var_export($output, TRUE)) . '' - . '
' . check_plain(var_export($expected, TRUE)) . '' + $this->verbose('Variables:' . '
' . StringUtil::checkPlain(var_export($variables, TRUE)) . '' + . '
' . StringUtil::checkPlain(var_export($output, TRUE)) . '' + . '
' . StringUtil::checkPlain(var_export($expected, TRUE)) . '' . '
./' . check_plain($site_directory) . '',
+ '!sites-simpletest' => './' . String::checkPlain($site_directory) . '',
)),
);
}
@@ -75,7 +77,7 @@ function simpletest_requirements($phase) {
'value' => t('Not protected'),
'severity' => REQUIREMENT_ERROR,
'description' => t('The file !file does not exist and could not be created automatically, which poses a security risk. Ensure that the directory is writable.', array(
- '!file' => './' . check_plain($site_directory) . '/.htaccess',
+ '!file' => './' . String::checkPlain($site_directory) . '/.htaccess',
)),
);
}
diff --git a/core/modules/system/form.api.php b/core/modules/system/form.api.php
index 5ae2d69..33d2b11 100644
--- a/core/modules/system/form.api.php
+++ b/core/modules/system/form.api.php
@@ -5,6 +5,8 @@
* Calbacks provided by the form system.
*/
+use Drupal\Component\Utility\String;
+
/**
* @addtogroup callbacks
* @{
@@ -74,7 +76,7 @@ function callback_batch_operation($MULTIPLE_PARAMS, &$context) {
node_save($node);
// Store some result for post-processing in the finished callback.
- $context['results'][] = check_plain($node->title);
+ $context['results'][] = String::checkPlain($node->title);
// Update our progress information.
$context['sandbox']['progress']++;
diff --git a/core/modules/system/lib/Drupal/system/Form/FileSystemForm.php b/core/modules/system/lib/Drupal/system/Form/FileSystemForm.php
index 2d51684..56e779d 100644
--- a/core/modules/system/lib/Drupal/system/Form/FileSystemForm.php
+++ b/core/modules/system/lib/Drupal/system/Form/FileSystemForm.php
@@ -7,8 +7,9 @@
namespace Drupal\system\Form;
-use Drupal\Core\StreamWrapper\PublicStream;
+use Drupal\Component\Utility\String;
use Drupal\Core\Form\ConfigFormBase;
+use Drupal\Core\StreamWrapper\PublicStream;
/**
* Configure file system settings for this site.
@@ -55,7 +56,7 @@ public function buildForm(array $form, array &$form_state) {
// Any visible, writeable wrapper can potentially be used for the files
// directory, including a remote file system that integrates with a CDN.
foreach (file_get_stream_wrappers(STREAM_WRAPPERS_WRITE_VISIBLE) as $scheme => $info) {
- $options[$scheme] = check_plain($info['description']);
+ $options[$scheme] = String::checkPlain($info['description']);
}
if (!empty($options)) {
diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php b/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php
index a090c67..5a88e31 100644
--- a/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php
+++ b/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php
@@ -7,12 +7,13 @@
namespace Drupal\system\Form;
+use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Access\AccessManager;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Form\FormBase;
use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Access\AccessManager;
/**
* Provides module installation interface.
@@ -77,7 +78,7 @@ public function getFormId() {
*/
public function buildForm(array $form, array &$form_state) {
require_once DRUPAL_ROOT . '/core/includes/install.inc';
- $distribution = check_plain(drupal_install_profile_distribution_name());
+ $distribution = String::checkPlain(drupal_install_profile_distribution_name());
// Include system.admin.inc so we can use the sort callbacks.
$this->moduleHandler->loadInclude('system', 'inc', 'system.admin');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsTest.php
index 5c016ce..536868f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Common;
+use Drupal\Component\Utility\String;
use Drupal\Core\Language\Language;
use Drupal\simpletest\DrupalUnitTestBase;
@@ -79,7 +80,7 @@ function testRenderFile() {
$this->assertTrue(strpos($styles, $css) > 0, 'Rendered CSS includes the added stylesheet.');
// Verify that newlines are properly added inside style tags.
$query_string = $this->container->get('state')->get('system.css_js_query_string') ?: '0';
- $css_processed = '';
+ $css_processed = '';
$this->assertEqual(trim($styles), $css_processed, 'Rendered CSS includes newlines inside style tags for JavaScript use.');
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/RenderWebTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/RenderWebTest.php
index c42997d..3b7b857 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/RenderWebTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/RenderWebTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Common;
+use Drupal\Component\Utility\String;
use Drupal\simpletest\WebTestBase;
/**
@@ -151,8 +152,8 @@ function testDrupalRenderFormElements() {
protected function assertRenderedElement(array $element, $xpath, array $xpath_args = array()) {
$original_element = $element;
$this->drupalSetContent(drupal_render($element));
- $this->verbose('' . check_plain(var_export($original_element, TRUE)) . '' - . '
' . check_plain(var_export($element, TRUE)) . '' + $this->verbose('
' . String::checkPlain(var_export($original_element, TRUE)) . '' + . '
' . String::checkPlain(var_export($element, TRUE)) . '' . '
!ts', array('!ts' => check_plain(var_export($ts, TRUE))))); + $this->verbose(strtr('$ts:
!ts', array('!ts' => String::checkPlain(var_export($ts, TRUE))))); $this->assertEqual($ts, $expected_ts, 'Simple table headers sorted correctly.'); // Test with simple table headers plus $_GET parameters that should _not_ @@ -56,7 +57,7 @@ function testTableSortInit() { )); \Drupal::getContainer()->set('request', $request); $ts = tablesort_init($headers); - $this->verbose(strtr('$ts:
!ts', array('!ts' => check_plain(var_export($ts, TRUE))))); + $this->verbose(strtr('$ts:
!ts', array('!ts' => String::checkPlain(var_export($ts, TRUE))))); $this->assertEqual($ts, $expected_ts, 'Simple table headers plus non-overriding $_GET parameters sorted correctly.'); // Test with simple table headers plus $_GET parameters that _should_ @@ -72,7 +73,7 @@ function testTableSortInit() { $expected_ts['sort'] = 'desc'; $expected_ts['query'] = array('alpha' => 'beta'); $ts = tablesort_init($headers); - $this->verbose(strtr('$ts:
!ts', array('!ts' => check_plain(var_export($ts, TRUE))))); + $this->verbose(strtr('$ts:
!ts', array('!ts' => String::checkPlain(var_export($ts, TRUE))))); $this->assertEqual($ts, $expected_ts, 'Simple table headers plus $_GET parameters sorted correctly.'); // Test complex table headers. @@ -104,7 +105,7 @@ function testTableSortInit() { 'sort' => 'desc', 'query' => array(), ); - $this->verbose(strtr('$ts:
!ts', array('!ts' => check_plain(var_export($ts, TRUE))))); + $this->verbose(strtr('$ts:
!ts', array('!ts' => String::checkPlain(var_export($ts, TRUE))))); $this->assertEqual($ts, $expected_ts, 'Complex table headers sorted correctly.'); // Test complex table headers plus $_GET parameters that should _not_ @@ -123,7 +124,7 @@ function testTableSortInit() { 'sort' => 'asc', 'query' => array(), ); - $this->verbose(strtr('$ts:
!ts', array('!ts' => check_plain(var_export($ts, TRUE))))); + $this->verbose(strtr('$ts:
!ts', array('!ts' => String::checkPlain(var_export($ts, TRUE))))); $this->assertEqual($ts, $expected_ts, 'Complex table headers plus non-overriding $_GET parameters sorted correctly.'); // Test complex table headers plus $_GET parameters that _should_ @@ -144,7 +145,7 @@ function testTableSortInit() { 'query' => array('alpha' => 'beta'), ); $ts = tablesort_init($headers); - $this->verbose(strtr('$ts:
!ts', array('!ts' => check_plain(var_export($ts, TRUE))))); + $this->verbose(strtr('$ts:
!ts', array('!ts' => String::checkPlain(var_export($ts, TRUE))))); $this->assertEqual($ts, $expected_ts, 'Complex table headers plus $_GET parameters sorted correctly.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php index c261031..53f5cec 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php @@ -8,6 +8,7 @@ namespace Drupal\system\Tests\Form; use Drupal\Component\Utility\String; +use Drupal\Component\Utility\String as StringUtil; use Drupal\simpletest\WebTestBase; class FormTest extends WebTestBase { @@ -606,7 +607,7 @@ function testDisabledMarkup() { $path = strtr($path, array('!type' => $type)); // Verify that the element exists. $element = $this->xpath($path, array( - ':name' => check_plain($name), + ':name' => StringUtil::checkPlain($name), ':div-class' => $class, ':value' => isset($item['#value']) ? $item['#value'] : '', )); diff --git a/core/modules/system/lib/Drupal/system/Tests/Mail/HtmlToTextTest.php b/core/modules/system/lib/Drupal/system/Tests/Mail/HtmlToTextTest.php index 751bf0c..cf4524c 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Mail/HtmlToTextTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Mail/HtmlToTextTest.php @@ -7,6 +7,7 @@ namespace Drupal\system\Tests\Mail; +use Drupal\Component\Utility\String; use Drupal\simpletest\WebTestBase; /** @@ -36,7 +37,7 @@ protected function stringToHtml($text) { str_replace( array("\n", ' '), array('\n', ' '), - check_plain($text) + String::checkPlain($text) ) . '"'; } @@ -58,7 +59,7 @@ protected function assertHtmlToText($html, $text, $message, $allowed_tags = NULL $tested_tags = implode(', ', array_unique($matches[1])); $message .= ' (' . $tested_tags . ')'; $result = drupal_html_to_text($html, $allowed_tags); - $pass = $this->assertEqual($result, $text, check_plain($message)); + $pass = $this->assertEqual($result, $text, String::checkPlain($message)); $verbose = 'html =
' . $this->stringToHtml($html)
. '' . $this->stringToHtml($result)
. '' . $this->stringToHtml($text)
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php
index d7e51c4..6df5800 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Menu;
+use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Unicode;
/**
@@ -271,7 +272,7 @@ function testBreadCrumbs() {
$link['link_path'] => $link['link_title'],
);
$this->assertBreadcrumb($link['link_path'], $trail, $term->label(), $tree);
- $this->assertRaw(check_plain($parent->getTitle()), 'Tagged node found.');
+ $this->assertRaw(String::checkPlain($parent->getTitle()), 'Tagged node found.');
// Additionally make sure that this link appears only once; i.e., the
// untranslated menu links automatically generated from menu router items
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php
index 4dd3e1a..490b7d4 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Menu;
+use Drupal\Component\Utility\String;
use Drupal\simpletest\WebTestBase;
/**
@@ -120,7 +121,7 @@ protected function doTestDescriptionMenuItems() {
// Verify that the menu router item title is output as page title.
$this->drupalGet('menu_callback_description');
$this->assertText(t('Menu item description text'));
- $this->assertRaw(check_plain('Menu item description arguments'));
+ $this->assertRaw(String::checkPlain('Menu item description arguments'));
}
/**
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Menu/MenuTestBase.php
index d205b13..fc896d8 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Menu/MenuTestBase.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Menu;
+use Drupal\Component\Utility\String;
use Drupal\simpletest\WebTestBase;
abstract class MenuTestBase extends WebTestBase {
@@ -65,7 +66,7 @@ protected function assertBreadcrumbParts($trail) {
foreach ($trail as $path => $title) {
$url = url($path);
$part = array_shift($parts);
- $pass = ($pass && $part['href'] === $url && $part['text'] === check_plain($title));
+ $pass = ($pass && $part['href'] === $url && $part['text'] === String::checkPlain($title));
}
}
// No parts must be left, or an expected "Home" will always pass.
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/PageTitleTest.php b/core/modules/system/lib/Drupal/system/Tests/System/PageTitleTest.php
index 33f2f47..f3e3e5e 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/PageTitleTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/PageTitleTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\System;
+use Drupal\Component\Utility\String;
use Drupal\Core\Utility\Title;
use Drupal\simpletest\WebTestBase;
@@ -80,7 +81,7 @@ function testTitleTags() {
$node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
$this->assertNotNull($node, 'Node created and found in database');
$this->drupalGet("node/" . $node->id());
- $this->assertText(check_plain($edit['title[0][value]']), 'Check to make sure tags in the node title are converted.');
+ $this->assertText(String::checkPlain($edit['title[0][value]']), 'Check to make sure tags in the node title are converted.');
}
/**
* Test if the title of the site is XSS proof.
@@ -88,7 +89,7 @@ function testTitleTags() {
function testTitleXSS() {
// Set some title with JavaScript and HTML chars to escape.
$title = ' & < > " \' ';
- $title_filtered = check_plain($title);
+ $title_filtered = String::checkPlain($title);
$slogan = '';
$slogan_filtered = filter_xss_admin($slogan);
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php
index 586e1eb..d01f68e 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Theme;
+use Drupal\Component\Utility\String;
use Drupal\Core\Session\UserSession;
use Drupal\simpletest\WebTestBase;
use Symfony\Cmf\Component\Routing\RouteObjectInterface;
@@ -198,10 +199,10 @@ function testLinks() {
$expected_links = '';
$expected_links .= '' . filter_xss_admin($this->token->replace($this->getBody())) . '
'; return array('#markup' => $output); } diff --git a/core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Plugin/tour/tip/TipPluginImage.php b/core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Plugin/tour/tip/TipPluginImage.php index 79ed03c..89f051a 100644 --- a/core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Plugin/tour/tip/TipPluginImage.php +++ b/core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Plugin/tour/tip/TipPluginImage.php @@ -7,6 +7,7 @@ namespace Drupal\tour_test\Plugin\tour\tip; +use Drupal\Component\Utility\String; use Drupal\tour\TipPluginBase; /** @@ -44,7 +45,7 @@ public function getOutput() { '#uri' => $this->get('url'), '#alt' => $this->get('alt'), ); - $output = '' . drupal_render($image) . '
'; return array('#markup' => $output); } diff --git a/core/modules/tracker/tracker.pages.inc b/core/modules/tracker/tracker.pages.inc index e94c163..6c794d0 100644 --- a/core/modules/tracker/tracker.pages.inc +++ b/core/modules/tracker/tracker.pages.inc @@ -5,6 +5,8 @@ * User page callbacks for tracker.module. */ +use Drupal\Component\Utility\String; + /** * Page callback: Generates a page of tracked nodes for the site. @@ -86,7 +88,7 @@ function tracker_page($account = NULL) { ); $row = array( - 'type' => check_plain(node_get_type_label($node)), + 'type' => String::checkPlain(node_get_type_label($node)), 'title' => array('data' => l($node->getTitle(), 'node/' . $node->id()) . ' ' . drupal_render($mark_build)), 'author' => array('data' => array('#theme' => 'username', '#account' => $node->getOwner())), 'replies' => array('class' => array('replies'), 'data' => $comments), diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc index b0d0483..44c4684 100644 --- a/core/modules/update/update.manager.inc +++ b/core/modules/update/update.manager.inc @@ -36,8 +36,9 @@ * root. */ -use Drupal\Core\Updater\Updater; +use Drupal\Component\Utility\String; use Drupal\Core\FileTransfer\Local; +use Drupal\Core\Updater\Updater; use Symfony\Component\HttpFoundation\RedirectResponse; /** @@ -108,14 +109,14 @@ function update_manager_update_form($form, $form_state = array(), $context) { $project_name = l($project['title'], $project['link']); } else { - $project_name = check_plain($project['title']); + $project_name = String::checkPlain($project['title']); } } elseif (!empty($project['info']['name'])) { - $project_name = check_plain($project['info']['name']); + $project_name = String::checkPlain($project['info']['name']); } else { - $project_name = check_plain($name); + $project_name = String::checkPlain($name); } if ($project['project_type'] == 'theme' || $project['project_type'] == 'theme-disabled') { $project_name .= ' ' . t('(Theme)'); diff --git a/core/modules/update/update.report.inc b/core/modules/update/update.report.inc index 51da7dd..579f461 100644 --- a/core/modules/update/update.report.inc +++ b/core/modules/update/update.report.inc @@ -5,6 +5,8 @@ * Code required only when rendering the available updates report. */ +use Drupal\Component\Utility\String; + /** * Returns HTML for the project status report. * @@ -83,7 +85,7 @@ function theme_update_report($variables) { $row = '