diff --git a/administrator/components/com_users/src/View/Users/HtmlView.php b/administrator/components/com_users/src/View/Users/HtmlView.php index b06124aa4c779..d88ba98067919 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\ToolbarHelper; use Joomla\Component\Users\Administrator\Model\UsersModel; -use Joomla\Database\DatabaseDriver; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -80,18 +78,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 * @@ -110,7 +96,6 @@ public function display($tpl = null) $this->filterForm = $model->getFilterForm(); $this->activeFilters = $model->getActiveFilters(); $this->canDo = ContentHelper::getActions('com_users'); - $this->db = Factory::getDbo(); // Check for errors. if (\count($errors = $model->getErrors())) { diff --git a/components/com_content/src/View/Featured/HtmlView.php b/components/com_content/src/View/Featured/HtmlView.php index ae02b1da2dd92..a9f36ffa3b47a 100644 --- a/components/com_content/src/View/Featured/HtmlView.php +++ b/components/com_content/src/View/Featured/HtmlView.php @@ -71,17 +71,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 * @@ -205,7 +194,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 a07f3a9a0fcb5..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; @@ -60,18 +59,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 * @@ -109,7 +96,6 @@ public function display($tpl = null) $this->state = $model->getState(); $this->params = $this->state->get('params'); $this->mfaConfigurationUI = Mfa::getConfigurationInterface($user); - $this->db = Factory::getDbo(); // Check for errors. if (\count($errors = $model->getErrors())) {