Skip to content

[6.0] Remove deprecated db object from views #42962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wilsonge merged 6 commits into from
Nov 2, 2024
Merged

[6.0] Remove deprecated db object from views #42962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d7efe48
Remove deprecated db object from views
laoneo Mar 5, 2024
0105c24
cs
laoneo Mar 5, 2024
970b436
Merge branch '6.0-dev' into view/db
laoneo Oct 20, 2024
f150265
Merge branch '6.0-dev' into view/db
laoneo Oct 23, 2024
4e6cad6
imports
laoneo Oct 23, 2024
0b2603a
Merge branch '6.0-dev' into view/db
laoneo Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions administrator/components/com_users/src/View/Users/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@

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;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
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;
Expand Down Expand Up @@ -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
*
Expand All @@ -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())) {
Expand Down
12 changes: 0 additions & 12 deletions components/com_content/src/View/Featured/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down Expand Up @@ -205,7 +194,6 @@ public function display($tpl = null)
$this->items = &$items;
$this->pagination = &$pagination;
$this->user = &$user;
$this->db = Factory::getDbo();

$this->_prepareDocument();

Expand Down
14 changes: 0 additions & 14 deletions components/com_users/src/View/Profile/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
*
Expand Down Expand Up @@ -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())) {
Expand Down