From ee9f9863cf7e6ad46eb62d6adeff37f78545a2fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Sat, 4 Nov 2023 18:35:28 +0100
Subject: [PATCH] Fix: Avoid empty divisions in main menu

---
 src/Menu/AbstractMenuBuilder.php     | 5 +++++
 src/Menu/AdminMenuBuilder.php        | 8 --------
 src/Menu/HouseManagerMenuBuilder.php | 6 +-----
 src/Menu/TeamerMenuBuilder.php       | 6 +-----
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/Menu/AbstractMenuBuilder.php b/src/Menu/AbstractMenuBuilder.php
index 5de15e5..6f98098 100644
--- a/src/Menu/AbstractMenuBuilder.php
+++ b/src/Menu/AbstractMenuBuilder.php
@@ -80,6 +80,7 @@ abstract class AbstractMenuBuilder
     protected function addAdminItem(ItemInterface $menu): void
     {
         if ($this->security->isGranted('ROLE_ADMIN')) {
+            $this->addDivider($menu);
             $menu
                 ->addChild('zum Adminbereich', ['route' => 'app_admin_index'])
                 ->setChildrenAttribute('title', 'zum Adminbereich')
@@ -91,6 +92,7 @@ abstract class AbstractMenuBuilder
     protected function addTeamerItem(ItemInterface $menu): void
     {
         if ($this->security->isGranted('ROLE_TEAMER')) {
+            $this->addDivider($menu);
             $menu
                 ->addChild('zum Teambereich', ['route' => 'app_teamer_index'])
                 ->setChildrenAttribute('title', 'zum Teambereich')
@@ -102,6 +104,7 @@ abstract class AbstractMenuBuilder
     protected function addHouseManagerItem(ItemInterface $menu): void
     {
         if ($this->security->isGranted('ROLE_HOUSE_MANAGER')) {
+            $this->addDivider($menu);
             $menu
                 ->addChild('zum Hausmanagerbereich', ['route' => 'app_house_manager_index'])
                 ->setChildrenAttribute('title', 'zum Hausmanagerbereich')
@@ -112,6 +115,8 @@ abstract class AbstractMenuBuilder
 
     protected function addLogoutItem(ItemInterface $menu): void
     {
+        $this->addDivider($menu);
+
         $token = $this->security->getToken();
 
         if ($token instanceof SwitchUserToken) {
diff --git a/src/Menu/AdminMenuBuilder.php b/src/Menu/AdminMenuBuilder.php
index 82bd5c0..04297f2 100644
--- a/src/Menu/AdminMenuBuilder.php
+++ b/src/Menu/AdminMenuBuilder.php
@@ -159,16 +159,8 @@ class AdminMenuBuilder extends AbstractMenuBuilder
     {
         $menu = $this->createMenu($this->getMainMenuItems());
 
-        $this->addDivider($menu);
-
         $this->addTeamerItem($menu);
-
-        $this->addDivider($menu);
-
         $this->addHouseManagerItem($menu);
-
-        $this->addDivider($menu);
-
         $this->addLogoutItem($menu);
 
         return $menu;
diff --git a/src/Menu/HouseManagerMenuBuilder.php b/src/Menu/HouseManagerMenuBuilder.php
index 3943da1..5a6499f 100644
--- a/src/Menu/HouseManagerMenuBuilder.php
+++ b/src/Menu/HouseManagerMenuBuilder.php
@@ -31,12 +31,8 @@ class HouseManagerMenuBuilder extends AbstractMenuBuilder
 
         $menu = $this->createMenu($menuItems);
 
-        $this->addDivider($menu);
-
         $this->addAdminItem($menu);
-
-        $this->addDivider($menu);
-
+        $this->addTeamerItem($menu);
         $this->addLogoutItem($menu);
 
         return $menu;
diff --git a/src/Menu/TeamerMenuBuilder.php b/src/Menu/TeamerMenuBuilder.php
index be5434a..20200ce 100644
--- a/src/Menu/TeamerMenuBuilder.php
+++ b/src/Menu/TeamerMenuBuilder.php
@@ -90,12 +90,8 @@ class TeamerMenuBuilder extends AbstractMenuBuilder
 
         $menu = $this->createMenu($menuItems);
 
-        $this->addDivider($menu);
-
         $this->addAdminItem($menu);
-
-        $this->addDivider($menu);
-
+        $this->addHouseManagerItem($menu);
         $this->addLogoutItem($menu);
 
         return $menu;