From 88b8387153cf001e8acafd24cef7bf6b43bb48a7 Mon Sep 17 00:00:00 2001 From: SharkyKZ Date: Tue, 7 Jul 2020 11:23:39 +0300 Subject: [PATCH 1/3] Get application from container --- components/com_tags/src/Helper/RouteHelper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/com_tags/src/Helper/RouteHelper.php b/components/com_tags/src/Helper/RouteHelper.php index 43901ade37780..060fda98ef163 100644 --- a/components/com_tags/src/Helper/RouteHelper.php +++ b/components/com_tags/src/Helper/RouteHelper.php @@ -11,6 +11,7 @@ \defined('_JEXEC') or die; +use Joomla\CMS\Application\SiteApplication; use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Factory; use Joomla\CMS\Helper\RouteHelper as CMSRouteHelper; @@ -153,7 +154,7 @@ public static function getTagsRoute() */ protected static function _findItem($needles = null) { - $app = Factory::getApplication(); + $app = Factory::getContainer()->get(SiteApplication::class); $menus = $app->getMenu('site'); $language = $needles['language'] ?? '*'; From d8469e1da1c17dbc42e1aa01e4bbe8320877d09c Mon Sep 17 00:00:00 2001 From: SharkyKZ Date: Tue, 7 Jul 2020 18:33:01 +0300 Subject: [PATCH 2/3] Get menu directly --- components/com_tags/src/Helper/RouteHelper.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/components/com_tags/src/Helper/RouteHelper.php b/components/com_tags/src/Helper/RouteHelper.php index 060fda98ef163..49c239a19134f 100644 --- a/components/com_tags/src/Helper/RouteHelper.php +++ b/components/com_tags/src/Helper/RouteHelper.php @@ -13,8 +13,8 @@ use Joomla\CMS\Application\SiteApplication; use Joomla\CMS\Component\ComponentHelper; -use Joomla\CMS\Factory; use Joomla\CMS\Helper\RouteHelper as CMSRouteHelper; +use Joomla\CMS\Menu\AbstractMenu; /** * Tags Component Route Helper. @@ -154,8 +154,7 @@ public static function getTagsRoute() */ protected static function _findItem($needles = null) { - $app = Factory::getContainer()->get(SiteApplication::class); - $menus = $app->getMenu('site'); + $menus = AbstractMenu::getInstance('site'); $language = $needles['language'] ?? '*'; // Prepare the reverse lookup array. From 39a4193d0f7dfa742a44cf7c69cd7cffda611cc2 Mon Sep 17 00:00:00 2001 From: SharkyKZ Date: Tue, 7 Jul 2020 18:42:06 +0300 Subject: [PATCH 3/3] Remove import --- components/com_tags/src/Helper/RouteHelper.php | 1 - 1 file changed, 1 deletion(-) diff --git a/components/com_tags/src/Helper/RouteHelper.php b/components/com_tags/src/Helper/RouteHelper.php index 49c239a19134f..c5a6c685ad66b 100644 --- a/components/com_tags/src/Helper/RouteHelper.php +++ b/components/com_tags/src/Helper/RouteHelper.php @@ -11,7 +11,6 @@ \defined('_JEXEC') or die; -use Joomla\CMS\Application\SiteApplication; use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Helper\RouteHelper as CMSRouteHelper; use Joomla\CMS\Menu\AbstractMenu;