From 70f8ac6f3106f6d17a0e789f94a0c74ec268c809 Mon Sep 17 00:00:00 2001
From: webchick <drupal@webchick.net>
Date: Sun, 29 Mar 2015 15:13:25 -0700
Subject: [PATCH] Issue #2457887 by prateekMehta, stefan.r, rpayanm, alexpott:
Use Utility\SafeMarkup class instead of Utility\String for placeholder(),
checkPlain(),format() functions
---
core/includes/common.inc | 15 ++---
core/includes/file.inc | 4 +-
core/includes/form.inc | 17 +++--
core/includes/menu.inc | 5 +-
core/includes/schema.inc | 2 +-
core/includes/tablesort.inc | 4 +-
core/includes/theme.inc | 15 ++---
core/includes/update.inc | 8 +--
.../Diff/Engine/HWLDFWordAccumulator.php | 5 +-
.../Component/Gettext/PoStreamReader.php | 32 +++++-----
core/lib/Drupal/Component/Utility/String.php | 6 +-
.../Drupal/Component/Utility/UrlHelper.php | 6 +-
core/lib/Drupal/Component/Utility/Xss.php | 2 +-
.../Core/Asset/CssCollectionRenderer.php | 4 +-
core/lib/Drupal/Core/Block/BlockBase.php | 4 +-
.../Core/Breadcrumb/BreadcrumbManager.php | 4 +-
core/lib/Drupal/Core/Cache/CacheContexts.php | 4 +-
core/lib/Drupal/Core/Config/ConfigBase.php | 10 +--
.../lib/Drupal/Core/Config/ConfigImporter.php | 6 +-
.../Core/Config/Entity/ConfigEntityBase.php | 8 +--
.../Config/Entity/ConfigEntityStorage.php | 6 +-
.../Core/Config/Entity/ConfigEntityType.php | 6 +-
core/lib/Drupal/Core/Config/FileStorage.php | 6 +-
.../Drupal/Core/Config/ImmutableConfig.php | 10 +--
.../Config/PreExistingConfigException.php | 4 +-
.../Core/Config/Schema/ArrayElement.php | 4 +-
.../Drupal/Core/Config/StorableConfigBase.php | 6 +-
.../Drupal/Core/Config/StorageComparer.php | 4 +-
.../Config/Testing/ConfigSchemaChecker.php | 8 +--
.../Drupal/Core/Config/TypedConfigManager.php | 4 +-
.../Config/UnmetDependenciesException.php | 4 +-
.../Controller/TitleResolverInterface.php | 2 +-
.../Core/Database/Driver/fake/FakeSelect.php | 4 +-
.../Drupal/Core/Database/Install/Tasks.php | 3 +-
core/lib/Drupal/Core/Diff/DiffFormatter.php | 8 +--
.../Drupal/Core/Entity/ContentEntityBase.php | 22 +++----
.../Core/Entity/ContentEntityStorageBase.php | 4 +-
core/lib/Drupal/Core/Entity/Entity.php | 6 +-
.../Drupal/Core/Entity/EntityDisplayBase.php | 4 +-
.../Drupal/Core/Entity/EntityListBuilder.php | 4 +-
core/lib/Drupal/Core/Entity/EntityManager.php | 12 ++--
.../Drupal/Core/Entity/EntityStorageBase.php | 4 +-
core/lib/Drupal/Core/Entity/EntityType.php | 4 +-
.../KeyValueStore/KeyValueEntityStorage.php | 4 +-
.../Entity/Plugin/DataType/EntityAdapter.php | 14 ++--
.../SelectionBase.php | 4 +-
.../Core/Entity/Sql/DefaultTableMapping.php | 6 +-
.../Entity/Sql/SqlContentEntityStorage.php | 6 +-
.../Sql/SqlContentEntityStorageSchema.php | 8 +--
.../DefaultExceptionSubscriber.php | 3 +-
.../ExceptionLoggingSubscriber.php | 6 +-
.../Fast404ExceptionHtmlSubscriber.php | 4 +-
.../MaintenanceModeSubscriber.php | 4 +-
core/lib/Drupal/Core/Extension/InfoParser.php | 6 +-
.../Drupal/Core/Extension/ModuleHandler.php | 4 +-
.../Drupal/Core/Extension/ModuleInstaller.php | 6 +-
.../Drupal/Core/Extension/ThemeHandler.php | 10 +--
.../Drupal/Core/Field/AllowedTagsXssTrait.php | 2 +-
.../Core/Field/Entity/BaseFieldOverride.php | 10 +--
.../lib/Drupal/Core/Field/FieldConfigBase.php | 4 +-
.../FieldFormatter/BasicStringFormatter.php | 4 +-
.../EntityReferenceIdFormatter.php | 4 +-
.../EntityReferenceLabelFormatter.php | 4 +-
.../FieldFormatter/LanguageFormatter.php | 4 +-
.../Field/FieldFormatter/StringFormatter.php | 4 +-
core/lib/Drupal/Core/Field/WidgetBase.php | 6 +-
core/lib/Drupal/Core/Form/FormBuilder.php | 4 +-
.../ImageToolkitOperationBase.php | 6 +-
.../ImageToolkitOperationManager.php | 4 +-
.../Installer/Form/SelectLanguageForm.php | 4 +-
.../Drupal/Core/Language/LanguageManager.php | 4 +-
.../Drupal/Core/Logger/LogMessageParser.php | 4 +-
.../Core/Logger/LogMessageParserInterface.php | 6 +-
core/lib/Drupal/Core/Menu/MenuLinkBase.php | 4 +-
core/lib/Drupal/Core/Menu/MenuLinkManager.php | 8 +--
core/lib/Drupal/Core/Menu/MenuTreeStorage.php | 6 +-
.../Drupal/Core/Plugin/Context/Context.php | 4 +-
.../Core/Plugin/Context/ContextDefinition.php | 4 +-
.../Core/Plugin/Context/ContextHandler.php | 4 +-
core/lib/Drupal/Core/Render/Element.php | 4 +-
.../Core/Routing/AcceptHeaderMatcher.php | 4 +-
.../Drupal/Core/Session/AccountInterface.php | 2 +-
.../TranslationInterface.php | 8 +--
core/lib/Drupal/Core/Template/Attribute.php | 2 +-
.../Drupal/Core/Template/AttributeArray.php | 4 +-
.../Drupal/Core/Template/AttributeBoolean.php | 4 +-
.../Drupal/Core/Template/AttributeString.php | 4 +-
.../Core/Template/AttributeValueBase.php | 4 +-
.../Core/TypedData/TypedDataManager.php | 4 +-
core/lib/Drupal/Core/Url.php | 14 ++--
core/lib/Drupal/Core/Utility/Error.php | 7 +-
.../lib/Drupal/Core/Utility/LinkGenerator.php | 3 +-
.../Core/Utility/LinkGeneratorInterface.php | 2 +-
core/lib/Drupal/Core/Utility/Token.php | 4 +-
.../Core/Utility/UnroutedUrlAssembler.php | 4 +-
.../modules/action/action.views_execution.inc | 6 +-
core/modules/aggregator/aggregator.theme.inc | 6 +-
.../aggregator/src/Form/SettingsForm.php | 4 +-
.../src/Plugin/views/argument/Fid.php | 4 +-
.../src/Plugin/views/argument/Iid.php | 4 +-
.../src/Tests/AggregatorRenderingTest.php | 4 +-
core/modules/ban/src/BanMiddleware.php | 4 +-
.../src/Authentication/Provider/BasicAuth.php | 4 +-
.../Tests/Authentication/BasicAuthTest.php | 4 +-
core/modules/block/src/BlockListBuilder.php | 6 +-
.../block/src/BlockPluginCollection.php | 4 +-
core/modules/block/src/BlockViewBuilder.php | 4 +-
.../CategoryAutocompleteController.php | 4 +-
.../block/src/Tests/BlockInterfaceTest.php | 4 +-
.../src/Tests/Views/DisplayBlockTest.php | 4 +-
.../src/Unit/CategoryAutocompleteTest.php | 4 +-
.../src/Tests/Views/BlockContentTestBase.php | 6 +-
core/modules/book/book.module | 14 ++--
core/modules/book/src/Tests/BookTest.php | 6 +-
core/modules/color/color.module | 3 +-
core/modules/comment/comment.module | 4 +-
core/modules/comment/comment.tokens.inc | 8 +--
.../comment/src/CommentTypeListBuilder.php | 4 +-
.../src/Form/ConfirmDeleteMultiple.php | 4 +-
.../src/Plugin/views/argument/UserUid.php | 4 +-
.../comment/src/Tests/CommentBlockTest.php | 7 +-
.../src/Tests/CommentFieldAccessTest.php | 14 ++--
.../comment/src/Tests/CommentPagerTest.php | 6 +-
.../comment/src/Tests/CommentTestTrait.php | 4 +-
.../src/Tests/CommentTokenReplaceTest.php | 16 ++---
.../config/src/Tests/ConfigCRUDTest.php | 6 +-
.../config/src/Tests/ConfigEntityTest.php | 10 +--
.../ConfigImportRenameValidationTest.php | 6 +-
.../config/src/Tests/ConfigImportUITest.php | 4 +-
.../config/src/Tests/ConfigImporterTest.php | 10 +--
.../config/src/Tests/SchemaCheckTestTrait.php | 8 +--
.../src/ConfigMapperManager.php | 4 +-
.../ConfigTranslationBlockListBuilder.php | 6 +-
.../ConfigTranslationFieldListBuilder.php | 4 +-
.../ConfigTranslationMapperList.php | 4 +-
.../Tests/ConfigTranslationOverviewTest.php | 4 +-
.../src/Tests/ConfigTranslationUiTest.php | 8 +--
.../contact/src/ContactFormListBuilder.php | 4 +-
.../src/Controller/ContactController.php | 4 +-
core/modules/contact/src/MessageForm.php | 6 +-
.../contact/src/MessageViewBuilder.php | 4 +-
.../contact/src/Tests/ContactPersonalTest.php | 4 +-
.../content_translation.admin.inc | 12 ++--
.../dblog/src/Controller/DbLogController.php | 3 +-
core/modules/dblog/src/Logger/DbLog.php | 3 +-
.../src/Plugin/views/field/DblogMessage.php | 4 +-
.../src/Tests/Views/ViewsIntegrationTest.php | 3 +-
.../editor/src/Tests/EditorSecurityTest.php | 4 +-
.../src/ConfigurableEntityReferenceItem.php | 8 +--
.../Tests/EntityReferenceIntegrationTest.php | 6 +-
core/modules/field/src/Entity/FieldConfig.php | 10 +--
.../field/src/Entity/FieldStorageConfig.php | 14 ++--
.../Boolean/BooleanFormatterSettingsTest.php | 4 +-
.../field/src/Tests/FieldImportDeleteTest.php | 12 ++--
.../src/Tests/FieldTypePluginManagerTest.php | 10 +--
core/modules/field/src/Tests/FormTest.php | 4 +-
.../Tests/String/RawStringFormatterTest.php | 4 +-
.../src/Tests/String/StringFormatterTest.php | 4 +-
.../field_ui/src/FieldConfigListBuilder.php | 4 +-
.../src/Form/EntityDisplayFormBase.php | 4 +-
.../field_ui/src/Form/FieldEditForm.php | 4 +-
.../field_ui/src/Tests/ManageFieldsTest.php | 6 +-
core/modules/file/file.module | 13 ++--
.../Plugin/Field/FieldWidget/FileWidget.php | 4 +-
.../file/src/Plugin/views/argument/Fid.php | 4 +-
.../file/src/Tests/FilePrivateTest.php | 6 +-
.../file/src/Tests/FileTokenReplaceTest.php | 12 ++--
core/modules/filter/filter.module | 17 ++---
.../filter/src/FilterFormatFormBase.php | 2 +-
.../filter/src/FilterFormatListBuilder.php | 10 +--
core/modules/filter/src/FilterPermissions.php | 4 +-
.../src/Plugin/Filter/FilterCaption.php | 2 +-
.../filter/src/Plugin/Filter/FilterHtml.php | 8 +--
.../filter/src/Tests/FilterAPITest.php | 4 +-
.../filter/src/Tests/FilterAdminTest.php | 4 +-
.../filter/src/Tests/FilterFormTest.php | 20 +++---
.../filter/src/Tests/FilterUnitTest.php | 9 +--
core/modules/forum/forum.module | 6 +-
.../help/src/Controller/HelpController.php | 4 +-
core/modules/image/image.admin.inc | 5 +-
.../image/src/Form/ImageEffectFormBase.php | 4 +-
.../image/src/Form/ImageStyleEditForm.php | 4 +-
.../image/src/Tests/ImageAdminStylesTest.php | 4 +-
core/modules/language/language.admin.inc | 4 +-
.../LanguageConfigCollectionNameTrait.php | 4 +-
.../src/Entity/ContentLanguageSettings.php | 4 +-
.../language/src/Form/LanguageFormBase.php | 4 +-
.../src/Form/NegotiationConfigureForm.php | 4 +-
core/modules/link/link.module | 4 +-
.../Field/FieldFormatter/LinkFormatter.php | 4 +-
core/modules/link/src/Tests/LinkFieldTest.php | 40 ++++++------
core/modules/locale/locale.pages.inc | 5 +-
.../locale/src/Form/TranslateEditForm.php | 8 +--
.../locale/src/Form/TranslationStatusForm.php | 4 +-
core/modules/locale/src/StringBase.php | 6 +-
.../Tests/LocaleJavascriptTranslationTest.php | 6 +-
.../src/Tests/LocaleTranslationUiTest.php | 8 +--
.../locale/src/Tests/LocaleUpdateBase.php | 4 +-
.../src/Tests/LocaleUpdateInterfaceTest.php | 6 +-
.../src/Plugin/Menu/MenuLinkContent.php | 4 +-
.../menu_link_content/src/Tests/LinksTest.php | 4 +-
core/modules/migrate/src/Entity/Migration.php | 4 +-
.../src/Plugin/migrate/process/Concat.php | 4 +-
.../migrate/tests/src/Unit/TestSqlIdMap.php | 4 +-
.../migrate_drupal/src/MigrationStorage.php | 4 +-
.../src/Plugin/migrate/load/LoadEntity.php | 4 +-
.../Plugin/migrate/source/DrupalSqlBase.php | 6 +-
.../dependencies/MigrateDependenciesTest.php | 4 +-
core/modules/node/node.api.php | 4 +-
core/modules/node/node.tokens.inc | 12 ++--
.../node/src/Controller/NodeController.php | 4 +-
.../src/Controller/NodePreviewController.php | 4 +-
.../src/Controller/NodeViewController.php | 4 +-
core/modules/node/src/Form/DeleteMultiple.php | 4 +-
core/modules/node/src/NodeListBuilder.php | 4 +-
core/modules/node/src/NodeTypeForm.php | 4 +-
.../node/src/Plugin/Search/NodeSearch.php | 7 +-
.../node/src/Plugin/views/argument/Nid.php | 4 +-
.../node/src/Plugin/views/argument/Type.php | 4 +-
.../node/src/Plugin/views/argument/Vid.php | 4 +-
.../modules/node/src/Plugin/views/row/Rss.php | 3 +-
.../node/src/Tests/NodeFieldAccessTest.php | 20 +++---
.../node/src/Tests/NodeTokenReplaceTest.php | 10 +--
.../Tests/NodeTypeRenameConfigImportTest.php | 4 +-
.../src/Tests/Views/BulkFormAccessTest.php | 5 +-
.../Plugin/views/argument/NumberListField.php | 4 +-
.../Plugin/views/argument/StringListField.php | 4 +-
core/modules/path/src/Form/EditForm.php | 4 +-
.../quickedit/src/MetadataGenerator.php | 4 +-
core/modules/rdf/rdf.module | 3 +-
.../responsive_image/responsive_image.module | 3 +-
.../Plugin/rest/resource/EntityResource.php | 8 +--
.../src/Plugin/views/display/RestExport.php | 4 +-
.../src/Tests/Views/StyleSerializerTest.php | 4 +-
core/modules/search/search.module | 4 +-
core/modules/search/search.pages.inc | 6 +-
.../search/src/Tests/SearchTestBase.php | 4 +-
.../src/Tests/EntitySerializationTest.php | 4 +-
core/modules/shortcut/shortcut.module | 4 +-
.../shortcut/src/Form/SwitchShortcutSet.php | 4 +-
.../shortcut/src/Tests/ShortcutLinksTest.php | 6 +-
.../simpletest/src/AssertContentTrait.php | 64 +++++++++----------
.../src/Form/SimpletestTestForm.php | 4 +-
.../modules/simpletest/src/KernelTestBase.php | 8 +--
core/modules/simpletest/src/TestBase.php | 50 +++++++--------
core/modules/simpletest/src/WebTestBase.php | 35 +++++-----
core/modules/system/form.api.php | 4 +-
.../system/src/Form/ModulesListForm.php | 4 +-
.../ImageToolkit/Operation/gd/Convert.php | 4 +-
.../ImageToolkit/Operation/gd/CreateNew.php | 10 +--
.../Plugin/ImageToolkit/Operation/gd/Crop.php | 6 +-
.../ImageToolkit/Operation/gd/Resize.php | 6 +-
.../ImageToolkit/Operation/gd/Scale.php | 6 +-
.../Operation/gd/ScaleAndCrop.php | 6 +-
.../src/Tests/Cache/PageCacheTagsTestBase.php | 4 +-
.../Tests/Common/RenderElementTypesTest.php | 8 +--
.../Common/TableSortExtenderUnitTest.php | 14 ++--
.../Condition/CurrentThemeConditionTest.php | 6 +-
.../Tests/Entity/EntityAutocompleteTest.php | 12 ++--
.../Entity/EntityFieldDefaultValueTest.php | 6 +-
.../EntityReferenceSelectionAccessTest.php | 8 +--
.../EntityReferenceSelectionSortTest.php | 4 +-
.../src/Tests/Entity/EntitySchemaTest.php | 14 ++--
.../Tests/Entity/EntityTranslationTest.php | 4 +-
.../src/Tests/File/HtaccessUnitTest.php | 4 +-
.../system/src/Tests/Form/ConfirmFormTest.php | 4 +-
.../Tests/Form/ElementsVerticalTabsTest.php | 4 +-
.../system/src/Tests/Form/FormTest.php | 6 +-
.../src/Tests/Form/StateValuesCleanTest.php | 4 +-
.../system/src/Tests/Image/ToolkitGdTest.php | 38 +++++------
.../src/Tests/Image/ToolkitTestBase.php | 8 +--
.../system/src/Tests/Mail/HtmlToTextTest.php | 6 +-
.../src/Tests/Menu/AssertBreadcrumbTrait.php | 4 +-
.../system/src/Tests/Module/UninstallTest.php | 8 +--
.../Tests/Routing/ExceptionHandlingTest.php | 4 +-
.../System/DefaultMobileMetaTagsTest.php | 6 +-
.../system/src/Tests/System/PageTitleTest.php | 6 +-
.../src/Tests/System/TokenReplaceUnitTest.php | 6 +-
.../system/src/Tests/Theme/FunctionsTest.php | 42 ++++++------
.../src/Tests/Theme/TwigEnvironmentTest.php | 4 +-
core/modules/system/system.api.php | 8 +--
core/modules/system/system.tokens.inc | 6 +-
core/modules/system/templates/links.html.twig | 2 +-
.../src/Controller/CommonTestController.php | 4 +-
.../src/Form/DatabaseTestForm.php | 6 +-
.../entity_test/src/EntityTestViewBuilder.php | 6 +-
.../src/Form/FormTestStorageForm.php | 4 +-
.../src/Form/FormTestStoragePageCacheForm.php | 4 +-
.../form_test/src/FormTestArgumentsObject.php | 4 +-
.../modules/menu_test/src/TestControllers.php | 6 +-
.../session_test/src/Form/SessionTestForm.php | 4 +-
.../TermSelection.php | 4 +-
.../src/Plugin/views/argument/IndexTid.php | 4 +-
.../Plugin/views/argument/IndexTidDepth.php | 4 +-
.../src/Plugin/views/argument/Taxonomy.php | 4 +-
.../Plugin/views/argument/VocabularyVid.php | 4 +-
.../Plugin/views/field/TaxonomyIndexTid.php | 4 +-
.../Plugin/views/filter/TaxonomyIndexTid.php | 8 +--
.../taxonomy/src/Tests/TokenReplaceTest.php | 14 ++--
core/modules/taxonomy/taxonomy.tokens.inc | 10 +--
.../Plugin/Field/FieldType/TextItemBase.php | 2 +-
core/modules/text/src/TextProcessed.php | 3 +-
core/modules/toolbar/toolbar.module | 4 +-
.../src/Plugin/tour/tip/TipPluginText.php | 4 +-
.../src/Plugin/tour/tip/TipPluginImage.php | 4 +-
.../tracker/src/Controller/TrackerUserTab.php | 4 +-
core/modules/tracker/tracker.pages.inc | 4 +-
.../update/src/Form/UpdateManagerUpdate.php | 8 +--
core/modules/user/src/AccountForm.php | 2 +-
.../src/Form/UserMultipleCancelConfirm.php | 4 +-
.../user/src/Form/UserPermissionsForm.php | 4 +-
.../user/src/Plugin/Condition/UserRole.php | 2 +-
.../Constraint/UserMailRequired.php | 4 +-
.../src/Plugin/views/access/Permission.php | 4 +-
.../user/src/Plugin/views/access/Role.php | 6 +-
.../src/Plugin/views/argument/RolesRid.php | 4 +-
.../user/src/Plugin/views/argument/Uid.php | 4 +-
.../Plugin/views/argument_validator/User.php | 2 +-
.../user/src/Plugin/views/field/Name.php | 4 +-
.../user/src/Plugin/views/field/Roles.php | 4 +-
.../src/Plugin/views/filter/Permissions.php | 4 +-
core/modules/user/src/PrivateTempStore.php | 6 +-
core/modules/user/src/SharedTempStore.php | 6 +-
.../Tests/Condition/UserRoleConditionTest.php | 4 +-
.../user/src/Tests/UserTokenReplaceTest.php | 8 +--
.../user/src/Tests/UserValidationTest.php | 4 +-
.../src/Tests/Views/BulkFormAccessTest.php | 4 +-
.../Views/HandlerFilterPermissionTest.php | 4 +-
core/modules/user/src/UserListBuilder.php | 2 +-
.../src/Unit/UserAccessControlHandlerTest.php | 4 +-
.../src/Unit/Views/Argument/RolesRidTest.php | 4 +-
core/modules/user/user.module | 8 +--
core/modules/user/user.tokens.inc | 6 +-
.../views/src/Form/ViewsExposedForm.php | 4 +-
.../src/Plugin/views/BrokenHandlerTrait.php | 4 +-
.../views/src/Plugin/views/HandlerBase.php | 10 +--
.../views/src/Plugin/views/PluginBase.php | 6 +-
.../Plugin/views/ViewsHandlerInterface.php | 2 +-
.../views/src/Plugin/views/area/Result.php | 4 +-
.../views/argument/ArgumentPluginBase.php | 6 +-
.../src/Plugin/views/argument/FieldList.php | 4 +-
.../src/Plugin/views/argument/ListString.php | 4 +-
.../Plugin/views/argument/StringArgument.php | 2 +-
.../src/Plugin/views/display/Attachment.php | 4 +-
.../views/src/Plugin/views/display/Block.php | 4 +-
.../views/display/DisplayPluginBase.php | 9 +--
.../views/src/Plugin/views/display/Feed.php | 6 +-
.../exposed_form/ExposedFormPluginBase.php | 4 +-
.../Plugin/views/field/FieldPluginBase.php | 14 ++--
.../src/Plugin/views/field/MachineName.php | 4 +-
.../src/Plugin/views/field/Serialized.php | 6 +-
.../Plugin/views/filter/FilterPluginBase.php | 7 +-
.../src/Plugin/views/filter/InOperator.php | 10 +--
.../src/Plugin/views/filter/NumericFilter.php | 6 +-
.../src/Plugin/views/filter/StringFilter.php | 6 +-
.../views/src/Plugin/views/row/EntityRow.php | 4 +-
.../views/src/Routing/ViewPageController.php | 4 +-
.../views/src/Tests/Handler/SortDateTest.php | 4 +-
core/modules/views/src/Tests/ModuleTest.php | 4 +-
.../views/src/Tests/Wizard/BasicTest.php | 4 +-
.../views/src/Tests/Wizard/MenuTest.php | 4 +-
core/modules/views/src/ViewExecutable.php | 3 +-
core/modules/views/src/Views.php | 6 +-
core/modules/views/src/ViewsDataHelper.php | 4 +-
.../tests/src/Unit/EntityViewsDataTest.php | 4 +-
.../src/Unit/Plugin/field/CounterTest.php | 18 +++---
.../tests/src/Unit/ViewsDataHelperTest.php | 6 +-
core/modules/views/views.module | 6 +-
core/modules/views/views.theme.inc | 16 ++---
core/modules/views/views.tokens.inc | 8 +--
.../src/Controller/ViewsUIController.php | 3 +-
.../views_ui/src/Form/Ajax/Rearrange.php | 4 +-
.../src/Form/Ajax/RearrangeFilter.php | 4 +-
.../src/Form/Ajax/ReorderDisplays.php | 4 +-
.../views_ui/src/Tests/DisplayTest.php | 4 +-
.../views_ui/src/Tests/HandlerTest.php | 6 +-
core/modules/views_ui/src/ViewEditForm.php | 10 +--
core/modules/views_ui/src/ViewListBuilder.php | 5 +-
core/modules/views_ui/views_ui.theme.inc | 5 +-
.../Tests/Component/Utility/RandomTest.php | 6 +-
.../Tests/Component/Utility/UrlHelperTest.php | 10 +--
.../Drupal/Tests/Core/Config/ConfigTest.php | 8 +--
.../Config/Entity/ConfigEntityTypeTest.php | 4 +-
.../Core/Controller/TitleResolverTest.php | 4 +-
.../Core/Entity/EntityListBuilderTest.php | 6 +-
.../Tests/Core/Form/FormValidatorTest.php | 4 +-
.../Tests/Core/Path/PathMatcherTest.php | 4 +-
.../PhpTransliterationTest.php | 4 +-
core/tests/Drupal/Tests/UnitTestCase.php | 2 +-
core/themes/bartik/bartik.theme | 4 +-
.../templates/navigation/links.html.twig | 2 +-
core/themes/engines/twig/twig.engine | 11 ++--
core/themes/seven/seven.theme | 6 +-
393 files changed, 1220 insertions(+), 1235 deletions(-)
diff --git a/core/includes/common.inc b/core/includes/common.inc
index 8444244787ea..3ceb479f29f6 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -15,9 +15,8 @@
use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\Number;
-use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\SortArray;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Tags;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Core\Asset\AttachedAssets;
@@ -280,10 +279,10 @@ function valid_email_address($mail) {
* \Drupal\Component\Utility\UrlHelper::stripDangerousProtocols() instead.
*
* @see \Drupal\Component\Utility\UrlHelper::stripDangerousProtocols()
- * @see \Drupal\Component\Utility\String::checkPlain()
+ * @see \Drupal\Component\Utility\SafeMarkup::checkPlain()
*/
function check_url($uri) {
- return String::checkPlain(UrlHelper::stripDangerousProtocols($uri));
+ return SafeMarkup::checkPlain(UrlHelper::stripDangerousProtocols($uri));
}
/**
@@ -325,7 +324,7 @@ function format_xml_elements($array) {
}
if (isset($value['value']) && $value['value'] != '') {
- $output .= '>' . (is_array($value['value']) ? format_xml_elements($value['value']) : String::checkPlain($value['value'])) . '</' . $value['key'] . ">\n";
+ $output .= '>' . (is_array($value['value']) ? format_xml_elements($value['value']) : SafeMarkup::checkPlain($value['value'])) . '</' . $value['key'] . ">\n";
}
else {
$output .= " />\n";
@@ -333,7 +332,7 @@ function format_xml_elements($array) {
}
}
else {
- $output .= ' <' . $key . '>' . (is_array($value) ? format_xml_elements($value) : String::checkPlain($value)) . "</$key>\n";
+ $output .= ' <' . $key . '>' . (is_array($value) ? format_xml_elements($value) : SafeMarkup::checkPlain($value)) . "</$key>\n";
}
}
// @todo This is marking the output string as safe HTML, but we have only
@@ -570,7 +569,7 @@ function _drupal_add_html_head_link($attributes, $header = FALSE) {
if ($header) {
// Also add a HTTP header "Link:".
- $href = '<' . String::checkPlain($attributes['href']) . '>;';
+ $href = '<' . SafeMarkup::checkPlain($attributes['href']) . '>;';
unset($attributes['href']);
$element['#attached']['http_header'][] = array('Link', $href . drupal_http_header_attributes($attributes), TRUE);
}
@@ -1581,7 +1580,7 @@ function _drupal_flush_css_js() {
*/
function debug($data, $label = NULL, $print_r = TRUE) {
// Print $data contents to string.
- $string = String::checkPlain($print_r ? print_r($data, TRUE) : var_export($data, TRUE));
+ $string = SafeMarkup::checkPlain($print_r ? print_r($data, TRUE) : var_export($data, TRUE));
// Display values with pre-formatting to increase readability.
$string = '<pre>' . $string . '</pre>';
diff --git a/core/includes/file.inc b/core/includes/file.inc
index 36204b05e8c4..858c4a6de5af 100644
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -9,7 +9,7 @@
use Drupal\Component\Utility\UrlHelper;
use Drupal\Component\PhpStorage\FileStorage;
use Drupal\Component\Utility\Bytes;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\File\FileSystem;
use Drupal\Core\StreamWrapper\PublicStream;
use Drupal\Core\StreamWrapper\StreamWrapperInterface;
@@ -463,7 +463,7 @@ function file_save_htaccess($directory, $private = TRUE, $force_overwrite = FALS
return drupal_chmod($htaccess_path, 0444);
}
else {
- $variables = array('%directory' => $directory, '!htaccess' => '<br />' . nl2br(String::checkPlain($htaccess_lines)));
+ $variables = array('%directory' => $directory, '!htaccess' => '<br />' . nl2br(SafeMarkup::checkPlain($htaccess_lines)));
\Drupal::logger('security')->error("Security warning: Couldn't write .htaccess file. Please create a .htaccess file in your %directory directory which contains the following lines: <code>!htaccess</code>", $variables);
return FALSE;
}
diff --git a/core/includes/form.inc b/core/includes/form.inc
index 9c7268504275..44a049ca3501 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -7,7 +7,6 @@
use Drupal\Component\Utility\NestedArray;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Database\Database;
@@ -109,7 +108,7 @@ function form_select_options($element, $choices = NULL) {
$options = '';
foreach ($choices as $key => $choice) {
if (is_array($choice)) {
- $options .= '<optgroup label="' . String::checkPlain($key) . '">';
+ $options .= '<optgroup label="' . SafeMarkup::checkPlain($key) . '">';
$options .= form_select_options($element, $choice);
$options .= '</optgroup>';
}
@@ -125,7 +124,7 @@ function form_select_options($element, $choices = NULL) {
else {
$selected = '';
}
- $options .= '<option value="' . String::checkPlain($key) . '"' . $selected . '>' . String::checkPlain($choice) . '</option>';
+ $options .= '<option value="' . SafeMarkup::checkPlain($key) . '"' . $selected . '>' . SafeMarkup::checkPlain($choice) . '</option>';
}
}
return SafeMarkup::set($options);
@@ -364,7 +363,7 @@ function template_preprocess_textarea(&$variables) {
Element\RenderElement::setAttributes($element, array('form-textarea'));
$variables['wrapper_attributes'] = new Attribute();
$variables['attributes'] = new Attribute($element['#attributes']);
- $variables['value'] = String::checkPlain($element['#value']);
+ $variables['value'] = SafeMarkup::checkPlain($element['#value']);
$variables['resizable'] = !empty($element['#resizable']) ? $element['#resizable'] : NULL;
$variables['required'] = !empty($element['#required']) ? $element['#required'] : NULL;
}
@@ -553,7 +552,7 @@ function template_preprocess_form_element_label(&$variables) {
* Note: if the batch 'title', 'init_message', 'progress_message', or
* 'error_message' could contain any user input, it is the responsibility of
* the code calling batch_set() to sanitize them first with a function like
- * \Drupal\Component\Utility\String::checkPlain() or
+ * \Drupal\Component\Utility\SafeMarkup::checkPlain() or
* \Drupal\Component\Utility\Xss::filter(). Furthermore, if the batch operation
* returns any user input in the 'results' or 'message' keys of $context, it
* must also sanitize them first.
@@ -580,8 +579,8 @@ function template_preprocess_form_element_label(&$variables) {
*
* $nodes = entity_load_multiple_by_properties('node', array('uid' => $uid, 'type' => $type));
* $node = reset($nodes);
- * $context['results'][] = $node->id() . ' : ' . String::checkPlain($node->label());
- * $context['message'] = String::checkPlain($node->label());
+ * $context['results'][] = $node->id() . ' : ' . SafeMarkup::checkPlain($node->label());
+ * $context['message'] = SafeMarkup::checkPlain($node->label());
* }
*
* // A more advanced example is a multi-step operation that loads all rows,
@@ -600,10 +599,10 @@ function template_preprocess_form_element_label(&$variables) {
* ->range(0, $limit)
* ->execute();
* foreach ($result as $row) {
- * $context['results'][] = $row->id . ' : ' . String::checkPlain($row->title);
+ * $context['results'][] = $row->id . ' : ' . SafeMarkup::checkPlain($row->title);
* $context['sandbox']['progress']++;
* $context['sandbox']['current_id'] = $row->id;
- * $context['message'] = String::checkPlain($row->title);
+ * $context['message'] = SafeMarkup::checkPlain($row->title);
* }
* if ($context['sandbox']['progress'] != $context['sandbox']['max']) {
* $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index 251b81df1237..f754ecb9268c 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -11,7 +11,6 @@
*/
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
use Drupal\Core\Render\Element;
@@ -38,12 +37,12 @@ function template_preprocess_menu_local_task(&$variables) {
$variables['attributes']['class'] = array('active');
// Add text to indicate active tab for non-visual users.
- $active = String::format('<span class="visually-hidden">@label</span>', array('@label' => t('(active tab)')));
+ $active = SafeMarkup::format('<span class="visually-hidden">@label</span>', array('@label' => t('(active tab)')));
$link_text = t('@local-task-title@active', array('@local-task-title' => $link_text, '@active' => $active));
}
else {
// @todo Remove this once https://www.drupal.org/node/2338081 is fixed.
- $link_text = String::checkPlain($link_text);
+ $link_text = SafeMarkup::checkPlain($link_text);
}
$link['localized_options']['set_active_class'] = TRUE;
diff --git a/core/includes/schema.inc b/core/includes/schema.inc
index 4722cf825c42..fdd0df593122 100644
--- a/core/includes/schema.inc
+++ b/core/includes/schema.inc
@@ -221,7 +221,7 @@ function drupal_install_schema($module) {
* An array of arrays with the following key/value pairs:
* - success: a boolean indicating whether the query succeeded.
* - query: the SQL query(s) executed, passed through
- * \Drupal\Component\Utility\String::checkPlain().
+ * \Drupal\Component\Utility\SafeMarkup::checkPlain().
*/
function drupal_uninstall_schema($module) {
$schema = drupal_get_schema_unprocessed($module);
diff --git a/core/includes/tablesort.inc b/core/includes/tablesort.inc
index d4179754b10b..38cccc4af7de 100644
--- a/core/includes/tablesort.inc
+++ b/core/includes/tablesort.inc
@@ -1,6 +1,6 @@
<?php
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Url;
use Drupal\Component\Utility\UrlHelper;
@@ -60,7 +60,7 @@ function tablesort_header(&$cell_content, array &$cell_attributes, array $header
$ts['sort'] = 'asc';
$image = '';
}
- $cell_content = \Drupal::l(String::format('@cell_content@image', array('@cell_content' => $cell_content, '@image' => $image)), new Url('<current>', [], [
+ $cell_content = \Drupal::l(SafeMarkup::format('@cell_content@image', array('@cell_content' => $cell_content, '@image' => $image)), new Url('<current>', [], [
'attributes' => array('title' => $title),
'query' => array_merge($ts['query'], array(
'sort' => $ts['sort'],
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 7761897eef9d..b5caa3f51639 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -11,7 +11,6 @@
use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Unicode;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Component\Utility\Xss;
@@ -574,7 +573,7 @@ function template_preprocess_links(&$variables) {
);
// Convert the attributes array into an Attribute object.
$heading['attributes'] = new Attribute($heading['attributes']);
- $heading['text'] = String::checkPlain($heading['text']);
+ $heading['text'] = SafeMarkup::checkPlain($heading['text']);
}
$variables['links'] = array();
@@ -1272,7 +1271,7 @@ function template_preprocess_html(&$variables) {
if (!empty($variables['page']['#title'])) {
$head_title = array(
'title' => SafeMarkup::set(trim(strip_tags($variables['page']['#title']))),
- 'name' => String::checkPlain($site_config->get('name')),
+ 'name' => SafeMarkup::checkPlain($site_config->get('name')),
);
}
// @todo Remove once views is not bypassing the view subscriber anymore.
@@ -1280,11 +1279,11 @@ function template_preprocess_html(&$variables) {
elseif ($is_front_page) {
$head_title = array(
'title' => t('Home'),
- 'name' => String::checkPlain($site_config->get('name')),
+ 'name' => SafeMarkup::checkPlain($site_config->get('name')),
);
}
else {
- $head_title = array('name' => String::checkPlain($site_config->get('name')));
+ $head_title = array('name' => SafeMarkup::checkPlain($site_config->get('name')));
if ($site_config->get('slogan')) {
$head_title['slogan'] = strip_tags(Xss::filterAdmin($site_config->get('slogan')));
}
@@ -1362,7 +1361,7 @@ function template_preprocess_page(&$variables) {
$variables['front_page'] = \Drupal::url('<front>');
$variables['language'] = $language_interface;
$variables['logo'] = theme_get_setting('logo.url');
- $variables['site_name'] = (theme_get_setting('features.name') ? String::checkPlain($site_config->get('name')) : '');
+ $variables['site_name'] = (theme_get_setting('features.name') ? SafeMarkup::checkPlain($site_config->get('name')) : '');
$variables['site_slogan'] = (theme_get_setting('features.slogan') ? Xss::filterAdmin($site_config->get('slogan')) : '');
// An exception might be thrown.
@@ -1495,7 +1494,7 @@ function template_preprocess_install_page(&$variables) {
// Override the site name that is displayed on the page, since Drupal is
// still in the process of being installed.
- $distribution_name = String::checkPlain(drupal_install_profile_distribution_name());
+ $distribution_name = SafeMarkup::checkPlain(drupal_install_profile_distribution_name());
$variables['site_name'] = $distribution_name;
$variables['head_title_array']['name'] = $distribution_name;
@@ -1547,7 +1546,7 @@ function template_preprocess_field(&$variables, $hook) {
// Always set the field label - allow themes to decide whether to display it.
// In addition the label should be rendered but hidden to support screen
// readers.
- $variables['label'] = String::checkPlain($element['#title']);
+ $variables['label'] = SafeMarkup::checkPlain($element['#title']);
static $default_attributes;
if (!isset($default_attributes)) {
diff --git a/core/includes/update.inc b/core/includes/update.inc
index ee3d66c690ef..f13a124904a7 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -9,7 +9,7 @@
*/
use Drupal\Component\Graph\Graph;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityStorageException;
use Drupal\Core\Utility\Error;
@@ -189,7 +189,7 @@ function update_do_one($module, $number, $dependency_map, &$context) {
$variables = Error::decodeException($e);
unset($variables['backtrace']);
// The exception message is run through
- // \Drupal\Component\Utility\String::checkPlain() by
+ // \Drupal\Component\Utility\SafeMarkup::checkPlain() by
// \Drupal\Core\Utility\Error::decodeException().
$ret['#abort'] = array('success' => FALSE, 'query' => t('%type: !message in %function (line %line of %file).', $variables));
}
@@ -218,7 +218,7 @@ function update_do_one($module, $number, $dependency_map, &$context) {
drupal_set_installed_schema_version($module, $number);
}
- $context['message'] = 'Updating ' . String::checkPlain($module) . ' module';
+ $context['message'] = 'Updating ' . SafeMarkup::checkPlain($module) . ' module';
}
/**
@@ -240,7 +240,7 @@ function update_entity_definitions($module, $number, &$context) {
$variables = Error::decodeException($e);
unset($variables['backtrace']);
// The exception message is run through
- // \Drupal\Component\Utility\String::checkPlain() by
+ // \Drupal\Component\Utility\SafeMarkup::checkPlain() by
// \Drupal\Core\Utility\Error::decodeException().
$ret['#abort'] = array('success' => FALSE, 'query' => t('%type: !message in %function (line %line of %file).', $variables));
$context['results'][$module][$number] = $ret;
diff --git a/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php b/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php
index 8c4ebeac2543..f4adf698bb00 100644
--- a/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php
+++ b/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php
@@ -2,7 +2,6 @@
namespace Drupal\Component\Diff\Engine;
-use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Unicode;
use Drupal\Component\Utility\SafeMarkup;
@@ -34,10 +33,10 @@ class HWLDFWordAccumulator {
protected function _flushGroup($new_tag) {
if ($this->group !== '') {
if ($this->tag == 'mark') {
- $this->line .= '<span class="diffchange">' . String::checkPlain($this->group) . '</span>';
+ $this->line .= '<span class="diffchange">' . SafeMarkup::checkPlain($this->group) . '</span>';
}
else {
- $this->line .= String::checkPlain($this->group);
+ $this->line .= SafeMarkup::checkPlain($this->group);
}
}
$this->group = '';
diff --git a/core/lib/Drupal/Component/Gettext/PoStreamReader.php b/core/lib/Drupal/Component/Gettext/PoStreamReader.php
index 94218e6feba0..4db52a2a63e0 100644
--- a/core/lib/Drupal/Component/Gettext/PoStreamReader.php
+++ b/core/lib/Drupal/Component/Gettext/PoStreamReader.php
@@ -10,7 +10,7 @@
use Drupal\Component\Gettext\PoReaderInterface;
use Drupal\Component\Gettext\PoStreamInterface;
use Drupal\Component\Gettext\PoHeader;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Implements Gettext PO stream reader.
@@ -298,7 +298,7 @@ private function readLine() {
}
else {
// A comment following any other context is a syntax error.
- $this->_errors[] = String::format('The translation stream %uri contains an error: "msgstr" was expected but not found on line %line.', $log_vars);
+ $this->_errors[] = SafeMarkup::format('The translation stream %uri contains an error: "msgstr" was expected but not found on line %line.', $log_vars);
return FALSE;
}
return;
@@ -308,7 +308,7 @@ private function readLine() {
if ($this->_context != 'MSGID') {
// A plural form can only be added to an msgid directly.
- $this->_errors[] = String::format('The translation stream %uri contains an error: "msgid_plural" was expected but not found on line %line.', $log_vars);
+ $this->_errors[] = SafeMarkup::format('The translation stream %uri contains an error: "msgid_plural" was expected but not found on line %line.', $log_vars);
return FALSE;
}
@@ -319,7 +319,7 @@ private function readLine() {
$quoted = $this->parseQuoted($line);
if ($quoted === FALSE) {
// The plural form must be wrapped in quotes.
- $this->_errors[] = String::format('The translation stream %uri contains a syntax error on line %line.', $log_vars);
+ $this->_errors[] = SafeMarkup::format('The translation stream %uri contains a syntax error on line %line.', $log_vars);
return FALSE;
}
@@ -346,7 +346,7 @@ private function readLine() {
}
elseif ($this->_context == 'MSGID') {
// We are currently already in the context, meaning we passed an id with no data.
- $this->_errors[] = String::format('The translation stream %uri contains an error: "msgid" is unexpected on line %line.', $log_vars);
+ $this->_errors[] = SafeMarkup::format('The translation stream %uri contains an error: "msgid" is unexpected on line %line.', $log_vars);
return FALSE;
}
@@ -357,7 +357,7 @@ private function readLine() {
$quoted = $this->parseQuoted($line);
if ($quoted === FALSE) {
// The message id must be wrapped in quotes.
- $this->_errors[] = String::format('The translation stream %uri contains an error: invalid format for "msgid" on line %line.', $log_vars, $log_vars);
+ $this->_errors[] = SafeMarkup::format('The translation stream %uri contains an error: invalid format for "msgid" on line %line.', $log_vars, $log_vars);
return FALSE;
}
@@ -375,7 +375,7 @@ private function readLine() {
}
elseif (!empty($this->_current_item['msgctxt'])) {
// A context cannot apply to another context.
- $this->_errors[] = String::format('The translation stream %uri contains an error: "msgctxt" is unexpected on line %line.', $log_vars);
+ $this->_errors[] = SafeMarkup::format('The translation stream %uri contains an error: "msgctxt" is unexpected on line %line.', $log_vars);
return FALSE;
}
@@ -386,7 +386,7 @@ private function readLine() {
$quoted = $this->parseQuoted($line);
if ($quoted === FALSE) {
// The context string must be quoted.
- $this->_errors[] = String::format('The translation stream %uri contains an error: invalid format for "msgctxt" on line %line.', $log_vars);
+ $this->_errors[] = SafeMarkup::format('The translation stream %uri contains an error: invalid format for "msgctxt" on line %line.', $log_vars);
return FALSE;
}
@@ -404,13 +404,13 @@ private function readLine() {
($this->_context != 'MSGSTR_ARR')) {
// Plural message strings must come after msgid, msgxtxt,
// msgid_plural, or other msgstr[] entries.
- $this->_errors[] = String::format('The translation stream %uri contains an error: "msgstr[]" is unexpected on line %line.', $log_vars);
+ $this->_errors[] = SafeMarkup::format('The translation stream %uri contains an error: "msgstr[]" is unexpected on line %line.', $log_vars);
return FALSE;
}
// Ensure the plurality is terminated.
if (strpos($line, ']') === FALSE) {
- $this->_errors[] = String::format('The translation stream %uri contains an error: invalid format for "msgstr[]" on line %line.', $log_vars);
+ $this->_errors[] = SafeMarkup::format('The translation stream %uri contains an error: invalid format for "msgstr[]" on line %line.', $log_vars);
return FALSE;
}
@@ -425,7 +425,7 @@ private function readLine() {
$quoted = $this->parseQuoted($line);
if ($quoted === FALSE) {
// The string must be quoted.
- $this->_errors[] = String::format('The translation stream %uri contains an error: invalid format for "msgstr[]" on line %line.', $log_vars);
+ $this->_errors[] = SafeMarkup::format('The translation stream %uri contains an error: invalid format for "msgstr[]" on line %line.', $log_vars);
return FALSE;
}
if (!isset($this->_current_item['msgstr']) || !is_array($this->_current_item['msgstr'])) {
@@ -442,7 +442,7 @@ private function readLine() {
if (($this->_context != 'MSGID') && ($this->_context != 'MSGCTXT')) {
// Strings are only valid within an id or context scope.
- $this->_errors[] = String::format('The translation stream %uri contains an error: "msgstr" is unexpected on line %line.', $log_vars);
+ $this->_errors[] = SafeMarkup::format('The translation stream %uri contains an error: "msgstr" is unexpected on line %line.', $log_vars);
return FALSE;
}
@@ -453,7 +453,7 @@ private function readLine() {
$quoted = $this->parseQuoted($line);
if ($quoted === FALSE) {
// The string must be quoted.
- $this->_errors[] = String::format('The translation stream %uri contains an error: invalid format for "msgstr" on line %line.', $log_vars);
+ $this->_errors[] = SafeMarkup::format('The translation stream %uri contains an error: invalid format for "msgstr" on line %line.', $log_vars);
return FALSE;
}
@@ -468,7 +468,7 @@ private function readLine() {
$quoted = $this->parseQuoted($line);
if ($quoted === FALSE) {
// This string must be quoted.
- $this->_errors[] = String::format('The translation stream %uri contains an error: string continuation expected on line %line.', $log_vars);
+ $this->_errors[] = SafeMarkup::format('The translation stream %uri contains an error: string continuation expected on line %line.', $log_vars);
return FALSE;
}
@@ -498,7 +498,7 @@ private function readLine() {
}
else {
// No valid context to append to.
- $this->_errors[] = String::format('The translation stream %uri contains an error: unexpected string on line %line.', $log_vars);
+ $this->_errors[] = SafeMarkup::format('The translation stream %uri contains an error: unexpected string on line %line.', $log_vars);
return FALSE;
}
return;
@@ -511,7 +511,7 @@ private function readLine() {
$this->_current_item = array();
}
elseif ($this->_context != 'COMMENT') {
- $this->_errors[] = String::format('The translation stream %uri ended unexpectedly at line %line.', $log_vars);
+ $this->_errors[] = SafeMarkup::format('The translation stream %uri ended unexpectedly at line %line.', $log_vars);
return FALSE;
}
}
diff --git a/core/lib/Drupal/Component/Utility/String.php b/core/lib/Drupal/Component/Utility/String.php
index 5bacf72af171..df4ba54440fe 100644
--- a/core/lib/Drupal/Component/Utility/String.php
+++ b/core/lib/Drupal/Component/Utility/String.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\Component\Utility\String.
+ * Contains \Drupal\Component\Utility\SafeMarkup.
*/
namespace Drupal\Component\Utility;
@@ -61,7 +61,7 @@ public static function decodeEntities($text) {
* - @variable: Escaped to HTML using
* \Drupal\Component\Utility\SafeMarkup::escape(). Use this as the
* default choice for anything displayed on a page on the site.
- * - %variable: Escaped to HTML and formatted using String::placeholder(),
+ * - %variable: Escaped to HTML and formatted using SafeMarkup::placeholder(),
* which makes the following HTML code:
* @code
* <em class="placeholder">text output here.</em>
@@ -71,7 +71,7 @@ public static function decodeEntities($text) {
* - Non-HTML usage, such as a plain-text email.
* - Non-direct HTML output, such as a plain-text variable that will be
* printed as an HTML attribute value and therefore formatted with
- * String::checkPlain() as part of that.
+ * SafeMarkup::checkPlain() as part of that.
* - Some other special reason for suppressing sanitization.
*
* @return string
diff --git a/core/lib/Drupal/Component/Utility/UrlHelper.php b/core/lib/Drupal/Component/Utility/UrlHelper.php
index 1564f8243dd2..dba89f94eee4 100644
--- a/core/lib/Drupal/Component/Utility/UrlHelper.php
+++ b/core/lib/Drupal/Component/Utility/UrlHelper.php
@@ -244,7 +244,7 @@ public static function externalIsLocal($url, $base_url) {
$base_parts = parse_url($base_url);
if (empty($base_parts['host']) || empty($url_parts['host'])) {
- throw new \InvalidArgumentException(String::format('A path was passed when a fully qualified domain was expected.'));
+ throw new \InvalidArgumentException(SafeMarkup::format('A path was passed when a fully qualified domain was expected.'));
}
if (!isset($url_parts['path']) || !isset($base_parts['path'])) {
@@ -272,7 +272,7 @@ public static function filterBadProtocol($string) {
// Get the plain text representation of the attribute value (i.e. its
// meaning).
$string = String::decodeEntities($string);
- return String::checkPlain(static::stripDangerousProtocols($string));
+ return SafeMarkup::checkPlain(static::stripDangerousProtocols($string));
}
/**
@@ -303,7 +303,7 @@ public static function setAllowedProtocols(array $protocols = array()) {
* check_url() or Drupal\Component\Utility\Xss::filter(), but those functions
* return an HTML-encoded string, so this function can be called independently
* when the output needs to be a plain-text string for passing to functions
- * that will call \Drupal\Component\Utility\String::checkPlain() separately.
+ * that will call \Drupal\Component\Utility\SafeMarkup::checkPlain() separately.
*
* @param string $uri
* A plain-text URI that might contain dangerous protocols.
diff --git a/core/lib/Drupal/Component/Utility/Xss.php b/core/lib/Drupal/Component/Utility/Xss.php
index 3cd3a33098d6..7a06e124e6c4 100644
--- a/core/lib/Drupal/Component/Utility/Xss.php
+++ b/core/lib/Drupal/Component/Utility/Xss.php
@@ -96,7 +96,7 @@ public static function filter($string, $html_tags = array('a', 'em', 'strong', '
*
* Use only for fields where it is impractical to use the
* whole filter system, but where some (mainly inline) mark-up
- * is desired (so \Drupal\Component\Utility\String::checkPlain() is
+ * is desired (so \Drupal\Component\Utility\SafeMarkup::checkPlain() is
* not acceptable).
*
* Allows all tags that can be used inside an HTML body, save
diff --git a/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php b/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
index 6d851d5f440d..eeed904c3e24 100644
--- a/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
+++ b/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
@@ -6,7 +6,7 @@
namespace Drupal\Core\Asset;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\State\StateInterface;
/**
@@ -167,7 +167,7 @@ public function render(array $css_assets) {
// control browser-caching. IE7 does not support a media type on
// the @import statement, so we instead specify the media for
// the group on the STYLE tag.
- $import[] = '@import url("' . String::checkPlain(file_create_url($next_css_asset['data']) . '?' . $query_string) . '");';
+ $import[] = '@import url("' . SafeMarkup::checkPlain(file_create_url($next_css_asset['data']) . '?' . $query_string) . '");';
// Move the outer for loop skip the next item, since we
// processed it here.
$i = $j;
diff --git a/core/lib/Drupal/Core/Block/BlockBase.php b/core/lib/Drupal/Core/Block/BlockBase.php
index 15d3ebf8168f..8bf86c50ec5c 100644
--- a/core/lib/Drupal/Core/Block/BlockBase.php
+++ b/core/lib/Drupal/Core/Block/BlockBase.php
@@ -8,7 +8,7 @@
namespace Drupal\Core\Block;
use Drupal\block\BlockInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Access\AccessResult;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Plugin\ContextAwarePluginBase;
@@ -171,7 +171,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
$form['admin_label'] = array(
'#type' => 'item',
'#title' => $this->t('Block description'),
- '#markup' => String::checkPlain($definition['admin_label']),
+ '#markup' => SafeMarkup::checkPlain($definition['admin_label']),
);
$form['label'] = array(
'#type' => 'textfield',
diff --git a/core/lib/Drupal/Core/Breadcrumb/BreadcrumbManager.php b/core/lib/Drupal/Core/Breadcrumb/BreadcrumbManager.php
index 2c6ed4927874..00998979ac27 100644
--- a/core/lib/Drupal/Core/Breadcrumb/BreadcrumbManager.php
+++ b/core/lib/Drupal/Core/Breadcrumb/BreadcrumbManager.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Breadcrumb;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Routing\RouteMatchInterface;
@@ -95,7 +95,7 @@ public function build(RouteMatchInterface $route_match) {
break;
}
else {
- throw new \UnexpectedValueException(String::format('Invalid breadcrumb returned by !class::build().', array('!class' => get_class($builder))));
+ throw new \UnexpectedValueException(SafeMarkup::format('Invalid breadcrumb returned by !class::build().', array('!class' => get_class($builder))));
}
}
// Allow modules to alter the breadcrumb.
diff --git a/core/lib/Drupal/Core/Cache/CacheContexts.php b/core/lib/Drupal/Core/Cache/CacheContexts.php
index 5f8202f65e7d..5de6527dbebc 100644
--- a/core/lib/Drupal/Core/Cache/CacheContexts.php
+++ b/core/lib/Drupal/Core/Cache/CacheContexts.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Cache;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -111,7 +111,7 @@ public function convertTokensToKeys(array $context_tokens) {
foreach (static::parseTokens($context_tokens) as $context) {
list($context_id, $parameter) = $context;
if (!in_array($context_id, $this->contexts)) {
- throw new \InvalidArgumentException(String::format('"@context" is not a valid cache context ID.', ['@context' => $context_id]));
+ throw new \InvalidArgumentException(SafeMarkup::format('"@context" is not a valid cache context ID.', ['@context' => $context_id]));
}
$keys[] = $this->getService($context_id)->getContext($parameter);
}
diff --git a/core/lib/Drupal/Core/Config/ConfigBase.php b/core/lib/Drupal/Core/Config/ConfigBase.php
index e94db9b9760a..f97f5fd7008b 100644
--- a/core/lib/Drupal/Core/Config/ConfigBase.php
+++ b/core/lib/Drupal/Core/Config/ConfigBase.php
@@ -8,7 +8,7 @@
namespace Drupal\Core\Config;
use Drupal\Component\Utility\NestedArray;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
/**
@@ -95,13 +95,13 @@ public function setName($name) {
public static function validateName($name) {
// The name must be namespaced by owner.
if (strpos($name, '.') === FALSE) {
- throw new ConfigNameException(String::format('Missing namespace in Config object name @name.', array(
+ throw new ConfigNameException(SafeMarkup::format('Missing namespace in Config object name @name.', array(
'@name' => $name,
)));
}
// The name must be shorter than Config::MAX_NAME_LENGTH characters.
if (strlen($name) > self::MAX_NAME_LENGTH) {
- throw new ConfigNameException(String::format('Config object name @name exceeds maximum allowed length of @length characters.', array(
+ throw new ConfigNameException(SafeMarkup::format('Config object name @name exceeds maximum allowed length of @length characters.', array(
'@name' => $name,
'@length' => self::MAX_NAME_LENGTH,
)));
@@ -110,7 +110,7 @@ public static function validateName($name) {
// The name must not contain any of the following characters:
// : ? * < > " ' / \
if (preg_match('/[:?*<>"\'\/\\\\]/', $name)) {
- throw new ConfigNameException(String::format('Invalid character in Config object name @name.', array(
+ throw new ConfigNameException(SafeMarkup::format('Invalid character in Config object name @name.', array(
'@name' => $name,
)));
}
@@ -220,7 +220,7 @@ public function set($key, $value) {
protected function validateKeys(array $data) {
foreach ($data as $key => $value) {
if (strpos($key, '.') !== FALSE) {
- throw new ConfigValueException(String::format('@key key contains a dot which is not supported.', array('@key' => $key)));
+ throw new ConfigValueException(SafeMarkup::format('@key key contains a dot which is not supported.', array('@key' => $key)));
}
if (is_array($value)) {
$this->validateKeys($value);
diff --git a/core/lib/Drupal/Core/Config/ConfigImporter.php b/core/lib/Drupal/Core/Config/ConfigImporter.php
index 3f7db462f190..4f28425a03d3 100644
--- a/core/lib/Drupal/Core/Config/ConfigImporter.php
+++ b/core/lib/Drupal/Core/Config/ConfigImporter.php
@@ -10,7 +10,7 @@
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Extension\ModuleInstallerInterface;
use Drupal\Core\Extension\ThemeHandlerInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Config\Entity\ImportableEntityStorageInterface;
use Drupal\Core\DependencyInjection\DependencySerializationTrait;
use Drupal\Core\Entity\EntityStorageException;
@@ -946,7 +946,7 @@ protected function importInvokeOwner($collection, $op, $name) {
// Call to the configuration entity's storage to handle the configuration
// change.
if (!($entity_storage instanceof ImportableEntityStorageInterface)) {
- throw new EntityStorageException(String::format('The entity storage "@storage" for the "@entity_type" entity type does not support imports', array('@storage' => get_class($entity_storage), '@entity_type' => $entity_type)));
+ throw new EntityStorageException(SafeMarkup::format('The entity storage "@storage" for the "@entity_type" entity type does not support imports', array('@storage' => get_class($entity_storage), '@entity_type' => $entity_type)));
}
$entity_storage->$method($name, $new_config, $old_config);
$this->setProcessedConfiguration($collection, $op, $name);
@@ -992,7 +992,7 @@ protected function importInvokeRename($collection, $rename_name) {
// Call to the configuration entity's storage to handle the configuration
// change.
if (!($entity_storage instanceof ImportableEntityStorageInterface)) {
- throw new EntityStorageException(String::format('The entity storage "@storage" for the "@entity_type" entity type does not support imports', array('@storage' => get_class($entity_storage), '@entity_type' => $entity_type_id)));
+ throw new EntityStorageException(SafeMarkup::format('The entity storage "@storage" for the "@entity_type" entity type does not support imports', array('@storage' => get_class($entity_storage), '@entity_type' => $entity_type_id)));
}
$entity_storage->importRename($names['old_name'], $new_config, $old_config);
$this->setProcessedConfiguration($collection, 'rename', $rename_name);
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
index 90837f9cf7ca..67405415aa70 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Config\Entity;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Config\ConfigException;
use Drupal\Core\Config\Schema\SchemaIncompleteException;
@@ -264,7 +264,7 @@ public function toArray() {
$config_name = $this->getEntityType()->getConfigPrefix() . '.' . $this->id();
$definition = $this->getTypedConfig()->getDefinition($config_name);
if (!isset($definition['mapping'])) {
- throw new SchemaIncompleteException(String::format('Incomplete or missing schema for @config_name', array('@config_name' => $config_name)));
+ throw new SchemaIncompleteException(SafeMarkup::format('Incomplete or missing schema for @config_name', array('@config_name' => $config_name)));
}
$id_key = $this->getEntityType()->getKey('id');
foreach (array_keys($definition['mapping']) as $name) {
@@ -313,7 +313,7 @@ public function preSave(EntityStorageInterface $storage) {
->execute();
$matched_entity = reset($matching_entities);
if (!empty($matched_entity) && ($matched_entity != $this->id()) && $matched_entity != $this->getOriginalId()) {
- throw new ConfigDuplicateUUIDException(String::format('Attempt to save a configuration entity %id with UUID %uuid when this UUID is already used for %matched', array('%id' => $this->id(), '%uuid' => $this->uuid(), '%matched' => $matched_entity)));
+ throw new ConfigDuplicateUUIDException(SafeMarkup::format('Attempt to save a configuration entity %id with UUID %uuid when this UUID is already used for %matched', array('%id' => $this->id(), '%uuid' => $this->uuid(), '%matched' => $matched_entity)));
}
// If this entity is not new, load the original entity for comparison.
@@ -321,7 +321,7 @@ public function preSave(EntityStorageInterface $storage) {
$original = $storage->loadUnchanged($this->getOriginalId());
// Ensure that the UUID cannot be changed for an existing entity.
if ($original && ($original->uuid() != $this->uuid())) {
- throw new ConfigDuplicateUUIDException(String::format('Attempt to save a configuration entity %id with UUID %uuid when this entity already exists with UUID %original_uuid', array('%id' => $this->id(), '%uuid' => $this->uuid(), '%original_uuid' => $original->uuid())));
+ throw new ConfigDuplicateUUIDException(SafeMarkup::format('Attempt to save a configuration entity %id with UUID %uuid when this entity already exists with UUID %original_uuid', array('%id' => $this->id(), '%uuid' => $this->uuid(), '%original_uuid' => $original->uuid())));
}
}
if (!$this->isSyncing()) {
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
index 27da150462a6..2c3e79891b22 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Config\Entity;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Config\ConfigImporterException;
use Drupal\Core\Entity\EntityInterface;
@@ -229,7 +229,7 @@ public function save(EntityInterface $entity) {
// @todo Consider moving this to a protected method on the parent class, and
// abstracting it for all entity types.
if (strlen($entity->get($this->idKey)) > self::MAX_ID_LENGTH) {
- throw new ConfigEntityIdLengthException(String::format('Configuration entity ID @id exceeds maximum allowed length of @length characters.', array(
+ throw new ConfigEntityIdLengthException(SafeMarkup::format('Configuration entity ID @id exceeds maximum allowed length of @length characters.', array(
'@id' => $entity->get($this->idKey),
'@length' => self::MAX_ID_LENGTH,
)));
@@ -362,7 +362,7 @@ public function importUpdate($name, Config $new_config, Config $old_config) {
$id = static::getIDFromConfigName($name, $this->entityType->getConfigPrefix());
$entity = $this->load($id);
if (!$entity) {
- throw new ConfigImporterException(String::format('Attempt to update non-existing entity "@id".', array('@id' => $id)));
+ throw new ConfigImporterException(SafeMarkup::format('Attempt to update non-existing entity "@id".', array('@id' => $id)));
}
$entity->setSyncing(TRUE);
$entity = $this->updateFromStorageRecord($entity, $new_config->get());
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php
index a3631552a015..ddba9f1a38c8 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php
@@ -10,7 +10,7 @@
use Drupal\Core\Config\Entity\Exception\ConfigEntityStorageClassException;
use Drupal\Core\Entity\EntityType;
use Drupal\Core\Config\ConfigPrefixLengthException;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Provides an implementation of a configuration entity type and its metadata.
@@ -104,7 +104,7 @@ public function getConfigPrefix() {
}
if (strlen($config_prefix) > static::PREFIX_LENGTH) {
- throw new ConfigPrefixLengthException(String::format('The configuration file name prefix @config_prefix exceeds the maximum character limit of @max_char.', array(
+ throw new ConfigPrefixLengthException(SafeMarkup::format('The configuration file name prefix @config_prefix exceeds the maximum character limit of @max_char.', array(
'@config_prefix' => $config_prefix,
'@max_char' => static::PREFIX_LENGTH,
)));
@@ -169,7 +169,7 @@ public function setStorageClass($class) {
*/
protected function checkStorageClass($class) {
if (!is_a($class, 'Drupal\Core\Config\Entity\ConfigEntityStorage', TRUE)) {
- throw new ConfigEntityStorageClassException(String::format('@class is not \Drupal\Core\Config\Entity\ConfigEntityStorage or it does not extend it', ['@class' => $class]));
+ throw new ConfigEntityStorageClassException(SafeMarkup::format('@class is not \Drupal\Core\Config\Entity\ConfigEntityStorage or it does not extend it', ['@class' => $class]));
}
}
diff --git a/core/lib/Drupal/Core/Config/FileStorage.php b/core/lib/Drupal/Core/Config/FileStorage.php
index f40448015013..de3ac80b686b 100644
--- a/core/lib/Drupal/Core/Config/FileStorage.php
+++ b/core/lib/Drupal/Core/Config/FileStorage.php
@@ -9,7 +9,7 @@
use Drupal\Component\Serialization\Yaml;
use Drupal\Component\Serialization\Exception\InvalidDataTypeException;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Defines the file storage.
@@ -101,7 +101,7 @@ public function read($name) {
$data = $this->decode($data);
}
catch (InvalidDataTypeException $e) {
- throw new UnsupportedDataTypeConfigException(String::format('Invalid data type in config @name: !message', array(
+ throw new UnsupportedDataTypeConfigException(SafeMarkup::format('Invalid data type in config @name: !message', array(
'@name' => $name,
'!message' => $e->getMessage(),
)));
@@ -130,7 +130,7 @@ public function write($name, array $data) {
$data = $this->encode($data);
}
catch (InvalidDataTypeException $e) {
- throw new StorageException(String::format('Invalid data type in config @name: !message', array(
+ throw new StorageException(SafeMarkup::format('Invalid data type in config @name: !message', array(
'@name' => $name,
'!message' => $e->getMessage(),
)));
diff --git a/core/lib/Drupal/Core/Config/ImmutableConfig.php b/core/lib/Drupal/Core/Config/ImmutableConfig.php
index 61e7fdd099b9..e6938fb010bd 100644
--- a/core/lib/Drupal/Core/Config/ImmutableConfig.php
+++ b/core/lib/Drupal/Core/Config/ImmutableConfig.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Config;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Defines the immutable configuration object.
@@ -31,21 +31,21 @@ class ImmutableConfig extends Config {
* {@inheritdoc}
*/
public function set($key, $value) {
- throw new ImmutableConfigException(String::format('Can not set values on immutable configuration !name:!key. Use \Drupal\Core\Config\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object', ['!name' => $this->getName(), '!key' => $key]));
+ throw new ImmutableConfigException(SafeMarkup::format('Can not set values on immutable configuration !name:!key. Use \Drupal\Core\Config\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object', ['!name' => $this->getName(), '!key' => $key]));
}
/**
* {@inheritdoc}
*/
public function clear($key) {
- throw new ImmutableConfigException(String::format('Can not clear !key key in immutable configuration !name. Use \Drupal\Core\Config\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object', ['!name' => $this->getName(), '!key' => $key]));
+ throw new ImmutableConfigException(SafeMarkup::format('Can not clear !key key in immutable configuration !name. Use \Drupal\Core\Config\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object', ['!name' => $this->getName(), '!key' => $key]));
}
/**
* {@inheritdoc}
*/
public function save() {
- throw new ImmutableConfigException(String::format('Can not save immutable configuration !name. Use \Drupal\Core\Config\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object', ['!name' => $this->getName()]));
+ throw new ImmutableConfigException(SafeMarkup::format('Can not save immutable configuration !name. Use \Drupal\Core\Config\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object', ['!name' => $this->getName()]));
}
/**
@@ -55,7 +55,7 @@ public function save() {
* The configuration object.
*/
public function delete() {
- throw new ImmutableConfigException(String::format('Can not delete immutable configuration !name. Use \Drupal\Core\Config\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object', ['!name' => $this->getName()]));
+ throw new ImmutableConfigException(SafeMarkup::format('Can not delete immutable configuration !name. Use \Drupal\Core\Config\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object', ['!name' => $this->getName()]));
}
}
diff --git a/core/lib/Drupal/Core/Config/PreExistingConfigException.php b/core/lib/Drupal/Core/Config/PreExistingConfigException.php
index 8fe8a6acdf29..533d781af99d 100644
--- a/core/lib/Drupal/Core/Config/PreExistingConfigException.php
+++ b/core/lib/Drupal/Core/Config/PreExistingConfigException.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Config;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* An exception thrown if configuration with the same name already exists.
@@ -61,7 +61,7 @@ public function getExtension() {
* @return \Drupal\Core\Config\PreExistingConfigException
*/
public static function create($extension, array $config_objects) {
- $message = String::format('Configuration objects (@config_names) provided by @extension already exist in active configuration',
+ $message = SafeMarkup::format('Configuration objects (@config_names) provided by @extension already exist in active configuration',
array(
'@config_names' => implode(', ', static::flattenConfigObjects($config_objects)),
'@extension' => $extension
diff --git a/core/lib/Drupal/Core/Config/Schema/ArrayElement.php b/core/lib/Drupal/Core/Config/Schema/ArrayElement.php
index 1b314ac3b4bc..35e932ac26fe 100644
--- a/core/lib/Drupal/Core/Config/Schema/ArrayElement.php
+++ b/core/lib/Drupal/Core/Config/Schema/ArrayElement.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Config\Schema;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Config\TypedConfigManagerInterface;
use Drupal\Core\TypedData\TypedData;
@@ -94,7 +94,7 @@ public function get($name) {
return $element;
}
else {
- throw new \InvalidArgumentException(String::format("The configuration property @key doesn't exist.", array('@key' => $name)));
+ throw new \InvalidArgumentException(SafeMarkup::format("The configuration property @key doesn't exist.", array('@key' => $name)));
}
}
diff --git a/core/lib/Drupal/Core/Config/StorableConfigBase.php b/core/lib/Drupal/Core/Config/StorableConfigBase.php
index d4b1fb1763ba..420925f20ab2 100644
--- a/core/lib/Drupal/Core/Config/StorableConfigBase.php
+++ b/core/lib/Drupal/Core/Config/StorableConfigBase.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Config;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Config\Schema\Ignore;
use Drupal\Core\TypedData\PrimitiveInterface;
use Drupal\Core\TypedData\Type\FloatInterface;
@@ -156,7 +156,7 @@ protected function validateValue($key, $value) {
}
}
elseif ($value !== NULL && !is_scalar($value)) {
- throw new UnsupportedDataTypeConfigException(String::format('Invalid data type for config element @name:@key', array(
+ throw new UnsupportedDataTypeConfigException(SafeMarkup::format('Invalid data type for config element @name:@key', array(
'@name' => $this->getName(),
'@key' => $key,
)));
@@ -206,7 +206,7 @@ protected function castValue($key, $value) {
else {
// Throw exception on any non-scalar or non-array value.
if (!is_array($value)) {
- throw new UnsupportedDataTypeConfigException(String::format('Invalid data type for config element @name:@key', array(
+ throw new UnsupportedDataTypeConfigException(SafeMarkup::format('Invalid data type for config element @name:@key', array(
'@name' => $this->getName(),
'@key' => $key,
)));
diff --git a/core/lib/Drupal/Core/Config/StorageComparer.php b/core/lib/Drupal/Core/Config/StorageComparer.php
index e3e42d83edeb..cc4512354ca9 100644
--- a/core/lib/Drupal/Core/Config/StorageComparer.php
+++ b/core/lib/Drupal/Core/Config/StorageComparer.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Config;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Config\Entity\ConfigDependencyManager;
use Drupal\Core\DependencyInjection\DependencySerializationTrait;
@@ -189,7 +189,7 @@ protected function addChangeList($collection, $op, array $changes, array $sort_o
// ensure the array is keyed from 0.
$this->changelist[$collection][$op] = array_values(array_intersect($sort_order, $this->changelist[$collection][$op]));
if ($count != count($this->changelist[$collection][$op])) {
- throw new \InvalidArgumentException(String::format('Sorting the @op changelist should not change its length.', array('@op' => $op)));
+ throw new \InvalidArgumentException(SafeMarkup::format('Sorting the @op changelist should not change its length.', array('@op' => $op)));
}
}
}
diff --git a/core/lib/Drupal/Core/Config/Testing/ConfigSchemaChecker.php b/core/lib/Drupal/Core/Config/Testing/ConfigSchemaChecker.php
index cc53975cf1a4..5e4fe5769dd2 100644
--- a/core/lib/Drupal/Core/Config/Testing/ConfigSchemaChecker.php
+++ b/core/lib/Drupal/Core/Config/Testing/ConfigSchemaChecker.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Config\Testing;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Config\ConfigCrudEvent;
use Drupal\Core\Config\ConfigEvents;
use Drupal\Core\Config\Schema\SchemaCheckTrait;
@@ -88,14 +88,14 @@ public function onConfigSave(ConfigCrudEvent $event) {
$this->checked[$name . ':' . $checksum] = TRUE;
$errors = $this->checkConfigSchema($this->typedManager, $name, $data);
if ($errors === FALSE) {
- throw new SchemaIncompleteException(String::format('No schema for @config_name', array('@config_name' => $name)));
+ throw new SchemaIncompleteException(SafeMarkup::format('No schema for @config_name', array('@config_name' => $name)));
}
elseif (is_array($errors)) {
$text_errors = [];
foreach ($errors as $key => $error) {
- $text_errors[] = String::format('@key @error', array('@key' => $key, '@error' => $error));
+ $text_errors[] = SafeMarkup::format('@key @error', array('@key' => $key, '@error' => $error));
}
- throw new SchemaIncompleteException(String::format('Schema errors for @config_name with the following errors: @errors', array('@config_name' => $name, '@errors' => implode(', ', $text_errors))));
+ throw new SchemaIncompleteException(SafeMarkup::format('Schema errors for @config_name with the following errors: @errors', array('@config_name' => $name, '@errors' => implode(', ', $text_errors))));
}
}
}
diff --git a/core/lib/Drupal/Core/Config/TypedConfigManager.php b/core/lib/Drupal/Core/Config/TypedConfigManager.php
index a086e341dee3..6fc202b129ae 100644
--- a/core/lib/Drupal/Core/Config/TypedConfigManager.php
+++ b/core/lib/Drupal/Core/Config/TypedConfigManager.php
@@ -8,7 +8,7 @@
namespace Drupal\Core\Config;
use Drupal\Component\Utility\NestedArray;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\Config\Schema\ArrayElement;
use Drupal\Core\Config\Schema\ConfigSchemaAlterException;
@@ -333,7 +333,7 @@ protected function alterDefinitions(&$definitions) {
else {
$message = 'Invoking hook_config_schema_info_alter() has removed (@removed) schema definitions';
}
- throw new ConfigSchemaAlterException(String::format($message, ['@added' => implode(',', $added_keys), '@removed' => implode(',', $removed_keys)]));
+ throw new ConfigSchemaAlterException(SafeMarkup::format($message, ['@added' => implode(',', $added_keys), '@removed' => implode(',', $removed_keys)]));
}
}
diff --git a/core/lib/Drupal/Core/Config/UnmetDependenciesException.php b/core/lib/Drupal/Core/Config/UnmetDependenciesException.php
index 6a10003f0fc3..22f1bdeff06d 100644
--- a/core/lib/Drupal/Core/Config/UnmetDependenciesException.php
+++ b/core/lib/Drupal/Core/Config/UnmetDependenciesException.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Config;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\StringTranslation\TranslationInterface;
/**
@@ -80,7 +80,7 @@ public function getTranslatedMessage(TranslationInterface $string_translation, $
* @return \Drupal\Core\Config\PreExistingConfigException
*/
public static function create($extension, array $config_objects) {
- $message = String::format('Configuration objects (@config_names) provided by @extension have unmet dependencies',
+ $message = SafeMarkup::format('Configuration objects (@config_names) provided by @extension have unmet dependencies',
array(
'@config_names' => implode(', ', $config_objects),
'@extension' => $extension
diff --git a/core/lib/Drupal/Core/Controller/TitleResolverInterface.php b/core/lib/Drupal/Core/Controller/TitleResolverInterface.php
index 810309fb8f89..3bea7e0ef3be 100644
--- a/core/lib/Drupal/Core/Controller/TitleResolverInterface.php
+++ b/core/lib/Drupal/Core/Controller/TitleResolverInterface.php
@@ -18,7 +18,7 @@ interface TitleResolverInterface {
* Returns a static or dynamic title for the route.
*
* The returned title string must be safe to output in HTML. For example, an
- * implementation should call \Drupal\Component\Utility\String::checkPlain()
+ * implementation should call \Drupal\Component\Utility\SafeMarkup::checkPlain()
* or \Drupal\Component\Utility\Xss::filterAdmin() on the string, or use
* appropriate placeholders to sanitize dynamic content inside a localized
* string before returning it. The title may contain HTML such as EM tags.
diff --git a/core/lib/Drupal/Core/Database/Driver/fake/FakeSelect.php b/core/lib/Drupal/Core/Database/Driver/fake/FakeSelect.php
index 7e6a1e7501b3..9a95a6e25502 100644
--- a/core/lib/Drupal/Core/Database/Driver/fake/FakeSelect.php
+++ b/core/lib/Drupal/Core/Database/Driver/fake/FakeSelect.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Database\Driver\fake;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Database\Connection;
use Drupal\Core\Database\Query\Condition;
use Drupal\Core\Database\Query\PlaceholderInterface;
@@ -521,7 +521,7 @@ public function fields($table_alias, array $fields = array()) {
$fields = array_keys(reset($this->databaseContents[$table]));
}
else {
- throw new \Exception(String::format('All fields on empty table @table is not supported.', array('@table' => $table)));
+ throw new \Exception(SafeMarkup::format('All fields on empty table @table is not supported.', array('@table' => $table)));
}
}
return parent::fields($table_alias, $fields);
diff --git a/core/lib/Drupal/Core/Database/Install/Tasks.php b/core/lib/Drupal/Core/Database/Install/Tasks.php
index 024bf5aee921..a944c58032b9 100644
--- a/core/lib/Drupal/Core/Database/Install/Tasks.php
+++ b/core/lib/Drupal/Core/Database/Install/Tasks.php
@@ -8,7 +8,6 @@
namespace Drupal\Core\Database\Install;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
use Drupal\Core\Database\Database;
/**
@@ -152,7 +151,7 @@ public function runTasks() {
$message = '';
foreach ($this->results as $result => $success) {
if (!$success) {
- $message = SafeMarkup::isSafe($result) ? $result : String::checkPlain($result);
+ $message = SafeMarkup::isSafe($result) ? $result : SafeMarkup::checkPlain($result);
}
}
if (!empty($message)) {
diff --git a/core/lib/Drupal/Core/Diff/DiffFormatter.php b/core/lib/Drupal/Core/Diff/DiffFormatter.php
index 5b15033120c1..cfd6bb8cefe4 100644
--- a/core/lib/Drupal/Core/Diff/DiffFormatter.php
+++ b/core/lib/Drupal/Core/Diff/DiffFormatter.php
@@ -9,7 +9,7 @@
use Drupal\Component\Diff\DiffFormatter as DiffFormatterBase;
use Drupal\Component\Diff\WordLevelDiff;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Config\ConfigFactoryInterface;
/**
@@ -172,7 +172,7 @@ protected function emptyLine() {
*/
protected function _added($lines) {
foreach ($lines as $line) {
- $this->rows[] = array_merge($this->emptyLine(), $this->addedLine(String::checkPlain($line)));
+ $this->rows[] = array_merge($this->emptyLine(), $this->addedLine(SafeMarkup::checkPlain($line)));
}
}
@@ -181,7 +181,7 @@ protected function _added($lines) {
*/
protected function _deleted($lines) {
foreach ($lines as $line) {
- $this->rows[] = array_merge($this->deletedLine(String::checkPlain($line)), $this->emptyLine());
+ $this->rows[] = array_merge($this->deletedLine(SafeMarkup::checkPlain($line)), $this->emptyLine());
}
}
@@ -190,7 +190,7 @@ protected function _deleted($lines) {
*/
protected function _context($lines) {
foreach ($lines as $line) {
- $this->rows[] = array_merge($this->contextLine(String::checkPlain($line)), $this->contextLine(String::checkPlain($line)));
+ $this->rows[] = array_merge($this->contextLine(SafeMarkup::checkPlain($line)), $this->contextLine(SafeMarkup::checkPlain($line)));
}
}
diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
index d315b27139bd..c26b98b418b7 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Entity;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\Plugin\DataType\EntityReference;
use Drupal\Core\Language\Language;
use Drupal\Core\Language\LanguageInterface;
@@ -221,7 +221,7 @@ public function postCreate(EntityStorageInterface $storage) {
public function setNewRevision($value = TRUE) {
if (!$this->getEntityType()->hasKey('revision')) {
- throw new \LogicException(String::format('Entity type @entity_type does not support revisions.', ['@entity_type' => $this->getEntityTypeId()]));
+ throw new \LogicException(SafeMarkup::format('Entity type @entity_type does not support revisions.', ['@entity_type' => $this->getEntityTypeId()]));
}
if ($value && !$this->newRevision) {
@@ -360,14 +360,14 @@ public function get($field_name) {
protected function getTranslatedField($name, $langcode) {
if ($this->translations[$this->activeLangcode]['status'] == static::TRANSLATION_REMOVED) {
$message = 'The entity object refers to a removed translation (@langcode) and cannot be manipulated.';
- throw new \InvalidArgumentException(String::format($message, array('@langcode' => $this->activeLangcode)));
+ throw new \InvalidArgumentException(SafeMarkup::format($message, array('@langcode' => $this->activeLangcode)));
}
// Populate $this->fields to speed-up further look-ups and to keep track of
// fields objects, possibly holding changes to field values.
if (!isset($this->fields[$name][$langcode])) {
$definition = $this->getFieldDefinition($name);
if (!$definition) {
- throw new \InvalidArgumentException('Field ' . String::checkPlain($name) . ' is unknown.');
+ throw new \InvalidArgumentException('Field ' . SafeMarkup::checkPlain($name) . ' is unknown.');
}
// Non-translatable fields are always stored with
// LanguageInterface::LANGCODE_DEFAULT as key.
@@ -565,7 +565,7 @@ public function onChange($name) {
// Update the default internal language cache.
$this->setDefaultLangcode();
if (isset($this->translations[$this->defaultLangcode])) {
- $message = String::format('A translation already exists for the specified language (@langcode).', array('@langcode' => $this->defaultLangcode));
+ $message = SafeMarkup::format('A translation already exists for the specified language (@langcode).', array('@langcode' => $this->defaultLangcode));
throw new \InvalidArgumentException($message);
}
$this->updateFieldLangcodes($this->defaultLangcode);
@@ -576,7 +576,7 @@ public function onChange($name) {
$items = $this->get($this->langcodeKey);
if ($items->value != $this->activeLangcode) {
$items->setValue($this->activeLangcode, FALSE);
- $message = String::format('The translation language cannot be changed (@langcode).', array('@langcode' => $this->activeLangcode));
+ $message = SafeMarkup::format('The translation language cannot be changed (@langcode).', array('@langcode' => $this->activeLangcode));
throw new \LogicException($message);
}
}
@@ -587,7 +587,7 @@ public function onChange($name) {
// read-only. See https://www.drupal.org/node/2443991.
if (isset($this->values[$this->defaultLangcodeKey])) {
$this->get($this->defaultLangcodeKey)->setValue($this->isDefaultTranslation(), FALSE);
- $message = String::format('The default translation flag cannot be changed (@langcode).', array('@langcode' => $this->activeLangcode));
+ $message = SafeMarkup::format('The default translation flag cannot be changed (@langcode).', array('@langcode' => $this->activeLangcode));
throw new \LogicException($message);
}
break;
@@ -635,7 +635,7 @@ public function getTranslation($langcode) {
if (empty($translation)) {
$message = 'Invalid translation language (@langcode) specified.';
- throw new \InvalidArgumentException(String::format($message, array('@langcode' => $langcode)));
+ throw new \InvalidArgumentException(SafeMarkup::format($message, array('@langcode' => $langcode)));
}
return $translation;
@@ -704,7 +704,7 @@ public function addTranslation($langcode, array $values = array()) {
$this->getLanguages();
if (!isset($this->languages[$langcode]) || $this->hasTranslation($langcode)) {
$message = 'Invalid translation language (@langcode) specified.';
- throw new \InvalidArgumentException(String::format($message, array('@langcode' => $langcode)));
+ throw new \InvalidArgumentException(SafeMarkup::format($message, array('@langcode' => $langcode)));
}
// Instantiate a new empty entity so default values will be populated in the
@@ -755,7 +755,7 @@ public function removeTranslation($langcode) {
}
else {
$message = 'The specified translation (@langcode) cannot be removed.';
- throw new \InvalidArgumentException(String::format($message, array('@langcode' => $langcode)));
+ throw new \InvalidArgumentException(SafeMarkup::format($message, array('@langcode' => $langcode)));
}
}
@@ -898,7 +898,7 @@ public function __unset($name) {
public function createDuplicate() {
if ($this->translations[$this->activeLangcode]['status'] == static::TRANSLATION_REMOVED) {
$message = 'The entity object refers to a removed translation (@langcode) and cannot be manipulated.';
- throw new \InvalidArgumentException(String::format($message, array('@langcode' => $this->activeLangcode)));
+ throw new \InvalidArgumentException(SafeMarkup::format($message, array('@langcode' => $this->activeLangcode)));
}
$duplicate = clone $this;
diff --git a/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
index d1beeeb8a63c..acc17bac2780 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Entity;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -60,7 +60,7 @@ protected function doCreate(array $values) {
$bundle = FALSE;
if ($this->bundleKey) {
if (!isset($values[$this->bundleKey])) {
- throw new EntityStorageException(String::format('Missing bundle for entity type @type', array('@type' => $this->entityTypeId)));
+ throw new EntityStorageException(SafeMarkup::format('Missing bundle for entity type @type', array('@type' => $this->entityTypeId)));
}
$bundle = $values[$this->bundleKey];
}
diff --git a/core/lib/Drupal/Core/Entity/Entity.php b/core/lib/Drupal/Core/Entity/Entity.php
index 455607e9adff..08c20cd05a2d 100644
--- a/core/lib/Drupal/Core/Entity/Entity.php
+++ b/core/lib/Drupal/Core/Entity/Entity.php
@@ -9,7 +9,7 @@
use Drupal\Core\Cache\Cache;
use Drupal\Core\DependencyInjection\DependencySerializationTrait;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Config\Entity\Exception\ConfigEntityIdLengthException;
use Drupal\Core\Entity\Exception\UndefinedLinkTemplateException;
@@ -186,7 +186,7 @@ public function urlInfo($rel = 'canonical', array $options = []) {
$uri = call_user_func($uri_callback, $this);
}
else {
- throw new UndefinedLinkTemplateException(String::format('No link template "@rel" found for the "@entity_type" entity type', array(
+ throw new UndefinedLinkTemplateException(SafeMarkup::format('No link template "@rel" found for the "@entity_type" entity type', array(
'@rel' => $rel,
'@entity_type' => $this->getEntityTypeId(),
)));
@@ -371,7 +371,7 @@ public function preSave(EntityStorageInterface $storage) {
if ($this->getEntityType()->getBundleOf()) {
// Throw an exception if the bundle ID is longer than 32 characters.
if (Unicode::strlen($this->id()) > EntityTypeInterface::BUNDLE_MAX_LENGTH) {
- throw new ConfigEntityIdLengthException(String::format(
+ throw new ConfigEntityIdLengthException(SafeMarkup::format(
'Attempt to create a bundle with an ID longer than @max characters: @id.', array(
'@max' => EntityTypeInterface::BUNDLE_MAX_LENGTH,
'@id' => $this->id(),
diff --git a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
index 11978011a32e..ec6533d47646 100644
--- a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
@@ -12,7 +12,7 @@
use Drupal\Core\Entity\Display\EntityDisplayInterface;
use Drupal\field\Entity\FieldConfig;
use Drupal\field\FieldConfigInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Provides a common base class for entity view and form displays.
@@ -254,7 +254,7 @@ public function calculateDependencies() {
// If the target entity type uses entities to manage its bundles then
// depend on the bundle entity.
if (!$bundle_entity = $this->entityManager()->getStorage($bundle_entity_type_id)->load($this->bundle)) {
- throw new \LogicException(String::format('Missing bundle entity, entity type %type, entity id %bundle.', array('%type' => $bundle_entity_type_id, '%bundle' => $this->bundle)));
+ throw new \LogicException(SafeMarkup::format('Missing bundle entity, entity type %type, entity id %bundle.', array('%type' => $bundle_entity_type_id, '%bundle' => $this->bundle)));
}
$this->addDependency('config', $bundle_entity->getConfigDependencyName());
}
diff --git a/core/lib/Drupal/Core/Entity/EntityListBuilder.php b/core/lib/Drupal/Core/Entity/EntityListBuilder.php
index 628bbd10bf48..22322f8a211f 100644
--- a/core/lib/Drupal/Core/Entity/EntityListBuilder.php
+++ b/core/lib/Drupal/Core/Entity/EntityListBuilder.php
@@ -9,7 +9,7 @@
use Drupal\Core\Extension\ModuleHandlerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Defines a generic implementation to build a listing of entities.
@@ -110,7 +110,7 @@ protected function getEntityIds() {
* The escaped entity label.
*/
protected function getLabel(EntityInterface $entity) {
- return String::checkPlain($entity->label());
+ return SafeMarkup::checkPlain($entity->label());
}
/**
diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php
index 3ab60f52bcfa..352679cd448b 100644
--- a/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -9,7 +9,7 @@
use Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException;
use Drupal\Component\Plugin\Exception\PluginNotFoundException;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\Config\Entity\ConfigEntityType;
@@ -405,7 +405,7 @@ protected function buildBaseFieldDefinitions($entity_type_id) {
// Fail with an exception for non-fieldable entity types.
if (!$entity_type->isSubclassOf('\Drupal\Core\Entity\FieldableEntityInterface')) {
- throw new \LogicException(String::format('Getting the base fields is not supported for entity type @type.', array('@type' => $entity_type->getLabel())));
+ throw new \LogicException(SafeMarkup::format('Getting the base fields is not supported for entity type @type.', array('@type' => $entity_type->getLabel())));
}
// Retrieve base field definitions.
@@ -473,19 +473,19 @@ protected function buildBaseFieldDefinitions($entity_type_id) {
// translatable values.
foreach (array_intersect_key($keys, array_flip(['id', 'revision', 'uuid', 'bundle'])) as $key => $field_name) {
if (!isset($base_field_definitions[$field_name])) {
- throw new \LogicException(String::format('The @field field definition does not exist and it is used as @key entity key.', array(
+ throw new \LogicException(SafeMarkup::format('The @field field definition does not exist and it is used as @key entity key.', array(
'@field' => $base_field_definitions[$field_name]->getLabel(),
'@key' => $key,
)));
}
if ($base_field_definitions[$field_name]->isRevisionable()) {
- throw new \LogicException(String::format('The @field field cannot be revisionable as it is used as @key entity key.', array(
+ throw new \LogicException(SafeMarkup::format('The @field field cannot be revisionable as it is used as @key entity key.', array(
'@field' => $base_field_definitions[$field_name]->getLabel(),
'@key' => $key,
)));
}
if ($base_field_definitions[$field_name]->isTranslatable()) {
- throw new \LogicException(String::format('The @field field cannot be translatable as it is used as @key entity key.', array(
+ throw new \LogicException(SafeMarkup::format('The @field field cannot be translatable as it is used as @key entity key.', array(
'@field' => $base_field_definitions[$field_name]->getLabel(),
'@key' => $key,
)));
@@ -494,7 +494,7 @@ protected function buildBaseFieldDefinitions($entity_type_id) {
// Make sure translatable entity types define the "langcode" field properly.
if ($entity_type->isTranslatable() && (!isset($keys['langcode']) || !isset($base_field_definitions[$keys['langcode']]) || !$base_field_definitions[$keys['langcode']]->isTranslatable())) {
- throw new \LogicException(String::format('The @entity_type entity type cannot be translatable as it does not define a translatable "langcode" field.', array('@entity_type' => $entity_type->getLabel())));
+ throw new \LogicException(SafeMarkup::format('The @entity_type entity type cannot be translatable as it does not define a translatable "langcode" field.', array('@entity_type' => $entity_type->getLabel())));
}
return $base_field_definitions;
diff --git a/core/lib/Drupal/Core/Entity/EntityStorageBase.php b/core/lib/Drupal/Core/Entity/EntityStorageBase.php
index 3528b7dd15f3..55d53176da4f 100644
--- a/core/lib/Drupal/Core/Entity/EntityStorageBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityStorageBase.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Entity;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\Query\QueryInterface;
/**
@@ -396,7 +396,7 @@ public function save(EntityInterface $entity) {
// A new entity should not already exist.
if ($id_exists && $is_new) {
- throw new EntityStorageException(String::format('@type entity with ID @id already exists.', array('@type' => $this->entityTypeId, '@id' => $id)));
+ throw new EntityStorageException(SafeMarkup::format('@type entity with ID @id already exists.', array('@type' => $this->entityTypeId, '@id' => $id)));
}
// Load the original entity, if any.
diff --git a/core/lib/Drupal/Core/Entity/EntityType.php b/core/lib/Drupal/Core/Entity/EntityType.php
index 38b6170f0652..2b9c2682943c 100644
--- a/core/lib/Drupal/Core/Entity/EntityType.php
+++ b/core/lib/Drupal/Core/Entity/EntityType.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Entity;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Entity\Exception\EntityTypeIdLengthException;
use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -238,7 +238,7 @@ class EntityType implements EntityTypeInterface {
public function __construct($definition) {
// Throw an exception if the entity type ID is longer than 32 characters.
if (Unicode::strlen($definition['id']) > static::ID_MAX_LENGTH) {
- throw new EntityTypeIdLengthException(String::format(
+ throw new EntityTypeIdLengthException(SafeMarkup::format(
'Attempt to create an entity type with an ID longer than @max characters: @id.', array(
'@max' => static::ID_MAX_LENGTH,
'@id' => $definition['id'],
diff --git a/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueEntityStorage.php b/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueEntityStorage.php
index 365020ca7ca6..e045f83c20b4 100644
--- a/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueEntityStorage.php
+++ b/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueEntityStorage.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Entity\KeyValueStore;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Uuid\UuidInterface;
use Drupal\Core\Config\Entity\Exception\ConfigEntityIdLengthException;
use Drupal\Core\Entity\FieldableEntityInterface;
@@ -167,7 +167,7 @@ public function save(EntityInterface $entity) {
// @todo This is not config-specific, but serial IDs will likely never hit
// this limit. Consider renaming the exception class.
if (strlen($entity->id()) > static::MAX_ID_LENGTH) {
- throw new ConfigEntityIdLengthException(String::format('Entity ID @id exceeds maximum allowed length of @length characters.', array(
+ throw new ConfigEntityIdLengthException(SafeMarkup::format('Entity ID @id exceeds maximum allowed length of @length characters.', array(
'@id' => $entity->id(),
'@length' => static::MAX_ID_LENGTH,
)));
diff --git a/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityAdapter.php b/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityAdapter.php
index bbcb0bb90416..305230bbc3f8 100644
--- a/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityAdapter.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityAdapter.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Entity\Plugin\DataType;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\FieldableEntityInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\TypedData\EntityDataDefinition;
@@ -81,12 +81,12 @@ public function setValue($entity, $notify = TRUE) {
*/
public function get($property_name) {
if (!isset($this->entity)) {
- throw new MissingDataException(String::format('Unable to get property @name as no entity has been provided.', array('@name' => $property_name)));
+ throw new MissingDataException(SafeMarkup::format('Unable to get property @name as no entity has been provided.', array('@name' => $property_name)));
}
if (!$this->entity instanceof FieldableEntityInterface) {
// @todo: Add support for config entities in
// https://www.drupal.org/node/1818574.
- throw new \InvalidArgumentException(String::format('Unable to get unknown property @name.', array('@name' => $property_name)));
+ throw new \InvalidArgumentException(SafeMarkup::format('Unable to get unknown property @name.', array('@name' => $property_name)));
}
// This will throw an exception for unknown fields.
return $this->entity->get($property_name);
@@ -97,12 +97,12 @@ public function get($property_name) {
*/
public function set($property_name, $value, $notify = TRUE) {
if (!isset($this->entity)) {
- throw new MissingDataException(String::format('Unable to set property @name as no entity has been provided.', array('@name' => $property_name)));
+ throw new MissingDataException(SafeMarkup::format('Unable to set property @name as no entity has been provided.', array('@name' => $property_name)));
}
if (!$this->entity instanceof FieldableEntityInterface) {
// @todo: Add support for config entities in
// https://www.drupal.org/node/1818574.
- throw new \InvalidArgumentException(String::format('Unable to set unknown property @name.', array('@name' => $property_name)));
+ throw new \InvalidArgumentException(SafeMarkup::format('Unable to set unknown property @name.', array('@name' => $property_name)));
}
// This will throw an exception for unknown fields.
$this->entity->set($property_name, $value, $notify);
@@ -114,7 +114,7 @@ public function set($property_name, $value, $notify = TRUE) {
*/
public function getProperties($include_computed = FALSE) {
if (!isset($this->entity)) {
- throw new MissingDataException(String::format('Unable to get properties as no entity has been provided.'));
+ throw new MissingDataException(SafeMarkup::format('Unable to get properties as no entity has been provided.'));
}
if (!$this->entity instanceof FieldableEntityInterface) {
// @todo: Add support for config entities in
@@ -129,7 +129,7 @@ public function getProperties($include_computed = FALSE) {
*/
public function toArray() {
if (!isset($this->entity)) {
- throw new MissingDataException(String::format('Unable to get property values as no entity has been provided.'));
+ throw new MissingDataException(SafeMarkup::format('Unable to get property values as no entity has been provided.'));
}
return $this->entity->toArray();
}
diff --git a/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/SelectionBase.php b/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/SelectionBase.php
index f33fe2ac7d5a..cb8c7d668af3 100644
--- a/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/SelectionBase.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/SelectionBase.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Entity\Plugin\EntityReferenceSelection;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Database\Query\AlterableInterface;
use Drupal\Core\Database\Query\SelectInterface;
use Drupal\Core\Entity\EntityManagerInterface;
@@ -235,7 +235,7 @@ public function getReferenceableEntities($match = NULL, $match_operator = 'CONTA
$entities = entity_load_multiple($target_type, $result);
foreach ($entities as $entity_id => $entity) {
$bundle = $entity->bundle();
- $options[$bundle][$entity_id] = String::checkPlain($entity->label());
+ $options[$bundle][$entity_id] = SafeMarkup::checkPlain($entity->label());
}
return $options;
diff --git a/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php b/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php
index 909ae5f3327a..c51ef0870803 100644
--- a/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php
+++ b/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Entity\Sql;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\ContentEntityTypeInterface;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
@@ -178,7 +178,7 @@ public function getFieldTableName($field_name) {
}
if (!isset($result)) {
- throw new SqlContentEntityStorageException(String::format('Table information not available for the "@field_name" field.', array('@field_name' => $field_name)));
+ throw new SqlContentEntityStorageException(SafeMarkup::format('Table information not available for the "@field_name" field.', array('@field_name' => $field_name)));
}
return $result;
@@ -211,7 +211,7 @@ public function getFieldColumnName(FieldStorageDefinitionInterface $storage_defi
$column_name = !in_array($property_name, $this->getReservedColumns()) ? $field_name . '_' . $property_name : $property_name;
}
else {
- throw new SqlContentEntityStorageException(String::format('Column information not available for the "@field_name" field.', array('@field_name' => $field_name)));
+ throw new SqlContentEntityStorageException(SafeMarkup::format('Column information not available for the "@field_name" field.', array('@field_name' => $field_name)));
}
return $column_name;
diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
index d4252b276fac..22d2f92a281e 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Entity\Sql;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\Database\Connection;
@@ -283,7 +283,7 @@ public function setEntityType(EntityTypeInterface $entity_type) {
$this->initTableLayout();
}
else {
- throw new EntityStorageException(String::format('Unsupported entity type @id', array('@id' => $entity_type->id())));
+ throw new EntityStorageException(SafeMarkup::format('Unsupported entity type @id', array('@id' => $entity_type->id())));
}
}
@@ -1070,7 +1070,7 @@ protected function mapToStorageRecord(ContentEntityInterface $entity, $table_nam
foreach ($table_mapping->getFieldNames($table_name) as $field_name) {
if (empty($this->getFieldStorageDefinitions()[$field_name])) {
- throw new EntityStorageException(String::format('Table mapping contains invalid field %field.', array('%field' => $field_name)));
+ throw new EntityStorageException(SafeMarkup::format('Table mapping contains invalid field %field.', array('%field' => $field_name)));
}
$definition = $this->getFieldStorageDefinitions()[$field_name];
$columns = $table_mapping->getColumnNames($field_name);
diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
index ddf9d81b9ddb..16c2ca1930b2 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Entity\Sql;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Database\Connection;
use Drupal\Core\Database\DatabaseException;
use Drupal\Core\Entity\ContentEntityTypeInterface;
@@ -262,7 +262,7 @@ public function onEntityTypeUpdate(EntityTypeInterface $entity_type, EntityTypeI
// If a migration is required, we can't proceed.
if ($this->requiresEntityDataMigration($entity_type, $original)) {
- throw new EntityStorageException(String::format('The SQL storage cannot change the schema for an existing entity type with data.'));
+ throw new EntityStorageException(SafeMarkup::format('The SQL storage cannot change the schema for an existing entity type with data.'));
}
// If we have no data just recreate the entity schema from scratch.
@@ -443,7 +443,7 @@ public function finalizePurge(FieldStorageDefinitionInterface $storage_definitio
*/
protected function checkEntityType(EntityTypeInterface $entity_type) {
if ($entity_type->id() != $this->entityType->id()) {
- throw new EntityStorageException(String::format('Unsupported entity type @id', array('@id' => $entity_type->id())));
+ throw new EntityStorageException(SafeMarkup::format('Unsupported entity type @id', array('@id' => $entity_type->id())));
}
return TRUE;
}
@@ -506,7 +506,7 @@ protected function getEntitySchema(ContentEntityTypeInterface $entity_type, $res
}
foreach ($table_mapping->getFieldNames($table_name) as $field_name) {
if (!isset($storage_definitions[$field_name])) {
- throw new FieldException(String::format('Field storage definition for "@field_name" could not be found.', array('@field_name' => $field_name)));
+ throw new FieldException(SafeMarkup::format('Field storage definition for "@field_name" could not be found.', array('@field_name' => $field_name)));
}
// Add the schema for base field definitions.
elseif ($table_mapping->allowsSharedTableStorage($storage_definitions[$field_name])) {
diff --git a/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php
index b3d22025c3d2..e0a1343d24f8 100644
--- a/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php
@@ -8,7 +8,6 @@
namespace Drupal\Core\EventSubscriber;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Render\BareHtmlPageRendererInterface;
use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -107,7 +106,7 @@ protected function onHtml(GetResponseForExceptionEvent $event) {
}
// Do not translate the string to avoid errors producing more errors.
unset($error['backtrace']);
- $message = String::format('%type: !message in %function (line %line of %file).', $error);
+ $message = SafeMarkup::format('%type: !message in %function (line %line of %file).', $error);
// Check if verbose error reporting is on.
if ($this->getErrorLevel() == ERROR_REPORTING_DISPLAY_VERBOSE) {
diff --git a/core/lib/Drupal/Core/EventSubscriber/ExceptionLoggingSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ExceptionLoggingSubscriber.php
index eba6e7c1af05..cb2fc31dc790 100644
--- a/core/lib/Drupal/Core/EventSubscriber/ExceptionLoggingSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/ExceptionLoggingSubscriber.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\EventSubscriber;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Logger\LoggerChannelFactoryInterface;
use Drupal\Core\Utility\Error;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -45,7 +45,7 @@ public function __construct(LoggerChannelFactoryInterface $logger) {
*/
public function on403(GetResponseForExceptionEvent $event) {
$request = $event->getRequest();
- $this->logger->get('access denied')->warning(String::checkPlain($request->getRequestUri()));
+ $this->logger->get('access denied')->warning(SafeMarkup::checkPlain($request->getRequestUri()));
}
/**
@@ -56,7 +56,7 @@ public function on403(GetResponseForExceptionEvent $event) {
*/
public function on404(GetResponseForExceptionEvent $event) {
$request = $event->getRequest();
- $this->logger->get('page not found')->warning(String::checkPlain($request->getRequestUri()));
+ $this->logger->get('page not found')->warning(SafeMarkup::checkPlain($request->getRequestUri()));
}
/**
diff --git a/core/lib/Drupal/Core/EventSubscriber/Fast404ExceptionHtmlSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/Fast404ExceptionHtmlSubscriber.php
index 0e64f94c8953..94a13b5a71bc 100644
--- a/core/lib/Drupal/Core/EventSubscriber/Fast404ExceptionHtmlSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/Fast404ExceptionHtmlSubscriber.php
@@ -8,7 +8,7 @@
namespace Drupal\Core\EventSubscriber;
use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -79,7 +79,7 @@ public function on404(GetResponseForExceptionEvent $event) {
if ($config->get('fast_404.enabled') && $exclude_paths && !preg_match($exclude_paths, $request->getPathInfo())) {
$fast_paths = $config->get('fast_404.paths');
if ($fast_paths && preg_match($fast_paths, $request->getPathInfo())) {
- $fast_404_html = strtr($config->get('fast_404.html'), ['@path' => String::checkPlain($request->getUri())]);
+ $fast_404_html = strtr($config->get('fast_404.html'), ['@path' => SafeMarkup::checkPlain($request->getUri())]);
$response = new Response($fast_404_html, Response::HTTP_NOT_FOUND);
$event->setResponse($response);
}
diff --git a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
index a32fa71c488b..e43d00e57cd7 100644
--- a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\EventSubscriber;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Render\BareHtmlPageRendererInterface;
@@ -104,7 +104,7 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) {
// Deliver the 503 page if the site is in maintenance mode and the
// logged in user is not allowed to bypass it.
drupal_maintenance_theme();
- $content = Xss::filterAdmin(String::format($this->config->get('system.maintenance')->get('message'), array(
+ $content = Xss::filterAdmin(SafeMarkup::format($this->config->get('system.maintenance')->get('message'), array(
'@site' => $this->config->get('system.site')->get('name'),
)));
$output = $this->bareHtmlPageRenderer->renderBarePage(['#markup' => $content], $this->t('Site under maintenance'), 'maintenance_page');
diff --git a/core/lib/Drupal/Core/Extension/InfoParser.php b/core/lib/Drupal/Core/Extension/InfoParser.php
index 38ac624f609b..cb178fb5a045 100644
--- a/core/lib/Drupal/Core/Extension/InfoParser.php
+++ b/core/lib/Drupal/Core/Extension/InfoParser.php
@@ -9,7 +9,7 @@
use Drupal\Component\Serialization\Yaml;
use Drupal\Component\Serialization\Exception\InvalidDataTypeException;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Parses extension .info.yml files.
@@ -36,12 +36,12 @@ public function parse($filename) {
static::$parsedInfos[$filename] = Yaml::decode(file_get_contents($filename));
}
catch (InvalidDataTypeException $e) {
- $message = String::format("Unable to parse !file: !error", array('!file' => $filename, '!error' => $e->getMessage()));
+ $message = SafeMarkup::format("Unable to parse !file: !error", array('!file' => $filename, '!error' => $e->getMessage()));
throw new InfoParserException($message);
}
$missing_keys = array_diff($this->getRequiredKeys(), array_keys(static::$parsedInfos[$filename]));
if (!empty($missing_keys)) {
- $message = String::format('Missing required keys (!missing_keys) in !file.', array('!missing_keys' => implode(', ', $missing_keys), '!file' => $filename));
+ $message = SafeMarkup::format('Missing required keys (!missing_keys) in !file.', array('!missing_keys' => implode(', ', $missing_keys), '!file' => $filename));
throw new InfoParserException($message);
}
if (isset(static::$parsedInfos[$filename]['version']) && static::$parsedInfos[$filename]['version'] === 'VERSION') {
diff --git a/core/lib/Drupal/Core/Extension/ModuleHandler.php b/core/lib/Drupal/Core/Extension/ModuleHandler.php
index c1eee716fdd2..bb79ae493634 100644
--- a/core/lib/Drupal/Core/Extension/ModuleHandler.php
+++ b/core/lib/Drupal/Core/Extension/ModuleHandler.php
@@ -9,7 +9,7 @@
use Drupal\Component\Graph\Graph;
use Drupal\Component\Utility\NestedArray;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Cache\CacheBackendInterface;
@@ -581,7 +581,7 @@ protected function buildImplementationInfo($hook) {
}
// If a new implementation was added, verify that the function exists.
if (!function_exists($module . '_' . $hook)) {
- throw new \RuntimeException(String::format('An invalid implementation @function was added by hook_module_implements_alter()', array('@function' => $module . '_' . $hook)));
+ throw new \RuntimeException(SafeMarkup::format('An invalid implementation @function was added by hook_module_implements_alter()', array('@function' => $module . '_' . $hook)));
}
}
}
diff --git a/core/lib/Drupal/Core/Extension/ModuleInstaller.php b/core/lib/Drupal/Core/Extension/ModuleInstaller.php
index 6797c98b1611..caddbad05ad7 100644
--- a/core/lib/Drupal/Core/Extension/ModuleInstaller.php
+++ b/core/lib/Drupal/Core/Extension/ModuleInstaller.php
@@ -13,7 +13,7 @@
use Drupal\Core\Config\PreExistingConfigException;
use Drupal\Core\Config\StorageInterface;
use Drupal\Core\DrupalKernelInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Default implementation of the module installer.
@@ -88,7 +88,7 @@ public function install(array $module_list, $enable_dependencies = TRUE) {
$module_list = $module_list ? array_combine($module_list, $module_list) : array();
if ($missing_modules = array_diff_key($module_list, $module_data)) {
// One or more of the given modules doesn't exist.
- throw new MissingDependencyException(String::format('Unable to install modules %modules due to missing modules %missing.', array(
+ throw new MissingDependencyException(SafeMarkup::format('Unable to install modules %modules due to missing modules %missing.', array(
'%modules' => implode(', ', $module_list),
'%missing' => implode(', ', $missing_modules),
)));
@@ -107,7 +107,7 @@ public function install(array $module_list, $enable_dependencies = TRUE) {
foreach (array_keys($module_data[$module]->requires) as $dependency) {
if (!isset($module_data[$dependency])) {
// The dependency does not exist.
- throw new MissingDependencyException(String::format('Unable to install modules: module %module is missing its dependency module %dependency.', array(
+ throw new MissingDependencyException(SafeMarkup::format('Unable to install modules: module %module is missing its dependency module %dependency.', array(
'%module' => $module,
'%dependency' => $dependency,
)));
diff --git a/core/lib/Drupal/Core/Extension/ThemeHandler.php b/core/lib/Drupal/Core/Extension/ThemeHandler.php
index 0c7ade428025..57a317e7f304 100644
--- a/core/lib/Drupal/Core/Extension/ThemeHandler.php
+++ b/core/lib/Drupal/Core/Extension/ThemeHandler.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Extension;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Asset\AssetCollectionOptimizerInterface;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Config\ConfigFactoryInterface;
@@ -199,7 +199,7 @@ public function install(array $theme_list, $install_dependencies = TRUE) {
if ($missing = array_diff_key($theme_list, $theme_data)) {
// One or more of the given themes doesn't exist.
- throw new \InvalidArgumentException(String::format('Unknown themes: !themes.', array(
+ throw new \InvalidArgumentException(SafeMarkup::format('Unknown themes: !themes.', array(
'!themes' => implode(', ', $missing),
)));
}
@@ -250,7 +250,7 @@ public function install(array $theme_list, $install_dependencies = TRUE) {
// Throw an exception if the theme name is too long.
if (strlen($key) > DRUPAL_EXTENSION_NAME_MAX_LENGTH) {
- throw new ExtensionNameLengthException(String::format('Theme name %name is over the maximum allowed length of @max characters.', array(
+ throw new ExtensionNameLengthException(SafeMarkup::format('Theme name %name is over the maximum allowed length of @max characters.', array(
'%name' => $key,
'@max' => DRUPAL_EXTENSION_NAME_MAX_LENGTH,
)));
@@ -628,9 +628,9 @@ protected function resetSystem() {
public function getName($theme) {
$themes = $this->listInfo();
if (!isset($themes[$theme])) {
- throw new \InvalidArgumentException(String::format('Requested the name of a non-existing theme @theme', array('@theme' => $theme)));
+ throw new \InvalidArgumentException(SafeMarkup::format('Requested the name of a non-existing theme @theme', array('@theme' => $theme)));
}
- return String::checkPlain($themes[$theme]->info['name']);
+ return SafeMarkup::checkPlain($themes[$theme]->info['name']);
}
/**
diff --git a/core/lib/Drupal/Core/Field/AllowedTagsXssTrait.php b/core/lib/Drupal/Core/Field/AllowedTagsXssTrait.php
index 270d92386f8f..f7eafdf53083 100644
--- a/core/lib/Drupal/Core/Field/AllowedTagsXssTrait.php
+++ b/core/lib/Drupal/Core/Field/AllowedTagsXssTrait.php
@@ -23,7 +23,7 @@ trait AllowedTagsXssTrait {
*
* Used for items entered by administrators, like field descriptions, allowed
* values, where some (mainly inline) mark-up may be desired (so
- * \Drupal\Component\Utility\String::checkPlain() is not acceptable).
+ * \Drupal\Component\Utility\SafeMarkup::checkPlain() is not acceptable).
*
* @param string $string
* The string with raw HTML in it.
diff --git a/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php b/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php
index b6b2a3c6ad7a..77551874f6cb 100644
--- a/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php
+++ b/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Field\Entity;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Field\BaseFieldDefinition;
use Drupal\Core\Field\FieldConfigBase;
@@ -89,10 +89,10 @@ public function __construct(array $values, $entity_type = 'base_field_override')
throw new FieldException('Attempt to create a base field bundle override of a field without a field_name');
}
if (empty($values['entity_type'])) {
- throw new FieldException(String::format('Attempt to create a base field bundle override of field @field_name without an entity_type', array('@field_name' => $values['field_name'])));
+ throw new FieldException(SafeMarkup::format('Attempt to create a base field bundle override of field @field_name without an entity_type', array('@field_name' => $values['field_name'])));
}
if (empty($values['bundle'])) {
- throw new FieldException(String::format('Attempt to create a base field bundle override of field @field_name without a bundle', array('@field_name' => $values['field_name'])));
+ throw new FieldException(SafeMarkup::format('Attempt to create a base field bundle override of field @field_name without a bundle', array('@field_name' => $values['field_name'])));
}
parent::__construct($values, $entity_type);
@@ -174,10 +174,10 @@ public function preSave(EntityStorageInterface $storage) {
else {
// Some updates are always disallowed.
if ($this->entity_type != $this->original->entity_type) {
- throw new FieldException(String::format('Cannot change the entity_type of an existing base field bundle override (entity type:@entity_type, bundle:@bundle, field name: @field_name)', array('@field_name' => $this->field_name, '@entity_type' => $this->entity_type, '@bundle' => $this->original->bundle)));
+ throw new FieldException(SafeMarkup::format('Cannot change the entity_type of an existing base field bundle override (entity type:@entity_type, bundle:@bundle, field name: @field_name)', array('@field_name' => $this->field_name, '@entity_type' => $this->entity_type, '@bundle' => $this->original->bundle)));
}
if ($this->bundle != $this->original->bundle && empty($this->bundleRenameAllowed)) {
- throw new FieldException(String::format('Cannot change the bundle of an existing base field bundle override (entity type:@entity_type, bundle:@bundle, field name: @field_name)', array('@field_name' => $this->field_name, '@entity_type' => $this->entity_type, '@bundle' => $this->original->bundle)));
+ throw new FieldException(SafeMarkup::format('Cannot change the bundle of an existing base field bundle override (entity type:@entity_type, bundle:@bundle, field name: @field_name)', array('@field_name' => $this->field_name, '@entity_type' => $this->entity_type, '@bundle' => $this->original->bundle)));
}
$previous_definition = $this->original;
}
diff --git a/core/lib/Drupal/Core/Field/FieldConfigBase.php b/core/lib/Drupal/Core/Field/FieldConfigBase.php
index 9a1acc018b92..da21566535c2 100644
--- a/core/lib/Drupal/Core/Field/FieldConfigBase.php
+++ b/core/lib/Drupal/Core/Field/FieldConfigBase.php
@@ -12,7 +12,7 @@
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Entity\FieldableEntityInterface;
use Drupal\Core\Field\TypedData\FieldItemDataDefinition;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Base class for configurable field definitions.
@@ -254,7 +254,7 @@ public function calculateDependencies() {
$bundle_entity_type_id = $this->entityManager()->getDefinition($this->entity_type)->getBundleEntityType();
if ($bundle_entity_type_id != 'bundle') {
if (!$bundle_entity = $this->entityManager()->getStorage($bundle_entity_type_id)->load($this->bundle)) {
- throw new \LogicException(String::format('Missing bundle entity, entity type %type, entity id %bundle.', array('%type' => $bundle_entity_type_id, '%bundle' => $this->bundle)));
+ throw new \LogicException(SafeMarkup::format('Missing bundle entity, entity type %type, entity id %bundle.', array('%type' => $bundle_entity_type_id, '%bundle' => $this->bundle)));
}
$this->addDependency('config', $bundle_entity->getConfigDependencyName());
}
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/BasicStringFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/BasicStringFormatter.php
index 8725600bf0d8..c03b96d20182 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/BasicStringFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/BasicStringFormatter.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Field\Plugin\Field\FieldFormatter;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Field\FormatterBase;
use Drupal\Core\Field\FieldItemListInterface;
@@ -37,7 +37,7 @@ public function viewElements(FieldItemListInterface $items) {
foreach ($items as $delta => $item) {
// The text value has no text format assigned to it, so the user input
// should equal the output, including newlines.
- $elements[$delta] = array('#markup' => nl2br(String::checkPlain($item->value)));
+ $elements[$delta] = array('#markup' => nl2br(SafeMarkup::checkPlain($item->value)));
}
return $elements;
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceIdFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceIdFormatter.php
index 5b3b1715f9c9..69b5b9f5d6ef 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceIdFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceIdFormatter.php
@@ -8,7 +8,7 @@
namespace Drupal\Core\Field\Plugin\Field\FieldFormatter;
use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Plugin implementation of the 'entity reference ID' formatter.
@@ -33,7 +33,7 @@ public function viewElements(FieldItemListInterface $items) {
foreach ($this->getEntitiesToView($items) as $delta => $entity) {
if ($entity->id()) {
$elements[$delta] = array(
- '#markup' => String::checkPlain($entity->id()),
+ '#markup' => SafeMarkup::checkPlain($entity->id()),
// Create a cache tag entry for the referenced entity. In the case
// that the referenced entity is deleted, the cache for referring
// entities must be cleared.
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php
index dbc89583913f..c362a80ec885 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Field\Plugin\Field\FieldFormatter;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\Exception\UndefinedLinkTemplateException;
use Drupal\Core\Field\FieldItemListInterface;
use Drupal\Core\Form\FormStateInterface;
@@ -98,7 +98,7 @@ public function viewElements(FieldItemListInterface $items) {
}
}
else {
- $elements[$delta] = array('#markup' => String::checkPlain($label));
+ $elements[$delta] = array('#markup' => SafeMarkup::checkPlain($label));
}
$elements[$delta]['#cache']['tags'] = $entity->getCacheTags();
}
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/LanguageFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/LanguageFormatter.php
index fbf120619781..3b43147a2f1c 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/LanguageFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/LanguageFormatter.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Field\Plugin\Field\FieldFormatter;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Core\Field\FieldItemInterface;
@@ -122,7 +122,7 @@ protected function viewValue(FieldItemInterface $item) {
// storage by LanguageManager::getLanguages()) or in its native language
// name. That only depends on formatter settings and no language condition.
$languages = $this->getSetting('native_language') ? $this->languageManager->getNativeLanguages() : $this->languageManager->getLanguages();
- return $item->language ? String::checkPlain($languages[$item->language->getId()]->getName()) : '';
+ return $item->language ? SafeMarkup::checkPlain($languages[$item->language->getId()]->getName()) : '';
}
}
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/StringFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/StringFormatter.php
index 31e537e3a912..588aad4028b3 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/StringFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/StringFormatter.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Field\Plugin\Field\FieldFormatter;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Core\Field\FieldItemInterface;
@@ -156,7 +156,7 @@ public function viewElements(FieldItemListInterface $items) {
protected function viewValue(FieldItemInterface $item) {
// The text value has no text format assigned to it, so the user input
// should equal the output, including newlines.
- return nl2br(String::checkPlain($item->value));
+ return nl2br(SafeMarkup::checkPlain($item->value));
}
}
diff --git a/core/lib/Drupal/Core/Field/WidgetBase.php b/core/lib/Drupal/Core/Field/WidgetBase.php
index ef64fea69401..e333df3f8c4d 100644
--- a/core/lib/Drupal/Core/Field/WidgetBase.php
+++ b/core/lib/Drupal/Core/Field/WidgetBase.php
@@ -10,7 +10,7 @@
use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\NestedArray;
use Drupal\Component\Utility\SortArray;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Form\FormStateInterface;
use Symfony\Component\Validator\ConstraintViolationInterface;
use Symfony\Component\Validator\ConstraintViolationListInterface;
@@ -84,7 +84,7 @@ public function form(FieldItemListInterface $items, array &$form, FormStateInter
if ($this->handlesMultipleValues() || isset($get_delta)) {
$delta = isset($get_delta) ? $get_delta : 0;
$element = array(
- '#title' => String::checkPlain($this->fieldDefinition->getLabel()),
+ '#title' => SafeMarkup::checkPlain($this->fieldDefinition->getLabel()),
'#description' => $this->fieldFilterXss(\Drupal::token()->replace($this->fieldDefinition->getDescription())),
);
$element = $this->formSingleElement($items, $delta, $element, $form, $form_state);
@@ -163,7 +163,7 @@ protected function formMultipleElements(FieldItemListInterface $items, array &$f
break;
}
- $title = String::checkPlain($this->fieldDefinition->getLabel());
+ $title = SafeMarkup::checkPlain($this->fieldDefinition->getLabel());
$description = $this->fieldFilterXss(\Drupal::token()->replace($this->fieldDefinition->getDescription()));
$elements = array();
diff --git a/core/lib/Drupal/Core/Form/FormBuilder.php b/core/lib/Drupal/Core/Form/FormBuilder.php
index 8eb78ddd572f..8d532ed8dda2 100644
--- a/core/lib/Drupal/Core/Form/FormBuilder.php
+++ b/core/lib/Drupal/Core/Form/FormBuilder.php
@@ -10,7 +10,7 @@
use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\NestedArray;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Core\Access\CsrfTokenGenerator;
use Drupal\Core\DependencyInjection\ClassResolverInterface;
@@ -139,7 +139,7 @@ public function getFormId($form_arg, FormStateInterface &$form_state) {
}
if (!is_object($form_arg) || !($form_arg instanceof FormInterface)) {
- throw new \InvalidArgumentException(String::format('The form argument @form_arg is not a valid form.', array('@form_arg' => $form_arg)));
+ throw new \InvalidArgumentException(SafeMarkup::format('The form argument @form_arg is not a valid form.', array('@form_arg' => $form_arg)));
}
// Add the $form_arg as the callback object and determine the form ID.
diff --git a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php
index e4e9b9f6f4f5..4fd6bdcf9af9 100644
--- a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php
+++ b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php
@@ -8,7 +8,7 @@
namespace Drupal\Core\ImageToolkit;
use Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Plugin\PluginBase;
use Psr\Log\LoggerInterface;
@@ -114,7 +114,7 @@ protected function prepareArguments(array $arguments) {
if ($argument['required']) {
if (!array_key_exists($id, $arguments)) {
// If the argument is required throw an exception.
- throw new \InvalidArgumentException(String::format("Argument '@argument' expected by plugin '@plugin' but not passed", array('@argument' => $id, '@plugin' => $this->getPluginId())));
+ throw new \InvalidArgumentException(SafeMarkup::format("Argument '@argument' expected by plugin '@plugin' but not passed", array('@argument' => $id, '@plugin' => $this->getPluginId())));
}
}
else {
@@ -124,7 +124,7 @@ protected function prepareArguments(array $arguments) {
if (!array_key_exists('default', $argument)) {
// The plugin did not define a default, so throw a plugin exception,
// not an invalid argument exception.
- throw new InvalidPluginDefinitionException(String::format("Default for argument '@argument' expected by plugin '@plugin' but not defined", array('@argument' => $id, '@plugin' => $this->getPluginId())));
+ throw new InvalidPluginDefinitionException(SafeMarkup::format("Default for argument '@argument' expected by plugin '@plugin' but not defined", array('@argument' => $id, '@plugin' => $this->getPluginId())));
}
// Use the default value if the argument is not passed in.
diff --git a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php
index dc4abaadf187..724b37db6210 100644
--- a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php
+++ b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php
@@ -12,7 +12,7 @@
use Drupal\Core\Plugin\DefaultPluginManager;
use Drupal\Component\Plugin\Exception\PluginNotFoundException;
use Drupal\Component\Plugin\Factory\DefaultFactory;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Psr\Log\LoggerInterface;
/**
@@ -77,7 +77,7 @@ function ($definition) use ($toolkit_id, $operation) {
);
if (!$definitions) {
- $message = String::format("No image operation plugin for '@toolkit' toolkit and '@operation' operation.", array('@toolkit' => $toolkit_id, '@operation' => $operation));
+ $message = SafeMarkup::format("No image operation plugin for '@toolkit' toolkit and '@operation' operation.", array('@toolkit' => $toolkit_id, '@operation' => $operation));
throw new PluginNotFoundException($toolkit_id . '.' . $operation, $message);
}
else {
diff --git a/core/lib/Drupal/Core/Installer/Form/SelectLanguageForm.php b/core/lib/Drupal/Core/Installer/Form/SelectLanguageForm.php
index 79d9082ca19d..91ed3f0fb131 100644
--- a/core/lib/Drupal/Core/Installer/Form/SelectLanguageForm.php
+++ b/core/lib/Drupal/Core/Installer/Form/SelectLanguageForm.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Installer\Form;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\UserAgent;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
@@ -70,7 +70,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $install_
);
$form['help'] = array(
'#type' => 'item',
- '#markup' => String::format('<p>Translations will be downloaded from the <a href="http://localize.drupal.org">Drupal Translation website</a>.
+ '#markup' => SafeMarkup::format('<p>Translations will be downloaded from the <a href="http://localize.drupal.org">Drupal Translation website</a>.
If you do not want this, select <a href="!english">English</a>.</p>', array(
'!english' => install_full_redirect_url(array('parameters' => array('langcode' => 'en'))),
)),
diff --git a/core/lib/Drupal/Core/Language/LanguageManager.php b/core/lib/Drupal/Core/Language/LanguageManager.php
index 22c52895f361..916903120df6 100644
--- a/core/lib/Drupal/Core/Language/LanguageManager.php
+++ b/core/lib/Drupal/Core/Language/LanguageManager.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Language;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\DependencyInjection\DependencySerializationTrait;
use Drupal\Core\StringTranslation\TranslationInterface;
use Drupal\Core\StringTranslation\TranslationWrapper;
@@ -69,7 +69,7 @@ public function setTranslation(TranslationInterface $translation) {
* @see \Drupal\Core\StringTranslation\TranslationInterface()
*/
protected function t($string, array $args = array(), array $options = array()) {
- return $this->translation ? $this->translation->translate($string, $args, $options) : String::format($string, $args);
+ return $this->translation ? $this->translation->translate($string, $args, $options) : SafeMarkup::format($string, $args);
}
/**
diff --git a/core/lib/Drupal/Core/Logger/LogMessageParser.php b/core/lib/Drupal/Core/Logger/LogMessageParser.php
index ba991299eccd..fd76c63ff49a 100644
--- a/core/lib/Drupal/Core/Logger/LogMessageParser.php
+++ b/core/lib/Drupal/Core/Logger/LogMessageParser.php
@@ -21,7 +21,7 @@ public function parseMessagePlaceholders(&$message, array &$context) {
if (($start = strpos($message, '{')) !== FALSE && strpos($message, '}') > $start) {
$has_psr3 = TRUE;
// Transform PSR3 style messages containing placeholders to
- // \Drupal\Component\Utility\String::format() style.
+ // \Drupal\Component\Utility\SafeMarkup::format() style.
$message = preg_replace('/\{(.*)\}/U', '@$1', $message);
}
foreach ($context as $key => $variable) {
@@ -35,7 +35,7 @@ public function parseMessagePlaceholders(&$message, array &$context) {
}
}
if (!empty($key) && ($key[0] === '@' || $key[0] === '%' || $key[0] === '!')) {
- // The key is now in \Drupal\Component\Utility\String::format() style.
+ // The key is now in \Drupal\Component\Utility\SafeMarkup::format() style.
$variables[$key] = $variable;
}
}
diff --git a/core/lib/Drupal/Core/Logger/LogMessageParserInterface.php b/core/lib/Drupal/Core/Logger/LogMessageParserInterface.php
index 545b03984371..26615a3a15bb 100644
--- a/core/lib/Drupal/Core/Logger/LogMessageParserInterface.php
+++ b/core/lib/Drupal/Core/Logger/LogMessageParserInterface.php
@@ -20,14 +20,14 @@ interface LogMessageParserInterface {
* - PSR3 format:
* @see https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md#12-message
* - Drupal specific string placeholder format:
- * @see \Drupal\Component\Utility\String::format()
+ * @see \Drupal\Component\Utility\SafeMarkup::format()
*
- * Values in PSR3 format will be transformed to String::format() format.
+ * Values in PSR3 format will be transformed to SafeMarkup::format() format.
*
* @param string $message
* The message that contains the placeholders.
* If the message is in PSR3 style, it will be transformed to
- * \Drupal\Component\Utility\String::format() style.
+ * \Drupal\Component\Utility\SafeMarkup::format() style.
* @param array $context
* An array that may or may not contain placeholder variables.
*
diff --git a/core/lib/Drupal/Core/Menu/MenuLinkBase.php b/core/lib/Drupal/Core/Menu/MenuLinkBase.php
index bc591f7e942b..6ee3ef422161 100644
--- a/core/lib/Drupal/Core/Menu/MenuLinkBase.php
+++ b/core/lib/Drupal/Core/Menu/MenuLinkBase.php
@@ -8,7 +8,7 @@
namespace Drupal\Core\Menu;
use Drupal\Component\Plugin\Exception\PluginException;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Plugin\PluginBase;
use Drupal\Core\Url;
@@ -176,7 +176,7 @@ public function getTranslateRoute() {
* {@inheritdoc}
*/
public function deleteLink() {
- throw new PluginException(String::format('Menu link plugin with ID @id does not support deletion', array('@id' => $this->getPluginId())));
+ throw new PluginException(SafeMarkup::format('Menu link plugin with ID @id does not support deletion', array('@id' => $this->getPluginId())));
}
}
diff --git a/core/lib/Drupal/Core/Menu/MenuLinkManager.php b/core/lib/Drupal/Core/Menu/MenuLinkManager.php
index 3647e07494b6..d9a60dcdd4a0 100644
--- a/core/lib/Drupal/Core/Menu/MenuLinkManager.php
+++ b/core/lib/Drupal/Core/Menu/MenuLinkManager.php
@@ -10,7 +10,7 @@
use Drupal\Component\Plugin\Exception\PluginException;
use Drupal\Component\Plugin\Exception\PluginNotFoundException;
use Drupal\Component\Utility\NestedArray;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Plugin\Discovery\ContainerDerivativeDiscoveryDecorator;
use Drupal\Core\Plugin\Discovery\YamlDiscovery;
@@ -281,7 +281,7 @@ protected function deleteInstance(MenuLinkInterface $instance, $persist) {
}
}
else {
- throw new PluginException(String::format('Menu link plugin with ID @id does not support deletion', array('@id' => $id)));
+ throw new PluginException(SafeMarkup::format('Menu link plugin with ID @id does not support deletion', array('@id' => $id)));
}
$this->treeStorage->delete($id);
}
@@ -349,7 +349,7 @@ public function loadLinksByRoute($route_name, array $route_parameters = array(),
*/
public function addDefinition($id, array $definition) {
if ($this->treeStorage->load($id) || $id === '') {
- throw new PluginException(String::format('The ID @id already exists as a plugin definition or is not valid', array('@id' => $id)));
+ throw new PluginException(SafeMarkup::format('The ID @id already exists as a plugin definition or is not valid', array('@id' => $id)));
}
// Add defaults, so there is no requirement to specify everything.
$this->processDefinition($definition, $id);
@@ -396,7 +396,7 @@ protected function resetInstance(MenuLinkInterface $instance) {
$id = $instance->getPluginId();
if (!$instance->isResettable()) {
- throw new PluginException(String::format('Menu link %id is not resettable', array('%id' => $id)));
+ throw new PluginException(SafeMarkup::format('Menu link %id is not resettable', array('%id' => $id)));
}
// Get the original data from disk, reset the override and re-save the menu
// tree for this link.
diff --git a/core/lib/Drupal/Core/Menu/MenuTreeStorage.php b/core/lib/Drupal/Core/Menu/MenuTreeStorage.php
index 5d1edb98d355..2ce68f778922 100644
--- a/core/lib/Drupal/Core/Menu/MenuTreeStorage.php
+++ b/core/lib/Drupal/Core/Menu/MenuTreeStorage.php
@@ -8,7 +8,7 @@
namespace Drupal\Core\Menu;
use Drupal\Component\Plugin\Exception\PluginException;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Cache\CacheBackendInterface;
@@ -476,7 +476,7 @@ protected function setParents(array &$fields, $parent, array $original) {
$limit = $this->maxDepth() - 1;
}
if ($parent['depth'] > $limit) {
- throw new PluginException(String::format('The link with ID @id or its children exceeded the maximum depth of @depth', array('@id' => $fields['id'], '@depth' => $this->maxDepth())));
+ throw new PluginException(SafeMarkup::format('The link with ID @id or its children exceeded the maximum depth of @depth', array('@id' => $fields['id'], '@depth' => $this->maxDepth())));
}
$fields['depth'] = $parent['depth'] + 1;
$i = 1;
@@ -637,7 +637,7 @@ public function loadByProperties(array $properties) {
foreach ($properties as $name => $value) {
if (!in_array($name, $this->definitionFields(), TRUE)) {
$fields = implode(', ', $this->definitionFields());
- throw new \InvalidArgumentException(String::format('An invalid property name, @name was specified. Allowed property names are: @fields.', array('@name' => $name, '@fields' => $fields)));
+ throw new \InvalidArgumentException(SafeMarkup::format('An invalid property name, @name was specified. Allowed property names are: @fields.', array('@name' => $name, '@fields' => $fields)));
}
$query->condition($name, $value);
}
diff --git a/core/lib/Drupal/Core/Plugin/Context/Context.php b/core/lib/Drupal/Core/Plugin/Context/Context.php
index a0ad01fcd455..9e69b4c582d6 100644
--- a/core/lib/Drupal/Core/Plugin/Context/Context.php
+++ b/core/lib/Drupal/Core/Plugin/Context/Context.php
@@ -9,7 +9,7 @@
use Drupal\Component\Plugin\Context\Context as ComponentContext;
use Drupal\Component\Plugin\Exception\ContextException;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\TypedData\TypedDataInterface;
use Drupal\Core\TypedData\TypedDataTrait;
@@ -42,7 +42,7 @@ public function getContextValue() {
$definition = $this->getContextDefinition();
if ($definition->isRequired()) {
$type = $definition->getDataType();
- throw new ContextException(String::format("The @type context is required and not present.", array('@type' => $type)));
+ throw new ContextException(SafeMarkup::format("The @type context is required and not present.", array('@type' => $type)));
}
return NULL;
}
diff --git a/core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php b/core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php
index 8063b2dbb333..b6d16227a837 100644
--- a/core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php
+++ b/core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Plugin\Context;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\TypedData\TypedDataTrait;
/**
@@ -220,7 +220,7 @@ public function getDataDefinition() {
}
if (!$definition) {
- throw new \Exception(String::format('The data type "@type" is invalid', array('@type' => $this->getDataType())));
+ throw new \Exception(SafeMarkup::format('The data type "@type" is invalid', array('@type' => $this->getDataType())));
}
$definition->setLabel($this->getLabel())
->setDescription($this->getDescription())
diff --git a/core/lib/Drupal/Core/Plugin/Context/ContextHandler.php b/core/lib/Drupal/Core/Plugin/Context/ContextHandler.php
index a5f4abab0ca5..fe9b78e751b7 100644
--- a/core/lib/Drupal/Core/Plugin/Context/ContextHandler.php
+++ b/core/lib/Drupal/Core/Plugin/Context/ContextHandler.php
@@ -8,7 +8,7 @@
namespace Drupal\Core\Plugin\Context;
use Drupal\Component\Plugin\Exception\ContextException;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Plugin\ContextAwarePluginInterface;
/**
@@ -86,7 +86,7 @@ public function applyContextMapping(ContextAwarePluginInterface $plugin, $contex
// If there are any mappings that were not satisfied, throw an exception.
if (!empty($mappings)) {
- throw new ContextException(String::format('Assigned contexts were not satisfied: @mappings', ['@mappings' => implode(',', array_keys($mappings))]));
+ throw new ContextException(SafeMarkup::format('Assigned contexts were not satisfied: @mappings', ['@mappings' => implode(',', array_keys($mappings))]));
}
}
diff --git a/core/lib/Drupal/Core/Render/Element.php b/core/lib/Drupal/Core/Render/Element.php
index eed5c30fde84..f268a01c6dd7 100644
--- a/core/lib/Drupal/Core/Render/Element.php
+++ b/core/lib/Drupal/Core/Render/Element.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Render;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Provides helper methods for Drupal render elements.
@@ -90,7 +90,7 @@ public static function children(array &$elements, $sort = FALSE) {
// Only trigger an error if the value is not null.
// @see http://drupal.org/node/1283892
elseif (isset($value)) {
- trigger_error(String::format('"@key" is an invalid render array key', array('@key' => $key)), E_USER_ERROR);
+ trigger_error(SafeMarkup::format('"@key" is an invalid render array key', array('@key' => $key)), E_USER_ERROR);
}
}
}
diff --git a/core/lib/Drupal/Core/Routing/AcceptHeaderMatcher.php b/core/lib/Drupal/Core/Routing/AcceptHeaderMatcher.php
index 5c0618ce3d08..779480063f88 100644
--- a/core/lib/Drupal/Core/Routing/AcceptHeaderMatcher.php
+++ b/core/lib/Drupal/Core/Routing/AcceptHeaderMatcher.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Routing;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException;
use Symfony\Component\Routing\Route;
@@ -61,7 +61,7 @@ public function filter(RouteCollection $collection, Request $request) {
// We do not throw a
// \Symfony\Component\Routing\Exception\ResourceNotFoundException here
// because we don't want to return a 404 status code, but rather a 406.
- throw new NotAcceptableHttpException(String::format('No route found for the specified formats @formats.', array('@formats' => implode(' ', $acceptable_mime_types))));
+ throw new NotAcceptableHttpException(SafeMarkup::format('No route found for the specified formats @formats.', array('@formats' => implode(' ', $acceptable_mime_types))));
}
/**
diff --git a/core/lib/Drupal/Core/Session/AccountInterface.php b/core/lib/Drupal/Core/Session/AccountInterface.php
index 7bef0ac3de3b..a52195c46091 100644
--- a/core/lib/Drupal/Core/Session/AccountInterface.php
+++ b/core/lib/Drupal/Core/Session/AccountInterface.php
@@ -141,7 +141,7 @@ public function getPreferredAdminLangcode($fallback_to_default = TRUE);
*
* @return
* An unsanitized string with the username to display. The code receiving
- * this result must ensure that \Drupal\Component\Utility\String::checkPlain()
+ * this result must ensure that \Drupal\Component\Utility\SafeMarkup::checkPlain()
* is called on it before it is
* printed to the page.
*/
diff --git a/core/lib/Drupal/Core/StringTranslation/TranslationInterface.php b/core/lib/Drupal/Core/StringTranslation/TranslationInterface.php
index 3e866bb02b97..fbb28e146f6a 100644
--- a/core/lib/Drupal/Core/StringTranslation/TranslationInterface.php
+++ b/core/lib/Drupal/Core/StringTranslation/TranslationInterface.php
@@ -22,7 +22,7 @@ interface TranslationInterface {
* @param array $args
* An associative array of replacements to make after translation. Based
* on the first character of the key, the value is escaped and/or themed.
- * See \Drupal\Component\Utility\String::format() for details.
+ * See \Drupal\Component\Utility\SafeMarkup::format() for details.
* @param array $options
* An associative array of additional options, with the following elements:
* - 'langcode': The language code to translate to a language other than
@@ -32,7 +32,7 @@ interface TranslationInterface {
* @return string
* The translated string.
*
- * @see \Drupal\Component\Utility\String::format()
+ * @see \Drupal\Component\Utility\SafeMarkup::format()
*/
public function translate($string, array $args = array(), array $options = array());
@@ -70,7 +70,7 @@ public function translate($string, array $args = array(), array $options = array
* An associative array of replacements to make after translation. Instances
* of any key in this array are replaced with the corresponding value.
* Based on the first character of the key, the value is escaped and/or
- * themed. See \Drupal\Component\Utility\String::format(). Note that you do
+ * themed. See \Drupal\Component\Utility\SafeMarkup::format(). Note that you do
* not need to include @count in this array; this replacement is done
* automatically for the plural cases.
* @param array $options
@@ -104,7 +104,7 @@ public function formatPlural($count, $singular, $plural, array $args = array(),
* Associative array of replacements to make in the translation. Instances
* of any key in this array are replaced with the corresponding value.
* Based on the first character of the key, the value is escaped and/or
- * themed. See \Drupal\Component\Utility\String::format(). Note that you do
+ * themed. See \Drupal\Component\Utility\SafeMarkup::format(). Note that you do
* not need to include @count in this array; this replacement is done
* automatically for the plural cases.
* @param array $options
diff --git a/core/lib/Drupal/Core/Template/Attribute.php b/core/lib/Drupal/Core/Template/Attribute.php
index 5333acb6e31d..3ea18b1f329c 100644
--- a/core/lib/Drupal/Core/Template/Attribute.php
+++ b/core/lib/Drupal/Core/Template/Attribute.php
@@ -40,7 +40,7 @@
* @endcode
*
* The attribute keys and values are automatically sanitized for output with
- * \Drupal\Component\Utility\String::checkPlain().
+ * \Drupal\Component\Utility\SafeMarkup::checkPlain().
*/
class Attribute implements \ArrayAccess, \IteratorAggregate {
diff --git a/core/lib/Drupal/Core/Template/AttributeArray.php b/core/lib/Drupal/Core/Template/AttributeArray.php
index 190c89812279..4cdd9323fa6a 100644
--- a/core/lib/Drupal/Core/Template/AttributeArray.php
+++ b/core/lib/Drupal/Core/Template/AttributeArray.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Template;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* A class that defines a type of Attribute that can be added to as an array.
@@ -76,7 +76,7 @@ public function offsetExists($offset) {
public function __toString() {
// Filter out any empty values before printing.
$this->value = array_unique(array_filter($this->value));
- return String::checkPlain(implode(' ', $this->value));
+ return SafeMarkup::checkPlain(implode(' ', $this->value));
}
/**
diff --git a/core/lib/Drupal/Core/Template/AttributeBoolean.php b/core/lib/Drupal/Core/Template/AttributeBoolean.php
index 4e9ea6751235..a2e5c02e6689 100644
--- a/core/lib/Drupal/Core/Template/AttributeBoolean.php
+++ b/core/lib/Drupal/Core/Template/AttributeBoolean.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Template;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* A class that defines a type of boolean HTML attribute.
@@ -42,7 +42,7 @@ public function render() {
* Implements the magic __toString() method.
*/
public function __toString() {
- return $this->value === FALSE ? '' : String::checkPlain($this->name);
+ return $this->value === FALSE ? '' : SafeMarkup::checkPlain($this->name);
}
}
diff --git a/core/lib/Drupal/Core/Template/AttributeString.php b/core/lib/Drupal/Core/Template/AttributeString.php
index 07211bed3c31..51b144827ea3 100644
--- a/core/lib/Drupal/Core/Template/AttributeString.php
+++ b/core/lib/Drupal/Core/Template/AttributeString.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Template;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* A class that represents most standard HTML attributes.
@@ -30,7 +30,7 @@ class AttributeString extends AttributeValueBase {
* Implements the magic __toString() method.
*/
public function __toString() {
- return String::checkPlain($this->value);
+ return SafeMarkup::checkPlain($this->value);
}
}
diff --git a/core/lib/Drupal/Core/Template/AttributeValueBase.php b/core/lib/Drupal/Core/Template/AttributeValueBase.php
index ed4dfc367cf7..4db6dd822f4f 100644
--- a/core/lib/Drupal/Core/Template/AttributeValueBase.php
+++ b/core/lib/Drupal/Core/Template/AttributeValueBase.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Template;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Defines the base class for an attribute type.
@@ -57,7 +57,7 @@ public function __construct($name, $value) {
public function render() {
$value = (string) $this;
if (isset($this->value) && static::RENDER_EMPTY_ATTRIBUTE || !empty($value)) {
- return String::checkPlain($this->name) . '="' . $value . '"';
+ return SafeMarkup::checkPlain($this->name) . '="' . $value . '"';
}
}
diff --git a/core/lib/Drupal/Core/TypedData/TypedDataManager.php b/core/lib/Drupal/Core/TypedData/TypedDataManager.php
index 18310bd27901..88f6fa52d03f 100644
--- a/core/lib/Drupal/Core/TypedData/TypedDataManager.php
+++ b/core/lib/Drupal/Core/TypedData/TypedDataManager.php
@@ -8,7 +8,7 @@
namespace Drupal\Core\TypedData;
use Drupal\Component\Plugin\Exception\PluginException;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\DependencyInjection\ClassResolverInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
@@ -296,7 +296,7 @@ public function getPropertyInstance(TypedDataInterface $object, $property_name,
throw new \InvalidArgumentException("The passed object has to either implement the ComplexDataInterface or the ListInterface.");
}
if (!$definition) {
- throw new \InvalidArgumentException('Property ' . String::checkPlain($property_name) . ' is unknown.');
+ throw new \InvalidArgumentException('Property ' . SafeMarkup::checkPlain($property_name) . ' is unknown.');
}
// Create the prototype without any value, but with initial parenting
// so that constructors can set up the objects correclty.
diff --git a/core/lib/Drupal/Core/Url.php b/core/lib/Drupal/Core/Url.php
index 90d43c2ce763..c6a5f0535a0d 100644
--- a/core/lib/Drupal/Core/Url.php
+++ b/core/lib/Drupal/Core/Url.php
@@ -7,7 +7,7 @@
namespace Drupal\Core;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Core\DependencyInjection\DependencySerializationTrait;
use Drupal\Core\Routing\RouteMatchInterface;
@@ -232,7 +232,7 @@ public static function fromUserInput($user_input, $options = []) {
// because these are URI reserved characters that a scheme name may not
// start with.
if ((strpos($user_input, '/') !== 0) && (strpos($user_input, '#') !== 0) && (strpos($user_input, '?') !== 0)) {
- throw new \InvalidArgumentException(String::format("The user-entered string @user_input must begin with a '/', '?', or '#'.", ['@user_input' => $user_input]));
+ throw new \InvalidArgumentException(SafeMarkup::format("The user-entered string @user_input must begin with a '/', '?', or '#'.", ['@user_input' => $user_input]));
}
// fromUri() requires an absolute URI, so prepend the appropriate scheme
@@ -296,10 +296,10 @@ public static function fromUserInput($user_input, $options = []) {
public static function fromUri($uri, $options = []) {
$uri_parts = parse_url($uri);
if ($uri_parts === FALSE) {
- throw new \InvalidArgumentException(String::format('The URI "@uri" is malformed.', ['@uri' => $uri]));
+ throw new \InvalidArgumentException(SafeMarkup::format('The URI "@uri" is malformed.', ['@uri' => $uri]));
}
if (empty($uri_parts['scheme'])) {
- throw new \InvalidArgumentException(String::format('The URI "@uri" is invalid. You must use a valid URI scheme.', ['@uri' => $uri]));
+ throw new \InvalidArgumentException(SafeMarkup::format('The URI "@uri" is invalid. You must use a valid URI scheme.', ['@uri' => $uri]));
}
$uri_parts += ['path' => ''];
// Discard empty fragment in $options for consistency with parse_url().
@@ -362,7 +362,7 @@ public static function fromUri($uri, $options = []) {
protected static function fromEntityUri(array $uri_parts, array $options, $uri) {
list($entity_type_id, $entity_id) = explode('/', $uri_parts['path'], 2);
if ($uri_parts['scheme'] != 'entity' || $entity_id === '') {
- throw new \InvalidArgumentException(String::format('The entity URI "@uri" is invalid. You must specify the entity id in the URL. e.g., entity:node/1 for loading the canonical path to node entity with id 1.', ['@uri' => $uri]));
+ throw new \InvalidArgumentException(SafeMarkup::format('The entity URI "@uri" is invalid. You must specify the entity id in the URL. e.g., entity:node/1 for loading the canonical path to node entity with id 1.', ['@uri' => $uri]));
}
return new static("entity.$entity_type_id.canonical", [$entity_type_id => $entity_id], $options);
@@ -422,7 +422,7 @@ protected static function fromInternalUri(array $uri_parts, array $options) {
}
else {
if ($uri_parts['path'][0] !== '/') {
- throw new \InvalidArgumentException(String::format('The internal path component "@path" is invalid. Its path component must have a leading slash, e.g. internal:/foo.', ['@path' => $uri_parts['path']]));
+ throw new \InvalidArgumentException(SafeMarkup::format('The internal path component "@path" is invalid. Its path component must have a leading slash, e.g. internal:/foo.', ['@path' => $uri_parts['path']]));
}
// Remove the leading slash.
$uri_parts['path'] = substr($uri_parts['path'], 1);
@@ -458,7 +458,7 @@ protected static function fromRouteUri(array $uri_parts, array $options, $uri) {
$route_parts = explode(';', $uri_parts['path'], 2);
$route_name = $route_parts[0];
if ($route_name === '') {
- throw new \InvalidArgumentException(String::format('The route URI "@uri" is invalid. You must have a route name in the URI. e.g., route:system.admin', ['@uri' => $uri]));
+ throw new \InvalidArgumentException(SafeMarkup::format('The route URI "@uri" is invalid. You must have a route name in the URI. e.g., route:system.admin', ['@uri' => $uri]));
}
$route_parameters = [];
if (!empty($route_parts[1])) {
diff --git a/core/lib/Drupal/Core/Utility/Error.php b/core/lib/Drupal/Core/Utility/Error.php
index 9fb001b1fc4d..bfa69e338f3c 100644
--- a/core/lib/Drupal/Core/Utility/Error.php
+++ b/core/lib/Drupal/Core/Utility/Error.php
@@ -7,9 +7,8 @@
namespace Drupal\Core\Utility;
-use Drupal\Component\Utility\String;
-use Drupal\Component\Utility\Xss;
use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Utility\Xss;
use Drupal\Core\Database\DatabaseExceptionWrapper;
/**
@@ -71,7 +70,7 @@ public static function decodeException(\Exception $exception) {
'%type' => get_class($exception),
// The standard PHP exception handler considers that the exception message
// is plain-text. We mimic this behavior here.
- '!message' => String::checkPlain($message),
+ '!message' => SafeMarkup::checkPlain($message),
'%function' => $caller['function'],
'%file' => $caller['file'],
'%line' => $caller['line'],
@@ -96,7 +95,7 @@ public static function renderExceptionSafe(\Exception $exception) {
// Remove 'main()'.
array_shift($backtrace);
- $output = String::format('%type: !message in %function (line %line of %file).', $decode);
+ $output = SafeMarkup::format('%type: !message in %function (line %line of %file).', $decode);
// Even though it is possible that this method is called on a public-facing
// site, it is only called when the exception handler itself threw an
// exception, which normally means that a code change caused the system to
diff --git a/core/lib/Drupal/Core/Utility/LinkGenerator.php b/core/lib/Drupal/Core/Utility/LinkGenerator.php
index 05b98b899946..8794836c30e3 100644
--- a/core/lib/Drupal/Core/Utility/LinkGenerator.php
+++ b/core/lib/Drupal/Core/Utility/LinkGenerator.php
@@ -9,7 +9,6 @@
use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Link;
use Drupal\Core\Path\AliasManagerInterface;
@@ -132,7 +131,7 @@ public function generate($text, Url $url) {
// The result of the url generator is a plain-text URL. Because we are using
// it here in an HTML argument context, we need to encode it properly.
- $url = String::checkPlain($url->toString());
+ $url = SafeMarkup::checkPlain($url->toString());
// Make sure the link text is sanitized.
$safe_text = SafeMarkup::escape($variables['text']);
diff --git a/core/lib/Drupal/Core/Utility/LinkGeneratorInterface.php b/core/lib/Drupal/Core/Utility/LinkGeneratorInterface.php
index cb0e65a547f9..8d2d9fc7b31e 100644
--- a/core/lib/Drupal/Core/Utility/LinkGeneratorInterface.php
+++ b/core/lib/Drupal/Core/Utility/LinkGeneratorInterface.php
@@ -41,7 +41,7 @@ interface LinkGeneratorInterface {
* Strings will be sanitized automatically. If you need to output HTML in
* the link text, use a render array or an already sanitized string such as
* the output of \Drupal\Component\Utility\Xss::filter() or
- * \Drupal\Component\Utility\String::format().
+ * \Drupal\Component\Utility\SafeMarkup::format().
* @param \Drupal\Core\Url $url
* The URL object used for the link. Amongst its options, the following may
* be set to affect the generated link:
diff --git a/core/lib/Drupal/Core/Utility/Token.php b/core/lib/Drupal/Core/Utility/Token.php
index 1078722cb006..6d3b4a257fb5 100644
--- a/core/lib/Drupal/Core/Utility/Token.php
+++ b/core/lib/Drupal/Core/Utility/Token.php
@@ -150,7 +150,7 @@ public function __construct(ModuleHandlerInterface $module_handler, CacheBackend
* display to a web browser. Defaults to TRUE. Developers who set this
* option to FALSE assume responsibility for running
* \Drupal\Component\Utility\Xss::filter(),
- * \Drupal\Component\Utility\String::checkPlain() or other appropriate
+ * \Drupal\Component\Utility\SafeMarkup::checkPlain() or other appropriate
* scrubbing functions before displaying data to users.
*
* @return string
@@ -243,7 +243,7 @@ public function scan($text) {
* - sanitize: A boolean flag indicating that tokens should be sanitized for
* display to a web browser. Developers who set this option to FALSE assume
* responsibility for running \Drupal\Component\Utility\Xss::filter(),
- * \Drupal\Component\Utility\String::checkPlain() or other appropriate
+ * \Drupal\Component\Utility\SafeMarkup::checkPlain() or other appropriate
* scrubbing functions before displaying data to users.
*
* @return array
diff --git a/core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php b/core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php
index 2aed98efa89d..efc966b9f7cb 100644
--- a/core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php
+++ b/core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Utility;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\PathProcessor\OutboundPathProcessorInterface;
@@ -68,7 +68,7 @@ public function assemble($uri, array $options = []) {
// UrlHelper::isExternal() only returns true for safe protocols.
return $this->buildExternalUrl($uri, $options);
}
- throw new \InvalidArgumentException(String::format('The URI "@uri" is invalid. You must use a valid URI scheme. Use base: for a path, e.g., to a Drupal file that needs the base path. Do not use this for internal paths controlled by Drupal.', ['@uri' => $uri]));
+ throw new \InvalidArgumentException(SafeMarkup::format('The URI "@uri" is invalid. You must use a valid URI scheme. Use base: for a path, e.g., to a Drupal file that needs the base path. Do not use this for internal paths controlled by Drupal.', ['@uri' => $uri]));
}
/**
diff --git a/core/modules/action/action.views_execution.inc b/core/modules/action/action.views_execution.inc
index 32bc883fbd02..8421d79c796b 100644
--- a/core/modules/action/action.views_execution.inc
+++ b/core/modules/action/action.views_execution.inc
@@ -5,14 +5,14 @@
* Provides views runtime hooks for action.module.
*/
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Implements hook_views_form_substitutions().
*/
function action_views_form_substitutions() {
- // Views String::checkPlain()s the column label, so we need to match that.
- $select_all_placeholder = String::checkPlain('<!--action-bulk-form-select-all-->');
+ // Views SafeMarkup::checkPlain()s the column label, so we need to match that.
+ $select_all_placeholder = SafeMarkup::checkPlain('<!--action-bulk-form-select-all-->');
$select_all = array(
'#type' => 'checkbox',
'#default_value' => FALSE,
diff --git a/core/modules/aggregator/aggregator.theme.inc b/core/modules/aggregator/aggregator.theme.inc
index 75c31ddf0d48..ab6c3dc01d93 100644
--- a/core/modules/aggregator/aggregator.theme.inc
+++ b/core/modules/aggregator/aggregator.theme.inc
@@ -5,7 +5,7 @@
* Preprocessors and theme functions of Aggregator module.
*/
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Render\Element;
/**
@@ -26,7 +26,7 @@ function template_preprocess_aggregator_item(&$variables) {
}
$variables['url'] = check_url($item->getLink());
- $variables['title'] = String::checkPlain($item->label());
+ $variables['title'] = SafeMarkup::checkPlain($item->label());
}
/**
@@ -46,5 +46,5 @@ function template_preprocess_aggregator_feed(&$variables) {
$variables['content'][$key] = $variables['elements'][$key];
}
$variables['full'] = $variables['elements']['#view_mode'] == 'full';
- $variables['title'] = String::checkPlain($feed->label());
+ $variables['title'] = SafeMarkup::checkPlain($feed->label());
}
diff --git a/core/modules/aggregator/src/Form/SettingsForm.php b/core/modules/aggregator/src/Form/SettingsForm.php
index 69c5ed67ad60..6af1b35e7274 100644
--- a/core/modules/aggregator/src/Form/SettingsForm.php
+++ b/core/modules/aggregator/src/Form/SettingsForm.php
@@ -8,7 +8,7 @@
namespace Drupal\aggregator\Form;
use Drupal\aggregator\Plugin\AggregatorPluginManager;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Plugin\PluginFormInterface;
@@ -71,7 +71,7 @@ public function __construct(ConfigFactoryInterface $config_factory, AggregatorPl
// Get all available fetcher, parser and processor definitions.
foreach (array('fetcher', 'parser', 'processor') as $type) {
foreach ($this->managers[$type]->getDefinitions() as $id => $definition) {
- $this->definitions[$type][$id] = String::format('@title <span class="description">@description</span>', array('@title' => $definition['title'], '@description' => $definition['description']));
+ $this->definitions[$type][$id] = SafeMarkup::format('@title <span class="description">@description</span>', array('@title' => $definition['title'], '@description' => $definition['description']));
}
}
}
diff --git a/core/modules/aggregator/src/Plugin/views/argument/Fid.php b/core/modules/aggregator/src/Plugin/views/argument/Fid.php
index 7561694befe4..b4abeca379d3 100644
--- a/core/modules/aggregator/src/Plugin/views/argument/Fid.php
+++ b/core/modules/aggregator/src/Plugin/views/argument/Fid.php
@@ -9,7 +9,7 @@
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\views\Plugin\views\argument\NumericArgument;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -60,7 +60,7 @@ public function titleQuery() {
$feeds = $this->entityManager->getStorage('aggregator_feed')->loadMultiple($this->value);
foreach ($feeds as $feed) {
- $titles[] = String::checkPlain($feed->label());
+ $titles[] = SafeMarkup::checkPlain($feed->label());
}
return $titles;
}
diff --git a/core/modules/aggregator/src/Plugin/views/argument/Iid.php b/core/modules/aggregator/src/Plugin/views/argument/Iid.php
index 1c95afac5d94..a125856d5c70 100644
--- a/core/modules/aggregator/src/Plugin/views/argument/Iid.php
+++ b/core/modules/aggregator/src/Plugin/views/argument/Iid.php
@@ -9,7 +9,7 @@
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\views\Plugin\views\argument\NumericArgument;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -60,7 +60,7 @@ public function titleQuery() {
$items = $this->entityManager->getStorage('aggregator_item')->loadMultiple($this->value);
foreach ($items as $feed) {
- $titles[] = String::checkPlain($feed->label());
+ $titles[] = SafeMarkup::checkPlain($feed->label());
}
return $titles;
}
diff --git a/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php b/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php
index 024acfeccd11..c344d5c6106d 100644
--- a/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php
+++ b/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php
@@ -7,7 +7,7 @@
namespace Drupal\aggregator\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Tests display of aggregator items on the page.
@@ -107,7 +107,7 @@ public function testFeedPage() {
// Find the expected read_more link on the sources page.
$href = $feed->url();
$links = $this->xpath('//a[@href = :href]', array(':href' => $href));
- $this->assertTrue(isset($links[0]), String::format('Link to href %href found.', array('%href' => $href)));
+ $this->assertTrue(isset($links[0]), SafeMarkup::format('Link to href %href found.', array('%href' => $href)));
$cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
$cache_tags = explode(' ', $cache_tags_header);
$this->assertTrue(in_array('aggregator_feed:' . $feed->id(), $cache_tags));
diff --git a/core/modules/ban/src/BanMiddleware.php b/core/modules/ban/src/BanMiddleware.php
index ca4f1d7cfb75..efd7bd460483 100644
--- a/core/modules/ban/src/BanMiddleware.php
+++ b/core/modules/ban/src/BanMiddleware.php
@@ -7,7 +7,7 @@
namespace Drupal\ban;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -50,7 +50,7 @@ public function __construct(HttpKernelInterface $http_kernel, BanIpManagerInterf
public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = TRUE) {
$ip = $request->getClientIp();
if ($this->banIpManager->isBanned($ip)) {
- return new Response(String::format('Sorry @ip has been banned', ['@ip' => $ip]), 403);
+ return new Response(SafeMarkup::format('Sorry @ip has been banned', ['@ip' => $ip]), 403);
}
return $this->httpKernel->handle($request, $type, $catch);
}
diff --git a/core/modules/basic_auth/src/Authentication/Provider/BasicAuth.php b/core/modules/basic_auth/src/Authentication/Provider/BasicAuth.php
index c2b8483ffb4d..641ac89138be 100644
--- a/core/modules/basic_auth/src/Authentication/Provider/BasicAuth.php
+++ b/core/modules/basic_auth/src/Authentication/Provider/BasicAuth.php
@@ -7,7 +7,7 @@
namespace Drupal\basic_auth\Authentication\Provider;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Authentication\AuthenticationProviderInterface;
use Drupal\Core\Authentication\AuthenticationProviderChallengeInterface;
use Drupal\Core\Config\ConfigFactoryInterface;
@@ -132,7 +132,7 @@ public function authenticate(Request $request) {
*/
public function challengeException(Request $request, \Exception $previous) {
$site_name = $this->configFactory->get('system.site')->get('name');
- $challenge = String::format('Basic realm="@realm"', array(
+ $challenge = SafeMarkup::format('Basic realm="@realm"', array(
'@realm' => !empty($site_name) ? $site_name : 'Access restricted',
));
return new UnauthorizedHttpException($challenge, 'No authentication credentials provided.', $previous);
diff --git a/core/modules/basic_auth/src/Tests/Authentication/BasicAuthTest.php b/core/modules/basic_auth/src/Tests/Authentication/BasicAuthTest.php
index 579029460934..8a61f5bef093 100644
--- a/core/modules/basic_auth/src/Tests/Authentication/BasicAuthTest.php
+++ b/core/modules/basic_auth/src/Tests/Authentication/BasicAuthTest.php
@@ -7,7 +7,7 @@
namespace Drupal\basic_auth\Tests\Authentication;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Url;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\simpletest\WebTestBase;
@@ -54,7 +54,7 @@ public function testBasicAuth() {
// @todo Change ->drupalGet() calls to just pass $url when
// https://www.drupal.org/node/2350837 gets committed
$this->drupalGet($url->setAbsolute()->toString());
- $this->assertEqual($this->drupalGetHeader('WWW-Authenticate'), String::format('Basic realm="@realm"', ['@realm' => \Drupal::config('system.site')->get('name')]));
+ $this->assertEqual($this->drupalGetHeader('WWW-Authenticate'), SafeMarkup::format('Basic realm="@realm"', ['@realm' => \Drupal::config('system.site')->get('name')]));
$this->assertResponse('401', 'Not authenticated on the route that allows only basic_auth. Prompt to authenticate received.');
$this->drupalGet('admin');
diff --git a/core/modules/block/src/BlockListBuilder.php b/core/modules/block/src/BlockListBuilder.php
index 293f088a30f4..652128758ca1 100644
--- a/core/modules/block/src/BlockListBuilder.php
+++ b/core/modules/block/src/BlockListBuilder.php
@@ -10,7 +10,7 @@
use Drupal\Component\Utility\Html;
use Drupal\Core\Block\BlockManagerInterface;
use Drupal\Component\Serialization\Json;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityStorageInterface;
@@ -251,7 +251,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
}
$form['blocks'][$entity_id]['info'] = array(
- '#markup' => String::checkPlain($info['label']),
+ '#markup' => SafeMarkup::checkPlain($info['label']),
'#wrapper_attributes' => array(
'class' => array('block'),
),
@@ -336,7 +336,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$definitions = $this->blockManager->getDefinitionsForContexts();
$sorted_definitions = $this->blockManager->getSortedDefinitions($definitions);
foreach ($sorted_definitions as $plugin_id => $plugin_definition) {
- $category = String::checkPlain($plugin_definition['category']);
+ $category = SafeMarkup::checkPlain($plugin_definition['category']);
$category_key = 'category-' . $category;
if (!isset($form['place_blocks']['list'][$category_key])) {
$form['place_blocks']['list'][$category_key] = array(
diff --git a/core/modules/block/src/BlockPluginCollection.php b/core/modules/block/src/BlockPluginCollection.php
index 0f103ca3f645..c1905a79428a 100644
--- a/core/modules/block/src/BlockPluginCollection.php
+++ b/core/modules/block/src/BlockPluginCollection.php
@@ -9,7 +9,7 @@
use Drupal\Component\Plugin\Exception\PluginException;
use Drupal\Component\Plugin\PluginManagerInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Plugin\DefaultSingleLazyPluginCollection;
/**
@@ -56,7 +56,7 @@ public function &get($instance_id) {
*/
protected function initializePlugin($instance_id) {
if (!$instance_id) {
- throw new PluginException(String::format("The block '@block' did not specify a plugin.", array('@block' => $this->blockId)));
+ throw new PluginException(SafeMarkup::format("The block '@block' did not specify a plugin.", array('@block' => $this->blockId)));
}
try {
diff --git a/core/modules/block/src/BlockViewBuilder.php b/core/modules/block/src/BlockViewBuilder.php
index 1c1ce7bf8b20..c2a0ba8960e6 100644
--- a/core/modules/block/src/BlockViewBuilder.php
+++ b/core/modules/block/src/BlockViewBuilder.php
@@ -7,7 +7,7 @@
namespace Drupal\block;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Entity\EntityViewBuilder;
use Drupal\Core\Entity\EntityViewBuilderInterface;
@@ -81,7 +81,7 @@ public function viewMultiple(array $entities = array(), $view_mode = 'full', $la
// Add the entity so that it can be used in the #pre_render method.
'#block' => $entity,
);
- $build[$entity_id]['#configuration']['label'] = String::checkPlain($configuration['label']);
+ $build[$entity_id]['#configuration']['label'] = SafeMarkup::checkPlain($configuration['label']);
if ($plugin->isCacheable()) {
$build[$entity_id]['#pre_render'][] = array($this, 'buildBlock');
diff --git a/core/modules/block/src/Controller/CategoryAutocompleteController.php b/core/modules/block/src/Controller/CategoryAutocompleteController.php
index 8d7cf3ada2a6..0f6a011e91b4 100644
--- a/core/modules/block/src/Controller/CategoryAutocompleteController.php
+++ b/core/modules/block/src/Controller/CategoryAutocompleteController.php
@@ -8,7 +8,7 @@
namespace Drupal\block\Controller;
use Drupal\Core\Block\BlockManagerInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\JsonResponse;
@@ -59,7 +59,7 @@ public function autocomplete(Request $request) {
$matches = array();
foreach ($this->blockManager->getCategories() as $category) {
if (stripos($category, $typed_category) === 0) {
- $matches[] = array('value' => $category, 'label' => String::checkPlain($category));
+ $matches[] = array('value' => $category, 'label' => SafeMarkup::checkPlain($category));
}
}
return new JsonResponse($matches);
diff --git a/core/modules/block/src/Tests/BlockInterfaceTest.php b/core/modules/block/src/Tests/BlockInterfaceTest.php
index b54746e0e77a..5e8b54c5766d 100644
--- a/core/modules/block/src/Tests/BlockInterfaceTest.php
+++ b/core/modules/block/src/Tests/BlockInterfaceTest.php
@@ -7,8 +7,8 @@
namespace Drupal\block\Tests;
-use Drupal\Component\Utility\String;
use Drupal\Core\Cache\Cache;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Form\FormState;
use Drupal\simpletest\KernelTestBase;
use Drupal\block\BlockInterface;
@@ -73,7 +73,7 @@ public function testBlockInterface() {
'admin_label' => array(
'#type' => 'item',
'#title' => t('Block description'),
- '#markup' => String::checkPlain($definition['admin_label']),
+ '#markup' => SafeMarkup::checkPlain($definition['admin_label']),
),
'label' => array(
'#type' => 'textfield',
diff --git a/core/modules/block/src/Tests/Views/DisplayBlockTest.php b/core/modules/block/src/Tests/Views/DisplayBlockTest.php
index d424853ca927..7f3665a8923f 100644
--- a/core/modules/block/src/Tests/Views/DisplayBlockTest.php
+++ b/core/modules/block/src/Tests/Views/DisplayBlockTest.php
@@ -9,7 +9,7 @@
use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\views\Views;
use Drupal\views\Tests\ViewTestBase;
use Drupal\views\Tests\ViewTestData;
@@ -95,7 +95,7 @@ public function testBlockCategory() {
$this->drupalPostForm(NULL, array(), t('Save'));
// Test that the blocks are listed under the correct categories.
- $category_id = Html::getUniqueId('edit-category-' . String::checkPlain($category));
+ $category_id = Html::getUniqueId('edit-category-' . SafeMarkup::checkPlain($category));
$arguments[':id'] = $category_id;
$this->drupalGet('admin/structure/block');
$elements = $this->xpath('//details[@id=:id]//li[contains(@class, :li_class)]/a[contains(@href, :href) and text()=:text]', $arguments);
diff --git a/core/modules/block/tests/src/Unit/CategoryAutocompleteTest.php b/core/modules/block/tests/src/Unit/CategoryAutocompleteTest.php
index 5089f76a6ac7..065a25b352e6 100644
--- a/core/modules/block/tests/src/Unit/CategoryAutocompleteTest.php
+++ b/core/modules/block/tests/src/Unit/CategoryAutocompleteTest.php
@@ -8,7 +8,7 @@
namespace Drupal\Tests\block\Unit;
use Drupal\block\Controller\CategoryAutocompleteController;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Tests\UnitTestCase;
use Symfony\Component\HttpFoundation\Request;
@@ -48,7 +48,7 @@ protected function setUp() {
*/
public function testAutocompleteSuggestions($string, $suggestions) {
$suggestions = array_map(function ($suggestion) {
- return array('value' => $suggestion, 'label' => String::checkPlain($suggestion));
+ return array('value' => $suggestion, 'label' => SafeMarkup::checkPlain($suggestion));
}, $suggestions);
$result = $this->autocompleteController->autocomplete(new Request(array('q' => $string)));
$this->assertSame($suggestions, json_decode($result->getContent(), TRUE));
diff --git a/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php b/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
index 83dc590a2c33..4d65dcf76622 100644
--- a/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
+++ b/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
@@ -8,7 +8,7 @@
namespace Drupal\block_content\Tests\Views;
use Drupal\block_content\Entity\BlockContentType;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\views\Tests\ViewTestBase;
use Drupal\views\Tests\ViewTestData;
@@ -72,7 +72,7 @@ protected function createBlockContent(array $settings = array()) {
if ($block_content = entity_create('block_content', $settings)) {
$status = $block_content->save();
}
- $this->assertEqual($status, SAVED_NEW, String::format('Created block content %info.', array('%info' => $block_content->label())));
+ $this->assertEqual($status, SAVED_NEW, SafeMarkup::format('Created block content %info.', array('%info' => $block_content->label())));
return $block_content;
}
@@ -104,7 +104,7 @@ protected function createBlockContentType(array $values = array()) {
$status = $bundle->save();
block_content_add_body_field($bundle->id());
- $this->assertEqual($status, SAVED_NEW, String::format('Created block content type %bundle.', array('%bundle' => $bundle->id())));
+ $this->assertEqual($status, SAVED_NEW, SafeMarkup::format('Created block content type %bundle.', array('%bundle' => $bundle->id())));
return $bundle;
}
diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index 54efba445639..356f68b53b43 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -7,7 +7,7 @@
use Drupal\book\BookManager;
use Drupal\book\BookManagerInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Render\Element;
@@ -390,7 +390,7 @@ function template_preprocess_book_navigation(&$variables) {
// Provide extra variables for themers. Not needed by default.
$variables['book_id'] = $book_link['bid'];
- $variables['book_title'] = String::checkPlain($book_link['link_title']);
+ $variables['book_title'] = SafeMarkup::checkPlain($book_link['link_title']);
$variables['book_url'] = \Drupal::url('entity.node.canonical', array('node' => $book_link['bid']));
$variables['current_depth'] = $book_link['depth'];
$variables['tree'] = '';
@@ -410,7 +410,7 @@ function template_preprocess_book_navigation(&$variables) {
'href' => $prev_href,
);
$variables['prev_url'] = $prev_href;
- $variables['prev_title'] = String::checkPlain($prev['title']);
+ $variables['prev_title'] = SafeMarkup::checkPlain($prev['title']);
}
/** @var \Drupal\book\BookManagerInterface $book_manager */
@@ -422,7 +422,7 @@ function template_preprocess_book_navigation(&$variables) {
'href' => $parent_href,
);
$variables['parent_url'] = $parent_href;
- $variables['parent_title'] = String::checkPlain($parent['title']);
+ $variables['parent_title'] = SafeMarkup::checkPlain($parent['title']);
}
if ($next = $book_outline->nextLink($book_link)) {
@@ -432,7 +432,7 @@ function template_preprocess_book_navigation(&$variables) {
'href' => $next_href,
);
$variables['next_url'] = $next_href;
- $variables['next_title'] = String::checkPlain($next['title']);
+ $variables['next_title'] = SafeMarkup::checkPlain($next['title']);
}
}
@@ -470,7 +470,7 @@ function template_preprocess_book_export_html(&$variables) {
global $base_url;
$language_interface = \Drupal::languageManager()->getCurrentLanguage();
- $variables['title'] = String::checkPlain($variables['title']);
+ $variables['title'] = SafeMarkup::checkPlain($variables['title']);
$variables['base_url'] = $base_url;
$variables['language'] = $language_interface;
$variables['language_rtl'] = ($language_interface->getDirection() == LanguageInterface::DIRECTION_RTL);
@@ -496,7 +496,7 @@ function template_preprocess_book_export_html(&$variables) {
*/
function template_preprocess_book_node_export_html(&$variables) {
$variables['depth'] = $variables['node']->book['depth'];
- $variables['title'] = String::checkPlain($variables['node']->label());
+ $variables['title'] = SafeMarkup::checkPlain($variables['node']->label());
$variables['content'] = $variables['node']->rendered;
}
diff --git a/core/modules/book/src/Tests/BookTest.php b/core/modules/book/src/Tests/BookTest.php
index 1102e69fe950..dd7e37352222 100644
--- a/core/modules/book/src/Tests/BookTest.php
+++ b/core/modules/book/src/Tests/BookTest.php
@@ -7,7 +7,7 @@
namespace Drupal\book\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityInterface;
use Drupal\simpletest\WebTestBase;
use Drupal\user\RoleInterface;
@@ -227,7 +227,7 @@ function checkBookNode(EntityInterface $node, $nodes, $previous = FALSE, $up = F
/** @var \Drupal\Core\Url $url */
$url = $previous->urlInfo();
$url->setOptions(array('attributes' => array('rel' => array('prev'), 'title' => t('Go to previous page'))));
- $text = String::format('<b>‹</b> @label', array('@label' => $previous->label()));
+ $text = SafeMarkup::format('<b>‹</b> @label', array('@label' => $previous->label()));
$this->assertRaw(\Drupal::l($text, $url), 'Previous page link found.');
}
@@ -242,7 +242,7 @@ function checkBookNode(EntityInterface $node, $nodes, $previous = FALSE, $up = F
/** @var \Drupal\Core\Url $url */
$url = $next->urlInfo();
$url->setOptions(array('attributes' => array('rel' => array('next'), 'title' => t('Go to next page'))));
- $text = String::format('@label <b>›</b>', array('@label' => $next->label()));
+ $text = SafeMarkup::format('@label <b>›</b>', array('@label' => $next->label()));
$this->assertRaw(\Drupal::l($text, $url), 'Next page link found.');
}
diff --git a/core/modules/color/color.module b/core/modules/color/color.module
index 98678f798284..65c60d766577 100644
--- a/core/modules/color/color.module
+++ b/core/modules/color/color.module
@@ -9,7 +9,6 @@
use Drupal\Component\Utility\Bytes;
use Drupal\Component\Utility\Environment;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Language\LanguageInterface;
@@ -250,7 +249,7 @@ function color_scheme_form($complete_form, FormStateInterface $form_state, $them
if (isset($names[$name])) {
$form['palette'][$name] = array(
'#type' => 'textfield',
- '#title' => String::checkPlain($names[$name]),
+ '#title' => SafeMarkup::checkPlain($names[$name]),
'#value_callback' => 'color_palette_color_value',
'#default_value' => $value,
'#size' => 8,
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 3ad9a0accae5..f1a4c9cc57bf 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -16,7 +16,7 @@
use Drupal\comment\Entity\CommentType;
use Drupal\Core\Entity\FieldableEntityInterface;
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Routing\RouteMatchInterface;
@@ -577,7 +577,7 @@ function comment_preview(CommentInterface $comment, FormStateInterface $form_sta
if (!empty($account) && $account->isAuthenticated()) {
$comment->setOwner($account);
- $comment->setAuthorName(String::checkPlain($account->getUsername()));
+ $comment->setAuthorName(SafeMarkup::checkPlain($account->getUsername()));
}
elseif (empty($author_name)) {
$comment->setAuthorName(\Drupal::config('user.settings')->get('anonymous'));
diff --git a/core/modules/comment/comment.tokens.inc b/core/modules/comment/comment.tokens.inc
index 1bae72eb8790..97a358010491 100644
--- a/core/modules/comment/comment.tokens.inc
+++ b/core/modules/comment/comment.tokens.inc
@@ -5,7 +5,7 @@
* Builds placeholder replacement tokens for comment-related data.
*/
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Xss;
/**
@@ -133,12 +133,12 @@ function comment_tokens($type, $tokens, array $data = array(), array $options =
// Poster identity information for comments.
case 'hostname':
- $replacements[$original] = $sanitize ? String::checkPlain($comment->getHostname()) : $comment->getHostname();
+ $replacements[$original] = $sanitize ? SafeMarkup::checkPlain($comment->getHostname()) : $comment->getHostname();
break;
case 'mail':
$mail = $comment->getAuthorEmail();
- $replacements[$original] = $sanitize ? String::checkPlain($mail) : $mail;
+ $replacements[$original] = $sanitize ? SafeMarkup::checkPlain($mail) : $mail;
break;
case 'homepage':
@@ -154,7 +154,7 @@ function comment_tokens($type, $tokens, array $data = array(), array $options =
break;
case 'langcode':
- $replacements[$original] = $sanitize ? String::checkPlain($comment->language()->getId()) : $comment->language()->getId();
+ $replacements[$original] = $sanitize ? SafeMarkup::checkPlain($comment->language()->getId()) : $comment->language()->getId();
break;
// Comment related URLs.
diff --git a/core/modules/comment/src/CommentTypeListBuilder.php b/core/modules/comment/src/CommentTypeListBuilder.php
index 7f54ce935c31..6f42f8467182 100644
--- a/core/modules/comment/src/CommentTypeListBuilder.php
+++ b/core/modules/comment/src/CommentTypeListBuilder.php
@@ -7,7 +7,7 @@
namespace Drupal\comment;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
use Drupal\Core\Entity\EntityInterface;
@@ -45,7 +45,7 @@ public function buildHeader() {
* {@inheritdoc}
*/
public function buildRow(EntityInterface $entity) {
- $row['type'] = String::checkPlain($entity->label());
+ $row['type'] = SafeMarkup::checkPlain($entity->label());
$row['description'] = Xss::filterAdmin($entity->getDescription());
return $row + parent::buildRow($entity);
}
diff --git a/core/modules/comment/src/Form/ConfirmDeleteMultiple.php b/core/modules/comment/src/Form/ConfirmDeleteMultiple.php
index d3605438bcac..666b5553d797 100644
--- a/core/modules/comment/src/Form/ConfirmDeleteMultiple.php
+++ b/core/modules/comment/src/Form/ConfirmDeleteMultiple.php
@@ -8,7 +8,7 @@
namespace Drupal\comment\Form;
use Drupal\comment\CommentStorageInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
@@ -100,7 +100,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
'#type' => 'hidden',
'#value' => $cid,
'#prefix' => '<li>',
- '#suffix' => String::checkPlain($comment->label()) . '</li>'
+ '#suffix' => SafeMarkup::checkPlain($comment->label()) . '</li>'
);
$comment_counter++;
}
diff --git a/core/modules/comment/src/Plugin/views/argument/UserUid.php b/core/modules/comment/src/Plugin/views/argument/UserUid.php
index b20a116da831..f6558e6593b9 100644
--- a/core/modules/comment/src/Plugin/views/argument/UserUid.php
+++ b/core/modules/comment/src/Plugin/views/argument/UserUid.php
@@ -7,7 +7,7 @@
namespace Drupal\comment\Plugin\views\argument;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Database\Connection;
use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -65,7 +65,7 @@ function title() {
return $this->t('No user');
}
- return String::checkPlain($title);
+ return SafeMarkup::checkPlain($title);
}
protected function defaultActions($which = NULL) {
diff --git a/core/modules/comment/src/Tests/CommentBlockTest.php b/core/modules/comment/src/Tests/CommentBlockTest.php
index f67c3777fcc8..ae68ff0b7f18 100644
--- a/core/modules/comment/src/Tests/CommentBlockTest.php
+++ b/core/modules/comment/src/Tests/CommentBlockTest.php
@@ -6,7 +6,8 @@
*/
namespace Drupal\comment\Tests;
-use Drupal\Component\Utility\String;
+
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\user\RoleInterface;
/**
@@ -72,11 +73,11 @@ function testRecentCommentBlock() {
// Test the only the 10 latest comments are shown and in the proper order.
$this->assertNoText($comments[10]->getSubject(), 'Comment 11 not found in block.');
for ($i = 0; $i < 10; $i++) {
- $this->assertText($comments[$i]->getSubject(), String::format('Comment @number found in block.', array('@number' => 10 - $i)));
+ $this->assertText($comments[$i]->getSubject(), SafeMarkup::format('Comment @number found in block.', array('@number' => 10 - $i)));
if ($i > 1) {
$previous_position = $position;
$position = strpos($this->getRawContent(), $comments[$i]->getSubject());
- $this->assertTrue($position > $previous_position, String::format('Comment @a appears after comment @b', array('@a' => 10 - $i, '@b' => 11 - $i)));
+ $this->assertTrue($position > $previous_position, SafeMarkup::format('Comment @a appears after comment @b', array('@a' => 10 - $i, '@b' => 11 - $i)));
}
$position = strpos($this->getRawContent(), $comments[$i]->getSubject());
}
diff --git a/core/modules/comment/src/Tests/CommentFieldAccessTest.php b/core/modules/comment/src/Tests/CommentFieldAccessTest.php
index 7faecadd1414..654d1b0d3f4a 100644
--- a/core/modules/comment/src/Tests/CommentFieldAccessTest.php
+++ b/core/modules/comment/src/Tests/CommentFieldAccessTest.php
@@ -8,7 +8,7 @@
use Drupal\comment\Entity\Comment;
use Drupal\comment\Entity\CommentType;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Session\AnonymousUserSession;
use Drupal\entity_test\Entity\EntityTest;
use Drupal\field\Entity\FieldConfig;
@@ -205,13 +205,13 @@ public function testAccessToAdministrativeFields() {
foreach ($permutations as $set) {
$may_view = $set['comment']->{$field}->access('view', $set['user']);
$may_update = $set['comment']->{$field}->access('edit', $set['user']);
- $this->assertEqual($may_view, $set['user']->hasPermission('administer comments') || ($set['comment']->isPublished() && $set['user']->hasPermission('access comments')), String::format('User @user !state view field !field on comment @comment', [
+ $this->assertEqual($may_view, $set['user']->hasPermission('administer comments') || ($set['comment']->isPublished() && $set['user']->hasPermission('access comments')), SafeMarkup::format('User @user !state view field !field on comment @comment', [
'@user' => $set['user']->getUsername(),
'!state' => $may_update ? 'can' : 'cannot',
'@comment' => $set['comment']->getSubject(),
'!field' => $field,
]));
- $this->assertEqual($may_update, $set['user']->hasPermission('administer comments'), String::format('User @user !state update field !field on comment @comment', [
+ $this->assertEqual($may_update, $set['user']->hasPermission('administer comments'), SafeMarkup::format('User @user !state update field !field on comment @comment', [
'@user' => $set['user']->getUsername(),
'!state' => $may_update ? 'can' : 'cannot',
'@comment' => $set['comment']->getSubject(),
@@ -223,7 +223,7 @@ public function testAccessToAdministrativeFields() {
// Check access to normal field.
foreach ($permutations as $set) {
$may_update = $set['comment']->access('update', $set['user']) && $set['comment']->subject->access('edit', $set['user']);
- $this->assertEqual($may_update, $set['user']->hasPermission('administer comments') || ($set['user']->hasPermission('edit own comments') && $set['user']->id() == $set['comment']->getOwnerId()), String::format('User @user !state update field subject on comment @comment', [
+ $this->assertEqual($may_update, $set['user']->hasPermission('administer comments') || ($set['user']->hasPermission('edit own comments') && $set['user']->id() == $set['comment']->getOwnerId()), SafeMarkup::format('User @user !state update field subject on comment @comment', [
'@user' => $set['user']->getUsername(),
'!state' => $may_update ? 'can' : 'cannot',
'@comment' => $set['comment']->getSubject(),
@@ -237,13 +237,13 @@ public function testAccessToAdministrativeFields() {
$may_view = $set['comment']->{$field}->access('view', $set['user']);
$may_update = $set['comment']->{$field}->access('edit', $set['user']);
$this->assertEqual($may_view, $field != 'hostname' && ($set['user']->hasPermission('administer comments') ||
- ($set['comment']->isPublished() && $set['user']->hasPermission('access comments'))), String::format('User @user !state view field !field on comment @comment', [
+ ($set['comment']->isPublished() && $set['user']->hasPermission('access comments'))), SafeMarkup::format('User @user !state view field !field on comment @comment', [
'@user' => $set['user']->getUsername(),
'!state' => $may_view ? 'can' : 'cannot',
'@comment' => $set['comment']->getSubject(),
'!field' => $field,
]));
- $this->assertFalse($may_update, String::format('User @user !state update field !field on comment @comment', [
+ $this->assertFalse($may_update, SafeMarkup::format('User @user !state update field !field on comment @comment', [
'@user' => $set['user']->getUsername(),
'!state' => $may_update ? 'can' : 'cannot',
'@comment' => $set['comment']->getSubject(),
@@ -265,7 +265,7 @@ public function testAccessToAdministrativeFields() {
$set['comment']->isNew() &&
$set['user']->hasPermission('post comments') &&
$set['comment']->getFieldName() == 'comment_other'
- ), String::format('User @user !state update field !field on comment @comment', [
+ ), SafeMarkup::format('User @user !state update field !field on comment @comment', [
'@user' => $set['user']->getUsername(),
'!state' => $may_update ? 'can' : 'cannot',
'@comment' => $set['comment']->getSubject(),
diff --git a/core/modules/comment/src/Tests/CommentPagerTest.php b/core/modules/comment/src/Tests/CommentPagerTest.php
index ca1c5a642c52..bd5578c3b20b 100644
--- a/core/modules/comment/src/Tests/CommentPagerTest.php
+++ b/core/modules/comment/src/Tests/CommentPagerTest.php
@@ -8,7 +8,7 @@
namespace Drupal\comment\Tests;
use Drupal\comment\CommentManagerInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\node\Entity\Node;
/**
@@ -378,10 +378,10 @@ protected function clickLinkWithXPath($xpath, $index = 0) {
$urls = $this->xpath($xpath);
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' => $xpath, '@url_target' => $url_target, '@url_before' => $url_before)), 'Browser');
+ $this->pass(SafeMarkup::format('Clicked link %label (@url_target) from @url_before', array('%label' => $xpath, '@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' => $xpath, '@url_before' => $url_before)), 'Browser');
+ $this->fail(SafeMarkup::format('Link %label does not exist on @url_before', array('%label' => $xpath, '@url_before' => $url_before)), 'Browser');
return FALSE;
}
diff --git a/core/modules/comment/src/Tests/CommentTestTrait.php b/core/modules/comment/src/Tests/CommentTestTrait.php
index bca6d5d240c0..58aa9c73be30 100644
--- a/core/modules/comment/src/Tests/CommentTestTrait.php
+++ b/core/modules/comment/src/Tests/CommentTestTrait.php
@@ -7,7 +7,7 @@
namespace Drupal\comment\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
@@ -42,7 +42,7 @@ public function addDefaultCommentField($entity_type, $bundle, $field_name = 'com
$comment_type_storage = $entity_manager->getStorage('comment_type');
if ($comment_type = $comment_type_storage->load($comment_type_id)) {
if ($comment_type->getTargetEntityTypeId() !== $entity_type) {
- throw new \InvalidArgumentException(String::format('The given comment type id %id can only be used with the %entity_type entity type', array(
+ throw new \InvalidArgumentException(SafeMarkup::format('The given comment type id %id can only be used with the %entity_type entity type', array(
'%id' => $comment_type_id,
'%entity_type' => $entity_type,
)));
diff --git a/core/modules/comment/src/Tests/CommentTokenReplaceTest.php b/core/modules/comment/src/Tests/CommentTokenReplaceTest.php
index 64cc9c39454f..a5eaad889bc0 100644
--- a/core/modules/comment/src/Tests/CommentTokenReplaceTest.php
+++ b/core/modules/comment/src/Tests/CommentTokenReplaceTest.php
@@ -7,7 +7,7 @@
namespace Drupal\comment\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Xss;
use Drupal\comment\Entity\Comment;
use Drupal\node\Entity\Node;
@@ -51,25 +51,25 @@ function testCommentTokenReplacement() {
// Generate and test sanitized tokens.
$tests = array();
$tests['[comment:cid]'] = $comment->id();
- $tests['[comment:hostname]'] = String::checkPlain($comment->getHostname());
+ $tests['[comment:hostname]'] = SafeMarkup::checkPlain($comment->getHostname());
$tests['[comment:author]'] = Xss::filter($comment->getAuthorName());
- $tests['[comment:mail]'] = String::checkPlain($this->adminUser->getEmail());
+ $tests['[comment:mail]'] = SafeMarkup::checkPlain($this->adminUser->getEmail());
$tests['[comment:homepage]'] = check_url($comment->getHomepage());
$tests['[comment:title]'] = Xss::filter($comment->getSubject());
$tests['[comment:body]'] = $comment->comment_body->processed;
- $tests['[comment:langcode]'] = String::checkPlain($comment->language()->getId());
+ $tests['[comment:langcode]'] = SafeMarkup::checkPlain($comment->language()->getId());
$tests['[comment:url]'] = $comment->url('canonical', $url_options + array('fragment' => 'comment-' . $comment->id()));
$tests['[comment:edit-url]'] = $comment->url('edit-form', $url_options);
$tests['[comment:created:since]'] = \Drupal::service('date.formatter')->formatInterval(REQUEST_TIME - $comment->getCreatedTime(), 2, $language_interface->getId());
$tests['[comment:changed:since]'] = \Drupal::service('date.formatter')->formatInterval(REQUEST_TIME - $comment->getChangedTime(), 2, $language_interface->getId());
$tests['[comment:parent:cid]'] = $comment->hasParentComment() ? $comment->getParentComment()->id() : NULL;
- $tests['[comment:parent:title]'] = String::checkPlain($parent_comment->getSubject());
- $tests['[comment:entity]'] = String::checkPlain($node->getTitle());
+ $tests['[comment:parent:title]'] = SafeMarkup::checkPlain($parent_comment->getSubject());
+ $tests['[comment:entity]'] = SafeMarkup::checkPlain($node->getTitle());
// Test node specific tokens.
$tests['[comment:entity:nid]'] = $comment->getCommentedEntityId();
- $tests['[comment:entity:title]'] = String::checkPlain($node->getTitle());
+ $tests['[comment:entity:title]'] = SafeMarkup::checkPlain($node->getTitle());
$tests['[comment:author:uid]'] = $comment->getOwnerId();
- $tests['[comment:author:name]'] = String::checkPlain($this->adminUser->getUsername());
+ $tests['[comment:author:name]'] = SafeMarkup::checkPlain($this->adminUser->getUsername());
// Test to make sure that we generated something for each token.
$this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
diff --git a/core/modules/config/src/Tests/ConfigCRUDTest.php b/core/modules/config/src/Tests/ConfigCRUDTest.php
index f42d722b9c10..268df44b421a 100644
--- a/core/modules/config/src/Tests/ConfigCRUDTest.php
+++ b/core/modules/config/src/Tests/ConfigCRUDTest.php
@@ -7,7 +7,7 @@
namespace Drupal\config\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Config\ConfigNameException;
use Drupal\Core\Config\ConfigValueException;
use Drupal\Core\Config\InstallStorage;
@@ -282,7 +282,7 @@ public function testDataTypes() {
$this->fail('No Exception thrown upon saving invalid data type.');
}
catch (UnsupportedDataTypeConfigException $e) {
- $this->pass(String::format('%class thrown upon saving invalid data type.', array(
+ $this->pass(SafeMarkup::format('%class thrown upon saving invalid data type.', array(
'%class' => get_class($e),
)));
}
@@ -299,7 +299,7 @@ public function testDataTypes() {
$this->fail('No Exception thrown upon saving invalid data type.');
}
catch (UnsupportedDataTypeConfigException $e) {
- $this->pass(String::format('%class thrown upon saving invalid data type.', array(
+ $this->pass(SafeMarkup::format('%class thrown upon saving invalid data type.', array(
'%class' => get_class($e),
)));
}
diff --git a/core/modules/config/src/Tests/ConfigEntityTest.php b/core/modules/config/src/Tests/ConfigEntityTest.php
index ac93e87dbc49..cdf9189ff8d9 100644
--- a/core/modules/config/src/Tests/ConfigEntityTest.php
+++ b/core/modules/config/src/Tests/ConfigEntityTest.php
@@ -7,7 +7,7 @@
namespace Drupal\config\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityMalformedException;
use Drupal\Core\Entity\EntityStorageException;
use Drupal\Core\Config\Entity\ConfigEntityStorage;
@@ -151,7 +151,7 @@ function testCRUD() {
));
try {
$id_length_config_test->save();
- $this->pass(String::format("config_test entity with ID length @length was saved.", array(
+ $this->pass(SafeMarkup::format("config_test entity with ID length @length was saved.", array(
'@length' => strlen($id_length_config_test->id()))
));
}
@@ -165,7 +165,7 @@ function testCRUD() {
));
try {
$id_length_config_test->save();
- $this->pass(String::format("config_test entity with ID length @length was saved.", array(
+ $this->pass(SafeMarkup::format("config_test entity with ID length @length was saved.", array(
'@length' => strlen($id_length_config_test->id()),
)));
}
@@ -179,13 +179,13 @@ function testCRUD() {
));
try {
$status = $id_length_config_test->save();
- $this->fail(String::format("config_test entity with ID length @length exceeding the maximum allowed length of @max saved successfully", array(
+ $this->fail(SafeMarkup::format("config_test entity with ID length @length exceeding the maximum allowed length of @max saved successfully", array(
'@length' => strlen($id_length_config_test->id()),
'@max' => static::MAX_ID_LENGTH,
)));
}
catch (ConfigEntityIdLengthException $e) {
- $this->pass(String::format("config_test entity with ID length @length exceeding the maximum allowed length of @max failed to save", array(
+ $this->pass(SafeMarkup::format("config_test entity with ID length @length exceeding the maximum allowed length of @max failed to save", array(
'@length' => strlen($id_length_config_test->id()),
'@max' => static::MAX_ID_LENGTH,
)));
diff --git a/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php b/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php
index 9341f215e586..118c1cb396d7 100644
--- a/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php
+++ b/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php
@@ -7,7 +7,7 @@
namespace Drupal\config\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\Component\Uuid\Php;
use Drupal\Core\Config\ConfigImporter;
@@ -110,7 +110,7 @@ public function testRenameValidation() {
catch (ConfigImporterException $e) {
$this->pass('Expected ConfigImporterException thrown when a renamed configuration entity does not match the existing entity type.');
$expected = array(
- String::format('Entity type mismatch on rename. !old_type not equal to !new_type for existing configuration !old_name and staged configuration !new_name.', array('old_type' => 'node_type', 'new_type' => 'config_test', 'old_name' => 'node.type.' . $content_type->id(), 'new_name' => 'config_test.dynamic.' . $test_entity_id))
+ SafeMarkup::format('Entity type mismatch on rename. !old_type not equal to !new_type for existing configuration !old_name and staged configuration !new_name.', array('old_type' => 'node_type', 'new_type' => 'config_test', 'old_name' => 'node.type.' . $content_type->id(), 'new_name' => 'config_test.dynamic.' . $test_entity_id))
);
$this->assertIdentical($expected, $this->configImporter->getErrors());
}
@@ -153,7 +153,7 @@ public function testRenameSimpleConfigValidation() {
catch (ConfigImporterException $e) {
$this->pass('Expected ConfigImporterException thrown when simple configuration is renamed.');
$expected = array(
- String::format('Rename operation for simple configuration. Existing configuration !old_name and staged configuration !new_name.', array('old_name' => 'config_test.old', 'new_name' => 'config_test.new'))
+ SafeMarkup::format('Rename operation for simple configuration. Existing configuration !old_name and staged configuration !new_name.', array('old_name' => 'config_test.old', 'new_name' => 'config_test.new'))
);
$this->assertIdentical($expected, $this->configImporter->getErrors());
}
diff --git a/core/modules/config/src/Tests/ConfigImportUITest.php b/core/modules/config/src/Tests/ConfigImportUITest.php
index 4f3aea59d564..69ee6aa0902d 100644
--- a/core/modules/config/src/Tests/ConfigImportUITest.php
+++ b/core/modules/config/src/Tests/ConfigImportUITest.php
@@ -7,7 +7,7 @@
namespace Drupal\config\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Config\InstallStorage;
use Drupal\simpletest\WebTestBase;
@@ -403,7 +403,7 @@ function testImportErrorLog() {
// Attempt to import configuration and verify that an error message appears.
$this->drupalPostForm(NULL, array(), t('Import all'));
- $this->assertText(String::format('Deleted and replaced configuration entity "@name"', array('@name' => $name_secondary)));
+ $this->assertText(SafeMarkup::format('Deleted and replaced configuration entity "@name"', array('@name' => $name_secondary)));
$this->assertText(t('The configuration was imported with errors.'));
$this->assertNoText(t('The configuration was imported successfully.'));
$this->assertText(t('There are no configuration changes to import.'));
diff --git a/core/modules/config/src/Tests/ConfigImporterTest.php b/core/modules/config/src/Tests/ConfigImporterTest.php
index a6b231284706..ebd6378ebc86 100644
--- a/core/modules/config/src/Tests/ConfigImporterTest.php
+++ b/core/modules/config/src/Tests/ConfigImporterTest.php
@@ -7,7 +7,7 @@
namespace Drupal\config\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Config\ConfigImporter;
use Drupal\Core\Config\ConfigImporterException;
use Drupal\Core\Config\StorageComparer;
@@ -249,7 +249,7 @@ function testSecondaryWritePrimaryFirst() {
$logs = $this->configImporter->getErrors();
$this->assertEqual(count($logs), 1);
- $this->assertEqual($logs[0], String::format('Deleted and replaced configuration entity "@name"', array('@name' => $name_secondary)));
+ $this->assertEqual($logs[0], SafeMarkup::format('Deleted and replaced configuration entity "@name"', array('@name' => $name_secondary)));
}
/**
@@ -295,8 +295,8 @@ function testSecondaryWriteSecondaryFirst() {
$logs = $this->configImporter->getErrors();
$this->assertEqual(count($logs), 1);
- $message = String::format('config_test entity with ID @name already exists', array('@name' => 'secondary'));
- $this->assertEqual($logs[0], String::format('Unexpected error during import with operation @op for @name: @message.', array('@op' => 'create', '@name' => $name_primary, '@message' => $message)));
+ $message = SafeMarkup::format('config_test entity with ID @name already exists', array('@name' => 'secondary'));
+ $this->assertEqual($logs[0], SafeMarkup::format('Unexpected error during import with operation @op for @name: @message.', array('@op' => 'create', '@name' => $name_primary, '@message' => $message)));
}
/**
@@ -378,7 +378,7 @@ function testSecondaryUpdateDeletedDeleterFirst() {
$logs = $this->configImporter->getErrors();
$this->assertEqual(count($logs), 1);
- $this->assertEqual($logs[0], String::format('Update target "@name" is missing.', array('@name' => $name_deletee)));
+ $this->assertEqual($logs[0], SafeMarkup::format('Update target "@name" is missing.', array('@name' => $name_deletee)));
}
/**
diff --git a/core/modules/config/src/Tests/SchemaCheckTestTrait.php b/core/modules/config/src/Tests/SchemaCheckTestTrait.php
index 9f7cf2a386f0..7315ca7565ed 100644
--- a/core/modules/config/src/Tests/SchemaCheckTestTrait.php
+++ b/core/modules/config/src/Tests/SchemaCheckTestTrait.php
@@ -9,7 +9,7 @@
use Drupal\Core\Config\TypedConfigManagerInterface;
use Drupal\Core\Config\Schema\SchemaCheckTrait;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Provides a class for checking configuration schema.
@@ -33,19 +33,19 @@ public function assertConfigSchema(TypedConfigManagerInterface $typed_config, $c
if ($errors === FALSE) {
// @todo Since the use of this trait is under TestBase, it works.
// Can be fixed as part of https://drupal.org/node/2260053.
- $this->fail(String::format('No schema for !config_name', array('!config_name' => $config_name)));
+ $this->fail(SafeMarkup::format('No schema for !config_name', array('!config_name' => $config_name)));
return;
}
elseif ($errors === TRUE) {
// @todo Since the use of this trait is under TestBase, it works.
// Can be fixed as part of https://drupal.org/node/2260053.
- $this->pass(String::format('Schema found for !config_name and values comply with schema.', array('!config_name' => $config_name)));
+ $this->pass(SafeMarkup::format('Schema found for !config_name and values comply with schema.', array('!config_name' => $config_name)));
}
else {
foreach ($errors as $key => $error) {
// @todo Since the use of this trait is under TestBase, it works.
// Can be fixed as part of https://drupal.org/node/2260053.
- $this->fail(String::format('Schema key @key failed with: @error', array('@key' => $key, '@error' => $error)));
+ $this->fail(SafeMarkup::format('Schema key @key failed with: @error', array('@key' => $key, '@error' => $error)));
}
}
}
diff --git a/core/modules/config_translation/src/ConfigMapperManager.php b/core/modules/config_translation/src/ConfigMapperManager.php
index 09b64986ec3c..95353d38ef16 100644
--- a/core/modules/config_translation/src/ConfigMapperManager.php
+++ b/core/modules/config_translation/src/ConfigMapperManager.php
@@ -7,7 +7,7 @@
namespace Drupal\config_translation;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException;
use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\Config\TypedConfigManagerInterface;
@@ -124,7 +124,7 @@ public function processDefinition(&$definition, $plugin_id) {
parent::processDefinition($definition, $plugin_id);
if (!isset($definition['base_route_name'])) {
- throw new InvalidPluginDefinitionException($plugin_id, String::format("The plugin definition of the mapper '%plugin_id' does not contain a base_route_name.", array('%plugin_id' => $plugin_id)));
+ throw new InvalidPluginDefinitionException($plugin_id, SafeMarkup::format("The plugin definition of the mapper '%plugin_id' does not contain a base_route_name.", array('%plugin_id' => $plugin_id)));
}
}
diff --git a/core/modules/config_translation/src/Controller/ConfigTranslationBlockListBuilder.php b/core/modules/config_translation/src/Controller/ConfigTranslationBlockListBuilder.php
index c14db12adc7f..275dfedce392 100644
--- a/core/modules/config_translation/src/Controller/ConfigTranslationBlockListBuilder.php
+++ b/core/modules/config_translation/src/Controller/ConfigTranslationBlockListBuilder.php
@@ -7,7 +7,7 @@
namespace Drupal\config_translation\Controller;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Entity\EntityTypeInterface;
@@ -70,12 +70,12 @@ public function buildRow(EntityInterface $entity) {
);
$row['theme'] = array(
- 'data' => String::checkPlain($this->themes[$theme]->info['name']),
+ 'data' => SafeMarkup::checkPlain($this->themes[$theme]->info['name']),
'class' => 'table-filter-text-source',
);
$row['category'] = array(
- 'data' => String::checkPlain($plugin_definition['category']),
+ 'data' => SafeMarkup::checkPlain($plugin_definition['category']),
'class' => 'table-filter-text-source',
);
diff --git a/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php b/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php
index a046d3b05094..a3407071db51 100644
--- a/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php
+++ b/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php
@@ -7,7 +7,7 @@
namespace Drupal\config_translation\Controller;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityManagerInterface;
@@ -123,7 +123,7 @@ public function buildRow(EntityInterface $entity) {
if ($this->displayBundle()) {
$bundle = $entity->get('bundle');
$row['bundle'] = array(
- 'data' => String::checkPlain($this->baseEntityBundles[$bundle]['label']),
+ 'data' => SafeMarkup::checkPlain($this->baseEntityBundles[$bundle]['label']),
'class' => 'table-filter-text-source',
);
}
diff --git a/core/modules/config_translation/src/Controller/ConfigTranslationMapperList.php b/core/modules/config_translation/src/Controller/ConfigTranslationMapperList.php
index 9e5ed09c46d7..e32714b975cd 100644
--- a/core/modules/config_translation/src/Controller/ConfigTranslationMapperList.php
+++ b/core/modules/config_translation/src/Controller/ConfigTranslationMapperList.php
@@ -7,7 +7,7 @@
namespace Drupal\config_translation\Controller;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\config_translation\ConfigMapperInterface;
use Drupal\Core\Controller\ControllerBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -94,7 +94,7 @@ public function render() {
* A render array structure of fields for this mapper.
*/
public function buildRow(ConfigMapperInterface $mapper) {
- $row['label'] = String::checkPlain($mapper->getTypeLabel());
+ $row['label'] = SafeMarkup::checkPlain($mapper->getTypeLabel());
$row['operations']['data'] = $this->buildOperations($mapper);
return $row;
}
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php
index 22243af28c9e..a2f6a6cf91dc 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php
@@ -7,7 +7,7 @@
namespace Drupal\config_translation\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\simpletest\WebTestBase;
@@ -84,7 +84,7 @@ public function testMapperListPage() {
$base_url = 'admin/structure/config_test/manage/' . $test_entity->id();
$this->drupalGet('admin/config/regional/config-translation/config_test');
$this->assertLinkByHref($base_url . '/translate');
- $this->assertText(String::checkPlain($test_entity->label()));
+ $this->assertText(SafeMarkup::checkPlain($test_entity->label()));
$entity_type = \Drupal::entityManager()->getDefinition($test_entity->getEntityTypeId());
$this->drupalGet($base_url . '/translate');
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
index ae0d25038c4d..807307c9338a 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
@@ -8,7 +8,7 @@
namespace Drupal\config_translation\Tests;
use Drupal\Component\Serialization\Json;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Config\FileStorage;
use Drupal\Core\Language\Language;
@@ -918,17 +918,17 @@ protected function assertDisabledTextarea($id) {
':id' => $id,
));
$textarea = reset($textarea);
- $passed = $this->assertTrue($textarea instanceof \SimpleXMLElement, String::format('Disabled field @id exists.', array(
+ $passed = $this->assertTrue($textarea instanceof \SimpleXMLElement, SafeMarkup::format('Disabled field @id exists.', array(
'@id' => $id,
)));
$expected = 'This field has been disabled because you do not have sufficient permissions to edit it.';
- $passed = $passed && $this->assertEqual((string) $textarea, $expected, String::format('Disabled textarea @id hides text in an inaccessible text format.', array(
+ $passed = $passed && $this->assertEqual((string) $textarea, $expected, SafeMarkup::format('Disabled textarea @id hides text in an inaccessible text format.', array(
'@id' => $id,
)));
// Make sure the text format select is not shown.
$select_id = str_replace('value', 'format--2', $id);
$select = $this->xpath('//select[@id=:id]', array(':id' => $select_id));
- return $passed && $this->assertFalse($select, String::format('Field @id does not exist.', array(
+ return $passed && $this->assertFalse($select, SafeMarkup::format('Field @id does not exist.', array(
'@id' => $id,
)));
}
diff --git a/core/modules/contact/src/ContactFormListBuilder.php b/core/modules/contact/src/ContactFormListBuilder.php
index 883ad9a2de76..fd4727f63fbe 100644
--- a/core/modules/contact/src/ContactFormListBuilder.php
+++ b/core/modules/contact/src/ContactFormListBuilder.php
@@ -7,7 +7,7 @@
namespace Drupal\contact;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
use Drupal\Core\Entity\EntityInterface;
@@ -39,7 +39,7 @@ public function buildRow(EntityInterface $entity) {
$row['selected'] = t('No');
}
else {
- $row['recipients'] = String::checkPlain(implode(', ', $entity->getRecipients()));
+ $row['recipients'] = SafeMarkup::checkPlain(implode(', ', $entity->getRecipients()));
$default_form = \Drupal::config('contact.settings')->get('default_form');
$row['selected'] = ($default_form == $entity->id() ? t('Yes') : t('No'));
}
diff --git a/core/modules/contact/src/Controller/ContactController.php b/core/modules/contact/src/Controller/ContactController.php
index 648a06406355..f3d6825daf1a 100644
--- a/core/modules/contact/src/Controller/ContactController.php
+++ b/core/modules/contact/src/Controller/ContactController.php
@@ -13,7 +13,7 @@
use Drupal\Core\Flood\FloodInterface;
use Drupal\contact\ContactFormInterface;
use Drupal\user\UserInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -105,7 +105,7 @@ public function contactSitePage(ContactFormInterface $contact_form = NULL) {
));
$form = $this->entityFormBuilder()->getForm($message);
- $form['#title'] = String::checkPlain($contact_form->label());
+ $form['#title'] = SafeMarkup::checkPlain($contact_form->label());
$form['#cache']['tags'] = Cache::mergeTags(isset($form['#cache']['tags']) ? $form['#cache']['tags'] : [], $config->getCacheTags());
return $form;
}
diff --git a/core/modules/contact/src/MessageForm.php b/core/modules/contact/src/MessageForm.php
index 908ed1747741..4384e9e6c85e 100644
--- a/core/modules/contact/src/MessageForm.php
+++ b/core/modules/contact/src/MessageForm.php
@@ -7,7 +7,7 @@
namespace Drupal\contact;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\ContentEntityForm;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Flood\FloodInterface;
@@ -118,12 +118,12 @@ public function form(array $form, FormStateInterface $form_state) {
$form['name']['#type'] = 'item';
$form['name']['#value'] = $user->getUsername();
$form['name']['#required'] = FALSE;
- $form['name']['#markup'] = String::checkPlain($user->getUsername());
+ $form['name']['#markup'] = SafeMarkup::checkPlain($user->getUsername());
$form['mail']['#type'] = 'item';
$form['mail']['#value'] = $user->getEmail();
$form['mail']['#required'] = FALSE;
- $form['mail']['#markup'] = String::checkPlain($user->getEmail());
+ $form['mail']['#markup'] = SafeMarkup::checkPlain($user->getEmail());
}
// The user contact form has a preset recipient.
diff --git a/core/modules/contact/src/MessageViewBuilder.php b/core/modules/contact/src/MessageViewBuilder.php
index 47173386bf19..5b9458275ca6 100644
--- a/core/modules/contact/src/MessageViewBuilder.php
+++ b/core/modules/contact/src/MessageViewBuilder.php
@@ -9,7 +9,7 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityViewBuilder;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Mail\MailFormatHelper;
use Drupal\Core\Render\Element;
@@ -42,7 +42,7 @@ public function buildComponents(array &$build, array $entities, array $displays,
$build[$id]['message'] = array(
'#type' => 'item',
'#title' => t('Message'),
- '#markup' => String::checkPlain($entity->getMessage()),
+ '#markup' => SafeMarkup::checkPlain($entity->getMessage()),
);
}
}
diff --git a/core/modules/contact/src/Tests/ContactPersonalTest.php b/core/modules/contact/src/Tests/ContactPersonalTest.php
index 03965ad65045..6b7638ffc11d 100644
--- a/core/modules/contact/src/Tests/ContactPersonalTest.php
+++ b/core/modules/contact/src/Tests/ContactPersonalTest.php
@@ -7,7 +7,7 @@
namespace Drupal\contact\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Session\AccountInterface;
use Drupal\simpletest\WebTestBase;
use Drupal\user\RoleInterface;
@@ -93,7 +93,7 @@ function testSendPersonalContactMessage() {
'@sender_email' => $this->webUser->getEmail(),
'@recipient_name' => $this->contactUser->getUsername()
);
- $this->assertText(String::format('@sender_name (@sender_email) sent @recipient_name an email.', $placeholders));
+ $this->assertText(SafeMarkup::format('@sender_name (@sender_email) sent @recipient_name an email.', $placeholders));
}
/**
diff --git a/core/modules/content_translation/content_translation.admin.inc b/core/modules/content_translation/content_translation.admin.inc
index 2c55fa9a8be8..f529e4d86891 100644
--- a/core/modules/content_translation/content_translation.admin.inc
+++ b/core/modules/content_translation/content_translation.admin.inc
@@ -5,7 +5,7 @@
* The content translation administration forms.
*/
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Config\Entity\ThirdPartySettingsInterface;
use Drupal\Core\Entity\ContentEntityTypeInterface;
use Drupal\Core\Field\FieldDefinitionInterface;
@@ -192,10 +192,10 @@ function _content_translation_preprocess_language_content_settings_table(&$varia
'bundle' => array(
'#prefix' => '<span class="visually-hidden">',
'#suffix' => '</span> ',
- '#markup' => String::checkPlain($element[$bundle]['settings']['#label']),
+ '#markup' => SafeMarkup::checkPlain($element[$bundle]['settings']['#label']),
),
'field' => array(
- '#markup' => String::checkPlain($field_element['#label']),
+ '#markup' => SafeMarkup::checkPlain($field_element['#label']),
),
),
'class' => array('field'),
@@ -226,15 +226,15 @@ function _content_translation_preprocess_language_content_settings_table(&$varia
'bundle' => array(
'#prefix' => '<span class="visually-hidden">',
'#suffix' => '</span> ',
- '#markup' => String::checkPlain($element[$bundle]['settings']['#label']),
+ '#markup' => SafeMarkup::checkPlain($element[$bundle]['settings']['#label']),
),
'field' => array(
'#prefix' => '<span class="visually-hidden">',
'#suffix' => '</span> ',
- '#markup' => String::checkPlain($field_element['#label']),
+ '#markup' => SafeMarkup::checkPlain($field_element['#label']),
),
'columns' => array(
- '#markup' => String::checkPlain($column_label),
+ '#markup' => SafeMarkup::checkPlain($column_label),
),
),
'class' => array('column'),
diff --git a/core/modules/dblog/src/Controller/DbLogController.php b/core/modules/dblog/src/Controller/DbLogController.php
index 038c7ca04e56..722759face5c 100644
--- a/core/modules/dblog/src/Controller/DbLogController.php
+++ b/core/modules/dblog/src/Controller/DbLogController.php
@@ -9,7 +9,6 @@
use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Unicode;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Controller\ControllerBase;
@@ -273,7 +272,7 @@ public function eventDetails($event_id) {
),
array(
array('data' => $this->t('Hostname'), 'header' => TRUE),
- String::checkPlain($dblog->hostname),
+ SafeMarkup::checkPlain($dblog->hostname),
),
array(
array('data' => $this->t('Operations'), 'header' => TRUE),
diff --git a/core/modules/dblog/src/Logger/DbLog.php b/core/modules/dblog/src/Logger/DbLog.php
index 451be3a7a8c8..950dd279572c 100644
--- a/core/modules/dblog/src/Logger/DbLog.php
+++ b/core/modules/dblog/src/Logger/DbLog.php
@@ -8,6 +8,7 @@
namespace Drupal\dblog\Logger;
use Drupal\Core\Database\Connection;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Logger\LogMessageParserInterface;
use Drupal\Core\Logger\RfcLoggerTrait;
use Psr\Log\LoggerInterface;
@@ -52,7 +53,7 @@ public function log($level, $message, array $context = array()) {
// Remove any backtraces since they may contain an unserializable variable.
unset($context['backtrace']);
- // Convert PSR3-style messages to String::format() style, so they can be
+ // Convert PSR3-style messages to SafeMarkup::format() style, so they can be
// translated too in runtime.
$message_placeholders = $this->parser->parseMessagePlaceholders($message, $context);
diff --git a/core/modules/dblog/src/Plugin/views/field/DblogMessage.php b/core/modules/dblog/src/Plugin/views/field/DblogMessage.php
index 67c5e4cf7451..b54b8b552509 100644
--- a/core/modules/dblog/src/Plugin/views/field/DblogMessage.php
+++ b/core/modules/dblog/src/Plugin/views/field/DblogMessage.php
@@ -7,7 +7,7 @@
namespace Drupal\dblog\Plugin\views\field;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Form\FormStateInterface;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\views\ResultRow;
@@ -65,7 +65,7 @@ public function render(ResultRow $values) {
if ($this->options['replace_variables']) {
$variables = unserialize($this->getvalue($values, 'variables'));
- return String::format($value, (array) $variables);
+ return SafeMarkup::format($value, (array) $variables);
}
else {
return $this->sanitizeValue($value);
diff --git a/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php b/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php
index b63aa9156cb5..e934e0f5bab5 100644
--- a/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php
+++ b/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php
@@ -8,7 +8,6 @@
namespace Drupal\dblog\Tests\Views;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Logger\RfcLogLevel;
use Drupal\Core\Url;
@@ -95,7 +94,7 @@ public function testIntegration() {
$view->initStyle();
foreach ($entries as $index => $entry) {
- $this->assertEqual($view->style_plugin->getField($index, 'message'), String::format($entry['message'], $entry['variables']));
+ $this->assertEqual($view->style_plugin->getField($index, 'message'), SafeMarkup::format($entry['message'], $entry['variables']));
$this->assertEqual($view->style_plugin->getField($index, 'link'), Xss::filterAdmin($entry['variables']['link']));
}
diff --git a/core/modules/editor/src/Tests/EditorSecurityTest.php b/core/modules/editor/src/Tests/EditorSecurityTest.php
index f63fce292ef5..305692dca22c 100644
--- a/core/modules/editor/src/Tests/EditorSecurityTest.php
+++ b/core/modules/editor/src/Tests/EditorSecurityTest.php
@@ -9,7 +9,7 @@
use Drupal\Component\Serialization\Json;
use Drupal\simpletest\WebTestBase;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Tests XSS protection for content creators when using text editors.
@@ -388,7 +388,7 @@ function testSwitchingSecurity() {
// Log in as the privileged user, and for every sample, do the following:
// - switch to every other text format/editor
// - assert the XSS-filtered values that we get from the server
- $value_original_attribute = String::checkPlain(self::$sampleContent);
+ $value_original_attribute = SafeMarkup::checkPlain(self::$sampleContent);
$this->drupalLogin($this->privilegedUser);
foreach ($expected as $case) {
$this->drupalGet('node/' . $case['node_id'] . '/edit');
diff --git a/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php b/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php
index 195365a4fa6f..1b3d66d2fa38 100644
--- a/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php
+++ b/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php
@@ -7,7 +7,7 @@
namespace Drupal\entity_reference;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem;
@@ -83,7 +83,7 @@ public function getSettableOptions(AccountInterface $account = NULL) {
$return = array();
foreach ($options as $bundle => $entity_ids) {
- $bundle_label = String::checkPlain($bundles[$bundle]['label']);
+ $bundle_label = SafeMarkup::checkPlain($bundles[$bundle]['label']);
$return[$bundle_label] = $entity_ids;
}
@@ -138,11 +138,11 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
// entity type specific plugins (e.g. 'default:node', 'default:user',
// ...).
if (array_key_exists($selection_group_id, $selection_plugins[$selection_group_id])) {
- $handlers_options[$selection_group_id] = String::checkPlain($selection_plugins[$selection_group_id][$selection_group_id]['label']);
+ $handlers_options[$selection_group_id] = SafeMarkup::checkPlain($selection_plugins[$selection_group_id][$selection_group_id]['label']);
}
elseif (array_key_exists($selection_group_id . ':' . $this->getSetting('target_type'), $selection_plugins[$selection_group_id])) {
$selection_group_plugin = $selection_group_id . ':' . $this->getSetting('target_type');
- $handlers_options[$selection_group_plugin] = String::checkPlain($selection_plugins[$selection_group_id][$selection_group_plugin]['base_plugin_label']);
+ $handlers_options[$selection_group_plugin] = SafeMarkup::checkPlain($selection_plugins[$selection_group_id][$selection_group_plugin]['base_plugin_label']);
}
}
diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceIntegrationTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceIntegrationTest.php
index 53fbccee388c..c4e885c452bf 100644
--- a/core/modules/entity_reference/src/Tests/EntityReferenceIntegrationTest.php
+++ b/core/modules/entity_reference/src/Tests/EntityReferenceIntegrationTest.php
@@ -7,7 +7,7 @@
namespace Drupal\entity_reference\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\config\Tests\AssertConfigEntityImportTrait;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\entity_reference\Tests\EntityReferenceTestTrait;
@@ -152,7 +152,7 @@ public function testSupportedEntityTypesAndWidgets() {
// Ensure the configuration has the expected dependency on the entity that
// is being used a default value.
$field = FieldConfig::loadByName($this->entityType, $this->bundle, $this->fieldName);
- $this->assertTrue(in_array($referenced_entities[0]->getConfigDependencyName(), $field->getDependencies()[$key]), String::format('Expected @type dependency @name found', ['@type' => $key, '@name' => $referenced_entities[0]->getConfigDependencyName()]));
+ $this->assertTrue(in_array($referenced_entities[0]->getConfigDependencyName(), $field->getDependencies()[$key]), SafeMarkup::format('Expected @type dependency @name found', ['@type' => $key, '@name' => $referenced_entities[0]->getConfigDependencyName()]));
// Ensure that the field can be imported without change even after the
// default value deleted.
$referenced_entities[0]->delete();
@@ -166,7 +166,7 @@ public function testSupportedEntityTypesAndWidgets() {
$field = FieldConfig::loadByName($this->entityType, $this->bundle, $this->fieldName);
$field->save();
$dependencies = $field->getDependencies();
- $this->assertFalse(isset($dependencies[$key]) && in_array($referenced_entities[0]->getConfigDependencyName(), $dependencies[$key]), String::format('@type dependency @name does not exist.', ['@type' => $key, '@name' => $referenced_entities[0]->getConfigDependencyName()]));
+ $this->assertFalse(isset($dependencies[$key]) && in_array($referenced_entities[0]->getConfigDependencyName(), $dependencies[$key]), SafeMarkup::format('@type dependency @name does not exist.', ['@type' => $key, '@name' => $referenced_entities[0]->getConfigDependencyName()]));
}
}
diff --git a/core/modules/field/src/Entity/FieldConfig.php b/core/modules/field/src/Entity/FieldConfig.php
index 802bc1b150d5..d7f2dd0a3ebf 100644
--- a/core/modules/field/src/Entity/FieldConfig.php
+++ b/core/modules/field/src/Entity/FieldConfig.php
@@ -7,7 +7,7 @@
namespace Drupal\field\Entity;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Field\FieldConfigBase;
use Drupal\Core\Field\FieldException;
@@ -96,12 +96,12 @@ public function __construct(array $values, $entity_type = 'field_config') {
throw new FieldException('Attempt to create a field without a field_name.');
}
if (empty($values['entity_type'])) {
- throw new FieldException(String::format('Attempt to create a field @field_name without an entity_type.', array('@field_name' => $values['field_name'])));
+ throw new FieldException(SafeMarkup::format('Attempt to create a field @field_name without an entity_type.', array('@field_name' => $values['field_name'])));
}
}
// 'bundle' is required in either case.
if (empty($values['bundle'])) {
- throw new FieldException(String::format('Attempt to create a field @field_name without a bundle.', array('@field_name' => $values['field_name'])));
+ throw new FieldException(SafeMarkup::format('Attempt to create a field @field_name without a bundle.', array('@field_name' => $values['field_name'])));
}
parent::__construct($values, $entity_type);
@@ -274,9 +274,9 @@ public function getFieldStorageDefinition() {
if (!$this->fieldStorage) {
$fields = $this->entityManager()->getFieldStorageDefinitions($this->entity_type);
if (!isset($fields[$this->field_name])) {
- throw new FieldException(String::format('Attempt to create a field @field_name that does not exist on entity type @entity_type.', array('@field_name' => $this->field_name, '@entity_type' => $this->entity_type))); }
+ throw new FieldException(SafeMarkup::format('Attempt to create a field @field_name that does not exist on entity type @entity_type.', array('@field_name' => $this->field_name, '@entity_type' => $this->entity_type))); }
if (!$fields[$this->field_name] instanceof FieldStorageConfigInterface) {
- throw new FieldException(String::format('Attempt to create a configurable field of non-configurable field storage @field_name.', array('@field_name' => $this->field_name, '@entity_type' => $this->entity_type)));
+ throw new FieldException(SafeMarkup::format('Attempt to create a configurable field of non-configurable field storage @field_name.', array('@field_name' => $this->field_name, '@entity_type' => $this->entity_type)));
}
$this->fieldStorage = $fields[$this->field_name];
}
diff --git a/core/modules/field/src/Entity/FieldStorageConfig.php b/core/modules/field/src/Entity/FieldStorageConfig.php
index fd3bd14555fd..1c0d5bd74d5b 100644
--- a/core/modules/field/src/Entity/FieldStorageConfig.php
+++ b/core/modules/field/src/Entity/FieldStorageConfig.php
@@ -7,7 +7,7 @@
namespace Drupal\field\Entity;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\EntityStorageInterface;
@@ -229,13 +229,13 @@ public function __construct(array $values, $entity_type = 'field_storage_config'
throw new FieldException('Attempt to create a field storage without a field name.');
}
if (!preg_match('/^[_a-z]+[_a-z0-9]*$/', $values['field_name'])) {
- throw new FieldException(String::format('Attempt to create a field storage @field_name with invalid characters. Only lowercase alphanumeric characters and underscores are allowed, and only lowercase letters and underscore are allowed as the first character', array('@field_name' => $values['field_name'])));
+ throw new FieldException(SafeMarkup::format('Attempt to create a field storage @field_name with invalid characters. Only lowercase alphanumeric characters and underscores are allowed, and only lowercase letters and underscore are allowed as the first character', array('@field_name' => $values['field_name'])));
}
if (empty($values['type'])) {
- throw new FieldException(String::format('Attempt to create a field storage @field_name with no type.', array('@field_name' => $values['field_name'])));
+ throw new FieldException(SafeMarkup::format('Attempt to create a field storage @field_name with no type.', array('@field_name' => $values['field_name'])));
}
if (empty($values['entity_type'])) {
- throw new FieldException(String::format('Attempt to create a field storage @field_name with no entity_type.', array('@field_name' => $values['field_name'])));
+ throw new FieldException(SafeMarkup::format('Attempt to create a field storage @field_name with no entity_type.', array('@field_name' => $values['field_name'])));
}
parent::__construct($values, $entity_type);
@@ -296,7 +296,7 @@ protected function preSaveNew(EntityStorageInterface $storage) {
// We use Unicode::strlen() because the DB layer assumes that column widths
// are given in characters rather than bytes.
if (Unicode::strlen($this->getName()) > static::NAME_MAX_LENGTH) {
- throw new FieldException(String::format(
+ throw new FieldException(SafeMarkup::format(
'Attempt to create a field storage with an name longer than @max characters: %name', array(
'@max' => static::NAME_MAX_LENGTH,
'%name' => $this->getName(),
@@ -307,13 +307,13 @@ protected function preSaveNew(EntityStorageInterface $storage) {
// Disallow reserved field names.
$disallowed_field_names = array_keys($entity_manager->getBaseFieldDefinitions($this->getTargetEntityTypeId()));
if (in_array($this->getName(), $disallowed_field_names)) {
- throw new FieldException(String::format('Attempt to create field storage %name which is reserved by entity type %type.', array('%name' => $this->getName(), '%type' => $this->getTargetEntityTypeId())));
+ throw new FieldException(SafeMarkup::format('Attempt to create field storage %name which is reserved by entity type %type.', array('%name' => $this->getName(), '%type' => $this->getTargetEntityTypeId())));
}
// Check that the field type is known.
$field_type = $field_type_manager->getDefinition($this->getType(), FALSE);
if (!$field_type) {
- throw new FieldException(String::format('Attempt to create a field storage of unknown type %type.', array('%type' => $this->getType())));
+ throw new FieldException(SafeMarkup::format('Attempt to create a field storage of unknown type %type.', array('%type' => $this->getType())));
}
$this->module = $field_type['provider'];
diff --git a/core/modules/field/src/Tests/Boolean/BooleanFormatterSettingsTest.php b/core/modules/field/src/Tests/Boolean/BooleanFormatterSettingsTest.php
index 5152a185ef62..7007e020f714 100644
--- a/core/modules/field/src/Tests/Boolean/BooleanFormatterSettingsTest.php
+++ b/core/modules/field/src/Tests/Boolean/BooleanFormatterSettingsTest.php
@@ -8,7 +8,7 @@
namespace Drupal\field\Tests\Boolean;
use Drupal\Component\Utility\Unicode;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
use Drupal\Core\Entity\FieldableEntityInterface;
use Drupal\field\Entity\FieldConfig;
@@ -125,7 +125,7 @@ function testBooleanFormatterSettings() {
foreach ($options as $string) {
$this->assertText($string);
}
- $this->assertText(String::format($default, array('@on' => $values[0], '@off' => $values[1])));
+ $this->assertText(SafeMarkup::format($default, array('@on' => $values[0], '@off' => $values[1])));
}
}
diff --git a/core/modules/field/src/Tests/FieldImportDeleteTest.php b/core/modules/field/src/Tests/FieldImportDeleteTest.php
index 04eaecc4c7d7..721d52ba0fe6 100644
--- a/core/modules/field/src/Tests/FieldImportDeleteTest.php
+++ b/core/modules/field/src/Tests/FieldImportDeleteTest.php
@@ -7,7 +7,7 @@
namespace Drupal\field\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig;
@@ -65,11 +65,11 @@ public function testImportDelete() {
$active = $this->container->get('config.storage');
$staging = $this->container->get('config.storage.staging');
$this->copyConfig($active, $staging);
- $this->assertTrue($staging->delete($field_storage_config_name), String::format('Deleted field storage: !field_storage', array('!field_storage' => $field_storage_config_name)));
- $this->assertTrue($staging->delete($field_storage_config_name_2), String::format('Deleted field storage: !field_storage', array('!field_storage' => $field_storage_config_name_2)));
- $this->assertTrue($staging->delete($field_config_name), String::format('Deleted field: !field', array('!field' => $field_config_name)));
- $this->assertTrue($staging->delete($field_config_name_2a), String::format('Deleted field: !field', array('!field' => $field_config_name_2a)));
- $this->assertTrue($staging->delete($field_config_name_2b), String::format('Deleted field: !field', array('!field' => $field_config_name_2b)));
+ $this->assertTrue($staging->delete($field_storage_config_name), SafeMarkup::format('Deleted field storage: !field_storage', array('!field_storage' => $field_storage_config_name)));
+ $this->assertTrue($staging->delete($field_storage_config_name_2), SafeMarkup::format('Deleted field storage: !field_storage', array('!field_storage' => $field_storage_config_name_2)));
+ $this->assertTrue($staging->delete($field_config_name), SafeMarkup::format('Deleted field: !field', array('!field' => $field_config_name)));
+ $this->assertTrue($staging->delete($field_config_name_2a), SafeMarkup::format('Deleted field: !field', array('!field' => $field_config_name_2a)));
+ $this->assertTrue($staging->delete($field_config_name_2b), SafeMarkup::format('Deleted field: !field', array('!field' => $field_config_name_2b)));
$deletes = $this->configImporter()->getUnprocessedConfiguration('delete');
$this->assertEqual(count($deletes), 5, 'Importing configuration will delete 3 fields and 2 field storages.');
diff --git a/core/modules/field/src/Tests/FieldTypePluginManagerTest.php b/core/modules/field/src/Tests/FieldTypePluginManagerTest.php
index 758b2f566a23..68e09d836a03 100644
--- a/core/modules/field/src/Tests/FieldTypePluginManagerTest.php
+++ b/core/modules/field/src/Tests/FieldTypePluginManagerTest.php
@@ -7,7 +7,7 @@
namespace Drupal\field\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Field\BaseFieldDefinition;
use Drupal\entity_test\Entity\EntityTest;
@@ -52,8 +52,8 @@ public function testCreateInstance() {
$instance = $field_type_manager->createInstance($type, $configuration);
- $this->assertTrue($instance instanceof $class, String::format('Created a @class instance', array('@class' => $class)));
- $this->assertEqual($field_name, $instance->getName(), String::format('Instance name is @name', array('@name' => $field_name)));
+ $this->assertTrue($instance instanceof $class, SafeMarkup::format('Created a @class instance', array('@class' => $class)));
+ $this->assertEqual($field_name, $instance->getName(), SafeMarkup::format('Instance name is @name', array('@name' => $field_name)));
}
}
@@ -83,8 +83,8 @@ public function testCreateInstanceWithConfig() {
$instance = $field_type_manager->createInstance($type, $configuration);
- $this->assertTrue($instance instanceof $class, String::format('Created a @class instance', array('@class' => $class)));
- $this->assertEqual($field_name, $instance->getName(), String::format('Instance name is @name', array('@name' => $field_name)));
+ $this->assertTrue($instance instanceof $class, SafeMarkup::format('Created a @class instance', array('@class' => $class)));
+ $this->assertEqual($field_name, $instance->getName(), SafeMarkup::format('Instance name is @name', array('@name' => $field_name)));
$this->assertEqual($instance->getFieldDefinition()->getLabel(), 'Jenny', 'Instance label is Jenny');
$this->assertEqual($instance->getFieldDefinition()->getDefaultValue($entity), [['value' => 8675309]], 'Instance default_value is 8675309');
}
diff --git a/core/modules/field/src/Tests/FormTest.php b/core/modules/field/src/Tests/FormTest.php
index e8b1323c4c56..ce370601110e 100644
--- a/core/modules/field/src/Tests/FormTest.php
+++ b/core/modules/field/src/Tests/FormTest.php
@@ -7,7 +7,7 @@
namespace Drupal\field\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\Core\Form\FormState;
@@ -103,7 +103,7 @@ function testFieldFormSingle() {
$this->drupalGet('entity_test/add');
// Create token value expected for description.
- $token_description = String::checkPlain($this->config('system.site')->get('name')) . '_description';
+ $token_description = SafeMarkup::checkPlain($this->config('system.site')->get('name')) . '_description';
$this->assertText($token_description, 'Token replacement for description is displayed');
$this->assertFieldByName("{$field_name}[0][value]", '', 'Widget is displayed');
$this->assertNoField("{$field_name}[1][value]", 'No extraneous widget is displayed');
diff --git a/core/modules/field/src/Tests/String/RawStringFormatterTest.php b/core/modules/field/src/Tests/String/RawStringFormatterTest.php
index bfaad92acd25..020a2e386e5b 100644
--- a/core/modules/field/src/Tests/String/RawStringFormatterTest.php
+++ b/core/modules/field/src/Tests/String/RawStringFormatterTest.php
@@ -7,7 +7,7 @@
namespace Drupal\field\Tests\String;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
use Drupal\Core\Entity\FieldableEntityInterface;
@@ -119,7 +119,7 @@ public function testStringFormatter() {
// Verify that all HTML is escaped and newlines are retained.
$this->renderEntityFields($entity, $this->display);
$this->assertNoRaw($value);
- $this->assertRaw(nl2br(String::checkPlain($value)));
+ $this->assertRaw(nl2br(SafeMarkup::checkPlain($value)));
// Verify the cache tags.
$build = $entity->{$this->fieldName}->view();
diff --git a/core/modules/field/src/Tests/String/StringFormatterTest.php b/core/modules/field/src/Tests/String/StringFormatterTest.php
index bc231481d0d6..78d3fe145678 100644
--- a/core/modules/field/src/Tests/String/StringFormatterTest.php
+++ b/core/modules/field/src/Tests/String/StringFormatterTest.php
@@ -7,7 +7,7 @@
namespace Drupal\field\Tests\String;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
use Drupal\Core\Entity\FieldableEntityInterface;
@@ -119,7 +119,7 @@ public function testStringFormatter() {
// Verify that all HTML is escaped and newlines are retained.
$this->renderEntityFields($entity, $this->display);
$this->assertNoRaw($value);
- $this->assertRaw(nl2br(String::checkPlain($value)));
+ $this->assertRaw(nl2br(SafeMarkup::checkPlain($value)));
// Verify the cache tags.
$build = $entity->{$this->fieldName}->view();
diff --git a/core/modules/field_ui/src/FieldConfigListBuilder.php b/core/modules/field_ui/src/FieldConfigListBuilder.php
index e44bc69395ff..fe59dd603a9e 100644
--- a/core/modules/field_ui/src/FieldConfigListBuilder.php
+++ b/core/modules/field_ui/src/FieldConfigListBuilder.php
@@ -8,7 +8,7 @@
namespace Drupal\field_ui;
use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityManagerInterface;
@@ -133,7 +133,7 @@ public function buildRow(EntityInterface $field_config) {
$row = array(
'id' => Html::getClass($field_config->getName()),
'data' => array(
- 'label' => String::checkPlain($field_config->getLabel()),
+ 'label' => SafeMarkup::checkPlain($field_config->getLabel()),
'field_name' => $field_config->getName(),
'field_type' => array(
'data' => array(
diff --git a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
index 94feeffa83a5..c9821677b390 100644
--- a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
+++ b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
@@ -10,7 +10,7 @@
use Drupal\Component\Plugin\Factory\DefaultFactory;
use Drupal\Component\Plugin\PluginManagerBase;
use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityForm;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityWithPluginCollectionInterface;
@@ -290,7 +290,7 @@ protected function buildFieldRow(FieldDefinitionInterface $field_definition, arr
'defaultPlugin' => $this->getDefaultPlugin($field_definition->getType()),
),
'human_name' => array(
- '#markup' => String::checkPlain($label),
+ '#markup' => SafeMarkup::checkPlain($label),
),
'weight' => array(
'#type' => 'textfield',
diff --git a/core/modules/field_ui/src/Form/FieldEditForm.php b/core/modules/field_ui/src/Form/FieldEditForm.php
index 9abf3d5b1ed3..d092680a08c5 100644
--- a/core/modules/field_ui/src/Form/FieldEditForm.php
+++ b/core/modules/field_ui/src/Form/FieldEditForm.php
@@ -10,7 +10,7 @@
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Field\AllowedTagsXssTrait;
use Drupal\Core\Form\FormBase;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Form\FormStateInterface;
use Drupal\field\FieldConfigInterface;
use Drupal\field_ui\FieldUI;
@@ -243,7 +243,7 @@ public function delete(array &$form, FormStateInterface $form_state) {
* The label of the field.
*/
public function getTitle(FieldConfigInterface $field_config) {
- return String::checkPlain($field_config->label());
+ return SafeMarkup::checkPlain($field_config->label());
}
}
diff --git a/core/modules/field_ui/src/Tests/ManageFieldsTest.php b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
index 0db2dd5f73cd..befc21299572 100644
--- a/core/modules/field_ui/src/Tests/ManageFieldsTest.php
+++ b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
@@ -7,7 +7,7 @@
namespace Drupal\field_ui\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\Core\Language\LanguageInterface;
use Drupal\entity_reference\Tests\EntityReferenceTestTrait;
@@ -572,10 +572,10 @@ function testHiddenFields() {
$field_types = \Drupal::service('plugin.manager.field.field_type')->getDefinitions();
foreach ($field_types as $field_type => $definition) {
if (empty($definition['no_ui'])) {
- $this->assertTrue($this->xpath('//select[@id="edit-new-storage-type"]//option[@value=:field_type]', array(':field_type' => $field_type)), String::format('Configurable field type @field_type is available.', array('@field_type' => $field_type)));
+ $this->assertTrue($this->xpath('//select[@id="edit-new-storage-type"]//option[@value=:field_type]', array(':field_type' => $field_type)), SafeMarkup::format('Configurable field type @field_type is available.', array('@field_type' => $field_type)));
}
else {
- $this->assertFalse($this->xpath('//select[@id="edit-new-storage-type"]//option[@value=:field_type]', array(':field_type' => $field_type)), String::format('Non-configurable field type @field_type is not available.', array('@field_type' => $field_type)));
+ $this->assertFalse($this->xpath('//select[@id="edit-new-storage-type"]//option[@value=:field_type]', array(':field_type' => $field_type)), SafeMarkup::format('Non-configurable field type @field_type is not available.', array('@field_type' => $field_type)));
}
}
}
diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index 0bc05845d104..9220fe7ef11e 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -6,7 +6,6 @@
*/
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Render\Element;
@@ -952,15 +951,15 @@ function file_tokens($type, $tokens, array $data = array(), array $options = arr
// Essential file data
case 'name':
- $replacements[$original] = $sanitize ? String::checkPlain($file->getFilename()) : $file->getFilename();
+ $replacements[$original] = $sanitize ? SafeMarkup::checkPlain($file->getFilename()) : $file->getFilename();
break;
case 'path':
- $replacements[$original] = $sanitize ? String::checkPlain($file->getFileUri()) : $file->getFileUri();
+ $replacements[$original] = $sanitize ? SafeMarkup::checkPlain($file->getFileUri()) : $file->getFileUri();
break;
case 'mime':
- $replacements[$original] = $sanitize ? String::checkPlain($file->getMimeType()) : $file->getMimeType();
+ $replacements[$original] = $sanitize ? SafeMarkup::checkPlain($file->getMimeType()) : $file->getMimeType();
break;
case 'size':
@@ -968,7 +967,7 @@ function file_tokens($type, $tokens, array $data = array(), array $options = arr
break;
case 'url':
- $replacements[$original] = $sanitize ? String::checkPlain(file_create_url($file->getFileUri())) : file_create_url($file->getFileUri());
+ $replacements[$original] = $sanitize ? SafeMarkup::checkPlain(file_create_url($file->getFileUri())) : file_create_url($file->getFileUri());
break;
// These tokens are default variations on the chained tokens handled below.
@@ -982,7 +981,7 @@ function file_tokens($type, $tokens, array $data = array(), array $options = arr
case 'owner':
$name = $file->getOwner()->label();
- $replacements[$original] = $sanitize ? String::checkPlain($name) : $name;
+ $replacements[$original] = $sanitize ? SafeMarkup::checkPlain($name) : $name;
break;
}
}
@@ -1227,7 +1226,7 @@ function template_preprocess_file_link(&$variables) {
}
else {
$link_text = $variables['description'];
- $options['attributes']['title'] = String::checkPlain($file_entity->getFilename());
+ $options['attributes']['title'] = SafeMarkup::checkPlain($file_entity->getFilename());
}
// Classes to add to the file field for icons.
diff --git a/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php b/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
index 1ad5a1f83138..6fe9d753cc88 100644
--- a/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
+++ b/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
@@ -7,7 +7,7 @@
namespace Drupal\file\Plugin\Field\FieldWidget;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\NestedArray;
use Drupal\Core\Field\FieldItemListInterface;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
@@ -98,7 +98,7 @@ protected function formMultipleElements(FieldItemListInterface $items, array &$f
break;
}
- $title = String::checkPlain($this->fieldDefinition->getLabel());
+ $title = SafeMarkup::checkPlain($this->fieldDefinition->getLabel());
$description = $this->fieldFilterXss($this->fieldDefinition->getDescription());
$elements = array();
diff --git a/core/modules/file/src/Plugin/views/argument/Fid.php b/core/modules/file/src/Plugin/views/argument/Fid.php
index 7548901f8c19..0015823ee88b 100644
--- a/core/modules/file/src/Plugin/views/argument/Fid.php
+++ b/core/modules/file/src/Plugin/views/argument/Fid.php
@@ -10,7 +10,7 @@
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Entity\Query\QueryFactory;
use Drupal\views\Plugin\views\argument\NumericArgument;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -81,7 +81,7 @@ public function titleQuery() {
$files = $controller->loadMultiple($fids);
$titles = array();
foreach ($files as $file) {
- $titles[] = String::checkPlain($file->getFilename());
+ $titles[] = SafeMarkup::checkPlain($file->getFilename());
}
return $titles;
}
diff --git a/core/modules/file/src/Tests/FilePrivateTest.php b/core/modules/file/src/Tests/FilePrivateTest.php
index 9c7762be92dc..996ffbb7b455 100644
--- a/core/modules/file/src/Tests/FilePrivateTest.php
+++ b/core/modules/file/src/Tests/FilePrivateTest.php
@@ -8,7 +8,7 @@
namespace Drupal\file\Tests;
use Drupal\Core\Entity\Plugin\Validation\Constraint\ReferenceAccessConstraint;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\file\Entity\File;
use Drupal\node\Entity\NodeType;
@@ -83,7 +83,7 @@ function testPrivateFile() {
$this->assertUrl('node/' . $new_node->id() .'/edit');
// Check that we got the expected constraint form error.
$constraint = new ReferenceAccessConstraint();
- $this->assertRaw(String::format($constraint->message, array('%type' => 'file', '%id' => $node_file->id())));
+ $this->assertRaw(SafeMarkup::format($constraint->message, array('%type' => 'file', '%id' => $node_file->id())));
// Attempt to reuse the existing file when creating a new node, and confirm
// that access is still denied.
$edit = array();
@@ -93,6 +93,6 @@ function testPrivateFile() {
$new_node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
$this->assertTrue(empty($new_node), 'Node was not created.');
$this->assertUrl('node/add/' . $type_name);
- $this->assertRaw(String::format($constraint->message, array('%type' => 'file', '%id' => $node_file->id())));
+ $this->assertRaw(SafeMarkup::format($constraint->message, array('%type' => 'file', '%id' => $node_file->id())));
}
}
diff --git a/core/modules/file/src/Tests/FileTokenReplaceTest.php b/core/modules/file/src/Tests/FileTokenReplaceTest.php
index bc53e68caa21..eaf2308d09af 100644
--- a/core/modules/file/src/Tests/FileTokenReplaceTest.php
+++ b/core/modules/file/src/Tests/FileTokenReplaceTest.php
@@ -7,7 +7,7 @@
namespace Drupal\file\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Generates text using placeholders for dummy content to check file token
@@ -45,16 +45,16 @@ function testFileTokenReplacement() {
// Generate and test sanitized tokens.
$tests = array();
$tests['[file:fid]'] = $file->id();
- $tests['[file:name]'] = String::checkPlain($file->getFilename());
- $tests['[file:path]'] = String::checkPlain($file->getFileUri());
- $tests['[file:mime]'] = String::checkPlain($file->getMimeType());
+ $tests['[file:name]'] = SafeMarkup::checkPlain($file->getFilename());
+ $tests['[file:path]'] = SafeMarkup::checkPlain($file->getFileUri());
+ $tests['[file:mime]'] = SafeMarkup::checkPlain($file->getMimeType());
$tests['[file:size]'] = format_size($file->getSize());
- $tests['[file:url]'] = String::checkPlain(file_create_url($file->getFileUri()));
+ $tests['[file:url]'] = SafeMarkup::checkPlain(file_create_url($file->getFileUri()));
$tests['[file:created]'] = format_date($file->getCreatedTime(), 'medium', '', NULL, $language_interface->getId());
$tests['[file:created:short]'] = format_date($file->getCreatedTime(), 'short', '', NULL, $language_interface->getId());
$tests['[file:changed]'] = format_date($file->getChangedTime(), 'medium', '', NULL, $language_interface->getId());
$tests['[file:changed:short]'] = format_date($file->getChangedTime(), 'short', '', NULL, $language_interface->getId());
- $tests['[file:owner]'] = String::checkPlain(user_format_name($this->adminUser));
+ $tests['[file:owner]'] = SafeMarkup::checkPlain(user_format_name($this->adminUser));
$tests['[file:owner:uid]'] = $file->getOwnerId();
// Test to make sure that we generated something for each token.
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 83e224ca47f5..1f85b10e2724 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -8,6 +8,7 @@
use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\Unicode;
use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Extension\Extension;
@@ -473,7 +474,7 @@ function template_preprocess_filter_tips(&$variables) {
$variables['tips'][$name] = array(
'attributes' => new Attribute(),
- 'name' => String::checkPlain($name),
+ 'name' => SafeMarkup::checkPlain($name),
'list' => $tiplist,
);
}
@@ -652,8 +653,8 @@ function _filter_url_parse_full_links($match) {
$i = 1;
$match[$i] = String::decodeEntities($match[$i]);
- $caption = String::checkPlain(_filter_url_trim($match[$i]));
- $match[$i] = String::checkPlain($match[$i]);
+ $caption = SafeMarkup::checkPlain(_filter_url_trim($match[$i]));
+ $match[$i] = SafeMarkup::checkPlain($match[$i]);
return '<a href="' . $match[$i] . '">' . $caption . '</a>';
}
@@ -667,8 +668,8 @@ function _filter_url_parse_email_links($match) {
$i = 0;
$match[$i] = String::decodeEntities($match[$i]);
- $caption = String::checkPlain(_filter_url_trim($match[$i]));
- $match[$i] = String::checkPlain($match[$i]);
+ $caption = SafeMarkup::checkPlain(_filter_url_trim($match[$i]));
+ $match[$i] = SafeMarkup::checkPlain($match[$i]);
return '<a href="mailto:' . $match[$i] . '">' . $caption . '</a>';
}
@@ -682,8 +683,8 @@ function _filter_url_parse_partial_links($match) {
$i = 1;
$match[$i] = String::decodeEntities($match[$i]);
- $caption = String::checkPlain(_filter_url_trim($match[$i]));
- $match[$i] = String::checkPlain($match[$i]);
+ $caption = SafeMarkup::checkPlain(_filter_url_trim($match[$i]));
+ $match[$i] = SafeMarkup::checkPlain($match[$i]);
return '<a href="http://' . $match[$i] . '">' . $caption . '</a>';
}
@@ -814,7 +815,7 @@ function _filter_autop($text) {
* Escapes all HTML tags, so they will be visible instead of being effective.
*/
function _filter_html_escape($text) {
- return trim(String::checkPlain($text));
+ return trim(SafeMarkup::checkPlain($text));
}
/**
diff --git a/core/modules/filter/src/FilterFormatFormBase.php b/core/modules/filter/src/FilterFormatFormBase.php
index c37027903d56..cbc68d61a1e7 100644
--- a/core/modules/filter/src/FilterFormatFormBase.php
+++ b/core/modules/filter/src/FilterFormatFormBase.php
@@ -79,7 +79,7 @@ public function form(array $form, FormStateInterface $form_state) {
$form['roles'] = array(
'#type' => 'checkboxes',
'#title' => $this->t('Roles'),
- '#options' => array_map('\Drupal\Component\Utility\String::checkPlain', user_role_names()),
+ '#options' => array_map('\Drupal\Component\Utility\SafeMarkup::checkPlain', user_role_names()),
'#disabled' => $is_fallback,
'#weight' => -10,
);
diff --git a/core/modules/filter/src/FilterFormatListBuilder.php b/core/modules/filter/src/FilterFormatListBuilder.php
index 0003cfafdbd4..8f46cbc59691 100644
--- a/core/modules/filter/src/FilterFormatListBuilder.php
+++ b/core/modules/filter/src/FilterFormatListBuilder.php
@@ -7,7 +7,7 @@
namespace Drupal\filter;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Config\Entity\DraggableListBuilder;
use Drupal\Core\Entity\EntityInterface;
@@ -95,19 +95,19 @@ 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.
if ($entity->isFallbackFormat()) {
- $row['label'] = String::placeholder($entity->label());
+ $row['label'] = SafeMarkup::placeholder($entity->label());
$fallback_choice = $this->configFactory->get('filter.settings')->get('always_show_fallback_choice');
if ($fallback_choice) {
- $roles_markup = String::placeholder($this->t('All roles may use this format'));
+ $roles_markup = SafeMarkup::placeholder($this->t('All roles may use this format'));
}
else {
- $roles_markup = String::placeholder($this->t('This format is shown when no other formats are available'));
+ $roles_markup = SafeMarkup::placeholder($this->t('This format is shown when no other formats are available'));
}
}
else {
$row['label'] = $this->getLabel($entity);
- $roles = array_map('\Drupal\Component\Utility\String::checkPlain', filter_get_roles_by_format($entity));
+ $roles = array_map('\Drupal\Component\Utility\SafeMarkup::checkPlain', filter_get_roles_by_format($entity));
$roles_markup = $roles ? implode(', ', $roles) : $this->t('No roles may use this format');
}
diff --git a/core/modules/filter/src/FilterPermissions.php b/core/modules/filter/src/FilterPermissions.php
index 6e3fe7ba561d..ef4e69410b2d 100644
--- a/core/modules/filter/src/FilterPermissions.php
+++ b/core/modules/filter/src/FilterPermissions.php
@@ -7,7 +7,7 @@
namespace Drupal\filter;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -60,7 +60,7 @@ public function permissions() {
if ($permission = $format->getPermissionName()) {
$permissions[$permission] = [
'title' => $this->t('Use the <a href="@url">@label</a> text format', ['@url' => $format->url(), '@label' => $format->label()]),
- 'description' => String::placeholder($this->t('Warning: This permission may have security implications depending on how the text format is configured.')),
+ 'description' => SafeMarkup::placeholder($this->t('Warning: This permission may have security implications depending on how the text format is configured.')),
];
}
}
diff --git a/core/modules/filter/src/Plugin/Filter/FilterCaption.php b/core/modules/filter/src/Plugin/Filter/FilterCaption.php
index b68e6d3a9adc..ab7f3e38871b 100644
--- a/core/modules/filter/src/Plugin/Filter/FilterCaption.php
+++ b/core/modules/filter/src/Plugin/Filter/FilterCaption.php
@@ -40,7 +40,7 @@ public function process($text, $langcode) {
$xpath = new \DOMXPath($dom);
foreach ($xpath->query('//*[@data-caption]') as $node) {
// Read the data-caption attribute's value, then delete it.
- $caption = String::checkPlain($node->getAttribute('data-caption'));
+ $caption = SafeMarkup::checkPlain($node->getAttribute('data-caption'));
$node->removeAttribute('data-caption');
// Sanitize caption: decode HTML encoding, limit allowed HTML tags; only
diff --git a/core/modules/filter/src/Plugin/Filter/FilterHtml.php b/core/modules/filter/src/Plugin/Filter/FilterHtml.php
index b76933ec5b03..3df9f28db13c 100644
--- a/core/modules/filter/src/Plugin/Filter/FilterHtml.php
+++ b/core/modules/filter/src/Plugin/Filter/FilterHtml.php
@@ -7,7 +7,7 @@
namespace Drupal\filter\Plugin\Filter;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Form\FormStateInterface;
use Drupal\filter\FilterProcessResult;
use Drupal\filter\Plugin\FilterBase;
@@ -102,7 +102,7 @@ public function tips($long = FALSE) {
$output .= '<p>' . $this->t('This site allows HTML content. While learning all of HTML may feel intimidating, learning how to use a very small number of the most basic HTML "tags" is very easy. This table provides examples for each tag that is enabled on this site.') . '</p>';
$output .= '<p>' . $this->t('For more information see W3C\'s <a href="@html-specifications">HTML Specifications</a> or use your favorite search engine to find other sites that explain HTML.', array('@html-specifications' => 'http://www.w3.org/TR/html/')) . '</p>';
$tips = array(
- 'a' => array($this->t('Anchors are used to make links to other pages.'), '<a href="' . $base_url . '">' . String::checkPlain(\Drupal::config('system.site')->get('name')) . '</a>'),
+ 'a' => array($this->t('Anchors are used to make links to other pages.'), '<a href="' . $base_url . '">' . SafeMarkup::checkPlain(\Drupal::config('system.site')->get('name')) . '</a>'),
'br' => array($this->t('By default line break tags are automatically added, so use this tag to add additional ones. Use of this tag is different because it is not used with an open/close pair like all the others. Use the extra " /" inside the tag to maintain XHTML 1.0 compatibility'), $this->t('Text with <br />line break')),
'p' => array($this->t('By default paragraph tags are automatically added, so use this tag to add additional ones.'), '<p>' . $this->t('Paragraph one.') . '</p> <p>' . $this->t('Paragraph two.') . '</p>'),
'strong' => array($this->t('Strong', array(), array('context' => 'Font weight')), '<strong>' . $this->t('Strong', array(), array('context' => 'Font weight')) . '</strong>'),
@@ -144,7 +144,7 @@ public function tips($long = FALSE) {
if (!empty($tips[$tag])) {
$rows[] = array(
array('data' => $tips[$tag][0], 'class' => array('description')),
- array('data' => '<code>' . String::checkPlain($tips[$tag][1]) . '</code>', 'class' => array('type')),
+ array('data' => '<code>' . SafeMarkup::checkPlain($tips[$tag][1]) . '</code>', 'class' => array('type')),
array('data' => $tips[$tag][1], 'class' => array('get'))
);
}
@@ -175,7 +175,7 @@ public function tips($long = FALSE) {
foreach ($entities as $entity) {
$rows[] = array(
array('data' => $entity[0], 'class' => array('description')),
- array('data' => '<code>' . String::checkPlain($entity[1]) . '</code>', 'class' => array('type')),
+ array('data' => '<code>' . SafeMarkup::checkPlain($entity[1]) . '</code>', 'class' => array('type')),
array('data' => $entity[1], 'class' => array('get'))
);
}
diff --git a/core/modules/filter/src/Tests/FilterAPITest.php b/core/modules/filter/src/Tests/FilterAPITest.php
index 5935c63d2e32..a1444c9e5c54 100644
--- a/core/modules/filter/src/Tests/FilterAPITest.php
+++ b/core/modules/filter/src/Tests/FilterAPITest.php
@@ -7,8 +7,8 @@
namespace Drupal\filter\Tests;
-use Drupal\Component\Utility\String;
use Drupal\Core\Language\LanguageInterface;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Session\AnonymousUserSession;
use Drupal\Core\TypedData\OptionsProviderInterface;
use Drupal\Core\TypedData\DataDefinition;
@@ -423,7 +423,7 @@ public function testDependencyRemoval() {
$module_data = _system_rebuild_module_data();
$this->assertTrue($module_data['filter_test']->info['required'], 'The filter_test module is required.');
- $this->assertEqual($module_data['filter_test']->info['explanation'], String::format('Provides a filter plugin that is in use in the following filter formats: %formats', array('%formats' => $filter_format->label())));
+ $this->assertEqual($module_data['filter_test']->info['explanation'], SafeMarkup::format('Provides a filter plugin that is in use in the following filter formats: %formats', array('%formats' => $filter_format->label())));
// Disable the filter_test_restrict_tags_and_attributes filter plugin but
// have custom configuration so that the filter plugin is still configured
diff --git a/core/modules/filter/src/Tests/FilterAdminTest.php b/core/modules/filter/src/Tests/FilterAdminTest.php
index b964e7120776..2cd5bd1e8077 100644
--- a/core/modules/filter/src/Tests/FilterAdminTest.php
+++ b/core/modules/filter/src/Tests/FilterAdminTest.php
@@ -7,7 +7,7 @@
namespace Drupal\filter\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\simpletest\WebTestBase;
use Drupal\user\RoleInterface;
@@ -312,7 +312,7 @@ function testFilterAdmin() {
$edit['body[0][format]'] = $plain;
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
$this->drupalGet('node/' . $node->id());
- $this->assertText(String::checkPlain($text), 'The "Plain text" text format escapes all HTML tags.');
+ $this->assertText(SafeMarkup::checkPlain($text), 'The "Plain text" text format escapes all HTML tags.');
$this->config('filter.settings')
->set('always_show_fallback_choice', FALSE)
->save();
diff --git a/core/modules/filter/src/Tests/FilterFormTest.php b/core/modules/filter/src/Tests/FilterFormTest.php
index 7db7c0fcb734..f8555fdda3dd 100644
--- a/core/modules/filter/src/Tests/FilterFormTest.php
+++ b/core/modules/filter/src/Tests/FilterFormTest.php
@@ -7,7 +7,7 @@
namespace Drupal\filter\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\simpletest\WebTestBase;
/**
@@ -183,7 +183,7 @@ protected function doFilterFormTestAsNonAdmin() {
*/
protected function assertNoSelect($id) {
$select = $this->xpath('//select[@id=:id]', array(':id' => $id));
- return $this->assertFalse($select, String::format('Field @id does not exist.', array(
+ return $this->assertFalse($select, SafeMarkup::format('Field @id does not exist.', array(
'@id' => $id,
)));
}
@@ -204,7 +204,7 @@ protected function assertNoSelect($id) {
protected function assertOptions($id, array $expected_options, $selected) {
$select = $this->xpath('//select[@id=:id]', array(':id' => $id));
$select = reset($select);
- $passed = $this->assertTrue($select instanceof \SimpleXMLElement, String::format('Field @id exists.', array(
+ $passed = $this->assertTrue($select instanceof \SimpleXMLElement, SafeMarkup::format('Field @id exists.', array(
'@id' => $id,
)));
@@ -212,7 +212,7 @@ protected function assertOptions($id, array $expected_options, $selected) {
foreach ($found_options as $found_key => $found_option) {
$expected_key = array_search($found_option->attributes()->value, $expected_options);
if ($expected_key !== FALSE) {
- $this->pass(String::format('Option @option for field @id exists.', array(
+ $this->pass(SafeMarkup::format('Option @option for field @id exists.', array(
'@option' => $expected_options[$expected_key],
'@id' => $id,
)));
@@ -224,14 +224,14 @@ protected function assertOptions($id, array $expected_options, $selected) {
// Make sure that all expected options were found and that there are no
// unexpected options.
foreach ($expected_options as $expected_option) {
- $this->fail(String::format('Option @option for field @id exists.', array(
+ $this->fail(SafeMarkup::format('Option @option for field @id exists.', array(
'@option' => $expected_option,
'@id' => $id,
)));
$passed = FALSE;
}
foreach ($found_options as $found_option) {
- $this->fail(String::format('Option @option for field @id does not exist.', array(
+ $this->fail(SafeMarkup::format('Option @option for field @id does not exist.', array(
'@option' => $found_option->attributes()->value,
'@id' => $id,
)));
@@ -258,7 +258,7 @@ protected function assertRequiredSelectAndOptions($id, array $options) {
':id' => $id,
));
$select = reset($select);
- $passed = $this->assertTrue($select instanceof \SimpleXMLElement, String::format('Required field @id exists.', array(
+ $passed = $this->assertTrue($select instanceof \SimpleXMLElement, SafeMarkup::format('Required field @id exists.', array(
'@id' => $id,
)));
// A required select element has a "- Select -" option whose key is an empty
@@ -281,7 +281,7 @@ protected function assertEnabledTextarea($id) {
':id' => $id,
));
$textarea = reset($textarea);
- return $this->assertTrue($textarea instanceof \SimpleXMLElement, String::format('Enabled field @id exists.', array(
+ return $this->assertTrue($textarea instanceof \SimpleXMLElement, SafeMarkup::format('Enabled field @id exists.', array(
'@id' => $id,
)));
}
@@ -300,11 +300,11 @@ protected function assertDisabledTextarea($id) {
':id' => $id,
));
$textarea = reset($textarea);
- $passed = $this->assertTrue($textarea instanceof \SimpleXMLElement, String::format('Disabled field @id exists.', array(
+ $passed = $this->assertTrue($textarea instanceof \SimpleXMLElement, SafeMarkup::format('Disabled field @id exists.', array(
'@id' => $id,
)));
$expected = 'This field has been disabled because you do not have sufficient permissions to edit it.';
- $passed = $passed && $this->assertEqual((string) $textarea, $expected, String::format('Disabled textarea @id hides text in an inaccessible text format.', array(
+ $passed = $passed && $this->assertEqual((string) $textarea, $expected, SafeMarkup::format('Disabled textarea @id hides text in an inaccessible text format.', array(
'@id' => $id,
)));
// Make sure the text format select is not shown.
diff --git a/core/modules/filter/src/Tests/FilterUnitTest.php b/core/modules/filter/src/Tests/FilterUnitTest.php
index 2c2a5c94a5d1..31742cb8788f 100644
--- a/core/modules/filter/src/Tests/FilterUnitTest.php
+++ b/core/modules/filter/src/Tests/FilterUnitTest.php
@@ -9,6 +9,7 @@
use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\filter\FilterPluginCollection;
use Drupal\simpletest\KernelTestBase;
@@ -399,7 +400,7 @@ function testNoFollowFilter() {
/**
* Tests the HTML escaping filter.
*
- * \Drupal\Component\Utility\String::checkPlain() is not tested here.
+ * \Drupal\Component\Utility\SafeMarkup::checkPlain() is not tested here.
*/
function testHtmlEscapeFilter() {
// Get FilterHtmlEscape object.
@@ -767,10 +768,10 @@ function assertFilteredString($filter, $tests) {
)));
}
if (!$success) {
- $this->verbose('Source:<pre>' . String::checkPlain(var_export($source, TRUE)) . '</pre>'
- . '<hr />' . 'Result:<pre>' . String::checkPlain(var_export($result, TRUE)) . '</pre>'
+ $this->verbose('Source:<pre>' . SafeMarkup::checkPlain(var_export($source, TRUE)) . '</pre>'
+ . '<hr />' . 'Result:<pre>' . SafeMarkup::checkPlain(var_export($result, TRUE)) . '</pre>'
. '<hr />' . ($is_expected ? 'Expected:' : 'Not expected:')
- . '<pre>' . String::checkPlain(var_export($value, TRUE)) . '</pre>'
+ . '<pre>' . SafeMarkup::checkPlain(var_export($value, TRUE)) . '</pre>'
);
}
}
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 2cf0c537102e..4ddc77591680 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -10,7 +10,7 @@
use Drupal\Component\Utility\Xss;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Url;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Extension\Extension;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Routing\RouteMatchInterface;
@@ -446,7 +446,7 @@ function template_preprocess_forums(&$variables) {
// them is a shadow copy.
if ($variables['tid'] != $topic->forum_tid) {
$variables['topics'][$id]->moved = TRUE;
- $variables['topics'][$id]->title = String::checkPlain($topic->getTitle());
+ $variables['topics'][$id]->title = SafeMarkup::checkPlain($topic->getTitle());
$variables['topics'][$id]->message = \Drupal::l(t('This topic has been moved'), new Url('forum.page', ['taxonomy_term' => $topic->forum_tid]));
}
else {
@@ -541,7 +541,7 @@ function template_preprocess_forum_list(&$variables) {
foreach ($variables['forums'] as $id => $forum) {
$variables['forums'][$id]->description = Xss::filterAdmin($forum->description->value);
$variables['forums'][$id]->link = forum_uri($forum);
- $variables['forums'][$id]->name = String::checkPlain($forum->label());
+ $variables['forums'][$id]->name = SafeMarkup::checkPlain($forum->label());
$variables['forums'][$id]->is_container = !empty($forum->forum_container->value);
$variables['forums'][$id]->zebra = $row % 2 == 0 ? 'odd' : 'even';
$row++;
diff --git a/core/modules/help/src/Controller/HelpController.php b/core/modules/help/src/Controller/HelpController.php
index 216d2c705ba1..53c3eb85a070 100644
--- a/core/modules/help/src/Controller/HelpController.php
+++ b/core/modules/help/src/Controller/HelpController.php
@@ -12,7 +12,7 @@
use Drupal\Core\Url;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Controller routines for help routes.
@@ -119,7 +119,7 @@ public function helpPage($name) {
$build = array();
if ($this->moduleHandler()->implementsHook($name, 'help')) {
$info = system_get_info('module');
- $build['#title'] = String::checkPlain($info[$name]['name']);
+ $build['#title'] = SafeMarkup::checkPlain($info[$name]['name']);
$temp = $this->moduleHandler()->invoke($name, 'help', array("help.page.$name", $this->routeMatch));
if (empty($temp)) {
diff --git a/core/modules/image/image.admin.inc b/core/modules/image/image.admin.inc
index 4ec432f7d271..0c9860340ce3 100644
--- a/core/modules/image/image.admin.inc
+++ b/core/modules/image/image.admin.inc
@@ -6,7 +6,6 @@
*/
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
use Drupal\Core\Render\Element;
/**
@@ -21,8 +20,8 @@
function template_preprocess_image_style_preview(&$variables) {
// Style information.
$style = $variables['style'];
- $variables['style_id'] = String::checkPlain($style->id());
- $variables['style_name'] = String::checkPlain($style->label());
+ $variables['style_id'] = SafeMarkup::checkPlain($style->id());
+ $variables['style_name'] = SafeMarkup::checkPlain($style->label());
// Cache bypass token.
$variables['cache_bypass'] = REQUEST_TIME;
diff --git a/core/modules/image/src/Form/ImageEffectFormBase.php b/core/modules/image/src/Form/ImageEffectFormBase.php
index 04516bf779c2..5aaf1a6921fa 100644
--- a/core/modules/image/src/Form/ImageEffectFormBase.php
+++ b/core/modules/image/src/Form/ImageEffectFormBase.php
@@ -13,7 +13,7 @@
use Drupal\image\ConfigurableImageEffectInterface;
use Drupal\image\ImageStyleInterface;
use Drupal\Component\Plugin\Exception\PluginNotFoundException;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
@@ -61,7 +61,7 @@ public function buildForm(array $form, FormStateInterface $form_state, ImageStyl
$this->imageEffect = $this->prepareImageEffect($image_effect);
}
catch (PluginNotFoundException $e) {
- throw new NotFoundHttpException(String::format("Invalid effect id: '@id'.", array('@id' => $image_effect)));
+ throw new NotFoundHttpException(SafeMarkup::format("Invalid effect id: '@id'.", array('@id' => $image_effect)));
}
$request = $this->getRequest();
diff --git a/core/modules/image/src/Form/ImageStyleEditForm.php b/core/modules/image/src/Form/ImageStyleEditForm.php
index bc58404f0342..b07090b7c498 100644
--- a/core/modules/image/src/Form/ImageStyleEditForm.php
+++ b/core/modules/image/src/Form/ImageStyleEditForm.php
@@ -12,7 +12,7 @@
use Drupal\Core\Url;
use Drupal\image\ConfigurableImageEffectInterface;
use Drupal\image\ImageEffectManager;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -99,7 +99,7 @@ public function form(array $form, FormStateInterface $form_state) {
'#tree' => FALSE,
'data' => array(
'label' => array(
- '#markup' => String::checkPlain($effect->label()),
+ '#markup' => SafeMarkup::checkPlain($effect->label()),
),
),
);
diff --git a/core/modules/image/src/Tests/ImageAdminStylesTest.php b/core/modules/image/src/Tests/ImageAdminStylesTest.php
index 3486e495b329..6a9a9e570474 100644
--- a/core/modules/image/src/Tests/ImageAdminStylesTest.php
+++ b/core/modules/image/src/Tests/ImageAdminStylesTest.php
@@ -7,7 +7,7 @@
namespace Drupal\image\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\image\ImageStyleInterface;
use Drupal\node\Entity\Node;
@@ -148,7 +148,7 @@ function testStyle() {
$uuids[$effect->getPluginId()] = $uuid;
$effect_configuration = $effect->getConfiguration();
foreach ($effect_edits[$effect->getPluginId()] as $field => $value) {
- $this->assertEqual($value, $effect_configuration['data'][$field], String::format('The %field field in the %effect effect has the correct value of %value.', array('%field' => $field, '%effect' => $effect->getPluginId(), '%value' => $value)));
+ $this->assertEqual($value, $effect_configuration['data'][$field], SafeMarkup::format('The %field field in the %effect effect has the correct value of %value.', array('%field' => $field, '%effect' => $effect->getPluginId(), '%value' => $value)));
}
}
diff --git a/core/modules/language/language.admin.inc b/core/modules/language/language.admin.inc
index ebae05c684ce..590240a4b8f2 100644
--- a/core/modules/language/language.admin.inc
+++ b/core/modules/language/language.admin.inc
@@ -5,7 +5,7 @@
* Administration functions for language.module.
*/
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Render\Element;
use Drupal\Core\Template\Attribute;
use Drupal\Core\Url;
@@ -170,7 +170,7 @@ function template_preprocess_language_content_settings_table(&$variables) {
'data' => array(
'#prefix' => '<label>',
'#suffix' => '</label>',
- '#markup' => String::checkPlain($element[$bundle]['settings']['#label']),
+ '#markup' => SafeMarkup::checkPlain($element[$bundle]['settings']['#label']),
),
'class' => array('bundle'),
),
diff --git a/core/modules/language/src/Config/LanguageConfigCollectionNameTrait.php b/core/modules/language/src/Config/LanguageConfigCollectionNameTrait.php
index 6f7b1ad0ba67..651209ae0d58 100644
--- a/core/modules/language/src/Config/LanguageConfigCollectionNameTrait.php
+++ b/core/modules/language/src/Config/LanguageConfigCollectionNameTrait.php
@@ -7,7 +7,7 @@
namespace Drupal\language\Config;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Provides a common trait for working with language override collection names.
@@ -45,7 +45,7 @@ protected function createConfigCollectionName($langcode) {
protected function getLangcodeFromCollectionName($collection) {
preg_match('/^language\.(.*)$/', $collection, $matches);
if (!isset($matches[1])) {
- throw new \InvalidArgumentException(String::format('!collection is not a valid language override collection', array('!collection' => $collection)));
+ throw new \InvalidArgumentException(SafeMarkup::format('!collection is not a valid language override collection', array('!collection' => $collection)));
}
return $matches[1];
}
diff --git a/core/modules/language/src/Entity/ContentLanguageSettings.php b/core/modules/language/src/Entity/ContentLanguageSettings.php
index 19ca5847779c..76a8a25739c9 100644
--- a/core/modules/language/src/Entity/ContentLanguageSettings.php
+++ b/core/modules/language/src/Entity/ContentLanguageSettings.php
@@ -7,7 +7,7 @@
namespace Drupal\language\Entity;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Language\LanguageInterface;
@@ -200,7 +200,7 @@ public function calculateDependencies() {
// If the target entity type uses entities to manage its bundles then
// depend on the bundle entity.
if (!$bundle_entity = $this->entityManager()->getStorage($bundle_entity_type_id)->load($this->target_bundle)) {
- throw new \LogicException(String::format('Missing bundle entity, entity type %type, entity id %bundle.', array('%type' => $bundle_entity_type_id, '%bundle' => $this->target_bundle)));
+ throw new \LogicException(SafeMarkup::format('Missing bundle entity, entity type %type, entity id %bundle.', array('%type' => $bundle_entity_type_id, '%bundle' => $this->target_bundle)));
}
$this->addDependency('config', $bundle_entity->getConfigDependencyName());
}
diff --git a/core/modules/language/src/Form/LanguageFormBase.php b/core/modules/language/src/Form/LanguageFormBase.php
index 14f219a4c4b9..e3711eddb292 100644
--- a/core/modules/language/src/Form/LanguageFormBase.php
+++ b/core/modules/language/src/Form/LanguageFormBase.php
@@ -7,7 +7,7 @@
namespace Drupal\language\Form;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityForm;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Language\LanguageInterface;
@@ -106,7 +106,7 @@ public function validateCommon(array $form, FormStateInterface $form_state) {
'@url' => 'http://www.w3.org/International/articles/language-tags/',
)));
}
- if ($form_state->getValue('label') != String::checkPlain($form_state->getValue('label'))) {
+ if ($form_state->getValue('label') != SafeMarkup::checkPlain($form_state->getValue('label'))) {
$form_state->setErrorByName('label', $this->t('%field cannot contain any markup.', array('%field' => $form['label']['#title'])));
}
}
diff --git a/core/modules/language/src/Form/NegotiationConfigureForm.php b/core/modules/language/src/Form/NegotiationConfigureForm.php
index 5d6cc3b18995..2b049fdc8252 100644
--- a/core/modules/language/src/Form/NegotiationConfigureForm.php
+++ b/core/modules/language/src/Form/NegotiationConfigureForm.php
@@ -8,7 +8,7 @@
namespace Drupal\language\Form;
use Drupal\Core\Block\BlockManagerInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Config\ConfigFactoryInterface;
@@ -277,7 +277,7 @@ protected function configureFormTable(array &$form, $type) {
if (isset($types[$type])) {
$table_form['#language_negotiation_info'][$method_id] = $method;
- $method_name = String::checkPlain($method['name']);
+ $method_name = SafeMarkup::checkPlain($method['name']);
$table_form['weight'][$method_id] = array(
'#type' => 'weight',
diff --git a/core/modules/link/link.module b/core/modules/link/link.module
index 142f8476b582..401f63ec5be4 100644
--- a/core/modules/link/link.module
+++ b/core/modules/link/link.module
@@ -5,7 +5,7 @@
* Defines simple link field types.
*/
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Routing\RouteMatchInterface;
/**
@@ -61,7 +61,7 @@ function link_theme() {
*/
function template_preprocess_link_formatter_link_separate(&$variables) {
if (!empty($variables['title'])) {
- $variables['title'] = String::checkPlain($variables['title']);
+ $variables['title'] = SafeMarkup::checkPlain($variables['title']);
}
$variables['link'] = \Drupal::l($variables['url_title'], $variables['url']);
diff --git a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
index 9be7280eb1bd..23f18b1a6ec9 100644
--- a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
+++ b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
@@ -7,7 +7,7 @@
namespace Drupal\link\Plugin\Field\FieldFormatter;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Core\Field\FieldDefinitionInterface;
@@ -201,7 +201,7 @@ public function viewElements(FieldItemListInterface $items) {
if (!empty($settings['url_only']) && !empty($settings['url_plain'])) {
$element[$delta] = array(
- '#markup' => String::checkPlain($link_title),
+ '#markup' => SafeMarkup::checkPlain($link_title),
);
if (!empty($item->_attributes)) {
diff --git a/core/modules/link/src/Tests/LinkFieldTest.php b/core/modules/link/src/Tests/LinkFieldTest.php
index 419fade22767..735938d41573 100644
--- a/core/modules/link/src/Tests/LinkFieldTest.php
+++ b/core/modules/link/src/Tests/LinkFieldTest.php
@@ -7,7 +7,7 @@
namespace Drupal\link\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Url;
use Drupal\link\LinkItemInterface;
@@ -420,39 +420,39 @@ function testLinkFormatter() {
case 'trim_length':
$url = $url1;
$title = isset($new_value) ? Unicode::truncate($title1, $new_value, FALSE, TRUE) : $title1;
- $this->assertRaw('<a href="' . String::checkPlain($url) . '">' . String::checkPlain($title) . '</a>');
+ $this->assertRaw('<a href="' . SafeMarkup::checkPlain($url) . '">' . SafeMarkup::checkPlain($title) . '</a>');
$url = $url2;
$title = isset($new_value) ? Unicode::truncate($title2, $new_value, FALSE, TRUE) : $title2;
- $this->assertRaw('<a href="' . String::checkPlain($url) . '">' . String::checkPlain($title) . '</a>');
+ $this->assertRaw('<a href="' . SafeMarkup::checkPlain($url) . '">' . SafeMarkup::checkPlain($title) . '</a>');
break;
case 'rel':
$rel = isset($new_value) ? ' rel="' . $new_value . '"' : '';
- $this->assertRaw('<a href="' . String::checkPlain($url1) . '"' . $rel . '>' . String::checkPlain($title1) . '</a>');
- $this->assertRaw('<a href="' . String::checkPlain($url2) . '"' . $rel . '>' . String::checkPlain($title2) . '</a>');
+ $this->assertRaw('<a href="' . SafeMarkup::checkPlain($url1) . '"' . $rel . '>' . SafeMarkup::checkPlain($title1) . '</a>');
+ $this->assertRaw('<a href="' . SafeMarkup::checkPlain($url2) . '"' . $rel . '>' . SafeMarkup::checkPlain($title2) . '</a>');
break;
case 'target':
$target = isset($new_value) ? ' target="' . $new_value . '"' : '';
- $this->assertRaw('<a href="' . String::checkPlain($url1) . '"' . $target . '>' . String::checkPlain($title1) . '</a>');
- $this->assertRaw('<a href="' . String::checkPlain($url2) . '"' . $target . '>' . String::checkPlain($title2) . '</a>');
+ $this->assertRaw('<a href="' . SafeMarkup::checkPlain($url1) . '"' . $target . '>' . SafeMarkup::checkPlain($title1) . '</a>');
+ $this->assertRaw('<a href="' . SafeMarkup::checkPlain($url2) . '"' . $target . '>' . SafeMarkup::checkPlain($title2) . '</a>');
break;
case 'url_only':
// In this case, $new_value is an array.
if (!$new_value['url_only']) {
- $this->assertRaw('<a href="' . String::checkPlain($url1) . '">' . String::checkPlain($title1) . '</a>');
- $this->assertRaw('<a href="' . String::checkPlain($url2) . '">' . String::checkPlain($title2) . '</a>');
+ $this->assertRaw('<a href="' . SafeMarkup::checkPlain($url1) . '">' . SafeMarkup::checkPlain($title1) . '</a>');
+ $this->assertRaw('<a href="' . SafeMarkup::checkPlain($url2) . '">' . SafeMarkup::checkPlain($title2) . '</a>');
}
else {
if (empty($new_value['url_plain'])) {
- $this->assertRaw('<a href="' . String::checkPlain($url1) . '">' . String::checkPlain($url1) . '</a>');
- $this->assertRaw('<a href="' . String::checkPlain($url2) . '">' . String::checkPlain($url2) . '</a>');
+ $this->assertRaw('<a href="' . SafeMarkup::checkPlain($url1) . '">' . SafeMarkup::checkPlain($url1) . '</a>');
+ $this->assertRaw('<a href="' . SafeMarkup::checkPlain($url2) . '">' . SafeMarkup::checkPlain($url2) . '</a>');
}
else {
- $this->assertNoRaw('<a href="' . String::checkPlain($url1) . '">' . String::checkPlain($url1) . '</a>');
- $this->assertNoRaw('<a href="' . String::checkPlain($url2) . '">' . String::checkPlain($url2) . '</a>');
+ $this->assertNoRaw('<a href="' . SafeMarkup::checkPlain($url1) . '">' . SafeMarkup::checkPlain($url1) . '</a>');
+ $this->assertNoRaw('<a href="' . SafeMarkup::checkPlain($url2) . '">' . SafeMarkup::checkPlain($url2) . '</a>');
$this->assertEscaped($url1);
$this->assertEscaped($url2);
}
@@ -540,7 +540,7 @@ function testLinkSeparateFormatter() {
$url = $url1;
$url_title = isset($new_value) ? Unicode::truncate($url, $new_value, FALSE, TRUE) : $url;
$expected = '<div class="link-item">';
- $expected .= '<div class="link-url"><a href="' . String::checkPlain($url) . '">' . String::checkPlain($url_title) . '</a></div>';
+ $expected .= '<div class="link-url"><a href="' . SafeMarkup::checkPlain($url) . '">' . SafeMarkup::checkPlain($url_title) . '</a></div>';
$expected .= '</div>';
$this->assertRaw($expected);
@@ -548,22 +548,22 @@ function testLinkSeparateFormatter() {
$url_title = isset($new_value) ? Unicode::truncate($url, $new_value, FALSE, TRUE) : $url;
$title = isset($new_value) ? Unicode::truncate($title2, $new_value, FALSE, TRUE) : $title2;
$expected = '<div class="link-item">';
- $expected .= '<div class="link-title">' . String::checkPlain($title) . '</div>';
- $expected .= '<div class="link-url"><a href="' . String::checkPlain($url) . '">' . String::checkPlain($url_title) . '</a></div>';
+ $expected .= '<div class="link-title">' . SafeMarkup::checkPlain($title) . '</div>';
+ $expected .= '<div class="link-url"><a href="' . SafeMarkup::checkPlain($url) . '">' . SafeMarkup::checkPlain($url_title) . '</a></div>';
$expected .= '</div>';
$this->assertRaw($expected);
break;
case 'rel':
$rel = isset($new_value) ? ' rel="' . $new_value . '"' : '';
- $this->assertRaw('<div class="link-url"><a href="' . String::checkPlain($url1) . '"' . $rel . '>' . String::checkPlain($url1) . '</a></div>');
- $this->assertRaw('<div class="link-url"><a href="' . String::checkPlain($url2) . '"' . $rel . '>' . String::checkPlain($url2) . '</a></div>');
+ $this->assertRaw('<div class="link-url"><a href="' . SafeMarkup::checkPlain($url1) . '"' . $rel . '>' . SafeMarkup::checkPlain($url1) . '</a></div>');
+ $this->assertRaw('<div class="link-url"><a href="' . SafeMarkup::checkPlain($url2) . '"' . $rel . '>' . SafeMarkup::checkPlain($url2) . '</a></div>');
break;
case 'target':
$target = isset($new_value) ? ' target="' . $new_value . '"' : '';
- $this->assertRaw('<div class="link-url"><a href="' . String::checkPlain($url1) . '"' . $target . '>' . String::checkPlain($url1) . '</a></div>');
- $this->assertRaw('<div class="link-url"><a href="' . String::checkPlain($url2) . '"' . $target . '>' . String::checkPlain($url2) . '</a></div>');
+ $this->assertRaw('<div class="link-url"><a href="' . SafeMarkup::checkPlain($url1) . '"' . $target . '>' . SafeMarkup::checkPlain($url1) . '</a></div>');
+ $this->assertRaw('<div class="link-url"><a href="' . SafeMarkup::checkPlain($url2) . '"' . $target . '>' . SafeMarkup::checkPlain($url2) . '</a></div>');
break;
}
}
diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc
index 596df9711ebe..06807b66557c 100644
--- a/core/modules/locale/locale.pages.inc
+++ b/core/modules/locale/locale.pages.inc
@@ -6,7 +6,6 @@
*/
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
use Drupal\Core\Url;
use Drupal\Core\Render\Element;
use Drupal\locale\SourceString;
@@ -61,7 +60,7 @@ function template_preprocess_locale_translation_update_info(array &$variables) {
if ($variables['updates']) {
foreach ($variables['updates'] as $update) {
$modules[] = $update['name'];
- $releases[] = String::format('@module (@date)', array(
+ $releases[] = SafeMarkup::format('@module (@date)', array(
'@module' => $update['name'],
'@date' => format_date($update['timestamp'], 'html_date'),
));
@@ -81,7 +80,7 @@ function template_preprocess_locale_translation_update_info(array &$variables) {
if ($variables['not_found']) {
foreach ($variables['not_found'] as $update) {
$version = $update['version'] ? $update['version'] : t('no version');
- $releases[] = String::format('@module (@version). !info', array(
+ $releases[] = SafeMarkup::format('@module (@version). !info', array(
'@module' => $update['name'],
'@version' => $version,
'!info' => $update['info'],
diff --git a/core/modules/locale/src/Form/TranslateEditForm.php b/core/modules/locale/src/Form/TranslateEditForm.php
index e85a09ebcd23..9a16fb7bfd2e 100644
--- a/core/modules/locale/src/Form/TranslateEditForm.php
+++ b/core/modules/locale/src/Form/TranslateEditForm.php
@@ -7,7 +7,7 @@
namespace Drupal\locale\Form;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Render\Element;
use Drupal\locale\SourceString;
@@ -73,7 +73,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
'#type' => 'item',
'#title' => $this->t('Source string (@language)', array('@language' => $this->t('Built-in English'))),
'#title_display' => 'invisible',
- '#markup' => '<span lang="en">' . String::checkPlain($source_array[0]) . '</span>',
+ '#markup' => '<span lang="en">' . SafeMarkup::checkPlain($source_array[0]) . '</span>',
);
}
else {
@@ -82,13 +82,13 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$original_singular = [
'#type' => 'item',
'#title' => $this->t('Singular form'),
- '#markup' => '<span lang="en">' . String::checkPlain($source_array[0]) . '</span>',
+ '#markup' => '<span lang="en">' . SafeMarkup::checkPlain($source_array[0]) . '</span>',
'#prefix' => '<span class="visually-hidden">' . $this->t('Source string (@language)', array('@language' => $this->t('Built-in English'))) . '</span>',
];
$original_plural = [
'#type' => 'item',
'#title' => $this->t('Plural form'),
- '#markup' => '<span lang="en">' . String::checkPlain($source_array[1]) . '</span>',
+ '#markup' => '<span lang="en">' . SafeMarkup::checkPlain($source_array[1]) . '</span>',
];
$form['strings'][$string->lid]['original'] = [
$original_singular,
diff --git a/core/modules/locale/src/Form/TranslationStatusForm.php b/core/modules/locale/src/Form/TranslationStatusForm.php
index ee0702990a3d..c8338cd51080 100644
--- a/core/modules/locale/src/Form/TranslationStatusForm.php
+++ b/core/modules/locale/src/Form/TranslationStatusForm.php
@@ -7,7 +7,7 @@
namespace Drupal\locale\Form;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
@@ -82,7 +82,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
// Build data options for the select table.
foreach ($updates as $langcode => $update) {
- $title = String::checkPlain($languages[$langcode]->getName());
+ $title = SafeMarkup::checkPlain($languages[$langcode]->getName());
$locale_translation_update_info = array('#theme' => 'locale_translation_update_info');
foreach (array('updates', 'not_found') as $update_status) {
if (isset($update[$update_status])) {
diff --git a/core/modules/locale/src/StringBase.php b/core/modules/locale/src/StringBase.php
index f6cfffd20a6a..4b18d5a373f0 100644
--- a/core/modules/locale/src/StringBase.php
+++ b/core/modules/locale/src/StringBase.php
@@ -7,7 +7,7 @@
namespace Drupal\locale;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Defines the locale string base class.
@@ -190,7 +190,7 @@ public function save() {
$storage->save($this);
}
else {
- throw new StringStorageException(String::format('The string cannot be saved because its not bound to a storage: @string', array(
+ throw new StringStorageException(SafeMarkup::format('The string cannot be saved because its not bound to a storage: @string', array(
'@string' => $this->getString(),
)));
}
@@ -206,7 +206,7 @@ public function delete() {
$storage->delete($this);
}
else {
- throw new StringStorageException(String::format('The string cannot be deleted because its not bound to a storage: @string', array(
+ throw new StringStorageException(SafeMarkup::format('The string cannot be deleted because its not bound to a storage: @string', array(
'@string' => $this->getString(),
)));
}
diff --git a/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php b/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php
index e8b94129a962..1436527b0da0 100644
--- a/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php
+++ b/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php
@@ -9,7 +9,7 @@
use Drupal\Core\Language\LanguageInterface;
use Drupal\simpletest\WebTestBase;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Tests parsing js files for translatable strings.
@@ -85,10 +85,10 @@ public function testFileParsing() {
$args = array('%source' => $str, '%context' => $context);
// Make sure that the string was found in the file.
- $this->assertTrue(isset($source_strings[$str]), String::format('Found source string: %source', $args));
+ $this->assertTrue(isset($source_strings[$str]), SafeMarkup::format('Found source string: %source', $args));
// Make sure that the proper context was matched.
- $message = $context ? String::format('Context for %source is %context', $args) : String::format('Context for %source is blank', $args);
+ $message = $context ? SafeMarkup::format('Context for %source is %context', $args) : SafeMarkup::format('Context for %source is blank', $args);
$this->assertTrue(isset($source_strings[$str]) && $source_strings[$str] === $context, $message);
}
diff --git a/core/modules/locale/src/Tests/LocaleTranslationUiTest.php b/core/modules/locale/src/Tests/LocaleTranslationUiTest.php
index 83a967d831a5..91e1ef067665 100644
--- a/core/modules/locale/src/Tests/LocaleTranslationUiTest.php
+++ b/core/modules/locale/src/Tests/LocaleTranslationUiTest.php
@@ -10,7 +10,7 @@
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\simpletest\WebTestBase;
use Drupal\Core\Language\LanguageInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Adds a new locale and translates its name. Checks the validation of
@@ -251,13 +251,13 @@ public function testJavaScriptTranslation() {
$locale_javascripts = \Drupal::state()->get('locale.translation.javascript') ?: array();
$js_file = 'public://' . $config->get('javascript.directory') . '/' . $langcode . '_' . $locale_javascripts[$langcode] . '.js';
- $this->assertTrue($result = file_exists($js_file), String::format('JavaScript file created: %file', array('%file' => $result ? $js_file : 'not found')));
+ $this->assertTrue($result = file_exists($js_file), SafeMarkup::format('JavaScript file created: %file', array('%file' => $result ? $js_file : 'not found')));
// Test JavaScript translation rebuilding.
file_unmanaged_delete($js_file);
- $this->assertTrue($result = !file_exists($js_file), String::format('JavaScript file deleted: %file', array('%file' => $result ? $js_file : 'found')));
+ $this->assertTrue($result = !file_exists($js_file), SafeMarkup::format('JavaScript file deleted: %file', array('%file' => $result ? $js_file : 'found')));
_locale_rebuild_js($langcode);
- $this->assertTrue($result = file_exists($js_file), String::format('JavaScript file rebuilt: %file', array('%file' => $result ? $js_file : 'not found')));
+ $this->assertTrue($result = file_exists($js_file), SafeMarkup::format('JavaScript file rebuilt: %file', array('%file' => $result ? $js_file : 'not found')));
}
/**
diff --git a/core/modules/locale/src/Tests/LocaleUpdateBase.php b/core/modules/locale/src/Tests/LocaleUpdateBase.php
index 83972214519a..584e97578d48 100644
--- a/core/modules/locale/src/Tests/LocaleUpdateBase.php
+++ b/core/modules/locale/src/Tests/LocaleUpdateBase.php
@@ -10,7 +10,7 @@
use Drupal\Core\StreamWrapper\PublicStream;
use Drupal\Core\Url;
use Drupal\simpletest\WebTestBase;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Base class for testing updates to string translations.
@@ -98,7 +98,7 @@ protected function addLanguage($langcode) {
$edit = array('predefined_langcode' => $langcode);
$this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
$this->container->get('language_manager')->reset();
- $this->assertTrue(\Drupal::languageManager()->getLanguage($langcode), String::format('Language %langcode added.', array('%langcode' => $langcode)));
+ $this->assertTrue(\Drupal::languageManager()->getLanguage($langcode), SafeMarkup::format('Language %langcode added.', array('%langcode' => $langcode)));
}
/**
diff --git a/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php b/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php
index d26a0705cc94..c0918edf1a31 100644
--- a/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php
+++ b/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php
@@ -7,7 +7,7 @@
namespace Drupal\locale\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Tests for the user interface of project interface translations.
@@ -87,7 +87,7 @@ public function testInterface() {
$this->assertRaw(t('Missing translations for: @languages. See the <a href="@updates">Available translation updates</a> page for more information.', array('@languages' => t('German'), '@updates' => \Drupal::url('locale.translate_status'))), 'Missing translations message');
$this->drupalGet('admin/reports/translations');
$this->assertText(t('Missing translations for one project'), 'No translations found');
- $this->assertText(String::format('@module (@version). !info', array('@module' => 'Locale test translate', '@version' => '1.3-dev', '!info' => t('No translation files are provided for development releases.'))), 'Release details');
+ $this->assertText(SafeMarkup::format('@module (@version). !info', array('@module' => 'Locale test translate', '@version' => '1.3-dev', '!info' => t('No translation files are provided for development releases.'))), 'Release details');
$this->assertText(t('No translation files are provided for development releases.'), 'Release info');
// Override Drupal core translation status as 'no translations found'.
@@ -112,7 +112,7 @@ public function testInterface() {
// Check if translations are available for Drupal core.
$this->drupalGet('admin/reports/translations');
$this->assertText(t('Updates for: !project', array('!project' => t('Drupal core'))), 'Translations found');
- $this->assertText(String::format('@module (@date)', array('@module' => t('Drupal core'), '@date' => format_date(REQUEST_TIME, 'html_date'))), 'Core translation update');
+ $this->assertText(SafeMarkup::format('@module (@date)', array('@module' => t('Drupal core'), '@date' => format_date(REQUEST_TIME, 'html_date'))), 'Core translation update');
$update_button = $this->xpath('//input[@type="submit"][@value="' . t('Update translations') . '"]');
$this->assertTrue($update_button, 'Update translations button');
}
diff --git a/core/modules/menu_link_content/src/Plugin/Menu/MenuLinkContent.php b/core/modules/menu_link_content/src/Plugin/Menu/MenuLinkContent.php
index 8e3433bc0e1b..05369d4e9f5a 100644
--- a/core/modules/menu_link_content/src/Plugin/Menu/MenuLinkContent.php
+++ b/core/modules/menu_link_content/src/Plugin/Menu/MenuLinkContent.php
@@ -8,7 +8,7 @@
namespace Drupal\menu_link_content\Plugin\Menu;
use Drupal\Component\Plugin\Exception\PluginException;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Language\LanguageManagerInterface;
use Drupal\Core\Menu\MenuLinkBase;
@@ -138,7 +138,7 @@ protected function getEntity() {
$entity = reset($loaded_entities);
}
if (!$entity) {
- throw new PluginException(String::format('Entity not found through the menu link plugin definition and could not fallback on UUID @uuid', array('@uuid' => $uuid)));
+ throw new PluginException(SafeMarkup::format('Entity not found through the menu link plugin definition and could not fallback on UUID @uuid', array('@uuid' => $uuid)));
}
// Clone the entity object to avoid tampering with the static cache.
$this->entity = clone $entity;
diff --git a/core/modules/menu_link_content/src/Tests/LinksTest.php b/core/modules/menu_link_content/src/Tests/LinksTest.php
index 92f18b6abaf6..b1bab8c5dbf9 100644
--- a/core/modules/menu_link_content/src/Tests/LinksTest.php
+++ b/core/modules/menu_link_content/src/Tests/LinksTest.php
@@ -7,7 +7,7 @@
namespace Drupal\menu_link_content\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\locale\TranslationString;
use Drupal\simpletest\WebTestBase;
@@ -117,7 +117,7 @@ function assertMenuLinkParents($links, $expected_hierarchy) {
$menu_link_plugin = $this->menuLinkManager->createInstance($links[$id]);
$expected_parent = isset($links[$parent]) ? $links[$parent] : '';
- $this->assertEqual($menu_link_plugin->getParent(), $expected_parent, String::format('Menu link %id has parent of %parent, expected %expected_parent.', array('%id' => $id, '%parent' => $menu_link_plugin->getParent(), '%expected_parent' => $expected_parent)));
+ $this->assertEqual($menu_link_plugin->getParent(), $expected_parent, SafeMarkup::format('Menu link %id has parent of %parent, expected %expected_parent.', array('%id' => $id, '%parent' => $menu_link_plugin->getParent(), '%expected_parent' => $expected_parent)));
}
}
diff --git a/core/modules/migrate/src/Entity/Migration.php b/core/modules/migrate/src/Entity/Migration.php
index 9e8fe4645152..42d9a7a47340 100644
--- a/core/modules/migrate/src/Entity/Migration.php
+++ b/core/modules/migrate/src/Entity/Migration.php
@@ -7,7 +7,7 @@
namespace Drupal\migrate\Entity;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\migrate\Exception\RequirementsException;
use Drupal\migrate\MigrateException;
@@ -352,7 +352,7 @@ public function checkRequirements() {
}
}
if ($missing_migrations) {
- throw new RequirementsException(String::format('Missing migrations @requirements.', ['@requirements' => implode(', ', $missing_migrations)]), ['requirements' => $missing_migrations]);
+ throw new RequirementsException(SafeMarkup::format('Missing migrations @requirements.', ['@requirements' => implode(', ', $missing_migrations)]), ['requirements' => $missing_migrations]);
}
}
diff --git a/core/modules/migrate/src/Plugin/migrate/process/Concat.php b/core/modules/migrate/src/Plugin/migrate/process/Concat.php
index 44651d2af06a..6e45e5d02347 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/Concat.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/Concat.php
@@ -7,7 +7,7 @@
namespace Drupal\migrate\Plugin\migrate\process;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\migrate\MigrateException;
use Drupal\migrate\MigrateExecutableInterface;
use Drupal\migrate\ProcessPluginBase;
@@ -34,7 +34,7 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
return implode($delimiter, $value);
}
else {
- throw new MigrateException(sprintf('%s is not an array', String::checkPlain(var_export($value, TRUE))));
+ throw new MigrateException(sprintf('%s is not an array', SafeMarkup::checkPlain(var_export($value, TRUE))));
}
}
diff --git a/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php b/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
index 36c731f8427a..203bd62dec71 100644
--- a/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
+++ b/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
@@ -7,7 +7,7 @@
namespace Drupal\Tests\migrate\Unit;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Database\Connection;
use Drupal\migrate\Entity\MigrationInterface;
use Drupal\migrate\MigrateException;
@@ -61,7 +61,7 @@ protected function getFieldSchema(array $id_definition) {
'not null' => FALSE,
);
default:
- throw new MigrateException(String::format('@type not supported', array('@type' => $id_definition['type'])));
+ throw new MigrateException(SafeMarkup::format('@type not supported', array('@type' => $id_definition['type'])));
}
}
}
diff --git a/core/modules/migrate_drupal/src/MigrationStorage.php b/core/modules/migrate_drupal/src/MigrationStorage.php
index 73826054a09e..18f9f91c20e9 100644
--- a/core/modules/migrate_drupal/src/MigrationStorage.php
+++ b/core/modules/migrate_drupal/src/MigrationStorage.php
@@ -7,7 +7,7 @@
namespace Drupal\migrate_drupal;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityStorageException;
use Drupal\migrate_drupal\Plugin\CckFieldMigrateSourceInterface;
@@ -125,7 +125,7 @@ protected function getDynamicIds(array &$dynamic_ids, array $entities) {
*/
public function save(EntityInterface $entity) {
if (strpos($entity->id(), ':') !== FALSE) {
- throw new EntityStorageException(String::format("Dynamic migration %id can't be saved", array('$%id' => $entity->id())));
+ throw new EntityStorageException(SafeMarkup::format("Dynamic migration %id can't be saved", array('$%id' => $entity->id())));
}
return parent::save($entity);
}
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/load/LoadEntity.php b/core/modules/migrate_drupal/src/Plugin/migrate/load/LoadEntity.php
index 22fec2f11910..570033a68d8b 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/load/LoadEntity.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/load/LoadEntity.php
@@ -7,7 +7,7 @@
namespace Drupal\migrate_drupal\Plugin\migrate\load;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Plugin\PluginBase;
use Drupal\migrate\Entity\MigrationInterface;
@@ -44,7 +44,7 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi
throw new MigrateException('Migrations with a load plugin using LoadEntity should have an entity as source.');
}
if ($source_plugin->bundleMigrationRequired() && empty($configuration['bundle_migration'])) {
- throw new MigrateException(String::format('Source plugin @plugin requires the bundle_migration key to be set.', array('@plugin' => $source_plugin->getPluginId())));
+ throw new MigrateException(SafeMarkup::format('Source plugin @plugin requires the bundle_migration key to be set.', array('@plugin' => $source_plugin->getPluginId())));
}
}
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
index 24b5067933a0..044dc61594ee 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
@@ -7,7 +7,7 @@
namespace Drupal\migrate_drupal\Plugin\migrate\source;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\migrate\Entity\MigrationInterface;
use Drupal\migrate\Exception\RequirementsException;
@@ -81,11 +81,11 @@ public function checkRequirements() {
if (isset($this->pluginDefinition['source_provider'])) {
if ($this->moduleExists($this->pluginDefinition['source_provider'])) {
if (isset($this->pluginDefinition['minimum_schema_version']) && !$this->getModuleSchemaVersion($this->pluginDefinition['source_provider']) < $this->pluginDefinition['minimum_schema_version']) {
- throw new RequirementsException(String::format('Required minimum schema version @minimum_schema_version', ['@minimum_schema_version' => $this->pluginDefinition['minimum_schema_version']]), ['minimum_schema_version' => $this->pluginDefinition['minimum_schema_version']]);
+ throw new RequirementsException(SafeMarkup::format('Required minimum schema version @minimum_schema_version', ['@minimum_schema_version' => $this->pluginDefinition['minimum_schema_version']]), ['minimum_schema_version' => $this->pluginDefinition['minimum_schema_version']]);
}
}
else {
- throw new RequirementsException(String::format('Missing source provider @provider', ['@provider' => $this->pluginDefinition['source_provider']]), ['source_provider' => $this->pluginDefinition['source_provider']]);
+ throw new RequirementsException(SafeMarkup::format('Missing source provider @provider', ['@provider' => $this->pluginDefinition['source_provider']]), ['source_provider' => $this->pluginDefinition['source_provider']]);
}
}
}
diff --git a/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php b/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php
index 8907986c7400..a3d24e2a9925 100644
--- a/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php
+++ b/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php
@@ -7,7 +7,7 @@
namespace Drupal\migrate_drupal\Tests\dependencies;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
@@ -62,7 +62,7 @@ public function testAggregatorMigrateDependencies() {
$executable = new MigrateExecutable($migration, $this);
$this->startCollectingMessages();
$executable->import();
- $this->assertIdentical($this->migrateMessages['error'], array(String::format('Migration @id did not meet the requirements. Missing migrations d6_aggregator_feed. requirements: d6_aggregator_feed.', array('@id' => $migration->id()))));
+ $this->assertIdentical($this->migrateMessages['error'], array(SafeMarkup::format('Migration @id did not meet the requirements. Missing migrations d6_aggregator_feed. requirements: d6_aggregator_feed.', array('@id' => $migration->id()))));
$this->collectMessages = FALSE;
}
diff --git a/core/modules/node/node.api.php b/core/modules/node/node.api.php
index ca09ecbaf876..a2d4e174f9ab 100644
--- a/core/modules/node/node.api.php
+++ b/core/modules/node/node.api.php
@@ -1,7 +1,7 @@
<?php
use Drupal\node\NodeInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Access\AccessResult;
@@ -403,7 +403,7 @@ function hook_node_update_index(\Drupal\node\NodeInterface $node, $langcode) {
$text = '';
$ratings = db_query('SELECT title, description FROM {my_ratings} WHERE nid = :nid', array(':nid' => $node->id()));
foreach ($ratings as $rating) {
- $text .= '<h2>' . String::checkPlain($rating->title) . '</h2>' . Xss::filter($rating->description);
+ $text .= '<h2>' . SafeMarkup::checkPlain($rating->title) . '</h2>' . Xss::filter($rating->description);
}
return $text;
}
diff --git a/core/modules/node/node.tokens.inc b/core/modules/node/node.tokens.inc
index 33461c91e6f9..4f4b06645d20 100644
--- a/core/modules/node/node.tokens.inc
+++ b/core/modules/node/node.tokens.inc
@@ -5,7 +5,7 @@
* Builds placeholder replacement tokens for node-related data.
*/
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Language\LanguageInterface;
/**
@@ -113,16 +113,16 @@ function node_tokens($type, $tokens, array $data = array(), array $options = arr
break;
case 'type':
- $replacements[$original] = $sanitize ? String::checkPlain($node->getType()) : $node->getType();
+ $replacements[$original] = $sanitize ? SafeMarkup::checkPlain($node->getType()) : $node->getType();
break;
case 'type-name':
$type_name = node_get_type_label($node);
- $replacements[$original] = $sanitize ? String::checkPlain($type_name) : $type_name;
+ $replacements[$original] = $sanitize ? SafeMarkup::checkPlain($type_name) : $type_name;
break;
case 'title':
- $replacements[$original] = $sanitize ? String::checkPlain($node->getTitle()) : $node->getTitle();
+ $replacements[$original] = $sanitize ? SafeMarkup::checkPlain($node->getTitle()) : $node->getTitle();
break;
case 'body':
@@ -161,7 +161,7 @@ function node_tokens($type, $tokens, array $data = array(), array $options = arr
break;
case 'langcode':
- $replacements[$original] = $sanitize ? String::checkPlain($node->language()->getId()) : $node->language()->getId();
+ $replacements[$original] = $sanitize ? SafeMarkup::checkPlain($node->language()->getId()) : $node->language()->getId();
break;
case 'url':
@@ -175,7 +175,7 @@ function node_tokens($type, $tokens, array $data = array(), array $options = arr
// Default values for the chained tokens handled below.
case 'author':
$account = $node->getOwner() ? $node->getOwner() : user_load(0);
- $replacements[$original] = $sanitize ? String::checkPlain($account->label()) : $account->label();
+ $replacements[$original] = $sanitize ? SafeMarkup::checkPlain($account->label()) : $account->label();
break;
case 'created':
diff --git a/core/modules/node/src/Controller/NodeController.php b/core/modules/node/src/Controller/NodeController.php
index f4a30eed0d44..91ba219e61cb 100644
--- a/core/modules/node/src/Controller/NodeController.php
+++ b/core/modules/node/src/Controller/NodeController.php
@@ -7,7 +7,7 @@
namespace Drupal\node\Controller;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Controller\ControllerBase;
use Drupal\Core\Datetime\DateFormatter;
@@ -185,7 +185,7 @@ public function revisionOverview(NodeInterface $node) {
$row[] = array('data' => $this->t('!date by !username', array('!date' => $node->link($this->dateFormatter->format($revision->revision_timestamp->value, 'short')), '!username' => drupal_render($username)))
. (($revision->revision_log->value != '') ? '<p class="revision-log">' . Xss::filter($revision->revision_log->value) . '</p>' : ''),
'class' => array('revision-current'));
- $row[] = array('data' => String::placeholder($this->t('current revision')), 'class' => array('revision-current'));
+ $row[] = array('data' => SafeMarkup::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 2134abe5d502..9fb0e7b7591b 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\SafeMarkup;
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 SafeMarkup::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 2e6839122de1..28b8909e593b 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\SafeMarkup;
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 SafeMarkup::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 abe8db199656..e7cb6ea99e11 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\SafeMarkup;
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 SafeMarkup::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 f2011c0244dd..8d36deee749e 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\SafeMarkup;
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'] = SafeMarkup::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 b5c4674f9a3b..6dfc669df7cb 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\SafeMarkup;
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'] = SafeMarkup::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/Plugin/Search/NodeSearch.php b/core/modules/node/src/Plugin/Search/NodeSearch.php
index 83140c19fe09..083c359493e9 100644
--- a/core/modules/node/src/Plugin/Search/NodeSearch.php
+++ b/core/modules/node/src/Plugin/Search/NodeSearch.php
@@ -8,7 +8,6 @@
namespace Drupal\node\Plugin\Search;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
use Drupal\Core\Access\AccessResult;
use Drupal\Core\Config\Config;
use Drupal\Core\Database\Connection;
@@ -321,7 +320,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' => SafeMarkup::checkPlain($this->entityManager->getStorage('node_type')->load($node->bundle())->label()),
'title' => $node->label(),
'user' => drupal_render($username),
'date' => $node->getChangedTime(),
@@ -396,7 +395,7 @@ protected function indexNode(NodeInterface $node) {
unset($build['#theme']);
$node->rendered = drupal_render($build);
- $text = '<h1>' . String::checkPlain($node->label($language->getId())) . '</h1>' . $node->rendered;
+ $text = '<h1>' . SafeMarkup::checkPlain($node->label($language->getId())) . '</h1>' . $node->rendered;
// Fetch extra data normally not visible.
$extra = $this->moduleHandler->invokeAll('node_update_index', array($node, $language->getId()));
@@ -476,7 +475,7 @@ public function searchFormAlter(array &$form, FormStateInterface $form_state) {
);
// Add node types.
- $types = array_map(array('\Drupal\Component\Utility\String', 'checkPlain'), node_type_get_names());
+ $types = array_map(array('\Drupal\Component\Utility\SafeMarkup', 'checkPlain'), node_type_get_names());
$form['advanced']['types-fieldset'] = array(
'#type' => 'fieldset',
'#title' => t('Types'),
diff --git a/core/modules/node/src/Plugin/views/argument/Nid.php b/core/modules/node/src/Plugin/views/argument/Nid.php
index 7ef1d937c054..890aaaae0bce 100644
--- a/core/modules/node/src/Plugin/views/argument/Nid.php
+++ b/core/modules/node/src/Plugin/views/argument/Nid.php
@@ -7,7 +7,7 @@
namespace Drupal\node\Plugin\views\argument;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\node\NodeStorageInterface;
use Drupal\views\Plugin\views\argument\NumericArgument;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -62,7 +62,7 @@ public function titleQuery() {
$nodes = $this->nodeStorage->loadMultiple($this->value);
foreach ($nodes as $node) {
- $titles[] = String::checkPlain($node->label());
+ $titles[] = SafeMarkup::checkPlain($node->label());
}
return $titles;
}
diff --git a/core/modules/node/src/Plugin/views/argument/Type.php b/core/modules/node/src/Plugin/views/argument/Type.php
index ec03b48f0005..00798afa3b63 100644
--- a/core/modules/node/src/Plugin/views/argument/Type.php
+++ b/core/modules/node/src/Plugin/views/argument/Type.php
@@ -7,7 +7,7 @@
namespace Drupal\node\Plugin\views\argument;
-use Drupal\Component\Utility\String as UtilityString;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\views\Plugin\views\argument\StringArgument;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -76,7 +76,7 @@ function title() {
function node_type($type_name) {
$type = $this->nodeTypeStorage->load($type_name);
$output = $type ? $type->label() : $this->t('Unknown content type');
- return UtilityString::checkPlain($output);
+ return SafeMarkup::checkPlain($output);
}
}
diff --git a/core/modules/node/src/Plugin/views/argument/Vid.php b/core/modules/node/src/Plugin/views/argument/Vid.php
index 2c93d9d8e79e..ded1ab88f55c 100644
--- a/core/modules/node/src/Plugin/views/argument/Vid.php
+++ b/core/modules/node/src/Plugin/views/argument/Vid.php
@@ -7,7 +7,7 @@
namespace Drupal\node\Plugin\views\argument;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Database\Connection;
use Drupal\views\Plugin\views\argument\NumericArgument;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -84,7 +84,7 @@ public function titleQuery() {
foreach ($results as $result) {
$nodes[$result['nid']]->set('title', $result['title']);
- $titles[] = String::checkPlain($nodes[$result['nid']]->label());
+ $titles[] = SafeMarkup::checkPlain($nodes[$result['nid']]->label());
}
return $titles;
diff --git a/core/modules/node/src/Plugin/views/row/Rss.php b/core/modules/node/src/Plugin/views/row/Rss.php
index 55d62a590059..b97bb646aeb6 100644
--- a/core/modules/node/src/Plugin/views/row/Rss.php
+++ b/core/modules/node/src/Plugin/views/row/Rss.php
@@ -8,7 +8,6 @@
namespace Drupal\node\Plugin\views\row;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\views\Plugin\views\row\RssPluginBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -79,7 +78,7 @@ public function buildOptionsForm_summary_options() {
public function summaryTitle() {
$options = $this->buildOptionsForm_summary_options();
- return String::checkPlain($options[$this->options['view_mode']]);
+ return SafeMarkup::checkPlain($options[$this->options['view_mode']]);
}
public function preRender($values) {
diff --git a/core/modules/node/src/Tests/NodeFieldAccessTest.php b/core/modules/node/src/Tests/NodeFieldAccessTest.php
index bc1ef76eb782..2b18e150b5d9 100644
--- a/core/modules/node/src/Tests/NodeFieldAccessTest.php
+++ b/core/modules/node/src/Tests/NodeFieldAccessTest.php
@@ -6,7 +6,7 @@
namespace Drupal\node\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\node\Entity\Node;
use Drupal\node\Entity\NodeType;
use Drupal\system\Tests\Entity\EntityUnitTestBase;
@@ -105,35 +105,35 @@ function testAccessToAdministrativeFields() {
// Checks on view operations.
foreach ($test_users as $account) {
$may_view = $node1->{$field}->access('view', $account);
- $this->assertTrue($may_view, String::format('Any user may view the field @name.', array('@name' => $field)));
+ $this->assertTrue($may_view, SafeMarkup::format('Any user may view the field @name.', array('@name' => $field)));
}
// Checks on edit operations.
$may_update = $node1->{$field}->access('edit', $page_creator_user);
- $this->assertFalse($may_update, String::format('Users with permission "edit own page content" is not allowed to the field @name.', array('@name' => $field)));
+ $this->assertFalse($may_update, SafeMarkup::format('Users with permission "edit own page content" is not allowed to the field @name.', array('@name' => $field)));
$may_update = $node2->{$field}->access('edit', $page_creator_user);
- $this->assertFalse($may_update, String::format('Users with permission "edit own page content" is not allowed to the field @name.', array('@name' => $field)));
+ $this->assertFalse($may_update, SafeMarkup::format('Users with permission "edit own page content" is not allowed to the field @name.', array('@name' => $field)));
$may_update = $node2->{$field}->access('edit', $page_manager_user);
- $this->assertFalse($may_update, String::format('Users with permission "edit any page content" is not allowed to the field @name.', array('@name' => $field)));
+ $this->assertFalse($may_update, SafeMarkup::format('Users with permission "edit any page content" is not allowed to the field @name.', array('@name' => $field)));
$may_update = $node1->{$field}->access('edit', $page_manager_user);
- $this->assertFalse($may_update, String::format('Users with permission "edit any page content" is not allowed to the field @name.', array('@name' => $field)));
+ $this->assertFalse($may_update, SafeMarkup::format('Users with permission "edit any page content" is not allowed to the field @name.', array('@name' => $field)));
$may_update = $node2->{$field}->access('edit', $page_unrelated_user);
- $this->assertFalse($may_update, String::format('Users not having permission "edit any page content" is not allowed to the field @name.', array('@name' => $field)));
+ $this->assertFalse($may_update, SafeMarkup::format('Users not having permission "edit any page content" is not allowed to the field @name.', array('@name' => $field)));
$may_update = $node1->{$field}->access('edit', $content_admin_user) && $node3->status->access('edit', $content_admin_user);
- $this->assertTrue($may_update, String::format('Users with permission "administer nodes" may edit @name fields on all nodes.', array('@name' => $field)));
+ $this->assertTrue($may_update, SafeMarkup::format('Users with permission "administer nodes" may edit @name fields on all nodes.', array('@name' => $field)));
}
foreach ($this->readOnlyFields as $field) {
// Check view operation.
foreach ($test_users as $account) {
$may_view = $node1->{$field}->access('view', $account);
- $this->assertTrue($may_view, String::format('Any user may view the field @name.', array('@name' => $field)));
+ $this->assertTrue($may_view, SafeMarkup::format('Any user may view the field @name.', array('@name' => $field)));
}
// Check edit operation.
foreach ($test_users as $account) {
$may_view = $node1->{$field}->access('edit', $account);
- $this->assertFalse($may_view, String::format('No user is not allowed to edit the field @name.', array('@name' => $field)));
+ $this->assertFalse($may_view, SafeMarkup::format('No user is not allowed to edit the field @name.', array('@name' => $field)));
}
}
diff --git a/core/modules/node/src/Tests/NodeTokenReplaceTest.php b/core/modules/node/src/Tests/NodeTokenReplaceTest.php
index 7431f06034cd..ffef457b3fb7 100644
--- a/core/modules/node/src/Tests/NodeTokenReplaceTest.php
+++ b/core/modules/node/src/Tests/NodeTokenReplaceTest.php
@@ -8,7 +8,7 @@
namespace Drupal\node\Tests;
use Drupal\system\Tests\System\TokenReplaceUnitTestBase;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Generates text using placeholders for dummy content to check node token
@@ -64,15 +64,15 @@ function testNodeTokenReplacement() {
$tests['[node:vid]'] = $node->getRevisionId();
$tests['[node:type]'] = 'article';
$tests['[node:type-name]'] = 'Article';
- $tests['[node:title]'] = String::checkPlain($node->getTitle());
+ $tests['[node:title]'] = SafeMarkup::checkPlain($node->getTitle());
$tests['[node:body]'] = $node->body->processed;
$tests['[node:summary]'] = $node->body->summary_processed;
- $tests['[node:langcode]'] = String::checkPlain($node->language()->getId());
+ $tests['[node:langcode]'] = SafeMarkup::checkPlain($node->language()->getId());
$tests['[node:url]'] = $node->url('canonical', $url_options);
$tests['[node:edit-url]'] = $node->url('edit-form', $url_options);
- $tests['[node:author]'] = String::checkPlain($account->getUsername());
+ $tests['[node:author]'] = SafeMarkup::checkPlain($account->getUsername());
$tests['[node:author:uid]'] = $node->getOwnerId();
- $tests['[node:author:name]'] = String::checkPlain($account->getUsername());
+ $tests['[node:author:name]'] = SafeMarkup::checkPlain($account->getUsername());
$tests['[node:created:since]'] = \Drupal::service('date.formatter')->formatInterval(REQUEST_TIME - $node->getCreatedTime(), 2, $this->interfaceLanguage->getId());
$tests['[node:changed:since]'] = \Drupal::service('date.formatter')->formatInterval(REQUEST_TIME - $node->getChangedTime(), 2, $this->interfaceLanguage->getId());
diff --git a/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php b/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php
index fa7ed6e4c946..af29bce89c4f 100644
--- a/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php
+++ b/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php
@@ -7,7 +7,7 @@
namespace Drupal\node\Tests;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Config\Entity\ConfigEntityStorage;
use Drupal\simpletest\WebTestBase;
@@ -104,7 +104,7 @@ public function testConfigurationRename() {
$this->drupalGet('admin/config/development/configuration');
foreach ($expected as $rename) {
$names = $this->configImporter()->getStorageComparer()->extractRenameNames($rename);
- $this->assertText(String::format('!source_name to !target_name', array('!source_name' => $names['old_name'], '!target_name' => $names['new_name'])));
+ $this->assertText(SafeMarkup::format('!source_name to !target_name', array('!source_name' => $names['old_name'], '!target_name' => $names['new_name'])));
// Test that the diff link is present for each renamed item.
$href = \Drupal::urlGenerator()->getPathFromRoute('config.diff', array('source_name' => $names['old_name'], 'target_name' => $names['new_name']));
$this->assertLinkByHref($href);
diff --git a/core/modules/node/src/Tests/Views/BulkFormAccessTest.php b/core/modules/node/src/Tests/Views/BulkFormAccessTest.php
index d6ea016b524b..027a66f82916 100644
--- a/core/modules/node/src/Tests/Views/BulkFormAccessTest.php
+++ b/core/modules/node/src/Tests/Views/BulkFormAccessTest.php
@@ -6,7 +6,8 @@
*/
namespace Drupal\node\Tests\Views;
-use Drupal\Component\Utility\String;
+
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\node\Entity\Node;
use Drupal\node\Entity\NodeType;
@@ -92,7 +93,7 @@ public function testNodeEditAccess() {
'action' => 'node_unpublish_action',
);
$this->drupalPostForm('test-node-bulk-form', $edit, t('Apply'));
- $this->assertRaw(String::format('No access to execute %action on the @entity_type_label %entity_label.', [
+ $this->assertRaw(SafeMarkup::format('No access to execute %action on the @entity_type_label %entity_label.', [
'%action' => 'Unpublish content',
'@entity_type_label' => 'Content',
'%entity_label' => $node->label(),
diff --git a/core/modules/options/src/Plugin/views/argument/NumberListField.php b/core/modules/options/src/Plugin/views/argument/NumberListField.php
index 007bcddaa38c..d99d86ff9dd1 100644
--- a/core/modules/options/src/Plugin/views/argument/NumberListField.php
+++ b/core/modules/options/src/Plugin/views/argument/NumberListField.php
@@ -7,7 +7,7 @@
namespace Drupal\options\Plugin\views\argument;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Field\AllowedTagsXssTrait;
use Drupal\Core\Form\FormStateInterface;
use Drupal\views\FieldAPIHandlerTrait;
@@ -84,7 +84,7 @@ public function summaryName($data) {
}
// Else, fallback to the key.
else {
- return String::checkPlain($value);
+ return SafeMarkup::checkPlain($value);
}
}
diff --git a/core/modules/options/src/Plugin/views/argument/StringListField.php b/core/modules/options/src/Plugin/views/argument/StringListField.php
index 0825bb1f5ea5..a36ef7ab6e4f 100644
--- a/core/modules/options/src/Plugin/views/argument/StringListField.php
+++ b/core/modules/options/src/Plugin/views/argument/StringListField.php
@@ -13,7 +13,7 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Plugin\views\argument\StringArgument;
-use Drupal\Component\Utility\String as StringUtility;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Argument handler for list field to show the human readable name in summary.
@@ -84,7 +84,7 @@ public function summaryName($data) {
}
// Else, fallback to the key.
else {
- return $this->caseTransform(StringUtility::checkPlain($value), $this->options['case']);
+ return $this->caseTransform(SafeMarkup::checkPlain($value), $this->options['case']);
}
}
diff --git a/core/modules/path/src/Form/EditForm.php b/core/modules/path/src/Form/EditForm.php
index 95d5e205d7f2..18863d71aa8f 100644
--- a/core/modules/path/src/Form/EditForm.php
+++ b/core/modules/path/src/Form/EditForm.php
@@ -7,7 +7,7 @@
namespace Drupal\path\Form;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
@@ -36,7 +36,7 @@ protected function buildPath($pid) {
public function buildForm(array $form, FormStateInterface $form_state, $pid = NULL) {
$form = parent::buildForm($form, $form_state, $pid);
- $form['#title'] = String::checkPlain($this->path['alias']);
+ $form['#title'] = SafeMarkup::checkPlain($this->path['alias']);
$form['pid'] = array(
'#type' => 'hidden',
'#value' => $this->path['pid'],
diff --git a/core/modules/quickedit/src/MetadataGenerator.php b/core/modules/quickedit/src/MetadataGenerator.php
index c510bf1b8150..df676d0cb653 100644
--- a/core/modules/quickedit/src/MetadataGenerator.php
+++ b/core/modules/quickedit/src/MetadataGenerator.php
@@ -8,7 +8,7 @@
namespace Drupal\quickedit;
use Drupal\Component\Plugin\PluginManagerInterface;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Field\FieldItemListInterface;
use Drupal\quickedit\Access\EditEntityFieldAccessCheckInterface;
@@ -89,7 +89,7 @@ public function generateFieldMetadata(FieldItemListInterface $items, $view_mode)
$label = $items->getFieldDefinition()->getLabel();
$editor = $this->editorManager->createInstance($editor_id);
$metadata = array(
- 'label' => String::checkPlain($label),
+ 'label' => SafeMarkup::checkPlain($label),
'access' => TRUE,
'editor' => $editor_id,
'aria' => t('Entity @type @id, field @field', array('@type' => $entity->getEntityTypeId(), '@id' => $entity->id(), '@field' => $label)),
diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module
index 50b6f36eb94a..4772d007ca9d 100644
--- a/core/modules/rdf/rdf.module
+++ b/core/modules/rdf/rdf.module
@@ -6,7 +6,6 @@
*/
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Template\Attribute;
@@ -417,7 +416,7 @@ function rdf_preprocess_username(&$variables) {
// Long usernames are truncated by template_preprocess_username(). Store the
// full name in the content attribute so it can be extracted in RDFa.
if ($variables['truncated']) {
- $variables['attributes']['content'] = String::checkPlain($variables['name_raw']);
+ $variables['attributes']['content'] = SafeMarkup::checkPlain($variables['name_raw']);
}
}
diff --git a/core/modules/responsive_image/responsive_image.module b/core/modules/responsive_image/responsive_image.module
index 5717a2a52cdf..695d2cb70e0d 100644
--- a/core/modules/responsive_image/responsive_image.module
+++ b/core/modules/responsive_image/responsive_image.module
@@ -13,7 +13,6 @@
use Drupal\Core\Url;
use Drupal\responsive_image\Entity\ResponsiveImageStyle;
use Drupal\Core\Image\ImageInterface;
-use Drupal\Component\Utility\String;
use Drupal\breakpoint\BreakpointInterface;
/**
@@ -374,7 +373,7 @@ function responsive_image_build_source_attributes(ImageInterface $image, array $
// this breakpoint should be merged into one srcset and the sizes
// attribute should be merged as well.
if (is_null($dimensions['width'])) {
- throw new \LogicException(String::format('Could not determine image width for @file using image style with ID: @image_style_name. This image style can not be used for a responsive image style mapping using the \'sizes\' attribute.', array('@file' => $image->getSource(), '@image_style_name' => $image_style_name)));
+ throw new \LogicException(SafeMarkup::format('Could not determine image width for @file using image style with ID: @image_style_name. This image style can not be used for a responsive image style mapping using the \'sizes\' attribute.', array('@file' => $image->getSource(), '@image_style_name' => $image_style_name)));
}
// Use the image width as key so we can sort the array later on.
// Images within a srcset should be sorted from small to large, since
diff --git a/core/modules/rest/src/Plugin/rest/resource/EntityResource.php b/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
index 1059bd4139ee..67dec06c4361 100644
--- a/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
+++ b/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
@@ -11,7 +11,7 @@
use Drupal\Core\Entity\EntityStorageException;
use Drupal\rest\Plugin\ResourceBase;
use Drupal\rest\ResourceResponse;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\HttpKernel\Exception\HttpException;
@@ -93,7 +93,7 @@ public function post(EntityInterface $entity = NULL) {
// and 'update', so the 'edit' operation is used here.
foreach ($entity->_restSubmittedFields as $key => $field_name) {
if (!$entity->get($field_name)->access('edit')) {
- throw new AccessDeniedHttpException(String::format('Access denied on creating field @field', array('@field' => $field_name)));
+ throw new AccessDeniedHttpException(SafeMarkup::format('Access denied on creating field @field', array('@field' => $field_name)));
}
}
@@ -146,11 +146,11 @@ public function patch(EntityInterface $original_entity, EntityInterface $entity
continue;
}
if ($field->isEmpty() && !$original_entity->get($field_name)->access('delete')) {
- throw new AccessDeniedHttpException(String::format('Access denied on deleting field @field.', array('@field' => $field_name)));
+ throw new AccessDeniedHttpException(SafeMarkup::format('Access denied on deleting field @field.', array('@field' => $field_name)));
}
$original_entity->set($field_name, $field->getValue());
if (!$original_entity->get($field_name)->access('update')) {
- throw new AccessDeniedHttpException(String::format('Access denied on updating field @field.', array('@field' => $field_name)));
+ throw new AccessDeniedHttpException(SafeMarkup::format('Access denied on updating field @field.', array('@field' => $field_name)));
}
}
diff --git a/core/modules/rest/src/Plugin/views/display/RestExport.php b/core/modules/rest/src/Plugin/views/display/RestExport.php
index 240c9de79542..70259d61930d 100644
--- a/core/modules/rest/src/Plugin/views/display/RestExport.php
+++ b/core/modules/rest/src/Plugin/views/display/RestExport.php
@@ -7,7 +7,7 @@
namespace Drupal\rest\Plugin\views\display;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\State\StateInterface;
use Drupal\Core\Routing\RouteProviderInterface;
use Drupal\views\ViewExecutable;
@@ -272,7 +272,7 @@ public function render() {
// Wrap the output in a pre tag if this is for a live preview.
if (!empty($this->view->live_preview)) {
$build['#prefix'] = '<pre>';
- $build['#markup'] = String::checkPlain($build['#markup']);
+ $build['#markup'] = SafeMarkup::checkPlain($build['#markup']);
$build['#suffix'] = '</pre>';
}
diff --git a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
index bfff89ef9065..12eb653763de 100644
--- a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
+++ b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
@@ -7,7 +7,7 @@
namespace Drupal\rest\Tests\Views;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\views\Views;
use Drupal\views\Tests\Plugin\PluginTestBase;
use Drupal\views\Tests\ViewTestData;
@@ -283,7 +283,7 @@ public function testLivePreview() {
$entities[] = $row->_entity;
}
- $expected = String::checkPlain($serializer->serialize($entities, 'json'));
+ $expected = SafeMarkup::checkPlain($serializer->serialize($entities, 'json'));
$view->live_preview = TRUE;
diff --git a/core/modules/search/search.module b/core/modules/search/search.module
index e5a51997c74e..b7b630ce5733 100644
--- a/core/modules/search/search.module
+++ b/core/modules/search/search.module
@@ -680,7 +680,7 @@ function search_excerpt($keys, $text, $langcode = NULL) {
// We didn't find any keyword matches, so just return the first part of the
// text. We also need to re-encode any HTML special characters that we
// entity-decoded above.
- return String::checkPlain(Unicode::truncate($text, 256, TRUE, TRUE));
+ return SafeMarkup::checkPlain(Unicode::truncate($text, 256, TRUE, TRUE));
}
// Sort the text ranges by starting position.
@@ -721,7 +721,7 @@ function search_excerpt($keys, $text, $langcode = NULL) {
// translated. Let translators have the … separator text as one chunk.
$ellipses = explode('!excerpt', t('… !excerpt … !excerpt …'));
$text = (isset($new_ranges[0]) ? '' : $ellipses[0]) . implode($ellipses[1], $out) . (($max_end < strlen($text) - 1) ? $ellipses[2] : '');
- $text = String::checkPlain($text);
+ $text = SafeMarkup::checkPlain($text);
// Highlight keywords. Must be done at once to prevent conflicts ('strong'
// and '<strong>').
diff --git a/core/modules/search/search.pages.inc b/core/modules/search/search.pages.inc
index ae427daee7c6..b50a6cd99e6b 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\SafeMarkup;
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'] = SafeMarkup::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'] = SafeMarkup::checkPlain($result['plugin_id']);
}
if (!empty($result['user'])) {
$info['user'] = $result['user'];
diff --git a/core/modules/search/src/Tests/SearchTestBase.php b/core/modules/search/src/Tests/SearchTestBase.php
index bac6974671c0..146982812d72 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\SafeMarkup;
/**
* 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(SafeMarkup::format('Failed to set field @name to @value', array('@name' => $name, '@value' => $value)));
}
$this->assertTrue($submit_matches, format_string('Found the @submit button', array('@submit' => $submit)));
$this->fail(format_string('Found the requested form fields at @path', array('@path' => $path)));
diff --git a/core/modules/serialization/src/Tests/EntitySerializationTest.php b/core/modules/serialization/src/Tests/EntitySerializationTest.php
index 04841a9f5691..bb305a7bd2ad 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\SafeMarkup;
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, SafeMarkup::format('Denormalized entity is an instance of @class', array('@class' => $this->entityClass)));
$this->assertIdentical($denormalized->getEntityTypeId(), $this->entity->getEntityTypeId(), 'Expected entity type found.');
$this->assertIdentical($denormalized->bundle(), $this->entity->bundle(), 'Expected entity bundle found.');
$this->assertIdentical($denormalized->uuid(), $this->entity->uuid(), 'Expected entity UUID found.');
diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index d04babe1dbaa..d57af75e3d67 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\SafeMarkup;
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' => '<div class="add-or-remove-shortcuts ' . $link_mode . '-shortcut">',
'#type' => 'link',
- '#title' => String::format('<span class="icon"></span><span class="text">@text</span>', array('@text' => $link_text)),
+ '#title' => SafeMarkup::format('<span class="icon"></span><span class="text">@text</span>', array('@text' => $link_text)),
'#url' => Url::fromRoute($route_name, $route_parameters),
'#options' => array('query' => $query),
'#suffix' => '</div>',
diff --git a/core/modules/shortcut/src/Form/SwitchShortcutSet.php b/core/modules/shortcut/src/Form/SwitchShortcutSet.php
index 53d5d8e32dfc..e7ee0e19986c 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\SafeMarkup;
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 SafeMarkup::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 bf985042bbae..f910da54be69 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\SafeMarkup;
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, SafeMarkup::format('Shortcut link %url not accessible on the page.', ['%url' => $test_path]));
}
else {
- $this->assertLink($title, 0, String::format('Shortcut link %url found on the page.', ['%url' => $test_path]));
+ $this->assertLink($title, 0, SafeMarkup::format('Shortcut link %url found on the page.', ['%url' => $test_path]));
}
}
$saved_set = ShortcutSet::load($set->id());
diff --git a/core/modules/simpletest/src/AssertContentTrait.php b/core/modules/simpletest/src/AssertContentTrait.php
index 9834417b2a89..e0eb7cee2ab3 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\SafeMarkup;
use Drupal\Component\Utility\Xss;
use Symfony\Component\CssSelector\CssSelector;
@@ -127,7 +127,7 @@ protected function parse() {
$html_dom = new \DOMDocument();
@$html_dom->loadHTML('<?xml encoding="UTF-8">' . $this->getRawContent());
if ($html_dom) {
- $this->pass(String::format('Valid HTML found on "@path"', array('@path' => $this->getUrl())), 'Browser');
+ $this->pass(SafeMarkup::format('Valid HTML found on "@path"', array('@path' => $this->getUrl())), 'Browser');
// It's much easier to work with simplexml than DOM, luckily enough
// we can just simply import our DOM tree.
$this->elements = simplexml_import_dom($html_dom);
@@ -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 : SafeMarkup::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 : SafeMarkup::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 : SafeMarkup::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 : SafeMarkup::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 = SafeMarkup::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 = SafeMarkup::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 = SafeMarkup::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(), SafeMarkup::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 = SafeMarkup::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(), SafeMarkup::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 ? SafeMarkup::format('"@text" found', array('@text' => $text)) : SafeMarkup::format('"@text" not found', array('@text' => $text));
}
return $this->assert($not_exists == (strpos($this->getTextContent(), (string) $text) === FALSE), $message, $group);
}
@@ -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 = SafeMarkup::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 = SafeMarkup::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 = SafeMarkup::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 = SafeMarkup::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 = SafeMarkup::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(
- '<hr />' . 'Result:' . '<pre>' . String::checkPlain(var_export($output, TRUE)) . '</pre>'
- . '<hr />' . 'Expected:' . '<pre>' . String::checkPlain(var_export($expected, TRUE)) . '</pre>'
+ '<hr />' . 'Result:' . '<pre>' . SafeMarkup::checkPlain(var_export($output, TRUE)) . '</pre>'
+ . '<hr />' . 'Expected:' . '<pre>' . SafeMarkup::checkPlain(var_export($expected, TRUE)) . '</pre>'
. '<hr />' . $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 = SafeMarkup::format('Found field with name @name', array(
'@name' => var_export($name, TRUE),
));
}
else {
- $message = String::format('Found field with name @name and value @value', array(
+ $message = SafeMarkup::format('Found field with name @name and value @value', array(
'@name' => var_export($name, TRUE),
'@value' => var_export($value, TRUE),
));
@@ -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 : SafeMarkup::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 : SafeMarkup::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 : SafeMarkup::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 : SafeMarkup::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 : SafeMarkup::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 : SafeMarkup::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 : SafeMarkup::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 : SafeMarkup::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 : SafeMarkup::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(SafeMarkup::format('The HTML ID %id is unique.', array('%id' => $id)), $group);
$status = FALSE;
}
$seen_ids[$id] = TRUE;
diff --git a/core/modules/simpletest/src/Form/SimpletestTestForm.php b/core/modules/simpletest/src/Form/SimpletestTestForm.php
index 03f16f511713..3c0fb2687246 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\SafeMarkup;
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' => '<div class="description">',
- '#markup' => String::checkPlain($info['description']),
+ '#markup' => SafeMarkup::checkPlain($info['description']),
'#suffix' => '</div>',
'#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 c4d94eb7ad62..bd611f482e48 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\SafeMarkup;
use Drupal\Component\Utility\Variable;
use Drupal\Core\Database\Database;
use Drupal\Core\DependencyInjection\ContainerBuilder;
@@ -458,7 +458,7 @@ protected function installEntitySchema($entity_type_id) {
$all_tables_exist = TRUE;
foreach ($tables as $table) {
if (!$db_schema->tableExists($table)) {
- $this->fail(String::format('Installed entity type table for the %entity_type entity type: %table', array(
+ $this->fail(SafeMarkup::format('Installed entity type table for the %entity_type entity type: %table', array(
'%entity_type' => $entity_type_id,
'%table' => $table,
)));
@@ -466,7 +466,7 @@ protected function installEntitySchema($entity_type_id) {
}
}
if ($all_tables_exist) {
- $this->pass(String::format('Installed entity type tables for the %entity_type entity type: %tables', array(
+ $this->pass(SafeMarkup::format('Installed entity type tables for the %entity_type entity type: %tables', array(
'%entity_type' => $entity_type_id,
'%tables' => '{' . implode('}, {', $tables) . '}',
)));
@@ -573,7 +573,7 @@ protected function render(array &$elements) {
$content = $this->container->get('renderer')->renderRoot($elements);
drupal_process_attached($elements);
$this->setRawContent($content);
- $this->verbose('<pre style="white-space: pre-wrap">' . String::checkPlain($content));
+ $this->verbose('<pre style="white-space: pre-wrap">' . SafeMarkup::checkPlain($content));
return $content;
}
diff --git a/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php
index b621140e4176..e56c40733cf9 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\SafeMarkup;
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\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -555,7 +555,7 @@ protected function getAssertionCall() {
* The value on which the assertion is to be done.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -568,7 +568,7 @@ protected function getAssertionCall() {
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertTrue($value, $message = '', $group = 'Other') {
- return $this->assert((bool) $value, $message ? $message : String::format('Value @value is TRUE.', array('@value' => var_export($value, TRUE))), $group);
+ return $this->assert((bool) $value, $message ? $message : SafeMarkup::format('Value @value is TRUE.', array('@value' => var_export($value, TRUE))), $group);
}
/**
@@ -580,7 +580,7 @@ protected function assertTrue($value, $message = '', $group = 'Other') {
* The value on which the assertion is to be done.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -593,7 +593,7 @@ protected function assertTrue($value, $message = '', $group = 'Other') {
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertFalse($value, $message = '', $group = 'Other') {
- return $this->assert(!$value, $message ? $message : String::format('Value @value is FALSE.', array('@value' => var_export($value, TRUE))), $group);
+ return $this->assert(!$value, $message ? $message : SafeMarkup::format('Value @value is FALSE.', array('@value' => var_export($value, TRUE))), $group);
}
/**
@@ -603,7 +603,7 @@ protected function assertFalse($value, $message = '', $group = 'Other') {
* The value on which the assertion is to be done.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -616,7 +616,7 @@ protected function assertFalse($value, $message = '', $group = 'Other') {
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertNull($value, $message = '', $group = 'Other') {
- return $this->assert(!isset($value), $message ? $message : String::format('Value @value is NULL.', array('@value' => var_export($value, TRUE))), $group);
+ return $this->assert(!isset($value), $message ? $message : SafeMarkup::format('Value @value is NULL.', array('@value' => var_export($value, TRUE))), $group);
}
/**
@@ -626,7 +626,7 @@ protected function assertNull($value, $message = '', $group = 'Other') {
* The value on which the assertion is to be done.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -639,7 +639,7 @@ protected function assertNull($value, $message = '', $group = 'Other') {
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertNotNull($value, $message = '', $group = 'Other') {
- return $this->assert(isset($value), $message ? $message : String::format('Value @value is not NULL.', array('@value' => var_export($value, TRUE))), $group);
+ return $this->assert(isset($value), $message ? $message : SafeMarkup::format('Value @value is not NULL.', array('@value' => var_export($value, TRUE))), $group);
}
/**
@@ -651,7 +651,7 @@ protected function assertNotNull($value, $message = '', $group = 'Other') {
* The second value to check.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -664,7 +664,7 @@ protected function assertNotNull($value, $message = '', $group = 'Other') {
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertEqual($first, $second, $message = '', $group = 'Other') {
- return $this->assert($first == $second, $message ? $message : String::format('Value @first is equal to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
+ return $this->assert($first == $second, $message ? $message : SafeMarkup::format('Value @first is equal to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
}
/**
@@ -676,7 +676,7 @@ protected function assertEqual($first, $second, $message = '', $group = 'Other')
* The second value to check.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -689,7 +689,7 @@ protected function assertEqual($first, $second, $message = '', $group = 'Other')
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertNotEqual($first, $second, $message = '', $group = 'Other') {
- return $this->assert($first != $second, $message ? $message : String::format('Value @first is not equal to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
+ return $this->assert($first != $second, $message ? $message : SafeMarkup::format('Value @first is not equal to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
}
/**
@@ -701,7 +701,7 @@ protected function assertNotEqual($first, $second, $message = '', $group = 'Othe
* The second value to check.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -714,7 +714,7 @@ protected function assertNotEqual($first, $second, $message = '', $group = 'Othe
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertIdentical($first, $second, $message = '', $group = 'Other') {
- return $this->assert($first === $second, $message ? $message : String::format('Value @first is identical to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
+ return $this->assert($first === $second, $message ? $message : SafeMarkup::format('Value @first is identical to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
}
/**
@@ -726,7 +726,7 @@ protected function assertIdentical($first, $second, $message = '', $group = 'Oth
* The second value to check.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -739,7 +739,7 @@ protected function assertIdentical($first, $second, $message = '', $group = 'Oth
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertNotIdentical($first, $second, $message = '', $group = 'Other') {
- return $this->assert($first !== $second, $message ? $message : String::format('Value @first is not identical to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
+ return $this->assert($first !== $second, $message ? $message : SafeMarkup::format('Value @first is not identical to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
}
/**
@@ -751,7 +751,7 @@ protected function assertNotIdentical($first, $second, $message = '', $group = '
* The second object to check.
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -764,7 +764,7 @@ protected function assertNotIdentical($first, $second, $message = '', $group = '
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertIdenticalObject($object1, $object2, $message = '', $group = 'Other') {
- $message = $message ?: String::format('!object1 is identical to !object2', array(
+ $message = $message ?: SafeMarkup::format('!object1 is identical to !object2', array(
'!object1' => var_export($object1, TRUE),
'!object2' => var_export($object2, TRUE),
));
@@ -795,7 +795,7 @@ protected function assertNoErrorsLogged() {
*
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -816,7 +816,7 @@ protected function pass($message = NULL, $group = 'Other') {
*
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -837,7 +837,7 @@ protected function fail($message = NULL, $group = 'Other') {
*
* @param $message
* (optional) A message to display with the assertion. Do not translate
- * messages: use \Drupal\Component\Utility\String::format() to embed
+ * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
* variables in the message text, not t(). If left blank, a default message
* will be displayed.
* @param $group
@@ -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\SafeMarkup::checkPlain().
$decoded_exception = Error::decodeException($exception);
unset($decoded_exception['backtrace']);
- $message = String::format('%type: !message in %function (line %line of %file). <pre class="backtrace">!backtrace</pre>', $decoded_exception + array(
+ $message = SafeMarkup::format('%type: !message in %function (line %line of %file). <pre class="backtrace">!backtrace</pre>', $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 220ee09bea1b..c42f3880e3f5 100644
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -13,6 +13,7 @@
use Drupal\Component\Utility\NestedArray;
use Drupal\Component\Utility\String;
use Drupal\Core\Cache\Cache;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\DependencyInjection\YamlFileLoader;
use Drupal\Core\DrupalKernel;
use Drupal\Core\Database\Database;
@@ -292,7 +293,7 @@ protected function drupalCreateContentType(array $values = array()) {
node_add_body_field($type);
\Drupal::service('router.builder')->rebuild();
- $this->assertEqual($status, SAVED_NEW, String::format('Created content type %type.', array('%type' => $type->id())));
+ $this->assertEqual($status, SAVED_NEW, SafeMarkup::format('Created content type %type.', array('%type' => $type->id())));
return $type;
}
@@ -554,7 +555,7 @@ protected function drupalCreateUser(array $permissions = array(), $name = NULL)
$account = entity_create('user', $edit);
$account->save();
- $this->assertTrue($account->id(), String::format('User created with name %name and pass %pass', array('%name' => $edit['name'], '%pass' => $edit['pass'])), 'User login');
+ $this->assertTrue($account->id(), SafeMarkup::format('User created with name %name and pass %pass', array('%name' => $edit['name'], '%pass' => $edit['pass'])), 'User login');
if (!$account->id()) {
return FALSE;
}
@@ -607,7 +608,7 @@ protected function drupalCreateRole(array $permissions, $rid = NULL, $name = NUL
}
$result = $role->save();
- $this->assertIdentical($result, SAVED_NEW, String::format('Created role ID @rid with name @name.', array(
+ $this->assertIdentical($result, SAVED_NEW, SafeMarkup::format('Created role ID @rid with name @name.', array(
'@name' => var_export($role->label(), TRUE),
'@rid' => var_export($role->id(), TRUE),
)), 'Role');
@@ -619,10 +620,10 @@ protected function drupalCreateRole(array $permissions, $rid = NULL, $name = NUL
$assigned_permissions = Role::load($role->id())->getPermissions();
$missing_permissions = array_diff($permissions, $assigned_permissions);
if (!$missing_permissions) {
- $this->pass(String::format('Created permissions: @perms', array('@perms' => implode(', ', $permissions))), 'Role');
+ $this->pass(SafeMarkup::format('Created permissions: @perms', array('@perms' => implode(', ', $permissions))), 'Role');
}
else {
- $this->fail(String::format('Failed to create permissions: @perms', array('@perms' => implode(', ', $missing_permissions))), 'Role');
+ $this->fail(SafeMarkup::format('Failed to create permissions: @perms', array('@perms' => implode(', ', $missing_permissions))), 'Role');
}
}
return $role->id();
@@ -646,7 +647,7 @@ protected function checkPermissions(array $permissions) {
$valid = TRUE;
foreach ($permissions as $permission) {
if (!in_array($permission, $available)) {
- $this->fail(String::format('Invalid permission %permission.', array('%permission' => $permission)), 'Role');
+ $this->fail(SafeMarkup::format('Invalid permission %permission.', array('%permission' => $permission)), 'Role');
$valid = FALSE;
}
}
@@ -939,7 +940,7 @@ protected function setUp() {
$modules = array_unique($modules);
try {
$success = $container->get('module_installer')->install($modules, TRUE);
- $this->assertTrue($success, String::format('Enabled modules: %modules', array('%modules' => implode(', ', $modules))));
+ $this->assertTrue($success, SafeMarkup::format('Enabled modules: %modules', array('%modules' => implode(', ', $modules))));
}
catch (\Drupal\Core\Extension\MissingDependencyException $e) {
// The exception message has all the details.
@@ -1396,7 +1397,7 @@ protected function curlExec($curl_options, $redirect = FALSE) {
'@status' => $status,
'!length' => format_size(strlen($this->getRawContent()))
);
- $message = String::format('!method @url returned @status (!length).', $message_vars);
+ $message = SafeMarkup::format('!method @url returned @status (!length).', $message_vars);
$this->assertTrue($this->getRawContent() !== FALSE, $message, 'Browser');
return $this->getRawContent();
}
@@ -1511,7 +1512,7 @@ protected function drupalGet($path, array $options = array(), array $headers = a
$verbose = 'GET request to: ' . $path .
'<hr />Ending URL: ' . $this->getUrl();
if ($this->dumpHeaders) {
- $verbose .= '<hr />Headers: <pre>' . String::checkPlain(var_export(array_map('trim', $this->headers), TRUE)) . '</pre>';
+ $verbose .= '<hr />Headers: <pre>' . SafeMarkup::checkPlain(var_export(array_map('trim', $this->headers), TRUE)) . '</pre>';
}
$verbose .= '<hr />' . $out;
@@ -1705,7 +1706,7 @@ protected function drupalPostForm($path, $edit, $submit, array $options = array(
$verbose = 'POST request to: ' . $path;
$verbose .= '<hr />Ending URL: ' . $this->getUrl();
if ($this->dumpHeaders) {
- $verbose .= '<hr />Headers: <pre>' . String::checkPlain(var_export(array_map('trim', $this->headers), TRUE)) . '</pre>';
+ $verbose .= '<hr />Headers: <pre>' . SafeMarkup::checkPlain(var_export(array_map('trim', $this->headers), TRUE)) . '</pre>';
}
$verbose .= '<hr />Fields: ' . highlight_string('<?php ' . var_export($post_array, TRUE), TRUE);
$verbose .= '<hr />' . $out;
@@ -1716,7 +1717,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(SafeMarkup::format('Failed to set field @name to @value', array('@name' => $name, '@value' => $value)));
}
if (!$ajax && isset($submit)) {
$this->assertTrue($submit_matches, format_string('Found the @submit button', array('@submit' => $submit)));
@@ -2113,7 +2114,7 @@ protected function drupalHead($path, array $options = array(), array $headers =
if ($this->dumpHeaders) {
$this->verbose('GET request to: ' . $path .
'<hr />Ending URL: ' . $this->getUrl() .
- '<hr />Headers: <pre>' . String::checkPlain(var_export(array_map('trim', $this->headers), TRUE)) . '</pre>');
+ '<hr />Headers: <pre>' . SafeMarkup::checkPlain(var_export(array_map('trim', $this->headers), TRUE)) . '</pre>');
}
return $out;
@@ -2302,10 +2303,10 @@ protected function clickLink($label, $index = 0) {
$urls = $this->xpath('//a[normalize-space()=:label]', array(':label' => $label));
if (isset($urls[$index])) {
$url_target = $this->getAbsoluteUrl($urls[$index]['href']);
- $this->pass(String::format('Clicked link %label (@url_target) from @url_before', array('%label' => $label, '@url_target' => $url_target, '@url_before' => $url_before)), 'Browser');
+ $this->pass(SafeMarkup::format('Clicked link %label (@url_target) from @url_before', array('%label' => $label, '@url_target' => $url_target, '@url_before' => $url_before)), 'Browser');
return $this->drupalGet($url_target);
}
- $this->fail(String::format('Link %label does not exist on @url_before', array('%label' => $label, '@url_before' => $url_before)), 'Browser');
+ $this->fail(SafeMarkup::format('Link %label does not exist on @url_before', array('%label' => $label, '@url_before' => $url_before)), 'Browser');
return FALSE;
}
@@ -2485,7 +2486,7 @@ protected function assertUrl($path, array $options = array(), $message = '', $gr
$url = $this->container->get('url_generator')->generateFromPath($path, $options);
}
if (!$message) {
- $message = String::format('Expected @url matches current URL (@current_url).', array(
+ $message = SafeMarkup::format('Expected @url matches current URL (@current_url).', array(
'@url' => var_export($url, TRUE),
'@current_url' => $this->getUrl(),
));
@@ -2519,7 +2520,7 @@ protected function assertUrl($path, array $options = array(), $message = '', $gr
protected function assertResponse($code, $message = '', $group = 'Browser') {
$curl_code = curl_getinfo($this->curlHandle, CURLINFO_HTTP_CODE);
$match = is_array($code) ? in_array($curl_code, $code) : $curl_code == $code;
- return $this->assertTrue($match, $message ? $message : String::format('HTTP response expected !code, actual !curl_code', array('!code' => $code, '!curl_code' => $curl_code)), $group);
+ return $this->assertTrue($match, $message ? $message : SafeMarkup::format('HTTP response expected !code, actual !curl_code', array('!code' => $code, '!curl_code' => $curl_code)), $group);
}
/**
@@ -2544,7 +2545,7 @@ protected function assertResponse($code, $message = '', $group = 'Browser') {
protected function assertNoResponse($code, $message = '', $group = 'Browser') {
$curl_code = curl_getinfo($this->curlHandle, CURLINFO_HTTP_CODE);
$match = is_array($code) ? in_array($curl_code, $code) : $curl_code == $code;
- return $this->assertFalse($match, $message ? $message : String::format('HTTP response not expected !code, actual !curl_code', array('!code' => $code, '!curl_code' => $curl_code)), $group);
+ return $this->assertFalse($match, $message ? $message : SafeMarkup::format('HTTP response not expected !code, actual !curl_code', array('!code' => $code, '!curl_code' => $curl_code)), $group);
}
/**
diff --git a/core/modules/system/form.api.php b/core/modules/system/form.api.php
index 765ce6094e42..917323111dc6 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\SafeMarkup;
/**
* @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'][] = SafeMarkup::checkPlain($node->title);
// Update our progress information.
$context['sandbox']['progress']++;
diff --git a/core/modules/system/src/Form/ModulesListForm.php b/core/modules/system/src/Form/ModulesListForm.php
index 90a6e9f71da0..eb894f625452 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\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Config\PreExistingConfigException;
use Drupal\Core\Config\UnmetDependenciesException;
@@ -169,7 +169,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 = SafeMarkup::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 51d79aa97316..93b93608d403 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\SafeMarkup;
/**
* 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(SafeMarkup::format("Invalid extension (@value) specified for the image 'convert' operation", array('@value' => $arguments['extension'])));
}
return $arguments;
}
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/CreateNew.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/CreateNew.php
index 126f53cca20a..00fecad63739 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\SafeMarkup;
/**
* 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(SafeMarkup::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(SafeMarkup::format("Invalid width (@value) specified for the image 'create_new' operation", array('@value' => $arguments['width'])));
}
if ($arguments['height'] <= 0) {
- throw new \InvalidArgumentException(String::format("Invalid height (@value) specified for the image 'create_new' operation", array('@value' => $arguments['height'])));
+ throw new \InvalidArgumentException(SafeMarkup::format("Invalid height (@value) specified for the image 'create_new' operation", array('@value' => $arguments['height'])));
}
// Assure transparent color is a valid hex string.
if ($arguments['transparent_color'] && !Color::validateHex($arguments['transparent_color'])) {
- throw new \InvalidArgumentException(String::format("Invalid transparent color (@value) specified for the image 'create_new' operation", array('@value' => $arguments['transparent_color'])));
+ throw new \InvalidArgumentException(SafeMarkup::format("Invalid transparent color (@value) specified for the image 'create_new' operation", array('@value' => $arguments['transparent_color'])));
}
return $arguments;
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Crop.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Crop.php
index fbda1ec576f4..21d59f47dedc 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\SafeMarkup;
/**
* 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(SafeMarkup::format("Invalid width (@value) specified for the image 'crop' operation", array('@value' => $arguments['width'])));
}
if ($arguments['height'] <= 0) {
- throw new \InvalidArgumentException(String::format("Invalid height (@value) specified for the image 'crop' operation", array('@value' => $arguments['height'])));
+ throw new \InvalidArgumentException(SafeMarkup::format("Invalid height (@value) specified for the image 'crop' operation", array('@value' => $arguments['height'])));
}
return $arguments;
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Resize.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Resize.php
index a5f63622b349..be72427e43a1 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\SafeMarkup;
/**
* 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(SafeMarkup::format("Invalid width (@value) specified for the image 'resize' operation", array('@value' => $arguments['width'])));
}
if ($arguments['height'] <= 0) {
- throw new \InvalidArgumentException(String::format("Invalid height (@value) specified for the image 'resize' operation", array('@value' => $arguments['height'])));
+ throw new \InvalidArgumentException(SafeMarkup::format("Invalid height (@value) specified for the image 'resize' operation", array('@value' => $arguments['height'])));
}
return $arguments;
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Scale.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Scale.php
index ee08c562ca96..875ce2326d68 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\SafeMarkup;
/**
* 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(SafeMarkup::format("Invalid width (@value) specified for the image 'scale' operation", array('@value' => $arguments['width'])));
}
if ($arguments['height'] <= 0) {
- throw new \InvalidArgumentException(String::format("Invalid height (@value) specified for the image 'scale' operation", array('@value' => $arguments['height'])));
+ throw new \InvalidArgumentException(SafeMarkup::format("Invalid height (@value) specified for the image 'scale' operation", array('@value' => $arguments['height'])));
}
return $arguments;
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/ScaleAndCrop.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/ScaleAndCrop.php
index 832c5b41f118..7d465b8d6766 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\SafeMarkup;
/**
* 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(SafeMarkup::format("Invalid width (@value) specified for the image 'scale_and_crop' operation", array('@value' => $arguments['width'])));
}
if ($arguments['height'] <= 0) {
- throw new \InvalidArgumentException(String::format("Invalid height (@value) specified for the image 'scale_and_crop' operation", array('@value' => $arguments['height'])));
+ throw new \InvalidArgumentException(SafeMarkup::format("Invalid height (@value) specified for the image 'scale_and_crop' operation", array('@value' => $arguments['height'])));
}
return $arguments;
diff --git a/core/modules/system/src/Tests/Cache/PageCacheTagsTestBase.php b/core/modules/system/src/Tests/Cache/PageCacheTagsTestBase.php
index 3e3b1bc95984..87958bf92964 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\SafeMarkup;
/**
* 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 = SafeMarkup::format('Page cache @hit_or_miss for %path.', array('@hit_or_miss' => $hit_or_miss, '%path' => $url->toString()));
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), $hit_or_miss, $message);
if ($hit_or_miss === 'HIT' && is_array($tags)) {
diff --git a/core/modules/system/src/Tests/Common/RenderElementTypesTest.php b/core/modules/system/src/Tests/Common/RenderElementTypesTest.php
index abd7925fcd49..448961873fcd 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\SafeMarkup;
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 = '<table><tr>';
- $out .= '<td valign="top"><pre>' . String::checkPlain($expected_html) . '</pre></td>';
- $out .= '<td valign="top"><pre>' . String::checkPlain($actual_html) . '</pre></td>';
+ $out .= '<td valign="top"><pre>' . SafeMarkup::checkPlain($expected_html) . '</pre></td>';
+ $out .= '<td valign="top"><pre>' . SafeMarkup::checkPlain($actual_html) . '</pre></td>';
$out .= '</tr></table>';
$this->verbose($out);
- $this->assertIdentical($actual_html, $expected_html, String::checkPlain($message));
+ $this->assertIdentical($actual_html, $expected_html, SafeMarkup::checkPlain($message));
}
/**
diff --git a/core/modules/system/src/Tests/Common/TableSortExtenderUnitTest.php b/core/modules/system/src/Tests/Common/TableSortExtenderUnitTest.php
index aa39b75a0859..001294c5f625 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\SafeMarkup;
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: <pre>!ts</pre>', array('!ts' => String::checkPlain(var_export($ts, TRUE)))));
+ $this->verbose(strtr('$ts: <pre>!ts</pre>', array('!ts' => SafeMarkup::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: <pre>!ts</pre>', array('!ts' => String::checkPlain(var_export($ts, TRUE)))));
+ $this->verbose(strtr('$ts: <pre>!ts</pre>', array('!ts' => SafeMarkup::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: <pre>!ts</pre>', array('!ts' => String::checkPlain(var_export($ts, TRUE)))));
+ $this->verbose(strtr('$ts: <pre>!ts</pre>', array('!ts' => SafeMarkup::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: <pre>!ts</pre>', array('!ts' => String::checkPlain(var_export($ts, TRUE)))));
+ $this->verbose(strtr('$ts: <pre>!ts</pre>', array('!ts' => SafeMarkup::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: <pre>!ts</pre>', array('!ts' => String::checkPlain(var_export($ts, TRUE)))));
+ $this->verbose(strtr('$ts: <pre>!ts</pre>', array('!ts' => SafeMarkup::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: <pre>!ts</pre>', array('!ts' => String::checkPlain(var_export($ts, TRUE)))));
+ $this->verbose(strtr('$ts: <pre>!ts</pre>', array('!ts' => SafeMarkup::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 164b1e91ab7e..3139ecc2ca3f 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\SafeMarkup;
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(), SafeMarkup::format('The current theme is @theme', array('@theme' => 'test_theme')));
+ $this->assertEqual($condition_negated->summary(), SafeMarkup::format('The current theme is not @theme', array('@theme' => 'test_theme')));
// The expected theme has not been set up yet.
$this->assertFalse($condition->execute());
diff --git a/core/modules/system/src/Tests/Entity/EntityAutocompleteTest.php b/core/modules/system/src/Tests/Entity/EntityAutocompleteTest.php
index f6fa25641058..949b7ccf37d4 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\SafeMarkup;
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'], SafeMarkup::checkPlain($entity_1->name->value), 'Autocomplete returned the first matching entity');
+ $this->assertIdentical($data[1]['label'], SafeMarkup::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' => SafeMarkup::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'], SafeMarkup::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' => SafeMarkup::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 32861c7ba9e8..e8453ff9cada 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\SafeMarkup;
/**
* 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', SafeMarkup::format('%entity_type: Default language', array('%entity_type' => $entity_type_id)));
+ $this->assertTrue(Uuid::isValid($entity->uuid->value), SafeMarkup::format('%entity_type: Default UUID', array('%entity_type' => $entity_type_id)));
$this->assertEqual($entity->name->getValue(), array(), 'Field has one empty value by default.');
}
diff --git a/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php b/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php
index b7bf65ec74c8..358c88396494 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\SafeMarkup;
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] = SafeMarkup::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] = SafeMarkup::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] = SafeMarkup::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 9370ddea6dbc..3fae8789d1b3 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\SafeMarkup;
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] = SafeMarkup::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 5bd22ed71837..6f6f39dcb5e5 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\SafeMarkup;
/**
* 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, SafeMarkup::format('Entity schema correct for the @table table.', array('@table' => $table)));
}
- $this->assertTrue($schema_handler->tableExists($dedicated_tables[0]), String::format('Field schema correct for the @table table.', array('@table' => $table)));
+ $this->assertTrue($schema_handler->tableExists($dedicated_tables[0]), SafeMarkup::format('Field schema correct for the @table table.', array('@table' => $table)));
// Update the entity type definition and check that the entity schema now
// supports translations and revisions.
$this->updateEntityType(TRUE);
foreach ($tables as $table) {
- $this->assertTrue($schema_handler->tableExists($table), String::format('Entity schema correct for the @table table.', array('@table' => $table)));
+ $this->assertTrue($schema_handler->tableExists($table), SafeMarkup::format('Entity schema correct for the @table table.', array('@table' => $table)));
}
foreach ($dedicated_tables as $table) {
- $this->assertTrue($schema_handler->tableExists($table), String::format('Field schema correct for the @table table.', array('@table' => $table)));
+ $this->assertTrue($schema_handler->tableExists($table), SafeMarkup::format('Field schema correct for the @table table.', array('@table' => $table)));
}
// Revert changes and check that the entity schema now does not support
// neither translations nor revisions.
$this->updateEntityType(FALSE);
foreach ($tables as $index => $table) {
- $this->assertEqual($schema_handler->tableExists($table), !$index, String::format('Entity schema correct for the @table table.', array('@table' => $table)));
+ $this->assertEqual($schema_handler->tableExists($table), !$index, SafeMarkup::format('Entity schema correct for the @table table.', array('@table' => $table)));
}
- $this->assertTrue($schema_handler->tableExists($dedicated_tables[0]), String::format('Field schema correct for the @table table.', array('@table' => $table)));
+ $this->assertTrue($schema_handler->tableExists($dedicated_tables[0]), SafeMarkup::format('Field schema correct for the @table table.', array('@table' => $table)));
}
/**
diff --git a/core/modules/system/src/Tests/Entity/EntityTranslationTest.php b/core/modules/system/src/Tests/Entity/EntityTranslationTest.php
index aab0d284e0f3..03300afa1047 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\SafeMarkup;
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'], SafeMarkup::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 7d71a33087aa..c8599b3af0c9 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\SafeMarkup;
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, SafeMarkup::format('@uri file permissions @actual are identical to @expected.', array(
'@uri' => $uri,
'@actual' => 0 . decoct($actual),
'@expected' => 0 . decoct($expected),
diff --git a/core/modules/system/src/Tests/Form/ConfirmFormTest.php b/core/modules/system/src/Tests/Form/ConfirmFormTest.php
index 9521176797f7..740935539f01 100644
--- a/core/modules/system/src/Tests/Form/ConfirmFormTest.php
+++ b/core/modules/system/src/Tests/Form/ConfirmFormTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Form;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Url;
use Drupal\simpletest\WebTestBase;
@@ -79,7 +79,7 @@ public function testConfirmFormWithExternalDestination() {
*/
public function assertCancelLinkUrl(Url $url, $message = '', $group = 'Other') {
$links = $this->xpath('//a[@href=:url]', [':url' => $url->toString()]);
- $message = ($message ? $message : String::format('Cancel link with url %url found.', ['%url' => $url->toString()]));
+ $message = ($message ? $message : SafeMarkup::format('Cancel link with url %url found.', ['%url' => $url->toString()]));
return $this->assertTrue(isset($links[0]), $message, $group);
}
diff --git a/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php b/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php
index a69da46af2ac..29610f07d2a1 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\SafeMarkup;
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']), SafeMarkup::format('%element was removed.', ['%element' => 'vertical_tabs__active_tab']));
}
}
diff --git a/core/modules/system/src/Tests/Form/FormTest.php b/core/modules/system/src/Tests/Form/FormTest.php
index 0197e8a7cb7f..5a43f4941643 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\SafeMarkup;
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, SafeMarkup::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' => SafeMarkup::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 f07ae8c7a243..642a85cc9828 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\SafeMarkup;
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']), SafeMarkup::format('%element was removed.', ['%element' => 'wine']));
// Verify that nested form value still exists.
$this->assertTrue(isset($values['baz']['beer']), 'Nested form value still exists.');
diff --git a/core/modules/system/src/Tests/Image/ToolkitGdTest.php b/core/modules/system/src/Tests/Image/ToolkitGdTest.php
index f4face02af61..c45bee36fdf5 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\SafeMarkup;
/**
* 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(SafeMarkup::format('Could not load image %file.', array('%file' => $file)));
continue 2;
}
$image_original_type = $image->getToolkit()->getType();
// All images should be converted to truecolor when loaded.
$image_truecolor = imageistruecolor($toolkit->getResource());
- $this->assertTrue($image_truecolor, String::format('Image %file after load is a truecolor image.', array('%file' => $file)));
+ $this->assertTrue($image_truecolor, SafeMarkup::format('Image %file after load is a truecolor image.', array('%file' => $file)));
if ($image->getToolkit()->getType() == IMAGETYPE_GIF) {
if ($op == 'desaturate') {
@@ -312,8 +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, SafeMarkup::format('Image %file after %action action has proper dimensions.', array('%file' => $file, '%action' => $op)));
+ $this->assertTrue($correct_dimensions_object, SafeMarkup::format('Image %file object after %action action is reporting the proper height and width values.', array('%file' => $file, '%action' => $op)));
// JPEG colors will always be messed up due to compression. So we skip
// these tests if the original or the result is in jpeg format.
@@ -349,7 +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, SafeMarkup::format('Image %file object after %action action has the correct color placement at corner %corner.',
array('%file' => $file, '%action' => $op, '%corner' => $key)));
}
}
@@ -367,25 +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(), SafeMarkup::format('Image file %file has the correct width.', array('%file' => $file)));
+ $this->assertEqual(20, $image->getHeight(), SafeMarkup::format('Image file %file has the correct height.', array('%file' => $file)));
+ $this->assertEqual(image_type_to_mime_type($type), $image->getMimeType(), SafeMarkup::format('Image file %file has the correct MIME type.', array('%file' => $file)));
+ $this->assertTrue($image->save($file_path), SafeMarkup::format('Image %file created anew from a null image was saved.', array('%file' => $file)));
// Reload saved image.
$image_reloaded = $this->imageFactory->get($file_path);
if (!$image_reloaded->isValid()) {
- $this->fail(String::format('Could not load image %file.', array('%file' => $file)));
+ $this->fail(SafeMarkup::format('Could not load image %file.', array('%file' => $file)));
continue;
}
- $this->assertEqual(50, $image_reloaded->getWidth(), String::format('Image file %file has the correct width.', array('%file' => $file)));
- $this->assertEqual(20, $image_reloaded->getHeight(), String::format('Image file %file has the correct height.', array('%file' => $file)));
- $this->assertEqual(image_type_to_mime_type($type), $image_reloaded->getMimeType(), String::format('Image file %file has the correct MIME type.', array('%file' => $file)));
+ $this->assertEqual(50, $image_reloaded->getWidth(), SafeMarkup::format('Image file %file has the correct width.', array('%file' => $file)));
+ $this->assertEqual(20, $image_reloaded->getHeight(), SafeMarkup::format('Image file %file has the correct height.', array('%file' => $file)));
+ $this->assertEqual(image_type_to_mime_type($type), $image_reloaded->getMimeType(), SafeMarkup::format('Image file %file has the correct MIME type.', array('%file' => $file)));
if ($image_reloaded->getToolkit()->getType() == IMAGETYPE_GIF) {
- $this->assertEqual('#ffff00', $image_reloaded->getToolkit()->getTransparentColor(), String::format('Image file %file has the correct transparent color channel set.', array('%file' => $file)));
+ $this->assertEqual('#ffff00', $image_reloaded->getToolkit()->getTransparentColor(), SafeMarkup::format('Image file %file has the correct transparent color channel set.', array('%file' => $file)));
}
else {
- $this->assertEqual(NULL, $image_reloaded->getToolkit()->getTransparentColor(), String::format('Image file %file has no color channel set.', array('%file' => $file)));
+ $this->assertEqual(NULL, $image_reloaded->getToolkit()->getTransparentColor(), SafeMarkup::format('Image file %file has no color channel set.', array('%file' => $file)));
}
}
@@ -420,12 +420,12 @@ function testTransparentColorOutOfRange() {
$toolkit = $image->getToolkit();
if (!$image->isValid()) {
- $this->fail(String::format('Could not load image %file.', array('%file' => $file)));
+ $this->fail(SafeMarkup::format('Could not load image %file.', array('%file' => $file)));
}
else {
// All images should be converted to truecolor when loaded.
$image_truecolor = imageistruecolor($toolkit->getResource());
- $this->assertTrue($image_truecolor, String::format('Image %file after load is a truecolor image.', array('%file' => $file)));
+ $this->assertTrue($image_truecolor, SafeMarkup::format('Image %file after load is a truecolor image.', array('%file' => $file)));
}
}
@@ -443,7 +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(SafeMarkup::format('Could not load image %file.', array('%file' => $file)));
}
// Try perform a missing toolkit operation.
diff --git a/core/modules/system/src/Tests/Image/ToolkitTestBase.php b/core/modules/system/src/Tests/Image/ToolkitTestBase.php
index 44b8437376d9..72703adb0138 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\SafeMarkup;
/**
* 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, SafeMarkup::format('Expected operations %expected to be called but %uncalled was not called.', array('%expected' => implode(', ', $expected), '%uncalled' => implode(', ', $uncalled))));
}
else {
- $this->assertTrue(TRUE, String::format('All the expected operations were called: %expected', array('%expected' => implode(', ', $expected))));
+ $this->assertTrue(TRUE, SafeMarkup::format('All the expected operations were called: %expected', array('%expected' => implode(', ', $expected))));
}
// Determine if there were any unexpected calls.
@@ -115,7 +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, SafeMarkup::format('Unexpected operations were called: %unexpected.', array('%unexpected' => implode(', ', $unexpected))));
}
else {
$this->assertTrue(TRUE, 'No unexpected operations were called.');
diff --git a/core/modules/system/src/Tests/Mail/HtmlToTextTest.php b/core/modules/system/src/Tests/Mail/HtmlToTextTest.php
index 3bf7ffcd29fd..b1c73748cde3 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\SafeMarkup;
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)
+ SafeMarkup::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, SafeMarkup::checkPlain($message));
$verbose = 'html = <pre>' . $this->stringToHtml($html)
. '</pre><br />' . 'result = <pre>' . $this->stringToHtml($result)
. '</pre><br />' . 'expected = <pre>' . $this->stringToHtml($text)
diff --git a/core/modules/system/src/Tests/Menu/AssertBreadcrumbTrait.php b/core/modules/system/src/Tests/Menu/AssertBreadcrumbTrait.php
index a9d421aa7552..42d2731ea8d3 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\SafeMarkup;
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'] === SafeMarkup::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 4032a900254f..337258c67926 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\SafeMarkup;
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(), SafeMarkup::format('The entity label "!label" found.', array('!label' => $node_type->label())));
$this->drupalPostForm(NULL, NULL, t('Uninstall'));
$this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.');
@@ -82,7 +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, SafeMarkup::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', SafeMarkup::format('Cache entry found: @bin', array('@bin' => $cached->data)));
$this->drupalPostForm(NULL, NULL, t('Uninstall'));
$this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.');
diff --git a/core/modules/system/src/Tests/Routing/ExceptionHandlingTest.php b/core/modules/system/src/Tests/Routing/ExceptionHandlingTest.php
index b8ea7edb8c1d..401420ca73b6 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\SafeMarkup;
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('<script>alert(\'xss\')</script>')) !== FALSE);
+ $this->assertTrue(strpos($response->getContent(), SafeMarkup::checkPlain('<script>alert(\'xss\')</script>')) !== FALSE);
$this->assertTrue(strpos($response->getContent(), '<script>alert(\'xss\')</script>') === FALSE);
}
diff --git a/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php b/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php
index 2960064dc593..dd2ec04300a5 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\SafeMarkup;
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, SafeMarkup::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, SafeMarkup::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 204d2653df72..2c6f62a50495 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\SafeMarkup;
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(SafeMarkup::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><script type="text/javascript">alert("Title XSS!");</script> & < > " \' ';
- $title_filtered = String::checkPlain($title);
+ $title_filtered = SafeMarkup::checkPlain($title);
$slogan = '<script type="text/javascript">alert("Slogan XSS!");</script>';
$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 f489c7548d81..a5bbe745d347 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\SafeMarkup;
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 = SafeMarkup::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]'] = SafeMarkup::checkPlain($config->get('name'));
$tests['[site:slogan]'] = $safe_slogan;
$tests['[site:mail]'] = $config->get('mail');
$tests['[site:url]'] = \Drupal::url('<front>', [], $url_options);
diff --git a/core/modules/system/src/Tests/Theme/FunctionsTest.php b/core/modules/system/src/Tests/Theme/FunctionsTest.php
index a5766fad49d9..a9a3daed6059 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\SafeMarkup;
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('<span class="unescaped">@text</span>', array('@text' => 'potentially unsafe text that <should> be escaped')),
+ 'title' => SafeMarkup::format('<span class="unescaped">@text</span>', array('@text' => 'potentially unsafe text that <should> be escaped')),
),
'front page' => array(
'title' => 'Front page',
@@ -218,13 +218,13 @@ function testLinks() {
$expected_links = '';
$expected_links .= '<ul id="somelinks">';
- $expected_links .= '<li class="a-link"><a href="' . Url::fromUri('base:a/link')->toString() . '">' . String::checkPlain('A <link>') . '</a></li>';
- $expected_links .= '<li class="plain-text">' . String::checkPlain('Plain "text"') . '</li>';
- $expected_links .= '<li class="html-text"><span class="unescaped">' . String::checkPlain('potentially unsafe text that <should> be escaped') . '</span></li>';
- $expected_links .= '<li class="front-page"><a href="' . Url::fromRoute('<front>')->toString() . '">' . String::checkPlain('Front page') . '</a></li>';
- $expected_links .= '<li class="router-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '">' . String::checkPlain('Test route') . '</a></li>';
+ $expected_links .= '<li class="a-link"><a href="' . Url::fromUri('base:a/link')->toString() . '">' . SafeMarkup::checkPlain('A <link>') . '</a></li>';
+ $expected_links .= '<li class="plain-text">' . SafeMarkup::checkPlain('Plain "text"') . '</li>';
+ $expected_links .= '<li class="html-text"><span class="unescaped">' . SafeMarkup::checkPlain('potentially unsafe text that <should> be escaped') . '</span></li>';
+ $expected_links .= '<li class="front-page"><a href="' . Url::fromRoute('<front>')->toString() . '">' . SafeMarkup::checkPlain('Front page') . '</a></li>';
+ $expected_links .= '<li class="router-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '">' . SafeMarkup::checkPlain('Test route') . '</a></li>';
$query = array('key' => 'value');
- $expected_links .= '<li class="query-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '">' . String::checkPlain('Query test route') . '</a></li>';
+ $expected_links .= '<li class="query-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '">' . SafeMarkup::checkPlain('Query test route') . '</a></li>';
$expected_links .= '</ul>';
// Verify that passing a string as heading works.
@@ -258,13 +258,13 @@ function testLinks() {
);
$expected_links = '';
$expected_links .= '<ul id="somelinks">';
- $expected_links .= '<li class="a-link"><a href="' . Url::fromUri('base:a/link')->toString() . '">' . String::checkPlain('A <link>') . '</a></li>';
- $expected_links .= '<li class="plain-text"><span class="a/class">' . String::checkPlain('Plain "text"') . '</span></li>';
- $expected_links .= '<li class="html-text"><span class="unescaped">' . String::checkPlain('potentially unsafe text that <should> be escaped') . '</span></li>';
- $expected_links .= '<li class="front-page"><a href="' . Url::fromRoute('<front>')->toString() . '">' . String::checkPlain('Front page') . '</a></li>';
- $expected_links .= '<li class="router-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '">' . String::checkPlain('Test route') . '</a></li>';
+ $expected_links .= '<li class="a-link"><a href="' . Url::fromUri('base:a/link')->toString() . '">' . SafeMarkup::checkPlain('A <link>') . '</a></li>';
+ $expected_links .= '<li class="plain-text"><span class="a/class">' . SafeMarkup::checkPlain('Plain "text"') . '</span></li>';
+ $expected_links .= '<li class="html-text"><span class="unescaped">' . SafeMarkup::checkPlain('potentially unsafe text that <should> be escaped') . '</span></li>';
+ $expected_links .= '<li class="front-page"><a href="' . Url::fromRoute('<front>')->toString() . '">' . SafeMarkup::checkPlain('Front page') . '</a></li>';
+ $expected_links .= '<li class="router-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '">' . SafeMarkup::checkPlain('Test route') . '</a></li>';
$query = array('key' => 'value');
- $expected_links .= '<li class="query-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '">' . String::checkPlain('Query test route') . '</a></li>';
+ $expected_links .= '<li class="query-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '">' . SafeMarkup::checkPlain('Query test route') . '</a></li>';
$expected_links .= '</ul>';
$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 .= '<ul id="somelinks">';
- $expected_links .= '<li class="a-link"><a href="' . Url::fromUri('base:a/link')->toString() . '">' . String::checkPlain('A <link>') . '</a></li>';
- $expected_links .= '<li class="plain-text"><span class="a/class">' . String::checkPlain('Plain "text"') . '</span></li>';
- $expected_links .= '<li class="html-text"><span class="unescaped">' . String::checkPlain('potentially unsafe text that <should> be escaped') . '</span></li>';
- $expected_links .= '<li data-drupal-link-system-path="<front>" class="front-page"><a href="' . Url::fromRoute('<front>')->toString() . '" data-drupal-link-system-path="<front>">' . String::checkPlain('Front page') . '</a></li>';
- $expected_links .= '<li data-drupal-link-system-path="router_test/test1" class="router-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '" data-drupal-link-system-path="router_test/test1">' . String::checkPlain('Test route') . '</a></li>';
+ $expected_links .= '<li class="a-link"><a href="' . Url::fromUri('base:a/link')->toString() . '">' . SafeMarkup::checkPlain('A <link>') . '</a></li>';
+ $expected_links .= '<li class="plain-text"><span class="a/class">' . SafeMarkup::checkPlain('Plain "text"') . '</span></li>';
+ $expected_links .= '<li class="html-text"><span class="unescaped">' . SafeMarkup::checkPlain('potentially unsafe text that <should> be escaped') . '</span></li>';
+ $expected_links .= '<li data-drupal-link-system-path="<front>" class="front-page"><a href="' . Url::fromRoute('<front>')->toString() . '" data-drupal-link-system-path="<front>">' . SafeMarkup::checkPlain('Front page') . '</a></li>';
+ $expected_links .= '<li data-drupal-link-system-path="router_test/test1" class="router-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '" data-drupal-link-system-path="router_test/test1">' . SafeMarkup::checkPlain('Test route') . '</a></li>';
$query = array('key' => 'value');
- $encoded_query = String::checkPlain(Json::encode($query));
- $expected_links .= '<li data-drupal-link-query="'.$encoded_query.'" data-drupal-link-system-path="router_test/test1" class="query-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '" data-drupal-link-query="'.$encoded_query.'" data-drupal-link-system-path="router_test/test1">' . String::checkPlain('Query test route') . '</a></li>';
+ $encoded_query = SafeMarkup::checkPlain(Json::encode($query));
+ $expected_links .= '<li data-drupal-link-query="'.$encoded_query.'" data-drupal-link-system-path="router_test/test1" class="query-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '" data-drupal-link-query="'.$encoded_query.'" data-drupal-link-system-path="router_test/test1">' . SafeMarkup::checkPlain('Query test route') . '</a></li>';
$expected_links .= '</ul>';
$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 b2e18d92ca3a..f113ead8c619 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\SafeMarkup;
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 ' . SafeMarkup::checkPlain($unsafe_string));
// Enable twig_auto_reload and twig_debug.
$settings = Settings::getAll();
diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php
index b0eadb58f751..94fbb64bbd70 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\SafeMarkup;
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 ? SafeMarkup::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 ? SafeMarkup::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\SafeMarkup::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 9e9d03d3a740..8ce5825fe6d2 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\SafeMarkup;
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 ? SafeMarkup::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 ? SafeMarkup::checkPlain($date) : $date;
break;
}
}
diff --git a/core/modules/system/templates/links.html.twig b/core/modules/system/templates/links.html.twig
index 56c7ec2569bb..21ab95d6376e 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\SafeMarkup::checkPlain().
* - attributes: (optional) HTML attributes for the anchor, or for the <span>
* 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 cf82dba1f716..0b4c42a5e229 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\SafeMarkup;
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: " . SafeMarkup::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 89bb6c083b75..c44871a40a80 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\SafeMarkup;
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' => SafeMarkup::checkPlain($account->getUsername()))),
+ 'username' => SafeMarkup::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 345651254215..7cfec16449b5 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\SafeMarkup;
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' => SafeMarkup::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' => SafeMarkup::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 60e0cdb082e7..9510ef4f7931 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\SafeMarkup;
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: " . SafeMarkup::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 223ed808dbe0..e700c193151b 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\SafeMarkup;
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'] = SafeMarkup::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 9dc522ce762d..a7fa82ce2a01 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\SafeMarkup;
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' => SafeMarkup::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 bbc4f1f9269e..836415c9050a 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\SafeMarkup;
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' => SafeMarkup::format("Sometimes there is a placeholder: '@placeholder'.", array('@placeholder' => $placeholder))];
}
else {
- return ['#markup' => String::format('Sometimes there is no placeholder.')];
+ return ['#markup' => SafeMarkup::format('Sometimes there is no placeholder.')];
}
}
diff --git a/core/modules/system/tests/modules/session_test/src/Form/SessionTestForm.php b/core/modules/system/tests/modules/session_test/src/Form/SessionTestForm.php
index f8d5614a3360..6c6706fdc6c4 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\SafeMarkup;
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(SafeMarkup::format('Ok: @input', array('@input' => $form_state->getValue('input'))));
}
}
diff --git a/core/modules/taxonomy/src/Plugin/EntityReferenceSelection/TermSelection.php b/core/modules/taxonomy/src/Plugin/EntityReferenceSelection/TermSelection.php
index 2a3c4adf05f3..ddf99cabc936 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\SafeMarkup;
use Drupal\Core\Database\Query\SelectInterface;
use Drupal\Core\Entity\Plugin\EntityReferenceSelection\SelectionBase;
use Drupal\Core\Form\FormStateInterface;
@@ -73,7 +73,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) . SafeMarkup::checkPlain($term->getName());
}
}
}
diff --git a/core/modules/taxonomy/src/Plugin/views/argument/IndexTid.php b/core/modules/taxonomy/src/Plugin/views/argument/IndexTid.php
index 3c59804f9771..95df98c304f2 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\SafeMarkup;
/**
* 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[] = SafeMarkup::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 e5c73cf0cdca..1bf9f5ef415d 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\SafeMarkup;
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 SafeMarkup::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 87704eda409a..1257a6a56b3b 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\NumericArgument;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
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 SafeMarkup::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 2b92822c8438..e632b6aaaeee 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\NumericArgument;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
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 SafeMarkup::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 e8ad1e565e45..79629fac7c1a 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\SafeMarkup;
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'] = SafeMarkup::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 1b8ead7008fd..47fd57380ea1 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\SafeMarkup;
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) . SafeMarkup::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()] = SafeMarkup::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()] = SafeMarkup::checkPlain(\Drupal::entityManager()->getTranslationFromContext($term)->label());
}
}
return parent::adminSummary();
diff --git a/core/modules/taxonomy/src/Tests/TokenReplaceTest.php b/core/modules/taxonomy/src/Tests/TokenReplaceTest.php
index 4ea3c4bee72b..c65f16a99eaa 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\SafeMarkup;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
@@ -85,12 +85,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]'] = SafeMarkup::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]'] = SafeMarkup::checkPlain($this->vocabulary->label());
foreach ($tests as $input => $expected) {
$output = $token_service->replace($input, array('term' => $term1), array('langcode' => $language_interface->getId()));
@@ -100,14 +100,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]'] = SafeMarkup::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]'] = SafeMarkup::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]'] = SafeMarkup::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.');
@@ -131,7 +131,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]'] = SafeMarkup::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.tokens.inc b/core/modules/taxonomy/taxonomy.tokens.inc
index 08c5c89d2f3e..87c4b7fb66f8 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\SafeMarkup;
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 ? SafeMarkup::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] = SafeMarkup::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] = SafeMarkup::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 ? SafeMarkup::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 9a79fab6ba08..13d15c925473 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\SafeMarkup::checkPlain().
// @todo: Add in the filter default format here.
$this->setValue(array('format' => NULL), $notify);
return $this;
diff --git a/core/modules/text/src/TextProcessed.php b/core/modules/text/src/TextProcessed.php
index d06ce01869b9..364937b52f5c 100644
--- a/core/modules/text/src/TextProcessed.php
+++ b/core/modules/text/src/TextProcessed.php
@@ -8,7 +8,6 @@
namespace Drupal\text;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
use Drupal\Core\TypedData\DataDefinitionInterface;
use Drupal\Core\TypedData\TypedDataInterface;
use Drupal\Core\TypedData\TypedData;
@@ -51,7 +50,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\SafeMarkup::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 50704d01a130..e9808d5f699e 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\SafeMarkup;
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'] = SafeMarkup::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 8cb9261ec2c7..c457bebbbb41 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\SafeMarkup;
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 = '<h2 class="tour-tip-label" id="tour-tip-' . $this->getAriaId() . '-label">' . String::checkPlain($this->getLabel()) . '</h2>';
+ $output = '<h2 class="tour-tip-label" id="tour-tip-' . $this->getAriaId() . '-label">' . SafeMarkup::checkPlain($this->getLabel()) . '</h2>';
$output .= '<p class="tour-tip-body" id="tour-tip-' . $this->getAriaId() . '-contents">' . Xss::filterAdmin($this->token->replace($this->getBody())) . '</p>';
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 951406c41664..109c5874c387 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\SafeMarkup;
use Drupal\tour\TipPluginBase;
/**
@@ -45,7 +45,7 @@ public function getOutput() {
'#uri' => $this->get('url'),
'#alt' => $this->get('alt'),
);
- $output = '<h2 class="tour-tip-label" id="tour-tip-' . $this->get('ariaId') . '-label">' . String::checkPlain($this->get('label')) . '</h2>';
+ $output = '<h2 class="tour-tip-label" id="tour-tip-' . $this->get('ariaId') . '-label">' . SafeMarkup::checkPlain($this->get('label')) . '</h2>';
$output .= '<p class="tour-tip-image" id="tour-tip-' . $this->get('ariaId') . '-contents">' . drupal_render($image) . '</p>';
return array('#markup' => $output);
}
diff --git a/core/modules/tracker/src/Controller/TrackerUserTab.php b/core/modules/tracker/src/Controller/TrackerUserTab.php
index 49a75749dd33..ae215487a504 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\SafeMarkup;
/**
* 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 SafeMarkup::checkPlain($user->getUsername());
}
}
diff --git a/core/modules/tracker/tracker.pages.inc b/core/modules/tracker/tracker.pages.inc
index d762e00692d6..837c157e011d 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\SafeMarkup;
use Drupal\node\Entity\Node;
/**
@@ -93,7 +93,7 @@ function tracker_page($account = NULL) {
);
$row = array(
- 'type' => String::checkPlain(node_get_type_label($node)),
+ 'type' => SafeMarkup::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 ce342e103397..f4d7cfbbaaa7 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\SafeMarkup;
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 = SafeMarkup::checkPlain($project['title']);
}
}
elseif (!empty($project['info']['name'])) {
- $project_name = String::checkPlain($project['info']['name']);
+ $project_name = SafeMarkup::checkPlain($project['info']['name']);
}
else {
- $project_name = String::checkPlain($name);
+ $project_name = SafeMarkup::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 4c6db065a3dc..f61fd0614f37 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\SafeMarkup', '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 432544be2df5..87e9e12b883c 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\SafeMarkup;
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' => '<li>',
- '#suffix' => String::checkPlain($account->label()) . "</li>\n",
+ '#suffix' => SafeMarkup::checkPlain($account->label()) . "</li>\n",
);
}
diff --git a/core/modules/user/src/Form/UserPermissionsForm.php b/core/modules/user/src/Form/UserPermissionsForm.php
index d0b166fd868d..854099bae6ea 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\SafeMarkup;
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] = SafeMarkup::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 1462c8f7d04d..b64a28fa7492 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\SafeMarkup::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 77c08b30bcc7..76bc17dd66b0 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\SafeMarkup;
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' => SafeMarkup::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 e7c46917ca82..6dca9bd3e795 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\SafeMarkup;
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] = SafeMarkup::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 345086d064e9..6a106de09938 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\SafeMarkup;
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 SafeMarkup::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\SafeMarkup::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 bbc5ab91e473..75fff0cdfd52 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\SafeMarkup;
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[] = SafeMarkup::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 63db23c4df66..c36500936ad0 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\SafeMarkup;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\views\Plugin\views\argument\NumericArgument;
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 SafeMarkup::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 20b94f46e4e9..dd30b9d641a2 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\SafeMarkup', '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 cc91eea17d07..1750ce0a7a26 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\SafeMarkup;
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 SafeMarkup::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 4ba1309a8669..53a7252e3205 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\SafeMarkup;
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'] = SafeMarkup::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 a3b26aa8230d..8b1015c676d5 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\SafeMarkup;
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] = SafeMarkup::checkPlain(strip_tags($perm_item['title']));
}
}
else {
diff --git a/core/modules/user/src/PrivateTempStore.php b/core/modules/user/src/PrivateTempStore.php
index e99d5fc95b23..1fbf416b8a3a 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\SafeMarkup;
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(SafeMarkup::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(SafeMarkup::format("Couldn't acquire lock to delete item %key from %collection temporary storage.", array(
'%key' => $key,
'%collection' => $this->storage->getCollectionName(),
)));
diff --git a/core/modules/user/src/SharedTempStore.php b/core/modules/user/src/SharedTempStore.php
index 0049d7970531..4dfc29115b0d 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\SafeMarkup;
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(SafeMarkup::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(SafeMarkup::format("Couldn't acquire lock to delete item %key from %collection temporary storage.", array(
'%key' => $key,
'%collection' => $this->storage->getCollectionName(),
)));
diff --git a/core/modules/user/src/Tests/Condition/UserRoleConditionTest.php b/core/modules/user/src/Tests/Condition/UserRoleConditionTest.php
index f5dd8f22c8a2..567ae06923c7 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\SafeMarkup;
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(), SafeMarkup::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 897e2aaf495c..16c43b482919 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\SafeMarkup;
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]'] = SafeMarkup::checkPlain(user_format_name($account));
+ $tests['[user:mail]'] = SafeMarkup::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]'] = SafeMarkup::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 d0d486463989..ec44a79430b9 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\SafeMarkup;
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' => SafeMarkup::placeholder($user->getFieldDefinition('mail')->getLabel()))));
$user->set('mail', 'someone@example.com');
$user->set('timezone', $this->randomString(33));
diff --git a/core/modules/user/src/Tests/Views/BulkFormAccessTest.php b/core/modules/user/src/Tests/Views/BulkFormAccessTest.php
index 8f9b6138a99c..d59f6b93452f 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\SafeMarkup;
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(SafeMarkup::format('No access to execute %action on the @entity_type_label %entity_label.', [
'%action' => 'Block the selected user(s)',
'@entity_type_label' => 'User',
'%entity_label' => $no_edit_user->label(),
diff --git a/core/modules/user/src/Tests/Views/HandlerFilterPermissionTest.php b/core/modules/user/src/Tests/Views/HandlerFilterPermissionTest.php
index 27a771527f15..51673e4df061 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\SafeMarkup;
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 SafeMarkup::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/UserListBuilder.php b/core/modules/user/src/UserListBuilder.php
index 544bd40d016e..c60001621f0f 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\SafeMarkup::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 79463bc7ff0e..34f759041500 100644
--- a/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php
+++ b/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php
@@ -7,7 +7,7 @@
namespace Drupal\Tests\user\Unit;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Access\AccessResult;
use Drupal\Tests\UnitTestCase;
use Drupal\user\UserAccessControlHandler;
@@ -125,7 +125,7 @@ public function assertFieldAccess($field, $viewer, $target, $view, $edit) {
->will($this->returnValue($this->{$target}));
foreach (array('view' => $view, 'edit' => $edit) as $operation => $result) {
- $message = String::format("User @field field access returns @result with operation '@op' for @account accessing @target", array(
+ $message = SafeMarkup::format("User @field field access returns @result with operation '@op' for @account accessing @target", array(
'@field' => $field,
'@result' => !isset($result) ? 'null' : ($result ? 'true' : 'false'),
'@op' => $operation,
diff --git a/core/modules/user/tests/src/Unit/Views/Argument/RolesRidTest.php b/core/modules/user/tests/src/Unit/Views/Argument/RolesRidTest.php
index d6566cca1c55..3a4db290cb64 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\SafeMarkup;
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 <strong>rid 2</strong>')), $titles);
+ $this->assertEquals(array('test rid 1', SafeMarkup::checkPlain('test <strong>rid 2</strong>')), $titles);
}
}
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 2b08e7324527..dd37814fdddb 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1,7 +1,7 @@
<?php
use Drupal\Component\Utility\Crypt;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Asset\AttachedAssetsInterface;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
@@ -449,7 +449,7 @@ function user_preprocess_block(&$variables) {
*
* @return
* An unsanitized string with the username to display. The code receiving
- * this result must ensure that \Drupal\Component\Utility\String::checkPlain()
+ * this result must ensure that \Drupal\Component\Utility\SafeMarkup::checkPlain()
* is called on it before it is printed to the page.
*
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
@@ -493,7 +493,7 @@ function user_template_preprocess_default_variables_alter(&$variables) {
*
* Modules that make any changes to variables like 'name' or 'extra' must ensure
* that the final string is safe to include directly in the output by using
- * \Drupal\Component\Utility\String::checkPlain() or
+ * \Drupal\Component\Utility\SafeMarkup::checkPlain() or
* \Drupal\Component\Utility\Xss::filter().
*/
function template_preprocess_username(&$variables) {
@@ -520,7 +520,7 @@ function template_preprocess_username(&$variables) {
else {
$variables['truncated'] = FALSE;
}
- $variables['name'] = String::checkPlain($name);
+ $variables['name'] = SafeMarkup::checkPlain($name);
$variables['profile_access'] = \Drupal::currentUser()->hasPermission('access user profiles');
$external = FALSE;
diff --git a/core/modules/user/user.tokens.inc b/core/modules/user/user.tokens.inc
index 073b90fcfc5b..510d138172f9 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\SafeMarkup;
/**
* 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 ? SafeMarkup::checkPlain($name) : $name;
break;
case 'mail':
- $replacements[$original] = $sanitize ? String::checkPlain($account->getEmail()) : $account->getEmail();
+ $replacements[$original] = $sanitize ? SafeMarkup::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 c87113c8558b..29300afd2452 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\SafeMarkup;
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('<current>')->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-' . SafeMarkup::checkPlain($view->storage->id()) . '-' . SafeMarkup::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 c579c2bb23fe..cdd235e850e2 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\SafeMarkup;
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[] = SafeMarkup::format('@key: @value', array('@key' => $key, '@value' => $value));
}
}
diff --git a/core/modules/views/src/Plugin/views/HandlerBase.php b/core/modules/views/src/Plugin/views/HandlerBase.php
index e277ac2f68cd..895753073498 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\SafeMarkup;
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 = SafeMarkup::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 = SafeMarkup::checkPlain(UrlHelper::stripDangerousProtocols($value));
break;
default:
- $value = String::checkPlain($value);
+ $value = SafeMarkup::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(SafeMarkup::format('No entity type for field @field on view @view', array('@field' => $this->options['id'], '@view' => $this->view->storage->id())));
}
}
diff --git a/core/modules/views/src/Plugin/views/PluginBase.php b/core/modules/views/src/Plugin/views/PluginBase.php
index 4d252e22eff7..9c0f49be7724 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\SafeMarkup;
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 SafeMarkup::checkPlain($this->definition['short_title']);
}
- return String::checkPlain($this->definition['title']);
+ return SafeMarkup::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 9e814b2740c6..1775d99885ed 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, SafeMarkup::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 0182c0673810..5852c160d8c7 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\SafeMarkup;
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 = SafeMarkup::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 4e5469bab77b..fb1a06bd1d61 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\SafeMarkup;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Render\Element;
use Drupal\views\Plugin\CacheablePluginInterface;
@@ -882,7 +882,7 @@ public function summaryName($data) {
if (empty($value) && !empty($this->definition['empty field name'])) {
$value = $this->definition['empty field name'];
}
- return UtilityString::checkPlain($value);
+ return SafeMarkup::checkPlain($value);
}
/**
@@ -901,7 +901,7 @@ public function query($group_by = FALSE) {
* This usually needs to be overridden to provide a proper title.
*/
function title() {
- return UtilityString::checkPlain($this->argument);
+ return SafeMarkup::checkPlain($this->argument);
}
/**
diff --git a/core/modules/views/src/Plugin/views/argument/FieldList.php b/core/modules/views/src/Plugin/views/argument/FieldList.php
index 64d9bb43fc9a..9764f0fe5be6 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\SafeMarkup;
use Drupal\Core\Field\AllowedTagsXssTrait;
use Drupal\Core\Form\FormStateInterface;
use Drupal\views\ViewExecutable;
@@ -74,7 +74,7 @@ public function summaryName($data) {
}
// else fallback to the key.
else {
- return UtilityString::checkPlain($value);
+ return SafeMarkup::checkPlain($value);
}
}
diff --git a/core/modules/views/src/Plugin/views/argument/ListString.php b/core/modules/views/src/Plugin/views/argument/ListString.php
index 3237e80a45d3..202d0701be5a 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\SafeMarkup;
use Drupal\Core\Field\AllowedTagsXssTrait;
use Drupal\Core\Form\FormStateInterface;
use Drupal\views\ViewExecutable;
@@ -76,7 +76,7 @@ public function summaryName($data) {
}
// else fallback to the key.
else {
- return $this->caseTransform(UtilityString::checkPlain($value), $this->options['case']);
+ return $this->caseTransform(SafeMarkup::checkPlain($value), $this->options['case']);
}
}
diff --git a/core/modules/views/src/Plugin/views/argument/StringArgument.php b/core/modules/views/src/Plugin/views/argument/StringArgument.php
index eeda44bb1cae..d5466acefedb 100644
--- a/core/modules/views/src/Plugin/views/argument/StringArgument.php
+++ b/core/modules/views/src/Plugin/views/argument/StringArgument.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\SafeMarkup::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 dbc773c4e496..30a4674293e4 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\SafeMarkup;
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 = SafeMarkup::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 9de84ef72b18..411c50ee2418 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\SafeMarkup;
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 = SafeMarkup::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 5a4bda2f5a04..ae9571f1044f 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -11,6 +11,7 @@
use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Unicode;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Language\LanguageInterface;
@@ -1023,7 +1024,7 @@ public function optionLink($text, $section, $class = '', $title = '') {
}
if (!empty($class)) {
- $text = String::format('<span>@text</span>', array('@text' => $text));
+ $text = SafeMarkup::format('<span>@text</span>', array('@text' => $text));
}
if (empty($title)) {
@@ -1061,7 +1062,7 @@ 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().
+ // were removed by SafeMarkup::checkPlain().
$tokens["!$count"] = isset($this->view->args[$count - 1]) ? strip_tags(String::decodeEntities($this->view->args[$count - 1])) : '';
}
@@ -1393,7 +1394,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'] = SafeMarkup::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 +2106,7 @@ public function renderMoreLink() {
return array(
'#theme' => $theme,
'#more_url' => $url->toString(),
- '#link_text' => String::checkPlain($this->useMoreText()),
+ '#link_text' => SafeMarkup::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 24e76ba64483..212672384039 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\SafeMarkup;
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' => '<pre>',
- '#markup' => String::checkPlain(drupal_render_root($output)),
+ '#markup' => SafeMarkup::checkPlain(drupal_render_root($output)),
'#suffix' => '</pre>',
);
}
@@ -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 = SafeMarkup::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 7f0caa929184..652cee19639a 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\SafeMarkup;
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] = SafeMarkup::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 3089c39d6651..098d23a78efa 100644
--- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -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 SafeMarkup::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 SafeMarkup::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 SafeMarkup::checkPlain($this->options['element_wrapper_type']);
}
if ($default_empty) {
@@ -1339,7 +1339,7 @@ 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().
+ // were removed by SafeMarkup::checkPlain().
$path = strip_tags(String::decodeEntities($this->viewsTokenReplace($path, $tokens)));
if (!empty($alter['path_case']) && $alter['path_case'] != 'none' && !$alter['url']->isRouted()) {
@@ -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 SafeMarkup::checkPlain() is needed here?
+ $target = SafeMarkup::checkPlain(trim($this->viewsTokenReplace($alter['target'], $tokens)));
if (!empty($target)) {
$options['attributes']['target'] = $target;
}
@@ -1508,7 +1508,7 @@ 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().
+ // were removed by SafeMarkup::checkPlain().
$tokens['!' . $count] = isset($this->view->args[$count - 1]) ? strip_tags(String::decodeEntities($this->view->args[$count - 1])) : '';
}
diff --git a/core/modules/views/src/Plugin/views/field/MachineName.php b/core/modules/views/src/Plugin/views/field/MachineName.php
index edd0a617c8b1..bf5fc4318d76 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\SafeMarkup;
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 = SafeMarkup::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 0540214502ca..cc04113eaff9 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\SafeMarkup;
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 SafeMarkup::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 SafeMarkup::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 9abf63ed109e..9ab4e79024c2 100644
--- a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
+++ b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
@@ -14,6 +14,7 @@
use Drupal\views\Plugin\CacheablePluginInterface;
use Drupal\views\Plugin\views\HandlerBase;
use Drupal\Component\Utility\String as UtilityString;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ViewExecutable;
@@ -171,7 +172,7 @@ protected function defineOptions() {
* Display the filter on the administrative summary
*/
public function adminSummary() {
- return UtilityString::checkPlain((string) $this->operator) . ' ' . UtilityString::checkPlain((string) $this->value);
+ return SafeMarkup::checkPlain((string) $this->operator) . ' ' . SafeMarkup::checkPlain((string) $this->value);
}
/**
@@ -594,7 +595,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\SafeMarkup::checkPlain', user_role_names());
$form['expose']['remember_roles'] = array(
'#type' => 'checkboxes',
'#title' => $this->t('User roles'),
@@ -765,7 +766,7 @@ public function groupForm(&$form, FormStateInterface $form_state) {
$value = $this->options['group_info']['identifier'];
$form[$value] = array(
- '#title' => UtilityString::checkPlain($this->options['group_info']['label']),
+ '#title' => SafeMarkup::checkPlain($this->options['group_info']['label']),
'#type' => $this->options['group_info']['widget'],
'#default_value' => $this->group_info,
'#options' => $groups,
diff --git a/core/modules/views/src/Plugin/views/filter/InOperator.php b/core/modules/views/src/Plugin/views/filter/InOperator.php
index 5d4865cc2b47..2950f5ed01ad 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\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Form\FormStateInterface;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
@@ -335,7 +335,7 @@ public function adminSummary() {
return;
}
- $operator = UtilityString::checkPlain($info[$this->operator]['short']);
+ $operator = SafeMarkup::checkPlain($info[$this->operator]['short']);
$values = '';
if (in_array($this->operator, $this->operatorValues(1))) {
// Remove every element which is not known.
@@ -351,13 +351,13 @@ public function adminSummary() {
else if (count($this->value) == 1) {
// If any, use the 'single' short name of the operator instead.
if (isset($info[$this->operator]['short_single'])) {
- $operator = UtilityString::checkPlain($info[$this->operator]['short_single']);
+ $operator = SafeMarkup::checkPlain($info[$this->operator]['short_single']);
}
$keys = $this->value;
$value = array_shift($keys);
if (isset($this->valueOptions[$value])) {
- $values = UtilityString::checkPlain($this->valueOptions[$value]);
+ $values = SafeMarkup::checkPlain($this->valueOptions[$value]);
}
else {
$values = '';
@@ -373,7 +373,7 @@ public function adminSummary() {
break;
}
if (isset($this->valueOptions[$value])) {
- $values .= UtilityString::checkPlain($this->valueOptions[$value]);
+ $values .= SafeMarkup::checkPlain($this->valueOptions[$value]);
}
}
}
diff --git a/core/modules/views/src/Plugin/views/filter/NumericFilter.php b/core/modules/views/src/Plugin/views/filter/NumericFilter.php
index e234bf296b08..f88e3a6989b5 100644
--- a/core/modules/views/src/Plugin/views/filter/NumericFilter.php
+++ b/core/modules/views/src/Plugin/views/filter/NumericFilter.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\views\filter;
-use Drupal\Component\Utility\String as UtilityString;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Database\Database;
use Drupal\Core\Form\FormStateInterface;
@@ -292,12 +292,12 @@ public function adminSummary() {
}
$options = $this->operatorOptions('short');
- $output = UtilityString::checkPlain($options[$this->operator]);
+ $output = SafeMarkup::checkPlain($options[$this->operator]);
if (in_array($this->operator, $this->operatorValues(2))) {
$output .= ' ' . $this->t('@min and @max', array('@min' => $this->value['min'], '@max' => $this->value['max']));
}
elseif (in_array($this->operator, $this->operatorValues(1))) {
- $output .= ' ' . UtilityString::checkPlain($this->value['value']);
+ $output .= ' ' . SafeMarkup::checkPlain($this->value['value']);
}
return $output;
}
diff --git a/core/modules/views/src/Plugin/views/filter/StringFilter.php b/core/modules/views/src/Plugin/views/filter/StringFilter.php
index 41e2e9aa38ef..a077b731a2a2 100644
--- a/core/modules/views/src/Plugin/views/filter/StringFilter.php
+++ b/core/modules/views/src/Plugin/views/filter/StringFilter.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\views\filter;
-use Drupal\Component\Utility\String as UtilityString;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Database\Database;
use Drupal\Core\Form\FormStateInterface;
@@ -162,10 +162,10 @@ public function adminSummary() {
$options = $this->operatorOptions('short');
$output = '';
if (!empty($options[$this->operator])) {
- $output = UtilityString::checkPlain($options[$this->operator]);
+ $output = SafeMarkup::checkPlain($options[$this->operator]);
}
if (in_array($this->operator, $this->operatorValues(1))) {
- $output .= ' ' . UtilityString::checkPlain($this->value);
+ $output .= ' ' . SafeMarkup::checkPlain($this->value);
}
return $output;
}
diff --git a/core/modules/views/src/Plugin/views/row/EntityRow.php b/core/modules/views/src/Plugin/views/row/EntityRow.php
index a0df1e197980..e95e5fa3feee 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\SafeMarkup;
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 SafeMarkup::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 fd3ac250260d..4cd8b71ff9c7 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\SafeMarkup;
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(SafeMarkup::format('Page controller for view %id requested, but view was not found.', array('%id' => $view_id)));
}
$view = $this->executableFactory->get($entity);
$view->setRequest($request);
diff --git a/core/modules/views/src/Tests/Handler/SortDateTest.php b/core/modules/views/src/Tests/Handler/SortDateTest.php
index 02d88073e8b5..b8e11f17bc98 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\SafeMarkup;
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')));
+ ), SafeMarkup::format('Result is returned correctly when ordering by granularity @granularity, @reverse.', array('@granularity' => $granularity, '@reverse' => $reverse ? 'reverse' : 'forward')));
$view->destroy();
unset($view);
}
diff --git a/core/modules/views/src/Tests/ModuleTest.php b/core/modules/views/src/Tests/ModuleTest.php
index cbb067e9eca5..e237a19adba5 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\SafeMarkup;
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]), SafeMarkup::format('The expected @key plugin list key was found.', array('@key' => $key)));
$plugin_details = $plugin_list[$key];
$this->assertEqual($plugin_details['type'], $plugin_type, 'The expected plugin type was found.');
diff --git a/core/modules/views/src/Tests/Wizard/BasicTest.php b/core/modules/views/src/Tests/Wizard/BasicTest.php
index 5871afce2089..894a37537bb7 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\SafeMarkup;
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']), SafeMarkup::format('Default options found for @plugin.', array('@plugin' => $type)));
}
}
}
diff --git a/core/modules/views/src/Tests/Wizard/MenuTest.php b/core/modules/views/src/Tests/Wizard/MenuTest.php
index 6f29329a0577..482321982201 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\SafeMarkup;
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', SafeMarkup::format('Found a link to %path in the main menu', array('%path' => $view['page[path]'])));
$metadata = $link->getMetaData();
$this->assertEqual(array('view_id' => $view['id'], 'display_id' => 'page_1'), $metadata);
}
diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php
index 11dce89c958d..08277aa84c78 100644
--- a/core/modules/views/src/ViewExecutable.php
+++ b/core/modules/views/src/ViewExecutable.php
@@ -9,6 +9,7 @@
use Drupal\Component\Utility\String;
use Drupal\Core\Cache\Cache;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\DependencyInjection\DependencySerializationTrait;
use Drupal\Core\Form\FormState;
use Drupal\Core\Routing\RouteProviderInterface;
@@ -1859,7 +1860,7 @@ public function getUrl($args = NULL, $display_id = NULL) {
public function getUrlInfo($display_id = '') {
$this->initDisplay();
if (!$this->display_handler instanceof DisplayRouterInterface) {
- throw new \InvalidArgumentException(String::format('You cannot generate a URL for the display @display_id', ['@display_id' => $display_id]));
+ throw new \InvalidArgumentException(SafeMarkup::format('You cannot generate a URL for the display @display_id', ['@display_id' => $display_id]));
}
return $this->display_handler->getUrlInfo();
}
diff --git a/core/modules/views/src/Views.php b/core/modules/views/src/Views.php
index 525177fc12f3..747f2f8f157b 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\SafeMarkup;
/**
* 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' => SafeMarkup::checkPlain($info[$name]['title']),
+ 'provider' => SafeMarkup::checkPlain($info[$name]['provider']),
'views' => array(),
);
}
diff --git a/core/modules/views/src/ViewsDataHelper.php b/core/modules/views/src/ViewsDataHelper.php
index b986746fff3d..c248d7d67e10 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\SafeMarkup;
/**
* Defines a helper class for stuff related to views data.
@@ -116,7 +116,7 @@ public function fetchFields($base, $type, $grouping = FALSE, $sub_type = NULL) {
}
else {
if ($string != 'base' && $string != 'base') {
- $strings[$field][$key][$string] = String::format("Error: missing @component", array('@component' => $string));
+ $strings[$field][$key][$string] = SafeMarkup::format("Error: missing @component", array('@component' => $string));
}
}
}
diff --git a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
index ee3cb039fe6b..95fd6c78f2ac 100644
--- a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
+++ b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
@@ -868,11 +868,11 @@ public function setKey($key, $value) {
namespace {
- use Drupal\Component\Utility\String;
+ use Drupal\Component\Utility\SafeMarkup;
if (!function_exists('t')) {
function t($string, array $args = []) {
- return String::format($string, $args);
+ return SafeMarkup::format($string, $args);
}
}
}
diff --git a/core/modules/views/tests/src/Unit/Plugin/field/CounterTest.php b/core/modules/views/tests/src/Unit/Plugin/field/CounterTest.php
index 7b0c14d8809a..ab181c1699b6 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\SafeMarkup;
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, SafeMarkup::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
'@expected' => $expected,
'@counter' => $counter
)));
$counter = $counter_handler->render($this->testData[$i]);
- $this->assertEquals($expected, $counter_handler->render($this->testData[$i]), String::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
+ $this->assertEquals($expected, $counter_handler->render($this->testData[$i]), SafeMarkup::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
'@expected' => $expected,
'@counter' => $counter
)));
@@ -158,12 +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, SafeMarkup::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
'@expected' => $expected,
'@counter' => $counter
)));
$counter = $counter_handler->render($this->testData[$i]);
- $this->assertEquals($expected, $counter_handler->render($this->testData[$i]), String::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
+ $this->assertEquals($expected, $counter_handler->render($this->testData[$i]), SafeMarkup::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
'@expected' => $expected,
'@counter' => $counter
)));
@@ -193,12 +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, SafeMarkup::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
'@expected' => $expected,
'@counter' => $counter
)));
$counter = $counter_handler->render($this->testData[$i]);
- $this->assertEquals($expected, $counter_handler->render($this->testData[$i]), String::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
+ $this->assertEquals($expected, $counter_handler->render($this->testData[$i]), SafeMarkup::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
'@expected' => $expected,
'@counter' => $counter
)));
@@ -232,12 +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, SafeMarkup::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
'@expected' => $expected,
'@counter' => $counter
)));
$counter = $counter_handler->render($this->testData[$i]);
- $this->assertEquals($expected, $counter_handler->render($this->testData[$i]), String::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
+ $this->assertEquals($expected, $counter_handler->render($this->testData[$i]), SafeMarkup::format('The expected number (@expected) patches with the rendered number (@counter) failed', array(
'@expected' => $expected,
'@counter' => $counter
)));
diff --git a/core/modules/views/tests/src/Unit/ViewsDataHelperTest.php b/core/modules/views/tests/src/Unit/ViewsDataHelperTest.php
index 9016dbfff94a..35713d760ed1 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\SafeMarkup;
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), SafeMarkup::format('Handlers of type @handler_type are not listed as expected.', array('@handler_type' => $handler_type)));
}
// Check for subtype filtering, so header and footer.
@@ -117,7 +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), SafeMarkup::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 23fd877a2d5b..d9666e49f94d 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\SafeMarkup;
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('<current>')->toString()),
+ 'view_args' => SafeMarkup::checkPlain(implode('/', $view->args)),
+ 'view_path' => SafeMarkup::checkPlain(Url::fromRoute('<current>')->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 a9b629523ae4..0f858a2d708e 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -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 = SafeMarkup::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 = SafeMarkup::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 &amp;).
- $variables['description'] = String::checkPlain(String::decodeEntities(strip_tags($style->getDescription())));
+ $variables['description'] = SafeMarkup::checkPlain(String::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'] = SafeMarkup::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'] = SafeMarkup::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'] = SafeMarkup::checkPlain($item->title);
$variables['link'] = $item->link;
- $variables['description'] = String::checkPlain($item->description);
+ $variables['description'] = SafeMarkup::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'] = SafeMarkup::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 85f6ec071944..49f326954b51 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\SafeMarkup;
/**
* 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 ? SafeMarkup::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 ? SafeMarkup::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 ? SafeMarkup::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 b797619ed207..f03328a59b9e 100644
--- a/core/modules/views_ui/src/Controller/ViewsUIController.php
+++ b/core/modules/views_ui/src/Controller/ViewsUIController.php
@@ -8,7 +8,6 @@
namespace Drupal\views_ui\Controller;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
use Drupal\Core\Controller\ControllerBase;
use Drupal\Core\Url;
use Drupal\views\ViewExecutable;
@@ -90,7 +89,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] = SafeMarkup::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 9e2259fa58a8..ceba99d37259 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\SafeMarkup;
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('<span>@text</span>', array('@text' => $this->t('Remove'))),
+ '#suffix' => \Drupal::l(SafeMarkup::format('<span>@text</span>', array('@text' => $this->t('Remove'))),
Url::fromRoute('<none>', 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 3ae2d3162b3c..1b8e18dde02a 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\SafeMarkup;
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'] = SafeMarkup::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 c2415ff7b55f..d3db3dd599b5 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\SafeMarkup;
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('<span>@text</span>', array('@text' => $this->t('Remove'))),
+ '#title' => SafeMarkup::format('<span>@text</span>', array('@text' => $this->t('Remove'))),
'#url' => Url::fromRoute('<none>'),
'#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 1b4d04c2b9e2..12c06bded267 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\SafeMarkup;
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], SafeMarkup::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 eebd4edad5a5..e7ce037030b0 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\SafeMarkup;
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, SafeMarkup::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(SafeMarkup::format('@key: @value', array('@key' => $key, '@value' => $value)));
}
}
}
diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php
index 1205f2882367..d47c2b0c1033 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\SafeMarkup;
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(SafeMarkup::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 = SafeMarkup::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('<span class="label">@text</span>', array('@text' => $this->t('Aggregation settings'))), new Url('views_ui.form_handler_group', array(
+ $build['fields'][$id]['#settings_links'][] = $this->l(SafeMarkup::format('<span class="label">@text</span>', 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('<span class="label">@text</span>', array('@text' => $this->t('Settings'))), new Url('views_ui.form_handler_extra', array(
+ $build['fields'][$id]['#settings_links'][] = $this->l(SafeMarkup::format('<span class="label">@text</span>', 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 3463177016a1..cc11d8e8e5fb 100644
--- a/core/modules/views_ui/src/ViewListBuilder.php
+++ b/core/modules/views_ui/src/ViewListBuilder.php
@@ -8,7 +8,6 @@
namespace Drupal\views_ui;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
use Drupal\Component\Plugin\PluginManagerInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
@@ -99,7 +98,7 @@ public function buildRow(EntityInterface $view) {
),
'description' => array(
'data' => array(
- '#markup' => String::checkPlain($view->get('description')),
+ '#markup' => SafeMarkup::checkPlain($view->get('description')),
),
'class' => array('views-table-filter-text-source'),
),
@@ -269,7 +268,7 @@ protected function getDisplayPaths(EntityInterface $view) {
$all_paths[] = \Drupal::l('/' . $path, Url::fromUserInput('/' . $path));
}
else {
- $all_paths[] = String::checkPlain('/' . $path);
+ $all_paths[] = SafeMarkup::checkPlain('/' . $path);
}
}
}
diff --git a/core/modules/views_ui/views_ui.theme.inc b/core/modules/views_ui/views_ui.theme.inc
index 218707625248..d0a2d7f46690 100644
--- a/core/modules/views_ui/views_ui.theme.inc
+++ b/core/modules/views_ui/views_ui.theme.inc
@@ -6,7 +6,6 @@
*/
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
use Drupal\Core\Form\FormState;
use Drupal\Core\Render\Element;
use Drupal\Core\Url;
@@ -158,7 +157,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('<span>@text</span>', array('@text' => t('Remove'))), Url::fromRoute('<none>', [], array('attributes' => array('id' => 'views-remove-link-' . $group_id, 'class' => array('views-hidden', 'views-button-remove', 'views-groups-remove-link', 'views-remove-link'), 'alt' => t('Remove this item'), 'title' => t('Remove this item'))))),
+ '#markup' => drupal_render($form['group_items'][$group_id]['remove']) . \Drupal::l(SafeMarkup::format('<span>@text</span>', array('@text' => t('Remove'))), Url::fromRoute('<none>', [], 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 +281,7 @@ function template_preprocess_views_ui_rearrange_filter_form(&$variables) {
$remove_link = array(
'#type' => 'link',
'#url' => Url::fromRoute('<none>'),
- '#title' => String::format('<span>@text</span>', array('@text' => t('Remove'))),
+ '#title' => SafeMarkup::format('<span>@text</span>', 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 716059fc9c0b..ead6469990c4 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\SafeMarkup;
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]), SafeMarkup::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]), SafeMarkup::format('Generated duplicate random name !name', array('!name' => $str)));
$names[$str] = TRUE;
}
}
diff --git a/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php b/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
index 9480a7e2fd33..b289d57db9c1 100644
--- a/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
@@ -8,7 +8,7 @@
namespace Drupal\Tests\Component\Utility;
use Drupal\Component\Utility\UrlHelper;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Tests\UnitTestCase;
/**
@@ -94,7 +94,7 @@ public function providerTestValidAbsoluteData() {
public function testValidAbsolute($url, $scheme) {
$test_url = $scheme . '://' . $url;
$valid_url = UrlHelper::isValid($test_url, TRUE);
- $this->assertTrue($valid_url, String::format('@url is a valid URL.', array('@url' => $test_url)));
+ $this->assertTrue($valid_url, SafeMarkup::format('@url is a valid URL.', array('@url' => $test_url)));
}
/**
@@ -125,7 +125,7 @@ public function providerTestInvalidAbsolute() {
public function testInvalidAbsolute($url, $scheme) {
$test_url = $scheme . '://' . $url;
$valid_url = UrlHelper::isValid($test_url, TRUE);
- $this->assertFalse($valid_url, String::format('@url is NOT a valid URL.', array('@url' => $test_url)));
+ $this->assertFalse($valid_url, SafeMarkup::format('@url is NOT a valid URL.', array('@url' => $test_url)));
}
/**
@@ -159,7 +159,7 @@ public function providerTestValidRelativeData() {
public function testValidRelative($url, $prefix) {
$test_url = $prefix . $url;
$valid_url = UrlHelper::isValid($test_url);
- $this->assertTrue($valid_url, String::format('@url is a valid URL.', array('@url' => $test_url)));
+ $this->assertTrue($valid_url, SafeMarkup::format('@url is a valid URL.', array('@url' => $test_url)));
}
/**
@@ -190,7 +190,7 @@ public function providerTestInvalidRelativeData() {
public function testInvalidRelative($url, $prefix) {
$test_url = $prefix . $url;
$valid_url = UrlHelper::isValid($test_url);
- $this->assertFalse($valid_url, String::format('@url is NOT a valid URL.', array('@url' => $test_url)));
+ $this->assertFalse($valid_url, SafeMarkup::format('@url is NOT a valid URL.', array('@url' => $test_url)));
}
/**
diff --git a/core/tests/Drupal/Tests/Core/Config/ConfigTest.php b/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
index 936287ade329..a048f9567182 100644
--- a/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
@@ -10,7 +10,7 @@
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Tests\UnitTestCase;
use Drupal\Core\Config\Config;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* Tests the Config.
@@ -413,14 +413,14 @@ public function validateNameProvider() {
// Name missing namespace (dot).
array(
'MissingNamespace',
- String::format('Missing namespace in Config object name MissingNamespace.', array(
+ SafeMarkup::format('Missing namespace in Config object name MissingNamespace.', array(
'@name' => 'MissingNamespace',
)),
),
// Exceeds length (max length plus an extra dot).
array(
str_repeat('a', Config::MAX_NAME_LENGTH) . ".",
- String::format('Config object name @name exceeds maximum allowed length of @length characters.', array(
+ SafeMarkup::format('Config object name @name exceeds maximum allowed length of @length characters.', array(
'@name' => str_repeat('a', Config::MAX_NAME_LENGTH) . ".",
'@length' => Config::MAX_NAME_LENGTH,
)),
@@ -431,7 +431,7 @@ public function validateNameProvider() {
$name = 'name.' . $char;
$return[] = array(
$name,
- String::format('Invalid character in Config object name @name.', array(
+ SafeMarkup::format('Invalid character in Config object name @name.', array(
'@name' => $name,
)),
);
diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php
index d3dfc258d1b2..005362681ba9 100644
--- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php
@@ -9,7 +9,7 @@
use Drupal\Tests\UnitTestCase;
use Drupal\Core\Config\Entity\ConfigEntityType;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
/**
* @coversDefaultClass \Drupal\Core\Config\Entity\ConfigEntityType
@@ -50,7 +50,7 @@ public function testConfigPrefixLengthExceeds() {
'config_prefix' => $this->randomMachineName(59),
);
$config_entity = $this->setUpConfigEntityType($definition);
- $this->setExpectedException('\Drupal\Core\Config\ConfigPrefixLengthException', String::format($message_text, array(
+ $this->setExpectedException('\Drupal\Core\Config\ConfigPrefixLengthException', SafeMarkup::format($message_text, array(
'@config_prefix' => $definition['provider'] . '.' . $definition['config_prefix'],
'@max_char' => ConfigEntityType::PREFIX_LENGTH,
)));
diff --git a/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php b/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php
index b153d9fc76e6..518953197022 100644
--- a/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php
+++ b/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php
@@ -7,7 +7,7 @@
namespace Drupal\Tests\Core\Controller;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Controller\TitleResolver;
use Drupal\Tests\UnitTestCase;
use Symfony\Component\HttpFoundation\ParameterBag;
@@ -151,7 +151,7 @@ class TitleCallback {
* Returns the example string.
*/
public function example($value) {
- return String::format('test @value', array('@value' => $value));
+ return SafeMarkup::format('test @value', array('@value' => $value));
}
}
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
index 120cd3d2c5b0..8dc339eb0ea9 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
@@ -139,7 +139,7 @@ public function testGetOperations() {
/**
* Tests that buildRow() returns a string which has been run through
- * String::checkPlain().
+ * SafeMarkup::checkPlain().
*
* @dataProvider providerTestBuildRow
*
@@ -173,11 +173,11 @@ public function testBuildRow($input, $expected, $message, $ignorewarnings = FALS
* Data provider for testBuildRow().
*
* @see self::testBuildRow()
- * @see \Drupal\Tests\Component\Utility\StringTest::providerCheckPlain()
+ * @see \Drupal\Tests\Component\Utility\SafeMarkupTest::providerCheckPlain()
*
* @return array
* An array containing a string, the expected return from
- * String::checkPlain, a message to be output for failures, and whether the
+ * SafeMarkup::checkPlain, a message to be output for failures, and whether the
* test should be processed as multibyte.
*/
public function providerTestBuildRow() {
diff --git a/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php b/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php
index cc49c2cb32a8..5165c0c7168f 100644
--- a/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php
@@ -7,7 +7,7 @@
namespace Drupal\Tests\Core\Form;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Form\FormState;
use Drupal\Tests\UnitTestCase;
use Symfony\Component\HttpFoundation\Request;
@@ -477,7 +477,7 @@ public function providerTestPerformRequiredValidation() {
'#maxlength' => 7,
'#value' => $this->randomMachineName(8),
),
- String::format('!name cannot be longer than %max characters but is currently %length characters long.', array('!name' => 'Test', '%max' => '7', '%length' => 8)),
+ SafeMarkup::format('!name cannot be longer than %max characters but is currently %length characters long.', array('!name' => 'Test', '%max' => '7', '%length' => 8)),
FALSE,
),
);
diff --git a/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php b/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php
index 01c6ab9ea4fe..a192210f1345 100644
--- a/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php
+++ b/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php
@@ -7,7 +7,7 @@
namespace Drupal\Tests\Core\Path;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Path\PathMatcher;
use Drupal\Tests\UnitTestCase;
@@ -49,7 +49,7 @@ protected function setUp() {
public function testMatchPath($patterns, $paths) {
foreach ($paths as $path => $expected_result) {
$actual_result = $this->pathMatcher->matchPath($path, $patterns);
- $this->assertEquals($actual_result, $expected_result, String::format('Tried matching the path <code>@path</code> to the pattern <pre>@patterns</pre> - expected @expected, got @actual.', array(
+ $this->assertEquals($actual_result, $expected_result, SafeMarkup::format('Tried matching the path <code>@path</code> to the pattern <pre>@patterns</pre> - expected @expected, got @actual.', array(
'@path' => $path,
'@patterns' => $patterns,
'@expected' => var_export($expected_result, TRUE),
diff --git a/core/tests/Drupal/Tests/Core/Transliteration/PhpTransliterationTest.php b/core/tests/Drupal/Tests/Core/Transliteration/PhpTransliterationTest.php
index 44d5d9538adf..c975551ca610 100644
--- a/core/tests/Drupal/Tests/Core/Transliteration/PhpTransliterationTest.php
+++ b/core/tests/Drupal/Tests/Core/Transliteration/PhpTransliterationTest.php
@@ -8,7 +8,7 @@
namespace Drupal\Tests\Core\Transliteration;
use Drupal\Component\Utility\Random;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Transliteration\PhpTransliteration;
use Drupal\Tests\UnitTestCase;
@@ -59,7 +59,7 @@ public function testPhpTransliterationWithAlter($langcode, $original, $expected,
$transliteration = new PhpTransliteration(NULL, $module_handler);
$actual = $transliteration->transliterate($original, $langcode);
- $this->assertSame($expected, $actual, String::format('@original transliteration to @actual is identical to @expected for language @langcode in service instance.', array(
+ $this->assertSame($expected, $actual, SafeMarkup::format('@original transliteration to @actual is identical to @expected for language @langcode in service instance.', array(
'@original' => $printable,
'@langcode' => $langcode,
'@expected' => $expected,
diff --git a/core/tests/Drupal/Tests/UnitTestCase.php b/core/tests/Drupal/Tests/UnitTestCase.php
index e82c3a96f4f0..c15bff26a3c4 100644
--- a/core/tests/Drupal/Tests/UnitTestCase.php
+++ b/core/tests/Drupal/Tests/UnitTestCase.php
@@ -202,7 +202,7 @@ public function getStringTranslationStub() {
$translation = $this->getMock('Drupal\Core\StringTranslation\TranslationInterface');
$translation->expects($this->any())
->method('translate')
- ->will($this->returnCallback('Drupal\Component\Utility\String::format'));
+ ->will($this->returnCallback('Drupal\Component\Utility\SafeMarkup::format'));
return $translation;
}
diff --git a/core/themes/bartik/bartik.theme b/core/themes/bartik/bartik.theme
index 7148e84e711e..1f69448e47ee 100644
--- a/core/themes/bartik/bartik.theme
+++ b/core/themes/bartik/bartik.theme
@@ -5,7 +5,7 @@
* Functions to support theming in the Bartik theme.
*/
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Template\Attribute;
@@ -120,7 +120,7 @@ function _bartik_process_page(&$variables) {
$variables['hide_site_slogan'] = theme_get_setting('features.slogan') ? FALSE : TRUE;
if ($variables['hide_site_name']) {
// If toggle_name is FALSE, the site_name will be empty, so we rebuild it.
- $variables['site_name'] = String::checkPlain($site_config->get('name'));
+ $variables['site_name'] = SafeMarkup::checkPlain($site_config->get('name'));
}
if ($variables['hide_site_slogan']) {
// If toggle_site_slogan is FALSE, the site_slogan will be empty, so we
diff --git a/core/themes/classy/templates/navigation/links.html.twig b/core/themes/classy/templates/navigation/links.html.twig
index dd9272e0f079..c59c4c2f3cab 100644
--- a/core/themes/classy/templates/navigation/links.html.twig
+++ b/core/themes/classy/templates/navigation/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\SafeMarkup::checkPlain().
* - attributes: (optional) HTML attributes for the anchor, or for the <span>
* tag if no 'href' is supplied.
* - link_key: The link CSS class.
diff --git a/core/themes/engines/twig/twig.engine b/core/themes/engines/twig/twig.engine
index a7a8b279b595..324203e225a2 100644
--- a/core/themes/engines/twig/twig.engine
+++ b/core/themes/engines/twig/twig.engine
@@ -6,7 +6,6 @@
*/
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\String;
use Drupal\Core\Extension\Extension;
/**
@@ -65,7 +64,7 @@ function twig_render_template($template_file, array $variables) {
}
if ($twig_service->isDebug()) {
$output['debug_prefix'] .= "\n\n<!-- THEME DEBUG -->";
- $output['debug_prefix'] .= "\n<!-- THEME HOOK: '" . String::checkPlain($variables['theme_hook_original']) . "' -->";
+ $output['debug_prefix'] .= "\n<!-- THEME HOOK: '" . SafeMarkup::checkPlain($variables['theme_hook_original']) . "' -->";
// If there are theme suggestions, reverse the array so more specific
// suggestions are shown first.
if (!empty($variables['theme_hook_suggestions'])) {
@@ -99,10 +98,10 @@ function twig_render_template($template_file, array $variables) {
$prefix = ($template == $current_template) ? 'x' : '*';
$suggestion = $prefix . ' ' . $template;
}
- $output['debug_info'] .= "\n<!-- FILE NAME SUGGESTIONS:\n " . String::checkPlain(implode("\n ", $suggestions)) . "\n-->";
+ $output['debug_info'] .= "\n<!-- FILE NAME SUGGESTIONS:\n " . SafeMarkup::checkPlain(implode("\n ", $suggestions)) . "\n-->";
}
- $output['debug_info'] .= "\n<!-- BEGIN OUTPUT from '" . String::checkPlain($template_file) . "' -->\n";
- $output['debug_suffix'] .= "\n<!-- END OUTPUT from '" . String::checkPlain($template_file) . "' -->\n\n";
+ $output['debug_info'] .= "\n<!-- BEGIN OUTPUT from '" . SafeMarkup::checkPlain($template_file) . "' -->\n";
+ $output['debug_suffix'] .= "\n<!-- END OUTPUT from '" . SafeMarkup::checkPlain($template_file) . "' -->\n\n";
}
return SafeMarkup::set(implode('', $output));
}
@@ -263,7 +262,7 @@ function twig_drupal_escape_filter(\Twig_Environment $env, $string, $strategy =
// Drupal only supports the HTML escaping strategy, so provide a
// fallback for other strategies.
if ($strategy == 'html') {
- return String::checkPlain($return);
+ return SafeMarkup::checkPlain($return);
}
return twig_escape_filter($env, $return, $strategy, $charset, $autoescape);
}
diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme
index 621cf8248fc3..c24035e7e8ce 100644
--- a/core/themes/seven/seven.theme
+++ b/core/themes/seven/seven.theme
@@ -6,7 +6,7 @@
*/
use Drupal\Component\Utility\Xss;
-use Drupal\Component\Utility\String;
+use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Form\FormStateInterface;
/**
@@ -74,7 +74,7 @@ function seven_preprocess_node_add_list(&$variables) {
if (!empty($variables['content'])) {
/** @var \Drupal\node\NodeTypeInterface $type */
foreach ($variables['content'] as $type) {
- $variables['types'][$type->id()]['label'] = String::checkPlain($type->label());
+ $variables['types'][$type->id()]['label'] = SafeMarkup::checkPlain($type->label());
$variables['types'][$type->id()]['description'] = Xss::filterAdmin($type->getDescription());
$variables['types'][$type->id()]['url'] = \Drupal::url('node.add', array('node_type' => $type->id()));
}
@@ -90,7 +90,7 @@ function seven_preprocess_node_add_list(&$variables) {
function seven_preprocess_block_content_add_list(&$variables) {
if (!empty($variables['content'])) {
foreach ($variables['content'] as $type) {
- $variables['types'][$type->id()]['label'] = String::checkPlain($type->label());
+ $variables['types'][$type->id()]['label'] = SafeMarkup::checkPlain($type->label());
$variables['types'][$type->id()]['description'] = Xss::filterAdmin($type->getDescription());
$options = array('query' => \Drupal::request()->query->all());
$variables['types'][$type->id()]['url'] = \Drupal::url('block_content.add_form', array('block_content_type' => $type->id()), $options);
--
GitLab