diff --git a/core/lib/Drupal/Core/Entity/EntityListBuilder.php b/core/lib/Drupal/Core/Entity/EntityListBuilder.php
index 6fbdedae7694e19357600872dc664b0bf469b60f..e31ed773edf8ff8abc0f8280459adfc639d964f8 100644
--- a/core/lib/Drupal/Core/Entity/EntityListBuilder.php
+++ b/core/lib/Drupal/Core/Entity/EntityListBuilder.php
@@ -9,7 +9,6 @@
use Drupal\Core\Extension\ModuleHandlerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Component\Utility\SafeMarkup;
/**
* Defines a generic implementation to build a listing of entities.
@@ -106,16 +105,20 @@ protected function getEntityIds() {
}
/**
- * Gets the escaped label of an entity.
+ * Gets the label of an entity.
*
* @param \Drupal\Core\Entity\EntityInterface $entity
* The entity being listed.
*
* @return string
- * The escaped entity label.
+ * The entity label.
+ *
+ * @deprecated in Drupal 8.0.x, will be removed before Drupal 9.0.0
+ * Use $entity->label() instead. This method used to escape the entity
+ * label. The render system's autoescape is now relied upon.
*/
protected function getLabel(EntityInterface $entity) {
- return SafeMarkup::checkPlain($entity->label());
+ return $entity->label();
}
/**
diff --git a/core/modules/action/src/ActionListBuilder.php b/core/modules/action/src/ActionListBuilder.php
index 2d3af861778a7adf72e4f56c59b73883cd4c2417..6d8a14dbbbfe5de7914f97d30ed685c9c5461323 100644
--- a/core/modules/action/src/ActionListBuilder.php
+++ b/core/modules/action/src/ActionListBuilder.php
@@ -80,7 +80,7 @@ public function load() {
*/
public function buildRow(EntityInterface $entity) {
$row['type'] = $entity->getType();
- $row['label'] = $this->getLabel($entity);
+ $row['label'] = $entity->label();
if ($this->hasConfigurableActions) {
$row += parent::buildRow($entity);
}
diff --git a/core/modules/block_content/src/BlockContentListBuilder.php b/core/modules/block_content/src/BlockContentListBuilder.php
index 793428da24381a7e6cf223163c6e310aecba2fec..4c6f80629cb4984d24748a453295a7ba0dd4b69d 100644
--- a/core/modules/block_content/src/BlockContentListBuilder.php
+++ b/core/modules/block_content/src/BlockContentListBuilder.php
@@ -29,7 +29,7 @@ public function buildHeader() {
* {@inheritdoc}
*/
public function buildRow(EntityInterface $entity) {
- $row['label'] = $this->getLabel($entity);
+ $row['label'] = $entity->label();
return $row + parent::buildRow($entity);
}
diff --git a/core/modules/config/tests/config_test/src/ConfigTestListBuilder.php b/core/modules/config/tests/config_test/src/ConfigTestListBuilder.php
index 8634b96eb07279321540b8619c6796fc2f89d625..4680ea226263f3b2a38bde7066f707228b57fe5b 100644
--- a/core/modules/config/tests/config_test/src/ConfigTestListBuilder.php
+++ b/core/modules/config/tests/config_test/src/ConfigTestListBuilder.php
@@ -30,7 +30,7 @@ public function buildHeader() {
* {@inheritdoc}
*/
public function buildRow(EntityInterface $entity) {
- $row['label'] = $this->getLabel($entity);
+ $row['label'] = $entity->label();
$row['id'] = $entity->id();
return $row + parent::buildRow($entity);
}
diff --git a/core/modules/config_translation/src/Controller/ConfigTranslationBlockListBuilder.php b/core/modules/config_translation/src/Controller/ConfigTranslationBlockListBuilder.php
index 275dfedce392f526e866250de331ad5cb172a73c..74e276a9d591e823eb5d4878c50312412c43dfb9 100644
--- a/core/modules/config_translation/src/Controller/ConfigTranslationBlockListBuilder.php
+++ b/core/modules/config_translation/src/Controller/ConfigTranslationBlockListBuilder.php
@@ -65,7 +65,7 @@ public function buildRow(EntityInterface $entity) {
$plugin_definition = $entity->getPlugin()->getPluginDefinition();
$row['label'] = array(
- 'data' => $this->getLabel($entity),
+ 'data' => $entity->label(),
'class' => 'table-filter-text-source',
);
diff --git a/core/modules/config_translation/src/Controller/ConfigTranslationEntityListBuilder.php b/core/modules/config_translation/src/Controller/ConfigTranslationEntityListBuilder.php
index 0c50f2a499b004a69b47c0e7a60b122007db8bc2..367b6fa883beccdeca68b3830bbbb460892104d8 100644
--- a/core/modules/config_translation/src/Controller/ConfigTranslationEntityListBuilder.php
+++ b/core/modules/config_translation/src/Controller/ConfigTranslationEntityListBuilder.php
@@ -68,7 +68,7 @@ public function render() {
* {@inheritdoc}
*/
public function buildRow(EntityInterface $entity) {
- $row['label']['data'] = $this->getLabel($entity);
+ $row['label']['data'] = $entity->label();
$row['label']['class'][] = 'table-filter-text-source';
return $row + parent::buildRow($entity);
}
diff --git a/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php b/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php
index a3407071db512c112369b3bb06558ab559ae76b7..1b2a08b6b036c3c3d9c25c77ee21a301cc7bde42 100644
--- a/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php
+++ b/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php
@@ -116,7 +116,7 @@ public function getFilterLabels() {
*/
public function buildRow(EntityInterface $entity) {
$row['label'] = array(
- 'data' => $this->getLabel($entity),
+ 'data' => $entity->label(),
'class' => 'table-filter-text-source',
);
diff --git a/core/modules/contact/src/ContactFormListBuilder.php b/core/modules/contact/src/ContactFormListBuilder.php
index 4ba3b3604d1abc52bbfd6b4f47a663a711bc3cca..ed027c1bf80f1ad34d16dc03122833a58de8c7da 100644
--- a/core/modules/contact/src/ContactFormListBuilder.php
+++ b/core/modules/contact/src/ContactFormListBuilder.php
@@ -35,7 +35,7 @@ public function buildHeader() {
public function buildRow(EntityInterface $entity) {
// Special case the personal form.
if ($entity->id() == 'personal') {
- $row['form'] = $this->getLabel($entity);
+ $row['form'] = $entity->label();
$row['recipients'] = t('Selected user');
$row['selected'] = t('No');
}
diff --git a/core/modules/field_ui/src/EntityDisplayModeListBuilder.php b/core/modules/field_ui/src/EntityDisplayModeListBuilder.php
index 906a8e04842bd148eb55ffaf0c66248b34858bae..159596319aa59bd6d5a77ad2d4e44ae046f0c87e 100644
--- a/core/modules/field_ui/src/EntityDisplayModeListBuilder.php
+++ b/core/modules/field_ui/src/EntityDisplayModeListBuilder.php
@@ -68,7 +68,7 @@ public function buildHeader() {
* {@inheritdoc}
*/
public function buildRow(EntityInterface $entity) {
- $row['label'] = $this->getLabel($entity);
+ $row['label'] = $entity->label();
return $row + parent::buildRow($entity);
}
diff --git a/core/modules/filter/src/FilterFormatListBuilder.php b/core/modules/filter/src/FilterFormatListBuilder.php
index 89b4c96513fa0a6330cc76d9db157490d6914b51..5ae317e4f0fca958d070277b2e48712bdeaeba9c 100644
--- a/core/modules/filter/src/FilterFormatListBuilder.php
+++ b/core/modules/filter/src/FilterFormatListBuilder.php
@@ -93,7 +93,7 @@ public function buildHeader() {
public function buildRow(EntityInterface $entity) {
// Check whether this is the fallback text format. This format is available
// to all roles and cannot be disabled via the admin interface.
- $row['label'] = $this->getLabel($entity);
+ $row['label'] = $entity->label();
$row['roles'] = [];
if ($entity->isFallbackFormat()) {
$fallback_choice = $this->configFactory->get('filter.settings')->get('always_show_fallback_choice');
diff --git a/core/modules/image/src/ImageStyleListBuilder.php b/core/modules/image/src/ImageStyleListBuilder.php
index b0ad2275714c9e2c2ab3a40b5240d91a48ad1e7e..191314c89462a3fec99e315cf23c446877a2a2f9 100644
--- a/core/modules/image/src/ImageStyleListBuilder.php
+++ b/core/modules/image/src/ImageStyleListBuilder.php
@@ -67,7 +67,7 @@ public function buildHeader() {
* {@inheritdoc}
*/
public function buildRow(EntityInterface $entity) {
- $row['label'] = $this->getLabel($entity);
+ $row['label'] = $entity->label();
return $row + parent::buildRow($entity);
}
diff --git a/core/modules/language/src/LanguageListBuilder.php b/core/modules/language/src/LanguageListBuilder.php
index 77deb0147ba9c694b76dcd4f9ceb39e20889c144..2f8057809d39c6ec2881c0056da06526242a6f12 100644
--- a/core/modules/language/src/LanguageListBuilder.php
+++ b/core/modules/language/src/LanguageListBuilder.php
@@ -107,7 +107,7 @@ public function buildHeader() {
* {@inheritdoc}
*/
public function buildRow(EntityInterface $entity) {
- $row['label'] = $this->getLabel($entity);
+ $row['label'] = $entity->label();
$row['default'] = array(
'#type' => 'radio',
'#parents' => array('site_default_language'),
diff --git a/core/modules/menu_ui/src/MenuListBuilder.php b/core/modules/menu_ui/src/MenuListBuilder.php
index 95d029c4f358a9708c3179f11ec637cebe67e9e6..be9fc1ec7be2cb2c04e18f6950157cb2acfa9cc3 100644
--- a/core/modules/menu_ui/src/MenuListBuilder.php
+++ b/core/modules/menu_ui/src/MenuListBuilder.php
@@ -36,7 +36,7 @@ public function buildHeader() {
*/
public function buildRow(EntityInterface $entity) {
$row['title'] = array(
- 'data' => $this->getLabel($entity),
+ 'data' => $entity->label(),
'class' => array('menu-label'),
);
$row['description']['data'] = ['#markup' => $entity->getDescription()];
diff --git a/core/modules/node/src/NodeTypeListBuilder.php b/core/modules/node/src/NodeTypeListBuilder.php
index 89ea82502d035d8434ba91a866d6c2759b34a585..ddefa51cea9fa636c34ee32fc7cd3462b577249a 100644
--- a/core/modules/node/src/NodeTypeListBuilder.php
+++ b/core/modules/node/src/NodeTypeListBuilder.php
@@ -35,7 +35,7 @@ public function buildHeader() {
*/
public function buildRow(EntityInterface $entity) {
$row['title'] = array(
- 'data' => $this->getLabel($entity),
+ 'data' => $entity->label(),
'class' => array('menu-label'),
);
$row['description']['data'] = ['#markup' => $entity->getDescription()];
diff --git a/core/modules/responsive_image/src/ResponsiveImageStyleListBuilder.php b/core/modules/responsive_image/src/ResponsiveImageStyleListBuilder.php
index 5a3da8daac99e4bb9c30a24f60758ce3ff6168fe..879313f77f6c019b45d86f33937e66b529d6626c 100644
--- a/core/modules/responsive_image/src/ResponsiveImageStyleListBuilder.php
+++ b/core/modules/responsive_image/src/ResponsiveImageStyleListBuilder.php
@@ -28,7 +28,7 @@ public function buildHeader() {
* {@inheritdoc}
*/
public function buildRow(EntityInterface $entity) {
- $row['label'] = $this->getLabel($entity);
+ $row['label'] = $entity->label();
$row['id'] = $entity->id();
return $row + parent::buildRow($entity);
}
diff --git a/core/modules/search/src/SearchPageListBuilder.php b/core/modules/search/src/SearchPageListBuilder.php
index 90955136dc6b29bde75641e5300e505db11a4ee0..b25c49972340ef900f29937dc807a87083bb84c3 100644
--- a/core/modules/search/src/SearchPageListBuilder.php
+++ b/core/modules/search/src/SearchPageListBuilder.php
@@ -121,7 +121,7 @@ public function buildHeader() {
*/
public function buildRow(EntityInterface $entity) {
/** @var $entity \Drupal\search\SearchPageInterface */
- $row['label'] = $this->getLabel($entity);
+ $row['label'] = $entity->label();
$row['url']['#markup'] = 'search/' . $entity->getPath();
// If the search page is active, link to it.
if ($entity->status()) {
diff --git a/core/modules/shortcut/src/Form/SwitchShortcutSet.php b/core/modules/shortcut/src/Form/SwitchShortcutSet.php
index 5388db5d9935d13962d5c33d1a198c89cbcdd152..9bc34caba27b57c599f98014637fb51995672272 100644
--- a/core/modules/shortcut/src/Form/SwitchShortcutSet.php
+++ b/core/modules/shortcut/src/Form/SwitchShortcutSet.php
@@ -7,7 +7,6 @@
namespace Drupal\shortcut\Form;
-use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Routing\RouteMatchInterface;
@@ -71,7 +70,7 @@ public function buildForm(array $form, FormStateInterface $form_state, UserInter
// Prepare the list of shortcut sets.
$options = array_map(function (ShortcutSet $set) {
- return SafeMarkup::checkPlain($set->label());
+ return $set->label();
}, $this->shortcutSetStorage->loadMultiple());
$current_set = shortcut_current_displayed_set($this->user);
diff --git a/core/modules/shortcut/src/ShortcutSetListBuilder.php b/core/modules/shortcut/src/ShortcutSetListBuilder.php
index 9de658d668f5f8673d748317d99986fa10e6921f..cf5c464eb7a4cfe5b0b8e5d8f7c0ed1b45a9c866 100644
--- a/core/modules/shortcut/src/ShortcutSetListBuilder.php
+++ b/core/modules/shortcut/src/ShortcutSetListBuilder.php
@@ -46,7 +46,7 @@ public function getDefaultOperations(EntityInterface $entity) {
* {@inheritdoc}
*/
public function buildRow(EntityInterface $entity) {
- $row['name'] = $this->getLabel($entity);
+ $row['name'] = $entity->label();
return $row + parent::buildRow($entity);
}
diff --git a/core/modules/system/src/DateFormatListBuilder.php b/core/modules/system/src/DateFormatListBuilder.php
index 29b201cd63e41cc67c0e206a684293d7f46580d8..2f052d9a79f9a586b001dd3804785c10d60f40a1 100644
--- a/core/modules/system/src/DateFormatListBuilder.php
+++ b/core/modules/system/src/DateFormatListBuilder.php
@@ -68,7 +68,7 @@ public function buildHeader() {
* {@inheritdoc}
*/
public function buildRow(EntityInterface $entity) {
- $row['label'] = $this->getLabel($entity);
+ $row['label'] = $entity->label();
$row['pattern'] = $this->dateFormatter->format(REQUEST_TIME, $entity->id());
return $row + parent::buildRow($entity);
}
diff --git a/core/modules/system/tests/modules/entity_test/src/EntityTestListBuilder.php b/core/modules/system/tests/modules/entity_test/src/EntityTestListBuilder.php
index 1fbc8a1b9eb03b3cdcf95591314efd4308d6a596..c3a9cba175440aaaf70b75e28e1d3f895f7e536e 100644
--- a/core/modules/system/tests/modules/entity_test/src/EntityTestListBuilder.php
+++ b/core/modules/system/tests/modules/entity_test/src/EntityTestListBuilder.php
@@ -30,7 +30,7 @@ public function buildHeader() {
* {@inheritdoc}
*/
public function buildRow(EntityInterface $entity) {
- $row['label'] = $this->getLabel($entity);
+ $row['label'] = $entity->label();
$row['id'] = $entity->id();
return $row + parent::buildRow($entity);
}
diff --git a/core/modules/taxonomy/src/VocabularyListBuilder.php b/core/modules/taxonomy/src/VocabularyListBuilder.php
index fe196c930f97141395930cd453746dae0dab9f66..88f2594ec486bb0f4ab7d935c198a5fb1d42c3d5 100644
--- a/core/modules/taxonomy/src/VocabularyListBuilder.php
+++ b/core/modules/taxonomy/src/VocabularyListBuilder.php
@@ -68,7 +68,7 @@ public function buildHeader() {
* {@inheritdoc}
*/
public function buildRow(EntityInterface $entity) {
- $row['label'] = $this->getLabel($entity);
+ $row['label'] = $entity->label();
return $row + parent::buildRow($entity);
}
diff --git a/core/modules/user/src/RoleListBuilder.php b/core/modules/user/src/RoleListBuilder.php
index 4e0dd7398b0cee6ee76b68640fdacf9a7680c94a..b2b9e547393fee8216eacabdd5fc0941558ffaba 100644
--- a/core/modules/user/src/RoleListBuilder.php
+++ b/core/modules/user/src/RoleListBuilder.php
@@ -37,7 +37,7 @@ public function buildHeader() {
* {@inheritdoc}
*/
public function buildRow(EntityInterface $entity) {
- $row['label'] = $this->getLabel($entity);
+ $row['label'] = $entity->label();
return $row + parent::buildRow($entity);
}
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
index b76ce384a38242fa64de3e40b234bf9bdb04fe7a..79447e5dc1d92a833c18a065a199d2229f4ff9de 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
@@ -137,64 +137,6 @@ public function testGetOperations() {
$this->assertArrayHasKey('title', $operations[$operation_name]);
}
- /**
- * Tests that buildRow() returns a string which has been run through
- * SafeMarkup::checkPlain().
- *
- * @dataProvider providerTestBuildRow
- *
- * @param string $input
- * The entity label being passed into buildRow.
- * @param string $expected
- * The expected output of the label from buildRow.
- * @param string $message
- * The message to provide as output for the test.
- * @param bool $ignorewarnings
- * Whether or not to ignore PHP 5.3+ invalid multibyte sequence warnings.
- *
- * @see \Drupal\Core\Entity\EntityListBuilder::buildRow()
- */
- public function testBuildRow($input, $expected, $message, $ignorewarnings = FALSE) {
- $this->role->expects($this->any())
- ->method('label')
- ->will($this->returnValue($input));
-
- if ($ignorewarnings) {
- $built_row = @$this->entityListBuilder->buildRow($this->role);
- }
- else {
- $built_row = $this->entityListBuilder->buildRow($this->role);
- }
-
- $this->assertEquals($built_row['label'], $expected, $message);
- }
-
- /**
- * Data provider for testBuildRow().
- *
- * @see self::testBuildRow()
- * @see \Drupal\Tests\Component\Utility\SafeMarkupTest::providerCheckPlain()
- *
- * @return array
- * An array containing a string, the expected return from
- * SafeMarkup::checkPlain, a message to be output for failures, and whether the
- * test should be processed as multibyte.
- */
- public function providerTestBuildRow() {
- $tests = array();
- // Checks that invalid multi-byte sequences are escaped.
- $tests[] = array("Foo\xC0barbaz", 'Foo�barbaz', 'EntityTestListBuilder::buildRow() escapes invalid sequence "Foo\xC0barbaz"', TRUE);
- $tests[] = array("\xc2\"", '�"', 'EntityTestListBuilder::buildRow escapes invalid sequence "\xc2\""', TRUE);
- $tests[] = array("Fooÿñ", "Fooÿñ", 'EntityTestListBuilder::buildR does not escape valid sequence "Fooÿñ"');
-
- // Checks that special characters are escaped.
- $tests[] = array("<script>", '<script>', 'EntityTestListBuilder::buildRow() escapes <script>');
- $tests[] = array('<>&"\'', '<>&"'', 'EntityTestListBuilder::buildRow() escapes reserved HTML characters.');
-
- return $tests;
-
- }
-
}
class TestEntityListBuilder extends EntityTestListBuilder {