From 869a4aee4915662f464653c116bc1731f14a1e48 Mon Sep 17 00:00:00 2001 From: Lee <8024370+millnut@users.noreply.github.com> Date: Tue, 5 Nov 2024 12:07:06 +0000 Subject: [PATCH 1/4] fix: strict types error (#180) * fix: strict types error * fix: strict types error --- src/Plugin/PreviewLinkAutopopulate/Guides.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Plugin/PreviewLinkAutopopulate/Guides.php b/src/Plugin/PreviewLinkAutopopulate/Guides.php index ffe194d..07aed57 100644 --- a/src/Plugin/PreviewLinkAutopopulate/Guides.php +++ b/src/Plugin/PreviewLinkAutopopulate/Guides.php @@ -26,6 +26,7 @@ class Guides extends PreviewLinkAutopopulatePluginBase { * {@inheritdoc} */ public function getPreviewEntities(): array { + $overview = NULL; $guide_nodes = []; // Find guide overview. @@ -36,13 +37,16 @@ public function getPreviewEntities(): array { elseif ($node->bundle() == 'localgov_guides_page') { $overview = $node->get('localgov_guides_parent')->entity; } - $guide_nodes[] = $overview; - // Find guide pages. - $guide_pages = $overview->get('localgov_guides_pages')->referencedEntities(); - foreach ($guide_pages as $guide_page) { - if ($guide_page instanceof NodeInterface && $guide_page->access('view')) { - $guide_nodes[] = $guide_page; + if ($overview instanceof NodeInterface) { + $guide_nodes[] = $overview; + + // Find guide pages. + $guide_pages = $overview->get('localgov_guides_pages')->referencedEntities(); + foreach ($guide_pages as $guide_page) { + if ($guide_page instanceof NodeInterface && $guide_page->access('view')) { + $guide_nodes[] = $guide_page; + } } } From 18f173d9bb1716cb168a1237517f8f1466c7268c Mon Sep 17 00:00:00 2001 From: Lee Mills Date: Sun, 24 Nov 2024 11:15:17 +0000 Subject: [PATCH 2/4] fix: add return types --- src/EventSubscriber/PageHeaderSubscriber.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/EventSubscriber/PageHeaderSubscriber.php b/src/EventSubscriber/PageHeaderSubscriber.php index 5a900d8..c382155 100644 --- a/src/EventSubscriber/PageHeaderSubscriber.php +++ b/src/EventSubscriber/PageHeaderSubscriber.php @@ -27,7 +27,7 @@ public function __construct(protected EntityRepositoryInterface $entityRepositor /** * {@inheritdoc} */ - public static function getSubscribedEvents() { + public static function getSubscribedEvents(): array { return [ PageHeaderDisplayEvent::EVENT_NAME => ['setPageHeader', 0], ]; From 859add39f71e675eb6e6db93586de7badfc6e49a Mon Sep 17 00:00:00 2001 From: Lee Mills Date: Fri, 10 Jan 2025 15:49:00 +0000 Subject: [PATCH 3/4] fix: superfluous semicolon causing phpcs failure --- localgov_guides.module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localgov_guides.module b/localgov_guides.module index c0ac468..41b13c2 100644 --- a/localgov_guides.module +++ b/localgov_guides.module @@ -208,7 +208,7 @@ function localgov_guides_preprocess_node__localgov_guides_overview__full(&$vars) if ($guide_overview_node->hasField('localgov_guides_section_title') && !$guide_overview_node->localgov_guides_section_title->isEmpty()) { $guide_overview_title = $guide_overview_node->localgov_guides_section_title->value; - }; + } $vars['guide_overview_title'] = $guide_overview_title ?: $guide_overview_default_title; } From 432ab76f9db9b7f4efa860d1459baa44ff6b9064 Mon Sep 17 00:00:00 2001 From: Lee Mills Date: Fri, 10 Jan 2025 16:00:25 +0000 Subject: [PATCH 4/4] fix: yaml indenting --- ...ocalgov_menu_link_group.localgov_menu_link_group_guide.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/optional/localgov_menu_link_group.localgov_menu_link_group.localgov_menu_link_group_guide.yml b/config/optional/localgov_menu_link_group.localgov_menu_link_group.localgov_menu_link_group_guide.yml index 972f2e6..d3fe254 100644 --- a/config/optional/localgov_menu_link_group.localgov_menu_link_group.localgov_menu_link_group_guide.yml +++ b/config/optional/localgov_menu_link_group.localgov_menu_link_group.localgov_menu_link_group_guide.yml @@ -3,8 +3,8 @@ status: true dependencies: enforced: module: - - localgov_guides - - localgov_menu_link_group + - localgov_guides + - localgov_menu_link_group id: localgov_menu_link_group_guide group_label: Guide weight: 0