Better active resolver

Author: Thomas Jarrand

Menu/Builder.php

@@ -38,22 +38,33 @@ public function isActive(array $item): bool
             return (bool) $item['active'];
         }
 
-        return (isset($item['root']) && $this->isCurrentRoot($item['root']))
-            || (isset($item['branch']) && $this->isCurrentBranch($item['branch']))
-            || (isset($item['route']) && $this->isCurrentRoute($item['route']));
+        return $this->isCurrentBranch($this->resolve($item, ['branch', 'root', 'route']))
+            || $this->isCurrentRoot($this->resolve($item, ['root', 'route']))
+            || $this->isCurrentRoute($this->resolve($item, ['route']));
     }
 
-    public function isCurrentRoot(string $root): bool
+    private function resolve(array $item, array $keys)
+    {
+        foreach ($keys as $key) {
+            if (isset($item[$key])) {
+                return $item[$key];
+            }
+        }
+
+        return null;
+    }
+
+    public function isCurrentRoot(?string $root): bool
     {
         return $this->getCurrentAttribute('_root') === $root;
     }
 
-    public function isCurrentBranch(string $branch): bool
+    public function isCurrentBranch(?string $branch): bool
     {
         return $this->getCurrentAttribute('_branch') === $branch;
     }
 
-    public function isCurrentRoute(string $route): bool
+    public function isCurrentRoute(?string $route): bool
     {
         return $this->getCurrentAttribute('_route') === $route;
     }

Resources/views/base.html.twig

@@ -36,18 +36,32 @@
                         </nav>
                     {% endblock %}
                     {% block nav_user %}
-                        <div class="user-menu drop drop--down">
-                            <button class="user-menu__button drop__button">
-                                {% block user_menu_label app.user|default('Jane doe') %}
-                            </button>
-                            <ul class="user-menu__content drop__menu">
-                                {#% set item_class = '' %#}
-                                {#% set item_active_class = '' %#}
-                                {% for item in menu_user|default([]) %}
-                                    {{ block('menu_item') }}
-                                {% endfor %}
-                            </ul>
-                        </div>
+                        {% if app.user %}
+                            {% block nav_user_authenticated %}
+                                <div class="user-menu drop drop--down">
+                                    <button class="user-menu__button drop__button">
+                                        {% block user_menu_label app.user|default('Jane doe') %}
+                                    </button>
+                                    <ul class="user-menu__content drop__menu">
+                                        {#% set item_class = '' %#}
+                                        {#% set item_active_class = '' %#}
+                                        {% for item in menu_user|default([]) %}
+                                            {{ block('menu_item') }}
+                                        {% endfor %}
+                                    </ul>
+                                </div>
+                            {% endblock %}
+                        {% else %}
+                            {% block nav_user_anonymous %}
+                                <ul class="user-menu">
+                                    {% set item_class = 'user-menu__button' %}
+                                    {% set item_active_class = 'user-menu__button--active' %}
+                                    {% for item in menu_anonymous|default([]) %}
+                                        {{ block('menu_item') }}
+                                    {% endfor %}
+                                </ul>
+                            {% endblock %}
+                        {% endif %}
                     {% endblock %}
                     <button class="menu-button"></button>
                 </header>
@@ -126,7 +140,7 @@
                                     </nav>
                                 {% endif %}
                             {% endblock %}
-                            <div class="container">
+                            <div class="container {% block content_class '' %}">
                                 {% block content '' %}
                             </div>
                         </div>