' . $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.') . '
';
$output .= '' . $this->t('Paragraph one.') . '
' . $this->t('Paragraph two.') . '
'),
'strong' => array($this->t('Strong', array(), array('context' => 'Font weight')), '' . Xss::filter($revision->revision_log->value) . '
' : ''),
'class' => array('revision-current'));
- $row[] = array('data' => String::placeholder($this->t('current revision')), 'class' => array('revision-current'));
+ $row[] = array('data' => StringHelper::placeholder($this->t('current revision')), 'class' => array('revision-current'));
}
else {
$username = array(
diff --git a/core/modules/node/src/Controller/NodePreviewController.php b/core/modules/node/src/Controller/NodePreviewController.php
index 2134abe..341fe9d 100644
--- a/core/modules/node/src/Controller/NodePreviewController.php
+++ b/core/modules/node/src/Controller/NodePreviewController.php
@@ -7,7 +7,7 @@
namespace Drupal\node\Controller;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\Controller\EntityViewController;
@@ -64,7 +64,7 @@ public function view(EntityInterface $node_preview, $view_mode_id = 'full', $lan
* The page title.
*/
public function title(EntityInterface $node_preview) {
- return String::checkPlain($this->entityManager->getTranslationFromContext($node_preview)->label());
+ return StringHelper::checkPlain($this->entityManager->getTranslationFromContext($node_preview)->label());
}
}
diff --git a/core/modules/node/src/Controller/NodeViewController.php b/core/modules/node/src/Controller/NodeViewController.php
index 2e68391..f9ad998 100644
--- a/core/modules/node/src/Controller/NodeViewController.php
+++ b/core/modules/node/src/Controller/NodeViewController.php
@@ -7,7 +7,7 @@
namespace Drupal\node\Controller;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\Controller\EntityViewController;
@@ -60,7 +60,7 @@ public function view(EntityInterface $node, $view_mode = 'full', $langcode = NUL
* The page title.
*/
public function title(EntityInterface $node) {
- return String::checkPlain($this->entityManager->getTranslationFromContext($node)->label());
+ return StringHelper::checkPlain($this->entityManager->getTranslationFromContext($node)->label());
}
}
diff --git a/core/modules/node/src/Form/DeleteMultiple.php b/core/modules/node/src/Form/DeleteMultiple.php
index abe8db1..a6dac64 100644
--- a/core/modules/node/src/Form/DeleteMultiple.php
+++ b/core/modules/node/src/Form/DeleteMultiple.php
@@ -10,7 +10,7 @@
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\Core\Url;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormStateInterface;
use Drupal\user\PrivateTempStoreFactory;
use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -105,7 +105,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$form['nodes'] = array(
'#theme' => 'item_list',
'#items' => array_map(function ($node) {
- return String::checkPlain($node->label());
+ return StringHelper::checkPlain($node->label());
}, $this->nodes),
);
$form = parent::buildForm($form, $form_state);
diff --git a/core/modules/node/src/NodeListBuilder.php b/core/modules/node/src/NodeListBuilder.php
index f2011c0..7fb3e69 100644
--- a/core/modules/node/src/NodeListBuilder.php
+++ b/core/modules/node/src/NodeListBuilder.php
@@ -7,7 +7,7 @@
namespace Drupal\node;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Datetime\DateFormatter;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityListBuilder;
@@ -107,7 +107,7 @@ public function buildRow(EntityInterface $entity) {
'#suffix' => ' ' . drupal_render($mark),
'#url' => $uri,
);
- $row['type'] = String::checkPlain(node_get_type_label($entity));
+ $row['type'] = StringHelper::checkPlain(node_get_type_label($entity));
$row['author']['data'] = array(
'#theme' => 'username',
'#account' => $entity->getOwner(),
diff --git a/core/modules/node/src/NodeTypeForm.php b/core/modules/node/src/NodeTypeForm.php
index b5c4674..9125201 100644
--- a/core/modules/node/src/NodeTypeForm.php
+++ b/core/modules/node/src/NodeTypeForm.php
@@ -9,7 +9,7 @@
use Drupal\Core\Entity\EntityForm;
use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
@@ -55,7 +55,7 @@ public function form(array $form, FormStateInterface $form_state) {
$type = $this->entity;
if ($this->operation == 'add') {
- $form['#title'] = String::checkPlain($this->t('Add content type'));
+ $form['#title'] = StringHelper::checkPlain($this->t('Add content type'));
$fields = $this->entityManager->getBaseFieldDefinitions('node');
// Create a node with a fake bundle using the type's UUID so that we can
// get the default values for workflow settings.
diff --git a/core/modules/node/src/NodeTypeListBuilder.php b/core/modules/node/src/NodeTypeListBuilder.php
index 494e217..80d6058 100644
--- a/core/modules/node/src/NodeTypeListBuilder.php
+++ b/core/modules/node/src/NodeTypeListBuilder.php
@@ -14,7 +14,7 @@
use Drupal\Core\Routing\UrlGeneratorInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Component\Utility\Xss;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Defines a class to build a listing of node type entities.
diff --git a/core/modules/node/src/Plugin/Search/NodeSearch.php b/core/modules/node/src/Plugin/Search/NodeSearch.php
index 83140c1..f22fe6b 100644
--- a/core/modules/node/src/Plugin/Search/NodeSearch.php
+++ b/core/modules/node/src/Plugin/Search/NodeSearch.php
@@ -8,7 +8,7 @@
namespace Drupal\node\Plugin\Search;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Access\AccessResult;
use Drupal\Core\Config\Config;
use Drupal\Core\Database\Connection;
@@ -321,7 +321,7 @@ protected function prepareResults(StatementInterface $found) {
);
$results[] = array(
'link' => $node->url('canonical', array('absolute' => TRUE, 'language' => $language)),
- 'type' => String::checkPlain($this->entityManager->getStorage('node_type')->load($node->bundle())->label()),
+ 'type' => StringHelper::checkPlain($this->entityManager->getStorage('node_type')->load($node->bundle())->label()),
'title' => $node->label(),
'user' => drupal_render($username),
'date' => $node->getChangedTime(),
@@ -396,7 +396,7 @@ protected function indexNode(NodeInterface $node) {
unset($build['#theme']);
$node->rendered = drupal_render($build);
- $text = '').
diff --git a/core/modules/search/search.pages.inc b/core/modules/search/search.pages.inc
index ae427da..22a4933 100644
--- a/core/modules/search/search.pages.inc
+++ b/core/modules/search/search.pages.inc
@@ -5,7 +5,7 @@
* User page callbacks for the Search module.
*/
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Language\LanguageInterface;
/**
@@ -36,7 +36,7 @@ function template_preprocess_search_result(&$variables) {
$result = $variables['result'];
$variables['url'] = check_url($result['link']);
- $variables['title'] = String::checkPlain($result['title']);
+ $variables['title'] = StringHelper::checkPlain($result['title']);
if (isset($result['language']) && $result['language'] != $language_interface->getId() && $result['language'] != LanguageInterface::LANGCODE_NOT_SPECIFIED) {
$variables['title_attributes']['lang'] = $result['language'];
$variables['content_attributes']['lang'] = $result['language'];
@@ -44,7 +44,7 @@ function template_preprocess_search_result(&$variables) {
$info = array();
if (!empty($result['plugin_id'])) {
- $info['plugin_id'] = String::checkPlain($result['plugin_id']);
+ $info['plugin_id'] = StringHelper::checkPlain($result['plugin_id']);
}
if (!empty($result['user'])) {
$info['user'] = $result['user'];
diff --git a/core/modules/search/src/Tests/SearchCommentTest.php b/core/modules/search/src/Tests/SearchCommentTest.php
index 69c8abe..413f035 100644
--- a/core/modules/search/src/Tests/SearchCommentTest.php
+++ b/core/modules/search/src/Tests/SearchCommentTest.php
@@ -9,7 +9,7 @@
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
use Drupal\comment\Tests\CommentTestTrait;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\field\Entity\FieldConfig;
use Drupal\user\RoleInterface;
diff --git a/core/modules/search/src/Tests/SearchPageTextTest.php b/core/modules/search/src/Tests/SearchPageTextTest.php
index 611d675..73c0bfd 100644
--- a/core/modules/search/src/Tests/SearchPageTextTest.php
+++ b/core/modules/search/src/Tests/SearchPageTextTest.php
@@ -7,7 +7,7 @@
namespace Drupal\search\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\Unicode;
/**
@@ -68,7 +68,7 @@ function testSearchText() {
$edit['keys'] = $search_terms;
$this->drupalPostForm('search/node', $edit, t('Search'));
$actual_title = (string) current($this->xpath('//title'));
- $this->assertEqual($actual_title, String::decodeEntities(t($title_source, array('@keywords' => Unicode::truncate($search_terms, 60, TRUE, TRUE)))), 'Search page title is correct');
+ $this->assertEqual($actual_title, StringHelper::decodeEntities(t($title_source, array('@keywords' => Unicode::truncate($search_terms, 60, TRUE, TRUE)))), 'Search page title is correct');
$edit['keys'] = $this->searchingUser->getUsername();
$this->drupalPostForm('search/user', $edit, t('Search'));
diff --git a/core/modules/search/src/Tests/SearchTestBase.php b/core/modules/search/src/Tests/SearchTestBase.php
index bac6974..ab64b10 100644
--- a/core/modules/search/src/Tests/SearchTestBase.php
+++ b/core/modules/search/src/Tests/SearchTestBase.php
@@ -8,7 +8,7 @@
namespace Drupal\search\Tests;
use Drupal\simpletest\WebTestBase;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Defines the common search test code.
@@ -87,7 +87,7 @@ 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(StringHelper::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)));
diff --git a/core/modules/serialization/src/Tests/EntitySerializationTest.php b/core/modules/serialization/src/Tests/EntitySerializationTest.php
index 04841a9..35d9e1e 100644
--- a/core/modules/serialization/src/Tests/EntitySerializationTest.php
+++ b/core/modules/serialization/src/Tests/EntitySerializationTest.php
@@ -8,7 +8,7 @@
namespace Drupal\serialization\Tests;
use Drupal\Core\Language\LanguageInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\user\Entity\User;
/**
@@ -206,7 +206,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, StringHelper::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..a1b7506 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -5,7 +5,7 @@
* Allows users to manage customizable lists of shortcut links.
*/
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Access\AccessResult;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Routing\RouteMatchInterface;
@@ -349,7 +349,7 @@ function shortcut_preprocess_page(&$variables) {
),
'#prefix' => '',
'#type' => 'link',
- '#title' => String::format('@text', array('@text' => $link_text)),
+ '#title' => StringHelper::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/Form/SwitchShortcutSet.php b/core/modules/shortcut/src/Form/SwitchShortcutSet.php
index 53d5d8e..6e437a8 100644
--- a/core/modules/shortcut/src/Form/SwitchShortcutSet.php
+++ b/core/modules/shortcut/src/Form/SwitchShortcutSet.php
@@ -7,7 +7,7 @@
namespace Drupal\shortcut\Form;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Routing\RouteMatchInterface;
@@ -71,7 +71,7 @@ public function buildForm(array $form, FormStateInterface $form_state, UserInter
// Prepare the list of shortcut sets.
$options = array_map(function (ShortcutSet $set) {
- return String::checkPlain($set->label());
+ return StringHelper::checkPlain($set->label());
}, $this->shortcutSetStorage->loadMultiple());
$current_set = shortcut_current_displayed_set($this->user);
diff --git a/core/modules/shortcut/src/Tests/ShortcutLinksTest.php b/core/modules/shortcut/src/Tests/ShortcutLinksTest.php
index bf98504..a90fb96 100644
--- a/core/modules/shortcut/src/Tests/ShortcutLinksTest.php
+++ b/core/modules/shortcut/src/Tests/ShortcutLinksTest.php
@@ -7,7 +7,7 @@
namespace Drupal\shortcut\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Url;
use Drupal\shortcut\Entity\Shortcut;
use Drupal\shortcut\Entity\ShortcutSet;
@@ -69,10 +69,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, StringHelper::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, StringHelper::format('Shortcut link %url found on the page.', ['%url' => $test_path]));
}
}
$saved_set = ShortcutSet::load($set->id());
diff --git a/core/modules/simpletest/simpletest.install b/core/modules/simpletest/simpletest.install
index c78abfe..e565888 100644
--- a/core/modules/simpletest/simpletest.install
+++ b/core/modules/simpletest/simpletest.install
@@ -6,7 +6,7 @@
*/
use Drupal\Component\Utility\Environment;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Minimum value of PHP memory_limit for SimpleTest.
diff --git a/core/modules/simpletest/src/AssertContentTrait.php b/core/modules/simpletest/src/AssertContentTrait.php
index 9834417..65138fb 100644
--- a/core/modules/simpletest/src/AssertContentTrait.php
+++ b/core/modules/simpletest/src/AssertContentTrait.php
@@ -8,7 +8,7 @@
namespace Drupal\simpletest;
use Drupal\Component\Serialization\Json;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\Xss;
use Symfony\Component\CssSelector\CssSelector;
@@ -127,7 +127,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(StringHelper::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);
@@ -295,7 +295,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 : StringHelper::format('Link with label %label found.', array('%label' => $label)));
return $this->assert(isset($links[$index]), $message, $group);
}
@@ -319,7 +319,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 : StringHelper::format('Link with label %label not found.', array('%label' => $label)));
return $this->assert(empty($links), $message, $group);
}
@@ -345,7 +345,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 : StringHelper::format('Link containing href %href found.', array('%href' => $href)));
return $this->assert(isset($links[$index]), $message, $group);
}
@@ -369,7 +369,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 : StringHelper::format('No link containing href %href found.', array('%href' => $href)));
return $this->assert(empty($links), $message, $group);
}
@@ -395,7 +395,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 = StringHelper::format('Raw "@raw" found', array('@raw' => $raw));
}
return $this->assert(strpos($this->getRawContent(), $raw) !== FALSE, $message, $group);
}
@@ -422,7 +422,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 = StringHelper::format('Raw "@raw" not found', array('@raw' => $raw));
}
return $this->assert(strpos($this->getRawContent(), $raw) === FALSE, $message, $group);
}
@@ -449,9 +449,9 @@ 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 = StringHelper::format('Escaped "@raw" found', array('@raw' => $raw));
}
- return $this->assert(strpos($this->getRawContent(), String::checkPlain($raw)) !== FALSE, $message, $group);
+ return $this->assert(strpos($this->getRawContent(), StringHelper::checkPlain($raw)) !== FALSE, $message, $group);
}
/**
@@ -477,9 +477,9 @@ 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 = StringHelper::format('Escaped "@raw" not found', array('@raw' => $raw));
}
- return $this->assert(strpos($this->getRawContent(), String::checkPlain($raw)) === FALSE, $message, $group);
+ return $this->assert(strpos($this->getRawContent(), StringHelper::checkPlain($raw)) === FALSE, $message, $group);
}
/**
@@ -559,7 +559,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 ? StringHelper::format('"@text" found', array('@text' => $text)) : StringHelper::format('"@text" not found', array('@text' => $text));
}
return $this->assert($not_exists == (strpos($this->getTextContent(), (string) $text) === FALSE), $message, $group);
}
@@ -672,7 +672,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 = StringHelper::format('Pattern "@pattern" found', array('@pattern' => $pattern));
}
return $this->assert((bool) preg_match($pattern, $this->getRawContent()), $message, $group);
}
@@ -697,7 +697,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 = StringHelper::format('Pattern "@pattern" not found', array('@pattern' => $pattern));
}
return $this->assert(!preg_match($pattern, $this->getRawContent()), $message, $group);
}
@@ -720,7 +720,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 = StringHelper::format('Pattern "@pattern" found', array('@pattern' => $pattern));
}
return $this->assert((bool) preg_match($pattern, $this->getTextContent()), $message, $group);
}
@@ -746,7 +746,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 = StringHelper::format('Page title @actual is equal to @expected.', array(
'@actual' => var_export($actual, TRUE),
'@expected' => var_export($title, TRUE),
));
@@ -775,7 +775,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 = StringHelper::format('Page title @actual is not equal to @unexpected.', array(
'@actual' => var_export($actual, TRUE),
'@unexpected' => var_export($title, TRUE),
));
@@ -808,8 +808,8 @@ protected function assertNoTitle($title, $message = '', $group = 'Other') {
protected function assertThemeOutput($callback, array $variables = array(), $expected = '', $message = '', $group = 'Other') {
$output = \Drupal::theme()->render($callback, $variables);
$this->verbose(
- '
' . 'Result:' . '' . String::checkPlain(var_export($output, TRUE)) . '
'
- . '
' . 'Expected:' . '' . String::checkPlain(var_export($expected, TRUE)) . '
'
+ '
' . 'Result:' . '' . StringHelper::checkPlain(var_export($output, TRUE)) . '
'
+ . '
' . 'Expected:' . '' . StringHelper::checkPlain(var_export($expected, TRUE)) . '
'
. '
' . $output
);
if (!$message) {
@@ -965,12 +965,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 = StringHelper::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 = StringHelper::format('Found field with name @name and value @value', array(
'@name' => var_export($name, TRUE),
'@value' => var_export($value, TRUE),
));
@@ -1003,7 +1003,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 : StringHelper::format('Did not find field by name @name', array('@name' => $name)), $group);
}
/**
@@ -1030,7 +1030,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 : StringHelper::format('Found field by id @id', array('@id' => $id)), $group);
}
/**
@@ -1057,7 +1057,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 : StringHelper::format('Did not find field by id @id', array('@id' => $id)), $group);
}
/**
@@ -1080,7 +1080,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 : StringHelper::format('Checkbox field @id is checked.', array('@id' => $id)), $group);
}
/**
@@ -1103,7 +1103,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 : StringHelper::format('Checkbox field @id is not checked.', array('@id' => $id)), $group);
}
/**
@@ -1128,7 +1128,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 : StringHelper::format('Option @option for field @id exists.', array('@option' => $option, '@id' => $id)), $group);
}
/**
@@ -1154,7 +1154,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 : StringHelper::format('Option @option for field @id does not exist.', array('@option' => $option, '@id' => $id)), $group);
}
/**
@@ -1181,7 +1181,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 : StringHelper::format('Option @option for field @id is selected.', array('@option' => $option, '@id' => $id)), $group);
}
/**
@@ -1206,7 +1206,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 : StringHelper::format('Option @option for field @id is not selected.', array('@option' => $option, '@id' => $id)), $group);
}
/**
@@ -1281,7 +1281,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(StringHelper::format('The HTML ID %id is unique.', array('%id' => $id)), $group);
$status = FALSE;
}
$seen_ids[$id] = TRUE;
diff --git a/core/modules/simpletest/src/Form/SimpletestTestForm.php b/core/modules/simpletest/src/Form/SimpletestTestForm.php
index 03f16f5..6887a16 100644
--- a/core/modules/simpletest/src/Form/SimpletestTestForm.php
+++ b/core/modules/simpletest/src/Form/SimpletestTestForm.php
@@ -8,7 +8,7 @@
namespace Drupal\simpletest\Form;
use Drupal\Component\Utility\SortArray;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
@@ -151,7 +151,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
);
$form['tests'][$class]['description'] = array(
'#prefix' => '',
- '#markup' => String::checkPlain($info['description']),
+ '#markup' => StringHelper::checkPlain($info['description']),
'#suffix' => '
',
'#wrapper_attributes' => array(
'class' => array('simpletest-test-description', 'table-filter-text-source'),
diff --git a/core/modules/simpletest/src/KernelTestBase.php b/core/modules/simpletest/src/KernelTestBase.php
index 14b839b..7995e4f 100644
--- a/core/modules/simpletest/src/KernelTestBase.php
+++ b/core/modules/simpletest/src/KernelTestBase.php
@@ -7,7 +7,7 @@
namespace Drupal\simpletest;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\Variable;
use Drupal\Core\Database\Database;
use Drupal\Core\DependencyInjection\ContainerBuilder;
@@ -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(StringHelper::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(StringHelper::format('Installed entity type tables for the %entity_type entity type: %tables', array(
'%entity_type' => $entity_type_id,
'%tables' => '{' . implode('}, {', $tables) . '}',
)));
@@ -563,7 +563,7 @@ protected function render(array &$elements) {
$content = $this->container->get('renderer')->renderRoot($elements);
drupal_process_attached($elements);
$this->setRawContent($content);
- $this->verbose('' . String::checkPlain($content));
+ $this->verbose('' . StringHelper::checkPlain($content));
return $content;
}
diff --git a/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php
index b621140..c627177 100644
--- a/core/modules/simpletest/src/TestBase.php
+++ b/core/modules/simpletest/src/TestBase.php
@@ -9,7 +9,7 @@
use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\Random;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Database\Database;
use Drupal\Core\Config\ConfigImporter;
use Drupal\Core\Config\StorageComparer;
@@ -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\StringHelper::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\StringHelper::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 : StringHelper::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\StringHelper::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 : StringHelper::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\StringHelper::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 : StringHelper::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\StringHelper::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 : StringHelper::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\StringHelper::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 : StringHelper::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\StringHelper::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 : StringHelper::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\StringHelper::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 : StringHelper::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\StringHelper::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 : StringHelper::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\StringHelper::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 ?: StringHelper::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\StringHelper::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\StringHelper::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\StringHelper::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -1397,10 +1397,10 @@ protected function exceptionHandler($exception) {
'file' => $exception->getFile(),
));
// \Drupal\Core\Utility\Error::decodeException() runs the exception
- // message through \Drupal\Component\Utility\String::checkPlain().
+ // message through \Drupal\Component\Utility\StringHelper::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 = StringHelper::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/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php
index 63cf76a..9684a20 100644
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -11,7 +11,7 @@
use Drupal\Component\Serialization\Yaml;
use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\NestedArray;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Cache\Cache;
use Drupal\Core\DependencyInjection\YamlFileLoader;
use Drupal\Core\DrupalKernel;
@@ -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, StringHelper::format('Created content type %type.', array('%type' => $type->id())));
return $type;
}
@@ -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(), StringHelper::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, StringHelper::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(StringHelper::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(StringHelper::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(StringHelper::format('Invalid permission %permission.', array('%permission' => $permission)), 'Role');
$valid = FALSE;
}
}
@@ -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, StringHelper::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 = StringHelper::format('!method @url returned @status (!length).', $message_vars);
$this->assertTrue($this->getRawContent() !== FALSE, $message, 'Browser');
return $this->getRawContent();
}
@@ -1511,7 +1511,7 @@ protected function drupalGet($path, array $options = array(), array $headers = a
$verbose = 'GET request to: ' . $path .
'
Ending URL: ' . $this->getUrl();
if ($this->dumpHeaders) {
- $verbose .= '
Headers: ' . String::checkPlain(var_export(array_map('trim', $this->headers), TRUE)) . '';
+ $verbose .= '
Headers: ' . StringHelper::checkPlain(var_export(array_map('trim', $this->headers), TRUE)) . '';
}
$verbose .= '
' . $out;
@@ -1705,7 +1705,7 @@ protected function drupalPostForm($path, $edit, $submit, array $options = array(
$verbose = 'POST request to: ' . $path;
$verbose .= '
Ending URL: ' . $this->getUrl();
if ($this->dumpHeaders) {
- $verbose .= '
Headers: ' . String::checkPlain(var_export(array_map('trim', $this->headers), TRUE)) . '';
+ $verbose .= '
Headers: ' . StringHelper::checkPlain(var_export(array_map('trim', $this->headers), TRUE)) . '';
}
$verbose .= '
Fields: ' . highlight_string('' . $out;
@@ -1716,7 +1716,7 @@ 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(StringHelper::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)));
@@ -2082,7 +2082,7 @@ protected function checkForMetaRefresh() {
// Parse the content attribute of the meta tag for the format:
// "[delay]: URL=[page_to_redirect_to]".
if (preg_match('/\d+;\s*URL=(?.*)/i', $refresh[0]['content'], $match)) {
- return $this->drupalGet($this->getAbsoluteUrl(String::decodeEntities($match['url'])));
+ return $this->drupalGet($this->getAbsoluteUrl(StringHelper::decodeEntities($match['url'])));
}
}
}
@@ -2113,7 +2113,7 @@ protected function drupalHead($path, array $options = array(), array $headers =
if ($this->dumpHeaders) {
$this->verbose('GET request to: ' . $path .
'
Ending URL: ' . $this->getUrl() .
- '
Headers: ' . String::checkPlain(var_export(array_map('trim', $this->headers), TRUE)) . '');
+ '
Headers: ' . StringHelper::checkPlain(var_export(array_map('trim', $this->headers), TRUE)) . '');
}
return $out;
@@ -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(StringHelper::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(StringHelper::format('Link %label does not exist on @url_before', array('%label' => $label, '@url_before' => $url_before)), 'Browser');
return FALSE;
}
@@ -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 = StringHelper::format('Expected @url matches current URL (@current_url).', array(
'@url' => var_export($url, TRUE),
'@current_url' => $this->getUrl(),
));
@@ -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 : StringHelper::format('HTTP response expected !code, actual !curl_code', array('!code' => $code, '!curl_code' => $curl_code)), $group);
}
/**
@@ -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 : StringHelper::format('HTTP response not expected !code, actual !curl_code', array('!code' => $code, '!curl_code' => $curl_code)), $group);
}
/**
diff --git a/core/modules/system/form.api.php b/core/modules/system/form.api.php
index 765ce60..7f82e3a 100644
--- a/core/modules/system/form.api.php
+++ b/core/modules/system/form.api.php
@@ -5,7 +5,7 @@
* Callbacks and hooks related to form system.
*/
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* @addtogroup callbacks
@@ -79,7 +79,7 @@ function callback_batch_operation($MULTIPLE_PARAMS, &$context) {
node_save($node);
// Store some result for post-processing in the finished callback.
- $context['results'][] = String::checkPlain($node->title);
+ $context['results'][] = StringHelper::checkPlain($node->title);
// Update our progress information.
$context['sandbox']['progress']++;
diff --git a/core/modules/system/src/Form/FileSystemForm.php b/core/modules/system/src/Form/FileSystemForm.php
index 40bd937..eafc730 100644
--- a/core/modules/system/src/Form/FileSystemForm.php
+++ b/core/modules/system/src/Form/FileSystemForm.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Form;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Datetime\DateFormatter;
use Drupal\Core\Form\FormStateInterface;
diff --git a/core/modules/system/src/Form/ModulesListForm.php b/core/modules/system/src/Form/ModulesListForm.php
index 2e80482..a4b3ce7 100644
--- a/core/modules/system/src/Form/ModulesListForm.php
+++ b/core/modules/system/src/Form/ModulesListForm.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Form;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Config\PreExistingConfigException;
use Drupal\Core\Controller\TitleResolverInterface;
@@ -168,7 +168,7 @@ public function getFormId() {
*/
public function buildForm(array $form, FormStateInterface $form_state) {
require_once DRUPAL_ROOT . '/core/includes/install.inc';
- $distribution = String::checkPlain(drupal_install_profile_distribution_name());
+ $distribution = StringHelper::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/src/Plugin/ImageToolkit/Operation/gd/Convert.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Convert.php
index 51d79aa..25b238f 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Convert.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Convert.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Defines GD2 convert operation.
@@ -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(StringHelper::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..4d95b44 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/CreateNew.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/CreateNew.php
@@ -8,7 +8,7 @@
namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
use Drupal\Component\Utility\Color;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Defines GD2 create_new image operation.
@@ -53,7 +53,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(StringHelper::format("Invalid extension (@value) specified for the image 'convert' operation", array('@value' => $arguments['extension'])));
}
// Assure integers for width and height.
@@ -62,15 +62,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(StringHelper::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(StringHelper::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(StringHelper::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..40c6aac 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Crop.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Crop.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Defines GD2 Crop operation.
@@ -67,10 +67,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(StringHelper::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(StringHelper::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..5c7cb07 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Resize.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Resize.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Defines GD2 resize operation.
@@ -46,10 +46,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(StringHelper::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(StringHelper::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..f378863 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Scale.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Scale.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Defines GD2 Scale operation.
@@ -73,10 +73,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(StringHelper::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(StringHelper::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..58f9a05 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/ScaleAndCrop.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/ScaleAndCrop.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Defines GD2 Scale and crop operation.
@@ -54,10 +54,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(StringHelper::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(StringHelper::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/Cache/PageCacheTagsTestBase.php b/core/modules/system/src/Tests/Cache/PageCacheTagsTestBase.php
index 3e3b1bc..69acc0b 100644
--- a/core/modules/system/src/Tests/Cache/PageCacheTagsTestBase.php
+++ b/core/modules/system/src/Tests/Cache/PageCacheTagsTestBase.php
@@ -9,7 +9,7 @@
use Drupal\Core\Url;
use Drupal\simpletest\WebTestBase;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Provides helper methods for page cache tags tests.
@@ -50,7 +50,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 = StringHelper::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/RenderElementTypesTest.php b/core/modules/system/src/Tests/Common/RenderElementTypesTest.php
index abd7925..a4108dc 100644
--- a/core/modules/system/src/Tests/Common/RenderElementTypesTest.php
+++ b/core/modules/system/src/Tests/Common/RenderElementTypesTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Common;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Url;
use Drupal\simpletest\KernelTestBase;
@@ -46,12 +46,12 @@ protected function assertElements(array $elements, $expected_html, $message) {
$actual_html = drupal_render($elements);
$out = '';
- $out .= '' . String::checkPlain($expected_html) . ' | ';
- $out .= '' . String::checkPlain($actual_html) . ' | ';
+ $out .= '' . StringHelper::checkPlain($expected_html) . ' | ';
+ $out .= '' . StringHelper::checkPlain($actual_html) . ' | ';
$out .= '
';
$this->verbose($out);
- $this->assertIdentical($actual_html, $expected_html, String::checkPlain($message));
+ $this->assertIdentical($actual_html, $expected_html, StringHelper::checkPlain($message));
}
/**
diff --git a/core/modules/system/src/Tests/Common/RenderWebTest.php b/core/modules/system/src/Tests/Common/RenderWebTest.php
index 4bdb996..b2667cf 100644
--- a/core/modules/system/src/Tests/Common/RenderWebTest.php
+++ b/core/modules/system/src/Tests/Common/RenderWebTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Common;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Url;
use Drupal\simpletest\WebTestBase;
diff --git a/core/modules/system/src/Tests/Common/TableSortExtenderUnitTest.php b/core/modules/system/src/Tests/Common/TableSortExtenderUnitTest.php
index aa39b75..c2f4696 100644
--- a/core/modules/system/src/Tests/Common/TableSortExtenderUnitTest.php
+++ b/core/modules/system/src/Tests/Common/TableSortExtenderUnitTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Common;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\simpletest\KernelTestBase;
use Symfony\Component\HttpFoundation\Request;
@@ -38,7 +38,7 @@ function testTableSortInit() {
$request->query->replace(array());
\Drupal::getContainer()->get('request_stack')->push($request);
$ts = tablesort_init($headers);
- $this->verbose(strtr('$ts: !ts
', array('!ts' => String::checkPlain(var_export($ts, TRUE)))));
+ $this->verbose(strtr('$ts: !ts
', array('!ts' => StringHelper::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_
@@ -51,7 +51,7 @@ function testTableSortInit() {
));
\Drupal::getContainer()->get('request_stack')->push($request);
$ts = tablesort_init($headers);
- $this->verbose(strtr('$ts: !ts
', array('!ts' => String::checkPlain(var_export($ts, TRUE)))));
+ $this->verbose(strtr('$ts: !ts
', array('!ts' => StringHelper::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_
@@ -67,7 +67,7 @@ function testTableSortInit() {
$expected_ts['sort'] = 'desc';
$expected_ts['query'] = array('alpha' => 'beta');
$ts = tablesort_init($headers);
- $this->verbose(strtr('$ts: !ts
', array('!ts' => String::checkPlain(var_export($ts, TRUE)))));
+ $this->verbose(strtr('$ts: !ts
', array('!ts' => StringHelper::checkPlain(var_export($ts, TRUE)))));
$this->assertEqual($ts, $expected_ts, 'Simple table headers plus $_GET parameters sorted correctly.');
// Test complex table headers.
@@ -99,7 +99,7 @@ function testTableSortInit() {
'sort' => 'desc',
'query' => array(),
);
- $this->verbose(strtr('$ts: !ts
', array('!ts' => String::checkPlain(var_export($ts, TRUE)))));
+ $this->verbose(strtr('$ts: !ts
', array('!ts' => StringHelper::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_
@@ -118,7 +118,7 @@ function testTableSortInit() {
'sort' => 'asc',
'query' => array(),
);
- $this->verbose(strtr('$ts: !ts
', array('!ts' => String::checkPlain(var_export($ts, TRUE)))));
+ $this->verbose(strtr('$ts: !ts
', array('!ts' => StringHelper::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_
@@ -139,7 +139,7 @@ function testTableSortInit() {
'query' => array('alpha' => 'beta'),
);
$ts = tablesort_init($headers);
- $this->verbose(strtr('$ts: !ts
', array('!ts' => String::checkPlain(var_export($ts, TRUE)))));
+ $this->verbose(strtr('$ts: !ts
', array('!ts' => StringHelper::checkPlain(var_export($ts, TRUE)))));
$this->assertEqual($ts, $expected_ts, 'Complex table headers plus $_GET parameters sorted correctly.');
}
}
diff --git a/core/modules/system/src/Tests/Condition/CurrentThemeConditionTest.php b/core/modules/system/src/Tests/Condition/CurrentThemeConditionTest.php
index 164b1e9..2f367c1 100644
--- a/core/modules/system/src/Tests/Condition/CurrentThemeConditionTest.php
+++ b/core/modules/system/src/Tests/Condition/CurrentThemeConditionTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Condition;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\simpletest\KernelTestBase;
/**
@@ -44,8 +44,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(), StringHelper::format('The current theme is @theme', array('@theme' => 'test_theme')));
+ $this->assertEqual($condition_negated->summary(), StringHelper::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/Entity/EntityAutocompleteTest.php b/core/modules/system/src/Tests/Entity/EntityAutocompleteTest.php
index f6fa256..5af2548 100644
--- a/core/modules/system/src/Tests/Entity/EntityAutocompleteTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityAutocompleteTest.php
@@ -8,7 +8,7 @@
namespace Drupal\system\Tests\Entity;
use Drupal\Component\Serialization\Json;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\Tags;
use Drupal\system\Controller\EntityAutocompleteController;
use Symfony\Component\HttpFoundation\Request;
@@ -54,8 +54,8 @@ function testEntityReferenceAutocompletion() {
// We should get both entities in a JSON encoded string.
$input = '10/';
$data = $this->getAutocompleteResult($input);
- $this->assertIdentical($data[0]['label'], String::checkPlain($entity_1->name->value), 'Autocomplete returned the first matching entity');
- $this->assertIdentical($data[1]['label'], String::checkPlain($entity_2->name->value), 'Autocomplete returned the second matching entity');
+ $this->assertIdentical($data[0]['label'], StringHelper::checkPlain($entity_1->name->value), 'Autocomplete returned the first matching entity');
+ $this->assertIdentical($data[1]['label'], StringHelper::checkPlain($entity_2->name->value), 'Autocomplete returned the second matching entity');
// Try to autocomplete a entity label that matches the first entity.
// We should only get the first entity in a JSON encoded string.
@@ -63,7 +63,7 @@ function testEntityReferenceAutocompletion() {
$data = $this->getAutocompleteResult($input);
$target = array(
'value' => $entity_1->name->value . ' (1)',
- 'label' => String::checkPlain($entity_1->name->value),
+ 'label' => StringHelper::checkPlain($entity_1->name->value),
);
$this->assertIdentical(reset($data), $target, 'Autocomplete returns only the expected matching entity.');
@@ -71,7 +71,7 @@ function testEntityReferenceAutocompletion() {
// the first entity is already typed in the autocomplete (tags) widget.
$input = $entity_1->name->value . ' (1), 10/17';
$data = $this->getAutocompleteResult($input);
- $this->assertIdentical($data[0]['label'], String::checkPlain($entity_2->name->value), 'Autocomplete returned the second matching entity');
+ $this->assertIdentical($data[0]['label'], StringHelper::checkPlain($entity_2->name->value), 'Autocomplete returned the second matching entity');
// Try to autocomplete a entity label with both a comma and a slash.
$input = '"label with, and / t';
@@ -81,7 +81,7 @@ function testEntityReferenceAutocompletion() {
$n = Tags::encode($n);
$target = array(
'value' => $n,
- 'label' => String::checkPlain($entity_3->name->value),
+ 'label' => StringHelper::checkPlain($entity_3->name->value),
);
$this->assertIdentical(reset($data), $target, 'Autocomplete returns an entity label containing a comma and a slash.');
}
diff --git a/core/modules/system/src/Tests/Entity/EntityFieldDefaultValueTest.php b/core/modules/system/src/Tests/Entity/EntityFieldDefaultValueTest.php
index 32861c7..a7c130b 100644
--- a/core/modules/system/src/Tests/Entity/EntityFieldDefaultValueTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityFieldDefaultValueTest.php
@@ -8,7 +8,7 @@
namespace Drupal\system\Tests\Entity;
use Drupal\Component\Uuid\Uuid;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Tests default values for entity fields.
@@ -50,8 +50,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', StringHelper::format('%entity_type: Default language', array('%entity_type' => $entity_type_id)));
+ $this->assertTrue(Uuid::isValid($entity->uuid->value), StringHelper::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..81f4ae1 100644
--- a/core/modules/system/src/Tests/Entity/EntityFieldTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityFieldTest.php
@@ -442,16 +442,16 @@ protected function doTestIntrospection($entity_type) {
$this->assertEqual($definitions['field_test_text']->getType(), 'text', $entity_type .': Test-text-field field found.');
$name_properties = $entity->name->getFieldDefinition()->getPropertyDefinitions();
- $this->assertEqual($name_properties['value']->getDataType(), 'string', $entity_type .': String value property of the name found.');
+ $this->assertEqual($name_properties['value']->getDataType(), 'string', $entity_type .': StringHelper value property of the name found.');
$userref_properties = $entity->user_id->getFieldDefinition()->getPropertyDefinitions();
$this->assertEqual($userref_properties['target_id']->getDataType(), 'integer', $entity_type .': Entity id property of the user found.');
$this->assertEqual($userref_properties['entity']->getDataType(), 'entity_reference', $entity_type .': Entity reference property of the user found.');
$textfield_properties = $entity->field_test_text->getFieldDefinition()->getFieldStorageDefinition()->getPropertyDefinitions();
- $this->assertEqual($textfield_properties['value']->getDataType(), 'string', $entity_type .': String value property of the test-text field found.');
- $this->assertEqual($textfield_properties['format']->getDataType(), 'filter_format', $entity_type .': String format field of the test-text field found.');
- $this->assertEqual($textfield_properties['processed']->getDataType(), 'string', $entity_type .': String processed property of the test-text field found.');
+ $this->assertEqual($textfield_properties['value']->getDataType(), 'string', $entity_type .': StringHelper value property of the test-text field found.');
+ $this->assertEqual($textfield_properties['format']->getDataType(), 'filter_format', $entity_type .': StringHelper format field of the test-text field found.');
+ $this->assertEqual($textfield_properties['processed']->getDataType(), 'string', $entity_type .': StringHelper processed property of the test-text field found.');
// Make sure provided contextual information is right.
$entity_adapter = $entity->getTypedData();
diff --git a/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php b/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php
index b7bf65e..dce26b8 100644
--- a/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php
@@ -8,7 +8,7 @@
namespace Drupal\system\Tests\Entity\EntityReferenceSelection;
use Drupal\comment\Tests\CommentTestTrait;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Language\LanguageInterface;
use Drupal\comment\CommentInterface;
use Drupal\simpletest\WebTestBase;
@@ -109,7 +109,7 @@ public function testNodeHandler() {
$node = entity_create('node', $values);
$node->save();
$nodes[$key] = $node;
- $node_labels[$key] = String::checkPlain($node->label());
+ $node_labels[$key] = StringHelper::checkPlain($node->label());
}
// Test as a non-admin.
@@ -240,7 +240,7 @@ public function testUserHandler() {
$account = $values;
}
$users[$key] = $account;
- $user_labels[$key] = String::checkPlain($account->getUsername());
+ $user_labels[$key] = StringHelper::checkPlain($account->getUsername());
}
// Test as a non-admin.
@@ -415,7 +415,7 @@ public function testCommentHandler() {
$comment = entity_create('comment', $values);
$comment->save();
$comments[$key] = $comment;
- $comment_labels[$key] = String::checkPlain($comment->label());
+ $comment_labels[$key] = StringHelper::checkPlain($comment->label());
}
// Test as a non-admin.
diff --git a/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionSortTest.php b/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionSortTest.php
index 9370dde..ddf94af 100644
--- a/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionSortTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionSortTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Entity\EntityReferenceSelection;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\node\Entity\Node;
use Drupal\node\Entity\NodeType;
use Drupal\system\Tests\Entity\EntityUnitTestBase;
@@ -93,7 +93,7 @@ public function testSort() {
$node = Node::create($values);
$node->save();
$nodes[$key] = $node;
- $node_labels[$key] = String::checkPlain($node->label());
+ $node_labels[$key] = StringHelper::checkPlain($node->label());
}
$selection_options = array(
diff --git a/core/modules/system/src/Tests/Entity/EntitySchemaTest.php b/core/modules/system/src/Tests/Entity/EntitySchemaTest.php
index 5bd22ed..ba03455 100644
--- a/core/modules/system/src/Tests/Entity/EntitySchemaTest.php
+++ b/core/modules/system/src/Tests/Entity/EntitySchemaTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Entity;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Tests adding a custom bundle field.
@@ -99,27 +99,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, StringHelper::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]), StringHelper::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), StringHelper::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), StringHelper::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, StringHelper::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]), StringHelper::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..296987c 100644
--- a/core/modules/system/src/Tests/Entity/EntityTranslationTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityTranslationTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Entity;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Entity\ContentEntityInterface;
use Drupal\Core\Language\LanguageInterface;
use Drupal\entity_test\Entity\EntityTestMulRev;
@@ -738,7 +738,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'], StringHelper::format('Name correctly retrieved from "@langcode" adapter', array('@langcode' => $langcode)));
}
}
diff --git a/core/modules/system/src/Tests/File/HtaccessUnitTest.php b/core/modules/system/src/Tests/File/HtaccessUnitTest.php
index 7d71a33..d6030c2 100644
--- a/core/modules/system/src/Tests/File/HtaccessUnitTest.php
+++ b/core/modules/system/src/Tests/File/HtaccessUnitTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\File;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\simpletest\KernelTestBase;
/**
@@ -89,7 +89,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, StringHelper::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/Form/ElementsVerticalTabsTest.php b/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php
index a69da46..21fcd41 100644
--- a/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php
+++ b/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Form;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\simpletest\WebTestBase;
use Drupal\Component\Serialization\Json;
@@ -74,6 +74,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']), StringHelper::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..0c17c3b 100644
--- a/core/modules/system/src/Tests/Form/FormTest.php
+++ b/core/modules/system/src/Tests/Form/FormTest.php
@@ -8,7 +8,7 @@
namespace Drupal\system\Tests\Form;
use Drupal\Component\Serialization\Json;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormState;
use Drupal\Core\Render\Element;
use Drupal\form_test\Form\FormTestDisabledElementsForm;
@@ -534,7 +534,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, StringHelper::format('Found @actual elements with disabled property (expected @expected).', array(
'@actual' => count($disabled_elements),
'@expected' => $expected_count,
)));
@@ -616,7 +616,7 @@ function testDisabledMarkup() {
$path = strtr($path, array('!type' => $type));
// Verify that the element exists.
$element = $this->xpath($path, array(
- ':name' => String::checkPlain($name),
+ ':name' => StringHelper::checkPlain($name),
':div-class' => $class,
':value' => isset($item['#value']) ? $item['#value'] : '',
));
diff --git a/core/modules/system/src/Tests/Form/StateValuesCleanTest.php b/core/modules/system/src/Tests/Form/StateValuesCleanTest.php
index f07ae8c..8b6b7c9 100644
--- a/core/modules/system/src/Tests/Form/StateValuesCleanTest.php
+++ b/core/modules/system/src/Tests/Form/StateValuesCleanTest.php
@@ -8,7 +8,7 @@
namespace Drupal\system\Tests\Form;
use Drupal\Component\Serialization\Json;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\simpletest\WebTestBase;
/**
@@ -51,7 +51,7 @@ function testFormStateValuesClean() {
$this->assertFalse(isset($values['baz']['baz']), format_string('%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']), StringHelper::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/TriggeringElementProgrammedUnitTest.php b/core/modules/system/src/Tests/Form/TriggeringElementProgrammedUnitTest.php
index 27327a4..b83ed1a 100644
--- a/core/modules/system/src/Tests/Form/TriggeringElementProgrammedUnitTest.php
+++ b/core/modules/system/src/Tests/Form/TriggeringElementProgrammedUnitTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Form;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormInterface;
use Drupal\Core\Form\FormState;
use Drupal\Core\Form\FormStateInterface;
diff --git a/core/modules/system/src/Tests/Image/ToolkitGdTest.php b/core/modules/system/src/Tests/Image/ToolkitGdTest.php
index f4face0..4b35c63 100644
--- a/core/modules/system/src/Tests/Image/ToolkitGdTest.php
+++ b/core/modules/system/src/Tests/Image/ToolkitGdTest.php
@@ -9,7 +9,7 @@
use Drupal\Core\Image\ImageInterface;
use \Drupal\simpletest\KernelTestBase;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Tests that core image manipulations work properly: scale, resize, rotate,
@@ -262,14 +262,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(StringHelper::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, StringHelper::format('Image %file after load is a truecolor image.', array('%file' => $file)));
if ($image->getToolkit()->getType() == IMAGETYPE_GIF) {
if ($op == 'desaturate') {
@@ -312,8 +312,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, StringHelper::format('Image %file after %action action has proper dimensions.', array('%file' => $file, '%action' => $op)));
+ $this->assertTrue($correct_dimensions_object, StringHelper::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 +349,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, StringHelper::format('Image %file object after %action action has the correct color placement at corner %corner.',
array('%file' => $file, '%action' => $op, '%corner' => $key)));
}
}
@@ -367,25 +367,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(), StringHelper::format('Image file %file has the correct width.', array('%file' => $file)));
+ $this->assertEqual(20, $image->getHeight(), StringHelper::format('Image file %file has the correct height.', array('%file' => $file)));
+ $this->assertEqual(image_type_to_mime_type($type), $image->getMimeType(), StringHelper::format('Image file %file has the correct MIME type.', array('%file' => $file)));
+ $this->assertTrue($image->save($file_path), StringHelper::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(StringHelper::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(), StringHelper::format('Image file %file has the correct width.', array('%file' => $file)));
+ $this->assertEqual(20, $image_reloaded->getHeight(), StringHelper::format('Image file %file has the correct height.', array('%file' => $file)));
+ $this->assertEqual(image_type_to_mime_type($type), $image_reloaded->getMimeType(), StringHelper::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(), StringHelper::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(), StringHelper::format('Image file %file has no color channel set.', array('%file' => $file)));
}
}
@@ -420,12 +420,12 @@ function testTransparentColorOutOfRange() {
$toolkit = $image->getToolkit();
if (!$image->isValid()) {
- $this->fail(String::format('Could not load image %file.', array('%file' => $file)));
+ $this->fail(StringHelper::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, StringHelper::format('Image %file after load is a truecolor image.', array('%file' => $file)));
}
}
@@ -443,7 +443,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(StringHelper::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..f502934 100644
--- a/core/modules/system/src/Tests/Image/ToolkitTestBase.php
+++ b/core/modules/system/src/Tests/Image/ToolkitTestBase.php
@@ -8,7 +8,7 @@
namespace Drupal\system\Tests\Image;
use Drupal\simpletest\WebTestBase;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Base class for image manipulation testing.
@@ -104,10 +104,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, StringHelper::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, StringHelper::format('All the expected operations were called: %expected', array('%expected' => implode(', ', $expected))));
}
// Determine if there were any unexpected calls.
@@ -115,7 +115,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, StringHelper::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/Mail/HtmlToTextTest.php b/core/modules/system/src/Tests/Mail/HtmlToTextTest.php
index 3bf7ffc..eeb4534 100644
--- a/core/modules/system/src/Tests/Mail/HtmlToTextTest.php
+++ b/core/modules/system/src/Tests/Mail/HtmlToTextTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Mail;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Mail\MailFormatHelper;
use Drupal\Core\Site\Settings;
@@ -34,7 +34,7 @@ protected function stringToHtml($text) {
str_replace(
array("\n", ' '),
array('\n', ' '),
- String::checkPlain($text)
+ StringHelper::checkPlain($text)
) . '"';
}
@@ -57,7 +57,7 @@ protected function assertHtmlToText($html, $text, $message, $allowed_tags = NULL
$tested_tags = implode(', ', array_unique($matches[1]));
$message .= ' (' . $tested_tags . ')';
$result = MailFormatHelper::htmlToText($html, $allowed_tags);
- $pass = $this->assertEqual($result, $text, String::checkPlain($message));
+ $pass = $this->assertEqual($result, $text, StringHelper::checkPlain($message));
$verbose = 'html = ' . $this->stringToHtml($html)
. '
' . 'result = ' . $this->stringToHtml($result)
. '
' . 'expected = ' . $this->stringToHtml($text)
diff --git a/core/modules/system/src/Tests/Menu/AssertBreadcrumbTrait.php b/core/modules/system/src/Tests/Menu/AssertBreadcrumbTrait.php
index a9d421a..4b7bfe4 100644
--- a/core/modules/system/src/Tests/Menu/AssertBreadcrumbTrait.php
+++ b/core/modules/system/src/Tests/Menu/AssertBreadcrumbTrait.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Menu;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Url;
/**
@@ -83,7 +83,7 @@ protected function assertBreadcrumbParts($trail) {
$url = $path;
}
$part = array_shift($parts);
- $pass = ($pass && $part['href'] === $url && $part['text'] === String::checkPlain($title));
+ $pass = ($pass && $part['href'] === $url && $part['text'] === StringHelper::checkPlain($title));
}
}
// No parts must be left, or an expected "Home" will always pass.
diff --git a/core/modules/system/src/Tests/Module/UninstallTest.php b/core/modules/system/src/Tests/Module/UninstallTest.php
index 4032a90..2b1851a 100644
--- a/core/modules/system/src/Tests/Module/UninstallTest.php
+++ b/core/modules/system/src/Tests/Module/UninstallTest.php
@@ -8,7 +8,7 @@
namespace Drupal\system\Tests\Module;
use Drupal\Core\Cache\Cache;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\simpletest\WebTestBase;
/**
@@ -66,7 +66,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(), StringHelper::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 +82,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, StringHelper::format('The entity label "!label" found.', array('!label' => $label)));
$entity_types[] = $entity->getEntityTypeId();
}
$entity_types = array_unique($entity_types);
@@ -97,7 +97,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', StringHelper::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/Plugin/PluginTestBase.php b/core/modules/system/src/Tests/Plugin/PluginTestBase.php
index b4d6c1d..73adc3e 100644
--- a/core/modules/system/src/Tests/Plugin/PluginTestBase.php
+++ b/core/modules/system/src/Tests/Plugin/PluginTestBase.php
@@ -102,7 +102,7 @@ protected function setUp() {
),
),
'string_context' => array(
- 'label' => 'String typed data',
+ 'label' => 'StringHelper typed data',
'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\TypedDataStringBlock',
),
'complex_context' => array(
diff --git a/core/modules/system/src/Tests/Routing/ExceptionHandlingTest.php b/core/modules/system/src/Tests/Routing/ExceptionHandlingTest.php
index 052033f..fe9d741 100644
--- a/core/modules/system/src/Tests/Routing/ExceptionHandlingTest.php
+++ b/core/modules/system/src/Tests/Routing/ExceptionHandlingTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Routing;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\simpletest\KernelTestBase;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -119,7 +119,7 @@ public function testBacktraceEscaping() {
// Test both that the backtrace is properly escaped, and that the unescaped
// string is not output at all.
- $this->assertTrue(strpos($response->getContent(), String::checkPlain('')) !== FALSE);
+ $this->assertTrue(strpos($response->getContent(), StringHelper::checkPlain('')) !== FALSE);
$this->assertTrue(strpos($response->getContent(), '') === FALSE);
}
diff --git a/core/modules/system/src/Tests/Session/SessionHttpsTest.php b/core/modules/system/src/Tests/Session/SessionHttpsTest.php
index 8b2a721..2d81e68 100644
--- a/core/modules/system/src/Tests/Session/SessionHttpsTest.php
+++ b/core/modules/system/src/Tests/Session/SessionHttpsTest.php
@@ -10,7 +10,7 @@
use Drupal\simpletest\WebTestBase;
use Symfony\Component\HttpFoundation\Request;
use Drupal\Component\Utility\Crypt;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Ensure that when running under HTTPS two session cookies are generated.
diff --git a/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php b/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php
index 2960064..e8f9283 100644
--- a/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php
+++ b/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\System;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\simpletest\WebTestBase;
/**
@@ -29,7 +29,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, StringHelper::format('Default Mobile meta tag "@name" displayed properly.', array('@name' => $name)), 'System');
}
}
@@ -40,7 +40,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, StringHelper::format('Default Mobile meta tag "@name" removed properly.', array('@name' => $name)), 'System');
}
}
}
diff --git a/core/modules/system/src/Tests/System/PageTitleTest.php b/core/modules/system/src/Tests/System/PageTitleTest.php
index 204d265..9f8b371 100644
--- a/core/modules/system/src/Tests/System/PageTitleTest.php
+++ b/core/modules/system/src/Tests/System/PageTitleTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\System;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\Xss;
use Drupal\simpletest\WebTestBase;
@@ -56,7 +56,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(String::checkPlain($edit['title[0][value]']), 'Check to make sure tags in the node title are converted.');
+ $this->assertText(StringHelper::checkPlain($edit['title[0][value]']), 'Check to make sure tags in the node title are converted.');
}
/**
@@ -65,7 +65,7 @@ function testTitleTags() {
function testTitleXSS() {
// Set some title with JavaScript and HTML chars to escape.
$title = ' & < > " \' ';
- $title_filtered = String::checkPlain($title);
+ $title_filtered = StringHelper::checkPlain($title);
$slogan = '';
$slogan_filtered = Xss::filterAdmin($slogan);
diff --git a/core/modules/system/src/Tests/System/TokenReplaceUnitTest.php b/core/modules/system/src/Tests/System/TokenReplaceUnitTest.php
index f489c75..213b725 100644
--- a/core/modules/system/src/Tests/System/TokenReplaceUnitTest.php
+++ b/core/modules/system/src/Tests/System/TokenReplaceUnitTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\System;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\Xss;
/**
@@ -60,7 +60,7 @@ public function testClear() {
$source .= '[bogus:token]';
// Replace with with the clear parameter, only the valid token should remain.
- $target = String::checkPlain($this->config('system.site')->get('name'));
+ $target = StringHelper::checkPlain($this->config('system.site')->get('name'));
$result = $this->tokenService->replace($source, array(), array('langcode' => $this->interfaceLanguage->getId(), 'clear' => TRUE));
$this->assertEqual($target, $result, 'Valid tokens replaced while invalid tokens ignored.');
@@ -95,7 +95,7 @@ public function testSystemSiteTokenReplacement() {
// Generate and test sanitized tokens.
$tests = array();
- $tests['[site:name]'] = String::checkPlain($config->get('name'));
+ $tests['[site:name]'] = StringHelper::checkPlain($config->get('name'));
$tests['[site:slogan]'] = $safe_slogan;
$tests['[site:mail]'] = $config->get('mail');
$tests['[site:url]'] = \Drupal::url('', [], $url_options);
diff --git a/core/modules/system/src/Tests/Theme/FunctionsTest.php b/core/modules/system/src/Tests/Theme/FunctionsTest.php
index a5766fa..fc6c8d2 100644
--- a/core/modules/system/src/Tests/Theme/FunctionsTest.php
+++ b/core/modules/system/src/Tests/Theme/FunctionsTest.php
@@ -8,7 +8,7 @@
namespace Drupal\system\Tests\Theme;
use Drupal\Component\Serialization\Json;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Session\UserSession;
use Drupal\Core\Url;
use Drupal\simpletest\WebTestBase;
@@ -197,7 +197,7 @@ function testLinks() {
'title' => 'Plain "text"',
),
'html text' => array(
- 'title' => String::format('@text', array('@text' => 'potentially unsafe text that be escaped')),
+ 'title' => StringHelper::format('@text', array('@text' => 'potentially unsafe text that be escaped')),
),
'front page' => array(
'title' => 'Front page',
@@ -218,13 +218,13 @@ function testLinks() {
$expected_links = '';
$expected_links .= '';
// Verify that passing a string as heading works.
@@ -258,13 +258,13 @@ function testLinks() {
);
$expected_links = '';
$expected_links .= '';
$expected = $expected_heading . $expected_links;
$this->assertThemeOutput('links', $variables, $expected);
@@ -274,14 +274,14 @@ function testLinks() {
$variables['set_active_class'] = TRUE;
$expected_links = '';
$expected_links .= '';
$expected = $expected_heading . $expected_links;
$this->assertThemeOutput('links', $variables, $expected);
diff --git a/core/modules/system/src/Tests/Theme/TwigEnvironmentTest.php b/core/modules/system/src/Tests/Theme/TwigEnvironmentTest.php
index b2e18d9..31dfa22 100644
--- a/core/modules/system/src/Tests/Theme/TwigEnvironmentTest.php
+++ b/core/modules/system/src/Tests/Theme/TwigEnvironmentTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Theme;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Site\Settings;
use Drupal\simpletest\KernelTestBase;
@@ -42,7 +42,7 @@ public function testInlineTemplate() {
'#template' => 'test-with-context {{ unsafe_content }}',
'#context' => array('unsafe_content' => $unsafe_string),
);
- $this->assertEqual(drupal_render($element), 'test-with-context ' . String::checkPlain($unsafe_string));
+ $this->assertEqual(drupal_render($element), 'test-with-context ' . StringHelper::checkPlain($unsafe_string));
// Enable twig_auto_reload and twig_debug.
$settings = Settings::getAll();
diff --git a/core/modules/system/src/Tests/Theme/TwigExtensionTest.php b/core/modules/system/src/Tests/Theme/TwigExtensionTest.php
index 6719ab7..fce6e69 100644
--- a/core/modules/system/src/Tests/Theme/TwigExtensionTest.php
+++ b/core/modules/system/src/Tests/Theme/TwigExtensionTest.php
@@ -46,7 +46,7 @@ function testTwigExtensionFilter() {
->save();
$this->drupalGet('twig-extension-test/filter');
- $this->assertText('Every plant is not a mineral.', 'Success: String filtered.');
+ $this->assertText('Every plant is not a mineral.', 'Success: StringHelper filtered.');
}
/**
diff --git a/core/modules/system/src/Tests/Theme/TwigRawTest.php b/core/modules/system/src/Tests/Theme/TwigRawTest.php
index 1fa5353..6c93fca 100644
--- a/core/modules/system/src/Tests/Theme/TwigRawTest.php
+++ b/core/modules/system/src/Tests/Theme/TwigRawTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Theme;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\simpletest\WebTestBase;
/**
diff --git a/core/modules/system/src/Tests/TypedData/TypedDataTest.php b/core/modules/system/src/Tests/TypedData/TypedDataTest.php
index 9cfeb8d..7487702 100644
--- a/core/modules/system/src/Tests/TypedData/TypedDataTest.php
+++ b/core/modules/system/src/Tests/TypedData/TypedDataTest.php
@@ -80,16 +80,16 @@ public function testGetAndSet() {
$value = $this->randomString();
$typed_data = $this->createTypedData(array('type' => 'string'), $value);
$this->assertTrue($typed_data instanceof \Drupal\Core\TypedData\Type\StringInterface, 'Typed data object is an instance of StringInterface.');
- $this->assertTrue($typed_data->getValue() === $value, 'String value was fetched.');
+ $this->assertTrue($typed_data->getValue() === $value, 'StringHelper value was fetched.');
$this->assertEqual($typed_data->validate()->count(), 0);
$new_value = $this->randomString();
$typed_data->setValue($new_value);
- $this->assertTrue($typed_data->getValue() === $new_value, 'String value was changed.');
+ $this->assertTrue($typed_data->getValue() === $new_value, 'StringHelper value was changed.');
$this->assertEqual($typed_data->validate()->count(), 0);
// Funky test.
- $this->assertTrue(is_string($typed_data->getString()), 'String value was converted to string');
+ $this->assertTrue(is_string($typed_data->getString()), 'StringHelper value was converted to string');
$typed_data->setValue(NULL);
- $this->assertNull($typed_data->getValue(), 'String wrapper is null-able.');
+ $this->assertNull($typed_data->getValue(), 'StringHelper wrapper is null-able.');
$this->assertEqual($typed_data->validate()->count(), 0);
$typed_data->setValue(array('no string'));
$this->assertEqual($typed_data->validate()->count(), 1, 'Validation detected invalid value.');
diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php
index b0eadb5..bb4af50 100644
--- a/core/modules/system/system.api.php
+++ b/core/modules/system/system.api.php
@@ -5,7 +5,7 @@
* Hooks provided by Drupal core and the System module.
*/
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Mail\MailFormatHelper;
use Drupal\Core\Url;
use Drupal\taxonomy\Entity\Vocabulary;
@@ -321,7 +321,7 @@ function hook_tokens($type, $tokens, array $data = array(), array $options = arr
break;
case 'title':
- $replacements[$original] = $sanitize ? String::checkPlain($node->getTitle()) : $node->getTitle();
+ $replacements[$original] = $sanitize ? StringHelper::checkPlain($node->getTitle()) : $node->getTitle();
break;
case 'edit-url':
@@ -331,7 +331,7 @@ function hook_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 ? String::checkPlain($account->label()) : $account->label();
+ $replacements[$original] = $sanitize ? StringHelper::checkPlain($account->label()) : $account->label();
break;
case 'created':
@@ -533,7 +533,7 @@ function hook_token_info_alter(&$data) {
* Drupal\Core\Template\Attribute($options['attributes']).
* - html: Whether or not HTML should be allowed as the link text. If FALSE,
* the text will be run through
- * \Drupal\Component\Utility\String::checkPlain() before being output.
+ * \Drupal\Component\Utility\StringHelper::checkPlain() before being output.
*
* @see \Drupal\Core\Routing\UrlGenerator::generateFromPath()
* @see \Drupal\Core\Routing\UrlGenerator::generateFromRoute()
diff --git a/core/modules/system/system.tokens.inc b/core/modules/system/system.tokens.inc
index 9e9d03d..bdb73f1 100644
--- a/core/modules/system/system.tokens.inc
+++ b/core/modules/system/system.tokens.inc
@@ -7,7 +7,7 @@
* This file handles tokens for the global 'site' and 'date' tokens.
*/
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\Xss;
/**
@@ -107,7 +107,7 @@ function system_tokens($type, $tokens, array $data = array(), array $options = a
switch ($name) {
case 'name':
$site_name = \Drupal::config('system.site')->get('name');
- $replacements[$original] = $sanitize ? String::checkPlain($site_name) : $site_name;
+ $replacements[$original] = $sanitize ? StringHelper::checkPlain($site_name) : $site_name;
break;
case 'slogan':
@@ -161,7 +161,7 @@ function system_tokens($type, $tokens, array $data = array(), array $options = a
break;
case 'raw':
- $replacements[$original] = $sanitize ? String::checkPlain($date) : $date;
+ $replacements[$original] = $sanitize ? StringHelper::checkPlain($date) : $date;
break;
}
}
diff --git a/core/modules/system/templates/links.html.twig b/core/modules/system/templates/links.html.twig
index 56c7ec2..17d88d8 100644
--- a/core/modules/system/templates/links.html.twig
+++ b/core/modules/system/templates/links.html.twig
@@ -12,7 +12,7 @@
* item in the links list. If 'href' is supplied, the entire link is passed
* to l() as its $options parameter.
* - html: (optional) Whether or not 'title' is HTML. If set, the title will
- * not be passed through \Drupal\Component\Utility\String::checkPlain().
+ * not be passed through \Drupal\Component\Utility\StringHelper::checkPlain().
* - attributes: (optional) HTML attributes for the anchor, or for the
* tag if no 'href' is supplied.
* - link_key: The link CSS class.
diff --git a/core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php b/core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php
index cf82dba..b9aa35a 100644
--- a/core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php
+++ b/core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php
@@ -7,7 +7,7 @@
namespace Drupal\common_test\Controller;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Url;
use Symfony\Component\HttpFoundation\Response;
@@ -90,7 +90,7 @@ public function jsAndCssQuerystring() {
*/
public function destination() {
$destination = drupal_get_destination();
- $output = "The destination: " . String::checkPlain($destination['destination']);
+ $output = "The destination: " . StringHelper::checkPlain($destination['destination']);
return new Response($output);
}
diff --git a/core/modules/system/tests/modules/database_test/src/Form/DatabaseTestForm.php b/core/modules/system/tests/modules/database_test/src/Form/DatabaseTestForm.php
index 89bb6c0..24ff5ec 100644
--- a/core/modules/system/tests/modules/database_test/src/Form/DatabaseTestForm.php
+++ b/core/modules/system/tests/modules/database_test/src/Form/DatabaseTestForm.php
@@ -7,7 +7,7 @@
namespace Drupal\database_test\Form;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
@@ -55,8 +55,8 @@ public function buildForm(array $form, FormStateInterface $form_state) {
foreach (user_load_multiple($uids) as $account) {
$options[$account->id()] = array(
- 'title' => array('data' => array('#title' => String::checkPlain($account->getUsername()))),
- 'username' => String::checkPlain($account->getUsername()),
+ 'title' => array('data' => array('#title' => StringHelper::checkPlain($account->getUsername()))),
+ 'username' => StringHelper::checkPlain($account->getUsername()),
'status' => $account->isActive() ? t('active') : t('blocked'),
);
}
diff --git a/core/modules/system/tests/modules/entity_test/src/EntityTestViewBuilder.php b/core/modules/system/tests/modules/entity_test/src/EntityTestViewBuilder.php
index 3456512..cc5fa66 100644
--- a/core/modules/system/tests/modules/entity_test/src/EntityTestViewBuilder.php
+++ b/core/modules/system/tests/modules/entity_test/src/EntityTestViewBuilder.php
@@ -7,7 +7,7 @@
namespace Drupal\entity_test;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityViewBuilder;
@@ -36,7 +36,7 @@ public function buildComponents(array &$build, array $entities, array $displays,
foreach ($entities as $id => $entity) {
$build[$id]['label'] = array(
'#weight' => -100,
- '#markup' => String::checkPlain($entity->label()),
+ '#markup' => StringHelper::checkPlain($entity->label()),
);
$build[$id]['separator'] = array(
'#weight' => -150,
@@ -44,7 +44,7 @@ public function buildComponents(array &$build, array $entities, array $displays,
);
$build[$id]['view_mode'] = array(
'#weight' => -200,
- '#markup' => String::checkPlain($view_mode),
+ '#markup' => StringHelper::checkPlain($view_mode),
);
}
}
diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestStorageForm.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestStorageForm.php
index 60e0cdb..d4b258a 100644
--- a/core/modules/system/tests/modules/form_test/src/Form/FormTestStorageForm.php
+++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestStorageForm.php
@@ -7,7 +7,7 @@
namespace Drupal\form_test\Form;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
@@ -123,7 +123,7 @@ public function continueSubmitForm(array &$form, FormStateInterface $form_state)
* {@inheritdoc}
*/
public function submitForm(array &$form, FormStateInterface $form_state) {
- drupal_set_message("Title: " . String::checkPlain($form_state->getValue('title')));
+ drupal_set_message("Title: " . StringHelper::checkPlain($form_state->getValue('title')));
drupal_set_message("Form constructions: " . $_SESSION['constructions']);
if ($form_state->has(['thing', 'changed'])) {
drupal_set_message("The thing has been changed.");
diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestStoragePageCacheForm.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestStoragePageCacheForm.php
index 223ed80..eb12613 100644
--- a/core/modules/system/tests/modules/form_test/src/Form/FormTestStoragePageCacheForm.php
+++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestStoragePageCacheForm.php
@@ -7,7 +7,7 @@
namespace Drupal\form_test\Form;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
@@ -58,7 +58,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
*/
function form_test_storage_page_cache_old_build_id($form) {
if (isset($form['#build_id_old'])) {
- $form['test_build_id_old']['#markup'] = String::checkPlain($form['#build_id_old']);
+ $form['test_build_id_old']['#markup'] = StringHelper::checkPlain($form['#build_id_old']);
}
return $form;
}
diff --git a/core/modules/system/tests/modules/form_test/src/FormTestArgumentsObject.php b/core/modules/system/tests/modules/form_test/src/FormTestArgumentsObject.php
index 9dc522c..d0ada24 100644
--- a/core/modules/system/tests/modules/form_test/src/FormTestArgumentsObject.php
+++ b/core/modules/system/tests/modules/form_test/src/FormTestArgumentsObject.php
@@ -7,7 +7,7 @@
namespace Drupal\form_test;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\ConfigFormBase;
use Drupal\Core\Form\FormStateInterface;
@@ -38,7 +38,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $arg = NU
$form['bananas'] = array(
'#type' => 'textfield',
- '#default_value' => String::checkPlain($arg),
+ '#default_value' => StringHelper::checkPlain($arg),
'#title' => $this->t('Bananas'),
);
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..b9ff6f8 100644
--- a/core/modules/system/tests/modules/menu_test/src/TestControllers.php
+++ b/core/modules/system/tests/modules/menu_test/src/TestControllers.php
@@ -7,7 +7,7 @@
namespace Drupal\menu_test;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Entity\EntityInterface;
/**
@@ -54,10 +54,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' => StringHelper::format("Sometimes there is a placeholder: '@placeholder'.", array('@placeholder' => $placeholder))];
}
else {
- return ['#markup' => String::format('Sometimes there is no placeholder.')];
+ return ['#markup' => StringHelper::format('Sometimes there is no placeholder.')];
}
}
diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php
index ca5847f..97950dc 100644
--- a/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php
+++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php
@@ -93,7 +93,7 @@ public function __construct() {
// A block plugin that requires a typed data string context to function.
$this->discovery->setDefinition('string_context', array(
- 'label' => t('String typed data'),
+ 'label' => t('StringHelper typed data'),
'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\TypedDataStringBlock',
));
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..fc93e59 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,7 +7,7 @@
namespace Drupal\session_test\Form;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
@@ -46,7 +46,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(StringHelper::format('Ok: @input', array('@input' => $form_state->getValue('input'))));
}
}
diff --git a/core/modules/taxonomy/src/Controller/TermAutocompleteController.php b/core/modules/taxonomy/src/Controller/TermAutocompleteController.php
index 08a01fc..50a7b1a 100644
--- a/core/modules/taxonomy/src/Controller/TermAutocompleteController.php
+++ b/core/modules/taxonomy/src/Controller/TermAutocompleteController.php
@@ -9,7 +9,7 @@
use Drupal\Component\Utility\Tags;
use Drupal\Component\Utility\Unicode;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Entity\Query\QueryInterface;
@@ -161,7 +161,7 @@ protected function getMatchingTerms($tags_typed, array $vids, $tag_last) {
foreach ($terms as $term) {
// Term names containing commas or quotes must be wrapped in quotes.
$name = Tags::encode($term->getName());
- $matches[] = array('value' => $prefix . $name, 'label' => String::checkPlain($term->getName()));
+ $matches[] = array('value' => $prefix . $name, 'label' => StringHelper::checkPlain($term->getName()));
}
return $matches;
}
diff --git a/core/modules/taxonomy/src/Plugin/EntityReferenceSelection/TermSelection.php b/core/modules/taxonomy/src/Plugin/EntityReferenceSelection/TermSelection.php
index 61281fb..6b55b3c 100644
--- a/core/modules/taxonomy/src/Plugin/EntityReferenceSelection/TermSelection.php
+++ b/core/modules/taxonomy/src/Plugin/EntityReferenceSelection/TermSelection.php
@@ -7,7 +7,7 @@
namespace Drupal\taxonomy\Plugin\EntityReferenceSelection;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Database\Query\SelectInterface;
use Drupal\Core\Entity\Plugin\EntityReferenceSelection\SelectionBase;
use Drupal\Core\Form\FormStateInterface;
@@ -68,7 +68,7 @@ public function getReferenceableEntities($match = NULL, $match_operator = 'CONTA
if ($vocabulary = Vocabulary::load($bundle)) {
if ($terms = $this->entityManager->getStorage('taxonomy_term')->loadTree($vocabulary->id(), 0, NULL, TRUE)) {
foreach ($terms as $term) {
- $options[$vocabulary->id()][$term->id()] = str_repeat('-', $term->depth) . String::checkPlain($term->getName());
+ $options[$vocabulary->id()][$term->id()] = str_repeat('-', $term->depth) . StringHelper::checkPlain($term->getName());
}
}
}
diff --git a/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/LinkFormatter.php b/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/LinkFormatter.php
index d94e2bf..4a92cda 100644
--- a/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/LinkFormatter.php
+++ b/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/LinkFormatter.php
@@ -8,7 +8,7 @@
namespace Drupal\taxonomy\Plugin\Field\FieldFormatter;
use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\taxonomy\Plugin\Field\FieldType\TaxonomyTermReferenceItem;
/**
@@ -34,7 +34,7 @@ public function viewElements(FieldItemListInterface $items) {
foreach ($items as $delta => $item) {
if ($item->hasNewEntity()) {
$elements[$delta] = array(
- '#markup' => String::checkPlain($item->entity->label()),
+ '#markup' => StringHelper::checkPlain($item->entity->label()),
);
}
else {
diff --git a/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/PlainFormatter.php b/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/PlainFormatter.php
index 1bf4ab4..c0e9fd4 100644
--- a/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/PlainFormatter.php
+++ b/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/PlainFormatter.php
@@ -8,7 +8,7 @@
namespace Drupal\taxonomy\Plugin\Field\FieldFormatter;
use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Plugin implementation of the 'taxonomy_term_reference_plain' formatter.
@@ -31,7 +31,7 @@ public function viewElements(FieldItemListInterface $items) {
foreach ($items as $delta => $item) {
$elements[$delta] = array(
- '#markup' => String::checkPlain($item->entity->label()),
+ '#markup' => StringHelper::checkPlain($item->entity->label()),
);
}
diff --git a/core/modules/taxonomy/src/Plugin/views/argument/IndexTid.php b/core/modules/taxonomy/src/Plugin/views/argument/IndexTid.php
index 3c59804..7abe09d 100644
--- a/core/modules/taxonomy/src/Plugin/views/argument/IndexTid.php
+++ b/core/modules/taxonomy/src/Plugin/views/argument/IndexTid.php
@@ -9,7 +9,7 @@
use Drupal\taxonomy\Entity\Term;
use Drupal\views\Plugin\views\argument\ManyToOne;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Allow taxonomy term ID(s) as argument.
@@ -24,7 +24,7 @@ public function titleQuery() {
$titles = array();
$terms = Term::loadMultiple($this->value);
foreach ($terms as $term) {
- $titles[] = String::checkPlain(\Drupal::entityManager()->getTranslationFromContext($term)->label());
+ $titles[] = StringHelper::checkPlain(\Drupal::entityManager()->getTranslationFromContext($term)->label());
}
return $titles;
}
diff --git a/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php b/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php
index e5c73cf..2556ca3 100644
--- a/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php
+++ b/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php
@@ -11,7 +11,7 @@
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\taxonomy\Entity\Term;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -140,7 +140,7 @@ public function query($group_by = FALSE) {
function title() {
$term = $this->termStorage->load($this->argument);
if (!empty($term)) {
- return String::checkPlain($term->getName());
+ return StringHelper::checkPlain($term->getName());
}
// TODO review text
return $this->t('No name');
diff --git a/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php b/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php
index 41a7f5d..5034be6 100644
--- a/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php
+++ b/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php
@@ -10,7 +10,7 @@
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\views\Plugin\views\argument\Numeric;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -56,7 +56,7 @@ function title() {
if ($this->argument) {
$term = $this->termStorage->load($this->argument);
if (!empty($term)) {
- return String::checkPlain($term->getName());
+ return StringHelper::checkPlain($term->getName());
}
}
// TODO review text
diff --git a/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php b/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php
index 597f826..55af101 100644
--- a/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php
+++ b/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php
@@ -8,7 +8,7 @@
namespace Drupal\taxonomy\Plugin\views\argument;
use Drupal\views\Plugin\views\argument\Numeric;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\taxonomy\VocabularyStorageInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -63,7 +63,7 @@ public static function create(ContainerInterface $container, array $configuratio
function title() {
$vocabulary = $this->vocabularyStorage->load($this->argument);
if ($vocabulary) {
- return String::checkPlain($vocabulary->label());
+ return StringHelper::checkPlain($vocabulary->label());
}
return $this->t('No vocabulary');
diff --git a/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php b/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php
index e8ad1e5..23ce97f 100644
--- a/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php
+++ b/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php
@@ -11,7 +11,7 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Plugin\views\field\PrerenderList;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\taxonomy\Entity\Vocabulary;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\taxonomy\VocabularyStorageInterface;
@@ -153,7 +153,7 @@ public function preRender(&$values) {
$this->items[$node_nid][$tid]['name'] = \Drupal::entityManager()->getTranslationFromContext($term)->label();
$this->items[$node_nid][$tid]['tid'] = $tid;
$this->items[$node_nid][$tid]['vocabulary_vid'] = $term->getVocabularyId();
- $this->items[$node_nid][$tid]['vocabulary'] = String::checkPlain($vocabularies[$term->getVocabularyId()]->label());
+ $this->items[$node_nid][$tid]['vocabulary'] = StringHelper::checkPlain($vocabularies[$term->getVocabularyId()]->label());
if (!empty($this->options['link_to_taxonomy'])) {
$this->items[$node_nid][$tid]['make_link'] = TRUE;
diff --git a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
index 573448d..ed11835 100644
--- a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
+++ b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
@@ -16,7 +16,7 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Plugin\views\filter\ManyToOne;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\Tags;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -183,7 +183,7 @@ protected function valueForm(&$form, FormStateInterface $form_state) {
if ($tree) {
foreach ($tree as $term) {
$choice = new \stdClass();
- $choice->option = array($term->id() => str_repeat('-', $term->depth) . String::checkPlain(\Drupal::entityManager()->getTranslationFromContext($term)->label()));
+ $choice->option = array($term->id() => str_repeat('-', $term->depth) . StringHelper::checkPlain(\Drupal::entityManager()->getTranslationFromContext($term)->label()));
$options[] = $choice;
}
}
@@ -200,7 +200,7 @@ protected function valueForm(&$form, FormStateInterface $form_state) {
}
$terms = Term::loadMultiple($query->execute());
foreach ($terms as $term) {
- $options[$term->id()] = String::checkPlain(\Drupal::entityManager()->getTranslationFromContext($term)->label());
+ $options[$term->id()] = StringHelper::checkPlain(\Drupal::entityManager()->getTranslationFromContext($term)->label());
}
}
@@ -346,7 +346,7 @@ public function adminSummary() {
$this->value = array_filter($this->value);
$terms = Term::loadMultiple($this->value);
foreach ($terms as $term) {
- $this->valueOptions[$term->id()] = String::checkPlain(\Drupal::entityManager()->getTranslationFromContext($term)->label());
+ $this->valueOptions[$term->id()] = StringHelper::checkPlain(\Drupal::entityManager()->getTranslationFromContext($term)->label());
}
}
return parent::adminSummary();
diff --git a/core/modules/taxonomy/src/Tests/TermTest.php b/core/modules/taxonomy/src/Tests/TermTest.php
index 083e28b..483a9a1 100644
--- a/core/modules/taxonomy/src/Tests/TermTest.php
+++ b/core/modules/taxonomy/src/Tests/TermTest.php
@@ -8,7 +8,7 @@
namespace Drupal\taxonomy\Tests;
use Drupal\Component\Serialization\Json;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\Tags;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
@@ -342,8 +342,8 @@ function testTermAutocompletion() {
return $item['label'];
}, $data);
- $this->assertTrue(in_array(String::checkPlain($first_term->getName()), $data), 'Autocomplete returned the first matching term');
- $this->assertTrue(in_array(String::checkPlain($second_term->getName()), $data), 'Autocomplete returned the second matching term');
+ $this->assertTrue(in_array(StringHelper::checkPlain($first_term->getName()), $data), 'Autocomplete returned the first matching term');
+ $this->assertTrue(in_array(StringHelper::checkPlain($second_term->getName()), $data), 'Autocomplete returned the second matching term');
// Try to autocomplete a term name that matches first term.
// We should only get the first term in a json encoded string.
@@ -351,7 +351,7 @@ function testTermAutocompletion() {
$path = 'taxonomy/autocomplete/node/taxonomy_' . $this->vocabulary->id();
$this->drupalGet($path, array('query' => array('q' => $input)));
$target = array(array(
- 'value' => String::checkPlain($first_term->getName()),
+ 'value' => StringHelper::checkPlain($first_term->getName()),
'label' => $first_term->getName(),
));
$this->assertRaw(Json::encode($target), 'Autocomplete returns only the expected matching term.');
@@ -364,7 +364,7 @@ function testTermAutocompletion() {
$n = Tags::encode($third_term->getName());
$target = array(array(
'value' => $n,
- 'label' => String::checkPlain($third_term->getName()),
+ 'label' => StringHelper::checkPlain($third_term->getName()),
));
$this->assertRaw(Json::encode($target), 'Autocomplete returns a term containing a comma and a slash.');
}
diff --git a/core/modules/taxonomy/src/Tests/TokenReplaceTest.php b/core/modules/taxonomy/src/Tests/TokenReplaceTest.php
index 242a23e..19ae0ba 100644
--- a/core/modules/taxonomy/src/Tests/TokenReplaceTest.php
+++ b/core/modules/taxonomy/src/Tests/TokenReplaceTest.php
@@ -7,7 +7,7 @@
namespace Drupal\taxonomy\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
@@ -96,12 +96,12 @@ function testTaxonomyTokenReplacement() {
// Generate and test sanitized tokens for term1.
$tests = array();
$tests['[term:tid]'] = $term1->id();
- $tests['[term:name]'] = String::checkPlain($term1->getName());
+ $tests['[term:name]'] = StringHelper::checkPlain($term1->getName());
$tests['[term:description]'] = $term1->description->processed;
$tests['[term:url]'] = $term1->url('canonical', array('absolute' => TRUE));
$tests['[term:node-count]'] = 0;
$tests['[term:parent:name]'] = '[term:parent:name]';
- $tests['[term:vocabulary:name]'] = String::checkPlain($this->vocabulary->label());
+ $tests['[term:vocabulary:name]'] = StringHelper::checkPlain($this->vocabulary->label());
foreach ($tests as $input => $expected) {
$output = $token_service->replace($input, array('term' => $term1), array('langcode' => $language_interface->getId()));
@@ -111,14 +111,14 @@ function testTaxonomyTokenReplacement() {
// Generate and test sanitized tokens for term2.
$tests = array();
$tests['[term:tid]'] = $term2->id();
- $tests['[term:name]'] = String::checkPlain($term2->getName());
+ $tests['[term:name]'] = StringHelper::checkPlain($term2->getName());
$tests['[term:description]'] = $term2->description->processed;
$tests['[term:url]'] = $term2->url('canonical', array('absolute' => TRUE));
$tests['[term:node-count]'] = 1;
- $tests['[term:parent:name]'] = String::checkPlain($term1->getName());
+ $tests['[term:parent:name]'] = StringHelper::checkPlain($term1->getName());
$tests['[term:parent:url]'] = $term1->url('canonical', array('absolute' => TRUE));
$tests['[term:parent:parent:name]'] = '[term:parent:parent:name]';
- $tests['[term:vocabulary:name]'] = String::checkPlain($this->vocabulary->label());
+ $tests['[term:vocabulary:name]'] = StringHelper::checkPlain($this->vocabulary->label());
// Test to make sure that we generated something for each token.
$this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
@@ -142,7 +142,7 @@ function testTaxonomyTokenReplacement() {
// Generate and test sanitized tokens.
$tests = array();
$tests['[vocabulary:vid]'] = $this->vocabulary->id();
- $tests['[vocabulary:name]'] = String::checkPlain($this->vocabulary->label());
+ $tests['[vocabulary:name]'] = StringHelper::checkPlain($this->vocabulary->label());
$tests['[vocabulary:description]'] = Xss::filter($this->vocabulary->getDescription());
$tests['[vocabulary:node-count]'] = 1;
$tests['[vocabulary:term-count]'] = 2;
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index c1896fd..cdc6eb6 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -19,7 +19,7 @@
use Drupal\taxonomy\Entity\Vocabulary;
use Drupal\taxonomy\TermInterface;
use Drupal\taxonomy\VocabularyInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Denotes that no term in the vocabulary has a parent.
diff --git a/core/modules/taxonomy/taxonomy.tokens.inc b/core/modules/taxonomy/taxonomy.tokens.inc
index 08c5c89..e97c9ce 100644
--- a/core/modules/taxonomy/taxonomy.tokens.inc
+++ b/core/modules/taxonomy/taxonomy.tokens.inc
@@ -5,7 +5,7 @@
* Builds placeholder replacement tokens for taxonomy terms and vocabularies.
*/
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\Xss;
use Drupal\taxonomy\Entity\Vocabulary;
@@ -108,7 +108,7 @@ function taxonomy_tokens($type, $tokens, array $data = array(), array $options =
break;
case 'name':
- $replacements[$original] = $sanitize ? String::checkPlain($term->getName()) : $term->getName();
+ $replacements[$original] = $sanitize ? StringHelper::checkPlain($term->getName()) : $term->getName();
break;
case 'description':
@@ -129,13 +129,13 @@ function taxonomy_tokens($type, $tokens, array $data = array(), array $options =
case 'vocabulary':
$vocabulary = Vocabulary::load($term->bundle());
- $replacements[$original] = String::checkPlain($vocabulary->label());
+ $replacements[$original] = StringHelper::checkPlain($vocabulary->label());
break;
case 'parent':
if ($parents = taxonomy_term_load_parents($term->id())) {
$parent = array_pop($parents);
- $replacements[$original] = String::checkPlain($parent->getName());
+ $replacements[$original] = StringHelper::checkPlain($parent->getName());
}
break;
}
@@ -162,7 +162,7 @@ function taxonomy_tokens($type, $tokens, array $data = array(), array $options =
break;
case 'name':
- $replacements[$original] = $sanitize ? String::checkPlain($vocabulary->label()) : $vocabulary->label();
+ $replacements[$original] = $sanitize ? StringHelper::checkPlain($vocabulary->label()) : $vocabulary->label();
break;
case 'description':
diff --git a/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php b/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php
index 9a79fab..444fa81 100644
--- a/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php
+++ b/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php
@@ -43,7 +43,7 @@ public static function propertyDefinitions(FieldStorageDefinitionInterface $fiel
* {@inheritdoc}
*/
public function applyDefaultValue($notify = TRUE) {
- // Default to a simple \Drupal\Component\Utility\String::checkPlain().
+ // Default to a simple \Drupal\Component\Utility\StringHelper::checkPlain().
// @todo: Add in the filter default format here.
$this->setValue(array('format' => NULL), $notify);
return $this;
diff --git a/core/modules/text/src/Tests/TextFieldTest.php b/core/modules/text/src/Tests/TextFieldTest.php
index 494d338..b353be5 100644
--- a/core/modules/text/src/Tests/TextFieldTest.php
+++ b/core/modules/text/src/Tests/TextFieldTest.php
@@ -7,7 +7,7 @@
namespace Drupal\text\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\Unicode;
use Drupal\field\Tests\String\StringFieldTest;
diff --git a/core/modules/text/src/TextProcessed.php b/core/modules/text/src/TextProcessed.php
index d06ce01..aa40436 100644
--- a/core/modules/text/src/TextProcessed.php
+++ b/core/modules/text/src/TextProcessed.php
@@ -8,7 +8,7 @@
namespace Drupal\text;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\TypedData\DataDefinitionInterface;
use Drupal\Core\TypedData\TypedDataInterface;
use Drupal\Core\TypedData\TypedData;
@@ -51,7 +51,7 @@ public function getValue($langcode = NULL) {
$text = $item->{($this->definition->getSetting('text source'))};
// Avoid running check_markup() or
- // \Drupal\Component\Utility\String::checkPlain() on empty strings.
+ // \Drupal\Component\Utility\StringHelper::checkPlain() on empty strings.
if (!isset($text) || $text === '') {
$this->processed = '';
}
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index 50704d0..c84e61c 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -12,7 +12,7 @@
use Drupal\Core\Template\Attribute;
use Drupal\Component\Datetime\DateTimePlus;
use Drupal\Component\Utility\Crypt;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\user\Entity\Role;
use Drupal\Core\Url;
@@ -252,7 +252,7 @@ function toolbar_menu_navigation_links(array $tree) {
$element->options['attributes']['id'] = 'toolbar-link-' . $id;
$element->options['attributes']['class'][] = 'toolbar-icon';
$element->options['attributes']['class'][] = 'toolbar-icon-' . strtolower(str_replace(array('.', ' ', '_'), array('-', '-', '-'), $definition['id']));
- $element->options['attributes']['title'] = String::checkPlain($link->getDescription());
+ $element->options['attributes']['title'] = StringHelper::checkPlain($link->getDescription());
}
return $tree;
}
diff --git a/core/modules/tour/src/Plugin/tour/tip/TipPluginText.php b/core/modules/tour/src/Plugin/tour/tip/TipPluginText.php
index 8cb9261..c905285 100644
--- a/core/modules/tour/src/Plugin/tour/tip/TipPluginText.php
+++ b/core/modules/tour/src/Plugin/tour/tip/TipPluginText.php
@@ -8,7 +8,7 @@
namespace Drupal\tour\Plugin\tour\tip;
use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Utility\Token;
@@ -121,7 +121,7 @@ public function getAttributes() {
* {@inheritdoc}
*/
public function getOutput() {
- $output = '' . String::checkPlain($this->getLabel()) . '
';
+ $output = '' . StringHelper::checkPlain($this->getLabel()) . '
';
$output .= '' . Xss::filterAdmin($this->token->replace($this->getBody())) . '
';
return array('#markup' => $output);
}
diff --git a/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImage.php b/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImage.php
index 951406c..b63a608 100644
--- a/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImage.php
+++ b/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImage.php
@@ -7,7 +7,7 @@
namespace Drupal\tour_test\Plugin\tour\tip;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\tour\TipPluginBase;
/**
@@ -45,7 +45,7 @@ public function getOutput() {
'#uri' => $this->get('url'),
'#alt' => $this->get('alt'),
);
- $output = '' . String::checkPlain($this->get('label')) . '
';
+ $output = '' . StringHelper::checkPlain($this->get('label')) . '
';
$output .= '' . drupal_render($image) . '
';
return array('#markup' => $output);
}
diff --git a/core/modules/tracker/src/Controller/TrackerUserTab.php b/core/modules/tracker/src/Controller/TrackerUserTab.php
index 49a7574..1e03c1d 100644
--- a/core/modules/tracker/src/Controller/TrackerUserTab.php
+++ b/core/modules/tracker/src/Controller/TrackerUserTab.php
@@ -9,7 +9,7 @@
use Drupal\Core\Controller\ControllerBase;
use Drupal\user\UserInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Controller for tracker.user_tab route.
@@ -28,6 +28,6 @@ public function getContent(UserInterface $user) {
* Title callback for the tracker.user_tab route.
*/
public function getTitle(UserInterface $user) {
- return String::checkPlain($user->getUsername());
+ return StringHelper::checkPlain($user->getUsername());
}
}
diff --git a/core/modules/tracker/tracker.pages.inc b/core/modules/tracker/tracker.pages.inc
index 2b32ed3..de82652 100644
--- a/core/modules/tracker/tracker.pages.inc
+++ b/core/modules/tracker/tracker.pages.inc
@@ -5,7 +5,7 @@
* User page callbacks for tracker.module.
*/
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\node\Entity\Node;
/**
@@ -91,7 +91,7 @@ function tracker_page($account = NULL) {
);
$row = array(
- 'type' => String::checkPlain(node_get_type_label($node)),
+ 'type' => StringHelper::checkPlain(node_get_type_label($node)),
'title' => array(
'data' => array(
'#type' => 'link',
diff --git a/core/modules/update/src/Form/UpdateManagerUpdate.php b/core/modules/update/src/Form/UpdateManagerUpdate.php
index ce342e1..94adb06 100644
--- a/core/modules/update/src/Form/UpdateManagerUpdate.php
+++ b/core/modules/update/src/Form/UpdateManagerUpdate.php
@@ -7,7 +7,7 @@
namespace Drupal\update\Form;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
@@ -115,14 +115,14 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$project_name = $this->l($project['title'], Url::fromUri($project['link']));
}
else {
- $project_name = String::checkPlain($project['title']);
+ $project_name = StringHelper::checkPlain($project['title']);
}
}
elseif (!empty($project['info']['name'])) {
- $project_name = String::checkPlain($project['info']['name']);
+ $project_name = StringHelper::checkPlain($project['info']['name']);
}
else {
- $project_name = String::checkPlain($name);
+ $project_name = StringHelper::checkPlain($name);
}
if ($project['project_type'] == 'theme' || $project['project_type'] == 'theme-disabled') {
$project_name .= ' ' . $this->t('(Theme)');
diff --git a/core/modules/user/src/AccountForm.php b/core/modules/user/src/AccountForm.php
index 8c14682..316b200 100644
--- a/core/modules/user/src/AccountForm.php
+++ b/core/modules/user/src/AccountForm.php
@@ -210,7 +210,7 @@ public function form(array $form, FormStateInterface $form_state) {
'#access' => $admin,
);
- $roles = array_map(array('\Drupal\Component\Utility\String', 'checkPlain'), user_role_names(TRUE));
+ $roles = array_map(array('\Drupal\Component\Utility\StringHelper', 'checkPlain'), user_role_names(TRUE));
$form['account']['roles'] = array(
'#type' => 'checkboxes',
diff --git a/core/modules/user/src/Form/UserMultipleCancelConfirm.php b/core/modules/user/src/Form/UserMultipleCancelConfirm.php
index 432544b..0edcbcc 100644
--- a/core/modules/user/src/Form/UserMultipleCancelConfirm.php
+++ b/core/modules/user/src/Form/UserMultipleCancelConfirm.php
@@ -7,7 +7,7 @@
namespace Drupal\user\Form;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\Core\Form\FormStateInterface;
@@ -119,7 +119,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
'#type' => 'hidden',
'#value' => $uid,
'#prefix' => '',
- '#suffix' => String::checkPlain($account->label()) . "\n",
+ '#suffix' => StringHelper::checkPlain($account->label()) . "\n",
);
}
diff --git a/core/modules/user/src/Form/UserPermissionsForm.php b/core/modules/user/src/Form/UserPermissionsForm.php
index d0b166f..bdb696e 100644
--- a/core/modules/user/src/Form/UserPermissionsForm.php
+++ b/core/modules/user/src/Form/UserPermissionsForm.php
@@ -7,7 +7,7 @@
namespace Drupal\user\Form;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\user\PermissionHandlerInterface;
@@ -82,7 +82,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$admin_roles = array();
foreach ($this->getRoles() as $role_name => $role) {
// Retrieve role names for columns.
- $role_names[$role_name] = String::checkPlain($role->label());
+ $role_names[$role_name] = StringHelper::checkPlain($role->label());
// Fetch permissions for the roles.
$role_permissions[$role_name] = $role->getPermissions();
$admin_roles[$role_name] = $role->isAdmin();
diff --git a/core/modules/user/src/Plugin/Condition/UserRole.php b/core/modules/user/src/Plugin/Condition/UserRole.php
index 1462c8f..564fcb1 100644
--- a/core/modules/user/src/Plugin/Condition/UserRole.php
+++ b/core/modules/user/src/Plugin/Condition/UserRole.php
@@ -33,7 +33,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
'#type' => 'checkboxes',
'#title' => $this->t('When the user has the following roles'),
'#default_value' => $this->configuration['roles'],
- '#options' => array_map('\Drupal\Component\Utility\String::checkPlain', user_role_names()),
+ '#options' => array_map('\Drupal\Component\Utility\StringHelper::checkPlain', user_role_names()),
'#description' => $this->t('If you select no roles, the condition will evaluate to TRUE for all users.'),
);
return parent::buildConfigurationForm($form, $form_state);
diff --git a/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequired.php b/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequired.php
index 77c08b3..c937d5a 100644
--- a/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequired.php
+++ b/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequired.php
@@ -7,7 +7,7 @@
namespace Drupal\user\Plugin\Validation\Constraint;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintValidatorInterface;
use Symfony\Component\Validator\ExecutionContextInterface;
@@ -70,7 +70,7 @@ public function validate($items, Constraint $constraint) {
$required = !(!$existing_value && \Drupal::currentUser()->hasPermission('administer users'));
if ($required && (!isset($items) || $items->isEmpty())) {
- $this->context->addViolation($this->message, array('!name' => String::placeholder($account->getFieldDefinition('mail')->getLabel())));
+ $this->context->addViolation($this->message, array('!name' => StringHelper::placeholder($account->getFieldDefinition('mail')->getLabel())));
}
}
diff --git a/core/modules/user/src/Plugin/views/access/Permission.php b/core/modules/user/src/Plugin/views/access/Permission.php
index e7c4691..e2da9af 100644
--- a/core/modules/user/src/Plugin/views/access/Permission.php
+++ b/core/modules/user/src/Plugin/views/access/Permission.php
@@ -7,7 +7,7 @@
namespace Drupal\user\Plugin\views\access;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Session\AccountInterface;
use Drupal\user\PermissionHandlerInterface;
@@ -110,7 +110,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
foreach ($permissions as $perm => $perm_item) {
$provider = $perm_item['provider'];
$display_name = $module_info[$provider]['name'];
- $perms[$display_name][$perm] = String::checkPlain(strip_tags($perm_item['title']));
+ $perms[$display_name][$perm] = StringHelper::checkPlain(strip_tags($perm_item['title']));
}
$form['perm'] = array(
diff --git a/core/modules/user/src/Plugin/views/access/Role.php b/core/modules/user/src/Plugin/views/access/Role.php
index 345086d..dd3fad3 100644
--- a/core/modules/user/src/Plugin/views/access/Role.php
+++ b/core/modules/user/src/Plugin/views/access/Role.php
@@ -7,7 +7,7 @@
namespace Drupal\user\Plugin\views\access;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormStateInterface;
use Drupal\user\RoleStorageInterface;
use Drupal\views\Plugin\views\access\AccessPluginBase;
@@ -96,7 +96,7 @@ public function summaryTitle() {
else {
$rids = user_role_names();
$rid = reset($this->options['role']);
- return String::checkPlain($rids[$rid]);
+ return StringHelper::checkPlain($rids[$rid]);
}
}
@@ -114,7 +114,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#type' => 'checkboxes',
'#title' => $this->t('Role'),
'#default_value' => $this->options['role'],
- '#options' => array_map('\Drupal\Component\Utility\String::checkPlain', user_role_names()),
+ '#options' => array_map('\Drupal\Component\Utility\StringHelper::checkPlain', user_role_names()),
'#description' => $this->t('Only the checked roles will be able to access this display.'),
);
}
diff --git a/core/modules/user/src/Plugin/views/argument/RolesRid.php b/core/modules/user/src/Plugin/views/argument/RolesRid.php
index bbc5ab9..86a8e40 100644
--- a/core/modules/user/src/Plugin/views/argument/RolesRid.php
+++ b/core/modules/user/src/Plugin/views/argument/RolesRid.php
@@ -7,7 +7,7 @@
namespace Drupal\user\Plugin\views\argument;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\views\Plugin\views\argument\ManyToOne;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -60,7 +60,7 @@ public function title_query() {
$entities = $this->roleStorage->loadMultiple($this->value);
$titles = array();
foreach ($entities as $entity) {
- $titles[] = String::checkPlain($entity->label());
+ $titles[] = StringHelper::checkPlain($entity->label());
}
return $titles;
}
diff --git a/core/modules/user/src/Plugin/views/argument/Uid.php b/core/modules/user/src/Plugin/views/argument/Uid.php
index 2c4a087..23fa93d 100644
--- a/core/modules/user/src/Plugin/views/argument/Uid.php
+++ b/core/modules/user/src/Plugin/views/argument/Uid.php
@@ -7,7 +7,7 @@
namespace Drupal\user\Plugin\views\argument;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\views\Plugin\views\argument\Numeric;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -61,7 +61,7 @@ public static function create(ContainerInterface $container, array $configuratio
*/
public function titleQuery() {
return array_map(function($account) {
- return String::checkPlain($account->label());
+ return StringHelper::checkPlain($account->label());
}, $this->storage->loadMultiple($this->value));
}
diff --git a/core/modules/user/src/Plugin/views/argument_validator/User.php b/core/modules/user/src/Plugin/views/argument_validator/User.php
index 20b94f4..b496ff8 100644
--- a/core/modules/user/src/Plugin/views/argument_validator/User.php
+++ b/core/modules/user/src/Plugin/views/argument_validator/User.php
@@ -65,7 +65,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
$form['roles'] = array(
'#type' => 'checkboxes',
'#title' => $this->t('Restrict to the selected roles'),
- '#options' => array_map(array('\Drupal\Component\Utility\String', 'checkPlain'), user_role_names(TRUE)),
+ '#options' => array_map(array('\Drupal\Component\Utility\StringHelper', 'checkPlain'), user_role_names(TRUE)),
'#default_value' => $this->options['roles'],
'#description' => $this->t('If no roles are selected, users from any role will be allowed.'),
'#states' => array(
diff --git a/core/modules/user/src/Plugin/views/field/Name.php b/core/modules/user/src/Plugin/views/field/Name.php
index cc91eea..371e945 100644
--- a/core/modules/user/src/Plugin/views/field/Name.php
+++ b/core/modules/user/src/Plugin/views/field/Name.php
@@ -7,7 +7,7 @@
namespace Drupal\user\Plugin\views\field;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormStateInterface;
use Drupal\user\Plugin\views\field\User;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
@@ -86,7 +86,7 @@ protected function renderLink($data, ResultRow $values) {
$account->name = $this->getValue($values);
if (!empty($this->options['overwrite_anonymous']) && !$account->id()) {
// This is an anonymous user, and we're overriting the text.
- return String::checkPlain($this->options['anonymous_text']);
+ return StringHelper::checkPlain($this->options['anonymous_text']);
}
elseif (!empty($this->options['link_to_user'])) {
$account->name = $this->getValue($values);
diff --git a/core/modules/user/src/Plugin/views/field/Roles.php b/core/modules/user/src/Plugin/views/field/Roles.php
index 4ba1309..bdaec3c 100644
--- a/core/modules/user/src/Plugin/views/field/Roles.php
+++ b/core/modules/user/src/Plugin/views/field/Roles.php
@@ -7,7 +7,7 @@
namespace Drupal\user\Plugin\views\field;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Database\Connection;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ViewExecutable;
@@ -81,7 +81,7 @@ public function preRender(&$values) {
$roles = user_roles();
$result = $this->database->query('SELECT u.entity_id as uid, u.roles_target_id as rid FROM {user__roles} u WHERE u.entity_id IN ( :uids[] ) AND u.roles_target_id IN ( :rids[] )', array(':uids[]' => $uids, ':rids[]' => array_keys($roles)));
foreach ($result as $role) {
- $this->items[$role->uid][$role->rid]['role'] = String::checkPlain($roles[$role->rid]->label());
+ $this->items[$role->uid][$role->rid]['role'] = StringHelper::checkPlain($roles[$role->rid]->label());
$this->items[$role->uid][$role->rid]['rid'] = $role->rid;
}
// Sort the roles for each user by role weight.
diff --git a/core/modules/user/src/Plugin/views/filter/Permissions.php b/core/modules/user/src/Plugin/views/filter/Permissions.php
index a3b26aa..4c4648a 100644
--- a/core/modules/user/src/Plugin/views/filter/Permissions.php
+++ b/core/modules/user/src/Plugin/views/filter/Permissions.php
@@ -7,7 +7,7 @@
namespace Drupal\user\Plugin\views\filter;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\user\PermissionHandlerInterface;
use Drupal\views\Plugin\views\filter\ManyToOne;
@@ -67,7 +67,7 @@ public function getValueOptions() {
foreach ($permissions as $perm => $perm_item) {
$provider = $perm_item['provider'];
$display_name = $module_info[$provider]['name'];
- $this->valueOptions[$display_name][$perm] = String::checkPlain(strip_tags($perm_item['title']));
+ $this->valueOptions[$display_name][$perm] = StringHelper::checkPlain(strip_tags($perm_item['title']));
}
}
else {
diff --git a/core/modules/user/src/PrivateTempStore.php b/core/modules/user/src/PrivateTempStore.php
index e99d5fc..0e51ba2 100644
--- a/core/modules/user/src/PrivateTempStore.php
+++ b/core/modules/user/src/PrivateTempStore.php
@@ -7,7 +7,7 @@
namespace Drupal\user;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface;
use Drupal\Core\Lock\LockBackendInterface;
use Drupal\Core\Session\AccountProxyInterface;
@@ -122,7 +122,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(StringHelper::format("Couldn't acquire lock to update item %key in %collection temporary storage.", array(
'%key' => $key,
'%collection' => $this->storage->getCollectionName(),
)));
@@ -180,7 +180,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(StringHelper::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..76b5598 100644
--- a/core/modules/user/src/SharedTempStore.php
+++ b/core/modules/user/src/SharedTempStore.php
@@ -7,7 +7,7 @@
namespace Drupal\user;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface;
use Drupal\Core\Lock\LockBackendInterface;
@@ -185,7 +185,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(StringHelper::format("Couldn't acquire lock to update item %key in %collection temporary storage.", array(
'%key' => $key,
'%collection' => $this->storage->getCollectionName(),
)));
@@ -231,7 +231,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(StringHelper::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..57bbc5b 100644
--- a/core/modules/user/src/Tests/Condition/UserRoleConditionTest.php
+++ b/core/modules/user/src/Tests/Condition/UserRoleConditionTest.php
@@ -7,7 +7,7 @@
namespace Drupal\user\Tests\Condition;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\simpletest\KernelTestBase;
use Drupal\user\Entity\Role;
use Drupal\user\Entity\User;
@@ -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(), StringHelper::format('The user is a member of @roles', array('@roles' => $this->role->label())));
}
}
diff --git a/core/modules/user/src/Tests/UserTokenReplaceTest.php b/core/modules/user/src/Tests/UserTokenReplaceTest.php
index 897e2aa..7fa0b39 100644
--- a/core/modules/user/src/Tests/UserTokenReplaceTest.php
+++ b/core/modules/user/src/Tests/UserTokenReplaceTest.php
@@ -7,7 +7,7 @@
namespace Drupal\user\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\simpletest\WebTestBase;
@@ -55,15 +55,15 @@ function testUserTokenReplacement() {
// Generate and test sanitized tokens.
$tests = array();
$tests['[user:uid]'] = $account->id();
- $tests['[user:name]'] = String::checkPlain(user_format_name($account));
- $tests['[user:mail]'] = String::checkPlain($account->getEmail());
+ $tests['[user:name]'] = StringHelper::checkPlain(user_format_name($account));
+ $tests['[user:mail]'] = StringHelper::checkPlain($account->getEmail());
$tests['[user:url]'] = $account->url('canonical', $url_options);
$tests['[user:edit-url]'] = $account->url('edit-form', $url_options);
$tests['[user:last-login]'] = format_date($account->getLastLoginTime(), 'medium', '', NULL, $language_interface->getId());
$tests['[user:last-login:short]'] = format_date($account->getLastLoginTime(), 'short', '', NULL, $language_interface->getId());
$tests['[user:created]'] = format_date($account->getCreatedTime(), 'medium', '', NULL, $language_interface->getId());
$tests['[user:created:short]'] = format_date($account->getCreatedTime(), 'short', '', NULL, $language_interface->getId());
- $tests['[current-user:name]'] = String::checkPlain(user_format_name($global_account));
+ $tests['[current-user:name]'] = StringHelper::checkPlain(user_format_name($global_account));
// Test to make sure that we generated something for each token.
$this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
diff --git a/core/modules/user/src/Tests/UserValidationTest.php b/core/modules/user/src/Tests/UserValidationTest.php
index acc64b7..415d674 100644
--- a/core/modules/user/src/Tests/UserValidationTest.php
+++ b/core/modules/user/src/Tests/UserValidationTest.php
@@ -7,7 +7,7 @@
namespace Drupal\user\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Field\Plugin\Field\FieldType\EmailItem;
use Drupal\Core\Language\Language;
@@ -136,7 +136,7 @@ function testValidation() {
$violations = $user->validate();
$this->assertEqual(count($violations), 1, 'E-mail addresses may not be removed');
$this->assertEqual($violations[0]->getPropertyPath(), 'mail');
- $this->assertEqual($violations[0]->getMessage(), t('!name field is required.', array('!name' => String::placeholder($user->getFieldDefinition('mail')->getLabel()))));
+ $this->assertEqual($violations[0]->getMessage(), t('!name field is required.', array('!name' => StringHelper::placeholder($user->getFieldDefinition('mail')->getLabel()))));
$user->set('mail', 'someone@example.com');
$user->set('signature', $this->randomString(256));
diff --git a/core/modules/user/src/Tests/Views/BulkFormAccessTest.php b/core/modules/user/src/Tests/Views/BulkFormAccessTest.php
index 8f9b613..ef8114f 100644
--- a/core/modules/user/src/Tests/Views/BulkFormAccessTest.php
+++ b/core/modules/user/src/Tests/Views/BulkFormAccessTest.php
@@ -6,7 +6,7 @@
*/
namespace Drupal\user\Tests\Views;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\user\Entity\User;
/**
@@ -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(StringHelper::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/src/Tests/Views/HandlerFilterPermissionTest.php b/core/modules/user/src/Tests/Views/HandlerFilterPermissionTest.php
index 27a7715..8369dc4 100644
--- a/core/modules/user/src/Tests/Views/HandlerFilterPermissionTest.php
+++ b/core/modules/user/src/Tests/Views/HandlerFilterPermissionTest.php
@@ -7,7 +7,7 @@
namespace Drupal\user\Tests\Views;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\user\Tests\Views\UserUnitTestBase;
use Drupal\views\Views;
@@ -87,7 +87,7 @@ public function testFilterPermission() {
}
foreach (array('system' => 'System', 'user' => 'User') as $module => $title) {
$expected = array_map(function ($permission) {
- return String::checkPlain(strip_tags($permission['title']));
+ return StringHelper::checkPlain(strip_tags($permission['title']));
}, $permission_by_module[$module]);
$this->assertEqual($expected, $value_options[$title], 'Ensure the all permissions are available');
diff --git a/core/modules/user/src/Tests/Views/HandlerFilterRolesTest.php b/core/modules/user/src/Tests/Views/HandlerFilterRolesTest.php
index 6ed889b..71da8e7 100644
--- a/core/modules/user/src/Tests/Views/HandlerFilterRolesTest.php
+++ b/core/modules/user/src/Tests/Views/HandlerFilterRolesTest.php
@@ -7,7 +7,7 @@
namespace Drupal\user\Tests\Views;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\user\Entity\Role;
use Drupal\user\Tests\Views\UserUnitTestBase;
use Drupal\views\Entity\View;
diff --git a/core/modules/user/src/UserListBuilder.php b/core/modules/user/src/UserListBuilder.php
index 544bd40..fac3892 100644
--- a/core/modules/user/src/UserListBuilder.php
+++ b/core/modules/user/src/UserListBuilder.php
@@ -126,7 +126,7 @@ public function buildRow(EntityInterface $entity) {
);
$row['status'] = $entity->isActive() ? $this->t('active') : $this->t('blocked');
- $roles = array_map('\Drupal\Component\Utility\String::checkPlain', user_role_names(TRUE));
+ $roles = array_map('\Drupal\Component\Utility\StringHelper::checkPlain', user_role_names(TRUE));
unset($roles[RoleInterface::AUTHENTICATED_ID]);
$users_roles = array();
foreach ($entity->getRoles() as $role) {
diff --git a/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php b/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php
index 04cdef9..311a027 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\StringHelper;
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 = StringHelper::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/user/tests/src/Unit/Views/Argument/RolesRidTest.php b/core/modules/user/tests/src/Unit/Views/Argument/RolesRidTest.php
index d6566cc..34b8ce0 100644
--- a/core/modules/user/tests/src/Unit/Views/Argument/RolesRidTest.php
+++ b/core/modules/user/tests/src/Unit/Views/Argument/RolesRidTest.php
@@ -7,7 +7,7 @@
namespace Drupal\Tests\user\Unit\Views\Argument;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Tests\UnitTestCase;
use Drupal\user\Entity\Role;
@@ -81,7 +81,7 @@ public function testTitleQuery() {
$roles_rid_argument->value = array('test_rid_1', 'test_rid_2');
$titles = $roles_rid_argument->title_query();
- $this->assertEquals(array('test rid 1', String::checkPlain('test rid 2')), $titles);
+ $this->assertEquals(array('test rid 1', StringHelper::checkPlain('test rid 2')), $titles);
}
}
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 665b43d..33dc6ae 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1,7 +1,7 @@
hasPermission('access user profiles');
$external = FALSE;
diff --git a/core/modules/user/user.tokens.inc b/core/modules/user/user.tokens.inc
index 073b90f..d6d5d21 100644
--- a/core/modules/user/user.tokens.inc
+++ b/core/modules/user/user.tokens.inc
@@ -5,7 +5,7 @@
* Builds placeholder replacement tokens for user-related data.
*/
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Implements hook_token_info().
@@ -90,11 +90,11 @@ function user_tokens($type, $tokens, array $data = array(), array $options = arr
case 'name':
$name = user_format_name($account);
- $replacements[$original] = $sanitize ? String::checkPlain($name) : $name;
+ $replacements[$original] = $sanitize ? StringHelper::checkPlain($name) : $name;
break;
case 'mail':
- $replacements[$original] = $sanitize ? String::checkPlain($account->getEmail()) : $account->getEmail();
+ $replacements[$original] = $sanitize ? StringHelper::checkPlain($account->getEmail()) : $account->getEmail();
break;
case 'url':
diff --git a/core/modules/views/src/Form/ViewsExposedForm.php b/core/modules/views/src/Form/ViewsExposedForm.php
index c87113c..c83f768 100644
--- a/core/modules/views/src/Form/ViewsExposedForm.php
+++ b/core/modules/views/src/Form/ViewsExposedForm.php
@@ -8,7 +8,7 @@
namespace Drupal\views\Form;
use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
@@ -118,7 +118,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$form['#action'] = $view->hasUrl() ? $view->getUrl()->toString() : Url::fromRoute('')->toString();
$form['#theme'] = $view->buildThemeFunctions('views_exposed_form');
- $form['#id'] = Html::cleanCssIdentifier('views_exposed_form-' . String::checkPlain($view->storage->id()) . '-' . String::checkPlain($display['id']));
+ $form['#id'] = Html::cleanCssIdentifier('views_exposed_form-' . StringHelper::checkPlain($view->storage->id()) . '-' . StringHelper::checkPlain($display['id']));
/** @var \Drupal\views\Plugin\views\exposed_form\ExposedFormPluginBase $exposed_form_plugin */
$exposed_form_plugin = $view->display_handler->getPlugin('exposed_form');
diff --git a/core/modules/views/src/Plugin/views/BrokenHandlerTrait.php b/core/modules/views/src/Plugin/views/BrokenHandlerTrait.php
index c579c2b..350ea33 100644
--- a/core/modules/views/src/Plugin/views/BrokenHandlerTrait.php
+++ b/core/modules/views/src/Plugin/views/BrokenHandlerTrait.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\views;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormStateInterface;
/**
@@ -60,7 +60,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[] = StringHelper::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..3284e22 100644
--- a/core/modules/views/src/Plugin/views/HandlerBase.php
+++ b/core/modules/views/src/Plugin/views/HandlerBase.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\views;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\Unicode;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Component\Utility\Xss;
@@ -181,7 +181,7 @@ protected function defineOptions() {
*/
public function adminLabel($short = FALSE) {
if (!empty($this->options['admin_label'])) {
- $title = String::checkPlain($this->options['admin_label']);
+ $title = StringHelper::checkPlain($this->options['admin_label']);
return $title;
}
$title = ($short && isset($this->definition['title short'])) ? $this->definition['title short'] : $this->definition['title'];
@@ -230,10 +230,10 @@ public function sanitizeValue($value, $type = NULL) {
$value = Xss::filterAdmin($value);
break;
case 'url':
- $value = String::checkPlain(UrlHelper::stripDangerousProtocols($value));
+ $value = StringHelper::checkPlain(UrlHelper::stripDangerousProtocols($value));
break;
default:
- $value = String::checkPlain($value);
+ $value = StringHelper::checkPlain($value);
break;
}
return $value;
@@ -721,7 +721,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(StringHelper::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/PluginBase.php b/core/modules/views/src/Plugin/views/PluginBase.php
index 4d252e2..84b64b6 100644
--- a/core/modules/views/src/Plugin/views/PluginBase.php
+++ b/core/modules/views/src/Plugin/views/PluginBase.php
@@ -8,7 +8,7 @@
namespace Drupal\views\Plugin\views;
use Drupal\Component\Plugin\DependentPluginInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Language\LanguageInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
@@ -313,9 +313,9 @@ public function summaryTitle() {
public function pluginTitle() {
// Short_title is optional so its defaults to an empty string.
if (!empty($this->definition['short_title'])) {
- return String::checkPlain($this->definition['short_title']);
+ return StringHelper::checkPlain($this->definition['short_title']);
}
- return String::checkPlain($this->definition['title']);
+ return StringHelper::checkPlain($this->definition['title']);
}
/**
diff --git a/core/modules/views/src/Plugin/views/ViewsHandlerInterface.php b/core/modules/views/src/Plugin/views/ViewsHandlerInterface.php
index 9e814b2..7fbeda9 100644
--- a/core/modules/views/src/Plugin/views/ViewsHandlerInterface.php
+++ b/core/modules/views/src/Plugin/views/ViewsHandlerInterface.php
@@ -72,7 +72,7 @@ public function getJoin();
* @param $value
* The value being rendered.
* @param $type
- * The type of sanitization needed. If not provided, String::checkPlain() is used.
+ * The type of sanitization needed. If not provided, StringHelper::checkPlain() is used.
*
* @return string
* Returns the safe value.
diff --git a/core/modules/views/src/Plugin/views/area/Result.php b/core/modules/views/src/Plugin/views/area/Result.php
index 0182c06..44d4b2c 100644
--- a/core/modules/views/src/Plugin/views/area/Result.php
+++ b/core/modules/views/src/Plugin/views/area/Result.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\views\area;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Form\FormStateInterface;
use Drupal\views\Plugin\views\style\DefaultSummary;
@@ -88,7 +88,7 @@ public function render($empty = FALSE) {
// @TODO: Maybe use a possible is views empty functionality.
// Not every view has total_rows set, use view->result instead.
$total = isset($this->view->total_rows) ? $this->view->total_rows : count($this->view->result);
- $label = String::checkPlain($this->view->storage->label());
+ $label = StringHelper::checkPlain($this->view->storage->label());
if ($per_page === 0) {
$page_count = 1;
$start = 1;
diff --git a/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php b/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
index 069276b..18a4df1 100644
--- a/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
+++ b/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
@@ -10,7 +10,7 @@
use Drupal\Component\Plugin\DependentPluginInterface;
use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\NestedArray;
-use Drupal\Component\Utility\String as UtilityString;
+use Drupal\Component\Utility\StringHelper as UtilityString;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Render\Element;
use Drupal\views\Plugin\CacheablePluginInterface;
diff --git a/core/modules/views/src/Plugin/views/argument/FieldList.php b/core/modules/views/src/Plugin/views/argument/FieldList.php
index 39d02cb..dccafd7 100644
--- a/core/modules/views/src/Plugin/views/argument/FieldList.php
+++ b/core/modules/views/src/Plugin/views/argument/FieldList.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\views\argument;
-use Drupal\Component\Utility\String as UtilityString;
+use Drupal\Component\Utility\StringHelper as UtilityString;
use Drupal\Core\Field\AllowedTagsXssTrait;
use Drupal\Core\Form\FormStateInterface;
use Drupal\views\ViewExecutable;
diff --git a/core/modules/views/src/Plugin/views/argument/ListString.php b/core/modules/views/src/Plugin/views/argument/ListString.php
index f24ca79..f12904f 100644
--- a/core/modules/views/src/Plugin/views/argument/ListString.php
+++ b/core/modules/views/src/Plugin/views/argument/ListString.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\views\argument;
-use Drupal\Component\Utility\String as UtilityString;
+use Drupal\Component\Utility\StringHelper as UtilityString;
use Drupal\Core\Field\AllowedTagsXssTrait;
use Drupal\Core\Form\FormStateInterface;
use Drupal\views\ViewExecutable;
diff --git a/core/modules/views/src/Plugin/views/argument/String.php b/core/modules/views/src/Plugin/views/argument/String.php
index b542bfb..d0dda9c 100644
--- a/core/modules/views/src/Plugin/views/argument/String.php
+++ b/core/modules/views/src/Plugin/views/argument/String.php
@@ -285,7 +285,7 @@ function title() {
* Override for specific title lookups.
*/
public function titleQuery() {
- return array_map('\Drupal\Component\Utility\String::checkPlain', array_combine($this->value, $this->value));
+ return array_map('\Drupal\Component\Utility\StringHelper::checkPlain', array_combine($this->value, $this->value));
}
public function summaryName($data) {
diff --git a/core/modules/views/src/Plugin/views/display/Attachment.php b/core/modules/views/src/Plugin/views/display/Attachment.php
index dbc773c..05ba6de 100644
--- a/core/modules/views/src/Plugin/views/display/Attachment.php
+++ b/core/modules/views/src/Plugin/views/display/Attachment.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\views\display;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormStateInterface;
use Drupal\views\ViewExecutable;
@@ -92,7 +92,7 @@ public function optionsSummary(&$categories, &$options) {
elseif (count($displays) == 1) {
$display = array_shift($displays);
if ($display = $this->view->storage->getDisplay($display)) {
- $attach_to = String::checkPlain($display['display_title']);
+ $attach_to = StringHelper::checkPlain($display['display_title']);
}
}
diff --git a/core/modules/views/src/Plugin/views/display/Block.php b/core/modules/views/src/Plugin/views/display/Block.php
index 9de84ef..d0e0db5 100644
--- a/core/modules/views/src/Plugin/views/display/Block.php
+++ b/core/modules/views/src/Plugin/views/display/Block.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\views\display;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\views\Plugin\Block\ViewsBlock;
@@ -149,7 +149,7 @@ public function optionsSummary(&$categories, &$options) {
if (empty($block_description)) {
$block_description = $this->t('None');
}
- $block_category = String::checkPlain($this->getOption('block_category'));
+ $block_category = StringHelper::checkPlain($this->getOption('block_category'));
$options['block_description'] = array(
'category' => 'block',
diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
index 5a4bda2..9a7ea15 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -9,7 +9,7 @@
use Drupal\Component\Plugin\DependentPluginInterface;
use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Form\FormStateInterface;
@@ -1023,7 +1023,7 @@ public function optionLink($text, $section, $class = '', $title = '') {
}
if (!empty($class)) {
- $text = String::format('@text', array('@text' => $text));
+ $text = StringHelper::format('@text', array('@text' => $text));
}
if (empty($title)) {
@@ -1061,8 +1061,8 @@ public function getArgumentsTokens() {
}
// Use strip tags as there should never be HTML in the path.
// However, we need to preserve special characters like " that
- // were removed by String::checkPlain().
- $tokens["!$count"] = isset($this->view->args[$count - 1]) ? strip_tags(String::decodeEntities($this->view->args[$count - 1])) : '';
+ // were removed by StringHelper::checkPlain().
+ $tokens["!$count"] = isset($this->view->args[$count - 1]) ? strip_tags(StringHelper::decodeEntities($this->view->args[$count - 1])) : '';
}
return $tokens;
@@ -1393,7 +1393,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
if ($this->defaultableSections($section)) {
views_ui_standard_display_dropdown($form, $form_state, $section);
}
- $form['#title'] = String::checkPlain($this->display['display_title']) . ': ';
+ $form['#title'] = StringHelper::checkPlain($this->display['display_title']) . ': ';
// Set the 'section' to hilite on the form.
// If it's the item we're looking at is pulling from the default display,
@@ -2105,7 +2105,7 @@ public function renderMoreLink() {
return array(
'#theme' => $theme,
'#more_url' => $url->toString(),
- '#link_text' => String::checkPlain($this->useMoreText()),
+ '#link_text' => StringHelper::checkPlain($this->useMoreText()),
'#view' => $this->view,
);
}
diff --git a/core/modules/views/src/Plugin/views/display/Feed.php b/core/modules/views/src/Plugin/views/display/Feed.php
index 24e76ba..c385ddd 100644
--- a/core/modules/views/src/Plugin/views/display/Feed.php
+++ b/core/modules/views/src/Plugin/views/display/Feed.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\views\display;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormStateInterface;
use Drupal\views\ViewExecutable;
use Drupal\views\Views;
@@ -95,7 +95,7 @@ public function preview() {
if (!empty($this->view->live_preview)) {
$output = array(
'#prefix' => '',
- '#markup' => String::checkPlain(drupal_render_root($output)),
+ '#markup' => StringHelper::checkPlain(drupal_render_root($output)),
'#suffix' => '',
);
}
@@ -177,7 +177,7 @@ public function optionsSummary(&$categories, &$options) {
$display = array_shift($displays);
$displays = $this->view->storage->get('display');
if (!empty($displays[$display])) {
- $attach_to = String::checkPlain($displays[$display]['display_title']);
+ $attach_to = StringHelper::checkPlain($displays[$display]['display_title']);
}
}
diff --git a/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php b/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
index 7f0caa9..66eb116 100644
--- a/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
+++ b/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\views\exposed_form;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormState;
use Drupal\Core\Form\FormStateInterface;
use Drupal\views\Form\ViewsExposedForm;
@@ -210,7 +210,7 @@ public function exposedFormAlter(&$form, FormStateInterface $form_state) {
$exposed_sorts = array();
foreach ($this->view->sort as $id => $handler) {
if ($handler->canExpose() && $handler->isExposed()) {
- $exposed_sorts[$id] = String::checkPlain($handler->options['expose']['label']);
+ $exposed_sorts[$id] = StringHelper::checkPlain($handler->options['expose']['label']);
}
}
diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
index 3089c39..cc1ce07 100644
--- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -10,7 +10,7 @@
use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\NestedArray;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\Unicode;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Component\Utility\Xss;
@@ -241,7 +241,7 @@ public function elementType($none_supported = FALSE, $default_empty = FALSE, $in
}
}
if ($this->options['element_type']) {
- return String::checkPlain($this->options['element_type']);
+ return StringHelper::checkPlain($this->options['element_type']);
}
if ($default_empty) {
@@ -269,7 +269,7 @@ public function elementLabelType($none_supported = FALSE, $default_empty = FALSE
}
}
if ($this->options['element_label_type']) {
- return String::checkPlain($this->options['element_label_type']);
+ return StringHelper::checkPlain($this->options['element_label_type']);
}
if ($default_empty) {
@@ -289,7 +289,7 @@ public function elementWrapperType($none_supported = FALSE, $default_empty = FAL
}
}
if ($this->options['element_wrapper_type']) {
- return String::checkPlain($this->options['element_wrapper_type']);
+ return StringHelper::checkPlain($this->options['element_wrapper_type']);
}
if ($default_empty) {
@@ -1239,7 +1239,7 @@ public function renderText($alter) {
$more_link_text = $this->options['alter']['more_link_text'] ? $this->options['alter']['more_link_text'] : $this->t('more');
$more_link_text = strtr(Xss::filterAdmin($more_link_text), $tokens);
$more_link_path = $this->options['alter']['more_link_path'];
- $more_link_path = strip_tags(String::decodeEntities($this->viewsTokenReplace($more_link_path, $tokens)));
+ $more_link_path = strip_tags(StringHelper::decodeEntities($this->viewsTokenReplace($more_link_path, $tokens)));
// Make sure that paths which were run through _url() work as well.
$base_path = base_path();
@@ -1339,8 +1339,8 @@ protected function renderAsLink($alter, $text, $tokens) {
// Use strip tags as there should never be HTML in the path.
// However, we need to preserve special characters like " that
- // were removed by String::checkPlain().
- $path = strip_tags(String::decodeEntities($this->viewsTokenReplace($path, $tokens)));
+ // were removed by StringHelper::checkPlain().
+ $path = strip_tags(StringHelper::decodeEntities($this->viewsTokenReplace($path, $tokens)));
if (!empty($alter['path_case']) && $alter['path_case'] != 'none' && !$alter['url']->isRouted()) {
$path = str_replace($alter['path'], $this->caseTransform($alter['path'], $this->options['alter']['path_case']), $path);
@@ -1413,7 +1413,7 @@ protected function renderAsLink($alter, $text, $tokens) {
$alt = $this->viewsTokenReplace($alter['alt'], $tokens);
// Set the title attribute of the link only if it improves accessibility
if ($alt && $alt != $text) {
- $options['attributes']['title'] = String::decodeEntities($alt);
+ $options['attributes']['title'] = StringHelper::decodeEntities($alt);
}
$class = $this->viewsTokenReplace($alter['link_class'], $tokens);
@@ -1425,8 +1425,8 @@ protected function renderAsLink($alter, $text, $tokens) {
$options['attributes']['rel'] = $rel;
}
- // Not sure if this String::checkPlain() is needed here?
- $target = String::checkPlain(trim($this->viewsTokenReplace($alter['target'], $tokens)));
+ // Not sure if this StringHelper::checkPlain() is needed here?
+ $target = StringHelper::checkPlain(trim($this->viewsTokenReplace($alter['target'], $tokens)));
if (!empty($target)) {
$options['attributes']['target'] = $target;
}
@@ -1508,8 +1508,8 @@ public function getRenderTokens($item) {
// Use strip tags as there should never be HTML in the path.
// However, we need to preserve special characters like " that
- // were removed by String::checkPlain().
- $tokens['!' . $count] = isset($this->view->args[$count - 1]) ? strip_tags(String::decodeEntities($this->view->args[$count - 1])) : '';
+ // were removed by StringHelper::checkPlain().
+ $tokens['!' . $count] = isset($this->view->args[$count - 1]) ? strip_tags(StringHelper::decodeEntities($this->view->args[$count - 1])) : '';
}
// Get flattened set of tokens for any array depth in query parameters.
@@ -1593,7 +1593,7 @@ protected function getTokenValuesRecursive(array $array, array $parent_keys = ar
else {
// Create a token key based on array element structure.
$token_string = !empty($parent_keys) ? implode('_', $parent_keys) . '_' . $param : $param;
- $tokens['%' . $token_string] = strip_tags(String::decodeEntities($val));
+ $tokens['%' . $token_string] = strip_tags(StringHelper::decodeEntities($val));
}
}
diff --git a/core/modules/views/src/Plugin/views/field/Links.php b/core/modules/views/src/Plugin/views/field/Links.php
index 2302778..15e1ebe 100644
--- a/core/modules/views/src/Plugin/views/field/Links.php
+++ b/core/modules/views/src/Plugin/views/field/Links.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\views\field;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url as UrlObject;
@@ -82,7 +82,7 @@ protected function getLinks() {
}
// Make sure that tokens are replaced for this paths as well.
$tokens = $this->getRenderTokens(array());
- $path = strip_tags(String::decodeEntities($this->viewsTokenReplace($path, $tokens)));
+ $path = strip_tags(StringHelper::decodeEntities($this->viewsTokenReplace($path, $tokens)));
$links[$field] = array(
'url' => $path ? UrlObject::fromUri('internal:/' . $path) : $url,
diff --git a/core/modules/views/src/Plugin/views/field/MachineName.php b/core/modules/views/src/Plugin/views/field/MachineName.php
index edd0a61..5f285c7 100644
--- a/core/modules/views/src/Plugin/views/field/MachineName.php
+++ b/core/modules/views/src/Plugin/views/field/MachineName.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\views\field;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormStateInterface;
use Drupal\views\ResultRow;
@@ -83,7 +83,7 @@ public function preRender(&$values) {
public function render(ResultRow $values) {
$value = $values->{$this->field_alias};
if (!empty($this->options['machine_name']) || !isset($this->valueOptions[$value])) {
- $result = String::checkPlain($value);
+ $result = StringHelper::checkPlain($value);
}
else {
$result = $this->valueOptions[$value];
diff --git a/core/modules/views/src/Plugin/views/field/Serialized.php b/core/modules/views/src/Plugin/views/field/Serialized.php
index 0540214..ff5a410 100644
--- a/core/modules/views/src/Plugin/views/field/Serialized.php
+++ b/core/modules/views/src/Plugin/views/field/Serialized.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\views\field;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormStateInterface;
use Drupal\views\ResultRow;
@@ -76,11 +76,11 @@ public function render(ResultRow $values) {
$value = $values->{$this->field_alias};
if ($this->options['format'] == 'unserialized') {
- return String::checkPlain(print_r(unserialize($value), TRUE));
+ return StringHelper::checkPlain(print_r(unserialize($value), TRUE));
}
elseif ($this->options['format'] == 'key' && !empty($this->options['key'])) {
$value = (array) unserialize($value);
- return String::checkPlain($value[$this->options['key']]);
+ return StringHelper::checkPlain($value[$this->options['key']]);
}
return $value;
diff --git a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
index b5f8bf8..e9954ce 100644
--- a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
+++ b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
@@ -13,7 +13,7 @@
use Drupal\user\RoleInterface;
use Drupal\views\Plugin\CacheablePluginInterface;
use Drupal\views\Plugin\views\HandlerBase;
-use Drupal\Component\Utility\String as UtilityString;
+use Drupal\Component\Utility\StringHelper as UtilityString;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ViewExecutable;
@@ -594,7 +594,7 @@ public function buildExposeForm(&$form, FormStateInterface $form_state) {
'#default_value' => $this->options['expose']['remember'],
);
- $role_options = array_map('\Drupal\Component\Utility\String::checkPlain', user_role_names());
+ $role_options = array_map('\Drupal\Component\Utility\StringHelper::checkPlain', user_role_names());
$form['expose']['remember_roles'] = array(
'#type' => 'checkboxes',
'#title' => $this->t('User roles'),
diff --git a/core/modules/views/src/Plugin/views/filter/InOperator.php b/core/modules/views/src/Plugin/views/filter/InOperator.php
index 5d4865c..f91f42d 100644
--- a/core/modules/views/src/Plugin/views/filter/InOperator.php
+++ b/core/modules/views/src/Plugin/views/filter/InOperator.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\views\filter;
-use Drupal\Component\Utility\String as UtilityString;
+use Drupal\Component\Utility\StringHelper as UtilityString;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Form\FormStateInterface;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
diff --git a/core/modules/views/src/Plugin/views/filter/Numeric.php b/core/modules/views/src/Plugin/views/filter/Numeric.php
index 38c0fca..3af5cfa 100644
--- a/core/modules/views/src/Plugin/views/filter/Numeric.php
+++ b/core/modules/views/src/Plugin/views/filter/Numeric.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\views\filter;
-use Drupal\Component\Utility\String as UtilityString;
+use Drupal\Component\Utility\StringHelper as UtilityString;
use Drupal\Core\Database\Database;
use Drupal\Core\Form\FormStateInterface;
diff --git a/core/modules/views/src/Plugin/views/filter/String.php b/core/modules/views/src/Plugin/views/filter/String.php
index 54dbb49..2f32550 100644
--- a/core/modules/views/src/Plugin/views/filter/String.php
+++ b/core/modules/views/src/Plugin/views/filter/String.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\views\filter;
-use Drupal\Component\Utility\String as UtilityString;
+use Drupal\Component\Utility\StringHelper as UtilityString;
use Drupal\Core\Database\Database;
use Drupal\Core\Form\FormStateInterface;
diff --git a/core/modules/views/src/Plugin/views/row/EntityRow.php b/core/modules/views/src/Plugin/views/row/EntityRow.php
index a0df1e1..043f0f6 100644
--- a/core/modules/views/src/Plugin/views/row/EntityRow.php
+++ b/core/modules/views/src/Plugin/views/row/EntityRow.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\views\row;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Language\LanguageManagerInterface;
@@ -160,7 +160,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
public function summaryTitle() {
$options = \Drupal::entityManager()->getViewModeOptions($this->entityTypeId);
if (isset($options[$this->options['view_mode']])) {
- return String::checkPlain($options[$this->options['view_mode']]);
+ return StringHelper::checkPlain($options[$this->options['view_mode']]);
}
else {
return $this->t('No view mode selected');
diff --git a/core/modules/views/src/Routing/ViewPageController.php b/core/modules/views/src/Routing/ViewPageController.php
index fd3ac25..9222b5a 100644
--- a/core/modules/views/src/Routing/ViewPageController.php
+++ b/core/modules/views/src/Routing/ViewPageController.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Routing;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Routing\RouteMatchInterface;
@@ -74,7 +74,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(StringHelper::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/FieldApiDataTest.php b/core/modules/views/src/Tests/FieldApiDataTest.php
index 96ff642..bfaf7e0 100644
--- a/core/modules/views/src/Tests/FieldApiDataTest.php
+++ b/core/modules/views/src/Tests/FieldApiDataTest.php
@@ -83,7 +83,7 @@ function testViewsData() {
$this->assertEqual($expected_join, $data[$revision_table]['table']['join']['node_field_revision']);
// Test click sortable.
- $this->assertTrue($data[$current_table][$field_storage->getName()]['field']['click sortable'], 'String field is click sortable.');
+ $this->assertTrue($data[$current_table][$field_storage->getName()]['field']['click sortable'], 'StringHelper field is click sortable.');
// Click sort should only be on the primary field.
$this->assertTrue(empty($data[$revision_table][$field_storage->getName()]['field']['click sortable']), 'Non-primary fields are not click sortable');
}
diff --git a/core/modules/views/src/Tests/Handler/FieldWebTest.php b/core/modules/views/src/Tests/Handler/FieldWebTest.php
index ceb8881..a4b8757 100644
--- a/core/modules/views/src/Tests/Handler/FieldWebTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldWebTest.php
@@ -8,7 +8,7 @@
namespace Drupal\views\Tests\Handler;
use Drupal\Component\Utility\Unicode;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\UrlHelper;
use Drupal\views\Views;
@@ -232,14 +232,14 @@ public function testAlterUrl() {
$expected_result = \Drupal::url('entity.node.canonical', ['node' => '123'], ['query' => ['foo' => 'bar', 'bar' => 'baz'], 'absolute' => $absolute]);
$alter['path'] = 'node/123?foo=bar&bar=baz';
$result = $id_field->theme($row);
- $this->assertSubString(String::decodeEntities($result), String::decodeEntities($expected_result));
+ $this->assertSubString(StringHelper::decodeEntities($result), StringHelper::decodeEntities($expected_result));
// @todo The route-based URL generator strips out NULL attributes.
// $expected_result = \Drupal::url('entity.node.canonical', ['node' => '123'], ['query' => ['foo' => NULL], 'fragment' => 'bar', 'absolute' => $absolute]);
$expected_result = \Drupal::urlGenerator()->generateFromPath('node/123', array('query' => array('foo' => NULL), 'fragment' => 'bar', 'absolute' => $absolute));
$alter['path'] = 'node/123?foo#bar';
$result = $id_field->theme($row);
- $this->assertSubString(String::decodeEntities($result), String::decodeEntities($expected_result));
+ $this->assertSubString(StringHelper::decodeEntities($result), StringHelper::decodeEntities($expected_result));
$expected_result = \Drupal::url('', [], ['absolute' => $absolute]);
$alter['path'] = '';
diff --git a/core/modules/views/src/Tests/Handler/SortDateTest.php b/core/modules/views/src/Tests/Handler/SortDateTest.php
index 02d8807..1dd61d9 100644
--- a/core/modules/views/src/Tests/Handler/SortDateTest.php
+++ b/core/modules/views/src/Tests/Handler/SortDateTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\views\Tests\ViewUnitTestBase;
use Drupal\views\Views;
@@ -198,7 +198,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')));
+ ), StringHelper::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 e801a09..1c1a3fb 100644
--- a/core/modules/views/src/Tests/ModuleTest.php
+++ b/core/modules/views/src/Tests/ModuleTest.php
@@ -14,7 +14,7 @@
*/
use Drupal\views\Plugin\views\filter\Standard;
use Drupal\views\Views;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
class ModuleTest extends ViewUnitTestBase {
@@ -258,7 +258,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]), StringHelper::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/CacheTest.php b/core/modules/views/src/Tests/Plugin/CacheTest.php
index 9e2c6c4..45dc3cd 100644
--- a/core/modules/views/src/Tests/Plugin/CacheTest.php
+++ b/core/modules/views/src/Tests/Plugin/CacheTest.php
@@ -200,7 +200,7 @@ public function testSubqueryStringCache() {
// Request for the cache.
$cid = 'views_relationship_groupwise_max:test_groupwise_term_ui:default:tid_representative';
$cache = \Drupal::cache('data')->get($cid);
- $this->assertEqual($cid, $cache->cid, 'Subquery String cached as expected.');
+ $this->assertEqual($cid, $cache->cid, 'Subquery StringHelper cached as expected.');
}
/**
diff --git a/core/modules/views/src/Tests/Wizard/BasicTest.php b/core/modules/views/src/Tests/Wizard/BasicTest.php
index 5871afc..977f459 100644
--- a/core/modules/views/src/Tests/Wizard/BasicTest.php
+++ b/core/modules/views/src/Tests/Wizard/BasicTest.php
@@ -8,7 +8,7 @@
namespace Drupal\views\Tests\Wizard;
use Drupal\Component\Serialization\Json;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Url;
use Drupal\views\Views;
@@ -207,7 +207,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']), StringHelper::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..f21d4de 100644
--- a/core/modules/views/src/Tests/Wizard/MenuTest.php
+++ b/core/modules/views/src/Tests/Wizard/MenuTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Wizard;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Url;
/**
@@ -49,7 +49,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', StringHelper::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..b4de2cb 100644
--- a/core/modules/views/src/ViewExecutable.php
+++ b/core/modules/views/src/ViewExecutable.php
@@ -7,7 +7,7 @@
namespace Drupal\views;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Cache\Cache;
use Drupal\Core\DependencyInjection\DependencySerializationTrait;
use Drupal\Core\Form\FormState;
@@ -993,7 +993,7 @@ protected function _buildArguments() {
// Add this argument's substitution
$substitutions['%' . ($position + 1)] = $arg_title;
- $substitutions['!' . ($position + 1)] = strip_tags(String::decodeEntities($arg));
+ $substitutions['!' . ($position + 1)] = strip_tags(StringHelper::decodeEntities($arg));
// Test to see if we should use this argument's title
if (!empty($argument->options['title_enable']) && !empty($argument->options['title'])) {
@@ -1859,7 +1859,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(StringHelper::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/Views.php b/core/modules/views/src/Views.php
index 525177f..589f7ee 100644
--- a/core/modules/views/src/Views.php
+++ b/core/modules/views/src/Views.php
@@ -7,7 +7,7 @@
namespace Drupal\views;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Static service container wrapper for views.
@@ -395,8 +395,8 @@ public static function pluginList() {
if (!isset($plugins[$key])) {
$plugins[$key] = array(
'type' => $type,
- 'title' => String::checkPlain($info[$name]['title']),
- 'provider' => String::checkPlain($info[$name]['provider']),
+ 'title' => StringHelper::checkPlain($info[$name]['title']),
+ 'provider' => StringHelper::checkPlain($info[$name]['provider']),
'views' => array(),
);
}
diff --git a/core/modules/views/src/ViewsDataHelper.php b/core/modules/views/src/ViewsDataHelper.php
index b986746..823dd2f 100644
--- a/core/modules/views/src/ViewsDataHelper.php
+++ b/core/modules/views/src/ViewsDataHelper.php
@@ -8,7 +8,7 @@
namespace Drupal\views;
use Drupal\Component\Utility\Unicode;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* 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] = StringHelper::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..9ad55d5 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\StringHelper;
if (!function_exists('t')) {
function t($string, array $args = []) {
- return String::format($string, $args);
+ return StringHelper::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..0a246e4 100644
--- a/core/modules/views/tests/src/Unit/Plugin/field/CounterTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/field/CounterTest.php
@@ -7,7 +7,7 @@
namespace Drupal\Tests\views\Unit\Plugin\field;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Tests\UnitTestCase;
use Drupal\views\Entity\View;
use Drupal\views\Plugin\views\field\Counter;
@@ -126,12 +126,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, StringHelper::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]), StringHelper::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
'@expected' => $expected,
'@counter' => $counter
)));
@@ -158,12 +158,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, StringHelper::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]), StringHelper::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
'@expected' => $expected,
'@counter' => $counter
)));
@@ -193,12 +193,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, StringHelper::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]), StringHelper::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
'@expected' => $expected,
'@counter' => $counter
)));
@@ -232,12 +232,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, StringHelper::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]), StringHelper::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..f72648e 100644
--- a/core/modules/views/tests/src/Unit/ViewsDataHelperTest.php
+++ b/core/modules/views/tests/src/Unit/ViewsDataHelperTest.php
@@ -7,7 +7,7 @@
namespace Drupal\Tests\views\Unit;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Tests\UnitTestCase;
use Drupal\views\ViewsDataHelper;
use Drupal\views\Tests\ViewTestData;
@@ -106,7 +106,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), StringHelper::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 +117,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), StringHelper::format('Sub_type @sub_type is not filtered as expected.', array('@sub_type' => $sub_type)));
}
}
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 23fd877..801d757 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -10,7 +10,7 @@
*/
use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Database\Query\AlterableInterface;
use Drupal\Core\Form\FormStateInterface;
@@ -61,8 +61,8 @@ function views_views_pre_render($view) {
'views_dom_id:' . $view->dom_id => array(
'view_name' => $view->storage->id(),
'view_display_id' => $view->current_display,
- 'view_args' => String::checkPlain(implode('/', $view->args)),
- 'view_path' => String::checkPlain(Url::fromRoute('')->toString()),
+ 'view_args' => StringHelper::checkPlain(implode('/', $view->args)),
+ 'view_path' => StringHelper::checkPlain(Url::fromRoute('')->toString()),
'view_base_path' => $view->getPath(),
'view_dom_id' => $view->dom_id,
// To fit multiple views on a page, the programmer may have
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index a9b6295..39e4643 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -7,7 +7,7 @@
use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Template\Attribute;
use Drupal\Core\Url;
@@ -159,7 +159,7 @@ function template_preprocess_views_view_fields(&$variables) {
// Set up the label for the value and the HTML to make it easier
// on the template.
- $object->label = String::checkPlain($view->field[$id]->label());
+ $object->label = StringHelper::checkPlain($view->field[$id]->label());
$object->label_html = '';
if ($object->label) {
$object->label_html .= $object->label;
@@ -463,7 +463,7 @@ function template_preprocess_views_view_table(&$variables) {
// Render the header labels.
if ($field == $column && empty($fields[$field]->options['exclude'])) {
- $label = String::checkPlain(!empty($fields[$field]) ? $fields[$field]->label() : '');
+ $label = StringHelper::checkPlain(!empty($fields[$field]) ? $fields[$field]->label() : '');
if (empty($options['info'][$field]['sortable']) || !$fields[$field]->clickSortable()) {
$variables['header'][$field]['content'] = $label;
}
@@ -849,7 +849,7 @@ function template_preprocess_views_view_rss(&$variables) {
// The RSS 2.0 "spec" doesn't indicate HTML can be used in the description.
// We strip all HTML tags, but need to prevent double encoding from properly
// escaped source data (such as & becoming &).
- $variables['description'] = String::checkPlain(String::decodeEntities(strip_tags($style->getDescription())));
+ $variables['description'] = StringHelper::checkPlain(StringHelper::decodeEntities(strip_tags($style->getDescription())));
if ($view->display_handler->getOption('sitename_title')) {
$title = $config->get('name');
@@ -860,7 +860,7 @@ function template_preprocess_views_view_rss(&$variables) {
else {
$title = $view->getTitle();
}
- $variables['title'] = String::checkPlain($title);
+ $variables['title'] = StringHelper::checkPlain($title);
// Figure out which display which has a path we're using for this feed. If
// there isn't one, use the global $base_url
@@ -888,7 +888,7 @@ function template_preprocess_views_view_rss(&$variables) {
$variables['link'] = $url_string;
}
- $variables['langcode'] = String::checkPlain(\Drupal::languageManager()->getCurrentLanguage()->getId());
+ $variables['langcode'] = StringHelper::checkPlain(\Drupal::languageManager()->getCurrentLanguage()->getId());
$variables['namespaces'] = new Attribute($style->namespaces);
$variables['items'] = $items;
$variables['channel_elements'] = format_xml_elements($style->channel_elements);
@@ -912,9 +912,9 @@ function template_preprocess_views_view_rss(&$variables) {
function template_preprocess_views_view_row_rss(&$variables) {
$item = $variables['row'];
- $variables['title'] = String::checkPlain($item->title);
+ $variables['title'] = StringHelper::checkPlain($item->title);
$variables['link'] = $item->link;
- $variables['description'] = String::checkPlain($item->description);
+ $variables['description'] = StringHelper::checkPlain($item->description);
$variables['item_elements'] = empty($item->elements) ? '' : format_xml_elements($item->elements);
}
@@ -943,7 +943,7 @@ function template_preprocess_views_view_opml(&$variables) {
else {
$title = $view->getTitle();
}
- $variables['title'] = String::checkPlain($title);
+ $variables['title'] = StringHelper::checkPlain($title);
$variables['items'] = $items;
$variables['updated'] = gmdate(DATE_RFC2822, REQUEST_TIME);
diff --git a/core/modules/views/views.tokens.inc b/core/modules/views/views.tokens.inc
index 85f6ec0..7247214 100644
--- a/core/modules/views/views.tokens.inc
+++ b/core/modules/views/views.tokens.inc
@@ -5,7 +5,7 @@
* Token integration for the views module.
*/
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Implements hook_token_info().
@@ -86,11 +86,11 @@ function views_tokens($type, $tokens, array $data = array(), array $options = ar
foreach ($tokens as $name => $original) {
switch ($name) {
case 'label':
- $replacements[$original] = $sanitize ? String::checkPlain($view->storage->label()) : $view->storage->label();
+ $replacements[$original] = $sanitize ? StringHelper::checkPlain($view->storage->label()) : $view->storage->label();
break;
case 'description':
- $replacements[$original] = $sanitize ? String::checkPlain($view->storage->get('description')) : $view->storage->get('description');
+ $replacements[$original] = $sanitize ? StringHelper::checkPlain($view->storage->get('description')) : $view->storage->get('description');
break;
case 'id':
@@ -99,7 +99,7 @@ function views_tokens($type, $tokens, array $data = array(), array $options = ar
case 'title':
$title = $view->getTitle();
- $replacements[$original] = $sanitize ? String::checkPlain($title) : $title;
+ $replacements[$original] = $sanitize ? StringHelper::checkPlain($title) : $title;
break;
case 'url':
diff --git a/core/modules/views_ui/src/Controller/ViewsUIController.php b/core/modules/views_ui/src/Controller/ViewsUIController.php
index b797619..85cdf32 100644
--- a/core/modules/views_ui/src/Controller/ViewsUIController.php
+++ b/core/modules/views_ui/src/Controller/ViewsUIController.php
@@ -8,7 +8,7 @@
namespace Drupal\views_ui\Controller;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Controller\ControllerBase;
use Drupal\Core\Url;
use Drupal\views\ViewExecutable;
@@ -90,7 +90,7 @@ public function reportFields() {
$header = array(t('Field name'), t('Used in'));
$rows = array();
foreach ($fields as $field_name => $views) {
- $rows[$field_name]['data'][0] = String::checkPlain($field_name);
+ $rows[$field_name]['data'][0] = StringHelper::checkPlain($field_name);
foreach ($views as $view) {
$rows[$field_name]['data'][1][] = $this->l($view, new Url('entity.view.edit_form', array('view' => $view)));
}
diff --git a/core/modules/views_ui/src/Form/Ajax/Rearrange.php b/core/modules/views_ui/src/Form/Ajax/Rearrange.php
index 9e2259f..1b57a1f 100644
--- a/core/modules/views_ui/src/Form/Ajax/Rearrange.php
+++ b/core/modules/views_ui/src/Form/Ajax/Rearrange.php
@@ -7,7 +7,7 @@
namespace Drupal\views_ui\Form\Ajax;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
use Drupal\views\ViewEntityInterface;
@@ -129,7 +129,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(StringHelper::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/RearrangeFilter.php b/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php
index 3ae2d31..dff0dad 100644
--- a/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php
+++ b/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php
@@ -7,7 +7,7 @@
namespace Drupal\views_ui\Form\Ajax;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormStateInterface;
use Drupal\views_ui\ViewUI;
use Drupal\views\ViewExecutable;
@@ -46,7 +46,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
return $form;
}
$display = $executable->displayHandlers->get($display_id);
- $form['#title'] = String::checkPlain($display->display['display_title']) . ': ';
+ $form['#title'] = StringHelper::checkPlain($display->display['display_title']) . ': ';
$form['#title'] .= $this->t('Rearrange @type', array('@type' => $types[$type]['ltitle']));
$form['#section'] = $display_id . 'rearrange-item';
diff --git a/core/modules/views_ui/src/Form/Ajax/ReorderDisplays.php b/core/modules/views_ui/src/Form/Ajax/ReorderDisplays.php
index c2415ff..a666db1 100644
--- a/core/modules/views_ui/src/Form/Ajax/ReorderDisplays.php
+++ b/core/modules/views_ui/src/Form/Ajax/ReorderDisplays.php
@@ -7,7 +7,7 @@
namespace Drupal\views_ui\Form\Ajax;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
use Drupal\views_ui\ViewUI;
@@ -121,7 +121,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
),
'link' => array(
'#type' => 'link',
- '#title' => String::format('@text', array('@text' => $this->t('Remove'))),
+ '#title' => StringHelper::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/DisplayTest.php b/core/modules/views_ui/src/Tests/DisplayTest.php
index 1b4d04c..c83897f 100644
--- a/core/modules/views_ui/src/Tests/DisplayTest.php
+++ b/core/modules/views_ui/src/Tests/DisplayTest.php
@@ -8,7 +8,7 @@
namespace Drupal\views_ui\Tests;
use Drupal\Component\Serialization\Json;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\views\Views;
use Drupal\Core\Template\Attribute;
@@ -130,7 +130,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], StringHelper::format('The selected display type does not use @type plugins', array('@type' => $type)));
}
}
diff --git a/core/modules/views_ui/src/Tests/HandlerTest.php b/core/modules/views_ui/src/Tests/HandlerTest.php
index 4c9c786..5fb5192 100644
--- a/core/modules/views_ui/src/Tests/HandlerTest.php
+++ b/core/modules/views_ui/src/Tests/HandlerTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views_ui\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\views\ViewExecutable;
/**
@@ -148,7 +148,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, StringHelper::format('Handler (%type) edit link found.', array('%type' => $type)));
$text = t('Broken/missing handler');
@@ -167,7 +167,7 @@ public function testBrokenHandlers() {
];
foreach ($original_configuration as $key => $value) {
- $this->assertText(String::format('@key: @value', array('@key' => $key, '@value' => $value)));
+ $this->assertText(StringHelper::format('@key: @value', array('@key' => $key, '@value' => $value)));
}
}
}
diff --git a/core/modules/views_ui/src/Tests/ViewEditTest.php b/core/modules/views_ui/src/Tests/ViewEditTest.php
index 07d5bb2..a2614be 100644
--- a/core/modules/views_ui/src/Tests/ViewEditTest.php
+++ b/core/modules/views_ui/src/Tests/ViewEditTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views_ui\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\views\Entity\View;
use Drupal\views\Views;
diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php
index 1205f28..fa2b03e 100644
--- a/core/modules/views_ui/src/ViewEditForm.php
+++ b/core/modules/views_ui/src/ViewEditForm.php
@@ -15,7 +15,7 @@
use Drupal\Core\Ajax\ReplaceCommand;
use Drupal\Core\Datetime\DateFormatter;
use Drupal\Component\Utility\NestedArray;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Render\Element;
use Drupal\Core\Url;
@@ -492,7 +492,7 @@ public function getDisplayDetails($view, $display) {
$build['top']['display_title'] = array(
'#theme' => 'views_ui_display_tab_setting',
'#description' => $this->t('Display name'),
- '#link' => $view->getExecutable()->displayHandlers->get($display['id'])->optionLink(String::checkPlain($display_title), 'display_title'),
+ '#link' => $view->getExecutable()->displayHandlers->get($display['id'])->optionLink(StringHelper::checkPlain($display_title), 'display_title'),
);
}
@@ -1060,7 +1060,7 @@ public function getFormBucket(ViewUI $view, $type, $display) {
continue;
}
- $field_name = String::checkPlain($handler->adminLabel(TRUE));
+ $field_name = StringHelper::checkPlain($handler->adminLabel(TRUE));
if (!empty($field['relationship']) && !empty($relationships[$field['relationship']])) {
$field_name = '(' . $relationships[$field['relationship']] . ') ' . $field_name;
}
@@ -1083,7 +1083,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(StringHelper::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 +1093,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(StringHelper::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/src/ViewListBuilder.php b/core/modules/views_ui/src/ViewListBuilder.php
index 3463177..687ab61 100644
--- a/core/modules/views_ui/src/ViewListBuilder.php
+++ b/core/modules/views_ui/src/ViewListBuilder.php
@@ -8,7 +8,7 @@
namespace Drupal\views_ui;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Component\Plugin\PluginManagerInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
@@ -99,7 +99,7 @@ public function buildRow(EntityInterface $view) {
),
'description' => array(
'data' => array(
- '#markup' => String::checkPlain($view->get('description')),
+ '#markup' => StringHelper::checkPlain($view->get('description')),
),
'class' => array('views-table-filter-text-source'),
),
@@ -269,7 +269,7 @@ protected function getDisplayPaths(EntityInterface $view) {
$all_paths[] = \Drupal::l('/' . $path, Url::fromUserInput('/' . $path));
}
else {
- $all_paths[] = String::checkPlain('/' . $path);
+ $all_paths[] = StringHelper::checkPlain('/' . $path);
}
}
}
diff --git a/core/modules/views_ui/views_ui.theme.inc b/core/modules/views_ui/views_ui.theme.inc
index 2187076..cd4c6f8 100644
--- a/core/modules/views_ui/views_ui.theme.inc
+++ b/core/modules/views_ui/views_ui.theme.inc
@@ -6,7 +6,7 @@
*/
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Core\Form\FormState;
use Drupal\Core\Render\Element;
use Drupal\Core\Url;
@@ -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(StringHelper::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' => StringHelper::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..7424dbe 100644
--- a/core/tests/Drupal/Tests/Component/Utility/RandomTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/RandomTest.php
@@ -8,7 +8,7 @@
namespace Drupal\Tests\Component\Utility;
use Drupal\Component\Utility\Random;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
use Drupal\Tests\UnitTestCase;
/**
@@ -39,7 +39,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]), StringHelper::format('Generated duplicate random string !string', array('!string' => $str)));
$strings[$str] = TRUE;
}
}
@@ -54,7 +54,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]), StringHelper::format('Generated duplicate random name !name', array('!name' => $str)));
$names[$str] = TRUE;
}
}
diff --git a/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php b/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
index eadc122..e85aedc 100644
--- a/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
@@ -45,7 +45,7 @@ public function testSet($text, $message) {
*/
public function providerSet() {
// Checks that invalid multi-byte sequences are rejected.
- $tests[] = array("Foo\xC0barbaz", '', 'String::checkPlain() rejects invalid sequence "Foo\xC0barbaz"', TRUE);
+ $tests[] = array("Foo\xC0barbaz", '', 'StringHelper::checkPlain() rejects invalid sequence "Foo\xC0barbaz"', TRUE);
$tests[] = array("Fooÿñ", 'SafeMarkup::set() accepts valid sequence "Fooÿñ"');
$tests[] = array(new TextWrapper("Fooÿñ"), 'SafeMarkup::set() accepts valid sequence "Fooÿñ" in an object implementing __toString()');
$tests[] = array("", 'SafeMarkup::set() accepts HTML');
@@ -60,13 +60,13 @@ public function providerSet() {
*/
public function testStrategy() {
$returned = SafeMarkup::set('string0', 'html');
- $this->assertTrue(SafeMarkup::isSafe($returned), 'String set with "html" provider is safe for default (html)');
+ $this->assertTrue(SafeMarkup::isSafe($returned), 'StringHelper set with "html" provider is safe for default (html)');
$returned = SafeMarkup::set('string1', 'all');
- $this->assertTrue(SafeMarkup::isSafe($returned), 'String set with "all" provider is safe for default (html)');
+ $this->assertTrue(SafeMarkup::isSafe($returned), 'StringHelper set with "all" provider is safe for default (html)');
$returned = SafeMarkup::set('string2', 'css');
- $this->assertFalse(SafeMarkup::isSafe($returned), 'String set with "css" provider is not safe for default (html)');
+ $this->assertFalse(SafeMarkup::isSafe($returned), 'StringHelper set with "css" provider is not safe for default (html)');
$returned = SafeMarkup::set('string3');
- $this->assertFalse(SafeMarkup::isSafe($returned, 'all'), 'String set with "html" provider is not safe for "all"');
+ $this->assertFalse(SafeMarkup::isSafe($returned, 'all'), 'StringHelper set with "html" provider is not safe for "all"');
}
/**
diff --git a/core/tests/Drupal/Tests/Component/Utility/StringTest.php b/core/tests/Drupal/Tests/Component/Utility/StringHelperTest.php
similarity index 63%
rename from core/tests/Drupal/Tests/Component/Utility/StringTest.php
rename to core/tests/Drupal/Tests/Component/Utility/StringHelperTest.php
index 307385a..7ceb063 100644
--- a/core/tests/Drupal/Tests/Component/Utility/StringTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/StringHelperTest.php
@@ -2,32 +2,32 @@
/**
* @file
- * Contains \Drupal\Tests\Component\Utility\StringTest.
+ * Contains \Drupal\Tests\Component\Utility\StringHelperTest.
*/
namespace Drupal\Tests\Component\Utility;
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Tests\UnitTestCase;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\StringHelper;
/**
* Tests string filtering.
*
* @group Utility
*
- * @coversDefaultClass \Drupal\Component\Utility\String
+ * @coversDefaultClass \Drupal\Component\Utility\StringHelper
*/
-class StringTest extends UnitTestCase {
+class StringHelperTest extends UnitTestCase {
/**
- * Tests String::checkPlain().
+ * Tests StringHelper::checkPlain().
*
* @dataProvider providerCheckPlain
* @covers ::checkPlain
*
* @param string $text
- * The text to provide to String::checkPlain().
+ * The text to provide to StringHelper::checkPlain().
* @param string $expected
* The expected output from the function.
* @param string $message
@@ -36,7 +36,7 @@ class StringTest extends UnitTestCase {
* Whether or not to ignore PHP 5.3+ invalid multibyte sequence warnings.
*/
function testCheckPlain($text, $expected, $message, $ignorewarnings = FALSE) {
- $result = $ignorewarnings ? @String::checkPlain($text) : String::checkPlain($text);
+ $result = $ignorewarnings ? @StringHelper::checkPlain($text) : StringHelper::checkPlain($text);
$this->assertEquals($expected, $result, $message);
}
@@ -47,27 +47,27 @@ function testCheckPlain($text, $expected, $message, $ignorewarnings = FALSE) {
*/
function providerCheckPlain() {
// Checks that invalid multi-byte sequences are rejected.
- $tests[] = array("Foo\xC0barbaz", '', 'String::checkPlain() rejects invalid sequence "Foo\xC0barbaz"', TRUE);
- $tests[] = array("\xc2\"", '', 'String::checkPlain() rejects invalid sequence "\xc2\""', TRUE);
- $tests[] = array("Fooÿñ", "Fooÿñ", 'String::checkPlain() accepts valid sequence "Fooÿñ"');
+ $tests[] = array("Foo\xC0barbaz", '', 'StringHelper::checkPlain() rejects invalid sequence "Foo\xC0barbaz"', TRUE);
+ $tests[] = array("\xc2\"", '', 'StringHelper::checkPlain() rejects invalid sequence "\xc2\""', TRUE);
+ $tests[] = array("Fooÿñ", "Fooÿñ", 'StringHelper::checkPlain() accepts valid sequence "Fooÿñ"');
// Checks that special characters are escaped.
- $tests[] = array("