Skip to content
Snippets Groups Projects
Commit d0337fa7 authored by catch's avatar catch
Browse files

Issue #3374253 by TwoD, smustgrave: The renderer throws away cache metadata...

Issue #3374253 by TwoD, smustgrave: The renderer throws away cache metadata from access result if it is not allowed
parent 349e4c5d
No related branches found
No related tags found
41 merge requests!54479.5.x SF update,!5014Issue #3071143: Table Render Array Example Is Incorrect,!4868Issue #1428520: Improve menu parent link selection,!4594Applying patch for Views Global Text area field to allow extra HTML tags. As video, source and iframe tag is not rendering. Due to which Media embedded video and remote-video not rendering in Views Global Text area field.,!3878Removed unused condition head title for views,!38582585169-10.1.x,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3668Resolve #3347842 "Deprecate the trusted",!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3546refactored dialog.pcss file,!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3502Issue #3335308: Confusing behavior with FormState::setFormState and FormState::setMethod,!3452Issue #3332701: Refactor Claro's tablesort-indicator stylesheet,!3451Issue #2410579: Allows setting the current language programmatically.,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3226Issue #2987537: Custom menu link entity type should not declare "bundle" entity key,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3147Issue #3328457: Replace most substr($a, $i) where $i is negative with str_ends_with(),!3146Issue #3328456: Replace substr($a, 0, $i) with str_starts_with(),!3133core/modules/system/css/components/hidden.module.css,!31312878513-10.1.x,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2614Issue #2981326: Replace non-test usages of \Drupal::logger() with IoC injection,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2334Issue #3228209: Add hasRole() method to AccountInterface,!2062Issue #3246454: Add weekly granularity to views date sort,!1591Issue #3199697: Add JSON:API Translation experimental module,!1255Issue #3238922: Refactor (if feasible) uses of the jQuery serialize function to use vanillaJS,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!877Issue #2708101: Default value for link text is not saved,!844Resolve #3036010 "Updaters",!673Issue #3214208: FinishResponseSubscriber could create duplicate headers,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493,!485Sets the autocomplete attribute for username/password input field on login form.,!30Issue #3182188: Updates composer usage to point at ./vendor/bin/composer
......@@ -233,6 +233,14 @@ protected function doRender(&$elements, $is_root_call = FALSE) {
if ($elements['#access'] instanceof AccessResultInterface) {
$this->addCacheableDependency($elements, $elements['#access']);
if (!$elements['#access']->isAllowed()) {
// Abort, but bubble new cache metadata from the access result.
$context = $this->getCurrentRenderContext();
if (!isset($context)) {
throw new \LogicException("Render context is empty, because render() was called outside of a renderRoot() or renderPlain() call. Use renderPlain()/renderRoot() or #lazy_builder/#pre_render instead.");
}
$context->push(new BubbleableMetadata());
$context->update($elements);
$context->bubble();
return '';
}
}
......@@ -592,7 +600,7 @@ public function executeInRenderContext(RenderContext $context, callable $callabl
/**
* Returns the current render context.
*
* @return \Drupal\Core\Render\RenderContext
* @return \Drupal\Core\Render\RenderContext|null
* The current render context.
*/
protected function getCurrentRenderContext() {
......
......@@ -625,11 +625,6 @@ parameters:
count: 1
path: lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
-
message: "#^Variable \\$context in isset\\(\\) always exists and is not nullable\\.$#"
count: 1
path: lib/Drupal/Core/Render/Renderer.php
-
message: "#^Variable \\$transaction in isset\\(\\) always exists and is not nullable\\.$#"
count: 1
......
......@@ -791,13 +791,47 @@ public function testRenderWithThemeArguments() {
$this->assertEquals($this->renderer->renderRoot($element), $element['#foo'] . $element['#bar'], 'Passing arguments to theme functions works');
}
/**
* Provides a list of access conditions and expected cache metadata.
*
* @return array
*/
public function providerRenderCache() {
return [
'full access' => [
NULL,
[
'render_cache_tag',
'render_cache_tag_child:1',
'render_cache_tag_child:2',
],
],
'no child access' => [
AccessResult::forbidden()
->addCacheTags([
'render_cache_tag_child_access:1',
'render_cache_tag_child_access:2',
]),
[
'render_cache_tag',
'render_cache_tag_child:1',
'render_cache_tag_child:2',
'render_cache_tag_child_access:1',
'render_cache_tag_child_access:2',
],
],
];
}
/**
* @covers ::render
* @covers ::doRender
* @covers \Drupal\Core\Render\RenderCache::get
* @covers \Drupal\Core\Render\RenderCache::set
*
* @dataProvider providerRenderCache
*/
public function testRenderCache() {
public function testRenderCache($child_access, $expected_tags) {
$this->setUpRequest();
$this->setupMemoryCache();
......@@ -809,6 +843,7 @@ public function testRenderCache() {
],
'#markup' => '',
'child' => [
'#access' => $child_access,
'#cache' => [
'keys' => ['render_cache_test_child'],
'tags' => ['render_cache_tag_child:1', 'render_cache_tag_child:2'],
......@@ -831,11 +866,6 @@ public function testRenderCache() {
// Test that cache tags are correctly collected from the render element,
// including the ones from its subchild.
$expected_tags = [
'render_cache_tag',
'render_cache_tag_child:1',
'render_cache_tag_child:2',
];
$this->assertEquals($expected_tags, $element['#cache']['tags'], 'Cache tags were collected from the element and its subchild.');
// The cache item also has a 'rendered' cache tag.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment