[K6.3] Replace deprecated usage of BaseController::getInstance

Kunena · Oct 22, 2023 · ef0d777 · ef0d777
1 parent 836d030
commit ef0d777
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 38 deletions.
diff --git a/src/site/src/Controller/Announcement/Edit/AnnouncementEditDisplay.php b/src/site/src/Controller/Announcement/Edit/AnnouncementEditDisplay.php
@@ -17,10 +17,11 @@
 
 use Exception;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\BaseController;
 use Kunena\Forum\Libraries\Controller\KunenaControllerDisplay;
 use Kunena\Forum\Libraries\Forum\Announcement\KunenaAnnouncementHelper;
 use Kunena\Forum\Libraries\Route\KunenaRoute;
+use Joomla\CMS\Factory;
+use Kunena\Forum\Libraries\Controller\KunenaController;
 
 /**
  * Class ComponentAnnouncementControllerEditDisplay
@@ -63,7 +64,8 @@ protected function before()
 
         if (!$Itemid && $this->config->sefRedirect) {
             $itemid     = KunenaRoute::fixMissingItemID();
-            $controller = BaseController::getInstance("kunena");
+            $controller = new KunenaController();
+            $controller = Factory::getApplication()->bootComponent('com_kunena')->getMVCFactory()->createController('kunena');
 
             if ($id) {
                 $controller->setRedirect(KunenaRoute::_("index.php?option=com_kunena&view=announcement&layout=edit&id={$id}&Itemid={$itemid}", false));

diff --git a/src/site/src/Controller/Announcement/Item/AnnouncementItemDisplay.php b/src/site/src/Controller/Announcement/Item/AnnouncementItemDisplay.php
@@ -17,10 +17,10 @@
 
 use Exception;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\BaseController;
 use Kunena\Forum\Libraries\Controller\KunenaControllerDisplay;
 use Kunena\Forum\Libraries\Forum\Announcement\KunenaAnnouncementHelper;
 use Kunena\Forum\Libraries\Route\KunenaRoute;
+use Kunena\Forum\Libraries\Controller\KunenaController;
 
 /**
  * Class ComponentAnnouncementControllerItemDisplay
@@ -62,7 +62,7 @@ protected function before()
 
         if (!$Itemid && $this->config->sefRedirect) {
             $itemid     = KunenaRoute::fixMissingItemID();
-            $controller = BaseController::getInstance("kunena");
+            $controller = new KunenaController();
             $controller->setRedirect(KunenaRoute::_("index.php?option=com_kunena&view=announcement&layout=default&id={$id}&Itemid={$itemid}", false));
             $controller->redirect();
         }

diff --git a/src/site/src/Controller/Announcement/Listing/AnnouncementListingDisplay.php b/src/site/src/Controller/Announcement/Listing/AnnouncementListingDisplay.php
@@ -17,12 +17,12 @@
 
 use Exception;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\BaseController;
 use Kunena\Forum\Libraries\Controller\KunenaControllerDisplay;
 use Kunena\Forum\Libraries\Forum\Announcement\KunenaAnnouncementHelper;
 use Kunena\Forum\Libraries\Pagination\KunenaPagination;
 use Kunena\Forum\Libraries\Route\KunenaRoute;
 use Kunena\Forum\Libraries\User\KunenaUserHelper;
+use Kunena\Forum\Libraries\Controller\KunenaController;
 
 /**
  * Class AnnouncementListingDisplay
@@ -68,7 +68,7 @@ protected function before()
 
         if (!$Itemid && $this->config->sefRedirect) {
             $itemid     = KunenaRoute::fixMissingItemID();
-            $controller = BaseController::getInstance("kunena");
+            $controller = new KunenaController();
             $controller->setRedirect(KunenaRoute::_("index.php?option=com_kunena&view=announcement&layout=listing&Itemid={$itemid}", false));
             $controller->redirect();
         }

diff --git a/src/site/src/Controller/Application/Misc/Initial/MiscDisplay.php b/src/site/src/Controller/Application/Misc/Initial/MiscDisplay.php
@@ -19,11 +19,11 @@
 use Joomla\CMS\Cache\CacheControllerFactoryInterface;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\MVC\Controller\BaseController;
 use Kunena\Forum\Libraries\Controller\Application\Display;
 use Kunena\Forum\Libraries\Layout\KunenaLayout;
 use Kunena\Forum\Libraries\Layout\KunenaPage;
 use Kunena\Forum\Libraries\Route\KunenaRoute;
+use Kunena\Forum\Libraries\Controller\KunenaController;
 
 /**
  * Class ComponentKunenaControllerApplicationMiscDisplay
@@ -135,7 +135,7 @@ protected function before()
                 $itemidfix = KunenaRoute::fixMissingItemID();
             }
 
-            $controller = BaseController::getInstance("kunena");
+            $controller = new KunenaController();
             $controller->setRedirect(KunenaRoute::_("index.php?option=com_kunena&view=misc&Itemid={$itemidfix}", false));
             $controller->redirect();
         }

diff --git a/src/site/src/Controller/Category/Index/CategoryIndexDisplay.php b/src/site/src/Controller/Category/Index/CategoryIndexDisplay.php
@@ -19,7 +19,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Database\Exception\ExecutionFailureException;
 use Joomla\Registry\Registry;
@@ -34,6 +33,7 @@
 use Kunena\Forum\Libraries\Route\KunenaRoute;
 use Kunena\Forum\Libraries\User\KunenaUser;
 use Kunena\Forum\Libraries\User\KunenaUserHelper;
+use Kunena\Forum\Libraries\Controller\KunenaController;
 
 /**
  * Class ComponentKunenaControllerApplicationMiscDisplay
@@ -111,7 +111,7 @@ protected function before()
         $this->layout = $this->input->getInt('layout');
 
         if (!$Itemid && $this->config->sefRedirect) {
-            $controller = BaseController::getInstance("kunena");
+            $controller = new KunenaController();
 
             if ($this->config->indexId) {
                 $itemidfix = $this->config->indexId;

diff --git a/src/site/src/Controller/Category/Topics/CategoryTopicsDisplay.php b/src/site/src/Controller/Category/Topics/CategoryTopicsDisplay.php
@@ -17,7 +17,6 @@
 
 use Exception;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Uri\Uri;
 use Kunena\Forum\Libraries\Access\KunenaAccess;
 use Kunena\Forum\Libraries\Controller\KunenaControllerDisplay;
@@ -31,6 +30,7 @@
 use Kunena\Forum\Libraries\User\KunenaUser;
 use Kunena\Forum\Libraries\User\KunenaUserHelper;
 use Kunena\Forum\Site\Model\CategoryModel;
+use Kunena\Forum\Libraries\Controller\KunenaController;
 
 /**
  * Class ComponentKunenaControllerApplicationMiscDisplay
@@ -109,7 +109,7 @@ protected function before()
 
         if (!$Itemid && $format != 'feed' && $this->config->sefRedirect) {
             $itemid     = KunenaRoute::fixMissingItemID();
-            $controller = BaseController::getInstance("kunena");
+            $controller = new KunenaController();
             $controller->setRedirect(KunenaRoute::_("index.php?option=com_kunena&view=category&catid={$catid}&Itemid={$itemid}", false));
             $controller->redirect();
         }
@@ -158,7 +158,7 @@ protected function before()
 
         if ($limitstart > 1 && !$this->topics) {
             $itemid     = KunenaRoute::fixMissingItemID();
-            $controller = BaseController::getInstance("kunena");
+            $controller = new KunenaController();
             $controller->setRedirect(KunenaRoute::_("index.php?option=com_kunena&view=category&catid={$catid}&Itemid={$itemid}", false));
             $controller->redirect();
         }

diff --git a/src/site/src/Controller/Credits/Display/CreditsDisplay.php b/src/site/src/Controller/Credits/Display/CreditsDisplay.php
@@ -16,13 +16,13 @@
 \defined('_JEXEC') or die();
 
 use Exception;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Plugin\PluginHelper;
 use Kunena\Forum\Libraries\Controller\KunenaControllerDisplay;
 use Kunena\Forum\Libraries\Factory\KunenaFactory;
 use Kunena\Forum\Libraries\Route\KunenaRoute;
+use Kunena\Forum\Libraries\Controller\KunenaController;
 
 /**
  * Class ComponentKunenaControllerApplicationMiscDisplay
@@ -83,7 +83,7 @@ protected function before()
 
         if (!$Itemid && $this->config->sefRedirect) {
             $itemid     = KunenaRoute::fixMissingItemID();
-            $controller = BaseController::getInstance("kunena");
+            $controller = new KunenaController();
             $controller->setRedirect(KunenaRoute::_("index.php?option=com_kunena&view=credits&Itemid={$itemid}", false));
             $controller->redirect();
         }

diff --git a/src/site/src/Controller/Search/Form/SearchFormDisplay.php b/src/site/src/Controller/Search/Form/SearchFormDisplay.php
@@ -16,14 +16,13 @@
 \defined('_JEXEC') or die();
 
 use Exception;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\BaseController;
 use Kunena\Forum\Libraries\Access\KunenaAccess;
 use Kunena\Forum\Libraries\Controller\KunenaControllerDisplay;
 use Kunena\Forum\Libraries\Route\KunenaRoute;
 use Kunena\Forum\Libraries\User\KunenaUserHelper;
 use Kunena\Forum\Site\Model\SearchModel;
+use Kunena\Forum\Libraries\Controller\KunenaController;
 
 /**
  * Class ComponentSearchControllerFormDisplay
@@ -84,7 +83,7 @@ protected function before()
                 $itemidfix = KunenaRoute::fixMissingItemID();
             }
 
-            $controller = BaseController::getInstance("kunena");
+            $controller = new KunenaController();
             $controller->setRedirect(KunenaRoute::_("index.php?option=com_kunena&view=search&Itemid={$itemidfix}", false));
             $controller->redirect();
         }

diff --git a/src/site/src/Controller/Statistics/General/StatisticsGeneralDisplay.php b/src/site/src/Controller/Statistics/General/StatisticsGeneralDisplay.php
@@ -17,14 +17,14 @@
 
 use Exception;
 use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Kunena\Forum\Libraries\Controller\KunenaControllerDisplay;
 use Kunena\Forum\Libraries\Exception\KunenaExceptionAuthorise;
 use Kunena\Forum\Libraries\Factory\KunenaFactory;
 use Kunena\Forum\Libraries\Forum\KunenaStatistics;
 use Kunena\Forum\Libraries\Route\KunenaRoute;
+use Kunena\Forum\Libraries\Controller\KunenaController;
 
 /**
  * Class ComponentStatisticsControllerGeneralDisplay
@@ -104,7 +104,7 @@ protected function before()
 
         if (!$Itemid && $this->config->sefRedirect) {
             $itemid     = KunenaRoute::fixMissingItemID();
-            $controller = BaseController::getInstance("kunena");
+            $controller = new KunenaController();
             $controller->setRedirect(KunenaRoute::_("index.php?option=com_kunena&view=statistics&Itemid={$itemid}", false));
             $controller->redirect();
         }

diff --git a/src/site/src/Controller/Topic/Form/Create/TopicFormCreateDisplay.php b/src/site/src/Controller/Topic/Form/Create/TopicFormCreateDisplay.php
@@ -17,10 +17,8 @@
 
 use Exception;
 use Joomla\CMS\Document\HtmlDocument;
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\BaseController;
 use Kunena\Forum\Libraries\Attachment\KunenaAttachmentHelper;
 use Kunena\Forum\Libraries\Controller\KunenaControllerDisplay;
 use Kunena\Forum\Libraries\Exception\KunenaExceptionAuthorise;
@@ -29,6 +27,7 @@
 use Kunena\Forum\Libraries\KunenaPrivate\KunenaPrivateMessage;
 use Kunena\Forum\Libraries\Route\KunenaRoute;
 use Kunena\Forum\Libraries\User\KunenaUserHelper;
+use Kunena\Forum\Libraries\Controller\KunenaController;
 
 /**
  * Class ComponentTopicControllerFormCreateDisplay
@@ -122,7 +121,7 @@ protected function before()
                 $itemidfix = KunenaRoute::fixMissingItemID();
             }
 
-            $controller = BaseController::getInstance("kunena");
+            $controller = new KunenaController();
 
             if ($catid) {
                 $controller->setRedirect(KunenaRoute::_("index.php?option=com_kunena&view=topic&layout=create&catid={$catid}&Itemid={$itemidfix}", false));

diff --git a/src/site/src/Controller/Topic/Item/TopicItemDisplay.php b/src/site/src/Controller/Topic/Item/TopicItemDisplay.php
@@ -20,7 +20,6 @@
 use Joomla\CMS\Cache\CacheControllerFactoryInterface;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Registry\Registry;
@@ -44,6 +43,7 @@
 use Kunena\Forum\Libraries\User\KunenaUser;
 use Kunena\Forum\Libraries\User\KunenaUserHelper;
 use stdClass;
+use Kunena\Forum\Libraries\Controller\KunenaController;
 
 /**
  * Class ComponentTopicControllerItemDisplay
@@ -133,7 +133,7 @@ protected function before()
 
         if (!$Itemid && $format != 'feed' && $this->config->sefRedirect) {
             $itemid     = KunenaRoute::fixMissingItemID();
-            $controller = BaseController::getInstance("kunena");
+            $controller = new KunenaController();
             $controller->setRedirect(KunenaRoute::_("index.php?option=com_kunena&view=topic&catid={$catid}&id={$id}&Itemid={$itemid}", false));
             $controller->redirect();
         }

diff --git a/src/site/src/Controller/Topic/Listing/Moderator/TopicListingModeratorDisplay.php b/src/site/src/Controller/Topic/Listing/Moderator/TopicListingModeratorDisplay.php
@@ -18,7 +18,6 @@
 use Exception;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\BaseController;
 use Kunena\Forum\Libraries\Access\KunenaAccess;
 use Kunena\Forum\Libraries\Forum\Category\KunenaCategoryHelper;
 use Kunena\Forum\Libraries\Forum\Topic\KunenaTopicFinder;
@@ -27,6 +26,7 @@
 use Kunena\Forum\Libraries\User\KunenaUserHelper;
 use Kunena\Forum\Site\Controller\Topic\Listing\ListDisplay;
 use Kunena\Forum\Libraries\Forum\Message\KunenaMessageHelper;
+use Kunena\Forum\Libraries\Controller\KunenaController;
 
 /**
  * Class ComponentTopicControllerListDisplay
@@ -72,7 +72,7 @@ protected function before()
                 $itemidfix = KunenaRoute::fixMissingItemID();
             }
 
-            $controller = BaseController::getInstance("kunena");
+            $controller = new KunenaController();
             $controller->setRedirect(KunenaRoute::_("index.php?option=com_kunena&view=topics&layout=moderator&Itemid={$itemidfix}", false));
             $controller->redirect();
         }

diff --git a/src/site/src/Controller/Topic/Listing/Recent/TopicListingRecentDisplay.php b/src/site/src/Controller/Topic/Listing/Recent/TopicListingRecentDisplay.php
@@ -19,7 +19,6 @@
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Uri\Uri;
 use Kunena\Forum\Libraries\Factory\KunenaFactory;
 use Kunena\Forum\Libraries\Forum\Category\KunenaCategoryHelper;
@@ -29,6 +28,7 @@
 use Kunena\Forum\Libraries\User\KunenaUserHelper;
 use Kunena\Forum\Site\Controller\Topic\Listing\ListDisplay;
 use Kunena\Forum\Site\Model\TopicsModel;
+use Kunena\Forum\Libraries\Controller\KunenaController;
 
 /**
  * Class ComponentTopicControllerListRecentDisplay
@@ -84,7 +84,7 @@ protected function before()
                 $itemidfix = KunenaRoute::fixMissingItemID();
             }
 
-            $controller = BaseController::getInstance("kunena");
+            $controller = new KunenaController();
             $controller->setRedirect(KunenaRoute::_("index.php?option=com_kunena&view=topics&mode={$this->state->get('list.mode')}&Itemid={$itemidfix}", false));
             $controller->redirect();
         }

diff --git a/src/site/src/Controller/Topic/Listing/Unread/TopicListingUnreadDisplay.php b/src/site/src/Controller/Topic/Listing/Unread/TopicListingUnreadDisplay.php
@@ -20,7 +20,6 @@
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\BaseController;
 use Kunena\Forum\Libraries\Access\KunenaAccess;
 use Kunena\Forum\Libraries\Factory\KunenaFactory;
 use Kunena\Forum\Libraries\Forum\Topic\KunenaTopicFinder;
@@ -30,6 +29,7 @@
 use Kunena\Forum\Libraries\User\KunenaUserHelper;
 use Kunena\Forum\Site\Controller\Topic\Listing\ListDisplay;
 use Kunena\Forum\Site\Model\TopicsModel;
+use Kunena\Forum\Libraries\Controller\KunenaController;
 
 /**
  * Class ComponentTopicControllerListDisplay
@@ -103,7 +103,7 @@ protected function before()
                 $itemidfix = KunenaRoute::fixMissingItemID();
             }
 
-            $controller = BaseController::getInstance("kunena");
+            $controller = new KunenaController();
             $controller->setRedirect(KunenaRoute::_("index.php?option=com_kunena&view=topics&layout=unread&Itemid={$itemidfix}", false));
             $controller->redirect();
         }

diff --git a/src/site/src/Controller/Topic/Listing/User/TopicListingUserDisplay.php b/src/site/src/Controller/Topic/Listing/User/TopicListingUserDisplay.php
@@ -19,7 +19,6 @@
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Uri\Uri;
 use Kunena\Forum\Libraries\Factory\KunenaFactory;
 use Kunena\Forum\Libraries\Forum\Category\KunenaCategoryHelper;
@@ -29,6 +28,7 @@
 use Kunena\Forum\Libraries\User\KunenaUserHelper;
 use Kunena\Forum\Site\Controller\Topic\Listing\ListDisplay;
 use Kunena\Forum\Site\Model\TopicsModel;
+use Kunena\Forum\Libraries\Controller\KunenaController;
 
 /**
  * Class ComponentTopicControllerListUserDisplay
@@ -151,7 +151,7 @@ protected function before()
         $format = $this->input->getCmd('format');
 
         if (!$Itemid && $format != 'feed') {
-            $controller = BaseController::getInstance("kunena");
+            $controller = new KunenaController();
 
             if ($this->config->profileId) {
                 $itemidfix = $this->config->profileId;

diff --git a/src/site/src/Controller/User/Item/UserItemDisplay.php b/src/site/src/Controller/User/Item/UserItemDisplay.php
@@ -18,7 +18,6 @@
 use Exception;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\User;
 use Joomla\CMS\User\UserFactoryInterface;
@@ -31,6 +30,7 @@
 use Kunena\Forum\Libraries\User\KunenaUser;
 use Kunena\Forum\Libraries\User\KunenaUserHelper;
 use Kunena\Forum\Site\Model\UserModel;
+use Kunena\Forum\Libraries\Controller\KunenaController;
 
 /**
  * Class ComponentUserControllerItemDisplay
@@ -149,7 +149,7 @@ protected function before()
         $format = $this->input->getCmd('format');
 
         if (!$Itemid && $format != 'feed' && $this->config->sefRedirect) {
-            $controller = BaseController::getInstance("kunena");
+            $controller = new KunenaController();
 
             if ($this->config->profileId) {
                 $itemidfix = $this->config->profileId;