From d7efe48724004b1f55d0a0573ba674f306db029d Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Tue, 5 Mar 2024 14:20:40 +0100 Subject: [PATCH 1/3] Remove deprecated db object from views --- .../com_users/src/View/Users/HtmlView.php | 13 ------------- .../com_content/src/View/Featured/HtmlView.php | 12 ------------ components/com_users/src/View/Profile/HtmlView.php | 13 ------------- 3 files changed, 38 deletions(-) diff --git a/administrator/components/com_users/src/View/Users/HtmlView.php b/administrator/components/com_users/src/View/Users/HtmlView.php index eafa9c9f55daa..57f9887d4c828 100644 --- a/administrator/components/com_users/src/View/Users/HtmlView.php +++ b/administrator/components/com_users/src/View/Users/HtmlView.php @@ -80,18 +80,6 @@ class HtmlView extends BaseHtmlView */ protected $canDo; - /** - * An instance of DatabaseDriver. - * - * @var DatabaseDriver - * @since 3.6.3 - * - * @deprecated 4.3 will be removed in 6.0 - * Will be removed without replacement use database from the container instead - * Example: Factory::getContainer()->get(DatabaseInterface::class); - */ - protected $db; - /** * Display the view * @@ -107,7 +95,6 @@ public function display($tpl = null) $this->filterForm = $this->get('FilterForm'); $this->activeFilters = $this->get('ActiveFilters'); $this->canDo = ContentHelper::getActions('com_users'); - $this->db = Factory::getDbo(); // Check for errors. if (\count($errors = $this->get('Errors'))) { diff --git a/components/com_content/src/View/Featured/HtmlView.php b/components/com_content/src/View/Featured/HtmlView.php index 270dde180f857..1441b235beb1f 100644 --- a/components/com_content/src/View/Featured/HtmlView.php +++ b/components/com_content/src/View/Featured/HtmlView.php @@ -70,17 +70,6 @@ class HtmlView extends BaseHtmlView */ protected $link_items = []; - /** - * @var \Joomla\Database\DatabaseDriver - * - * @since 3.6.3 - * - * @deprecated 4.3 will be removed in 6.0 - * Will be removed without replacement use database from the container instead - * Example: Factory::getContainer()->get(DatabaseInterface::class); - */ - protected $db; - /** * The user object * @@ -202,7 +191,6 @@ public function display($tpl = null) $this->items = &$items; $this->pagination = &$pagination; $this->user = &$user; - $this->db = Factory::getDbo(); $this->_prepareDocument(); diff --git a/components/com_users/src/View/Profile/HtmlView.php b/components/com_users/src/View/Profile/HtmlView.php index 6cca57149707c..11f2f335a8f5e 100644 --- a/components/com_users/src/View/Profile/HtmlView.php +++ b/components/com_users/src/View/Profile/HtmlView.php @@ -60,18 +60,6 @@ class HtmlView extends BaseHtmlView */ protected $state; - /** - * An instance of DatabaseDriver. - * - * @var DatabaseDriver - * @since 3.6.3 - * - * @deprecated 4.3 will be removed in 6.0 - * Will be removed without replacement use database from the container instead - * Example: Factory::getContainer()->get(DatabaseInterface::class); - */ - protected $db; - /** * The page class suffix * @@ -108,7 +96,6 @@ public function display($tpl = null) $this->state = $this->get('State'); $this->params = $this->state->get('params'); $this->mfaConfigurationUI = Mfa::getConfigurationInterface($user); - $this->db = Factory::getDbo(); // Check for errors. if (\count($errors = $this->get('Errors'))) { From 0105c24448e9e69dc4120eaf085967ab56c8f5f3 Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Tue, 5 Mar 2024 14:36:21 +0100 Subject: [PATCH 2/3] cs --- administrator/components/com_users/src/View/Users/HtmlView.php | 2 -- components/com_users/src/View/Profile/HtmlView.php | 1 - 2 files changed, 3 deletions(-) diff --git a/administrator/components/com_users/src/View/Users/HtmlView.php b/administrator/components/com_users/src/View/Users/HtmlView.php index 57f9887d4c828..cc1d4c846d128 100644 --- a/administrator/components/com_users/src/View/Users/HtmlView.php +++ b/administrator/components/com_users/src/View/Users/HtmlView.php @@ -10,7 +10,6 @@ namespace Joomla\Component\Users\Administrator\View\Users; -use Joomla\CMS\Factory; use Joomla\CMS\Helper\ContentHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\View\GenericDataException; @@ -18,7 +17,6 @@ use Joomla\CMS\Toolbar\Button\DropdownButton; use Joomla\CMS\Toolbar\Toolbar; use Joomla\CMS\Toolbar\ToolbarHelper; -use Joomla\Database\DatabaseDriver; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; diff --git a/components/com_users/src/View/Profile/HtmlView.php b/components/com_users/src/View/Profile/HtmlView.php index 11f2f335a8f5e..8c9ac2232c9d0 100644 --- a/components/com_users/src/View/Profile/HtmlView.php +++ b/components/com_users/src/View/Profile/HtmlView.php @@ -19,7 +19,6 @@ use Joomla\CMS\Router\Route; use Joomla\CMS\User\User; use Joomla\Component\Users\Administrator\Helper\Mfa; -use Joomla\Database\DatabaseDriver; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; From 4e6cad6a76e575d3230adb71a9e67b637bc5d8a6 Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Wed, 23 Oct 2024 16:32:45 +0200 Subject: [PATCH 3/3] imports --- administrator/components/com_users/src/View/Users/HtmlView.php | 1 - components/com_users/src/View/Profile/HtmlView.php | 1 - 2 files changed, 2 deletions(-) diff --git a/administrator/components/com_users/src/View/Users/HtmlView.php b/administrator/components/com_users/src/View/Users/HtmlView.php index 3aa81457ca950..d88ba98067919 100644 --- a/administrator/components/com_users/src/View/Users/HtmlView.php +++ b/administrator/components/com_users/src/View/Users/HtmlView.php @@ -17,7 +17,6 @@ use Joomla\CMS\Toolbar\Button\DropdownButton; use Joomla\CMS\Toolbar\ToolbarHelper; use Joomla\Component\Users\Administrator\Model\UsersModel; -use Joomla\Database\DatabaseDriver; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; diff --git a/components/com_users/src/View/Profile/HtmlView.php b/components/com_users/src/View/Profile/HtmlView.php index 2006a94509c08..137a5a67ed5fc 100644 --- a/components/com_users/src/View/Profile/HtmlView.php +++ b/components/com_users/src/View/Profile/HtmlView.php @@ -19,7 +19,6 @@ use Joomla\CMS\User\User; use Joomla\Component\Users\Administrator\Helper\Mfa; use Joomla\Component\Users\Site\Model\ProfileModel; -use Joomla\Database\DatabaseDriver; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die;