' . $this->t('Most unusual characters can be directly entered without any problems.') . '
'; $output .= '' . $this->t('If you do encounter problems, try using HTML character entities. A common example looks like & for an ampersand & character. For a full list of entities see HTML\'s entities page. Some of the available characters include:', [':html-entities' => 'http://www.w3.org/TR/html4/sgml/entities.html']) . '
'; @@ -461,7 +461,7 @@ public function tips($long = FALSE) { '#header' => $header, '#rows' => $rows, ]; - $output .= drupal_render($table); + $output .= \Drupal::service('renderer')->render($table); return $output; } diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module index c2de3c9e0b..51472cf8c5 100644 --- a/core/modules/forum/forum.module +++ b/core/modules/forum/forum.module @@ -460,12 +460,12 @@ function template_preprocess_forums(&$variables) { 'name' => $topic->getOwner()->getDisplayName(), 'created' => $topic->getCreatedTime(), ]]; - $variables['topics'][$id]->submitted = drupal_render($forum_submitted); + $variables['topics'][$id]->submitted = \Drupal::service('renderer')->render($forum_submitted); $forum_submitted = [ '#theme' => 'forum_submitted', '#topic' => isset($topic->last_reply) ? $topic->last_reply : NULL, ]; - $variables['topics'][$id]->last_reply = drupal_render($forum_submitted); + $variables['topics'][$id]->last_reply = \Drupal::service('renderer')->render($forum_submitted); $variables['topics'][$id]->new_text = ''; $variables['topics'][$id]->new_url = ''; @@ -569,7 +569,7 @@ function template_preprocess_forum_list(&$variables) { $variables['forums'][$id]->old_topics = $forum->num_topics - $variables['forums'][$id]->new_topics; } $forum_submitted = ['#theme' => 'forum_submitted', '#topic' => $forum->last_post]; - $variables['forums'][$id]->last_reply = drupal_render($forum_submitted); + $variables['forums'][$id]->last_reply = \Drupal::service('renderer')->render($forum_submitted); } $variables['pager'] = [ @@ -636,7 +636,7 @@ function template_preprocess_forum_submitted(&$variables) { $variables['author'] = ''; if (isset($variables['topic']->uid)) { $username = ['#theme' => 'username', '#account' => User::load($variables['topic']->uid)]; - $variables['author'] = drupal_render($username); + $variables['author'] = \Drupal::service('renderer')->render($username); } $variables['time'] = isset($variables['topic']->created) ? \Drupal::service('date.formatter')->formatTimeDiffSince($variables['topic']->created) : ''; } diff --git a/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php b/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php index f33dab25aa..3a8b22d00e 100644 --- a/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php +++ b/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php @@ -96,7 +96,7 @@ public function render(ResultRow $values) { '#theme' => 'mark', '#status' => $mark, ]; - return $this->renderLink(drupal_render($build), $values); + return $this->renderLink(\Drupal::service('renderer')->render($build), $values); } } diff --git a/core/modules/image/src/Form/ImageStyleEditForm.php b/core/modules/image/src/Form/ImageStyleEditForm.php index 574d9145a8..1e242954b5 100644 --- a/core/modules/image/src/Form/ImageStyleEditForm.php +++ b/core/modules/image/src/Form/ImageStyleEditForm.php @@ -58,7 +58,7 @@ public function form(array $form, FormStateInterface $form_state) { $form['preview'] = [ '#type' => 'item', '#title' => $this->t('Preview'), - '#markup' => drupal_render($preview_arguments), + '#markup' => \Drupal::service('renderer')->render($preview_arguments), // Render preview above parent elements. '#weight' => -5, ]; diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc index 6c3bb5fd3d..b96ee5aff6 100644 --- a/core/modules/node/node.admin.inc +++ b/core/modules/node/node.admin.inc @@ -173,7 +173,7 @@ function _node_mass_update_batch_finished($success, $results, $operations) { '#theme' => 'item_list', '#items' => $results, ]; - $message .= drupal_render($item_list); + $message .= \Drupal::service('renderer')->render($item_list); drupal_set_message($message); } } diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 466f510001..4e76edddd2 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -593,9 +593,9 @@ function template_preprocess_node(&$variables) { $variables['node'] = $variables['elements']['#node']; /** @var \Drupal\node\NodeInterface $node */ $node = $variables['node']; - $variables['date'] = drupal_render($variables['elements']['created']); + $variables['date'] = \Drupal::service('renderer')->render($variables['elements']['created']); unset($variables['elements']['created']); - $variables['author_name'] = drupal_render($variables['elements']['uid']); + $variables['author_name'] = \Drupal::service('renderer')->render($variables['elements']['uid']); unset($variables['elements']['uid']); $variables['url'] = $node->url('canonical', [ diff --git a/core/modules/node/src/NodeListBuilder.php b/core/modules/node/src/NodeListBuilder.php index 62666497e8..4dbdf27bf2 100644 --- a/core/modules/node/src/NodeListBuilder.php +++ b/core/modules/node/src/NodeListBuilder.php @@ -110,7 +110,7 @@ public function buildRow(EntityInterface $entity) { $row['title']['data'] = [ '#type' => 'link', '#title' => $entity->label(), - '#suffix' => ' ' . drupal_render($mark), + '#suffix' => ' ' . \Drupal::service('renderer')->render($mark), '#url' => $uri, ]; $row['type'] = node_get_type_label($entity); diff --git a/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php b/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php index c0081882ce..3709853335 100644 --- a/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php +++ b/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php @@ -24,7 +24,7 @@ class UnpublishByKeywordNode extends ConfigurableActionBase { public function execute($node = NULL) { foreach ($this->configuration['keywords'] as $keyword) { $elements = node_view(clone $node); - if (strpos(drupal_render($elements), $keyword) !== FALSE || strpos($node->label(), $keyword) !== FALSE) { + if (strpos(\Drupal::service('renderer')->render($elements), $keyword) !== FALSE || strpos($node->label(), $keyword) !== FALSE) { $node->setPublished(FALSE); $node->save(); break; diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module index 0afcb09186..8d4329884d 100644 --- a/core/modules/rdf/rdf.module +++ b/core/modules/rdf/rdf.module @@ -329,7 +329,7 @@ function rdf_preprocess_node(&$variables) { '#theme' => 'rdf_metadata', '#metadata' => [$date_attributes], ]; - $variables['metadata'] = drupal_render($rdf_metadata); + $variables['metadata'] = \Drupal::service('renderer')->render($rdf_metadata); } // Adds RDFa markup annotating the number of comments a node has. @@ -534,7 +534,7 @@ function rdf_preprocess_comment(&$variables) { if (!empty($variables['content']['comment_body']['#prefix'])) { $rdf_metadata['#suffix'] = $variables['content']['comment_body']['#prefix']; } - $variables['content']['comment_body']['#prefix'] = drupal_render($rdf_metadata); + $variables['content']['comment_body']['#prefix'] = \Drupal::service('renderer')->render($rdf_metadata); } } diff --git a/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php b/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php index d18ff1c925..899986ae60 100644 --- a/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php +++ b/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php @@ -81,7 +81,7 @@ public function buildResults() { $pager = [ '#type' => 'pager', ]; - $output['suffix']['#markup'] = '' . drupal_render($pager); + $output['suffix']['#markup'] = '' . \Drupal::service('renderer')->render($pager); return $output; } diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module index e5c67d3954..83d7feb699 100644 --- a/core/modules/simpletest/simpletest.module +++ b/core/modules/simpletest/simpletest.module @@ -445,20 +445,20 @@ function _simpletest_batch_operation($test_list_init, $test_id, &$context) { '#theme' => 'simpletest_result_summary', '#label' => t($test_results[$class]['#name'] . ':'), ]; - array_unshift($items, drupal_render($class_test_result)); + array_unshift($items, \Drupal::service('renderer')->render($class_test_result)); } $context['message'] = t('Processed test @num of @max - %test.', ['%test' => $info['name'], '@num' => $max - $size, '@max' => $max]); $overall_results = $test_results + [ '#theme' => 'simpletest_result_summary', '#label' => t('Overall results:'), ]; - $context['message'] .= drupal_render($overall_results); + $context['message'] .= \Drupal::service('renderer')->render($overall_results); $item_list = [ '#theme' => 'item_list', '#items' => $items, ]; - $context['message'] .= drupal_render($item_list); + $context['message'] .= \Drupal::service('renderer')->render($item_list); // Save working values for the next iteration. $context['sandbox']['tests'] = $test_list; diff --git a/core/modules/system/tests/modules/theme_test/theme_test.module b/core/modules/system/tests/modules/theme_test/theme_test.module index 2e6f164733..6a701abee9 100644 --- a/core/modules/system/tests/modules/theme_test/theme_test.module +++ b/core/modules/system/tests/modules/theme_test/theme_test.module @@ -153,7 +153,7 @@ function template_preprocess_theme_test_render_element(&$variables) { * - element: An associative array containing the properties of the element. */ function theme_theme_test_render_element_children($variables) { - return drupal_render($variables['element']); + return \Drupal::service('renderer')->render($variables['element']); } /** diff --git a/core/modules/taxonomy/src/Form/OverviewTerms.php b/core/modules/taxonomy/src/Form/OverviewTerms.php index 0ccb24b49b..3811ee5fd8 100644 --- a/core/modules/taxonomy/src/Form/OverviewTerms.php +++ b/core/modules/taxonomy/src/Form/OverviewTerms.php @@ -227,7 +227,7 @@ public function buildForm(array $form, FormStateInterface $form_state, Vocabular ]; } $form['terms'][$key]['term'] = [ - '#prefix' => !empty($indentation) ? drupal_render($indentation) : '', + '#prefix' => !empty($indentation) ? \Drupal::service('renderer')->render($indentation) : '', '#type' => 'link', '#title' => $term->getName(), '#url' => $term->urlInfo(), diff --git a/core/modules/update/src/Form/UpdateManagerUpdate.php b/core/modules/update/src/Form/UpdateManagerUpdate.php index 62572d60d3..60f506af04 100644 --- a/core/modules/update/src/Form/UpdateManagerUpdate.php +++ b/core/modules/update/src/Form/UpdateManagerUpdate.php @@ -69,7 +69,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#last' => $this->state->get('update.last_check') ?: 0, ]; $form['last_check'] = [ - '#markup' => drupal_render($last_markup), + '#markup' => \Drupal::service('renderer')->render($last_markup), ]; if (!_update_manager_check_backends($form, 'update')) { diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc index d9067f4a12..399694f2c7 100644 --- a/core/modules/update/update.manager.inc +++ b/core/modules/update/update.manager.inc @@ -53,7 +53,7 @@ function update_manager_download_batch_finished($success, $results) { '#title' => t('Downloading updates failed:'), '#items' => $results['errors'], ]; - drupal_set_message(drupal_render($item_list), 'error'); + drupal_set_message(\Drupal::service('renderer')->render($item_list), 'error'); } elseif ($success) { drupal_set_message(t('Updates downloaded successfully.')); diff --git a/core/modules/views/src/Analyzer.php b/core/modules/views/src/Analyzer.php index a5de193ded..a6a8d56bf4 100644 --- a/core/modules/views/src/Analyzer.php +++ b/core/modules/views/src/Analyzer.php @@ -77,7 +77,7 @@ public function formatMessages(array $messages) { '#theme' => 'item_list', '#items' => $messages, ]; - $message = drupal_render($item_list); + $message = \Drupal::service('renderer')->render($item_list); } elseif ($messages) { $message = array_shift($messages); diff --git a/core/modules/views/src/Plugin/views/area/Result.php b/core/modules/views/src/Plugin/views/area/Result.php index d2f1b01ab6..2bbd23bb24 100644 --- a/core/modules/views/src/Plugin/views/area/Result.php +++ b/core/modules/views/src/Plugin/views/area/Result.php @@ -47,7 +47,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { '@page_count -- the total page count', ], ]; - $list = drupal_render($item_list); + $list = \Drupal::service('renderer')->render($item_list); $form['content'] = [ '#title' => $this->t('Display'), '#type' => 'textarea', diff --git a/core/modules/views/src/Plugin/views/field/PrerenderList.php b/core/modules/views/src/Plugin/views/field/PrerenderList.php index f851cbb6a0..f27973ebbf 100644 --- a/core/modules/views/src/Plugin/views/field/PrerenderList.php +++ b/core/modules/views/src/Plugin/views/field/PrerenderList.php @@ -90,7 +90,7 @@ public function renderItems($items) { '#list_type' => $this->options['type'], ]; } - return drupal_render($render); + return \Drupal::service('renderer')->render($render); } } diff --git a/core/modules/views/views.module b/core/modules/views/views.module index f6b4f79f9e..453c90bd79 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -614,7 +614,7 @@ function views_pre_render_views_form_views_form($element) { $row_id = $substitution['row_id']; $search[] = $substitution['placeholder']; - $replace[] = isset($element[$field_name][$row_id]) ? drupal_render($element[$field_name][$row_id]) : ''; + $replace[] = isset($element[$field_name][$row_id]) ? \Drupal::service('renderer')->render($element[$field_name][$row_id]) : ''; } // Add in substitutions from hook_views_form_substitutions(). $substitutions = \Drupal::moduleHandler()->invokeAll('views_form_substitutions'); @@ -628,7 +628,7 @@ function views_pre_render_views_form_views_form($element) { } // Apply substitutions to the rendered output. - $output = str_replace($search, $replace, drupal_render($element['output'])); + $output = str_replace($search, $replace, \Drupal::service('renderer')->render($element['output'])); $element['output'] = ['#markup' => ViewsRenderPipelineMarkup::create($output)]; return $element; diff --git a/core/modules/views_ui/src/Form/BreakLockForm.php b/core/modules/views_ui/src/Form/BreakLockForm.php index 94a626f273..b73e618cc2 100644 --- a/core/modules/views_ui/src/Form/BreakLockForm.php +++ b/core/modules/views_ui/src/Form/BreakLockForm.php @@ -74,7 +74,7 @@ public function getDescription() { '#theme' => 'username', '#account' => $account, ]; - return $this->t('By breaking this lock, any unsaved changes made by @user will be lost.', ['@user' => drupal_render($username)]); + return $this->t('By breaking this lock, any unsaved changes made by @user will be lost.', ['@user' => \Drupal::service('renderer')->render($username)]); } /** diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php index 67d1229555..fe3d86fc66 100644 --- a/core/modules/views_ui/src/ViewEditForm.php +++ b/core/modules/views_ui/src/ViewEditForm.php @@ -129,7 +129,7 @@ public function form(array $form, FormStateInterface $form_state) { '#account' => $this->entityManager->getStorage('user')->load($view->lock->owner), ]; $lock_message_substitutions = [ - '@user' => drupal_render($username), + '@user' => \Drupal::service('renderer')->render($username), '@age' => $this->dateFormatter->formatTimeDiffSince($view->lock->updated), ':url' => $view->url('break-lock-form'), ]; diff --git a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php index 3e1ee407ec..0666367c21 100644 --- a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php +++ b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php @@ -46,7 +46,7 @@ public function testBubblingWithoutPreRender() { $element = [ '#type' => 'container', '#cache' => [ - 'keys' => ['simpletest', 'drupal_render', 'children_attached'], + 'keys' => ['simpletest', 'renderer', 'children_attached'], ], '#attached' => ['library' => ['test/parent']], '#title' => 'Parent', @@ -68,7 +68,7 @@ public function testBubblingWithoutPreRender() { // Load the element from cache and verify the presence of the #attached // JavaScript. - $element = ['#cache' => ['keys' => ['simpletest', 'drupal_render', 'children_attached']]]; + $element = ['#cache' => ['keys' => ['simpletest', 'renderer', 'children_attached']]]; $this->assertTrue(strlen($this->renderer->renderRoot($element)) > 0, 'The element was retrieved from cache.'); $this->assertEquals($element['#attached']['library'], $expected_libraries, 'The element, child and subchild #attached libraries are included.'); } diff --git a/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php b/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php index 00426c252d..a92c363619 100644 --- a/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php +++ b/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php @@ -996,7 +996,7 @@ public function testRenderChildrenPlaceholdersDifferentArguments() { $this->assertSame($element['#attached']['drupalSettings'], $expected_js_settings, '#attached is modified; both the original JavaScript setting and the ones added by each placeholder #lazy_builder callback exist.'); // GET request: validate cached data. - $cached_element = $this->memoryCache->get('simpletest:drupal_render:children_placeholders')->data; + $cached_element = $this->memoryCache->get('simpletest:renderer:children_placeholders')->data; $expected_element = [ '#attached' => [ 'drupalSettings' => [ @@ -1066,7 +1066,7 @@ protected function generatePlaceholdersWithChildrenTestElement(array $args_1, ar $test_element = [ '#type' => 'details', '#cache' => [ - 'keys' => ['simpletest', 'drupal_render', 'children_placeholders'], + 'keys' => ['simpletest', 'renderer', 'children_placeholders'], ], '#title' => 'Parent', '#attached' => [