Fix phpstan (#1742)

sonata-project · Dec 12, 2023 · 13e5c1d · 13e5c1d
1 parent f10a9fa
commit 13e5c1d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 23 deletions.
diff --git a/src/CmsManager/CmsPageManager.php b/src/CmsManager/CmsPageManager.php
@@ -96,38 +96,28 @@ public function getInternalRoute(SiteInterface $site, string $routeName): PageIn
         return $page;
     }
 
-    public function findContainer(string $name, PageInterface $page, ?PageBlockInterface $parentContainer = null): ?PageBlockInterface
+    public function findContainer(string $name, PageInterface $page, ?PageBlockInterface $parentContainer = null): PageBlockInterface
     {
-        $container = null;
-
         if (null !== $parentContainer) {
             // parent container is set, nothing to find, don't need to loop across the
             // name to find the correct container (main template level)
-            $container = $parentContainer;
+            return $parentContainer;
         }
 
         // first level blocks are containers
-        if (null === $container) {
-            foreach ($page->getBlocks() as $block) {
-                if ($block->getSetting('code') === $name) {
-                    $container = $block;
-
-                    break;
-                }
+        foreach ($page->getBlocks() as $block) {
+            if ($block->getSetting('code') === $name) {
+                return $block;
             }
         }
 
-        if (null === $container) {
-            $container = $this->blockInteractor->createNewContainer([
-                'enabled' => true,
-                'page' => $page,
-                'code' => $name,
-                'position' => 1,
-                'parent' => $parentContainer,
-            ]);
-        }
-
-        return $container;
+        return $this->blockInteractor->createNewContainer([
+            'enabled' => true,
+            'page' => $page,
+            'code' => $name,
+            'position' => 1,
+            'parent' => $parentContainer,
+        ]);
     }
 
     public function getBlock($id): ?PageBlockInterface

diff --git a/tests/CmsManager/CmsPageManagerTest.php b/tests/CmsManager/CmsPageManagerTest.php
@@ -60,7 +60,6 @@ public function testFindExistingContainer(): void
 
         $container = $this->manager->findContainer('findme', $page);
 
-        static::assertNotNull($container);
         static::assertSame(
             spl_object_hash($block),
             spl_object_hash($container),