diff --git a/administrator/components/com_guidedtours/src/View/Step/HtmlView.php b/administrator/components/com_guidedtours/src/View/Step/HtmlView.php index dc44d34fac17..a25ee5be05f7 100644 --- a/administrator/components/com_guidedtours/src/View/Step/HtmlView.php +++ b/administrator/components/com_guidedtours/src/View/Step/HtmlView.php @@ -16,6 +16,7 @@ use Joomla\CMS\MVC\View\GenericDataException; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Guidedtours\Administrator\Model\StepModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -68,11 +69,14 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->form = $this->get('Form'); - $this->item = $this->get('Item'); - $this->state = $this->get('State'); + /** @var StepModel $model */ + $model = $this->getModel(); - if (\count($errors = $this->get('Errors'))) { + $this->form = $model->getForm(); + $this->item = $model->getItem(); + $this->state = $model->getState(); + + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } diff --git a/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php b/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php index d67d3044acb5..101f7df659d4 100644 --- a/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php +++ b/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php @@ -17,6 +17,7 @@ use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Router\Route; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Guidedtours\Administrator\Model\StepsModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -82,18 +83,21 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->state = $this->get('State'); - $this->filterForm = $this->get('FilterForm'); - $this->activeFilters = $this->get('ActiveFilters'); + /** @var StepsModel $model */ + $model = $this->getModel(); - if (!\count($this->items) && $this->isEmptyState = $this->get('IsEmptyState')) { + $this->items = $model->getItems(); + $this->pagination = $model->getPagination(); + $this->state = $model->getState(); + $this->filterForm = $model->getFilterForm(); + $this->activeFilters = $model->getActiveFilters(); + + if (!\count($this->items) && $this->isEmptyState = $model->getIsEmptyState()) { $this->setLayout('emptystate'); } // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } diff --git a/administrator/components/com_guidedtours/src/View/Tour/HtmlView.php b/administrator/components/com_guidedtours/src/View/Tour/HtmlView.php index 8a5f7e62452b..6ee65c44d563 100644 --- a/administrator/components/com_guidedtours/src/View/Tour/HtmlView.php +++ b/administrator/components/com_guidedtours/src/View/Tour/HtmlView.php @@ -16,6 +16,7 @@ use Joomla\CMS\MVC\View\GenericDataException; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Guidedtours\Administrator\Model\TourModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -68,11 +69,14 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->form = $this->get('Form'); - $this->item = $this->get('Item'); - $this->state = $this->get('State'); + /** @var TourModel $model */ + $model = $this->getModel(); - if (\count($errors = $this->get('Errors'))) { + $this->form = $model->getItem(); + $this->item = $model->getItem(); + $this->state = $model->getState(); + + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } diff --git a/administrator/components/com_guidedtours/src/View/Tours/HtmlView.php b/administrator/components/com_guidedtours/src/View/Tours/HtmlView.php index 261449bc67d4..81aae1f4515e 100644 --- a/administrator/components/com_guidedtours/src/View/Tours/HtmlView.php +++ b/administrator/components/com_guidedtours/src/View/Tours/HtmlView.php @@ -16,6 +16,7 @@ use Joomla\CMS\MVC\View\GenericDataException; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Guidedtours\Administrator\Model\ToursModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -81,18 +82,21 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->state = $this->get('State'); - $this->filterForm = $this->get('FilterForm'); - $this->activeFilters = $this->get('ActiveFilters'); + /** @var ToursModel $model */ + $model = $this->getModel(); - if (!\count($this->items) && $this->isEmptyState = $this->get('IsEmptyState')) { + $this->items = $model->getItems(); + $this->pagination = $model->getPagination(); + $this->state = $model->getState(); + $this->filterForm = $model->getFilterForm(); + $this->activeFilters = $model->getActiveFilters(); + + if (!\count($this->items) && $this->isEmptyState = $model->getIsEmptyState()) { $this->setLayout('emptystate'); } // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } diff --git a/administrator/components/com_installer/src/View/Discover/HtmlView.php b/administrator/components/com_installer/src/View/Discover/HtmlView.php index b3bad1621b51..15b49338c5a2 100644 --- a/administrator/components/com_installer/src/View/Discover/HtmlView.php +++ b/administrator/components/com_installer/src/View/Discover/HtmlView.php @@ -11,6 +11,7 @@ namespace Joomla\Component\Installer\Administrator\View\Discover; use Joomla\CMS\MVC\View\GenericDataException; +use Joomla\Component\Installer\Administrator\Model\DiscoverModel; use Joomla\Component\Installer\Administrator\View\Installer\HtmlView as InstallerViewDefault; // phpcs:disable PSR1.Files.SideEffects @@ -75,23 +76,26 @@ class HtmlView extends InstallerViewDefault */ public function display($tpl = null) { + /** @var DiscoverModel $model */ + $model = $this->getModel(); + // Run discover from the model. - if (!$this->getModel()->checkExtensions()) { - $this->getModel()->discover(); + if (!$model->checkExtensions()) { + $model->discover(); } // Get data from the model. - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->filterForm = $this->get('FilterForm'); - $this->activeFilters = $this->get('ActiveFilters'); + $this->items = $model->getItems(); + $this->pagination = $model->getPagination(); + $this->filterForm = $model->getFilterForm(); + $this->activeFilters = $model->getActiveFilters(); - if (!\count($this->items) && $this->isEmptyState = $this->get('IsEmptyState')) { + if (!\count($this->items) && $this->isEmptyState = $model->getIsEmptyState()) { $this->setLayout('emptystate'); } // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } diff --git a/administrator/components/com_installer/src/View/Installer/HtmlView.php b/administrator/components/com_installer/src/View/Installer/HtmlView.php index c08726497ec9..50ba70438379 100644 --- a/administrator/components/com_installer/src/View/Installer/HtmlView.php +++ b/administrator/components/com_installer/src/View/Installer/HtmlView.php @@ -15,6 +15,7 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Installer\Administrator\Model\InstallerModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -71,21 +72,21 @@ public function __construct($config = null) */ public function display($tpl = null) { + /** @var InstallerModel $model */ + $model = $this->getModel(); + // Get data from the model. - $state = $this->get('State'); + $this->state = $model->getState(); // Are there messages to display? - $showMessage = false; + $this->showMessage = false; - if (\is_object($state)) { - $message1 = $state->get('message'); - $message2 = $state->get('extension_message'); - $showMessage = ($message1 || $message2); + if (\is_object($this->state)) { + $message1 = $this->state->get('message'); + $message2 = $this->state->get('extension_message'); + $this->showMessage = ($message1 || $message2); } - $this->showMessage = $showMessage; - $this->state = &$state; - $this->addToolbar(); parent::display($tpl); } diff --git a/administrator/components/com_installer/src/View/Languages/HtmlView.php b/administrator/components/com_installer/src/View/Languages/HtmlView.php index b6d482f9ddff..a0e6c4bf5025 100644 --- a/administrator/components/com_installer/src/View/Languages/HtmlView.php +++ b/administrator/components/com_installer/src/View/Languages/HtmlView.php @@ -15,6 +15,7 @@ use Joomla\CMS\Language\LanguageHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\View\GenericDataException; +use Joomla\Component\Installer\Administrator\Model\LanguagesModel; use Joomla\Component\Installer\Administrator\View\Installer\HtmlView as InstallerViewDefault; // phpcs:disable PSR1.Files.SideEffects @@ -65,15 +66,18 @@ public function display($tpl = null) throw new NotAllowed(Text::_('JERROR_ALERTNOAUTHOR'), 403); } + /** @var LanguagesModel $model */ + $model = $this->getModel(); + // Get data from the model. - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->filterForm = $this->get('FilterForm'); - $this->activeFilters = $this->get('ActiveFilters'); + $this->items = $model->getItems(); + $this->pagination = $model->getPagination(); + $this->filterForm = $model->getFilterForm(); + $this->activeFilters = $model->getActiveFilters(); $this->installedLang = LanguageHelper::getInstalledLanguages(); // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } diff --git a/administrator/components/com_installer/src/View/Manage/HtmlView.php b/administrator/components/com_installer/src/View/Manage/HtmlView.php index 299dcb8ff5f7..e4b596bb5397 100644 --- a/administrator/components/com_installer/src/View/Manage/HtmlView.php +++ b/administrator/components/com_installer/src/View/Manage/HtmlView.php @@ -14,6 +14,7 @@ use Joomla\CMS\Helper\ContentHelper; use Joomla\CMS\MVC\View\GenericDataException; use Joomla\CMS\Pagination\Pagination; +use Joomla\Component\Installer\Administrator\Model\ManageModel; use Joomla\Component\Installer\Administrator\View\Installer\HtmlView as InstallerViewDefault; // phpcs:disable PSR1.Files.SideEffects @@ -73,14 +74,17 @@ class HtmlView extends InstallerViewDefault */ public function display($tpl = null) { + /** @var ManageModel $model */ + $model = $this->getModel(); + // Get data from the model. - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->filterForm = $this->get('FilterForm'); - $this->activeFilters = $this->get('ActiveFilters'); + $this->items = $model->getItems(); + $this->pagination = $model->getPagination(); + $this->filterForm = $model->getFilterForm(); + $this->activeFilters = $model->getActiveFilters(); // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } diff --git a/administrator/components/com_installer/src/View/Update/HtmlView.php b/administrator/components/com_installer/src/View/Update/HtmlView.php index c1f733bb7c2a..819a80eeb4d5 100644 --- a/administrator/components/com_installer/src/View/Update/HtmlView.php +++ b/administrator/components/com_installer/src/View/Update/HtmlView.php @@ -15,6 +15,7 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\Object\CMSObject; use Joomla\Component\Installer\Administrator\Helper\InstallerHelper as CmsInstallerHelper; +use Joomla\Component\Installer\Administrator\Model\UpdateModel; use Joomla\Component\Installer\Administrator\View\Installer\HtmlView as InstallerViewDefault; // phpcs:disable PSR1.Files.SideEffects @@ -81,18 +82,18 @@ class HtmlView extends InstallerViewDefault */ public function display($tpl = null) { - // Get data from the model. - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->filterForm = $this->get('FilterForm'); - $this->activeFilters = $this->get('ActiveFilters'); - - $paths = new \stdClass(); - $paths->first = ''; + /** @var UpdateModel $model */ + $model = $this->getModel(); - $this->paths = &$paths; - - if (\count($this->items) === 0 && $this->isEmptyState = $this->get('IsEmptyState')) { + // Get data from the model. + $this->items = $model->getItems(); + $this->pagination = $model->getPagination(); + $this->filterForm = $model->getFilterForm(); + $this->activeFilters = $model->getActiveFilters(); + $this->paths = new \stdClass(); + $this->paths->first = ''; + + if (\count($this->items) === 0 && $this->isEmptyState = $model->getIsEmptyState()) { $this->setLayout('emptystate'); } else { Factory::getApplication()->enqueueMessage(Text::_('COM_INSTALLER_MSG_WARNINGS_UPDATE_NOTICE'), 'warning'); diff --git a/administrator/components/com_installer/src/View/Warnings/HtmlView.php b/administrator/components/com_installer/src/View/Warnings/HtmlView.php index 1fe991e137f4..f480472187ab 100644 --- a/administrator/components/com_installer/src/View/Warnings/HtmlView.php +++ b/administrator/components/com_installer/src/View/Warnings/HtmlView.php @@ -10,6 +10,7 @@ namespace Joomla\Component\Installer\Administrator\View\Warnings; +use Joomla\Component\Installer\Administrator\Model\WarningsModel; use Joomla\Component\Installer\Administrator\View\Installer\HtmlView as InstallerViewDefault; // phpcs:disable PSR1.Files.SideEffects @@ -34,7 +35,10 @@ class HtmlView extends InstallerViewDefault */ public function display($tpl = null) { - $this->messages = $this->get('Items'); + /** @var WarningsModel $model */ + $model = $this->getModel(); + + $this->messages = $model->getItems(); if (!\count($this->messages)) { $this->setLayout('emptystate'); diff --git a/administrator/components/com_installer/tmpl/installer/default_message.php b/administrator/components/com_installer/tmpl/installer/default_message.php index 87ac7477e3ea..3d0e89353c13 100644 --- a/administrator/components/com_installer/tmpl/installer/default_message.php +++ b/administrator/components/com_installer/tmpl/installer/default_message.php @@ -12,7 +12,7 @@ /** @var \Joomla\Component\Installer\Administrator\View\Installer\HtmlView $this */ -$state = $this->get('State'); +$state = $this->state; $message1 = $state->get('message'); $message2 = $state->get('extension_message'); ?> diff --git a/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php b/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php index 2426157f1196..72db5813aa7f 100644 --- a/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php +++ b/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php @@ -16,6 +16,7 @@ use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\ToolbarHelper; use Joomla\CMS\Version; +use Joomla\Component\Joomlaupdate\Administrator\Model\UpdateModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -163,20 +164,21 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->updateInfo = $this->get('UpdateInformation'); - $this->selfUpdateAvailable = $this->get('CheckForSelfUpdate'); + /** @var UpdateModel $model */ + $model = $this->getModel(); // Get results of pre update check evaluations - $model = $this->getModel(); - $this->phpOptions = $this->get('PhpOptions'); - $this->phpSettings = $this->get('PhpSettings'); - $this->nonCoreExtensions = $this->get('NonCoreExtensions'); + $this->updateInfo = $model->getUpdateInformation(); + $this->selfUpdateAvailable = $model->getCheckForSelfUpdate(); + $this->phpOptions = $model->getPhpOptions(); + $this->phpSettings = $model->getPhpSettings(); + $this->nonCoreExtensions = $model->getNonCoreExtensions(); $this->isDefaultBackendTemplate = (bool) $model->isTemplateActive($this->defaultBackendTemplate); $nextMajorVersion = Version::MAJOR_VERSION + 1; // The critical plugins check is only available for major updates. if (version_compare($this->updateInfo['latest'], (string) $nextMajorVersion, '>=')) { - $this->nonCoreCriticalPlugins = $this->get('NonCorePlugins'); + $this->nonCoreCriticalPlugins = $model->getNonCorePlugins(); } // Set to true if a required PHP option is not ok @@ -189,7 +191,7 @@ public function display($tpl = null) } } - $this->state = $this->get('State'); + $this->state = $model->getState(); $hasUpdate = !empty($this->updateInfo['hasUpdate']); $hasDownload = isset($this->updateInfo['object']->downloadurl->_data); diff --git a/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php b/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php index 129f0f848f27..d4941bd8d1fe 100644 --- a/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php +++ b/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php @@ -14,6 +14,8 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Installer\Administrator\Model\WarningsModel; +use Joomla\Component\Joomlaupdate\Administrator\Model\UpdateModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -72,16 +74,21 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { + /** @var UpdateModel $model */ + $model = $this->getModel(); + // Load com_installer's language $language = $this->getLanguage(); $language->load('com_installer', JPATH_ADMINISTRATOR, 'en-GB', false, true); $language->load('com_installer', JPATH_ADMINISTRATOR, null, true); - $this->updateInfo = $this->get('UpdateInformation'); - $this->selfUpdateAvailable = $this->get('CheckForSelfUpdate'); + $this->updateInfo = $model->getUpdateInformation(); + $this->selfUpdateAvailable = $model->getCheckForSelfUpdate(); if ($this->getLayout() !== 'captive') { - $this->warnings = $this->get('Items', 'warnings'); + /** @var WarningsModel $warningsModel */ + $warningsModel = $this->getModel('warnings'); + $this->warnings = $warningsModel->getItems(); } $params = ComponentHelper::getParams('com_joomlaupdate'); diff --git a/administrator/components/com_languages/src/View/Installed/HtmlView.php b/administrator/components/com_languages/src/View/Installed/HtmlView.php index a2564ec73b42..2b36393c4994 100644 --- a/administrator/components/com_languages/src/View/Installed/HtmlView.php +++ b/administrator/components/com_languages/src/View/Installed/HtmlView.php @@ -15,6 +15,7 @@ use Joomla\CMS\MVC\View\GenericDataException; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Languages\Administrator\Model\InstalledModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -83,16 +84,19 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->option = $this->get('Option'); - $this->pagination = $this->get('Pagination'); - $this->rows = $this->get('Data'); - $this->total = $this->get('Total'); - $this->state = $this->get('State'); - $this->filterForm = $this->get('FilterForm'); - $this->activeFilters = $this->get('ActiveFilters'); + /** @var InstalledModel $model */ + $model = $this->getModel(); + + $this->option = $model->getOption(); + $this->pagination = $model->getPagination(); + $this->rows = $model->getData(); + $this->total = $model->getTotal(); + $this->state = $model->getState(); + $this->filterForm = $model->getFilterForm(); + $this->activeFilters = $model->getActiveFilters(); // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } diff --git a/administrator/components/com_languages/src/View/Language/HtmlView.php b/administrator/components/com_languages/src/View/Language/HtmlView.php index f2fdb181694c..a9b0d445a9e8 100644 --- a/administrator/components/com_languages/src/View/Language/HtmlView.php +++ b/administrator/components/com_languages/src/View/Language/HtmlView.php @@ -17,6 +17,7 @@ use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\Toolbar; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Languages\Administrator\Model\LanguageModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -68,13 +69,16 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->item = $this->get('Item'); - $this->form = $this->get('Form'); - $this->state = $this->get('State'); + /** @var LanguageModel $model */ + $model = $this->getModel(); + + $this->item = $model->getItem(); + $this->form = $model->getForm(); + $this->state = $model->getState(); $this->canDo = ContentHelper::getActions('com_languages'); // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } diff --git a/administrator/components/com_languages/src/View/Languages/HtmlView.php b/administrator/components/com_languages/src/View/Languages/HtmlView.php index ac8d004ef622..b7598c374a3b 100644 --- a/administrator/components/com_languages/src/View/Languages/HtmlView.php +++ b/administrator/components/com_languages/src/View/Languages/HtmlView.php @@ -16,6 +16,7 @@ use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\Button\DropdownButton; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Languages\Administrator\Model\LanguagesModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -77,14 +78,17 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->state = $this->get('State'); - $this->filterForm = $this->get('FilterForm'); - $this->activeFilters = $this->get('ActiveFilters'); + /** @var LanguagesModel $model */ + $model = $this->getModel(); + + $this->items = $model->getItems(); + $this->pagination = $model->getPagination(); + $this->state = $model->getState(); + $this->filterForm = $model->getFilterForm(); + $this->activeFilters = $model->getActiveFilters(); // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } diff --git a/administrator/components/com_languages/src/View/Override/HtmlView.php b/administrator/components/com_languages/src/View/Override/HtmlView.php index 7a1e68769879..3daf15057ba6 100644 --- a/administrator/components/com_languages/src/View/Override/HtmlView.php +++ b/administrator/components/com_languages/src/View/Override/HtmlView.php @@ -17,6 +17,7 @@ use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\Toolbar; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Languages\Administrator\Model\OverrideModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -64,9 +65,12 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->form = $this->get('Form'); - $this->item = $this->get('Item'); - $this->state = $this->get('State'); + /** @var OverrideModel $model */ + $model = $this->getModel(); + + $this->form = $model->getForm(); + $this->item = $model->getItem(); + $this->state = $model->getState(); $app = Factory::getApplication(); @@ -79,7 +83,7 @@ public function display($tpl = null) } // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors)); } diff --git a/administrator/components/com_languages/src/View/Overrides/HtmlView.php b/administrator/components/com_languages/src/View/Overrides/HtmlView.php index 8b57b0162f0d..3fd8588e0f2c 100644 --- a/administrator/components/com_languages/src/View/Overrides/HtmlView.php +++ b/administrator/components/com_languages/src/View/Overrides/HtmlView.php @@ -15,6 +15,7 @@ use Joomla\CMS\MVC\View\GenericDataException; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Languages\Administrator\Model\OverridesModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -84,15 +85,17 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->state = $this->get('State'); - $this->items = $this->get('Overrides'); - $this->languages = $this->get('Languages'); - $this->pagination = $this->get('Pagination'); - $this->filterForm = $this->get('FilterForm'); - $this->activeFilters = $this->get('ActiveFilters'); + /** @var OverridesModel $model */ + $model = $this->getModel(); + + $this->state = $model->getState(); + $this->items = $model->getOverrides(); + $this->pagination = $model->getPagination(); + $this->filterForm = $model->getFilterForm(); + $this->activeFilters = $model->getActiveFilters(); // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors)); } diff --git a/administrator/components/com_mails/src/View/Template/HtmlView.php b/administrator/components/com_mails/src/View/Template/HtmlView.php index 235346c41a76..6c76a01e52aa 100644 --- a/administrator/components/com_mails/src/View/Template/HtmlView.php +++ b/administrator/components/com_mails/src/View/Template/HtmlView.php @@ -18,6 +18,7 @@ use Joomla\CMS\Toolbar\Toolbar; use Joomla\CMS\Toolbar\ToolbarHelper; use Joomla\Component\Mails\Administrator\Helper\MailsHelper; +use Joomla\Component\Mails\Administrator\Model\TemplateModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -76,13 +77,16 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->state = $this->get('State'); - $this->item = $this->get('Item'); - $this->master = $this->get('Master'); - $this->form = $this->get('Form'); + /** @var TemplateModel $model */ + $model = $this->getModel(); + + $this->state = $model->getState(); + $this->item = $model->getItem(); + $this->master = $model->getMaster(); + $this->form = $model->getForm(); // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } diff --git a/administrator/components/com_mails/src/View/Templates/HtmlView.php b/administrator/components/com_mails/src/View/Templates/HtmlView.php index 437719ade9ce..3cc6da95f37a 100644 --- a/administrator/components/com_mails/src/View/Templates/HtmlView.php +++ b/administrator/components/com_mails/src/View/Templates/HtmlView.php @@ -18,6 +18,7 @@ use Joomla\CMS\Pagination\Pagination; use Joomla\CMS\Toolbar\ToolbarHelper; use Joomla\Component\Mails\Administrator\Helper\MailsHelper; +use Joomla\Component\Mails\Administrator\Model\TemplatesModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -90,16 +91,19 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->items = $this->get('Items'); - $this->languages = $this->get('Languages'); - $this->pagination = $this->get('Pagination'); - $this->state = $this->get('State'); - $this->filterForm = $this->get('FilterForm'); - $this->activeFilters = $this->get('ActiveFilters'); - $extensions = $this->get('Extensions'); + /** @var TemplatesModel $model */ + $model = $this->getModel(); + + $this->items = $model->getItems(); + $this->languages = $model->getLanguages(); + $this->pagination = $model->getPagination(); + $this->state = $model->getState(); + $this->filterForm = $model->getFilterForm(); + $this->activeFilters = $model->getActiveFilters(); + $extensions = $model->getExtensions(); // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } diff --git a/administrator/components/com_media/src/View/File/HtmlView.php b/administrator/components/com_media/src/View/File/HtmlView.php index 1a644ee5265f..fd47ea15912d 100644 --- a/administrator/components/com_media/src/View/File/HtmlView.php +++ b/administrator/components/com_media/src/View/File/HtmlView.php @@ -15,6 +15,7 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Media\Administrator\Model\FileModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -38,15 +39,18 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { + /** @var FileModel $model */ + $model = $this->getModel(); + $input = Factory::getApplication()->getInput(); - $this->form = $this->get('Form'); + $this->form = $model->getForm(); // The component params $this->params = ComponentHelper::getParams('com_media'); // The requested file - $this->file = $this->getModel()->getFileInformation($input->getString('path', null)); + $this->file = $model->getFileInformation($input->getString('path', null)); if (empty($this->file->content)) { // @todo error handling controller redirect files diff --git a/administrator/components/com_media/src/View/Media/HtmlView.php b/administrator/components/com_media/src/View/Media/HtmlView.php index b0143be555c2..2d24f572af51 100644 --- a/administrator/components/com_media/src/View/Media/HtmlView.php +++ b/administrator/components/com_media/src/View/Media/HtmlView.php @@ -17,6 +17,7 @@ use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Router\Route; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Media\Administrator\Model\MediaModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -59,11 +60,14 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { + /** @var MediaModel $model */ + $model = $this->getModel(); + // Prepare the toolbar $this->prepareToolbar(); // Get enabled adapters - $this->providers = $this->get('Providers'); + $this->providers = $model->getProviders(); // Check that there are providers if (!\count($this->providers)) { diff --git a/administrator/components/com_menus/src/View/Item/HtmlView.php b/administrator/components/com_menus/src/View/Item/HtmlView.php index 83edf9dbf710..3670928cb434 100644 --- a/administrator/components/com_menus/src/View/Item/HtmlView.php +++ b/administrator/components/com_menus/src/View/Item/HtmlView.php @@ -19,6 +19,7 @@ use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\Toolbar; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Menus\Administrator\Model\ItemModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -93,11 +94,14 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->state = $this->get('State'); - $this->form = $this->get('Form'); - $this->item = $this->get('Item'); - $this->modules = $this->get('Modules'); - $this->levels = $this->get('ViewLevels'); + /** @var ItemModel $model */ + $model = $this->getModel(); + + $this->state = $model->getState(); + $this->form = $model->getForm(); + $this->item = $model->getItem(); + $this->modules = $model->getModules(); + $this->levels = $model->getViewLevels(); $this->canDo = ContentHelper::getActions('com_menus', 'menu', (int) $this->state->get('item.menutypeid')); // Check if we're allowed to edit this item @@ -107,7 +111,7 @@ public function display($tpl = null) } // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } @@ -212,7 +216,9 @@ function (Toolbar $childBar) use ($isNew, $checkedOut, $canDo) { // Get the help information for the menu item. $lang = $this->getLanguage(); - $help = $this->get('Help'); + /** @var ItemModel $model */ + $model = $this->getModel(); + $help = $model->getHelp(); if ($lang->hasKey($help->url)) { $debug = $lang->setDebug(false); diff --git a/administrator/components/com_menus/src/View/Items/HtmlView.php b/administrator/components/com_menus/src/View/Items/HtmlView.php index 7e852eb43e48..ce7e97dc6b7d 100644 --- a/administrator/components/com_menus/src/View/Items/HtmlView.php +++ b/administrator/components/com_menus/src/View/Items/HtmlView.php @@ -19,6 +19,7 @@ use Joomla\CMS\MVC\View\GenericDataException; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Menus\Administrator\Model\ItemsModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -96,16 +97,19 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { + /** @var ItemsModel $model */ + $model = $this->getModel(); + $lang = $this->getLanguage(); - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->total = $this->get('Total'); - $this->state = $this->get('State'); - $this->filterForm = $this->get('FilterForm'); - $this->activeFilters = $this->get('ActiveFilters'); + $this->items = $model->getItems(); + $this->pagination = $model->getPagination(); + $this->total = $model->getTotal(); + $this->state = $model->getState(); + $this->filterForm = $model->getFilterForm(); + $this->activeFilters = $model->getActiveFilters(); // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } @@ -298,7 +302,7 @@ protected function addToolbar() $user = $this->getCurrentUser(); // Get the menu title - $menuTypeTitle = $this->get('State')->get('menutypetitle'); + $menuTypeTitle = $this->state->get('menutypetitle'); // Get the toolbar object instance $toolbar = $this->getDocument()->getToolbar(); diff --git a/administrator/components/com_menus/src/View/Menu/HtmlView.php b/administrator/components/com_menus/src/View/Menu/HtmlView.php index ee85c68b085c..05f6a80b71eb 100644 --- a/administrator/components/com_menus/src/View/Menu/HtmlView.php +++ b/administrator/components/com_menus/src/View/Menu/HtmlView.php @@ -17,6 +17,7 @@ use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\Toolbar; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Menus\Administrator\Model\MenuModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -68,14 +69,17 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->form = $this->get('Form'); - $this->item = $this->get('Item'); - $this->state = $this->get('State'); + /** @var MenuModel $model */ + $model = $this->getModel(); + + $this->form = $model->getForm(); + $this->item = $model->getItem(); + $this->state = $model->getState(); $this->canDo = ContentHelper::getActions('com_menus', 'menu', $this->item->id); // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } diff --git a/administrator/components/com_menus/src/View/Menus/HtmlView.php b/administrator/components/com_menus/src/View/Menus/HtmlView.php index 25bc1a4d74fc..866b923bf5ca 100644 --- a/administrator/components/com_menus/src/View/Menus/HtmlView.php +++ b/administrator/components/com_menus/src/View/Menus/HtmlView.php @@ -15,6 +15,7 @@ use Joomla\CMS\MVC\View\GenericDataException; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Menus\Administrator\Model\MenusModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -91,18 +92,21 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->items = $this->get('Items'); - $this->modules = $this->get('Modules'); - $this->pagination = $this->get('Pagination'); - $this->state = $this->get('State'); + /** @var MenusModel $model */ + $model = $this->getModel(); + + $this->items = $model->getItems(); + $this->modules = $model->getModules(); + $this->pagination = $model->getPagination(); + $this->state = $model->getState(); if ($this->getLayout() == 'default') { - $this->filterForm = $this->get('FilterForm'); - $this->activeFilters = $this->get('ActiveFilters'); + $this->filterForm = $model->getFilterForm(); + $this->activeFilters = $model->getActiveFilters(); } // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } diff --git a/administrator/components/com_menus/src/View/Menutypes/HtmlView.php b/administrator/components/com_menus/src/View/Menutypes/HtmlView.php index e0c45536ab91..e75af1057c8a 100644 --- a/administrator/components/com_menus/src/View/Menutypes/HtmlView.php +++ b/administrator/components/com_menus/src/View/Menutypes/HtmlView.php @@ -15,6 +15,7 @@ use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Object\CMSObject; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Menus\Administrator\Model\MenutypesModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -58,7 +59,10 @@ public function display($tpl = null) $app = Factory::getApplication(); $this->recordId = $app->getInput()->getInt('recordId'); - $types = $this->get('TypeOptions'); + /** @var MenutypesModel $model */ + $model = $this->getModel(); + + $types = $model->getTypeOptions(); $this->addCustomTypes($types); @@ -154,7 +158,7 @@ protected function addCustomTypes(&$types) $o->request = null; $list[] = $o; - if ($this->get('state')->get('client_id') == 1) { + if ($this->state->get('client_id') == 1) { $o = new CMSObject(); $o->title = 'COM_MENUS_TYPE_CONTAINER'; $o->type = 'container'; diff --git a/administrator/components/com_menus/tmpl/menus/default.php b/administrator/components/com_menus/tmpl/menus/default.php index e39ba67c3d4c..794fdb30db4a 100644 --- a/administrator/components/com_menus/tmpl/menus/default.php +++ b/administrator/components/com_menus/tmpl/menus/default.php @@ -31,7 +31,7 @@ $user = $this->getCurrentUser(); $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); -$modMenuId = (int) $this->get('ModMenuId'); +$modMenuId = (int) $this->getModel()->getModMenuId(); $itemIds = []; foreach ($this->items as $item) { diff --git a/administrator/components/com_messages/src/View/Config/HtmlView.php b/administrator/components/com_messages/src/View/Config/HtmlView.php index 78128aae43a1..a1920989761b 100644 --- a/administrator/components/com_messages/src/View/Config/HtmlView.php +++ b/administrator/components/com_messages/src/View/Config/HtmlView.php @@ -15,6 +15,7 @@ use Joomla\CMS\MVC\View\GenericDataException; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Messages\Administrator\Model\ConfigModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -59,12 +60,15 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->form = $this->get('Form'); - $this->item = $this->get('Item'); - $this->state = $this->get('State'); + /** @var ConfigModel $model */ + $model = $this->getModel(); + + $this->form = $model->getForm(); + $this->item = $model->getItem(); + $this->state = $model->getState(); // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } diff --git a/administrator/components/com_messages/src/View/Message/HtmlView.php b/administrator/components/com_messages/src/View/Message/HtmlView.php index 283dcdce429c..9979de530764 100644 --- a/administrator/components/com_messages/src/View/Message/HtmlView.php +++ b/administrator/components/com_messages/src/View/Message/HtmlView.php @@ -17,6 +17,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper; use Joomla\CMS\User\UserFactoryAwareInterface; use Joomla\CMS\User\UserFactoryAwareTrait; +use Joomla\Component\Messages\Administrator\Model\MessageModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -63,12 +64,15 @@ class HtmlView extends BaseHtmlView implements UserFactoryAwareInterface */ public function display($tpl = null) { - $this->form = $this->get('Form'); - $this->item = $this->get('Item'); - $this->state = $this->get('State'); + /** @var MessageModel $model */ + $model = $this->getModel(); + + $this->form = $model->getForm(); + $this->item = $model->getItem(); + $this->state = $model->getState(); // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } diff --git a/administrator/components/com_messages/src/View/Messages/HtmlView.php b/administrator/components/com_messages/src/View/Messages/HtmlView.php index 6f353947f632..b6ec48d0692b 100644 --- a/administrator/components/com_messages/src/View/Messages/HtmlView.php +++ b/administrator/components/com_messages/src/View/Messages/HtmlView.php @@ -15,6 +15,7 @@ use Joomla\CMS\MVC\View\GenericDataException; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Messages\Administrator\Model\MessagesModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -84,18 +85,21 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->state = $this->get('State'); - $this->filterForm = $this->get('FilterForm'); - $this->activeFilters = $this->get('ActiveFilters'); + /** @var MessagesModel $model */ + $model = $this->getModel(); - if (!\count($this->items) && $this->isEmptyState = $this->get('IsEmptyState')) { + $this->items = $model->getItems(); + $this->pagination = $model->getPagination(); + $this->state = $model->getState(); + $this->filterForm = $model->getFilterForm(); + $this->activeFilters = $model->getActiveFilters(); + + if (!\count($this->items) && $this->isEmptyState = $model->getIsEmptyState()) { $this->setLayout('emptystate'); } // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } @@ -113,7 +117,7 @@ public function display($tpl = null) */ protected function addToolbar() { - $state = $this->get('State'); + $state = $this->state; $canDo = ContentHelper::getActions('com_messages'); $user = $this->getCurrentUser(); diff --git a/administrator/components/com_modules/src/View/Module/HtmlView.php b/administrator/components/com_modules/src/View/Module/HtmlView.php index e040c200670c..8d9a0ec78e9c 100644 --- a/administrator/components/com_modules/src/View/Module/HtmlView.php +++ b/administrator/components/com_modules/src/View/Module/HtmlView.php @@ -17,6 +17,7 @@ use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\Toolbar; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Modules\Administrator\Model\ModuleModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -77,7 +78,10 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->state = $this->get('State'); + /** @var ModuleModel $model */ + $model = $this->getModel(); + + $this->state = $model->getState(); // Have to stop it earlier, because on cancel task for a new module we do not have an ID, and Model doing redirect on getItem() if ($this->getLayout() === 'modalreturn' && !$this->state->get('module.id')) { @@ -86,8 +90,8 @@ public function display($tpl = null) return; } - $this->form = $this->get('Form'); - $this->item = $this->get('Item'); + $this->form = $model->getForm(); + $this->item = $model->getItem(); $this->canDo = ContentHelper::getActions('com_modules', 'module', $this->item->id); if ($this->getLayout() === 'modalreturn') { @@ -97,7 +101,7 @@ public function display($tpl = null) } // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } @@ -176,7 +180,9 @@ function (Toolbar $childBar) use ($checkedOut, $canDo) { // Get the help information for the menu item. $lang = $this->getLanguage(); - $help = $this->get('Help'); + /** @var ModuleModel $model */ + $model = $this->getModel(); + $help = $model->getHelp(); if ($lang->hasKey($help->url)) { $debug = $lang->setDebug(false); diff --git a/administrator/components/com_modules/src/View/Modules/HtmlView.php b/administrator/components/com_modules/src/View/Modules/HtmlView.php index 52d66c79b8cd..87eb4cfa73fe 100644 --- a/administrator/components/com_modules/src/View/Modules/HtmlView.php +++ b/administrator/components/com_modules/src/View/Modules/HtmlView.php @@ -19,6 +19,7 @@ use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\Button\DropdownButton; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Modules\Administrator\Model\ModulesModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -88,15 +89,18 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->state = $this->get('State'); - $this->total = $this->get('Total'); - $this->filterForm = $this->get('FilterForm'); - $this->activeFilters = $this->get('ActiveFilters'); + /** @var ModulesModel $model */ + $model = $this->getModel(); + + $this->items = $model->getItems(); + $this->pagination = $model->getPagination(); + $this->state = $model->getState(); + $this->total = $model->getTotal(); + $this->filterForm = $model->getFilterForm(); + $this->activeFilters = $model->getActiveFilters(); $this->clientId = $this->state->get('client_id'); - if (!\count($this->items) && $this->isEmptyState = $this->get('IsEmptyState')) { + if (!\count($this->items) && $this->isEmptyState = $model->getIsEmptyState()) { $this->setLayout('emptystate'); } @@ -126,7 +130,7 @@ public function display($tpl = null) } // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } @@ -169,7 +173,7 @@ public function display($tpl = null) */ protected function addToolbar() { - $state = $this->get('State'); + $state = $this->state; $canDo = ContentHelper::getActions('com_modules'); $user = $this->getCurrentUser(); diff --git a/administrator/components/com_modules/src/View/Select/HtmlView.php b/administrator/components/com_modules/src/View/Select/HtmlView.php index 631824c474f4..adf6793e8f14 100644 --- a/administrator/components/com_modules/src/View/Select/HtmlView.php +++ b/administrator/components/com_modules/src/View/Select/HtmlView.php @@ -15,6 +15,7 @@ use Joomla\CMS\MVC\View\GenericDataException; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Modules\Administrator\Model\SelectModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -57,12 +58,15 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->state = $this->get('State'); - $this->items = $this->get('Items'); + /** @var SelectModel $model */ + $model = $this->getModel(); + + $this->state = $model->getState(); + $this->items = $model->getItems(); $this->modalLink = ''; // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } @@ -79,7 +83,7 @@ public function display($tpl = null) */ protected function addToolbar() { - $state = $this->get('State'); + $state = $this->state; $clientId = (int) $state->get('client_id', 0); $toolbar = $this->getDocument()->getToolbar(); diff --git a/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php b/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php index 42a7d684bf77..b972f0f1d21d 100644 --- a/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php +++ b/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php @@ -19,6 +19,7 @@ use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\Toolbar; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Newsfeeds\Administrator\Model\NewsfeedModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -78,9 +79,12 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->state = $this->get('State'); - $this->item = $this->get('Item'); - $this->form = $this->get('Form'); + /** @var NewsfeedModel $model */ + $model = $this->getModel(); + + $this->state = $model->getState(); + $this->item = $model->getItem(); + $this->form = $model->getForm(); if ($this->getLayout() === 'modalreturn') { parent::display($tpl); @@ -89,7 +93,7 @@ public function display($tpl = null) } // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } diff --git a/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php b/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php index 989d60656d0a..c7af4042e9b2 100644 --- a/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php +++ b/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php @@ -18,6 +18,7 @@ use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\Button\DropdownButton; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Newsfeeds\Administrator\Model\NewsfeedsModel; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -91,18 +92,21 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->state = $this->get('State'); - $this->filterForm = $this->get('FilterForm'); - $this->activeFilters = $this->get('ActiveFilters'); + /** @var NewsfeedsModel $model */ + $model = $this->getModel(); - if (!\count($this->items) && $this->isEmptyState = $this->get('IsEmptyState')) { + $this->items = $model->getItems(); + $this->pagination = $model->getPagination(); + $this->state = $model->getState(); + $this->filterForm = $model->getFilterForm(); + $this->activeFilters = $model->getActiveFilters(); + + if (!\count($this->items) && $this->isEmptyState = $model->getIsEmptyState()) { $this->setLayout('emptystate'); } // Check for errors. - if (\count($errors = $this->get('Errors'))) { + if (\count($errors = $model->getErrors())) { throw new GenericDataException(implode("\n", $errors), 500); } @@ -143,7 +147,7 @@ public function display($tpl = null) */ protected function addToolbar() { - $state = $this->get('State'); + $state = $this->state; $canDo = ContentHelper::getActions('com_newsfeeds', 'category', $state->get('filter.category_id')); $user = $this->getCurrentUser(); $toolbar = $this->getDocument()->getToolbar();