diff --git a/core/includes/common.inc b/core/includes/common.inc index d81fd13..e2a5d4f 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -21,7 +21,6 @@ use Drupal\Core\StringTranslation\PluralTranslatableMarkup; use Drupal\Core\Render\BubbleableMetadata; use Drupal\Core\Render\Element; -use Drupal\Core\Render\BareHtmlPageRenderer; /** * @defgroup php_wrappers PHP wrapper functions @@ -897,7 +896,7 @@ function drupal_render_children(&$element, $children_keys = NULL) { $output = ''; foreach ($children_keys as $key) { if (!empty($element[$key])) { - $output .= \Drupal::service('bare_html_page_renderer')->render($element[$key]); + $output .= \Drupal::service('renderer')->render($element[$key]); } } return Markup::create($output); diff --git a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php index a3835e1..43f85c7 100644 --- a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php +++ b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php @@ -45,7 +45,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', @@ -67,7 +67,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 530f603..8d9bf0e 100644 --- a/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php +++ b/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php @@ -1007,7 +1007,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' => [ @@ -1077,7 +1077,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' => [