wait #5957 @0.75

diff --git a/src/app/Magic/Menu/Menu.php b/src/app/Magic/Menu/Menu.php
index eb98c3d519d6a84035177031867ac22cbc58537d..f692162c0b927bb3a4d3872f663782b376120809 100644 (file)
--- a/src/app/Magic/Menu/Menu.php
+++ b/src/app/Magic/Menu/Menu.php
@@ -8,8 +8,7 @@ use Cubist\Backpack\Facades\App;
 use Lavary\Menu\Menu as BaseMenu;
 use Illuminate\Support\Facades\Cache;
 
-class Menu extends BaseMenu
-{
+class Menu extends BaseMenu {
     /**
      * @var Item[}
      */
@@ -26,14 +25,12 @@ class Menu extends BaseMenu
     protected $_currentPage;
 
 
-    public function registerMenuMaker($name, $callback)
-    {
+    public function registerMenuMaker($name, $callback) {
         $this->_registeredMenuMakers[$name] = $callback;
     }
 
 
-    public function get($key, $name = self::_STANDARD_PREFIX, $locale = null)
-    {
+    public function get($key, $name = self::_STANDARD_PREFIX, $locale = null) {
         if (null === $locale) {
             $locale = App::getLocale();
         }
@@ -50,8 +47,7 @@ class Menu extends BaseMenu
     /**
      * @return Item
      */
-    public static function getNavigation($locale = null, $variant = null)
-    {
+    public static function getNavigation($locale = null, $variant = null) {
         if (null === $locale) {
             $locale = App::getLocale();
         }
@@ -64,12 +60,14 @@ class Menu extends BaseMenu
         }
 
         if (!isset(self::$_nav[$variant][$locale])) {
-            \Barryvdh\Debugbar\Facade::startMeasure('nav', 'Init Navigation object');
+            \Barryvdh\Debugbar\Facade::startMeasure('nav', 'Init Navigation object ' . $variant . ', ' . $locale);
             self::$_nav[$variant][$locale] = Cache::tags(self::CACHE_TAG)->remember('navigation_' . $variant . '_' . $locale, 43200, function () use ($locale, $variant) {
+                \Barryvdh\Debugbar\Facade::startMeasure('donav', 'Do Navigation object ' . $variant . ', ' . $locale);
                 $nav = new Item();
                 $nav->setLocale($locale);
                 $nav->setVariant($variant);
                 $nav->initFromDatabase();
+                \Barryvdh\Debugbar\Facade::stopMeasure('donav');
                 return $nav;
             });
             \Barryvdh\Debugbar\Facade::stopMeasure('nav');
@@ -81,8 +79,7 @@ class Menu extends BaseMenu
     /**
      * @return Cubist\Backpack\app\Magic\Menu\Item[]
      */
-    public static function getAllNavigablePages($locale = null, $variant = null)
-    {
+    public static function getAllNavigablePages($locale = null, $variant = null) {
         $pages = self::getNavigation($locale, $variant)->findAll();
 
         $res = [];
@@ -117,8 +114,7 @@ class Menu extends BaseMenu
         return $res;
     }
 
-    public static function internalToHref($url)
-    {
+    public static function internalToHref($url) {
         if (stripos($url, 'internal:') !== false) {
             $e = explode(':', $url, 2);
             $url = $e[1];
@@ -137,8 +133,7 @@ class Menu extends BaseMenu
         return '#internalnotfound';
     }
 
-    public function makeAllMenus($locale)
-    {
+    public function makeAllMenus($locale) {
         $nav = self::getNavigation($locale);
         foreach ($nav->getChildren() as $main) {
             $this->makeStandardMenus($main, $locale);
@@ -152,8 +147,7 @@ class Menu extends BaseMenu
         });
     }
 
-    public function makeStandardMenus($item, $locale)
-    {
+    public function makeStandardMenus($item, $locale) {
         $this->make($locale . '_' . self::_STANDARD_PREFIX . '_' . $item->getName(), function ($menu) use ($item) {
             $this->makeStandardMenu($menu, $item);
         });
@@ -167,15 +161,13 @@ class Menu extends BaseMenu
         }
     }
 
-    public function makeStandardMenu($menu, $item)
-    {
+    public function makeStandardMenu($menu, $item) {
         foreach ($item->getChildren() as $child) {
             $this->_addItem($menu, $child, 'isMenuDesktop');
         }
     }
 
-    protected function _addItem($menu, $item, $checkFunction)
-    {
+    protected function _addItem($menu, $item, $checkFunction) {
         $checkFunctionChildren = $checkFunction . 'Children';
         if (!$item->$checkFunction()) {
             return;
@@ -197,8 +189,7 @@ class Menu extends BaseMenu
      * @param $menu Menu
      * @param $item Item
      */
-    public function makeMobileMenu($menu, $item)
-    {
+    public function makeMobileMenu($menu, $item) {
         foreach ($item->getChildren() as $child) {
             if (!$child->isMenuMobile()) {
                 continue;
@@ -218,8 +209,7 @@ class Menu extends BaseMenu
      * @param $nav Item
      * @param $menu \Lavary\Menu\Item
      */
-    protected function _addToBreadcrumbs($nav, $menu)
-    {
+    protected function _addToBreadcrumbs($nav, $menu) {
         if ($nav->getTitle() && $nav->isBreadcrumbs()) {
             if (strpos($nav->getBreadcrumbHref(), '#') === 0) {
                 $parent = $menu->raw($nav->getTitle());
@@ -236,8 +226,7 @@ class Menu extends BaseMenu
         }
     }
 
-    public function getSearchBreadcrumbs()
-    {
+    public function getSearchBreadcrumbs() {
         $all = $this->get('breadcrumbs')->crumbMenu()->all();
         $lastIndex = count($all) - 1;
         $search_breadcrumbs = [];
@@ -250,8 +239,7 @@ class Menu extends BaseMenu
         return $search_breadcrumbs;
     }
 
-    public function breadcrumbs()
-    {
+    public function breadcrumbs() {
         $res = '<div class="breadcrumbs" itemscope itemtype="http://schema.org/BreadcrumbList">';
         /** @var \Lavary\Menu\Item $item */
         $position = 0;
@@ -292,16 +280,14 @@ class Menu extends BaseMenu
     /**
      * @param Item $currentPage
      */
-    public function setCurrentPage(Item $currentPage): void
-    {
+    public function setCurrentPage(Item $currentPage): void {
         $this->_currentPage = $currentPage;
     }
 
     /**
      * @return Item
      */
-    public function getCurrentPage(): Item
-    {
+    public function getCurrentPage(): Item {
         return $this->_currentPage;
     }
 }