From 9c0a3d13a4c951e4cd85c78e71414be79223c9b4 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Tue, 23 Apr 2024 09:47:08 +0200 Subject: [PATCH 1/5] Adding undefined vars $filterForm/$activeFilters to HtmlView --- .../src/View/Associations/HtmlView.php | 14 ++++++++++++++ .../com_installer/src/View/Discover/HtmlView.php | 14 ++++++++++++++ .../com_installer/src/View/Languages/HtmlView.php | 14 ++++++++++++++ .../com_installer/src/View/Manage/HtmlView.php | 14 ++++++++++++++ .../com_installer/src/View/Update/HtmlView.php | 14 ++++++++++++++ .../com_languages/src/View/Overrides/HtmlView.php | 14 ++++++++++++++ 6 files changed, 84 insertions(+) diff --git a/administrator/components/com_associations/src/View/Associations/HtmlView.php b/administrator/components/com_associations/src/View/Associations/HtmlView.php index e6e8527ae033d..494bc0f1cc970 100644 --- a/administrator/components/com_associations/src/View/Associations/HtmlView.php +++ b/administrator/components/com_associations/src/View/Associations/HtmlView.php @@ -66,6 +66,20 @@ class HtmlView extends BaseHtmlView */ public $itemType = null; + /** + * Form object for search filters + * + * @var \Joomla\CMS\Form\Form + */ + public $filterForm; + + /** + * The active search filters + * + * @var array + */ + public $activeFilters; + /** * Display the view * diff --git a/administrator/components/com_installer/src/View/Discover/HtmlView.php b/administrator/components/com_installer/src/View/Discover/HtmlView.php index 52f9fd30183c7..892503573d852 100644 --- a/administrator/components/com_installer/src/View/Discover/HtmlView.php +++ b/administrator/components/com_installer/src/View/Discover/HtmlView.php @@ -33,6 +33,20 @@ class HtmlView extends InstallerViewDefault */ private $isEmptyState = false; + /** + * Form object for search filters + * + * @var \Joomla\CMS\Form\Form + */ + public $filterForm; + + /** + * The active search filters + * + * @var array + */ + public $activeFilters; + /** * Display the view. * diff --git a/administrator/components/com_installer/src/View/Languages/HtmlView.php b/administrator/components/com_installer/src/View/Languages/HtmlView.php index 2adafb0e006b6..e328ae2e48cd7 100644 --- a/administrator/components/com_installer/src/View/Languages/HtmlView.php +++ b/administrator/components/com_installer/src/View/Languages/HtmlView.php @@ -39,6 +39,20 @@ class HtmlView extends InstallerViewDefault */ protected $pagination; + /** + * Form object for search filters + * + * @var \Joomla\CMS\Form\Form + */ + public $filterForm; + + /** + * The active search filters + * + * @var array + */ + public $activeFilters; + /** * Display the view. * diff --git a/administrator/components/com_installer/src/View/Manage/HtmlView.php b/administrator/components/com_installer/src/View/Manage/HtmlView.php index 1cb4eb26707c4..cc173c7a19095 100644 --- a/administrator/components/com_installer/src/View/Manage/HtmlView.php +++ b/administrator/components/com_installer/src/View/Manage/HtmlView.php @@ -49,6 +49,20 @@ class HtmlView extends InstallerViewDefault */ protected $form; + /** + * Form object for search filters + * + * @var \Joomla\CMS\Form\Form + */ + public $filterForm; + + /** + * The active search filters + * + * @var array + */ + public $activeFilters; + /** * Display the view. * diff --git a/administrator/components/com_installer/src/View/Update/HtmlView.php b/administrator/components/com_installer/src/View/Update/HtmlView.php index 0a098a8ea7a8a..7ac4708b02cc0 100644 --- a/administrator/components/com_installer/src/View/Update/HtmlView.php +++ b/administrator/components/com_installer/src/View/Update/HtmlView.php @@ -57,6 +57,20 @@ class HtmlView extends InstallerViewDefault */ private $isEmptyState = false; + /** + * Form object for search filters + * + * @var \Joomla\CMS\Form\Form + */ + public $filterForm; + + /** + * The active search filters + * + * @var array + */ + public $activeFilters; + /** * Display the view. * diff --git a/administrator/components/com_languages/src/View/Overrides/HtmlView.php b/administrator/components/com_languages/src/View/Overrides/HtmlView.php index e9dd379eead06..f528de07efd89 100644 --- a/administrator/components/com_languages/src/View/Overrides/HtmlView.php +++ b/administrator/components/com_languages/src/View/Overrides/HtmlView.php @@ -60,6 +60,20 @@ class HtmlView extends BaseHtmlView */ protected $languages; + /** + * Form object for search filters + * + * @var \Joomla\CMS\Form\Form + */ + public $filterForm; + + /** + * The active search filters + * + * @var array + */ + public $activeFilters; + /** * Displays the view. * From 6dd96f06180fb57404e35f72d0307c974a546497 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Tue, 23 Apr 2024 10:02:09 +0200 Subject: [PATCH 2/5] Fixing typehints from item to list view in layouts --- administrator/components/com_privacy/tmpl/requests/default.php | 2 +- administrator/components/com_redirect/tmpl/links/default.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/administrator/components/com_privacy/tmpl/requests/default.php b/administrator/components/com_privacy/tmpl/requests/default.php index 08bd03afc9224..954c9ec399d1b 100644 --- a/administrator/components/com_privacy/tmpl/requests/default.php +++ b/administrator/components/com_privacy/tmpl/requests/default.php @@ -18,7 +18,7 @@ use Joomla\CMS\Router\Route; use Joomla\CMS\String\PunycodeHelper; -/** @var \Joomla\Component\Privacy\Administrator\View\Request\HtmlView $this */ +/** @var \Joomla\Component\Privacy\Administrator\View\Requests\HtmlView $this */ /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */ $wa = $this->getDocument()->getWebAssetManager(); diff --git a/administrator/components/com_redirect/tmpl/links/default.php b/administrator/components/com_redirect/tmpl/links/default.php index d8d7bdb7f8ade..f2e35e2d65e04 100644 --- a/administrator/components/com_redirect/tmpl/links/default.php +++ b/administrator/components/com_redirect/tmpl/links/default.php @@ -18,7 +18,7 @@ use Joomla\CMS\Uri\Uri; use Joomla\Component\Redirect\Administrator\Helper\RedirectHelper; -/** @var \Joomla\Component\Redirect\Administrator\View\Link\HtmlView $this */ +/** @var \Joomla\Component\Redirect\Administrator\View\Links\HtmlView $this */ /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */ $wa = $this->getDocument()->getWebAssetManager(); From 9a28b4e2b30a90a363f577474c6538eeaf4e1e83 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Tue, 23 Apr 2024 10:02:35 +0200 Subject: [PATCH 3/5] Adding missing $item/$pagination to list views --- .../src/View/Discover/HtmlView.php | 18 ++++++++++++++++++ .../src/View/Messages/HtmlView.php | 9 +++++++++ 2 files changed, 27 insertions(+) diff --git a/administrator/components/com_installer/src/View/Discover/HtmlView.php b/administrator/components/com_installer/src/View/Discover/HtmlView.php index 892503573d852..4decb4cbd4ca8 100644 --- a/administrator/components/com_installer/src/View/Discover/HtmlView.php +++ b/administrator/components/com_installer/src/View/Discover/HtmlView.php @@ -25,6 +25,24 @@ */ class HtmlView extends InstallerViewDefault { + /** + * An array of items + * + * @var array + * + * @since __DEPLOY_VERSION__ + */ + protected $items; + + /** + * The pagination object + * + * @var \Joomla\CMS\Pagination\Pagination + * + * @since __DEPLOY_VERSION__ + */ + protected $pagination; + /** * Is this view an Empty State * diff --git a/administrator/components/com_postinstall/src/View/Messages/HtmlView.php b/administrator/components/com_postinstall/src/View/Messages/HtmlView.php index 60120ed259414..e38f62cdef8f3 100644 --- a/administrator/components/com_postinstall/src/View/Messages/HtmlView.php +++ b/administrator/components/com_postinstall/src/View/Messages/HtmlView.php @@ -28,6 +28,15 @@ */ class HtmlView extends BaseHtmlView { + /** + * An array of items + * + * @var array + * + * @since __DEPLOY_VERSION__ + */ + protected $items; + /** * Executes before rendering the page for the Browse task. * From d234252a0a90731b09a13bef41cab90f4d2976c9 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Tue, 23 Apr 2024 10:18:00 +0200 Subject: [PATCH 4/5] Adding missing $params in CategoryView --- libraries/src/MVC/View/CategoryView.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libraries/src/MVC/View/CategoryView.php b/libraries/src/MVC/View/CategoryView.php index e1ed667723968..d78631db736e2 100644 --- a/libraries/src/MVC/View/CategoryView.php +++ b/libraries/src/MVC/View/CategoryView.php @@ -35,6 +35,15 @@ class CategoryView extends HtmlView */ protected $state; + /** + * The page parameters + * + * @var \Joomla\Registry\Registry + * + * @since __DEPLOY_VERSION__ + */ + protected $params; + /** * Category items data * From a9e084080dfa295506de17ba382d6eeacf9afeb0 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Sun, 28 Apr 2024 22:39:23 +0200 Subject: [PATCH 5/5] Make $params public instead of protected --- libraries/src/MVC/View/CategoryView.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/src/MVC/View/CategoryView.php b/libraries/src/MVC/View/CategoryView.php index d78631db736e2..cf764cc2169a4 100644 --- a/libraries/src/MVC/View/CategoryView.php +++ b/libraries/src/MVC/View/CategoryView.php @@ -42,7 +42,7 @@ class CategoryView extends HtmlView * * @since __DEPLOY_VERSION__ */ - protected $params; + public $params; /** * Category items data