Merge pull request #128 from localgovdrupal/fix/127-php-phpstan-issues

fix: phpstan issues
localgovdrupal · Oct 2, 2023 · d8e8121 · d8e8121
2 parents 352862e + da968bb
commit d8e8121
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/Plugin/Block/SubsitesBannerBlock.php b/src/Plugin/Block/SubsitesBannerBlock.php
@@ -39,7 +39,7 @@ class SubsitesBannerBlock extends SubsitesAbstractBlockBase {
   public function build() {
     $build = [];
 
-    if ($this->getSubsite($this->node)) {
+    if ($this->getSubsite()) {
       if ($banner = $this->getSubsiteBanner()) {
         $viewBuilder = $this->entityTypeManager->getViewBuilder('paragraph');
         $build = $viewBuilder->view($banner);

diff --git a/src/Plugin/Block/SubsitesNavigationBlock.php b/src/Plugin/Block/SubsitesNavigationBlock.php
@@ -7,7 +7,7 @@
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Template\Attribute;
-use Drupal\Node\NodeInterface;
+use Drupal\node\NodeInterface;
 
 /**
  * Class SubsiteNavigationBlock.
@@ -51,6 +51,8 @@ public function build() {
     $cache = (new CacheableMetadata())->addCacheableDependency($subsite_entity);
     $storage = $this->getNestedSetStorage('localgov_subsites');
     $node = $this->getNestedSetNodeKeyFactory()->fromEntity($subsite_entity);
+    $subsite_id = NULL;
+    $overview_entity = NULL;
     if ($ancestors = $storage->findAncestors($node)) {
       $tree = $storage->findDescendants($ancestors[0]->getNodeKey());
       array_unshift($tree, $ancestors[0]);

diff --git a/tests/src/Functional/SubsitePagesTest.php b/tests/src/Functional/SubsitePagesTest.php
@@ -65,7 +65,6 @@ protected function setUp(): void {
       'create localgov_subsites_overview content',
 
     ]);
-    $this->nodeStorage = $this->container->get('entity_type.manager')->getStorage('node');
   }
 
   /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,7 +65,6 @@ protected function setUp(): void { @@
           'create localgov_subsites_overview content',
         ]);
-        $this->nodeStorage = $this->container->get('entity_type.manager')->getStorage('node');
       }
       /**
@@ Expand Down @@