diff --git a/page_manager_ui/src/Form/PageReorderVariantsForm.php b/page_manager_ui/src/Form/PageReorderVariantsForm.php index edcb525..2d209d8 100644 --- a/page_manager_ui/src/Form/PageReorderVariantsForm.php +++ b/page_manager_ui/src/Form/PageReorderVariantsForm.php @@ -88,9 +88,7 @@ class PageReorderVariantsForm extends FormBase { $variants = $page->getVariants(); if (!empty($cached_values['deleted_variants'])) { foreach ($cached_values['deleted_variants'] as $page_variant) { - if (isset($variants[$page_variant->id()])) { - unset($variants[$page_variant->id()]); - } + unset($variants[$page_variant->id()]); } } /** @var \Drupal\page_manager\PageVariantInterface $page_variant */ diff --git a/page_manager_ui/src/Wizard/PageEditWizard.php b/page_manager_ui/src/Wizard/PageEditWizard.php index 682d7f7..ea3a969 100644 --- a/page_manager_ui/src/Wizard/PageEditWizard.php +++ b/page_manager_ui/src/Wizard/PageEditWizard.php @@ -32,9 +32,7 @@ class PageEditWizard extends PageWizardBase { $variants = $page->getVariants(); if (!empty($cached_values['deleted_variants'])) { foreach ($cached_values['deleted_variants'] as $page_variant) { - if (isset($variants[$page_variant->id()])) { - unset($variants[$page_variant->id()]); - } + unset($variants[$page_variant->id()]); } } // Suppress errors because of https://bugs.php.net/bug.php?id=50688. diff --git a/src/Entity/Page.php b/src/Entity/Page.php index 6f0a36a..21d9b30 100644 --- a/src/Entity/Page.php +++ b/src/Entity/Page.php @@ -322,7 +322,7 @@ class Page extends ConfigEntityBase implements PageInterface { * {@inheritdoc} */ public function getContexts() { - if (!$this->contexts) { + if (empty($this->contexts)) { $this->eventDispatcher()->dispatch(PageManagerEvents::PAGE_CONTEXT, new PageManagerContextEvent($this)); } return $this->contexts;