Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3294833 by claudiu.cristea, alexpott: Page variant plugin is not correctlly instantiated

merge-requests/2817/merge
Alex Pott 2022-10-03 14:22:33 +01:00
parent 6402539128
commit c0bee1ddda
No known key found for this signature in database
GPG Key ID: BDA67E7EE836E5CE
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
View File

@ -219,6 +219,7 @@ class HtmlRenderer implements MainContentRendererInterface {
$event = new PageDisplayVariantSelectionEvent('simple_page', $route_match); $event = new PageDisplayVariantSelectionEvent('simple_page', $route_match);
$this->eventDispatcher->dispatch($event, RenderEvents::SELECT_PAGE_DISPLAY_VARIANT); $this->eventDispatcher->dispatch($event, RenderEvents::SELECT_PAGE_DISPLAY_VARIANT);
$variant_id = $event->getPluginId(); $variant_id = $event->getPluginId();
$variant_configuration = $event->getPluginConfiguration();
// We must render the main content now already, because it might provide a // We must render the main content now already, because it might provide a
// title. We set its $is_root_call parameter to FALSE, to ensure // title. We set its $is_root_call parameter to FALSE, to ensure
@ -244,15 +245,14 @@ class HtmlRenderer implements MainContentRendererInterface {
$title = $get_title($main_content); $title = $get_title($main_content);
// Instantiate the page display, and give it the main content. // Instantiate the page display, and give it the main content.
$page_display = $this->displayVariantManager->createInstance($variant_id); $page_display = $this->displayVariantManager->createInstance($variant_id, $variant_configuration);
if (!$page_display instanceof PageVariantInterface) { if (!$page_display instanceof PageVariantInterface) {
throw new \LogicException('Cannot render the main content for this page because the provided display variant does not implement PageVariantInterface.'); throw new \LogicException('Cannot render the main content for this page because the provided display variant does not implement PageVariantInterface.');
} }
$page_display $page_display
->setMainContent($main_content) ->setMainContent($main_content)
->setTitle($title) ->setTitle($title)
->addCacheableDependency($event) ->addCacheableDependency($event);
->setConfiguration($event->getPluginConfiguration());
// Some display variants need to be passed an array of contexts with // Some display variants need to be passed an array of contexts with
// values because they can't get all their contexts globally. For example, // values because they can't get all their contexts globally. For example,
// in Page Manager, you can create a Page which has a specific static // in Page Manager, you can create a Page which has a specific static

2
core/modules/system/tests/modules/display_variant_test/src/Plugin/DisplayVariant/TestDisplayVariant.php
View File

@ -67,6 +67,7 @@ class TestDisplayVariant extends VariantBase implements PageVariantInterface, Co
* {@inheritdoc} * {@inheritdoc}
*/ */
public function setMainContent(array $main_content) { public function setMainContent(array $main_content) {
assert(!empty($this->getConfiguration()['required_configuration']), 'Ensure that ::setMainContent() is called with the variant configuration');
$this->mainContent = $main_content; $this->mainContent = $main_content;
return $this; return $this;
} }
@ -75,6 +76,7 @@ class TestDisplayVariant extends VariantBase implements PageVariantInterface, Co
* {@inheritdoc} * {@inheritdoc}
*/ */
public function setTitle($title) { public function setTitle($title) {
assert(!empty($this->getConfiguration()['required_configuration']), 'Ensure that ::setTitle() is called with the variant configuration');
$this->title = $title; $this->title = $title;
return $this; return $this;
} }