From 4808c6b0000a0a17be538b4b5282106b65d329a3 Mon Sep 17 00:00:00 2001
From: Allon Moritz <allon.moritz@digital-peak.com>
Date: Sat, 22 Oct 2022 16:17:08 +0200
Subject: [PATCH 1/3] Change application input access to getInput

---
 .../com_admin/src/Model/HelpModel.php         |  4 +-
 .../layouts/joomla/searchtools/default.php    |  4 +-
 .../src/Field/ItemlanguageField.php           |  2 +-
 .../src/Field/Modal/AssociationField.php      |  2 +-
 .../src/Model/AssociationsModel.php           |  6 +--
 .../src/View/Association/HtmlView.php         |  4 +-
 .../src/View/Associations/HtmlView.php        |  2 +-
 .../tmpl/association/edit.php                 |  2 +-
 .../tmpl/associations/modal.php               |  6 +--
 .../com_banners/src/Model/BannerModel.php     |  4 +-
 .../com_banners/src/Model/DownloadModel.php   |  2 +-
 .../com_banners/src/View/Banner/HtmlView.php  |  2 +-
 .../com_banners/src/View/Client/HtmlView.php  |  2 +-
 .../src/Dispatcher/Dispatcher.php             |  2 +-
 .../src/Field/CategoryeditField.php           |  2 +-
 .../src/Field/Modal/CategoryField.php         |  2 +-
 .../src/Model/CategoriesModel.php             |  4 +-
 .../src/Model/CategoryModel.php               | 30 +++++++-------
 .../src/View/Categories/HtmlView.php          |  2 +-
 .../src/View/Category/HtmlView.php            |  6 +--
 .../com_categories/tmpl/categories/modal.php  |  4 +-
 .../com_categories/tmpl/category/edit.php     |  2 +-
 .../com_config/src/Model/ApplicationModel.php | 12 +++---
 .../com_config/src/Model/ComponentModel.php   |  2 +-
 .../src/View/Component/HtmlView.php           |  4 +-
 .../com_contact/src/Model/ContactModel.php    |  4 +-
 .../com_contact/src/Model/ContactsModel.php   |  4 +-
 .../com_contact/src/View/Contact/HtmlView.php |  4 +-
 .../src/View/Contacts/HtmlView.php            |  2 +-
 .../com_contact/tmpl/contact/edit.php         |  2 +-
 .../com_contact/tmpl/contacts/modal.php       |  6 +--
 .../com_content/src/Model/ArticleModel.php    | 14 +++----
 .../com_content/src/Model/ArticlesModel.php   | 14 +++----
 .../com_content/src/View/Article/HtmlView.php |  4 +-
 .../src/View/Articles/HtmlView.php            |  2 +-
 .../com_content/tmpl/article/edit.php         |  2 +-
 .../com_content/tmpl/article/pagebreak.php    |  2 +-
 .../com_content/tmpl/articles/modal.php       |  6 +--
 .../src/Model/CompareModel.php                |  2 +-
 .../src/Model/HistoryModel.php                |  4 +-
 .../src/Model/PreviewModel.php                |  2 +-
 .../com_cpanel/src/View/Cpanel/HtmlView.php   |  2 +-
 .../com_fields/src/Helper/FieldsHelper.php    |  4 +-
 .../com_fields/src/Model/FieldModel.php       | 24 +++++------
 .../com_fields/src/Model/FieldsModel.php      |  4 +-
 .../com_fields/src/Model/GroupModel.php       | 12 +++---
 .../com_fields/src/View/Field/HtmlView.php    |  2 +-
 .../com_fields/src/View/Group/HtmlView.php    |  2 +-
 .../components/com_fields/tmpl/field/edit.php |  2 +-
 .../com_fields/tmpl/fields/modal.php          |  2 +-
 .../components/com_fields/tmpl/group/edit.php |  2 +-
 .../com_finder/src/Indexer/Query.php          |  2 +-
 .../com_finder/src/Service/HTML/Filter.php    |  2 +-
 .../com_finder/src/Service/HTML/Query.php     |  2 +-
 .../com_finder/src/View/Filter/HtmlView.php   |  2 +-
 .../com_finder/tmpl/filter/edit.php           |  2 +-
 .../com_installer/src/Model/DiscoverModel.php |  2 +-
 .../com_installer/src/Model/InstallModel.php  | 10 ++---
 .../src/View/Updatesite/HtmlView.php          |  2 +-
 .../src/Model/UpdateModel.php                 |  2 +-
 .../src/View/Update/HtmlView.php              |  2 +-
 .../com_languages/src/Model/LanguageModel.php |  2 +-
 .../com_languages/src/Model/OverrideModel.php |  2 +-
 .../com_languages/src/Model/StringsModel.php  |  2 +-
 .../src/View/Language/HtmlView.php            |  2 +-
 .../src/View/Override/HtmlView.php            |  2 +-
 .../com_login/src/Model/LoginModel.php        |  2 +-
 .../com_mails/src/Model/TemplateModel.php     |  4 +-
 .../com_mails/src/View/Template/HtmlView.php  |  2 +-
 .../com_mails/tmpl/template/edit.php          |  2 +-
 .../com_media/src/Model/ApiModel.php          |  2 +-
 .../com_media/src/View/File/HtmlView.php      |  2 +-
 .../com_media/src/View/Media/HtmlView.php     |  4 +-
 .../com_media/tmpl/file/default.php           |  2 +-
 .../com_media/tmpl/media/default.php          |  2 +-
 .../layouts/joomla/menu/edit_modules.php      |  2 +-
 .../src/Field/MenuItemByTypeField.php         |  2 +-
 .../com_menus/src/Model/ItemModel.php         | 18 ++++-----
 .../com_menus/src/Model/ItemsModel.php        | 22 +++++-----
 .../com_menus/src/Model/MenuModel.php         |  2 +-
 .../com_menus/src/Model/MenutypesModel.php    |  2 +-
 .../com_menus/src/View/Item/HtmlView.php      |  4 +-
 .../com_menus/src/View/Items/HtmlView.php     |  2 +-
 .../com_menus/src/View/Menu/HtmlView.php      |  2 +-
 .../com_menus/src/View/Menu/XmlView.php       |  2 +-
 .../com_menus/src/View/Menutypes/HtmlView.php |  2 +-
 .../components/com_menus/tmpl/item/edit.php   |  2 +-
 .../components/com_menus/tmpl/items/modal.php |  6 +--
 .../com_menus/tmpl/menutypes/default.php      |  2 +-
 .../com_messages/src/Model/MessageModel.php   |  2 +-
 .../com_messages/src/View/Config/HtmlView.php |  2 +-
 .../src/View/Message/HtmlView.php             |  2 +-
 .../com_modules/src/Model/ModuleModel.php     | 14 +++----
 .../com_modules/src/Model/ModulesModel.php    |  4 +-
 .../com_modules/src/View/Module/HtmlView.php  |  2 +-
 .../com_modules/tmpl/module/edit.php          |  2 +-
 .../com_modules/tmpl/modules/modal.php        |  2 +-
 .../com_modules/tmpl/select/default.php       |  2 +-
 .../com_newsfeeds/src/Model/NewsfeedModel.php |  4 +-
 .../src/Model/NewsfeedsModel.php              |  4 +-
 .../src/View/Newsfeed/HtmlView.php            |  4 +-
 .../src/View/Newsfeeds/HtmlView.php           |  2 +-
 .../com_newsfeeds/tmpl/newsfeed/edit.php      |  2 +-
 .../com_newsfeeds/tmpl/newsfeeds/modal.php    |  4 +-
 .../com_plugins/src/Model/PluginModel.php     |  2 +-
 .../com_plugins/src/View/Plugin/HtmlView.php  |  2 +-
 .../com_plugins/tmpl/plugin/edit.php          |  2 +-
 .../src/Model/MessagesModel.php               |  2 +-
 .../com_privacy/src/Model/ExportModel.php     |  2 +-
 .../com_privacy/src/Model/RemoveModel.php     |  2 +-
 .../com_privacy/src/View/Request/HtmlView.php |  2 +-
 .../com_redirect/src/View/Link/HtmlView.php   |  2 +-
 .../com_tags/src/Model/TagModel.php           |  8 ++--
 .../com_tags/src/View/Tag/HtmlView.php        |  2 +-
 .../com_templates/src/Model/StyleModel.php    |  4 +-
 .../com_templates/src/Model/TemplateModel.php | 18 ++++-----
 .../com_templates/src/View/Style/HtmlView.php |  2 +-
 .../src/View/Template/HtmlView.php            |  4 +-
 .../com_templates/tmpl/template/default.php   |  2 +-
 .../template/default_modal_delete_footer.php  |  2 +-
 .../tmpl/template/default_modal_file_body.php |  2 +-
 .../template/default_modal_folder_body.php    |  2 +-
 .../template/default_modal_folder_footer.php  |  2 +-
 .../tmpl/template/default_updated_files.php   |  2 +-
 .../com_templates/tmpl/template/readonly.php  |  2 +-
 .../src/Controller/MethodController.php       |  2 +-
 .../com_users/src/Field/GroupparentField.php  |  2 +-
 .../components/com_users/src/Helper/Mfa.php   |  2 +-
 .../com_users/src/Model/DebuggroupModel.php   |  2 +-
 .../com_users/src/Model/DebuguserModel.php    |  2 +-
 .../com_users/src/Model/GroupModel.php        |  2 +-
 .../com_users/src/Model/MailModel.php         |  2 +-
 .../com_users/src/Model/NoteModel.php         |  6 +--
 .../com_users/src/Model/NotesModel.php        |  2 +-
 .../com_users/src/Model/UsersModel.php        |  6 +--
 .../com_users/src/View/Group/HtmlView.php     |  2 +-
 .../com_users/src/View/Level/HtmlView.php     |  2 +-
 .../com_users/src/View/Mail/HtmlView.php      |  2 +-
 .../com_users/src/View/Note/HtmlView.php      |  2 +-
 .../com_users/src/View/SiteTemplateTrait.php  |  4 +-
 .../com_users/src/View/User/HtmlView.php      |  2 +-
 .../components/com_users/tmpl/user/edit.php   |  2 +-
 .../components/com_users/tmpl/users/modal.php |  2 +-
 .../src/Dispatcher/Dispatcher.php             |  2 +-
 .../com_workflow/src/Model/StageModel.php     |  4 +-
 .../src/Model/TransitionModel.php             |  4 +-
 .../com_workflow/src/Model/WorkflowModel.php  |  4 +-
 .../com_workflow/src/View/Stage/HtmlView.php  |  2 +-
 .../com_workflow/src/View/Stages/HtmlView.php |  2 +-
 .../src/View/Transition/HtmlView.php          |  4 +-
 .../src/View/Workflow/HtmlView.php            |  2 +-
 .../com_workflow/tmpl/stage/edit.php          |  2 +-
 .../com_workflow/tmpl/workflow/edit.php       |  2 +-
 administrator/modules/mod_menu/mod_menu.php   |  2 +-
 .../modules/mod_messages/tmpl/default.php     |  2 +-
 .../mod_multilangstatus/tmpl/default.php      |  2 +-
 .../tmpl/default.php                          |  2 +-
 .../modules/mod_user/tmpl/default.php         |  2 +-
 administrator/templates/atum/error_full.php   |  4 +-
 administrator/templates/atum/error_login.php  |  2 +-
 administrator/templates/atum/index.php        |  4 +-
 administrator/templates/atum/login.php        |  2 +-
 .../src/Controller/StringsController.php      |  6 +--
 components/com_ajax/ajax.php                  |  2 +-
 .../src/Controller/ConfigController.php       |  2 +-
 .../src/Controller/TemplatesController.php    |  2 +-
 .../com_config/src/Model/ModulesModel.php     |  2 +-
 .../com_config/src/View/Modules/HtmlView.php  |  2 +-
 .../src/View/Templates/HtmlView.php           |  2 +-
 .../com_config/tmpl/modules/default.php       |  2 +-
 .../src/Controller/DisplayController.php      |  2 +-
 .../src/Helper/AssociationHelper.php          |  2 +-
 .../com_contact/src/Model/CategoriesModel.php |  2 +-
 .../com_contact/src/Model/CategoryModel.php   | 14 +++----
 .../com_contact/src/Model/ContactModel.php    |  6 +--
 .../com_contact/src/Model/FeaturedModel.php   |  8 ++--
 .../com_contact/src/Model/FormModel.php       |  8 ++--
 .../src/Controller/ArticleController.php      |  2 +-
 .../src/Controller/DisplayController.php      |  2 +-
 .../src/Helper/AssociationHelper.php          |  2 +-
 .../com_content/src/Model/ArchiveModel.php    | 14 +++----
 .../com_content/src/Model/ArticleModel.php    |  6 +--
 .../com_content/src/Model/ArticlesModel.php   | 14 +++----
 .../com_content/src/Model/CategoriesModel.php |  2 +-
 .../com_content/src/Model/CategoryModel.php   | 14 +++----
 .../com_content/src/Model/FeaturedModel.php   |  2 +-
 .../com_content/src/Model/FormModel.php       | 10 ++---
 .../com_content/src/View/Article/HtmlView.php |  2 +-
 .../src/View/Featured/FeedView.php            |  2 +-
 .../src/Controller/DisplayController.php      |  2 +-
 .../src/Controller/SuggestionsController.php  |  2 +-
 .../com_finder/src/Model/SearchModel.php      |  2 +-
 .../com_finder/src/Model/SuggestionsModel.php |  2 +-
 .../com_finder/src/View/Search/FeedView.php   |  2 +-
 .../src/Controller/DisplayController.php      |  2 +-
 .../src/Helper/AssociationHelper.php          |  2 +-
 .../src/Model/CategoriesModel.php             |  2 +-
 .../com_newsfeeds/src/Model/CategoryModel.php | 12 +++---
 .../com_newsfeeds/src/Model/NewsfeedModel.php |  6 +--
 .../src/View/Newsfeed/HtmlView.php            |  2 +-
 .../com_privacy/src/Model/ConfirmModel.php    |  2 +-
 .../com_privacy/src/Model/RemindModel.php     |  2 +-
 components/com_tags/src/Model/TagModel.php    | 14 +++----
 components/com_tags/src/Model/TagsModel.php   | 12 +++---
 components/com_tags/src/View/Tag/FeedView.php |  4 +-
 .../com_tags/src/View/Tags/FeedView.php       |  2 +-
 .../src/Controller/ProfileController.php      |  2 +-
 .../src/Controller/UserController.php         |  4 +-
 components/com_users/src/Model/LoginModel.php |  2 +-
 components/com_users/src/Model/ResetModel.php |  2 +-
 installation/src/Model/ChecksModel.php        |  2 +-
 installation/src/Model/LanguagesModel.php     |  2 +-
 installation/src/Model/SetupModel.php         |  4 +-
 layouts/joomla/content/emptystate.php         |  4 +-
 layouts/joomla/edit/admin_modules.php         |  2 +-
 layouts/joomla/edit/frontediting_modules.php  |  2 +-
 layouts/joomla/edit/global.php                |  2 +-
 layouts/joomla/edit/params.php                |  2 +-
 .../Application/AdministratorApplication.php  |  4 +-
 .../src/Application/ApplicationHelper.php     |  2 +-
 libraries/src/Cache/Cache.php                 |  2 +-
 libraries/src/Client/ClientHelper.php         |  2 +-
 .../Component/Router/Rules/NomenuRules.php    |  6 +--
 libraries/src/Document/FeedDocument.php       |  2 +-
 libraries/src/Document/HtmlDocument.php       |  2 +-
 libraries/src/Document/ImageDocument.php      |  2 +-
 libraries/src/Exception/ExceptionHandler.php  |  2 +-
 libraries/src/Form/Field/ListField.php        |  4 +-
 libraries/src/Form/Field/MediaField.php       |  2 +-
 libraries/src/Form/Field/NumberField.php      |  4 +-
 libraries/src/Form/Field/TextField.php        |  4 +-
 libraries/src/Form/Field/TransitionField.php  |  4 +-
 .../src/Form/Field/WorkflowconditionField.php |  2 +-
 .../src/Form/Field/WorkflowstageField.php     |  2 +-
 libraries/src/HTML/Helpers/Dropdown.php       |  2 +-
 libraries/src/HTML/Helpers/Sidebar.php        |  2 +-
 libraries/src/Helper/CMSHelper.php            |  2 +-
 libraries/src/Helper/ContentHelper.php        |  2 +-
 libraries/src/Helper/ModuleHelper.php         | 12 +++---
 libraries/src/Helper/RouteHelper.php          |  6 +--
 .../src/MVC/Controller/BaseController.php     |  4 +-
 .../src/MVC/Controller/FormController.php     |  2 +-
 libraries/src/MVC/Model/AdminModel.php        |  8 ++--
 libraries/src/MVC/Model/BaseDatabaseModel.php |  2 +-
 libraries/src/MVC/Model/ListModel.php         |  8 ++--
 libraries/src/MVC/View/CategoryFeedView.php   |  6 +--
 libraries/src/MVC/View/FormView.php           |  2 +-
 libraries/src/Service/Provider/Session.php    |  8 ++--
 libraries/src/Session/Session.php             |  4 +-
 libraries/src/UCM/UCMBase.php                 |  2 +-
 libraries/src/UCM/UCMType.php                 |  2 +-
 .../src/Workflow/WorkflowPluginTrait.php      |  2 +-
 .../tmpl/default_items.php                    |  2 +-
 .../mod_articles_category.php                 |  2 +-
 .../src/Helper/ArticlesCategoryHelper.php     |  2 +-
 .../src/Helper/ArticlesNewsHelper.php         |  6 +--
 .../mod_finder/src/Helper/FinderHelper.php    |  2 +-
 modules/mod_finder/tmpl/default.php           |  2 +-
 .../src/Helper/LanguagesHelper.php            |  2 +-
 .../src/Helper/RelatedItemsHelper.php         |  2 +-
 .../src/Helper/TagsSimilarHelper.php          |  6 +--
 .../mod_wrapper/src/Helper/WrapperHelper.php  |  2 +-
 .../actionlog/joomla/src/Extension/Joomla.php | 40 +++++++++----------
 .../basic/src/Extension/Basic.php             |  4 +-
 .../token/src/Extension/Token.php             |  4 +-
 plugins/authentication/cookie/cookie.php      | 22 +++++-----
 .../versionable/src/Extension/Versionable.php |  2 +-
 plugins/captcha/recaptcha/recaptcha.php       |  2 +-
 .../recaptcha_invisible.php                   |  2 +-
 plugins/content/joomla/joomla.php             |  2 +-
 plugins/content/pagebreak/pagebreak.php       |  4 +-
 .../content/pagenavigation/pagenavigation.php |  4 +-
 plugins/content/vote/vote.php                 |  2 +-
 plugins/editors-xtd/fields/fields.php         |  2 +-
 plugins/editors-xtd/image/image.php           |  4 +-
 .../folderinstaller/tmpl/default.php          |  2 +-
 .../packageinstaller/tmpl/default.php         |  2 +-
 .../installer/webinstaller/webinstaller.php   |  2 +-
 .../webauthn/src/Extension/Webauthn.php       |  2 +-
 .../phpversioncheck/phpversioncheck.php       |  4 +-
 plugins/sampledata/blog/blog.php              |  8 ++--
 plugins/sampledata/multilang/multilang.php    | 16 ++++----
 plugins/sampledata/testing/testing.php        | 16 ++++----
 .../system/accessibility/accessibility.php    |  2 +-
 plugins/system/actionlogs/actionlogs.php      |  2 +-
 plugins/system/cache/src/Extension/Cache.php  |  4 +-
 plugins/system/debug/debug.php                |  8 ++--
 plugins/system/fields/fields.php              |  6 +--
 plugins/system/highlight/highlight.php        |  2 +-
 plugins/system/jooa11y/jooa11y.php            |  2 +-
 .../system/languagefilter/languagefilter.php  | 16 ++++----
 plugins/system/logout/logout.php              |  6 +--
 .../system/privacyconsent/privacyconsent.php  | 26 ++++++------
 plugins/system/redirect/redirect.php          |  2 +-
 plugins/system/remember/remember.php          |  4 +-
 .../system/schedulerunner/schedulerunner.php  | 10 ++---
 .../shortcut/src/Extension/Shortcut.php       |  2 +-
 plugins/system/skipto/skipto.php              |  2 +-
 plugins/system/stats/stats.php                |  2 +-
 .../webauthn/src/PluginTraits/AjaxHandler.php |  2 +-
 .../src/PluginTraits/AjaxHandlerChallenge.php |  2 +-
 .../src/PluginTraits/AjaxHandlerCreate.php    |  2 +-
 .../src/PluginTraits/AjaxHandlerDelete.php    |  2 +-
 .../src/PluginTraits/AjaxHandlerLogin.php     |  2 +-
 .../src/PluginTraits/AjaxHandlerSaveLabel.php |  2 +-
 plugins/user/joomla/joomla.php                |  6 +--
 plugins/user/profile/profile.php              |  4 +-
 plugins/user/terms/terms.php                  |  6 +--
 plugins/user/token/token.php                  |  6 +--
 templates/cassiopeia/error.php                | 10 ++---
 templates/cassiopeia/index.php                | 10 ++---
 311 files changed, 636 insertions(+), 636 deletions(-)

diff --git a/administrator/components/com_admin/src/Model/HelpModel.php b/administrator/components/com_admin/src/Model/HelpModel.php
index f3b8b7d862110..27701373b00a3 100644
--- a/administrator/components/com_admin/src/Model/HelpModel.php
+++ b/administrator/components/com_admin/src/Model/HelpModel.php
@@ -78,7 +78,7 @@ class HelpModel extends BaseDatabaseModel
     public function &getHelpSearch()
     {
         if (\is_null($this->help_search)) {
-            $this->help_search = Factory::getApplication()->input->getString('helpsearch');
+            $this->help_search = Factory::getApplication()->getInput()->getString('helpsearch');
         }
 
         return $this->help_search;
@@ -94,7 +94,7 @@ public function &getHelpSearch()
     public function &getPage()
     {
         if (\is_null($this->page)) {
-            $this->page = Help::createUrl(Factory::getApplication()->input->get('page', 'Start_Here'));
+            $this->page = Help::createUrl(Factory::getApplication()->getInput()->get('page', 'Start_Here'));
         }
 
         return $this->page;
diff --git a/administrator/components/com_associations/layouts/joomla/searchtools/default.php b/administrator/components/com_associations/layouts/joomla/searchtools/default.php
index 91ee344814ea9..2152ec4c3ae79 100644
--- a/administrator/components/com_associations/layouts/joomla/searchtools/default.php
+++ b/administrator/components/com_associations/layouts/joomla/searchtools/default.php
@@ -83,7 +83,7 @@
 <div class="js-stools" role="search">
     <?php // Add the itemtype and language selectors before the form filters. Do not display in modal. ?>
     <?php $app = Factory::getApplication(); ?>
-    <?php if ($app->input->get('forcedItemType', '', 'string') == '') : ?>
+    <?php if ($app->getInput()->get('forcedItemType', '', 'string') == '') : ?>
         <?php $itemTypeField = $data['view']->filterForm->getField('itemtype'); ?>
         <div class="js-stools-container-selector">
             <div class="js-stools-field-selector js-stools-itemtype">
@@ -92,7 +92,7 @@
             </div>
         </div>
     <?php endif; ?>
-    <?php if ($app->input->get('forcedLanguage', '', 'cmd') == '') : ?>
+    <?php if ($app->getInput()->get('forcedLanguage', '', 'cmd') == '') : ?>
         <?php $languageField = $data['view']->filterForm->getField('language'); ?>
         <div class="js-stools-container-selector">
             <div class="js-stools-field-selector js-stools-language">
diff --git a/administrator/components/com_associations/src/Field/ItemlanguageField.php b/administrator/components/com_associations/src/Field/ItemlanguageField.php
index 79230d581f075..04639b0906d26 100644
--- a/administrator/components/com_associations/src/Field/ItemlanguageField.php
+++ b/administrator/components/com_associations/src/Field/ItemlanguageField.php
@@ -44,7 +44,7 @@ class ItemlanguageField extends ListField
      */
     protected function getOptions()
     {
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         list($extensionName, $typeName) = explode('.', $input->get('itemtype', '', 'string'), 2);
 
diff --git a/administrator/components/com_associations/src/Field/Modal/AssociationField.php b/administrator/components/com_associations/src/Field/Modal/AssociationField.php
index 5238418dfdf2b..d35a4b2058aab 100644
--- a/administrator/components/com_associations/src/Field/Modal/AssociationField.php
+++ b/administrator/components/com_associations/src/Field/Modal/AssociationField.php
@@ -58,7 +58,7 @@ protected function getInput()
         $html = array();
 
         $linkAssociations = 'index.php?option=com_associations&amp;view=associations&amp;layout=modal&amp;tmpl=component'
-            . '&amp;forcedItemType=' . Factory::getApplication()->input->get('itemtype', '', 'string') . '&amp;function=jSelectAssociation_' . $this->id;
+            . '&amp;forcedItemType=' . Factory::getApplication()->getInput()->get('itemtype', '', 'string') . '&amp;function=jSelectAssociation_' . $this->id;
 
         $linkAssociations .= "&amp;forcedLanguage=' + document.getElementById('target-association').getAttribute('data-language') + '";
 
diff --git a/administrator/components/com_associations/src/Model/AssociationsModel.php b/administrator/components/com_associations/src/Model/AssociationsModel.php
index 1228cc30d1e12..954f0a9b8e334 100644
--- a/administrator/components/com_associations/src/Model/AssociationsModel.php
+++ b/administrator/components/com_associations/src/Model/AssociationsModel.php
@@ -79,11 +79,11 @@ protected function populateState($ordering = 'ordering', $direction = 'asc')
     {
         $app = Factory::getApplication();
 
-        $forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');
-        $forcedItemType = $app->input->get('forcedItemType', '', 'string');
+        $forcedLanguage = $app->getInput()->get('forcedLanguage', '', 'cmd');
+        $forcedItemType = $app->getInput()->get('forcedItemType', '', 'string');
 
         // Adjust the context to support modal layouts.
-        if ($layout = $app->input->get('layout')) {
+        if ($layout = $app->getInput()->get('layout')) {
             $this->context .= '.' . $layout;
         }
 
diff --git a/administrator/components/com_associations/src/View/Association/HtmlView.php b/administrator/components/com_associations/src/View/Association/HtmlView.php
index d0479d3ebfa24..fa9e24a01d1a3 100644
--- a/administrator/components/com_associations/src/View/Association/HtmlView.php
+++ b/administrator/components/com_associations/src/View/Association/HtmlView.php
@@ -234,7 +234,7 @@ public function display($tpl = null): void
         $this->app  = Factory::getApplication();
         $this->form = $model->getForm();
         /** @var Input $input */
-        $input             = $this->app->input;
+        $input             = $this->app->getInput();
         $this->referenceId = $input->get('id', 0, 'int');
 
         [$extensionName, $typeName] = explode('.', $input->get('itemtype', '', 'string'), 2);
@@ -339,7 +339,7 @@ public function display($tpl = null): void
     protected function addToolbar(): void
     {
         // Hide main menu.
-        $this->app->input->set('hidemainmenu', 1);
+        $this->app->getInput()->set('hidemainmenu', 1);
 
         $helper = AssociationsHelper::getExtensionHelper($this->extensionName);
         $title  = $helper->getTypeTitle($this->typeName);
diff --git a/administrator/components/com_associations/src/View/Associations/HtmlView.php b/administrator/components/com_associations/src/View/Associations/HtmlView.php
index 54c7c230c3de8..2c53b8fd7fc58 100644
--- a/administrator/components/com_associations/src/View/Associations/HtmlView.php
+++ b/administrator/components/com_associations/src/View/Associations/HtmlView.php
@@ -155,7 +155,7 @@ public function display($tpl = null)
 
                     if ($this->getLayout() == 'modal') {
                         // We need to change the category filter to only show categories tagged to All or to the forced language.
-                        if ($forcedLanguage = Factory::getApplication()->input->get('forcedLanguage', '', 'CMD')) {
+                        if ($forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD')) {
                             $this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter');
                         }
                     }
diff --git a/administrator/components/com_associations/tmpl/association/edit.php b/administrator/components/com_associations/tmpl/association/edit.php
index 0f7b5bc1b4a1a..9928dfcfc4513 100644
--- a/administrator/components/com_associations/tmpl/association/edit.php
+++ b/administrator/components/com_associations/tmpl/association/edit.php
@@ -25,7 +25,7 @@
     ->useScript('webcomponent.core-loader');
 
 $options = [
-    'layout'   => $this->app->input->get('layout', '', 'string'),
+    'layout'   => $this->app->getInput()->get('layout', '', 'string'),
     'itemtype' => $this->itemType,
     'id'       => $this->referenceId,
 ];
diff --git a/administrator/components/com_associations/tmpl/associations/modal.php b/administrator/components/com_associations/tmpl/associations/modal.php
index 398e271296b1c..901a2ceb32d8d 100644
--- a/administrator/components/com_associations/tmpl/associations/modal.php
+++ b/administrator/components/com_associations/tmpl/associations/modal.php
@@ -29,7 +29,7 @@
 $wa->useScript('multiselect')
     ->useScript('com_associations.admin-associations-modal');
 
-$function         = $app->input->getCmd('function', 'jSelectAssociation');
+$function         = $app->getInput()->getCmd('function', 'jSelectAssociation');
 $listOrder        = $this->escape($this->state->get('list.ordering'));
 $listDirn         = $this->escape($this->state->get('list.direction'));
 $canManageCheckin = Factory::getUser()->authorise('core.manage', 'com_checkin');
@@ -163,8 +163,8 @@
         <?php endif; ?>
 
         <input type="hidden" name="task" value="">
-        <input type="hidden" name="forcedItemType" value="<?php echo $app->input->get('forcedItemType', '', 'string'); ?>">
-        <input type="hidden" name="forcedLanguage" value="<?php echo $app->input->get('forcedLanguage', '', 'cmd'); ?>">
+        <input type="hidden" name="forcedItemType" value="<?php echo $app->getInput()->get('forcedItemType', '', 'string'); ?>">
+        <input type="hidden" name="forcedLanguage" value="<?php echo $app->getInput()->get('forcedLanguage', '', 'cmd'); ?>">
         <?php echo HTMLHelper::_('form.token'); ?>
     </form>
 </div>
diff --git a/administrator/components/com_banners/src/Model/BannerModel.php b/administrator/components/com_banners/src/Model/BannerModel.php
index 0f3924bdf6117..b72ffa83e8c82 100644
--- a/administrator/components/com_banners/src/Model/BannerModel.php
+++ b/administrator/components/com_banners/src/Model/BannerModel.php
@@ -234,7 +234,7 @@ protected function loadFormData()
                 $filters     = (array) $app->getUserState('com_banners.banners.filter');
                 $filterCatId = $filters['category_id'] ?? null;
 
-                $data->set('catid', $app->input->getInt('catid', $filterCatId));
+                $data->set('catid', $app->getInput()->getInt('catid', $filterCatId));
             }
         }
 
@@ -374,7 +374,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
      */
     public function save($data)
     {
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         // Create new category, if needed.
         $createCategory = true;
diff --git a/administrator/components/com_banners/src/Model/DownloadModel.php b/administrator/components/com_banners/src/Model/DownloadModel.php
index a93fdeef5e1ac..bc06055d99201 100644
--- a/administrator/components/com_banners/src/Model/DownloadModel.php
+++ b/administrator/components/com_banners/src/Model/DownloadModel.php
@@ -43,7 +43,7 @@ class DownloadModel extends FormModel
      */
     protected function populateState()
     {
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         $this->setState('basename', $input->cookie->getString(ApplicationHelper::getHash($this->_context . '.basename'), '__SITE__'));
         $this->setState('compressed', $input->cookie->getInt(ApplicationHelper::getHash($this->_context . '.compressed'), 1));
diff --git a/administrator/components/com_banners/src/View/Banner/HtmlView.php b/administrator/components/com_banners/src/View/Banner/HtmlView.php
index c5b2ebe5ea172..6cefffd3b7935 100644
--- a/administrator/components/com_banners/src/View/Banner/HtmlView.php
+++ b/administrator/components/com_banners/src/View/Banner/HtmlView.php
@@ -95,7 +95,7 @@ public function display($tpl = null): void
      */
     protected function addToolbar(): void
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $user       = $this->getCurrentUser();
         $userId     = $user->id;
diff --git a/administrator/components/com_banners/src/View/Client/HtmlView.php b/administrator/components/com_banners/src/View/Client/HtmlView.php
index b3bc20498c8b6..9b9048a131b4c 100644
--- a/administrator/components/com_banners/src/View/Client/HtmlView.php
+++ b/administrator/components/com_banners/src/View/Client/HtmlView.php
@@ -106,7 +106,7 @@ public function display($tpl = null): void
      */
     protected function addToolbar(): void
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $user       = $this->getCurrentUser();
         $isNew      = ($this->item->id == 0);
diff --git a/administrator/components/com_categories/src/Dispatcher/Dispatcher.php b/administrator/components/com_categories/src/Dispatcher/Dispatcher.php
index 68ee3f8f3902b..595b5c4e01113 100644
--- a/administrator/components/com_categories/src/Dispatcher/Dispatcher.php
+++ b/administrator/components/com_categories/src/Dispatcher/Dispatcher.php
@@ -31,7 +31,7 @@ class Dispatcher extends ComponentDispatcher
      */
     protected function checkAccess()
     {
-        $extension = $this->getApplication()->input->getCmd('extension');
+        $extension = $this->getApplication()->getInput()->getCmd('extension');
 
         $parts = explode('.', $extension);
 
diff --git a/administrator/components/com_categories/src/Field/CategoryeditField.php b/administrator/components/com_categories/src/Field/CategoryeditField.php
index ae4e2d885bc8f..8a4811a921e58 100644
--- a/administrator/components/com_categories/src/Field/CategoryeditField.php
+++ b/administrator/components/com_categories/src/Field/CategoryeditField.php
@@ -150,7 +150,7 @@ protected function getOptions()
         $name = (string) $this->element['name'];
 
         // Let's get the id for the current item, either category or content item.
-        $jinput = Factory::getApplication()->input;
+        $jinput = Factory::getApplication()->getInput();
 
         // Load the category options for a given extension.
 
diff --git a/administrator/components/com_categories/src/Field/Modal/CategoryField.php b/administrator/components/com_categories/src/Field/Modal/CategoryField.php
index 05234673e7ddd..8a03ad60298fa 100644
--- a/administrator/components/com_categories/src/Field/Modal/CategoryField.php
+++ b/administrator/components/com_categories/src/Field/Modal/CategoryField.php
@@ -49,7 +49,7 @@ protected function getInput()
         if ($this->element['extension']) {
             $extension = (string) $this->element['extension'];
         } else {
-            $extension = (string) Factory::getApplication()->input->get('extension', 'com_content');
+            $extension = (string) Factory::getApplication()->getInput()->get('extension', 'com_content');
         }
 
         $allowNew       = ((string) $this->element['new'] == 'true');
diff --git a/administrator/components/com_categories/src/Model/CategoriesModel.php b/administrator/components/com_categories/src/Model/CategoriesModel.php
index e265afa5a3dd7..888b6b8d59d64 100644
--- a/administrator/components/com_categories/src/Model/CategoriesModel.php
+++ b/administrator/components/com_categories/src/Model/CategoriesModel.php
@@ -92,10 +92,10 @@ protected function populateState($ordering = 'a.lft', $direction = 'asc')
     {
         $app = Factory::getApplication();
 
-        $forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');
+        $forcedLanguage = $app->getInput()->get('forcedLanguage', '', 'cmd');
 
         // Adjust the context to support modal layouts.
-        if ($layout = $app->input->get('layout')) {
+        if ($layout = $app->getInput()->get('layout')) {
             $this->context .= '.' . $layout;
         }
 
diff --git a/administrator/components/com_categories/src/Model/CategoryModel.php b/administrator/components/com_categories/src/Model/CategoryModel.php
index 5327288048f37..0b6e93a305eea 100644
--- a/administrator/components/com_categories/src/Model/CategoryModel.php
+++ b/administrator/components/com_categories/src/Model/CategoryModel.php
@@ -89,7 +89,7 @@ class CategoryModel extends AdminModel
      */
     public function __construct($config = array(), MVCFactoryInterface $factory = null)
     {
-        $extension = Factory::getApplication()->input->get('extension', 'com_content');
+        $extension = Factory::getApplication()->getInput()->get('extension', 'com_content');
         $this->typeAlias = $extension . '.category';
 
         // Add a new batch command
@@ -172,14 +172,14 @@ protected function populateState()
     {
         $app = Factory::getApplication();
 
-        $parentId = $app->input->getInt('parent_id');
+        $parentId = $app->getInput()->getInt('parent_id');
         $this->setState('category.parent_id', $parentId);
 
         // Load the User state.
-        $pk = $app->input->getInt('id');
+        $pk = $app->getInput()->getInt('id');
         $this->setState($this->getName() . '.id', $pk);
 
-        $extension = $app->input->get('extension', 'com_content');
+        $extension = $app->getInput()->get('extension', 'com_content');
         $this->setState('category.extension', $extension);
         $parts = explode('.', $extension);
 
@@ -248,7 +248,7 @@ public function getItem($pk = null)
     public function getForm($data = array(), $loadData = true)
     {
         $extension = $this->getState('category.extension');
-        $jinput = Factory::getApplication()->input;
+        $jinput = Factory::getApplication()->getInput();
 
         // A workaround to get the extension into the model for save requests.
         if (empty($extension) && isset($data['extension'])) {
@@ -338,15 +338,15 @@ protected function loadFormData()
 
                 $data->set(
                     'published',
-                    $app->input->getInt(
+                    $app->getInput()->getInt(
                         'published',
                         ((isset($filters['published']) && $filters['published'] !== '') ? $filters['published'] : null)
                     )
                 );
-                $data->set('language', $app->input->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
+                $data->set('language', $app->getInput()->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
                 $data->set(
                     'access',
-                    $app->input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')))
+                    $app->getInput()->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')))
                 );
             }
         }
@@ -400,7 +400,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
         $lang = Factory::getLanguage();
         $component = $this->getState('category.component');
         $section = $this->getState('category.section');
-        $extension = Factory::getApplication()->input->get('extension', null);
+        $extension = Factory::getApplication()->getInput()->get('extension', null);
 
         // Get the component form if it exists
         $name = 'category' . ($section ? ('.' . $section) : '');
@@ -508,7 +508,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
     public function save($data)
     {
         $table      = $this->getTable();
-        $input      = Factory::getApplication()->input;
+        $input      = Factory::getApplication()->getInput();
         $pk         = (!empty($data['id'])) ? $data['id'] : (int) $this->getState($this->getName() . '.id');
         $isNew      = true;
         $context    = $this->option . '.' . $this->name;
@@ -714,7 +714,7 @@ public function save($data)
 
         $this->setState($this->getName() . '.id', $table->id);
 
-        if (Factory::getApplication()->input->get('task') == 'editAssociations') {
+        if (Factory::getApplication()->getInput()->get('task') == 'editAssociations') {
             return $this->redirectToAssociations($data);
         }
 
@@ -737,7 +737,7 @@ public function save($data)
     public function publish(&$pks, $value = 1)
     {
         if (parent::publish($pks, $value)) {
-            $extension = Factory::getApplication()->input->get('extension');
+            $extension = Factory::getApplication()->getInput()->get('extension');
 
             // Include the content plugins for the change of category state event.
             PluginHelper::importPlugin('content');
@@ -874,7 +874,7 @@ protected function batchCopy($value, $pks, $contexts)
         $parentId = (int) ArrayHelper::getValue($parts, 0, 1);
 
         $db = $this->getDatabase();
-        $extension = Factory::getApplication()->input->get('extension', '', 'word');
+        $extension = Factory::getApplication()->getInput()->get('extension', '', 'word');
         $newIds = array();
 
         // Check that the parent exists
@@ -1077,7 +1077,7 @@ protected function batchMove($value, $pks, $contexts)
 
         $db = $this->getDatabase();
         $query = $db->getQuery(true);
-        $extension = Factory::getApplication()->input->get('extension', '', 'word');
+        $extension = Factory::getApplication()->getInput()->get('extension', '', 'word');
 
         // Check that the parent exists.
         if ($parentId) {
@@ -1202,7 +1202,7 @@ protected function batchMove($value, $pks, $contexts)
      */
     protected function cleanCache($group = null, $clientId = 0)
     {
-        $extension = Factory::getApplication()->input->get('extension');
+        $extension = Factory::getApplication()->getInput()->get('extension');
 
         switch ($extension) {
             case 'com_content':
diff --git a/administrator/components/com_categories/src/View/Categories/HtmlView.php b/administrator/components/com_categories/src/View/Categories/HtmlView.php
index 1b24757769753..6df0056a50174 100644
--- a/administrator/components/com_categories/src/View/Categories/HtmlView.php
+++ b/administrator/components/com_categories/src/View/Categories/HtmlView.php
@@ -127,7 +127,7 @@ public function display($tpl = null)
             }
         } else {
             // In article associations modal we need to remove language filter if forcing a language.
-            if ($forcedLanguage = Factory::getApplication()->input->get('forcedLanguage', '', 'CMD')) {
+            if ($forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD')) {
                 // If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
                 $languageXml = new \SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
                 $this->filterForm->setField($languageXml, 'filter', true);
diff --git a/administrator/components/com_categories/src/View/Category/HtmlView.php b/administrator/components/com_categories/src/View/Category/HtmlView.php
index 7e0f3e566141c..d9078da396e10 100644
--- a/administrator/components/com_categories/src/View/Category/HtmlView.php
+++ b/administrator/components/com_categories/src/View/Category/HtmlView.php
@@ -102,10 +102,10 @@ public function display($tpl = null)
             $this->checkTags = true;
         }
 
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         // If we are forcing a language in modal (used for associations).
-        if ($this->getLayout() === 'modal' && $forcedLanguage = Factory::getApplication()->input->get('forcedLanguage', '', 'cmd')) {
+        if ($this->getLayout() === 'modal' && $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'cmd')) {
             // Set the language field to the forcedLanguage and disable changing it.
             $this->form->setValue('language', null, $forcedLanguage);
             $this->form->setFieldAttribute('language', 'readonly', 'true');
@@ -131,7 +131,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        $extension = Factory::getApplication()->input->get('extension');
+        $extension = Factory::getApplication()->getInput()->get('extension');
         $user = $this->getCurrentUser();
         $userId = $user->id;
 
diff --git a/administrator/components/com_categories/tmpl/categories/modal.php b/administrator/components/com_categories/tmpl/categories/modal.php
index 819957f58ddc7..0d7cc34297dc3 100644
--- a/administrator/components/com_categories/tmpl/categories/modal.php
+++ b/administrator/components/com_categories/tmpl/categories/modal.php
@@ -28,7 +28,7 @@
 HTMLHelper::_('behavior.core');
 
 $extension = $this->escape($this->state->get('filter.extension'));
-$function  = $app->input->getCmd('function', 'jSelectCategory');
+$function  = $app->getInput()->getCmd('function', 'jSelectCategory');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 ?>
@@ -132,7 +132,7 @@
         <input type="hidden" name="extension" value="<?php echo $extension; ?>">
         <input type="hidden" name="task" value="">
         <input type="hidden" name="boxchecked" value="0">
-        <input type="hidden" name="forcedLanguage" value="<?php echo $app->input->get('forcedLanguage', '', 'CMD'); ?>">
+        <input type="hidden" name="forcedLanguage" value="<?php echo $app->getInput()->get('forcedLanguage', '', 'CMD'); ?>">
         <?php echo HTMLHelper::_('form.token'); ?>
 
     </form>
diff --git a/administrator/components/com_categories/tmpl/category/edit.php b/administrator/components/com_categories/tmpl/category/edit.php
index b20338fdbb7e4..e5a6398049e58 100644
--- a/administrator/components/com_categories/tmpl/category/edit.php
+++ b/administrator/components/com_categories/tmpl/category/edit.php
@@ -24,7 +24,7 @@
     ->useScript('form.validate');
 
 $app = Factory::getApplication();
-$input = $app->input;
+$input = $app->getInput();
 
 $assoc = Associations::isEnabled();
 // Are associations implemented for this extension?
diff --git a/administrator/components/com_config/src/Model/ApplicationModel.php b/administrator/components/com_config/src/Model/ApplicationModel.php
index 416aeaae956bd..d5f952b96b966 100644
--- a/administrator/components/com_config/src/Model/ApplicationModel.php
+++ b/administrator/components/com_config/src/Model/ApplicationModel.php
@@ -851,11 +851,11 @@ public function storePermissions($permission = null)
         if (is_null($permission)) {
             // Get data from input.
             $permission = array(
-                'component' => $app->input->Json->get('comp'),
-                'action'    => $app->input->Json->get('action'),
-                'rule'      => $app->input->Json->get('rule'),
-                'value'     => $app->input->Json->get('value'),
-                'title'     => $app->input->Json->get('title', '', 'RAW')
+                'component' => $app->getInput()->Json->get('comp'),
+                'action'    => $app->getInput()->Json->get('action'),
+                'rule'      => $app->getInput()->Json->get('rule'),
+                'value'     => $app->getInput()->Json->get('value'),
+                'title'     => $app->getInput()->Json->get('title', '', 'RAW')
             );
         }
 
@@ -1174,7 +1174,7 @@ public function sendTestMail()
         // Set the new values to test with the current settings
         $app = Factory::getApplication();
         $user = $this->getCurrentUser();
-        $input = $app->input->json;
+        $input = $app->getInput()->json;
         $smtppass = $input->get('smtppass', null, 'RAW');
 
         $app->set('smtpauth', $input->get('smtpauth'));
diff --git a/administrator/components/com_config/src/Model/ComponentModel.php b/administrator/components/com_config/src/Model/ComponentModel.php
index 7624b8fb75db5..c17dc8e3f1a5e 100644
--- a/administrator/components/com_config/src/Model/ComponentModel.php
+++ b/administrator/components/com_config/src/Model/ComponentModel.php
@@ -43,7 +43,7 @@ class ComponentModel extends FormModel
      */
     protected function populateState()
     {
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         // Set the component (option) we are dealing with.
         $component = $input->get('component');
diff --git a/administrator/components/com_config/src/View/Component/HtmlView.php b/administrator/components/com_config/src/View/Component/HtmlView.php
index e9568dfeea17f..fb3e44fe7e228 100644
--- a/administrator/components/com_config/src/View/Component/HtmlView.php
+++ b/administrator/components/com_config/src/View/Component/HtmlView.php
@@ -92,8 +92,8 @@ public function display($tpl = null)
         $this->components = ConfigHelper::getComponentsWithConfig();
 
         $this->userIsSuperAdmin = $user->authorise('core.admin');
-        $this->currentComponent = Factory::getApplication()->input->get('component');
-        $this->return = Factory::getApplication()->input->get('return', '', 'base64');
+        $this->currentComponent = Factory::getApplication()->getInput()->get('component');
+        $this->return = Factory::getApplication()->getInput()->get('return', '', 'base64');
 
         $this->addToolbar();
 
diff --git a/administrator/components/com_contact/src/Model/ContactModel.php b/administrator/components/com_contact/src/Model/ContactModel.php
index c52cebb0171e7..0182ae57a7911 100644
--- a/administrator/components/com_contact/src/Model/ContactModel.php
+++ b/administrator/components/com_contact/src/Model/ContactModel.php
@@ -258,7 +258,7 @@ protected function loadFormData()
 
             // Prime some default values.
             if ($this->getState('contact.id') == 0) {
-                $data->set('catid', $app->input->get('catid', $app->getUserState('com_contact.contacts.filter.category_id'), 'int'));
+                $data->set('catid', $app->getInput()->get('catid', $app->getUserState('com_contact.contacts.filter.category_id'), 'int'));
             }
         }
 
@@ -278,7 +278,7 @@ protected function loadFormData()
      */
     public function save($data)
     {
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         // Create new category, if needed.
         $createCategory = true;
diff --git a/administrator/components/com_contact/src/Model/ContactsModel.php b/administrator/components/com_contact/src/Model/ContactsModel.php
index 11eee1995f5ce..d97d4700499fc 100644
--- a/administrator/components/com_contact/src/Model/ContactsModel.php
+++ b/administrator/components/com_contact/src/Model/ContactsModel.php
@@ -84,10 +84,10 @@ protected function populateState($ordering = 'a.name', $direction = 'asc')
     {
         $app = Factory::getApplication();
 
-        $forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');
+        $forcedLanguage = $app->getInput()->get('forcedLanguage', '', 'cmd');
 
         // Adjust the context to support modal layouts.
-        if ($layout = $app->input->get('layout')) {
+        if ($layout = $app->getInput()->get('layout')) {
             $this->context .= '.' . $layout;
         }
 
diff --git a/administrator/components/com_contact/src/View/Contact/HtmlView.php b/administrator/components/com_contact/src/View/Contact/HtmlView.php
index eef25e75866d4..6887d4f2df237 100644
--- a/administrator/components/com_contact/src/View/Contact/HtmlView.php
+++ b/administrator/components/com_contact/src/View/Contact/HtmlView.php
@@ -72,7 +72,7 @@ public function display($tpl = null)
         }
 
         // If we are forcing a language in modal (used for associations).
-        if ($this->getLayout() === 'modal' && $forcedLanguage = Factory::getApplication()->input->get('forcedLanguage', '', 'cmd')) {
+        if ($this->getLayout() === 'modal' && $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'cmd')) {
             // Set the language field to the forcedLanguage and disable changing it.
             $this->form->setValue('language', null, $forcedLanguage);
             $this->form->setFieldAttribute('language', 'readonly', 'true');
@@ -98,7 +98,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $user       = $this->getCurrentUser();
         $userId     = $user->id;
diff --git a/administrator/components/com_contact/src/View/Contacts/HtmlView.php b/administrator/components/com_contact/src/View/Contacts/HtmlView.php
index 1b672f1d213c5..fdc08ad9a0920 100644
--- a/administrator/components/com_contact/src/View/Contacts/HtmlView.php
+++ b/administrator/components/com_contact/src/View/Contacts/HtmlView.php
@@ -117,7 +117,7 @@ public function display($tpl = null)
         } else {
             // In article associations modal we need to remove language filter if forcing a language.
             // We also need to change the category filter to show show categories with All or the forced language.
-            if ($forcedLanguage = Factory::getApplication()->input->get('forcedLanguage', '', 'CMD')) {
+            if ($forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD')) {
                 // If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
                 $languageXml = new \SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
                 $this->filterForm->setField($languageXml, 'filter', true);
diff --git a/administrator/components/com_contact/tmpl/contact/edit.php b/administrator/components/com_contact/tmpl/contact/edit.php
index 6798cc6e1cc2d..c6b8223d1f89d 100644
--- a/administrator/components/com_contact/tmpl/contact/edit.php
+++ b/administrator/components/com_contact/tmpl/contact/edit.php
@@ -23,7 +23,7 @@
     ->useScript('form.validate');
 
 $app = Factory::getApplication();
-$input = $app->input;
+$input = $app->getInput();
 
 $assoc = Associations::isEnabled();
 
diff --git a/administrator/components/com_contact/tmpl/contacts/modal.php b/administrator/components/com_contact/tmpl/contacts/modal.php
index 6f5a11153c85c..d54feb7154239 100644
--- a/administrator/components/com_contact/tmpl/contacts/modal.php
+++ b/administrator/components/com_contact/tmpl/contacts/modal.php
@@ -29,8 +29,8 @@
 $wa = $this->document->getWebAssetManager();
 $wa->useScript('com_contact.admin-contacts-modal');
 
-$function  = $app->input->getCmd('function', 'jSelectContact');
-$editor    = $app->input->getCmd('editor', '');
+$function  = $app->getInput()->getCmd('function', 'jSelectContact');
+$editor    = $app->getInput()->getCmd('editor', '');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 $onclick   = $this->escape($function);
@@ -148,7 +148,7 @@
         <?php endif; ?>
 
         <input type="hidden" name="task" value="">
-        <input type="hidden" name="forcedLanguage" value="<?php echo $app->input->get('forcedLanguage', '', 'CMD'); ?>">
+        <input type="hidden" name="forcedLanguage" value="<?php echo $app->getInput()->get('forcedLanguage', '', 'CMD'); ?>">
         <?php echo HTMLHelper::_('form.token'); ?>
 
     </form>
diff --git a/administrator/components/com_content/src/Model/ArticleModel.php b/administrator/components/com_content/src/Model/ArticleModel.php
index 9bfe51085243b..47e0344f2ac82 100644
--- a/administrator/components/com_content/src/Model/ArticleModel.php
+++ b/administrator/components/com_content/src/Model/ArticleModel.php
@@ -474,8 +474,8 @@ public function getForm($data = array(), $loadData = true)
 
         // Get ID of the article from input, for frontend, we use a_id while backend uses id
         $articleIdFromInput = $app->isClient('site')
-            ? $app->input->getInt('a_id', 0)
-            : $app->input->getInt('id', 0);
+            ? $app->getInput()->getInt('a_id', 0)
+            : $app->getInput()->getInt('id', 0);
 
         // On edit article, we get ID of article from article.id state, but on save, we use data from input
         $id = (int) $this->getState('article.id', $articleIdFromInput);
@@ -581,20 +581,20 @@ protected function loadFormData()
                 $filters = (array) $app->getUserState('com_content.articles.filter');
                 $data->set(
                     'state',
-                    $app->input->getInt(
+                    $app->getInput()->getInt(
                         'state',
                         ((isset($filters['published']) && $filters['published'] !== '') ? $filters['published'] : null)
                     )
                 );
-                $data->set('catid', $app->input->getInt('catid', (!empty($filters['category_id']) ? $filters['category_id'] : null)));
+                $data->set('catid', $app->getInput()->getInt('catid', (!empty($filters['category_id']) ? $filters['category_id'] : null)));
 
                 if ($app->isClient('administrator')) {
-                    $data->set('language', $app->input->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
+                    $data->set('language', $app->getInput()->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
                 }
 
                 $data->set(
                     'access',
-                    $app->input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')))
+                    $app->getInput()->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')))
                 );
             }
         }
@@ -645,7 +645,7 @@ public function validate($form, $data, $group = null)
     public function save($data)
     {
         $app    = Factory::getApplication();
-        $input  = $app->input;
+        $input  = $app->getInput();
         $filter = InputFilter::getInstance();
 
         if (isset($data['metadata']) && isset($data['metadata']['author'])) {
diff --git a/administrator/components/com_content/src/Model/ArticlesModel.php b/administrator/components/com_content/src/Model/ArticlesModel.php
index 04e079dca045a..2753d0949bac5 100644
--- a/administrator/components/com_content/src/Model/ArticlesModel.php
+++ b/administrator/components/com_content/src/Model/ArticlesModel.php
@@ -127,10 +127,10 @@ protected function populateState($ordering = 'a.id', $direction = 'desc')
     {
         $app = Factory::getApplication();
 
-        $forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');
+        $forcedLanguage = $app->getInput()->get('forcedLanguage', '', 'cmd');
 
         // Adjust the context to support modal layouts.
-        if ($layout = $app->input->get('layout')) {
+        if ($layout = $app->getInput()->get('layout')) {
             $this->context .= '.' . $layout;
         }
 
@@ -154,7 +154,7 @@ protected function populateState($ordering = 'a.id', $direction = 'desc')
         $language = $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '');
         $this->setState('filter.language', $language);
 
-        $formSubmitted = $app->input->post->get('form_submitted');
+        $formSubmitted = $app->getInput()->post->get('form_submitted');
 
         // Gets the value of a user state variable and sets it in the session
         $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access');
@@ -163,16 +163,16 @@ protected function populateState($ordering = 'a.id', $direction = 'desc')
         $this->getUserStateFromRequest($this->context . '.filter.tag', 'filter_tag', '');
 
         if ($formSubmitted) {
-            $access = $app->input->post->get('access');
+            $access = $app->getInput()->post->get('access');
             $this->setState('filter.access', $access);
 
-            $authorId = $app->input->post->get('author_id');
+            $authorId = $app->getInput()->post->get('author_id');
             $this->setState('filter.author_id', $authorId);
 
-            $categoryId = $app->input->post->get('category_id');
+            $categoryId = $app->getInput()->post->get('category_id');
             $this->setState('filter.category_id', $categoryId);
 
-            $tag = $app->input->post->get('tag');
+            $tag = $app->getInput()->post->get('tag');
             $this->setState('filter.tag', $tag);
         }
 
diff --git a/administrator/components/com_content/src/View/Article/HtmlView.php b/administrator/components/com_content/src/View/Article/HtmlView.php
index da0196cd725a2..393e38cd5e974 100644
--- a/administrator/components/com_content/src/View/Article/HtmlView.php
+++ b/administrator/components/com_content/src/View/Article/HtmlView.php
@@ -99,7 +99,7 @@ public function display($tpl = null)
         }
 
         // If we are forcing a language in modal (used for associations).
-        if ($this->getLayout() === 'modal' && $forcedLanguage = Factory::getApplication()->input->get('forcedLanguage', '', 'cmd')) {
+        if ($this->getLayout() === 'modal' && $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'cmd')) {
             // Set the language field to the forcedLanguage and disable changing it.
             $this->form->setValue('language', null, $forcedLanguage);
             $this->form->setFieldAttribute('language', 'readonly', 'true');
@@ -127,7 +127,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
         $user       = $this->getCurrentUser();
         $userId     = $user->id;
         $isNew      = ($this->item->id == 0);
diff --git a/administrator/components/com_content/src/View/Articles/HtmlView.php b/administrator/components/com_content/src/View/Articles/HtmlView.php
index e4565910428f7..2514a430f0ace 100644
--- a/administrator/components/com_content/src/View/Articles/HtmlView.php
+++ b/administrator/components/com_content/src/View/Articles/HtmlView.php
@@ -127,7 +127,7 @@ public function display($tpl = null)
         } else {
             // In article associations modal we need to remove language filter if forcing a language.
             // We also need to change the category filter to show show categories with All or the forced language.
-            if ($forcedLanguage = Factory::getApplication()->input->get('forcedLanguage', '', 'CMD')) {
+            if ($forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD')) {
                 // If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
                 $languageXml = new \SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
                 $this->filterForm->setField($languageXml, 'filter', true);
diff --git a/administrator/components/com_content/tmpl/article/edit.php b/administrator/components/com_content/tmpl/article/edit.php
index 969455f185a16..8d9e466d59f35 100644
--- a/administrator/components/com_content/tmpl/article/edit.php
+++ b/administrator/components/com_content/tmpl/article/edit.php
@@ -38,7 +38,7 @@
 $params = clone $this->state->get('params');
 $params->merge(new Registry($this->item->attribs));
 
-$input = Factory::getApplication()->input;
+$input = Factory::getApplication()->getInput();
 
 $assoc              = Associations::isEnabled();
 $showArticleOptions = $params->get('show_article_options', 1);
diff --git a/administrator/components/com_content/tmpl/article/pagebreak.php b/administrator/components/com_content/tmpl/article/pagebreak.php
index 4612825d783f3..4b86eda1ec359 100644
--- a/administrator/components/com_content/tmpl/article/pagebreak.php
+++ b/administrator/components/com_content/tmpl/article/pagebreak.php
@@ -17,7 +17,7 @@
 $wa = $this->document->getWebAssetManager();
 $wa->useScript('com_content.admin-article-pagebreak');
 
-$this->eName = Factory::getApplication()->input->getCmd('e_name', '');
+$this->eName = Factory::getApplication()->getInput()->getCmd('e_name', '');
 $this->eName = preg_replace('#[^A-Z0-9\-\_\[\]]#i', '', $this->eName);
 $this->document->setTitle(Text::_('COM_CONTENT_PAGEBREAK_DOC_TITLE'));
 
diff --git a/administrator/components/com_content/tmpl/articles/modal.php b/administrator/components/com_content/tmpl/articles/modal.php
index d99d647c4641c..f7a075c656cfe 100644
--- a/administrator/components/com_content/tmpl/articles/modal.php
+++ b/administrator/components/com_content/tmpl/articles/modal.php
@@ -31,8 +31,8 @@
     ->useScript('multiselect')
     ->useScript('com_content.admin-articles-modal');
 
-$function  = $app->input->getCmd('function', 'jSelectArticle');
-$editor    = $app->input->getCmd('editor', '');
+$function  = $app->getInput()->getCmd('function', 'jSelectArticle');
+$editor    = $app->getInput()->getCmd('editor', '');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 $onclick   = $this->escape($function);
@@ -162,7 +162,7 @@
 
         <input type="hidden" name="task" value="">
         <input type="hidden" name="boxchecked" value="0">
-        <input type="hidden" name="forcedLanguage" value="<?php echo $app->input->get('forcedLanguage', '', 'CMD'); ?>">
+        <input type="hidden" name="forcedLanguage" value="<?php echo $app->getInput()->get('forcedLanguage', '', 'CMD'); ?>">
         <?php echo HTMLHelper::_('form.token'); ?>
 
     </form>
diff --git a/administrator/components/com_contenthistory/src/Model/CompareModel.php b/administrator/components/com_contenthistory/src/Model/CompareModel.php
index adba9c0b8279b..fb3922ec4bc58 100644
--- a/administrator/components/com_contenthistory/src/Model/CompareModel.php
+++ b/administrator/components/com_contenthistory/src/Model/CompareModel.php
@@ -42,7 +42,7 @@ class CompareModel extends ListModel
      */
     public function getItems()
     {
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         /** @var ContentHistory $table1 */
         $table1 = $this->getTable('ContentHistory');
diff --git a/administrator/components/com_contenthistory/src/Model/HistoryModel.php b/administrator/components/com_contenthistory/src/Model/HistoryModel.php
index d098ef2ffee9d..076f5fc9b4fe2 100644
--- a/administrator/components/com_contenthistory/src/Model/HistoryModel.php
+++ b/administrator/components/com_contenthistory/src/Model/HistoryModel.php
@@ -300,7 +300,7 @@ public function keep(&$pks)
      */
     protected function populateState($ordering = 'h.save_date', $direction = 'DESC')
     {
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
         $itemId = $input->get('item_id', '', 'string');
 
         $this->setState('item_id', $itemId);
@@ -375,7 +375,7 @@ protected function getListQuery()
     protected function getSha1Hash()
     {
         $result    = false;
-        $item_id   = Factory::getApplication()->input->getCmd('item_id', '');
+        $item_id   = Factory::getApplication()->getInput()->getCmd('item_id', '');
         $typeAlias = explode('.', $item_id);
         Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/' . $typeAlias[0] . '/tables');
         $typeTable = $this->getTable('ContentType');
diff --git a/administrator/components/com_contenthistory/src/Model/PreviewModel.php b/administrator/components/com_contenthistory/src/Model/PreviewModel.php
index f09537b4a2601..3c9d5debd33f8 100644
--- a/administrator/components/com_contenthistory/src/Model/PreviewModel.php
+++ b/administrator/components/com_contenthistory/src/Model/PreviewModel.php
@@ -46,7 +46,7 @@ public function getItem($pk = null)
     {
         /** @var ContentHistory $table */
         $table = $this->getTable('ContentHistory');
-        $versionId = Factory::getApplication()->input->getInt('version_id');
+        $versionId = Factory::getApplication()->getInput()->getInt('version_id');
 
         if (!$versionId || \is_array($versionId) || !$table->load($versionId)) {
             return false;
diff --git a/administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php b/administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php
index 58df45b02ea30..597020015a9cb 100644
--- a/administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php
+++ b/administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php
@@ -59,7 +59,7 @@ class HtmlView extends BaseHtmlView
     public function display($tpl = null)
     {
         $app = Factory::getApplication();
-        $dashboard = $app->input->getCmd('dashboard', '');
+        $dashboard = $app->getInput()->getCmd('dashboard', '');
 
         $position = OutputFilter::stringURLSafe($dashboard);
 
diff --git a/administrator/components/com_fields/src/Helper/FieldsHelper.php b/administrator/components/com_fields/src/Helper/FieldsHelper.php
index 99cd4d3ec17ce..7944eaa205f6f 100644
--- a/administrator/components/com_fields/src/Helper/FieldsHelper.php
+++ b/administrator/components/com_fields/src/Helper/FieldsHelper.php
@@ -454,11 +454,11 @@ public static function prepareForm($context, Form $form, $data)
             ->getMVCFactory()->createModel('Field', 'Administrator', ['ignore_request' => true]);
 
         if (
-            (!isset($data->id) || !$data->id) && Factory::getApplication()->input->getCmd('controller') == 'modules'
+            (!isset($data->id) || !$data->id) && Factory::getApplication()->getInput()->getCmd('controller') == 'modules'
             && Factory::getApplication()->isClient('site')
         ) {
             // Modules on front end editing don't have data and an id set
-            $data->id = Factory::getApplication()->input->getInt('id');
+            $data->id = Factory::getApplication()->getInput()->getInt('id');
         }
 
         // Looping through the fields again to set the value
diff --git a/administrator/components/com_fields/src/Model/FieldModel.php b/administrator/components/com_fields/src/Model/FieldModel.php
index c0ff23176a82d..245a3e7ea9fca 100644
--- a/administrator/components/com_fields/src/Model/FieldModel.php
+++ b/administrator/components/com_fields/src/Model/FieldModel.php
@@ -95,7 +95,7 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
     {
         parent::__construct($config, $factory);
 
-        $this->typeAlias = Factory::getApplication()->input->getCmd('context', 'com_content.article') . '.field';
+        $this->typeAlias = Factory::getApplication()->getInput()->getCmd('context', 'com_content.article') . '.field';
     }
 
     /**
@@ -122,7 +122,7 @@ public function save($data)
         }
 
         // Alter the title for save as copy
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         if ($input->get('task') == 'save2copy') {
             $origTable = clone $this->getTable();
@@ -365,7 +365,7 @@ public function getItem($pk = null)
         if ($result) {
             // Prime required properties.
             if (empty($result->id)) {
-                $result->context = Factory::getApplication()->input->getCmd('context', $this->getState('field.context'));
+                $result->context = Factory::getApplication()->getInput()->getCmd('context', $this->getState('field.context'));
             }
 
             if (property_exists($result, 'fieldparams') && $result->fieldparams !== null) {
@@ -496,7 +496,7 @@ public function delete(&$pks)
     public function getForm($data = array(), $loadData = true)
     {
         $context = $this->getState('field.context');
-        $jinput  = Factory::getApplication()->input;
+        $jinput  = Factory::getApplication()->getInput();
 
         // A workaround to get the context into the model for save requests.
         if (empty($context) && isset($data['context'])) {
@@ -833,10 +833,10 @@ protected function populateState()
         $app = Factory::getApplication();
 
         // Load the User state.
-        $pk = $app->input->getInt('id');
+        $pk = $app->getInput()->getInt('id');
         $this->setState($this->getName() . '.id', $pk);
 
-        $context = $app->input->get('context', 'com_content.article');
+        $context = $app->getInput()->get('context', 'com_content.article');
         $this->setState('field.context', $context);
         $parts = FieldsHelper::extract($context);
 
@@ -892,16 +892,16 @@ protected function loadFormData()
                 // get selected fields
                 $filters = (array) $app->getUserState('com_fields.fields.filter');
 
-                $data->set('state', $app->input->getInt('state', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null)));
-                $data->set('language', $app->input->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
-                $data->set('group_id', $app->input->getString('group_id', (!empty($filters['group_id']) ? $filters['group_id'] : null)));
+                $data->set('state', $app->getInput()->getInt('state', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null)));
+                $data->set('language', $app->getInput()->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
+                $data->set('group_id', $app->getInput()->getString('group_id', (!empty($filters['group_id']) ? $filters['group_id'] : null)));
                 $data->set(
                     'access',
-                    $app->input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')))
+                    $app->getInput()->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')))
                 );
 
                 // Set the type if available from the request
-                $data->set('type', $app->input->getWord('type', $this->state->get('field.type', $data->get('type'))));
+                $data->set('type', $app->getInput()->getWord('type', $this->state->get('field.type', $data->get('type'))));
             }
 
             if ($data->label && !isset($data->params['label'])) {
@@ -1067,7 +1067,7 @@ function () use ($component, $section) {
      */
     protected function cleanCache($group = null, $clientId = 0)
     {
-        $context = Factory::getApplication()->input->get('context');
+        $context = Factory::getApplication()->getInput()->get('context');
 
         switch ($context) {
             case 'com_content':
diff --git a/administrator/components/com_fields/src/Model/FieldsModel.php b/administrator/components/com_fields/src/Model/FieldsModel.php
index 27f2fe39af125..b251290d40483 100644
--- a/administrator/components/com_fields/src/Model/FieldsModel.php
+++ b/administrator/components/com_fields/src/Model/FieldsModel.php
@@ -281,8 +281,8 @@ function () use ($parts) {
 
         // Include group state only when not on on back end list
         $includeGroupState = !$app->isClient('administrator') ||
-            $app->input->get('option') != 'com_fields' ||
-            $app->input->get('view') != 'fields';
+            $app->getInput()->get('option') != 'com_fields' ||
+            $app->getInput()->get('view') != 'fields';
 
         if (is_numeric($state)) {
             $state = (int) $state;
diff --git a/administrator/components/com_fields/src/Model/GroupModel.php b/administrator/components/com_fields/src/Model/GroupModel.php
index e09fa33e8d216..da3e58d7058f9 100644
--- a/administrator/components/com_fields/src/Model/GroupModel.php
+++ b/administrator/components/com_fields/src/Model/GroupModel.php
@@ -59,7 +59,7 @@ class GroupModel extends AdminModel
     public function save($data)
     {
         // Alter the title for save as copy
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         // Save new group as unpublished
         if ($input->get('task') == 'save2copy') {
@@ -99,7 +99,7 @@ public function getTable($name = 'Group', $prefix = 'Administrator', $options =
     public function getForm($data = array(), $loadData = true)
     {
         $context = $this->getState('filter.context');
-        $jinput = Factory::getApplication()->input;
+        $jinput = Factory::getApplication()->getInput();
 
         if (empty($context) && isset($data['context'])) {
             $context = $data['context'];
@@ -315,15 +315,15 @@ protected function loadFormData()
 
                 $data->set(
                     'state',
-                    $app->input->getInt('state', (!empty($filters['state']) ? $filters['state'] : null))
+                    $app->getInput()->getInt('state', (!empty($filters['state']) ? $filters['state'] : null))
                 );
                 $data->set(
                     'language',
-                    $app->input->getString('language', (!empty($filters['language']) ? $filters['language'] : null))
+                    $app->getInput()->getString('language', (!empty($filters['language']) ? $filters['language'] : null))
                 );
                 $data->set(
                     'access',
-                    $app->input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')))
+                    $app->getInput()->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')))
                 );
             }
         }
@@ -370,7 +370,7 @@ public function getItem($pk = null)
      */
     protected function cleanCache($group = null, $clientId = 0)
     {
-        $context = Factory::getApplication()->input->get('context');
+        $context = Factory::getApplication()->getInput()->get('context');
 
         parent::cleanCache($context);
     }
diff --git a/administrator/components/com_fields/src/View/Field/HtmlView.php b/administrator/components/com_fields/src/View/Field/HtmlView.php
index 5eafa567697c4..6f900178b582f 100644
--- a/administrator/components/com_fields/src/View/Field/HtmlView.php
+++ b/administrator/components/com_fields/src/View/Field/HtmlView.php
@@ -75,7 +75,7 @@ public function display($tpl = null)
             throw new GenericDataException(implode("\n", $errors), 500);
         }
 
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $this->addToolbar();
 
diff --git a/administrator/components/com_fields/src/View/Group/HtmlView.php b/administrator/components/com_fields/src/View/Group/HtmlView.php
index cf3e8caa94feb..b4f211e66ec3c 100644
--- a/administrator/components/com_fields/src/View/Group/HtmlView.php
+++ b/administrator/components/com_fields/src/View/Group/HtmlView.php
@@ -93,7 +93,7 @@ public function display($tpl = null)
             throw new GenericDataException(implode("\n", $errors), 500);
         }
 
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $this->addToolbar();
 
diff --git a/administrator/components/com_fields/tmpl/field/edit.php b/administrator/components/com_fields/tmpl/field/edit.php
index 1f3a11faa627d..068a931c5f53c 100644
--- a/administrator/components/com_fields/tmpl/field/edit.php
+++ b/administrator/components/com_fields/tmpl/field/edit.php
@@ -17,7 +17,7 @@
 use Joomla\CMS\Router\Route;
 
 $app = Factory::getApplication();
-$input = $app->input;
+$input = $app->getInput();
 
 $this->useCoreUI = true;
 
diff --git a/administrator/components/com_fields/tmpl/fields/modal.php b/administrator/components/com_fields/tmpl/fields/modal.php
index 15a39f1c485ee..4dd33fc467c43 100644
--- a/administrator/components/com_fields/tmpl/fields/modal.php
+++ b/administrator/components/com_fields/tmpl/fields/modal.php
@@ -27,7 +27,7 @@
 
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
-$editor    = Factory::getApplication()->input->get('editor', '', 'cmd');
+$editor    = Factory::getApplication()->getInput()->get('editor', '', 'cmd');
 ?>
 <div class="container-popup">
 
diff --git a/administrator/components/com_fields/tmpl/group/edit.php b/administrator/components/com_fields/tmpl/group/edit.php
index 97bb6db49d931..9a650d2156070 100644
--- a/administrator/components/com_fields/tmpl/group/edit.php
+++ b/administrator/components/com_fields/tmpl/group/edit.php
@@ -22,7 +22,7 @@
     ->useScript('form.validate');
 
 $app = Factory::getApplication();
-$input = $app->input;
+$input = $app->getInput();
 
 $this->useCoreUI = true;
 
diff --git a/administrator/components/com_finder/src/Indexer/Query.php b/administrator/components/com_finder/src/Indexer/Query.php
index a5bea020c25b0..ed7090806680f 100644
--- a/administrator/components/com_finder/src/Indexer/Query.php
+++ b/administrator/components/com_finder/src/Indexer/Query.php
@@ -312,7 +312,7 @@ public function toUri($base = '')
         }
 
         // Get the filters in the request.
-        $t = Factory::getApplication()->input->request->get('t', array(), 'array');
+        $t = Factory::getApplication()->getInput()->request->get('t', array(), 'array');
 
         // Add the dynamic taxonomy filters if present.
         if ((bool) $this->filters) {
diff --git a/administrator/components/com_finder/src/Service/HTML/Filter.php b/administrator/components/com_finder/src/Service/HTML/Filter.php
index 87e9687b6cf78..2b2fe3feb566c 100644
--- a/administrator/components/com_finder/src/Service/HTML/Filter.php
+++ b/administrator/components/com_finder/src/Service/HTML/Filter.php
@@ -363,7 +363,7 @@ public function select($idxQuery, $options)
             // Check if the branch is in the filter.
             if (array_key_exists($bv->title, $idxQuery->filters)) {
                 // Get the request filters.
-                $temp   = Factory::getApplication()->input->request->get('t', array(), 'array');
+                $temp   = Factory::getApplication()->getInput()->request->get('t', array(), 'array');
 
                 // Search for active nodes in the branch and get the active node.
                 $active = array_intersect($temp, $idxQuery->filters[$bv->title]);
diff --git a/administrator/components/com_finder/src/Service/HTML/Query.php b/administrator/components/com_finder/src/Service/HTML/Query.php
index b6c7346f8d9b8..ca4b0aced0cb6 100644
--- a/administrator/components/com_finder/src/Service/HTML/Query.php
+++ b/administrator/components/com_finder/src/Service/HTML/Query.php
@@ -77,7 +77,7 @@ public static function explained(IndexerQuery $query)
         // Process the taxonomy filters.
         if (!empty($query->filters)) {
             // Get the filters in the request.
-            $t = Factory::getApplication()->input->request->get('t', array(), 'array');
+            $t = Factory::getApplication()->getInput()->request->get('t', array(), 'array');
 
             // Process the taxonomy branches.
             foreach ($query->filters as $branch => $nodes) {
diff --git a/administrator/components/com_finder/src/View/Filter/HtmlView.php b/administrator/components/com_finder/src/View/Filter/HtmlView.php
index 384a9d74b3a36..a285bfa09d8b0 100644
--- a/administrator/components/com_finder/src/View/Filter/HtmlView.php
+++ b/administrator/components/com_finder/src/View/Filter/HtmlView.php
@@ -112,7 +112,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $isNew = ($this->item->filter_id == 0);
         $checkedOut = !(is_null($this->item->checked_out) || $this->item->checked_out == $this->getCurrentUser()->id);
diff --git a/administrator/components/com_finder/tmpl/filter/edit.php b/administrator/components/com_finder/tmpl/filter/edit.php
index 1dd6f47bee024..789ed61a75b0e 100644
--- a/administrator/components/com_finder/tmpl/filter/edit.php
+++ b/administrator/components/com_finder/tmpl/filter/edit.php
@@ -86,7 +86,7 @@
         <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
 
         <input type="hidden" name="task" value="">
-        <input type="hidden" name="return" value="<?php echo Factory::getApplication()->input->get('return', '', 'BASE64'); ?>">
+        <input type="hidden" name="return" value="<?php echo Factory::getApplication()->getInput()->get('return', '', 'BASE64'); ?>">
         <?php echo HTMLHelper::_('form.token'); ?>
     </div>
 </form>
diff --git a/administrator/components/com_installer/src/Model/DiscoverModel.php b/administrator/components/com_installer/src/Model/DiscoverModel.php
index 7c91cee19f720..4532d79e93e99 100644
--- a/administrator/components/com_installer/src/Model/DiscoverModel.php
+++ b/administrator/components/com_installer/src/Model/DiscoverModel.php
@@ -212,7 +212,7 @@ public function discover()
     public function discover_install()
     {
         $app   = Factory::getApplication();
-        $input = $app->input;
+        $input = $app->getInput();
         $eid   = $input->get('cid', 0, 'array');
 
         if (is_array($eid) || $eid) {
diff --git a/administrator/components/com_installer/src/Model/InstallModel.php b/administrator/components/com_installer/src/Model/InstallModel.php
index 727257b452c5b..bc476763a8e98 100644
--- a/administrator/components/com_installer/src/Model/InstallModel.php
+++ b/administrator/components/com_installer/src/Model/InstallModel.php
@@ -101,8 +101,8 @@ public function install()
             return false;
         }
 
-        $installType = $app->input->getWord('installtype');
-        $installLang = $app->input->getWord('package');
+        $installType = $app->getInput()->getWord('installtype');
+        $installLang = $app->getInput()->getWord('package');
 
         if ($package === null) {
             switch ($installType) {
@@ -239,7 +239,7 @@ public function install()
     protected function _getPackageFromUpload()
     {
         // Get the uploaded file information.
-        $input    = Factory::getApplication()->input;
+        $input    = Factory::getApplication()->getInput();
 
         // Do not change the filter type 'raw'. We need this to let files containing PHP code to upload. See \JInputFiles::get.
         $userfile = $input->files->get('install_package', null, 'raw');
@@ -315,7 +315,7 @@ protected function _getPackageFromUpload()
      */
     protected function _getPackageFromFolder()
     {
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         // Get the path to the package to install.
         $p_dir = $input->getString('install_directory');
@@ -353,7 +353,7 @@ protected function _getPackageFromFolder()
      */
     protected function _getPackageFromUrl()
     {
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         // Get the URL of the package to install.
         $url = $input->getString('install_url');
diff --git a/administrator/components/com_installer/src/View/Updatesite/HtmlView.php b/administrator/components/com_installer/src/View/Updatesite/HtmlView.php
index c7919898876eb..8f8ce48363cf3 100644
--- a/administrator/components/com_installer/src/View/Updatesite/HtmlView.php
+++ b/administrator/components/com_installer/src/View/Updatesite/HtmlView.php
@@ -95,7 +95,7 @@ public function display($tpl = null): void
     protected function addToolbar(): void
     {
         $app = Factory::getApplication();
-        $app->input->set('hidemainmenu', true);
+        $app->getInput()->set('hidemainmenu', true);
 
         $user       = $app->getIdentity();
         $userId     = $user->id;
diff --git a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
index a11459b873c7f..1411e91b01aa4 100644
--- a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
+++ b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
@@ -883,7 +883,7 @@ public function cleanUp()
     public function upload()
     {
         // Get the uploaded file information.
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         // Do not change the filter type 'raw'. We need this to let files containing PHP code to upload. See \JInputFiles::get.
         $userfile = $input->files->get('install_package', null, 'raw');
diff --git a/administrator/components/com_joomlaupdate/src/View/Update/HtmlView.php b/administrator/components/com_joomlaupdate/src/View/Update/HtmlView.php
index b8571462881a5..66d15319f2544 100644
--- a/administrator/components/com_joomlaupdate/src/View/Update/HtmlView.php
+++ b/administrator/components/com_joomlaupdate/src/View/Update/HtmlView.php
@@ -35,7 +35,7 @@ class HtmlView extends BaseHtmlView
      */
     public function display($tpl = null)
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         // Set the toolbar information.
         ToolbarHelper::title(Text::_('COM_JOOMLAUPDATE_OVERVIEW'), 'sync install');
diff --git a/administrator/components/com_languages/src/Model/LanguageModel.php b/administrator/components/com_languages/src/Model/LanguageModel.php
index 4a77446b5044e..135fa0f14d6f2 100644
--- a/administrator/components/com_languages/src/Model/LanguageModel.php
+++ b/administrator/components/com_languages/src/Model/LanguageModel.php
@@ -88,7 +88,7 @@ protected function populateState()
         $params = ComponentHelper::getParams('com_languages');
 
         // Load the User state.
-        $langId = $app->input->getInt('lang_id');
+        $langId = $app->getInput()->getInt('lang_id');
         $this->setState('language.id', $langId);
 
         // Load the parameters.
diff --git a/administrator/components/com_languages/src/Model/OverrideModel.php b/administrator/components/com_languages/src/Model/OverrideModel.php
index 6a0a9618903df..9a4a29b03506b 100644
--- a/administrator/components/com_languages/src/Model/OverrideModel.php
+++ b/administrator/components/com_languages/src/Model/OverrideModel.php
@@ -96,7 +96,7 @@ protected function loadFormData()
      */
     public function getItem($pk = null)
     {
-        $input    = Factory::getApplication()->input;
+        $input    = Factory::getApplication()->getInput();
         $pk       = !empty($pk) ? $pk : $input->get('id');
         $fileName = constant('JPATH_' . strtoupper($this->getState('filter.client')))
             . '/language/overrides/' . $this->getState('filter.language', 'en-GB') . '.override.ini';
diff --git a/administrator/components/com_languages/src/Model/StringsModel.php b/administrator/components/com_languages/src/Model/StringsModel.php
index 2ad3956ee1d58..1f34c2de31c27 100644
--- a/administrator/components/com_languages/src/Model/StringsModel.php
+++ b/administrator/components/com_languages/src/Model/StringsModel.php
@@ -131,7 +131,7 @@ public function refresh()
     public function search()
     {
         $results = array();
-        $input   = Factory::getApplication()->input;
+        $input   = Factory::getApplication()->getInput();
         $filter  = InputFilter::getInstance();
         $db      = $this->getDatabase();
         $searchTerm = $input->getString('searchstring');
diff --git a/administrator/components/com_languages/src/View/Language/HtmlView.php b/administrator/components/com_languages/src/View/Language/HtmlView.php
index b17ae8ca6c71b..27c43c9fa74c7 100644
--- a/administrator/components/com_languages/src/View/Language/HtmlView.php
+++ b/administrator/components/com_languages/src/View/Language/HtmlView.php
@@ -91,7 +91,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', 1);
+        Factory::getApplication()->getInput()->set('hidemainmenu', 1);
         $isNew = empty($this->item->lang_id);
         $canDo = $this->canDo;
 
diff --git a/administrator/components/com_languages/src/View/Override/HtmlView.php b/administrator/components/com_languages/src/View/Override/HtmlView.php
index f9cda3183135a..ea5a4bac86bc7 100644
--- a/administrator/components/com_languages/src/View/Override/HtmlView.php
+++ b/administrator/components/com_languages/src/View/Override/HtmlView.php
@@ -109,7 +109,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $canDo = ContentHelper::getActions('com_languages');
 
diff --git a/administrator/components/com_login/src/Model/LoginModel.php b/administrator/components/com_login/src/Model/LoginModel.php
index e250d3c640d30..c8739e0a5ac29 100644
--- a/administrator/components/com_login/src/Model/LoginModel.php
+++ b/administrator/components/com_login/src/Model/LoginModel.php
@@ -39,7 +39,7 @@ class LoginModel extends BaseDatabaseModel
      */
     protected function populateState()
     {
-        $input = Factory::getApplication()->input->getInputForRequestMethod();
+        $input = Factory::getApplication()->getInput()->getInputForRequestMethod();
 
         $credentials = array(
             'username'  => $input->get('username', '', 'USERNAME'),
diff --git a/administrator/components/com_mails/src/Model/TemplateModel.php b/administrator/components/com_mails/src/Model/TemplateModel.php
index 1777d8ae18d40..9b19e62e4b88d 100644
--- a/administrator/components/com_mails/src/Model/TemplateModel.php
+++ b/administrator/components/com_mails/src/Model/TemplateModel.php
@@ -398,10 +398,10 @@ protected function populateState()
     {
         parent::populateState();
 
-        $template_id = Factory::getApplication()->input->getCmd('template_id');
+        $template_id = Factory::getApplication()->getInput()->getCmd('template_id');
         $this->setState($this->getName() . '.template_id', $template_id);
 
-        $language = Factory::getApplication()->input->getCmd('language');
+        $language = Factory::getApplication()->getInput()->getCmd('language');
         $this->setState($this->getName() . '.language', $language);
     }
 }
diff --git a/administrator/components/com_mails/src/View/Template/HtmlView.php b/administrator/components/com_mails/src/View/Template/HtmlView.php
index fe52c216efcc0..db68b742a0bb6 100644
--- a/administrator/components/com_mails/src/View/Template/HtmlView.php
+++ b/administrator/components/com_mails/src/View/Template/HtmlView.php
@@ -130,7 +130,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
         $toolbar = Toolbar::getInstance();
 
         ToolbarHelper::title(
diff --git a/administrator/components/com_mails/tmpl/template/edit.php b/administrator/components/com_mails/tmpl/template/edit.php
index b0f14e322bb2f..b5ae34d6d156d 100644
--- a/administrator/components/com_mails/tmpl/template/edit.php
+++ b/administrator/components/com_mails/tmpl/template/edit.php
@@ -28,7 +28,7 @@
 
 $this->useCoreUI = true;
 
-$input = $app->input;
+$input = $app->getInput();
 list($component, $sub_id) = explode('.', $this->master->template_id, 2);
 $sub_id = str_replace('.', '_', $sub_id);
 
diff --git a/administrator/components/com_media/src/Model/ApiModel.php b/administrator/components/com_media/src/Model/ApiModel.php
index f82986b21a26a..1608e3d977edf 100644
--- a/administrator/components/com_media/src/Model/ApiModel.php
+++ b/administrator/components/com_media/src/Model/ApiModel.php
@@ -451,7 +451,7 @@ private function isMediaFile($path)
         // Initialize the allowed extensions
         if ($this->allowedExtensions === null) {
             // Get options from the input or fallback to images only
-            $mediaTypes = explode(',', Factory::getApplication()->input->getString('mediatypes', '0'));
+            $mediaTypes = explode(',', Factory::getApplication()->getInput()->getString('mediatypes', '0'));
             $types      = [];
             $extensions = [];
 
diff --git a/administrator/components/com_media/src/View/File/HtmlView.php b/administrator/components/com_media/src/View/File/HtmlView.php
index b98dca8d46238..1ede1045fbbab 100644
--- a/administrator/components/com_media/src/View/File/HtmlView.php
+++ b/administrator/components/com_media/src/View/File/HtmlView.php
@@ -38,7 +38,7 @@ class HtmlView extends BaseHtmlView
      */
     public function display($tpl = null)
     {
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         $this->form = $this->get('Form');
 
diff --git a/administrator/components/com_media/src/View/Media/HtmlView.php b/administrator/components/com_media/src/View/Media/HtmlView.php
index a8bd7b64b2864..0a8e246986e91 100644
--- a/administrator/components/com_media/src/View/Media/HtmlView.php
+++ b/administrator/components/com_media/src/View/Media/HtmlView.php
@@ -70,7 +70,7 @@ public function display($tpl = null)
 			Factory::getApplication()->enqueueMessage(Text::sprintf('COM_MEDIA_ERROR_NO_PROVIDERS', $link), CMSApplication::MSG_WARNING);
 		}
 
-		$this->currentPath = Factory::getApplication()->input->getString('path');
+		$this->currentPath = Factory::getApplication()->getInput()->getString('path');
 
 		parent::display($tpl);
 	}
@@ -84,7 +84,7 @@ public function display($tpl = null)
 	 */
 	protected function prepareToolbar()
 	{
-		$tmpl = Factory::getApplication()->input->getCmd('tmpl');
+		$tmpl = Factory::getApplication()->getInput()->getCmd('tmpl');
 
 		// Get the toolbar object instance
 		$bar  = Toolbar::getInstance('toolbar');
diff --git a/administrator/components/com_media/tmpl/file/default.php b/administrator/components/com_media/tmpl/file/default.php
index 2385e5805361a..4a6991ea3342d 100644
--- a/administrator/components/com_media/tmpl/file/default.php
+++ b/administrator/components/com_media/tmpl/file/default.php
@@ -27,7 +27,7 @@
 $script = $wa->getAsset('script', 'com_media.edit-images')->getUri(true);
 
 $params = ComponentHelper::getParams('com_media');
-$input  = Factory::getApplication()->input;
+$input  = Factory::getApplication()->getInput();
 
 /** @var \Joomla\CMS\Form\Form $form */
 $form = $this->form;
diff --git a/administrator/components/com_media/tmpl/media/default.php b/administrator/components/com_media/tmpl/media/default.php
index 5ea50cd93f62c..7e647885d912d 100644
--- a/administrator/components/com_media/tmpl/media/default.php
+++ b/administrator/components/com_media/tmpl/media/default.php
@@ -16,7 +16,7 @@
 
 $app    = Factory::getApplication();
 $params = ComponentHelper::getParams('com_media');
-$input  = $app->input;
+$input  = $app->getInput();
 $user   = $app->getIdentity();
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
diff --git a/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php b/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php
index a8d3e336658c1..b3255533d49a0 100644
--- a/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php
+++ b/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php
@@ -15,7 +15,7 @@
 
 $app       = Factory::getApplication();
 $form      = $displayData->getForm();
-$input     = $app->input;
+$input     = $app->getInput();
 $component = $input->getCmd('option', 'com_content');
 
 if ($component == 'com_categories') {
diff --git a/administrator/components/com_menus/src/Field/MenuItemByTypeField.php b/administrator/components/com_menus/src/Field/MenuItemByTypeField.php
index f50500ad22fdd..9b2291926996a 100644
--- a/administrator/components/com_menus/src/Field/MenuItemByTypeField.php
+++ b/administrator/components/com_menus/src/Field/MenuItemByTypeField.php
@@ -155,7 +155,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
             if (!$menuType) {
                 $app = Factory::getApplication();
                 $currentMenuType = $app->getUserState('com_menus.items.menutype', '');
-                $menuType        = $app->input->getString('menutype', $currentMenuType);
+                $menuType        = $app->getInput()->getString('menutype', $currentMenuType);
             }
 
             $this->menuType  = $menuType;
diff --git a/administrator/components/com_menus/src/Model/ItemModel.php b/administrator/components/com_menus/src/Model/ItemModel.php
index e0ada7e3af042..c3bae328bcd4a 100644
--- a/administrator/components/com_menus/src/Model/ItemModel.php
+++ b/administrator/components/com_menus/src/Model/ItemModel.php
@@ -930,7 +930,7 @@ protected function populateState()
         $app = Factory::getApplication();
 
         // Load the User state.
-        $pk = $app->input->getInt('id');
+        $pk = $app->getInput()->getInt('id');
         $this->setState('item.id', $pk);
 
         if (!$app->isClient('api')) {
@@ -938,11 +938,11 @@ protected function populateState()
             $menuType = $app->getUserStateFromRequest('com_menus.items.menutype', 'menutype', '', 'string');
         } else {
             $parentId = null;
-            $menuType = $app->input->get('com_menus.items.menutype');
+            $menuType = $app->getInput()->get('com_menus.items.menutype');
         }
 
         if (!$parentId) {
-            $parentId = $app->input->getInt('parent_id');
+            $parentId = $app->getInput()->getInt('parent_id');
         }
 
         $this->setState('item.parent_id', $parentId);
@@ -957,12 +957,12 @@ protected function populateState()
             $clientId   = (int) $menuTypeObj->client_id;
         } else {
             $menuTypeId = 0;
-            $clientId   = $app->isClient('api') ? $app->input->get('client_id') :
+            $clientId   = $app->isClient('api') ? $app->getInput()->get('client_id') :
                 $app->getUserState('com_menus.items.client_id', 0);
         }
 
         // Forced client id will override/clear menuType if conflicted
-        $forcedClientId = $app->input->get('client_id', null, 'string');
+        $forcedClientId = $app->getInput()->get('client_id', null, 'string');
 
         if (!$app->isClient('api')) {
             // Set the menu type and client id on the list view state, so we return to this menu after saving.
@@ -988,7 +988,7 @@ protected function populateState()
         $this->setState('item.menutypeid', $menuTypeId);
 
         if (!($type = $app->getUserState('com_menus.edit.item.type'))) {
-            $type = $app->input->get('type');
+            $type = $app->getInput()->get('type');
 
             /**
              * Note: a new menu item will have no field type.
@@ -998,7 +998,7 @@ protected function populateState()
 
         $this->setState('item.type', $type);
 
-        $link = $app->isClient('api') ? $app->input->get('link') :
+        $link = $app->isClient('api') ? $app->getInput()->get('link') :
             $app->getUserState('com_menus.edit.item.link');
 
         if ($link) {
@@ -1379,7 +1379,7 @@ public function save($data)
         }
 
         // Alter the title & alias for save2copy when required. Also, unset the home record.
-        if (Factory::getApplication()->input->get('task') === 'save2copy' && $data['id'] === 0) {
+        if (Factory::getApplication()->getInput()->get('task') === 'save2copy' && $data['id'] === 0) {
             $origTable = $this->getTable();
             $origTable->load($this->getState('item.id'));
 
@@ -1569,7 +1569,7 @@ public function save($data)
             parent::cleanCache($option);
         }
 
-        if (Factory::getApplication()->input->get('task') === 'editAssociations') {
+        if (Factory::getApplication()->getInput()->get('task') === 'editAssociations') {
             return $this->redirectToAssociations($data);
         }
 
diff --git a/administrator/components/com_menus/src/Model/ItemsModel.php b/administrator/components/com_menus/src/Model/ItemsModel.php
index dda6fc9b47308..17d4891f83e8b 100644
--- a/administrator/components/com_menus/src/Model/ItemsModel.php
+++ b/administrator/components/com_menus/src/Model/ItemsModel.php
@@ -89,10 +89,10 @@ protected function populateState($ordering = 'a.lft', $direction = 'asc')
     {
         $app = Factory::getApplication();
 
-        $forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');
+        $forcedLanguage = $app->getInput()->get('forcedLanguage', '', 'cmd');
 
         // Adjust the context to support modal layouts.
-        if ($layout = $app->input->get('layout')) {
+        if ($layout = $app->getInput()->get('layout')) {
             $this->context .= '.' . $layout;
         }
 
@@ -118,7 +118,7 @@ protected function populateState($ordering = 'a.lft', $direction = 'asc')
 
         // Watch changes in client_id and menutype and keep sync whenever needed.
         $currentClientId = $app->getUserState($this->context . '.client_id', 0);
-        $clientId        = $app->input->getInt('client_id', $currentClientId);
+        $clientId        = $app->getInput()->getInt('client_id', $currentClientId);
 
         // Load mod_menu.ini file when client is administrator
         if ($clientId == 1) {
@@ -126,19 +126,19 @@ protected function populateState($ordering = 'a.lft', $direction = 'asc')
         }
 
         $currentMenuType = $app->getUserState($this->context . '.menutype', '');
-        $menuType        = $app->input->getString('menutype', $currentMenuType);
+        $menuType        = $app->getInput()->getString('menutype', $currentMenuType);
 
         // If client_id changed clear menutype and reset pagination
         if ($clientId != $currentClientId) {
             $menuType = '';
 
-            $app->input->set('limitstart', 0);
-            $app->input->set('menutype', '');
+            $app->getInput()->set('limitstart', 0);
+            $app->getInput()->set('menutype', '');
         }
 
         // If menutype changed reset pagination.
         if ($menuType != $currentMenuType) {
-            $app->input->set('limitstart', 0);
+            $app->getInput()->set('limitstart', 0);
         }
 
         if (!$menuType) {
@@ -148,7 +148,7 @@ protected function populateState($ordering = 'a.lft', $direction = 'asc')
         } elseif ($menuType == 'main') {
             // Special menu types, if selected explicitly, will be allowed as a filter
             // Adjust client_id to match the menutype. This is safe as client_id was not changed in this request.
-            $app->input->set('client_id', 1);
+            $app->getInput()->set('client_id', 1);
 
             $app->setUserState($this->context . '.menutype', $menuType);
             $this->setState('menutypetitle', ucfirst($menuType));
@@ -156,7 +156,7 @@ protected function populateState($ordering = 'a.lft', $direction = 'asc')
         } elseif ($cMenu = $this->getMenu($menuType, true)) {
             // Get the menutype object with appropriate checks.
             // Adjust client_id to match the menutype. This is safe as client_id was not changed in this request.
-            $app->input->set('client_id', $cMenu->client_id);
+            $app->getInput()->set('client_id', $cMenu->client_id);
 
             $app->setUserState($this->context . '.menutype', $menuType);
             $this->setState('menutypetitle', $cMenu->title);
@@ -165,8 +165,8 @@ protected function populateState($ordering = 'a.lft', $direction = 'asc')
             // This menutype does not exist, leave client id unchanged but reset menutype and pagination
             $menuType = '';
 
-            $app->input->set('limitstart', 0);
-            $app->input->set('menutype', $menuType);
+            $app->getInput()->set('limitstart', 0);
+            $app->getInput()->set('menutype', $menuType);
 
             $app->setUserState($this->context . '.menutype', $menuType);
             $this->setState('menutypetitle', '');
diff --git a/administrator/components/com_menus/src/Model/MenuModel.php b/administrator/components/com_menus/src/Model/MenuModel.php
index ed681f2e192cf..5d1e08203699d 100644
--- a/administrator/components/com_menus/src/Model/MenuModel.php
+++ b/administrator/components/com_menus/src/Model/MenuModel.php
@@ -104,7 +104,7 @@ protected function populateState()
         $app = Factory::getApplication();
 
         // Load the User state.
-        $id = $app->input->getInt('id');
+        $id = $app->getInput()->getInt('id');
         $this->setState('menu.id', $id);
 
         // Load the parameters.
diff --git a/administrator/components/com_menus/src/Model/MenutypesModel.php b/administrator/components/com_menus/src/Model/MenutypesModel.php
index 8402492b34d52..04b8ced798374 100644
--- a/administrator/components/com_menus/src/Model/MenutypesModel.php
+++ b/administrator/components/com_menus/src/Model/MenutypesModel.php
@@ -51,7 +51,7 @@ protected function populateState()
     {
         parent::populateState();
 
-        $clientId = Factory::getApplication()->input->get('client_id', 0);
+        $clientId = Factory::getApplication()->getInput()->get('client_id', 0);
 
         $this->state->set('client_id', $clientId);
     }
diff --git a/administrator/components/com_menus/src/View/Item/HtmlView.php b/administrator/components/com_menus/src/View/Item/HtmlView.php
index f9b34cf1eebc5..2b9288b430216 100644
--- a/administrator/components/com_menus/src/View/Item/HtmlView.php
+++ b/administrator/components/com_menus/src/View/Item/HtmlView.php
@@ -103,7 +103,7 @@ public function display($tpl = null)
         }
 
         // If we are forcing a language in modal (used for associations).
-        if ($this->getLayout() === 'modal' && $forcedLanguage = Factory::getApplication()->input->get('forcedLanguage', '', 'cmd')) {
+        if ($this->getLayout() === 'modal' && $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'cmd')) {
             // Set the language field to the forcedLanguage and disable changing it.
             $this->form->setValue('language', null, $forcedLanguage);
             $this->form->setFieldAttribute('language', 'readonly', 'true');
@@ -125,7 +125,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
         $input->set('hidemainmenu', true);
 
         $user       = $this->getCurrentUser();
diff --git a/administrator/components/com_menus/src/View/Items/HtmlView.php b/administrator/components/com_menus/src/View/Items/HtmlView.php
index 350b62c35ae87..3569a094546c4 100644
--- a/administrator/components/com_menus/src/View/Items/HtmlView.php
+++ b/administrator/components/com_menus/src/View/Items/HtmlView.php
@@ -265,7 +265,7 @@ public function display($tpl = null)
             }
         } else {
             // In menu associations modal we need to remove language filter if forcing a language.
-            if ($forcedLanguage = Factory::getApplication()->input->get('forcedLanguage', '', 'CMD')) {
+            if ($forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD')) {
                 // If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
                 $languageXml = new \SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
                 $this->filterForm->setField($languageXml, 'filter', true);
diff --git a/administrator/components/com_menus/src/View/Menu/HtmlView.php b/administrator/components/com_menus/src/View/Menu/HtmlView.php
index e3fa7bbabbab1..261a24e56ce56 100644
--- a/administrator/components/com_menus/src/View/Menu/HtmlView.php
+++ b/administrator/components/com_menus/src/View/Menu/HtmlView.php
@@ -92,7 +92,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
         $input->set('hidemainmenu', true);
 
         $isNew = ($this->item->id == 0);
diff --git a/administrator/components/com_menus/src/View/Menu/XmlView.php b/administrator/components/com_menus/src/View/Menu/XmlView.php
index d0b304b0989f3..3a368d6bda7fc 100644
--- a/administrator/components/com_menus/src/View/Menu/XmlView.php
+++ b/administrator/components/com_menus/src/View/Menu/XmlView.php
@@ -54,7 +54,7 @@ class XmlView extends BaseHtmlView
     public function display($tpl = null)
     {
         $app      = Factory::getApplication();
-        $menutype = $app->input->getCmd('menutype');
+        $menutype = $app->getInput()->getCmd('menutype');
 
         if ($menutype) {
             $root = MenusHelper::getMenuItems($menutype, true);
diff --git a/administrator/components/com_menus/src/View/Menutypes/HtmlView.php b/administrator/components/com_menus/src/View/Menutypes/HtmlView.php
index 1796cbcea32d9..88f29fe6c3b04 100644
--- a/administrator/components/com_menus/src/View/Menutypes/HtmlView.php
+++ b/administrator/components/com_menus/src/View/Menutypes/HtmlView.php
@@ -57,7 +57,7 @@ class HtmlView extends BaseHtmlView
     public function display($tpl = null)
     {
         $app            = Factory::getApplication();
-        $this->recordId = $app->input->getInt('recordId');
+        $this->recordId = $app->getInput()->getInt('recordId');
 
         $types = $this->get('TypeOptions');
 
diff --git a/administrator/components/com_menus/tmpl/item/edit.php b/administrator/components/com_menus/tmpl/item/edit.php
index 644dcca1a5e2e..e380a5ad3ac0f 100644
--- a/administrator/components/com_menus/tmpl/item/edit.php
+++ b/administrator/components/com_menus/tmpl/item/edit.php
@@ -31,7 +31,7 @@
     ->useScript('com_menus.admin-item-edit');
 
 $assoc = Associations::isEnabled();
-$input = Factory::getApplication()->input;
+$input = Factory::getApplication()->getInput();
 
 // In case of modal
 $isModal  = $input->get('layout') === 'modal';
diff --git a/administrator/components/com_menus/tmpl/items/modal.php b/administrator/components/com_menus/tmpl/items/modal.php
index 49a212fde01c5..d2551c828d69c 100644
--- a/administrator/components/com_menus/tmpl/items/modal.php
+++ b/administrator/components/com_menus/tmpl/items/modal.php
@@ -28,8 +28,8 @@
 $wa = $this->document->getWebAssetManager();
 $wa->useScript('com_menus.admin-items-modal');
 
-$function  = $app->input->get('function', 'jSelectMenuItem', 'cmd');
-$editor    = $app->input->getCmd('editor', '');
+$function  = $app->getInput()->get('function', 'jSelectMenuItem', 'cmd');
+$editor    = $app->getInput()->getCmd('editor', '');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 $link      = 'index.php?option=com_menus&view=items&layout=modal&tmpl=component&' . Session::getFormToken() . '=1';
@@ -177,7 +177,7 @@
         <input type="hidden" name="task" value="">
         <input type="hidden" name="boxchecked" value="0">
         <input type="hidden" name="function" value="<?php echo $function; ?>">
-        <input type="hidden" name="forcedLanguage" value="<?php echo $app->input->get('forcedLanguage', '', 'cmd'); ?>">
+        <input type="hidden" name="forcedLanguage" value="<?php echo $app->getInput()->get('forcedLanguage', '', 'cmd'); ?>">
         <?php echo HTMLHelper::_('form.token'); ?>
 
     </form>
diff --git a/administrator/components/com_menus/tmpl/menutypes/default.php b/administrator/components/com_menus/tmpl/menutypes/default.php
index a0a32a9d6f658..a246fd50b83f7 100644
--- a/administrator/components/com_menus/tmpl/menutypes/default.php
+++ b/administrator/components/com_menus/tmpl/menutypes/default.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
-$input = Factory::getApplication()->input;
+$input = Factory::getApplication()->getInput();
 
 // Checking if loaded via index.php or component.php
 $tmpl = ($input->getCmd('tmpl') != '') ? '1' : '';
diff --git a/administrator/components/com_messages/src/Model/MessageModel.php b/administrator/components/com_messages/src/Model/MessageModel.php
index a0ac8af5f2a9e..b040578f6d2e6 100644
--- a/administrator/components/com_messages/src/Model/MessageModel.php
+++ b/administrator/components/com_messages/src/Model/MessageModel.php
@@ -62,7 +62,7 @@ protected function populateState()
     {
         parent::populateState();
 
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         $user  = $this->getCurrentUser();
         $this->setState('user.id', $user->get('id'));
diff --git a/administrator/components/com_messages/src/View/Config/HtmlView.php b/administrator/components/com_messages/src/View/Config/HtmlView.php
index 707ce41768c71..e048fed02a8b2 100644
--- a/administrator/components/com_messages/src/View/Config/HtmlView.php
+++ b/administrator/components/com_messages/src/View/Config/HtmlView.php
@@ -85,7 +85,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         ToolbarHelper::title(Text::_('COM_MESSAGES_TOOLBAR_MY_SETTINGS'), 'envelope');
 
diff --git a/administrator/components/com_messages/src/View/Message/HtmlView.php b/administrator/components/com_messages/src/View/Message/HtmlView.php
index 64a9a87a7b4a2..dae8f22ed0318 100644
--- a/administrator/components/com_messages/src/View/Message/HtmlView.php
+++ b/administrator/components/com_messages/src/View/Message/HtmlView.php
@@ -87,7 +87,7 @@ protected function addToolbar()
         $app = Factory::getApplication();
 
         if ($this->getLayout() == 'edit') {
-            $app->input->set('hidemainmenu', true);
+            $app->getInput()->set('hidemainmenu', true);
             ToolbarHelper::title(Text::_('COM_MESSAGES_WRITE_PRIVATE_MESSAGE'), 'envelope-open-text new-privatemessage');
             ToolbarHelper::custom('message.save', 'envelope', '', 'COM_MESSAGES_TOOLBAR_SEND', false);
             ToolbarHelper::cancel('message.cancel');
diff --git a/administrator/components/com_modules/src/Model/ModuleModel.php b/administrator/components/com_modules/src/Model/ModuleModel.php
index 69bf959e80690..40977cb0ab738 100644
--- a/administrator/components/com_modules/src/Model/ModuleModel.php
+++ b/administrator/components/com_modules/src/Model/ModuleModel.php
@@ -122,7 +122,7 @@ protected function populateState()
         $app = Factory::getApplication();
 
         // Load the User state.
-        $pk = $app->input->getInt('id');
+        $pk = $app->getInput()->getInt('id');
 
         if (!$pk) {
             if ($extensionId = (int) $app->getUserState('com_modules.add.module.extension_id')) {
@@ -590,12 +590,12 @@ protected function loadFormData()
 
             // Pre-select some filters (Status, Module Position, Language, Access Level) in edit form if those have been selected in Module Manager
             if (!$data->id) {
-                $clientId = $app->input->getInt('client_id', 0);
+                $clientId = $app->getInput()->getInt('client_id', 0);
                 $filters  = (array) $app->getUserState('com_modules.modules.' . $clientId . '.filter');
-                $data->set('published', $app->input->getInt('published', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null)));
-                $data->set('position', $app->input->getInt('position', (!empty($filters['position']) ? $filters['position'] : null)));
-                $data->set('language', $app->input->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
-                $data->set('access', $app->input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access'))));
+                $data->set('published', $app->getInput()->getInt('published', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null)));
+                $data->set('position', $app->getInput()->getInt('position', (!empty($filters['position']) ? $filters['position'] : null)));
+                $data->set('language', $app->getInput()->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
+                $data->set('access', $app->getInput()->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access'))));
             }
 
             // Avoid to delete params of a second module opened in a new browser tab while new one is not saved yet.
@@ -893,7 +893,7 @@ public function validate($form, $data, $group = null)
      */
     public function save($data)
     {
-        $input      = Factory::getApplication()->input;
+        $input      = Factory::getApplication()->getInput();
         $table      = $this->getTable();
         $pk         = (!empty($data['id'])) ? $data['id'] : (int) $this->getState('module.id');
         $isNew      = true;
diff --git a/administrator/components/com_modules/src/Model/ModulesModel.php b/administrator/components/com_modules/src/Model/ModulesModel.php
index 341b69fda9609..77df137ac80a6 100644
--- a/administrator/components/com_modules/src/Model/ModulesModel.php
+++ b/administrator/components/com_modules/src/Model/ModulesModel.php
@@ -82,7 +82,7 @@ protected function populateState($ordering = 'a.position', $direction = 'asc')
     {
         $app = Factory::getApplication();
 
-        $layout = $app->input->get('layout', '', 'cmd');
+        $layout = $app->getInput()->get('layout', '', 'cmd');
 
         // Adjust the context to support modal layouts.
         if ($layout) {
@@ -90,7 +90,7 @@ protected function populateState($ordering = 'a.position', $direction = 'asc')
         }
 
         // Make context client aware
-        $this->context .= '.' . $app->input->get->getInt('client_id', 0);
+        $this->context .= '.' . $app->getInput()->get->getInt('client_id', 0);
 
         // Load the filter state.
         $this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
diff --git a/administrator/components/com_modules/src/View/Module/HtmlView.php b/administrator/components/com_modules/src/View/Module/HtmlView.php
index f8143d3fc6aeb..1e7752f6d6b8b 100644
--- a/administrator/components/com_modules/src/View/Module/HtmlView.php
+++ b/administrator/components/com_modules/src/View/Module/HtmlView.php
@@ -90,7 +90,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $user       = $this->getCurrentUser();
         $isNew      = ($this->item->id == 0);
diff --git a/administrator/components/com_modules/tmpl/module/edit.php b/administrator/components/com_modules/tmpl/module/edit.php
index 0dbdb4680d460..b5835045c766f 100644
--- a/administrator/components/com_modules/tmpl/module/edit.php
+++ b/administrator/components/com_modules/tmpl/module/edit.php
@@ -43,7 +43,7 @@
     ->useScript('form.validate')
     ->useScript('com_modules.admin-module-edit');
 
-$input = Factory::getApplication()->input;
+$input = Factory::getApplication()->getInput();
 
 // In case of modal
 $isModal = $input->get('layout') === 'modal';
diff --git a/administrator/components/com_modules/tmpl/modules/modal.php b/administrator/components/com_modules/tmpl/modules/modal.php
index 3c24c77f552c0..bb8f3f559e1e1 100644
--- a/administrator/components/com_modules/tmpl/modules/modal.php
+++ b/administrator/components/com_modules/tmpl/modules/modal.php
@@ -27,7 +27,7 @@
 
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
-$editor    = Factory::getApplication()->input->get('editor', '', 'cmd');
+$editor    = Factory::getApplication()->getInput()->get('editor', '', 'cmd');
 $link      = 'index.php?option=com_modules&view=modules&layout=modal&tmpl=component&' . Session::getFormToken() . '=1';
 
 if (!empty($editor)) {
diff --git a/administrator/components/com_modules/tmpl/select/default.php b/administrator/components/com_modules/tmpl/select/default.php
index 7e779d4218d36..acc789b0437d6 100644
--- a/administrator/components/com_modules/tmpl/select/default.php
+++ b/administrator/components/com_modules/tmpl/select/default.php
@@ -17,7 +17,7 @@
 
 $app = Factory::getApplication();
 
-$function  = $app->input->getCmd('function');
+$function  = $app->getInput()->getCmd('function');
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->document->getWebAssetManager();
diff --git a/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php b/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php
index a8a8eb897a3e1..7afb253fde759 100644
--- a/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php
+++ b/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php
@@ -157,7 +157,7 @@ protected function loadFormData()
             // Prime some default values.
             if ($this->getState('newsfeed.id') == 0) {
                 $app = Factory::getApplication();
-                $data->set('catid', $app->input->get('catid', $app->getUserState('com_newsfeeds.newsfeeds.filter.category_id'), 'int'));
+                $data->set('catid', $app->getInput()->get('catid', $app->getUserState('com_newsfeeds.newsfeeds.filter.category_id'), 'int'));
             }
         }
 
@@ -177,7 +177,7 @@ protected function loadFormData()
      */
     public function save($data)
     {
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         // Create new category, if needed.
         $createCategory = true;
diff --git a/administrator/components/com_newsfeeds/src/Model/NewsfeedsModel.php b/administrator/components/com_newsfeeds/src/Model/NewsfeedsModel.php
index 4a61b79dfde1e..b23e2d0424b1b 100644
--- a/administrator/components/com_newsfeeds/src/Model/NewsfeedsModel.php
+++ b/administrator/components/com_newsfeeds/src/Model/NewsfeedsModel.php
@@ -87,10 +87,10 @@ protected function populateState($ordering = 'a.name', $direction = 'asc')
     {
         $app = Factory::getApplication();
 
-        $forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');
+        $forcedLanguage = $app->getInput()->get('forcedLanguage', '', 'cmd');
 
         // Adjust the context to support modal layouts.
-        if ($layout = $app->input->get('layout')) {
+        if ($layout = $app->getInput()->get('layout')) {
             $this->context .= '.' . $layout;
         }
 
diff --git a/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php b/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
index 68651b6b924f5..ec3f49cba8f5e 100644
--- a/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
+++ b/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
@@ -78,7 +78,7 @@ public function display($tpl = null)
         }
 
         // If we are forcing a language in modal (used for associations).
-        if ($this->getLayout() === 'modal' && $forcedLanguage = Factory::getApplication()->input->get('forcedLanguage', '', 'cmd')) {
+        if ($this->getLayout() === 'modal' && $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'cmd')) {
             // Set the language field to the forcedLanguage and disable changing it.
             $this->form->setValue('language', null, $forcedLanguage);
             $this->form->setFieldAttribute('language', 'readonly', 'true');
@@ -103,7 +103,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $user       = $this->getCurrentUser();
         $isNew      = ($this->item->id == 0);
diff --git a/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php b/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php
index 106ed99b2c261..d044094c21645 100644
--- a/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php
+++ b/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php
@@ -105,7 +105,7 @@ public function display($tpl = null)
         } else {
             // In article associations modal we need to remove language filter if forcing a language.
             // We also need to change the category filter to show show categories with All or the forced language.
-            if ($forcedLanguage = Factory::getApplication()->input->get('forcedLanguage', '', 'CMD')) {
+            if ($forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD')) {
                 // If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
                 $languageXml = new \SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
                 $this->filterForm->setField($languageXml, 'filter', true);
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php b/administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php
index dd09e694e8368..540398cc66a51 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php
@@ -23,7 +23,7 @@
     ->useScript('form.validate');
 
 $app   = Factory::getApplication();
-$input = $app->input;
+$input = $app->getInput();
 
 $assoc = Associations::isEnabled();
 
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php
index c99d6372b0724..759802a1183d6 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php
@@ -22,7 +22,7 @@
 
 $app = Factory::getApplication();
 
-$function  = $app->input->getCmd('function', 'jSelectNewsfeed');
+$function  = $app->getInput()->getCmd('function', 'jSelectNewsfeed');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 $multilang = Multilanguage::isEnabled();
@@ -125,7 +125,7 @@
 
         <input type="hidden" name="task" value="">
         <input type="hidden" name="boxchecked" value="0">
-        <input type="hidden" name="forcedLanguage" value="<?php echo $app->input->get('forcedLanguage', '', 'CMD'); ?>">
+        <input type="hidden" name="forcedLanguage" value="<?php echo $app->getInput()->get('forcedLanguage', '', 'CMD'); ?>">
         <?php echo HTMLHelper::_('form.token'); ?>
 
     </form>
diff --git a/administrator/components/com_plugins/src/Model/PluginModel.php b/administrator/components/com_plugins/src/Model/PluginModel.php
index d5c4c8f5307ac..3fd934703318e 100644
--- a/administrator/components/com_plugins/src/Model/PluginModel.php
+++ b/administrator/components/com_plugins/src/Model/PluginModel.php
@@ -229,7 +229,7 @@ protected function populateState()
         $app = Factory::getApplication();
 
         // Load the User state.
-        $pk = $app->input->getInt('extension_id');
+        $pk = $app->getInput()->getInt('extension_id');
         $this->setState('plugin.id', $pk);
     }
 
diff --git a/administrator/components/com_plugins/src/View/Plugin/HtmlView.php b/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
index 5a922e7ba0488..35ef7e9b099fd 100644
--- a/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
+++ b/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
@@ -81,7 +81,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $canDo = ContentHelper::getActions('com_plugins');
 
diff --git a/administrator/components/com_plugins/tmpl/plugin/edit.php b/administrator/components/com_plugins/tmpl/plugin/edit.php
index c97f8d19a7afd..3e31d18dad34d 100644
--- a/administrator/components/com_plugins/tmpl/plugin/edit.php
+++ b/administrator/components/com_plugins/tmpl/plugin/edit.php
@@ -24,7 +24,7 @@
 $this->fieldsets = $this->form->getFieldsets('params');
 $this->useCoreUI = true;
 
-$input = Factory::getApplication()->input;
+$input = Factory::getApplication()->getInput();
 
 // In case of modal
 $isModal  = $input->get('layout') === 'modal';
diff --git a/administrator/components/com_postinstall/src/Model/MessagesModel.php b/administrator/components/com_postinstall/src/Model/MessagesModel.php
index 5441d47f79f0a..18dc0ee969ca6 100644
--- a/administrator/components/com_postinstall/src/Model/MessagesModel.php
+++ b/administrator/components/com_postinstall/src/Model/MessagesModel.php
@@ -48,7 +48,7 @@ protected function populateState()
     {
         parent::populateState();
 
-        $eid = (int) Factory::getApplication()->input->getInt('eid');
+        $eid = (int) Factory::getApplication()->getInput()->getInt('eid');
 
         if ($eid) {
             $this->setState('eid', $eid);
diff --git a/administrator/components/com_privacy/src/Model/ExportModel.php b/administrator/components/com_privacy/src/Model/ExportModel.php
index f4e3745cd043c..b22345dc830fb 100644
--- a/administrator/components/com_privacy/src/Model/ExportModel.php
+++ b/administrator/components/com_privacy/src/Model/ExportModel.php
@@ -305,7 +305,7 @@ public function logExportEmailed(RequestTable $request)
     protected function populateState()
     {
         // Get the pk of the record from the request.
-        $this->setState($this->getName() . '.request_id', Factory::getApplication()->input->getUint('id'));
+        $this->setState($this->getName() . '.request_id', Factory::getApplication()->getInput()->getUint('id'));
 
         // Load the parameters.
         $this->setState('params', ComponentHelper::getParams('com_privacy'));
diff --git a/administrator/components/com_privacy/src/Model/RemoveModel.php b/administrator/components/com_privacy/src/Model/RemoveModel.php
index 8add55baa5202..75eed0c787314 100644
--- a/administrator/components/com_privacy/src/Model/RemoveModel.php
+++ b/administrator/components/com_privacy/src/Model/RemoveModel.php
@@ -194,7 +194,7 @@ public function logRemoveBlocked(RequestTable $request, array $reasons)
     protected function populateState()
     {
         // Get the pk of the record from the request.
-        $this->setState($this->getName() . '.request_id', Factory::getApplication()->input->getUint('id'));
+        $this->setState($this->getName() . '.request_id', Factory::getApplication()->getInput()->getUint('id'));
 
         // Load the parameters.
         $this->setState('params', ComponentHelper::getParams('com_privacy'));
diff --git a/administrator/components/com_privacy/src/View/Request/HtmlView.php b/administrator/components/com_privacy/src/View/Request/HtmlView.php
index 89a5f8c3b764c..df46d3cf35107 100644
--- a/administrator/components/com_privacy/src/View/Request/HtmlView.php
+++ b/administrator/components/com_privacy/src/View/Request/HtmlView.php
@@ -120,7 +120,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         // Set the title and toolbar based on the layout
         if ($this->getLayout() === 'edit') {
diff --git a/administrator/components/com_redirect/src/View/Link/HtmlView.php b/administrator/components/com_redirect/src/View/Link/HtmlView.php
index 4d253993fb4d6..f3bd285b5b4d6 100644
--- a/administrator/components/com_redirect/src/View/Link/HtmlView.php
+++ b/administrator/components/com_redirect/src/View/Link/HtmlView.php
@@ -82,7 +82,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $isNew = ($this->item->id == 0);
         $canDo = ContentHelper::getActions('com_redirect');
diff --git a/administrator/components/com_tags/src/Model/TagModel.php b/administrator/components/com_tags/src/Model/TagModel.php
index 9424e68a86a9b..90375bfb7cea0 100644
--- a/administrator/components/com_tags/src/Model/TagModel.php
+++ b/administrator/components/com_tags/src/Model/TagModel.php
@@ -86,11 +86,11 @@ protected function populateState()
     {
         $app = Factory::getApplication();
 
-        $parentId = $app->input->getInt('parent_id');
+        $parentId = $app->getInput()->getInt('parent_id');
         $this->setState('tag.parent_id', $parentId);
 
         // Load the User state.
-        $pk = $app->input->getInt('id');
+        $pk = $app->getInput()->getInt('id');
         $this->setState($this->getName() . '.id', $pk);
 
         // Load the parameters.
@@ -154,7 +154,7 @@ public function getItem($pk = null)
      */
     public function getForm($data = array(), $loadData = true)
     {
-        $jinput = Factory::getApplication()->input;
+        $jinput = Factory::getApplication()->getInput();
 
         // Get the form.
         $form = $this->loadForm('com_tags.tag', 'tag', array('control' => 'jform', 'load_data' => $loadData));
@@ -213,7 +213,7 @@ public function save($data)
     {
         /** @var \Joomla\Component\Tags\Administrator\Table\TagTable $table */
         $table      = $this->getTable();
-        $input      = Factory::getApplication()->input;
+        $input      = Factory::getApplication()->getInput();
         $pk         = (!empty($data['id'])) ? $data['id'] : (int) $this->getState($this->getName() . '.id');
         $isNew      = true;
         $context    = $this->option . '.' . $this->name;
diff --git a/administrator/components/com_tags/src/View/Tag/HtmlView.php b/administrator/components/com_tags/src/View/Tag/HtmlView.php
index 55f925b2dae97..ab233fe8b9453 100644
--- a/administrator/components/com_tags/src/View/Tag/HtmlView.php
+++ b/administrator/components/com_tags/src/View/Tag/HtmlView.php
@@ -99,7 +99,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $user       = $this->getCurrentUser();
         $userId     = $user->get('id');
diff --git a/administrator/components/com_templates/src/Model/StyleModel.php b/administrator/components/com_templates/src/Model/StyleModel.php
index 59975c49b56ab..944bf746227c9 100644
--- a/administrator/components/com_templates/src/Model/StyleModel.php
+++ b/administrator/components/com_templates/src/Model/StyleModel.php
@@ -102,7 +102,7 @@ protected function populateState()
         $app = Factory::getApplication();
 
         // Load the User state.
-        $pk = $app->input->getInt('id');
+        $pk = $app->getInput()->getInt('id');
         $this->setState('style.id', $pk);
 
         // Load the parameters.
@@ -474,7 +474,7 @@ public function save($data)
             $isNew = false;
         }
 
-        if ($app->input->get('task') == 'save2copy') {
+        if ($app->getInput()->get('task') == 'save2copy') {
             $data['title']    = $this->generateNewTitle(null, null, $data['title']);
             $data['home']     = 0;
             $data['assigned'] = '';
diff --git a/administrator/components/com_templates/src/Model/TemplateModel.php b/administrator/components/com_templates/src/Model/TemplateModel.php
index e3cf6e3cd194d..89fd32676ee27 100644
--- a/administrator/components/com_templates/src/Model/TemplateModel.php
+++ b/administrator/components/com_templates/src/Model/TemplateModel.php
@@ -577,7 +577,7 @@ protected function populateState()
         $app = Factory::getApplication();
 
         // Load the User state.
-        $pk = $app->input->getInt('id');
+        $pk = $app->getInput()->getInt('id');
         $this->setState('extension.id', $pk);
 
         // Load the parameters.
@@ -874,7 +874,7 @@ public function &getSource()
         }
 
         if ($this->template) {
-            $input    = Factory::getApplication()->input;
+            $input    = Factory::getApplication()->getInput();
             $fileName = base64_decode($input->get('file'));
             $fileName = str_replace('//', '/', $fileName);
             $isMedia  = $input->getInt('isMedia', 0);
@@ -929,8 +929,8 @@ public function save($data)
         }
 
         $app      = Factory::getApplication();
-        $fileName = base64_decode($app->input->get('file'));
-        $isMedia  = $app->input->getInt('isMedia', 0);
+        $fileName = base64_decode($app->getInput()->get('file'));
+        $isMedia  = $app->getInput()->getInt('isMedia', 0);
         $fileName = $isMedia ? JPATH_ROOT . '/media/templates/' . ($this->template->client_id === 0 ? 'site' : 'administrator') . '/' . $this->template->element . $fileName  :
             JPATH_ROOT . '/' . ($this->template->client_id === 0 ? '' : 'administrator/') . 'templates/' . $this->template->element . $fileName;
 
@@ -1452,7 +1452,7 @@ public function getImage()
     {
         if ($this->getTemplate()) {
             $app      = Factory::getApplication();
-            $fileName = base64_decode($app->input->get('file'));
+            $fileName = base64_decode($app->getInput()->get('file'));
             $path     = $this->getBasePath();
 
             $uri = Uri::root(false) . ltrim(str_replace(JPATH_ROOT, '', $this->getBasePath()), '/');
@@ -1610,10 +1610,10 @@ public function getFont()
         if ($template = $this->getTemplate()) {
             $app          = Factory::getApplication();
             $client       = ApplicationHelper::getClientInfo($template->client_id);
-            $relPath      = base64_decode($app->input->get('file'));
+            $relPath      = base64_decode($app->getInput()->get('file'));
             $explodeArray = explode('/', $relPath);
             $fileName     = end($explodeArray);
-            $path         = $this->getBasePath() . base64_decode($app->input->get('file'));
+            $path         = $this->getBasePath() . base64_decode($app->getInput()->get('file'));
 
             if (stristr($client->path, 'administrator') == false) {
                 $folder = '/templates/';
@@ -1687,7 +1687,7 @@ public function getArchive()
     {
         if ($this->getTemplate()) {
             $app  = Factory::getApplication();
-            $path = $this->getBasePath() . base64_decode($app->input->get('file'));
+            $path = $this->getBasePath() . base64_decode($app->getInput()->get('file'));
 
             if (file_exists(Path::clean($path))) {
                 $files = array();
@@ -1831,7 +1831,7 @@ public function getMediaFiles()
     private function getBasePath()
     {
         $app      = Factory::getApplication();
-        $isMedia  = $app->input->getInt('isMedia', 0);
+        $isMedia  = $app->getInput()->getInt('isMedia', 0);
 
         return $isMedia ? JPATH_ROOT . '/media/templates/' . ($this->template->client_id === 0 ? 'site' : 'administrator') . '/' . $this->template->element :
             JPATH_ROOT . '/' . ($this->template->client_id === 0 ? '' : 'administrator/') . 'templates/' . $this->template->element;
diff --git a/administrator/components/com_templates/src/View/Style/HtmlView.php b/administrator/components/com_templates/src/View/Style/HtmlView.php
index 546a1a0db4f55..d2c06e616577d 100644
--- a/administrator/components/com_templates/src/View/Style/HtmlView.php
+++ b/administrator/components/com_templates/src/View/Style/HtmlView.php
@@ -94,7 +94,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $isNew = ($this->item->id == 0);
         $canDo = $this->canDo;
diff --git a/administrator/components/com_templates/src/View/Template/HtmlView.php b/administrator/components/com_templates/src/View/Template/HtmlView.php
index 4d1801aa11d17..ebe575d3b22c6 100644
--- a/administrator/components/com_templates/src/View/Template/HtmlView.php
+++ b/administrator/components/com_templates/src/View/Template/HtmlView.php
@@ -160,7 +160,7 @@ class HtmlView extends BaseHtmlView
     public function display($tpl = null)
     {
         $app               = Factory::getApplication();
-        $this->file        = $app->input->get('file', '');
+        $this->file        = $app->getInput()->get('file', '');
         $this->fileName    = InputFilter::getInstance()->clean(base64_decode($this->file), 'string');
         $explodeArray      = explode('.', $this->fileName);
         $ext               = end($explodeArray);
@@ -233,7 +233,7 @@ protected function addToolbar()
     {
         $app   = Factory::getApplication();
         $user  = $this->getCurrentUser();
-        $app->input->set('hidemainmenu', true);
+        $app->getInput()->set('hidemainmenu', true);
 
         // User is global SuperUser
         $isSuperUser = $user->authorise('core.admin');
diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index ed2108bc86aa3..ce86388fe82b0 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -24,7 +24,7 @@
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa    = $this->document->getWebAssetManager();
-$input = Factory::getApplication()->input;
+$input = Factory::getApplication()->getInput();
 
 // Enable assets
 $wa->useScript('form.validate')
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_delete_footer.php b/administrator/components/com_templates/tmpl/template/default_modal_delete_footer.php
index 9895aadd69b81..55c342babc144 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_delete_footer.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_delete_footer.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
-$input = Factory::getApplication()->input;
+$input = Factory::getApplication()->getInput();
 ?>
 <form method="post" action="">
     <input type="hidden" name="option" value="com_templates">
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_file_body.php b/administrator/components/com_templates/tmpl/template/default_modal_file_body.php
index 926cd1fec345d..a4724e3dc026e 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_file_body.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_file_body.php
@@ -16,7 +16,7 @@
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Utility\Utility;
 
-$input = Factory::getApplication()->input;
+$input = Factory::getApplication()->getInput();
 ?>
 <div id="#template-manager-file" class="container-fluid">
     <div class="mt-2 p-2">
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_folder_body.php b/administrator/components/com_templates/tmpl/template/default_modal_folder_body.php
index ecb3c878451e5..635d7cb66ecc8 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_folder_body.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_folder_body.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
-$input = Factory::getApplication()->input;
+$input = Factory::getApplication()->getInput();
 ?>
 <div id="#template-manager-folder" class="container-fluid">
     <div class="mt-2 p-2">
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_folder_footer.php b/administrator/components/com_templates/tmpl/template/default_modal_folder_footer.php
index 1fbf670f9b7b3..aa17d5903521b 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_folder_footer.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_folder_footer.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
-$input = Factory::getApplication()->input;
+$input = Factory::getApplication()->getInput();
 ?>
 <form id="deleteFolder" method="post" action="<?php echo Route::_('index.php?option=com_templates&task=template.deleteFolder&id=' . $input->getInt('id') . '&file=' . $this->file); ?>">
     <fieldset>
diff --git a/administrator/components/com_templates/tmpl/template/default_updated_files.php b/administrator/components/com_templates/tmpl/template/default_updated_files.php
index 54d5faab8d458..6b86e484a5265 100644
--- a/administrator/components/com_templates/tmpl/template/default_updated_files.php
+++ b/administrator/components/com_templates/tmpl/template/default_updated_files.php
@@ -17,7 +17,7 @@
 
 HTMLHelper::_('bootstrap.dropdown', '.dropdown-toggle');
 
-$input = Factory::getApplication()->input;
+$input = Factory::getApplication()->getInput();
 ?>
 
 <?php if (count($this->updatedList) === 0) : ?>
diff --git a/administrator/components/com_templates/tmpl/template/readonly.php b/administrator/components/com_templates/tmpl/template/readonly.php
index 0d9f62bcce178..b0fb791a23dee 100644
--- a/administrator/components/com_templates/tmpl/template/readonly.php
+++ b/administrator/components/com_templates/tmpl/template/readonly.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
-$input = Factory::getApplication()->input;
+$input = Factory::getApplication()->getInput();
 ?>
 <form action="<?php echo Route::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm">
     <?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', ['active' => 'description', 'recall' => true, 'breakpoint' => 768]); ?>
diff --git a/administrator/components/com_users/src/Controller/MethodController.php b/administrator/components/com_users/src/Controller/MethodController.php
index e2fae399d57b5..9c282b222691b 100644
--- a/administrator/components/com_users/src/Controller/MethodController.php
+++ b/administrator/components/com_users/src/Controller/MethodController.php
@@ -309,7 +309,7 @@ public function save($cachable = false, $urlparams = []): void
 
         // Ask the plugin to validate the input by calling onUserMultifactorSaveSetup
         $result = [];
-        $input  = $this->app->input;
+        $input  = $this->app->getInput();
 
         $event = new NotifyActionLog('onComUsersControllerMethodBeforeSave', [$id, $user]);
         $this->app->getDispatcher()->dispatch($event->getName(), $event);
diff --git a/administrator/components/com_users/src/Field/GroupparentField.php b/administrator/components/com_users/src/Field/GroupparentField.php
index b61a98b4ac528..08da0c853d026 100644
--- a/administrator/components/com_users/src/Field/GroupparentField.php
+++ b/administrator/components/com_users/src/Field/GroupparentField.php
@@ -67,7 +67,7 @@ private function cleanOptionsChildrenByFather($userGroupsOptions, $fatherId)
     protected function getOptions()
     {
         $options        = UserGroupsHelper::getInstance()->getAll();
-        $currentGroupId = (int) Factory::getApplication()->input->get('id', 0, 'int');
+        $currentGroupId = (int) Factory::getApplication()->getInput()->get('id', 0, 'int');
 
         // Prevent to set yourself as parent
         if ($currentGroupId) {
diff --git a/administrator/components/com_users/src/Helper/Mfa.php b/administrator/components/com_users/src/Helper/Mfa.php
index 42f231f1be930..ac31402866051 100644
--- a/administrator/components/com_users/src/Helper/Mfa.php
+++ b/administrator/components/com_users/src/Helper/Mfa.php
@@ -78,7 +78,7 @@ public static function getConfigurationInterface(User $user): ?string
         /** @var CMSApplication $app */
         $app = Factory::getApplication();
 
-        if (!$app->input->getCmd('option', '') === 'com_users') {
+        if (!$app->getInput()->getCmd('option', '') === 'com_users') {
             $app->getLanguage()->load('com_users');
             $app->getDocument()
                 ->getWebAssetManager()
diff --git a/administrator/components/com_users/src/Model/DebuggroupModel.php b/administrator/components/com_users/src/Model/DebuggroupModel.php
index 8076436cdd5e4..9a16b7c297d9e 100644
--- a/administrator/components/com_users/src/Model/DebuggroupModel.php
+++ b/administrator/components/com_users/src/Model/DebuggroupModel.php
@@ -113,7 +113,7 @@ protected function populateState($ordering = 'a.lft', $direction = 'asc')
         $app = Factory::getApplication();
 
         // Adjust the context to support modal layouts.
-        $layout = $app->input->get('layout', 'default');
+        $layout = $app->getInput()->get('layout', 'default');
 
         if ($layout) {
             $this->context .= '.' . $layout;
diff --git a/administrator/components/com_users/src/Model/DebuguserModel.php b/administrator/components/com_users/src/Model/DebuguserModel.php
index 22bb90b10b09a..a45736847004f 100644
--- a/administrator/components/com_users/src/Model/DebuguserModel.php
+++ b/administrator/components/com_users/src/Model/DebuguserModel.php
@@ -114,7 +114,7 @@ protected function populateState($ordering = 'a.lft', $direction = 'asc')
         $app = Factory::getApplication();
 
         // Adjust the context to support modal layouts.
-        $layout = $app->input->get('layout', 'default');
+        $layout = $app->getInput()->get('layout', 'default');
 
         if ($layout) {
             $this->context .= '.' . $layout;
diff --git a/administrator/components/com_users/src/Model/GroupModel.php b/administrator/components/com_users/src/Model/GroupModel.php
index 7fc202547525b..8dad13b09e571 100644
--- a/administrator/components/com_users/src/Model/GroupModel.php
+++ b/administrator/components/com_users/src/Model/GroupModel.php
@@ -218,7 +218,7 @@ public function save($data)
             }
         }
 
-        if (Factory::getApplication()->input->get('task') == 'save2copy') {
+        if (Factory::getApplication()->getInput()->get('task') == 'save2copy') {
             $data['title'] = $this->generateGroupTitle($data['parent_id'], $data['title']);
         }
 
diff --git a/administrator/components/com_users/src/Model/MailModel.php b/administrator/components/com_users/src/Model/MailModel.php
index 8905503f5b5cd..996e643c37e6c 100644
--- a/administrator/components/com_users/src/Model/MailModel.php
+++ b/administrator/components/com_users/src/Model/MailModel.php
@@ -101,7 +101,7 @@ protected function preprocessForm(Form $form, $data, $group = 'user')
     public function send()
     {
         $app      = Factory::getApplication();
-        $data     = $app->input->post->get('jform', array(), 'array');
+        $data     = $app->getInput()->post->get('jform', array(), 'array');
         $user     = $this->getCurrentUser();
         $access   = new Access();
         $db       = $this->getDatabase();
diff --git a/administrator/components/com_users/src/Model/NoteModel.php b/administrator/components/com_users/src/Model/NoteModel.php
index 977ef9fa6543c..d1f21a7e65b0a 100644
--- a/administrator/components/com_users/src/Model/NoteModel.php
+++ b/administrator/components/com_users/src/Model/NoteModel.php
@@ -105,10 +105,10 @@ protected function loadFormData()
 
             // Prime some default values.
             if ($this->getState('note.id') == 0) {
-                $data->set('catid', $app->input->get('catid', $app->getUserState('com_users.notes.filter.category_id'), 'int'));
+                $data->set('catid', $app->getInput()->get('catid', $app->getUserState('com_users.notes.filter.category_id'), 'int'));
             }
 
-            $userId = $app->input->get('u_id', 0, 'int');
+            $userId = $app->getInput()->get('u_id', 0, 'int');
 
             if ($userId != 0) {
                 $data->user_id = $userId;
@@ -134,7 +134,7 @@ protected function populateState()
     {
         parent::populateState();
 
-        $userId = Factory::getApplication()->input->get('u_id', 0, 'int');
+        $userId = Factory::getApplication()->getInput()->get('u_id', 0, 'int');
         $this->setState('note.user_id', $userId);
     }
 }
diff --git a/administrator/components/com_users/src/Model/NotesModel.php b/administrator/components/com_users/src/Model/NotesModel.php
index c4d7c7d51f584..d162d17c5f1a7 100644
--- a/administrator/components/com_users/src/Model/NotesModel.php
+++ b/administrator/components/com_users/src/Model/NotesModel.php
@@ -222,7 +222,7 @@ public function getUser()
     protected function populateState($ordering = 'a.review_time', $direction = 'desc')
     {
         // Adjust the context to support modal layouts.
-        if ($layout = Factory::getApplication()->input->get('layout')) {
+        if ($layout = Factory::getApplication()->getInput()->get('layout')) {
             $this->context .= '.' . $layout;
         }
 
diff --git a/administrator/components/com_users/src/Model/UsersModel.php b/administrator/components/com_users/src/Model/UsersModel.php
index e8036388ecffb..b8fd8c3e8c577 100644
--- a/administrator/components/com_users/src/Model/UsersModel.php
+++ b/administrator/components/com_users/src/Model/UsersModel.php
@@ -92,11 +92,11 @@ protected function populateState($ordering = 'a.name', $direction = 'asc')
         $app = Factory::getApplication();
 
         // Adjust the context to support modal layouts.
-        if ($layout = $app->input->get('layout', 'default', 'cmd')) {
+        if ($layout = $app->getInput()->get('layout', 'default', 'cmd')) {
             $this->context .= '.' . $layout;
         }
 
-        $groups = json_decode(base64_decode($app->input->get('groups', '', 'BASE64')));
+        $groups = json_decode(base64_decode($app->getInput()->get('groups', '', 'BASE64')));
 
         if (isset($groups)) {
             $groups = ArrayHelper::toInteger($groups);
@@ -104,7 +104,7 @@ protected function populateState($ordering = 'a.name', $direction = 'asc')
 
         $this->setState('filter.groups', $groups);
 
-        $excluded = json_decode(base64_decode($app->input->get('excluded', '', 'BASE64')));
+        $excluded = json_decode(base64_decode($app->getInput()->get('excluded', '', 'BASE64')));
 
         if (isset($excluded)) {
             $excluded = ArrayHelper::toInteger($excluded);
diff --git a/administrator/components/com_users/src/View/Group/HtmlView.php b/administrator/components/com_users/src/View/Group/HtmlView.php
index b35a797cd1e68..e120eccb7b5c8 100644
--- a/administrator/components/com_users/src/View/Group/HtmlView.php
+++ b/administrator/components/com_users/src/View/Group/HtmlView.php
@@ -84,7 +84,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $isNew = ($this->item->id == 0);
         $canDo = ContentHelper::getActions('com_users');
diff --git a/administrator/components/com_users/src/View/Level/HtmlView.php b/administrator/components/com_users/src/View/Level/HtmlView.php
index 9dfec7c3d97fb..662fb02e3930f 100644
--- a/administrator/components/com_users/src/View/Level/HtmlView.php
+++ b/administrator/components/com_users/src/View/Level/HtmlView.php
@@ -84,7 +84,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $isNew = ($this->item->id == 0);
         $canDo = ContentHelper::getActions('com_users');
diff --git a/administrator/components/com_users/src/View/Mail/HtmlView.php b/administrator/components/com_users/src/View/Mail/HtmlView.php
index 2b4d2f9ad2e9e..aab66e9470043 100644
--- a/administrator/components/com_users/src/View/Mail/HtmlView.php
+++ b/administrator/components/com_users/src/View/Mail/HtmlView.php
@@ -67,7 +67,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         ToolbarHelper::title(Text::_('COM_USERS_MASS_MAIL'), 'users massmail');
         ToolbarHelper::custom('mail.send', 'envelope', '', 'COM_USERS_TOOLBAR_MAIL_SEND_MAIL', false);
diff --git a/administrator/components/com_users/src/View/Note/HtmlView.php b/administrator/components/com_users/src/View/Note/HtmlView.php
index 04971ed5a1a10..d58ff8657ebe9 100644
--- a/administrator/components/com_users/src/View/Note/HtmlView.php
+++ b/administrator/components/com_users/src/View/Note/HtmlView.php
@@ -91,7 +91,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
         $input->set('hidemainmenu', 1);
 
         $user       = $this->getCurrentUser();
diff --git a/administrator/components/com_users/src/View/SiteTemplateTrait.php b/administrator/components/com_users/src/View/SiteTemplateTrait.php
index 68fbf23fe233b..49ab6f35ec86f 100644
--- a/administrator/components/com_users/src/View/SiteTemplateTrait.php
+++ b/administrator/components/com_users/src/View/SiteTemplateTrait.php
@@ -43,13 +43,13 @@ private function setSiteTemplateStyle(): void
             return;
         }
 
-        $itemId = $app->input->get('Itemid');
+        $itemId = $app->getInput()->get('Itemid');
 
         if (!empty($itemId)) {
             return;
         }
 
-        $app->input->set('templateStyle', $templateStyle);
+        $app->getInput()->set('templateStyle', $templateStyle);
 
         try {
             $refApp      = new ReflectionObject($app);
diff --git a/administrator/components/com_users/src/View/User/HtmlView.php b/administrator/components/com_users/src/View/User/HtmlView.php
index b8415f8557061..ea559e1f30fb2 100644
--- a/administrator/components/com_users/src/View/User/HtmlView.php
+++ b/administrator/components/com_users/src/View/User/HtmlView.php
@@ -144,7 +144,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $user      = Factory::getApplication()->getIdentity();
         $canDo     = ContentHelper::getActions('com_users');
diff --git a/administrator/components/com_users/tmpl/user/edit.php b/administrator/components/com_users/tmpl/user/edit.php
index 826d04cd985c0..259cfb3c08cdb 100644
--- a/administrator/components/com_users/tmpl/user/edit.php
+++ b/administrator/components/com_users/tmpl/user/edit.php
@@ -23,7 +23,7 @@
 $wa->useScript('keepalive')
     ->useScript('form.validate');
 
-$input = Factory::getApplication()->input;
+$input = Factory::getApplication()->getInput();
 
 // Get the form fieldsets.
 $fieldsets = $this->form->getFieldsets();
diff --git a/administrator/components/com_users/tmpl/users/modal.php b/administrator/components/com_users/tmpl/users/modal.php
index 787156ab8c865..ba56493744581 100644
--- a/administrator/components/com_users/tmpl/users/modal.php
+++ b/administrator/components/com_users/tmpl/users/modal.php
@@ -20,7 +20,7 @@
 $wa = $this->document->getWebAssetManager();
 $wa->useScript('multiselect');
 
-$input           = Factory::getApplication()->input;
+$input           = Factory::getApplication()->getInput();
 $field           = $input->getCmd('field');
 $listOrder       = $this->escape($this->state->get('list.ordering'));
 $listDirn        = $this->escape($this->state->get('list.direction'));
diff --git a/administrator/components/com_workflow/src/Dispatcher/Dispatcher.php b/administrator/components/com_workflow/src/Dispatcher/Dispatcher.php
index cdc140e583f4a..5633363111185 100644
--- a/administrator/components/com_workflow/src/Dispatcher/Dispatcher.php
+++ b/administrator/components/com_workflow/src/Dispatcher/Dispatcher.php
@@ -31,7 +31,7 @@ class Dispatcher extends ComponentDispatcher
      */
     protected function checkAccess()
     {
-        $extension = $this->getApplication()->input->getCmd('extension');
+        $extension = $this->getApplication()->getInput()->getCmd('extension');
 
         $parts = explode('.', $extension);
 
diff --git a/administrator/components/com_workflow/src/Model/StageModel.php b/administrator/components/com_workflow/src/Model/StageModel.php
index b0cbdf8855adb..1d0afab824d0a 100644
--- a/administrator/components/com_workflow/src/Model/StageModel.php
+++ b/administrator/components/com_workflow/src/Model/StageModel.php
@@ -87,7 +87,7 @@ public function save($data)
         $context    = $this->option . '.' . $this->name;
         $app        = Factory::getApplication();
         $user       = $app->getIdentity();
-        $input      = $app->input;
+        $input      = $app->getInput();
         $workflowID = $app->getUserStateFromRequest($context . '.filter.workflow_id', 'workflow_id', 0, 'int');
 
         if (empty($data['workflow_id'])) {
@@ -359,7 +359,7 @@ public function publish(&$pks, $value = 1)
      */
     protected function preprocessForm(Form $form, $data, $group = 'content')
     {
-        $extension = Factory::getApplication()->input->get('extension');
+        $extension = Factory::getApplication()->getInput()->get('extension');
 
         $parts = explode('.', $extension);
 
diff --git a/administrator/components/com_workflow/src/Model/TransitionModel.php b/administrator/components/com_workflow/src/Model/TransitionModel.php
index 391505022037d..99a341d8fa693 100644
--- a/administrator/components/com_workflow/src/Model/TransitionModel.php
+++ b/administrator/components/com_workflow/src/Model/TransitionModel.php
@@ -136,7 +136,7 @@ public function save($data)
         $context    = $this->option . '.' . $this->name;
         $app        = Factory::getApplication();
         $user       = $app->getIdentity();
-        $input      = $app->input;
+        $input      = $app->getInput();
 
         $workflowID = $app->getUserStateFromRequest($context . '.filter.workflow_id', 'workflow_id', 0, 'int');
 
@@ -319,7 +319,7 @@ public function getWorkflow()
      */
     protected function preprocessForm(Form $form, $data, $group = 'content')
     {
-        $extension = Factory::getApplication()->input->get('extension');
+        $extension = Factory::getApplication()->getInput()->get('extension');
 
         $parts = explode('.', $extension);
 
diff --git a/administrator/components/com_workflow/src/Model/WorkflowModel.php b/administrator/components/com_workflow/src/Model/WorkflowModel.php
index 18f3c25d9726f..879084ecf254b 100644
--- a/administrator/components/com_workflow/src/Model/WorkflowModel.php
+++ b/administrator/components/com_workflow/src/Model/WorkflowModel.php
@@ -86,7 +86,7 @@ public function save($data)
         $table             = $this->getTable();
         $app               = Factory::getApplication();
         $user              = $app->getIdentity();
-        $input             = $app->input;
+        $input             = $app->getInput();
         $context           = $this->option . '.' . $this->name;
         $extension         = $app->getUserStateFromRequest($context . '.filter.extension', 'extension', null, 'cmd');
         $data['extension'] = !empty($data['extension']) ? $data['extension'] : $extension;
@@ -226,7 +226,7 @@ protected function loadFormData()
      */
     protected function preprocessForm(Form $form, $data, $group = 'content')
     {
-        $extension = Factory::getApplication()->input->get('extension');
+        $extension = Factory::getApplication()->getInput()->get('extension');
 
         $parts = explode('.', $extension);
 
diff --git a/administrator/components/com_workflow/src/View/Stage/HtmlView.php b/administrator/components/com_workflow/src/View/Stage/HtmlView.php
index 9670a37a24260..ac8b7630b96ba 100644
--- a/administrator/components/com_workflow/src/View/Stage/HtmlView.php
+++ b/administrator/components/com_workflow/src/View/Stage/HtmlView.php
@@ -116,7 +116,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $user       = $this->getCurrentUser();
         $userId     = $user->id;
diff --git a/administrator/components/com_workflow/src/View/Stages/HtmlView.php b/administrator/components/com_workflow/src/View/Stages/HtmlView.php
index 114b409fd5fc1..49f04e104e6a1 100644
--- a/administrator/components/com_workflow/src/View/Stages/HtmlView.php
+++ b/administrator/components/com_workflow/src/View/Stages/HtmlView.php
@@ -147,7 +147,7 @@ public function display($tpl = null)
         }
 
         if (!empty($this->stages)) {
-            $extension = Factory::getApplication()->input->getCmd('extension');
+            $extension = Factory::getApplication()->getInput()->getCmd('extension');
             $workflow  = new Workflow($extension);
         }
 
diff --git a/administrator/components/com_workflow/src/View/Transition/HtmlView.php b/administrator/components/com_workflow/src/View/Transition/HtmlView.php
index ce230196ee1ed..7e04c236b5854 100644
--- a/administrator/components/com_workflow/src/View/Transition/HtmlView.php
+++ b/administrator/components/com_workflow/src/View/Transition/HtmlView.php
@@ -105,7 +105,7 @@ class HtmlView extends BaseHtmlView
     public function display($tpl = null)
     {
         $this->app = Factory::getApplication();
-        $this->input = $this->app->input;
+        $this->input = $this->app->getInput();
 
         // Get the Data
         $this->state      = $this->get('State');
@@ -146,7 +146,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $user       = $this->getCurrentUser();
         $userId     = $user->id;
diff --git a/administrator/components/com_workflow/src/View/Workflow/HtmlView.php b/administrator/components/com_workflow/src/View/Workflow/HtmlView.php
index 05a6581dedd53..07cd04279aad9 100644
--- a/administrator/components/com_workflow/src/View/Workflow/HtmlView.php
+++ b/administrator/components/com_workflow/src/View/Workflow/HtmlView.php
@@ -121,7 +121,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $user       = $this->getCurrentUser();
         $userId     = $user->id;
diff --git a/administrator/components/com_workflow/tmpl/stage/edit.php b/administrator/components/com_workflow/tmpl/stage/edit.php
index 24a89fecbb458..ac0b645f52a85 100644
--- a/administrator/components/com_workflow/tmpl/stage/edit.php
+++ b/administrator/components/com_workflow/tmpl/stage/edit.php
@@ -23,7 +23,7 @@
 
 $app   = Factory::getApplication();
 $user  = $app->getIdentity();
-$input = $app->input;
+$input = $app->getInput();
 
 // In case of modal
 $isModal  = $input->get('layout') === 'modal';
diff --git a/administrator/components/com_workflow/tmpl/workflow/edit.php b/administrator/components/com_workflow/tmpl/workflow/edit.php
index 055056043752a..6088266b53388 100644
--- a/administrator/components/com_workflow/tmpl/workflow/edit.php
+++ b/administrator/components/com_workflow/tmpl/workflow/edit.php
@@ -23,7 +23,7 @@
 
 $app = Factory::getApplication();
 $user = $app->getIdentity();
-$input = $app->input;
+$input = $app->getInput();
 
 // In case of modal
 $isModal  = $input->get('layout') === 'modal';
diff --git a/administrator/modules/mod_menu/mod_menu.php b/administrator/modules/mod_menu/mod_menu.php
index 484dd7e24687e..5d6b65a3dc389 100644
--- a/administrator/modules/mod_menu/mod_menu.php
+++ b/administrator/modules/mod_menu/mod_menu.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\Module\Menu\Administrator\Menu\CssMenu;
 
-$enabled = !$app->input->getBool('hidemainmenu');
+$enabled = !$app->getInput()->getBool('hidemainmenu');
 
 $menu = new CssMenu($app);
 $root = $menu->load($params, $enabled);
diff --git a/administrator/modules/mod_messages/tmpl/default.php b/administrator/modules/mod_messages/tmpl/default.php
index 77e03cef5e79e..82efc9d74a329 100644
--- a/administrator/modules/mod_messages/tmpl/default.php
+++ b/administrator/modules/mod_messages/tmpl/default.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
-$hideLinks = $app->input->getBool('hidemainmenu');
+$hideLinks = $app->getInput()->getBool('hidemainmenu');
 
 if ($hideLinks || $countUnread < 1) {
     return;
diff --git a/administrator/modules/mod_multilangstatus/tmpl/default.php b/administrator/modules/mod_multilangstatus/tmpl/default.php
index 599aaf8498b98..80b19df8c112c 100644
--- a/administrator/modules/mod_multilangstatus/tmpl/default.php
+++ b/administrator/modules/mod_multilangstatus/tmpl/default.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
-$hideLinks = $app->input->getBool('hidemainmenu');
+$hideLinks = $app->getInput()->getBool('hidemainmenu');
 
 if (!$multilanguageEnabled || $hideLinks) {
     return;
diff --git a/administrator/modules/mod_post_installation_messages/tmpl/default.php b/administrator/modules/mod_post_installation_messages/tmpl/default.php
index f2b9cef548449..dceffecce04be 100644
--- a/administrator/modules/mod_post_installation_messages/tmpl/default.php
+++ b/administrator/modules/mod_post_installation_messages/tmpl/default.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
-$hideLinks = $app->input->getBool('hidemainmenu');
+$hideLinks = $app->getInput()->getBool('hidemainmenu');
 
 if ($hideLinks || $messagesCount < 1) {
     return;
diff --git a/administrator/modules/mod_user/tmpl/default.php b/administrator/modules/mod_user/tmpl/default.php
index 5125ce4a29505..61ff2bf5ca61d 100644
--- a/administrator/modules/mod_user/tmpl/default.php
+++ b/administrator/modules/mod_user/tmpl/default.php
@@ -16,7 +16,7 @@
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 
-$hideLinks = $app->input->getBool('hidemainmenu');
+$hideLinks = $app->getInput()->getBool('hidemainmenu');
 
 if ($hideLinks) {
     return;
diff --git a/administrator/templates/atum/error_full.php b/administrator/templates/atum/error_full.php
index d2c2381f4e8eb..b256f203ef59c 100644
--- a/administrator/templates/atum/error_full.php
+++ b/administrator/templates/atum/error_full.php
@@ -19,7 +19,7 @@
 /** @var \Joomla\CMS\Document\ErrorDocument $this */
 
 $app   = Factory::getApplication();
-$input = $app->input;
+$input = $app->getInput();
 $wa    = $this->getWebAssetManager();
 
 // Detecting Active Variables
@@ -28,7 +28,7 @@
 $layout     = $input->get('layout', 'default');
 $task       = $input->get('task', 'display');
 $cpanel     = $option === 'com_cpanel';
-$hiddenMenu = $app->input->get('hidemainmenu');
+$hiddenMenu = $app->getInput()->get('hidemainmenu');
 
 // Browsers support SVG favicons
 $this->addHeadLink(HTMLHelper::_('image', 'joomla-favicon.svg', '', [], true, 1), 'icon', 'rel', ['type' => 'image/svg+xml']);
diff --git a/administrator/templates/atum/error_login.php b/administrator/templates/atum/error_login.php
index a760530c90f49..0d30ab3a73db8 100644
--- a/administrator/templates/atum/error_login.php
+++ b/administrator/templates/atum/error_login.php
@@ -19,7 +19,7 @@
 /** @var \Joomla\CMS\Document\ErrorDocument $this */
 
 $app   = Factory::getApplication();
-$input = $app->input;
+$input = $app->getInput();
 $wa    = $this->getWebAssetManager();
 
 // Detecting Active Variables
diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php
index d1fff8eda9adf..26f9602095cbf 100644
--- a/administrator/templates/atum/index.php
+++ b/administrator/templates/atum/index.php
@@ -20,7 +20,7 @@
 /** @var \Joomla\CMS\Document\HtmlDocument $this */
 
 $app   = Factory::getApplication();
-$input = $app->input;
+$input = $app->getInput();
 $wa    = $this->getWebAssetManager();
 
 // Detecting Active Variables
@@ -29,7 +29,7 @@
 $layout       = $input->get('layout', 'default');
 $task         = $input->get('task', 'display');
 $cpanel       = $option === 'com_cpanel' || ($option === 'com_admin' && $view === 'help');
-$hiddenMenu   = $app->input->get('hidemainmenu');
+$hiddenMenu   = $app->getInput()->get('hidemainmenu');
 $sidebarState = $input->cookie->get('atumSidebarState', '');
 
 // Getting user accessibility settings
diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php
index 3f043caabfc2a..06835b7913043 100644
--- a/administrator/templates/atum/login.php
+++ b/administrator/templates/atum/login.php
@@ -19,7 +19,7 @@
 /** @var \Joomla\CMS\Document\HtmlDocument $this */
 
 $app   = Factory::getApplication();
-$input = $app->input;
+$input = $app->getInput();
 $wa    = $this->getWebAssetManager();
 
 // Detecting Active Variables
diff --git a/api/components/com_languages/src/Controller/StringsController.php b/api/components/com_languages/src/Controller/StringsController.php
index 33db2be67bfdb..3956f33c4d44b 100644
--- a/api/components/com_languages/src/Controller/StringsController.php
+++ b/api/components/com_languages/src/Controller/StringsController.php
@@ -63,9 +63,9 @@ public function search()
         }
 
         $app = Factory::getApplication();
-        $app->input->set('searchstring', $data['searchstring']);
-        $app->input->set('searchtype', $data['searchtype']);
-        $app->input->set('more', 0);
+        $app->getInput()->set('searchstring', $data['searchstring']);
+        $app->getInput()->set('searchtype', $data['searchtype']);
+        $app->getInput()->set('more', 0);
 
         $viewType   = $this->app->getDocument()->getType();
         $viewName   = $this->input->get('view', $this->default_view);
diff --git a/components/com_ajax/ajax.php b/components/com_ajax/ajax.php
index 20674d4be208e..148afd064bec4 100644
--- a/components/com_ajax/ajax.php
+++ b/components/com_ajax/ajax.php
@@ -34,7 +34,7 @@
 $app->setHeader('X-Robots-Tag', 'noindex, nofollow');
 
 // JInput object
-$input = $app->input;
+$input = $app->getInput();
 
 // Requested format passed via URL
 $format = strtolower($input->getWord('format', ''));
diff --git a/components/com_config/src/Controller/ConfigController.php b/components/com_config/src/Controller/ConfigController.php
index 042173e4c0464..69a7ffbcbe801 100644
--- a/components/com_config/src/Controller/ConfigController.php
+++ b/components/com_config/src/Controller/ConfigController.php
@@ -83,7 +83,7 @@ public function save()
         $model = $this->getModel();
 
         $form  = $model->getForm();
-        $data  = $this->app->input->post->get('jform', array(), 'array');
+        $data  = $this->app->getInput()->post->get('jform', array(), 'array');
 
         // Validate the posted data.
         $return = $model->validate($form, $data);
diff --git a/components/com_config/src/Controller/TemplatesController.php b/components/com_config/src/Controller/TemplatesController.php
index 87d19e8c871b8..1b2ebd7b513e1 100644
--- a/components/com_config/src/Controller/TemplatesController.php
+++ b/components/com_config/src/Controller/TemplatesController.php
@@ -86,7 +86,7 @@ public function save()
 
         // Access backend com_templates
         $controllerClass = $app->bootComponent('com_templates')
-            ->getMVCFactory()->createController('Style', 'Administrator', [], $app, $app->input);
+            ->getMVCFactory()->createController('Style', 'Administrator', [], $app, $app->getInput());
 
         // Get a document object
         $document = $app->getDocument();
diff --git a/components/com_config/src/Model/ModulesModel.php b/components/com_config/src/Model/ModulesModel.php
index 8146ea4327c63..1742421cc21a7 100644
--- a/components/com_config/src/Model/ModulesModel.php
+++ b/components/com_config/src/Model/ModulesModel.php
@@ -41,7 +41,7 @@ protected function populateState()
         $app = Factory::getApplication();
 
         // Load the User state.
-        $pk = $app->input->getInt('id');
+        $pk = $app->getInput()->getInt('id');
 
         $this->setState('module.id', $pk);
     }
diff --git a/components/com_config/src/View/Modules/HtmlView.php b/components/com_config/src/View/Modules/HtmlView.php
index 615e5d73ffaf7..54e196ef26924 100644
--- a/components/com_config/src/View/Modules/HtmlView.php
+++ b/components/com_config/src/View/Modules/HtmlView.php
@@ -60,7 +60,7 @@ public function display($tpl = null)
         $lang->load('com_modules', JPATH_ADMINISTRATOR, $lang->getTag());
 
         // @todo Move and clean up
-        $module = (new \Joomla\Component\Modules\Administrator\Model\ModuleModel())->getItem(Factory::getApplication()->input->getInt('id'));
+        $module = (new \Joomla\Component\Modules\Administrator\Model\ModuleModel())->getItem(Factory::getApplication()->getInput()->getInt('id'));
 
         $moduleData = $module->getProperties();
         unset($moduleData['xml']);
diff --git a/components/com_config/src/View/Templates/HtmlView.php b/components/com_config/src/View/Templates/HtmlView.php
index 7d222560c68da..63765279b0c9a 100644
--- a/components/com_config/src/View/Templates/HtmlView.php
+++ b/components/com_config/src/View/Templates/HtmlView.php
@@ -86,7 +86,7 @@ public function display($tpl = null)
 
         $app   = Factory::getApplication();
 
-        $app->input->set('id', $app->getTemplate(true)->id);
+        $app->getInput()->set('id', $app->getTemplate(true)->id);
 
         /** @var MVCFactory $factory */
         $factory = $app->bootComponent('com_templates')->getMVCFactory();
diff --git a/components/com_config/tmpl/modules/default.php b/components/com_config/tmpl/modules/default.php
index 6fc48f5163366..147b6a9482455 100644
--- a/components/com_config/tmpl/modules/default.php
+++ b/components/com_config/tmpl/modules/default.php
@@ -165,7 +165,7 @@
                 </div>
 
                 <input type="hidden" name="id" value="<?php echo $this->item['id']; ?>">
-                <input type="hidden" name="return" value="<?php echo Factory::getApplication()->input->get('return', null, 'base64'); ?>">
+                <input type="hidden" name="return" value="<?php echo Factory::getApplication()->getInput()->get('return', null, 'base64'); ?>">
                 <input type="hidden" name="task" value="">
                 <?php echo HTMLHelper::_('form.token'); ?>
             </div>
diff --git a/components/com_contact/src/Controller/DisplayController.php b/components/com_contact/src/Controller/DisplayController.php
index 171a4d8e44e64..d02f76ca5e928 100644
--- a/components/com_contact/src/Controller/DisplayController.php
+++ b/components/com_contact/src/Controller/DisplayController.php
@@ -39,7 +39,7 @@ class DisplayController extends BaseController
     public function __construct($config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null)
     {
         // Contact frontpage Editor contacts proxying.
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         if ($input->get('view') === 'contacts' && $input->get('layout') === 'modal') {
             $config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
diff --git a/components/com_contact/src/Helper/AssociationHelper.php b/components/com_contact/src/Helper/AssociationHelper.php
index 3b7a8361c9b22..9bac888769850 100644
--- a/components/com_contact/src/Helper/AssociationHelper.php
+++ b/components/com_contact/src/Helper/AssociationHelper.php
@@ -37,7 +37,7 @@ abstract class AssociationHelper extends CategoryAssociationHelper
      */
     public static function getAssociations($id = 0, $view = null)
     {
-        $jinput = Factory::getApplication()->input;
+        $jinput = Factory::getApplication()->getInput();
         $view   = $view ?? $jinput->get('view');
         $id     = empty($id) ? $jinput->getInt('id') : $id;
 
diff --git a/components/com_contact/src/Model/CategoriesModel.php b/components/com_contact/src/Model/CategoriesModel.php
index c90405f1c93f9..ea34739719eaa 100644
--- a/components/com_contact/src/Model/CategoriesModel.php
+++ b/components/com_contact/src/Model/CategoriesModel.php
@@ -73,7 +73,7 @@ protected function populateState($ordering = null, $direction = null)
         $this->setState('filter.extension', $this->_extension);
 
         // Get the parent id if defined.
-        $parentId = $app->input->getInt('id');
+        $parentId = $app->getInput()->getInt('id');
         $this->setState('filter.parentId', $parentId);
 
         $params = $app->getParams();
diff --git a/components/com_contact/src/Model/CategoryModel.php b/components/com_contact/src/Model/CategoryModel.php
index b6ad90dcce832..b7072c997d955 100644
--- a/components/com_contact/src/Model/CategoryModel.php
+++ b/components/com_contact/src/Model/CategoryModel.php
@@ -267,7 +267,7 @@ protected function populateState($ordering = null, $direction = null)
         $this->setState('params', $params);
 
         // List state information
-        $format = $app->input->getWord('format');
+        $format = $app->getInput()->getWord('format');
 
         if ($format === 'feed') {
             $limit = $app->get('feed_limit');
@@ -282,15 +282,15 @@ protected function populateState($ordering = null, $direction = null)
 
         $this->setState('list.limit', $limit);
 
-        $limitstart = $app->input->get('limitstart', 0, 'uint');
+        $limitstart = $app->getInput()->get('limitstart', 0, 'uint');
         $this->setState('list.start', $limitstart);
 
         // Optional filter text
-        $itemid = $app->input->get('Itemid', 0, 'int');
+        $itemid = $app->getInput()->get('Itemid', 0, 'int');
         $search = $app->getUserStateFromRequest('com_contact.category.list.' . $itemid . '.filter-search', 'filter-search', '', 'string');
         $this->setState('list.filter', $search);
 
-        $orderCol = $app->input->get('filter_order', $params->get('initial_sort', 'ordering'));
+        $orderCol = $app->getInput()->get('filter_order', $params->get('initial_sort', 'ordering'));
 
         if (!in_array($orderCol, $this->filter_fields)) {
             $orderCol = 'ordering';
@@ -298,7 +298,7 @@ protected function populateState($ordering = null, $direction = null)
 
         $this->setState('list.ordering', $orderCol);
 
-        $listOrder = $app->input->get('filter_order_Dir', 'ASC');
+        $listOrder = $app->getInput()->get('filter_order_Dir', 'ASC');
 
         if (!in_array(strtoupper($listOrder), array('ASC', 'DESC', ''))) {
             $listOrder = 'ASC';
@@ -306,7 +306,7 @@ protected function populateState($ordering = null, $direction = null)
 
         $this->setState('list.direction', $listOrder);
 
-        $id = $app->input->get('id', 0, 'int');
+        $id = $app->getInput()->get('id', 0, 'int');
         $this->setState('category.id', $id);
 
         $user = $this->getCurrentUser();
@@ -454,7 +454,7 @@ private function getSlugColumn($query, $id, $alias)
      */
     public function hit($pk = 0)
     {
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
         $hitcount = $input->getInt('hitcount', 1);
 
         if ($hitcount) {
diff --git a/components/com_contact/src/Model/ContactModel.php b/components/com_contact/src/Model/ContactModel.php
index 703565b5515f5..f6097d3d83785 100644
--- a/components/com_contact/src/Model/ContactModel.php
+++ b/components/com_contact/src/Model/ContactModel.php
@@ -76,9 +76,9 @@ protected function populateState()
         if (Factory::getApplication()->isClient('api')) {
             // @todo: remove this
             $app->loadLanguage();
-            $this->setState('contact.id', Factory::getApplication()->input->post->getInt('id'));
+            $this->setState('contact.id', Factory::getApplication()->getInput()->post->getInt('id'));
         } else {
-            $this->setState('contact.id', $app->input->getInt('id'));
+            $this->setState('contact.id', $app->getInput()->getInt('id'));
         }
 
         $this->setState('params', $app->getParams());
@@ -423,7 +423,7 @@ private function getSlugColumn($query, $id, $alias)
      */
     public function hit($pk = 0)
     {
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
         $hitcount = $input->getInt('hitcount', 1);
 
         if ($hitcount) {
diff --git a/components/com_contact/src/Model/FeaturedModel.php b/components/com_contact/src/Model/FeaturedModel.php
index 9e34eebca64cf..2c7838fed5e6b 100644
--- a/components/com_contact/src/Model/FeaturedModel.php
+++ b/components/com_contact/src/Model/FeaturedModel.php
@@ -167,13 +167,13 @@ protected function populateState($ordering = null, $direction = null)
         $limit = $app->getUserStateFromRequest('global.list.limit', 'limit', $app->get('list_limit'), 'uint');
         $this->setState('list.limit', $limit);
 
-        $limitstart = $app->input->get('limitstart', 0, 'uint');
+        $limitstart = $app->getInput()->get('limitstart', 0, 'uint');
         $this->setState('list.start', $limitstart);
 
         // Optional filter text
-        $this->setState('list.filter', $app->input->getString('filter-search'));
+        $this->setState('list.filter', $app->getInput()->getString('filter-search'));
 
-        $orderCol = $app->input->get('filter_order', 'ordering');
+        $orderCol = $app->getInput()->get('filter_order', 'ordering');
 
         if (!in_array($orderCol, $this->filter_fields)) {
             $orderCol = 'ordering';
@@ -181,7 +181,7 @@ protected function populateState($ordering = null, $direction = null)
 
         $this->setState('list.ordering', $orderCol);
 
-        $listOrder = $app->input->get('filter_order_Dir', 'ASC');
+        $listOrder = $app->getInput()->get('filter_order_Dir', 'ASC');
 
         if (!in_array(strtoupper($listOrder), array('ASC', 'DESC', ''))) {
             $listOrder = 'ASC';
diff --git a/components/com_contact/src/Model/FormModel.php b/components/com_contact/src/Model/FormModel.php
index 6dd0319a47fb2..ea655ebb4a5cb 100644
--- a/components/com_contact/src/Model/FormModel.php
+++ b/components/com_contact/src/Model/FormModel.php
@@ -181,19 +181,19 @@ protected function populateState()
         $app = Factory::getApplication();
 
         // Load state from the request.
-        $pk = $app->input->getInt('id');
+        $pk = $app->getInput()->getInt('id');
         $this->setState('contact.id', $pk);
 
-        $this->setState('contact.catid', $app->input->getInt('catid'));
+        $this->setState('contact.catid', $app->getInput()->getInt('catid'));
 
-        $return = $app->input->get('return', '', 'base64');
+        $return = $app->getInput()->get('return', '', 'base64');
         $this->setState('return_page', base64_decode($return));
 
         // Load the parameters.
         $params = $app->getParams();
         $this->setState('params', $params);
 
-        $this->setState('layout', $app->input->getString('layout'));
+        $this->setState('layout', $app->getInput()->getString('layout'));
     }
 
     /**
diff --git a/components/com_content/src/Controller/ArticleController.php b/components/com_content/src/Controller/ArticleController.php
index 019dec7c9bee1..4b8d5501b98f8 100644
--- a/components/com_content/src/Controller/ArticleController.php
+++ b/components/com_content/src/Controller/ArticleController.php
@@ -347,7 +347,7 @@ public function save($key = null, $urlVar = 'a_id')
         }
 
         $app       = $this->app;
-        $articleId = $app->input->getInt('a_id');
+        $articleId = $app->getInput()->getInt('a_id');
 
         // Load the parameters.
         $params   = $app->getParams();
diff --git a/components/com_content/src/Controller/DisplayController.php b/components/com_content/src/Controller/DisplayController.php
index 03f5ca3a96538..47916389e5465 100644
--- a/components/com_content/src/Controller/DisplayController.php
+++ b/components/com_content/src/Controller/DisplayController.php
@@ -39,7 +39,7 @@ class DisplayController extends \Joomla\CMS\MVC\Controller\BaseController
      */
     public function __construct($config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null)
     {
-        $this->input = Factory::getApplication()->input;
+        $this->input = Factory::getApplication()->getInput();
 
         // Article frontpage Editor pagebreak proxying:
         if ($this->input->get('view') === 'article' && $this->input->get('layout') === 'pagebreak') {
diff --git a/components/com_content/src/Helper/AssociationHelper.php b/components/com_content/src/Helper/AssociationHelper.php
index c81050e35ec9e..d6c6a1fb9d135 100644
--- a/components/com_content/src/Helper/AssociationHelper.php
+++ b/components/com_content/src/Helper/AssociationHelper.php
@@ -40,7 +40,7 @@ abstract class AssociationHelper extends CategoryAssociationHelper
      */
     public static function getAssociations($id = 0, $view = null, $layout = null)
     {
-        $jinput    = Factory::getApplication()->input;
+        $jinput    = Factory::getApplication()->getInput();
         $view      = $view ?? $jinput->get('view');
         $component = $jinput->getCmd('option');
         $id        = empty($id) ? $jinput->getInt('id') : $id;
diff --git a/components/com_content/src/Model/ArchiveModel.php b/components/com_content/src/Model/ArchiveModel.php
index c6935eb8685d3..56557b69f1df5 100644
--- a/components/com_content/src/Model/ArchiveModel.php
+++ b/components/com_content/src/Model/ArchiveModel.php
@@ -58,14 +58,14 @@ protected function populateState($ordering = null, $direction = null)
         $this->setState('filter.published', ContentComponent::CONDITION_ARCHIVED);
 
         // Filter on month, year
-        $this->setState('filter.month', $app->input->getInt('month'));
-        $this->setState('filter.year', $app->input->getInt('year'));
+        $this->setState('filter.month', $app->getInput()->getInt('month'));
+        $this->setState('filter.year', $app->getInput()->getInt('year'));
 
         // Optional filter text
-        $this->setState('list.filter', $app->input->getString('filter-search'));
+        $this->setState('list.filter', $app->getInput()->getString('filter-search'));
 
         // Get list limit
-        $itemid = $app->input->get('Itemid', 0, 'int');
+        $itemid = $app->getInput()->get('Itemid', 0, 'int');
         $limit = $app->getUserStateFromRequest('com_content.archive.list' . $itemid . '.limit', 'limit', $params->get('display_num', 20), 'uint');
         $this->setState('list.limit', $limit);
 
@@ -91,7 +91,7 @@ protected function getListQuery()
     {
         $params           = $this->state->params;
         $app              = Factory::getApplication();
-        $catids           = $app->input->get('catid', array(), 'array');
+        $catids           = $app->getInput()->get('catid', array(), 'array');
         $catids           = array_values(array_diff($catids, array('')));
 
         $articleOrderDate = $params->get('order_date');
@@ -145,8 +145,8 @@ public function getData()
             $params = $app->getParams();
 
             // Get the pagination request variables
-            $limit      = $app->input->get('limit', $params->get('display_num', 20), 'uint');
-            $limitstart = $app->input->get('limitstart', 0, 'uint');
+            $limit      = $app->getInput()->get('limit', $params->get('display_num', 20), 'uint');
+            $limitstart = $app->getInput()->get('limitstart', 0, 'uint');
 
             $query = $this->_buildQuery();
 
diff --git a/components/com_content/src/Model/ArticleModel.php b/components/com_content/src/Model/ArticleModel.php
index e8350b64665e1..cd156dd6d5ad0 100644
--- a/components/com_content/src/Model/ArticleModel.php
+++ b/components/com_content/src/Model/ArticleModel.php
@@ -52,10 +52,10 @@ protected function populateState()
         $app = Factory::getApplication();
 
         // Load state from the request.
-        $pk = $app->input->getInt('id');
+        $pk = $app->getInput()->getInt('id');
         $this->setState('article.id', $pk);
 
-        $offset = $app->input->getUint('limitstart');
+        $offset = $app->getInput()->getUint('limitstart');
         $this->setState('list.offset', $offset);
 
         // Load the parameters.
@@ -288,7 +288,7 @@ public function getItem($pk = null)
      */
     public function hit($pk = 0)
     {
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
         $hitcount = $input->getInt('hitcount', 1);
 
         if ($hitcount) {
diff --git a/components/com_content/src/Model/ArticlesModel.php b/components/com_content/src/Model/ArticlesModel.php
index 085f72d86c35b..b50fc6d1f73e5 100644
--- a/components/com_content/src/Model/ArticlesModel.php
+++ b/components/com_content/src/Model/ArticlesModel.php
@@ -93,16 +93,16 @@ protected function populateState($ordering = 'ordering', $direction = 'ASC')
         $app = Factory::getApplication();
 
         // List state information
-        $value = $app->input->get('limit', $app->get('list_limit', 0), 'uint');
+        $value = $app->getInput()->get('limit', $app->get('list_limit', 0), 'uint');
         $this->setState('list.limit', $value);
 
-        $value = $app->input->get('limitstart', 0, 'uint');
+        $value = $app->getInput()->get('limitstart', 0, 'uint');
         $this->setState('list.start', $value);
 
-        $value = $app->input->get('filter_tag', 0, 'uint');
+        $value = $app->getInput()->get('filter_tag', 0, 'uint');
         $this->setState('filter.tag', $value);
 
-        $orderCol = $app->input->get('filter_order', 'a.ordering');
+        $orderCol = $app->getInput()->get('filter_order', 'a.ordering');
 
         if (!in_array($orderCol, $this->filter_fields)) {
             $orderCol = 'a.ordering';
@@ -110,7 +110,7 @@ protected function populateState($ordering = 'ordering', $direction = 'ASC')
 
         $this->setState('list.ordering', $orderCol);
 
-        $listOrder = $app->input->get('filter_order_Dir', 'ASC');
+        $listOrder = $app->getInput()->get('filter_order_Dir', 'ASC');
 
         if (!in_array(strtoupper($listOrder), array('ASC', 'DESC', ''))) {
             $listOrder = 'ASC';
@@ -137,7 +137,7 @@ protected function populateState($ordering = 'ordering', $direction = 'ASC')
             $this->setState('filter.access', false);
         }
 
-        $this->setState('layout', $app->input->getString('layout'));
+        $this->setState('layout', $app->getInput()->getString('layout'));
     }
 
     /**
@@ -643,7 +643,7 @@ public function getItems()
         $userId = $user->get('id');
         $guest = $user->get('guest');
         $groups = $user->getAuthorisedViewLevels();
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         // Get the global params
         $globalParams = ComponentHelper::getParams('com_content', true);
diff --git a/components/com_content/src/Model/CategoriesModel.php b/components/com_content/src/Model/CategoriesModel.php
index 52e9f0e3db680..cedf04a19b1ee 100644
--- a/components/com_content/src/Model/CategoriesModel.php
+++ b/components/com_content/src/Model/CategoriesModel.php
@@ -66,7 +66,7 @@ protected function populateState($ordering = null, $direction = null)
         $this->setState('filter.extension', $this->_extension);
 
         // Get the parent id if defined.
-        $parentId = $app->input->getInt('id');
+        $parentId = $app->getInput()->getInt('id');
         $this->setState('filter.parentId', $parentId);
 
         $params = $app->getParams();
diff --git a/components/com_content/src/Model/CategoryModel.php b/components/com_content/src/Model/CategoryModel.php
index ddd003834ea5f..f1235e3a9b864 100644
--- a/components/com_content/src/Model/CategoryModel.php
+++ b/components/com_content/src/Model/CategoryModel.php
@@ -138,7 +138,7 @@ protected function populateState($ordering = null, $direction = null)
     {
         $app = Factory::getApplication();
 
-        $pk  = $app->input->getInt('id');
+        $pk  = $app->getInput()->getInt('id');
         $this->setState('category.id', $pk);
 
         // Load the parameters. Merge Global and Menu Item params into new object
@@ -167,7 +167,7 @@ protected function populateState($ordering = null, $direction = null)
             $this->setState('filter.access', false);
         }
 
-        $itemid = $app->input->get('id', 0, 'int') . ':' . $app->input->get('Itemid', 0, 'int');
+        $itemid = $app->getInput()->get('id', 0, 'int') . ':' . $app->getInput()->get('Itemid', 0, 'int');
 
         $value = $this->getUserStateFromRequest('com_content.category.filter.' . $itemid . '.tag', 'filter_tag', 0, 'int', false);
         $this->setState('filter.tag', $value);
@@ -193,10 +193,10 @@ protected function populateState($ordering = null, $direction = null)
 
         $this->setState('list.direction', $listOrder);
 
-        $this->setState('list.start', $app->input->get('limitstart', 0, 'uint'));
+        $this->setState('list.start', $app->getInput()->get('limitstart', 0, 'uint'));
 
         // Set limit for query. If list, use parameter. If blog, add blog parameters for limit.
-        if (($app->input->get('layout') === 'blog') || $params->get('layout_type') === 'blog') {
+        if (($app->getInput()->get('layout') === 'blog') || $params->get('layout_type') === 'blog') {
             $limit = $params->get('num_leading_articles') + $params->get('num_intro_articles') + $params->get('num_links');
             $this->setState('list.links', $params->get('num_links'));
         } else {
@@ -215,7 +215,7 @@ protected function populateState($ordering = null, $direction = null)
 
         $this->setState('filter.language', Multilanguage::isEnabled());
 
-        $this->setState('layout', $app->input->getString('layout'));
+        $this->setState('layout', $app->getInput()->getString('layout'));
 
         // Set the featured articles state
         $this->setState('filter.featured', $params->get('show_featured'));
@@ -281,7 +281,7 @@ protected function _buildContentOrderBy()
         $app       = Factory::getApplication();
         $db        = $this->getDatabase();
         $params    = $this->state->params;
-        $itemid    = $app->input->get('id', 0, 'int') . ':' . $app->input->get('Itemid', 0, 'int');
+        $itemid    = $app->getInput()->get('id', 0, 'int') . ':' . $app->getInput()->get('Itemid', 0, 'int');
         $orderCol  = $app->getUserStateFromRequest('com_content.category.list.' . $itemid . '.filter_order', 'filter_order', '', 'string');
         $orderDirn = $app->getUserStateFromRequest('com_content.category.list.' . $itemid . '.filter_order_Dir', 'filter_order_Dir', '', 'cmd');
         $orderby   = ' ';
@@ -460,7 +460,7 @@ public function &getChildren()
      */
     public function hit($pk = 0)
     {
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
         $hitcount = $input->getInt('hitcount', 1);
 
         if ($hitcount) {
diff --git a/components/com_content/src/Model/FeaturedModel.php b/components/com_content/src/Model/FeaturedModel.php
index e187638eaa5a2..ceb5cc710092e 100644
--- a/components/com_content/src/Model/FeaturedModel.php
+++ b/components/com_content/src/Model/FeaturedModel.php
@@ -51,7 +51,7 @@ protected function populateState($ordering = null, $direction = null)
         parent::populateState($ordering, $direction);
 
         $app   = Factory::getApplication();
-        $input = $app->input;
+        $input = $app->getInput();
         $user  = $app->getIdentity();
 
         // List state information
diff --git a/components/com_content/src/Model/FormModel.php b/components/com_content/src/Model/FormModel.php
index 8cd372ad2a246..e0783afc17bf8 100644
--- a/components/com_content/src/Model/FormModel.php
+++ b/components/com_content/src/Model/FormModel.php
@@ -63,15 +63,15 @@ protected function populateState()
         }
 
         // Load state from the request.
-        $pk = $app->input->getInt('a_id');
+        $pk = $app->getInput()->getInt('a_id');
         $this->setState('article.id', $pk);
 
-        $this->setState('article.catid', $app->input->getInt('catid', $catId));
+        $this->setState('article.catid', $app->getInput()->getInt('catid', $catId));
 
-        $return = $app->input->get('return', '', 'base64');
+        $return = $app->getInput()->get('return', '', 'base64');
         $this->setState('return_page', base64_decode($return));
 
-        $this->setState('layout', $app->input->getString('layout'));
+        $this->setState('layout', $app->getInput()->getString('layout'));
     }
 
     /**
@@ -219,7 +219,7 @@ public function getForm($data = [], $loadData = true)
         $user = $app->getIdentity();
 
         // On edit article, we get ID of article from article.id state, but on save, we use data from input
-        $id = (int) $this->getState('article.id', $app->input->getInt('a_id'));
+        $id = (int) $this->getState('article.id', $app->getInput()->getInt('a_id'));
 
         // Existing record. We can't edit the category in frontend if not edit.state.
         if ($id > 0 && !$user->authorise('core.edit.state', 'com_content.article.' . $id)) {
diff --git a/components/com_content/src/View/Article/HtmlView.php b/components/com_content/src/View/Article/HtmlView.php
index 2678f38988603..0f7c64ba9bb17 100644
--- a/components/com_content/src/View/Article/HtmlView.php
+++ b/components/com_content/src/View/Article/HtmlView.php
@@ -108,7 +108,7 @@ public function display($tpl = null)
         $user = $this->getCurrentUser();
 
         $this->item  = $this->get('Item');
-        $this->print = $app->input->getBool('print', false);
+        $this->print = $app->getInput()->getBool('print', false);
         $this->state = $this->get('State');
         $this->user  = $user;
 
diff --git a/components/com_content/src/View/Featured/FeedView.php b/components/com_content/src/View/Featured/FeedView.php
index 8e8eeeb6d09b0..e8f4a4d192191 100644
--- a/components/com_content/src/View/Featured/FeedView.php
+++ b/components/com_content/src/View/Featured/FeedView.php
@@ -48,7 +48,7 @@ public function display($tpl = null)
         $this->document->link = Route::_('index.php?option=com_content&view=featured');
 
         // Get some data from the model
-        $app->input->set('limit', $app->get('feed_limit'));
+        $app->getInput()->set('limit', $app->get('feed_limit'));
         $categories = Categories::getInstance('Content');
         $rows       = $this->get('Items');
 
diff --git a/components/com_finder/src/Controller/DisplayController.php b/components/com_finder/src/Controller/DisplayController.php
index f71cfb0354f16..c20920f422cd7 100644
--- a/components/com_finder/src/Controller/DisplayController.php
+++ b/components/com_finder/src/Controller/DisplayController.php
@@ -37,7 +37,7 @@ class DisplayController extends BaseController
      */
     public function display($cachable = false, $urlparams = array())
     {
-        $input = $this->app->input;
+        $input = $this->app->getInput();
         $cachable = true;
 
         // Load plugin language files.
diff --git a/components/com_finder/src/Controller/SuggestionsController.php b/components/com_finder/src/Controller/SuggestionsController.php
index 2342fb3e326da..d2e11ce24dd58 100644
--- a/components/com_finder/src/Controller/SuggestionsController.php
+++ b/components/com_finder/src/Controller/SuggestionsController.php
@@ -59,7 +59,7 @@ public function opensearchsuggest()
         $app = $this->app;
         $app->mimeType = 'application/json';
         $result = array();
-        $result[] = $app->input->request->get('q', '', 'string');
+        $result[] = $app->getInput()->request->get('q', '', 'string');
 
         $result[] = $this->getSuggestions();
 
diff --git a/components/com_finder/src/Model/SearchModel.php b/components/com_finder/src/Model/SearchModel.php
index 2feb06b7a5981..a3c32958b8ccf 100644
--- a/components/com_finder/src/Model/SearchModel.php
+++ b/components/com_finder/src/Model/SearchModel.php
@@ -350,7 +350,7 @@ protected function populateState($ordering = null, $direction = null)
     {
         // Get the configuration options.
         $app      = Factory::getApplication();
-        $input    = $app->input;
+        $input    = $app->getInput();
         $params   = $app->getParams();
         $user     = $this->getCurrentUser();
         $language = Factory::getLanguage();
diff --git a/components/com_finder/src/Model/SuggestionsModel.php b/components/com_finder/src/Model/SuggestionsModel.php
index e60fd79f07a43..55926171c2a95 100644
--- a/components/com_finder/src/Model/SuggestionsModel.php
+++ b/components/com_finder/src/Model/SuggestionsModel.php
@@ -152,7 +152,7 @@ protected function populateState($ordering = null, $direction = null)
     {
         // Get the configuration options.
         $app = Factory::getApplication();
-        $input = $app->input;
+        $input = $app->getInput();
         $params = ComponentHelper::getParams('com_finder');
         $user = $this->getCurrentUser();
 
diff --git a/components/com_finder/src/View/Search/FeedView.php b/components/com_finder/src/View/Search/FeedView.php
index dd437da25501c..e5befce1696a7 100644
--- a/components/com_finder/src/View/Search/FeedView.php
+++ b/components/com_finder/src/View/Search/FeedView.php
@@ -42,7 +42,7 @@ public function display($tpl = null)
         $app = Factory::getApplication();
 
         // Adjust the list limit to the feed limit.
-        $app->input->set('limit', $app->get('feed_limit'));
+        $app->getInput()->set('limit', $app->get('feed_limit'));
 
         // Get view data.
         $state = $this->get('State');
diff --git a/components/com_modules/src/Controller/DisplayController.php b/components/com_modules/src/Controller/DisplayController.php
index d8018850c06bd..358bc14b42722 100644
--- a/components/com_modules/src/Controller/DisplayController.php
+++ b/components/com_modules/src/Controller/DisplayController.php
@@ -39,7 +39,7 @@ class DisplayController extends BaseController
      */
     public function __construct($config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null)
     {
-        $this->input = Factory::getApplication()->input;
+        $this->input = Factory::getApplication()->getInput();
 
         // Modules frontpage Editor Module proxying.
         if ($this->input->get('view') === 'modules' && $this->input->get('layout') === 'modal') {
diff --git a/components/com_newsfeeds/src/Helper/AssociationHelper.php b/components/com_newsfeeds/src/Helper/AssociationHelper.php
index 3be17675fb751..c01cfd641aaf4 100644
--- a/components/com_newsfeeds/src/Helper/AssociationHelper.php
+++ b/components/com_newsfeeds/src/Helper/AssociationHelper.php
@@ -37,7 +37,7 @@ abstract class AssociationHelper extends CategoryAssociationHelper
      */
     public static function getAssociations($id = 0, $view = null)
     {
-        $jinput = Factory::getApplication()->input;
+        $jinput = Factory::getApplication()->getInput();
         $view   = $view ?? $jinput->get('view');
         $id     = empty($id) ? $jinput->getInt('id') : $id;
 
diff --git a/components/com_newsfeeds/src/Model/CategoriesModel.php b/components/com_newsfeeds/src/Model/CategoriesModel.php
index 06a3fb393e9d4..306270f5a5a95 100644
--- a/components/com_newsfeeds/src/Model/CategoriesModel.php
+++ b/components/com_newsfeeds/src/Model/CategoriesModel.php
@@ -75,7 +75,7 @@ protected function populateState($ordering = null, $direction = null)
         $this->setState('filter.extension', $this->_extension);
 
         // Get the parent id if defined.
-        $parentId = $app->input->getInt('id');
+        $parentId = $app->getInput()->getInt('id');
         $this->setState('filter.parentId', $parentId);
 
         $params = $app->getParams();
diff --git a/components/com_newsfeeds/src/Model/CategoryModel.php b/components/com_newsfeeds/src/Model/CategoryModel.php
index 8a4142ea123dd..d7586f8621cee 100644
--- a/components/com_newsfeeds/src/Model/CategoryModel.php
+++ b/components/com_newsfeeds/src/Model/CategoryModel.php
@@ -251,13 +251,13 @@ protected function populateState($ordering = null, $direction = null)
         $limit = $app->getUserStateFromRequest('global.list.limit', 'limit', $app->get('list_limit'), 'uint');
         $this->setState('list.limit', $limit);
 
-        $limitstart = $app->input->get('limitstart', 0, 'uint');
+        $limitstart = $app->getInput()->get('limitstart', 0, 'uint');
         $this->setState('list.start', $limitstart);
 
         // Optional filter text
-        $this->setState('list.filter', $app->input->getString('filter-search'));
+        $this->setState('list.filter', $app->getInput()->getString('filter-search'));
 
-        $orderCol = $app->input->get('filter_order', 'ordering');
+        $orderCol = $app->getInput()->get('filter_order', 'ordering');
 
         if (!in_array($orderCol, $this->filter_fields)) {
             $orderCol = 'ordering';
@@ -265,7 +265,7 @@ protected function populateState($ordering = null, $direction = null)
 
         $this->setState('list.ordering', $orderCol);
 
-        $listOrder = $app->input->get('filter_order_Dir', 'ASC');
+        $listOrder = $app->getInput()->get('filter_order_Dir', 'ASC');
 
         if (!in_array(strtoupper($listOrder), array('ASC', 'DESC', ''))) {
             $listOrder = 'ASC';
@@ -273,7 +273,7 @@ protected function populateState($ordering = null, $direction = null)
 
         $this->setState('list.direction', $listOrder);
 
-        $id = $app->input->get('id', 0, 'int');
+        $id = $app->getInput()->get('id', 0, 'int');
         $this->setState('category.id', $id);
 
         $user = $this->getCurrentUser();
@@ -398,7 +398,7 @@ public function &getChildren()
      */
     public function hit($pk = 0)
     {
-        $input    = Factory::getApplication()->input;
+        $input    = Factory::getApplication()->getInput();
         $hitcount = $input->getInt('hitcount', 1);
 
         if ($hitcount) {
diff --git a/components/com_newsfeeds/src/Model/NewsfeedModel.php b/components/com_newsfeeds/src/Model/NewsfeedModel.php
index 42a36140b1833..c2e3faf0e82cc 100644
--- a/components/com_newsfeeds/src/Model/NewsfeedModel.php
+++ b/components/com_newsfeeds/src/Model/NewsfeedModel.php
@@ -49,10 +49,10 @@ protected function populateState()
         $app = Factory::getApplication();
 
         // Load state from the request.
-        $pk = $app->input->getInt('id');
+        $pk = $app->getInput()->getInt('id');
         $this->setState('newsfeed.id', $pk);
 
-        $offset = $app->input->get('limitstart', 0, 'uint');
+        $offset = $app->getInput()->get('limitstart', 0, 'uint');
         $this->setState('list.offset', $offset);
 
         // Load the parameters.
@@ -210,7 +210,7 @@ public function &getItem($pk = null)
      */
     public function hit($pk = 0)
     {
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
         $hitcount = $input->getInt('hitcount', 1);
 
         if ($hitcount) {
diff --git a/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php b/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
index c1d76049642f7..517eae61f3875 100644
--- a/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
+++ b/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
@@ -99,7 +99,7 @@ public function display($tpl = null)
         $user = $this->getCurrentUser();
 
         // Get view related request variables.
-        $print = $app->input->getBool('print');
+        $print = $app->getInput()->getBool('print');
 
         // Get model data.
         $state = $this->get('State');
diff --git a/components/com_privacy/src/Model/ConfirmModel.php b/components/com_privacy/src/Model/ConfirmModel.php
index 0f4b7a4081675..efcf87aca9ee9 100644
--- a/components/com_privacy/src/Model/ConfirmModel.php
+++ b/components/com_privacy/src/Model/ConfirmModel.php
@@ -175,7 +175,7 @@ public function getForm($data = [], $loadData = true)
             return false;
         }
 
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         if ($input->getMethod() === 'GET') {
             $form->setValue('confirm_token', '', $input->get->getAlnum('confirm_token'));
diff --git a/components/com_privacy/src/Model/RemindModel.php b/components/com_privacy/src/Model/RemindModel.php
index 7ed5881c77b3f..2db9a39f260e2 100644
--- a/components/com_privacy/src/Model/RemindModel.php
+++ b/components/com_privacy/src/Model/RemindModel.php
@@ -145,7 +145,7 @@ public function getForm($data = [], $loadData = true)
             return false;
         }
 
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         if ($input->getMethod() === 'GET') {
             $form->setValue('remind_token', '', $input->get->getAlnum('remind_token'));
diff --git a/components/com_tags/src/Model/TagModel.php b/components/com_tags/src/Model/TagModel.php
index e5b974ea27c1e..f2d55067cec12 100644
--- a/components/com_tags/src/Model/TagModel.php
+++ b/components/com_tags/src/Model/TagModel.php
@@ -184,7 +184,7 @@ protected function populateState($ordering = 'c.core_title', $direction = 'ASC')
         $this->setState('params', $params);
 
         // Load state from the request.
-        $ids = (array) $app->input->get('id', array(), 'string');
+        $ids = (array) $app->getInput()->get('id', array(), 'string');
 
         if (count($ids) == 1) {
             $ids = explode(',', $ids[0]);
@@ -200,7 +200,7 @@ protected function populateState($ordering = 'c.core_title', $direction = 'ASC')
         $this->setState('tag.id', $pkString);
 
         // Get the selected list of types from the request. If none are specified all are used.
-        $typesr = $app->input->get('types', array(), 'array');
+        $typesr = $app->getInput()->get('types', array(), 'array');
 
         if ($typesr) {
             // Implode is needed because the array can contain a string with a coma separated list of ids
@@ -213,11 +213,11 @@ protected function populateState($ordering = 'c.core_title', $direction = 'ASC')
             $this->setState('tag.typesr', $typesr);
         }
 
-        $language = $app->input->getString('tag_list_language_filter');
+        $language = $app->getInput()->getString('tag_list_language_filter');
         $this->setState('tag.language', $language);
 
         // List state information
-        $format = $app->input->getWord('format');
+        $format = $app->getInput()->getWord('format');
 
         if ($format === 'feed') {
             $limit = $app->get('feed_limit');
@@ -228,10 +228,10 @@ protected function populateState($ordering = 'c.core_title', $direction = 'ASC')
 
         $this->setState('list.limit', $limit);
 
-        $offset = $app->input->get('limitstart', 0, 'uint');
+        $offset = $app->getInput()->get('limitstart', 0, 'uint');
         $this->setState('list.start', $offset);
 
-        $itemid = $pkString . ':' . $app->input->get('Itemid', 0, 'int');
+        $itemid = $pkString . ':' . $app->getInput()->get('Itemid', 0, 'int');
         $orderCol = $app->getUserStateFromRequest('com_tags.tag.list.' . $itemid . '.filter_order', 'filter_order', '', 'string');
         $orderCol = !$orderCol ? $this->state->params->get('tag_list_orderby', 'c.core_title') : $orderCol;
 
@@ -326,7 +326,7 @@ public function getItem($pk = null)
      */
     public function hit($pk = 0)
     {
-        $input    = Factory::getApplication()->input;
+        $input    = Factory::getApplication()->getInput();
         $hitcount = $input->getInt('hitcount', 1);
 
         if ($hitcount) {
diff --git a/components/com_tags/src/Model/TagsModel.php b/components/com_tags/src/Model/TagsModel.php
index d95c90f4cc6da..978a20c06ca69 100644
--- a/components/com_tags/src/Model/TagsModel.php
+++ b/components/com_tags/src/Model/TagsModel.php
@@ -52,13 +52,13 @@ protected function populateState($ordering = null, $direction = null)
         $app = Factory::getApplication();
 
         // Load state from the request.
-        $pid = $app->input->getInt('parent_id');
+        $pid = $app->getInput()->getInt('parent_id');
         $this->setState('tag.parent_id', $pid);
 
-        $language = $app->input->getString('tag_list_language_filter');
+        $language = $app->getInput()->getString('tag_list_language_filter');
         $this->setState('tag.language', $language);
 
-        $offset = $app->input->get('limitstart', 0, 'uint');
+        $offset = $app->getInput()->get('limitstart', 0, 'uint');
         $this->setState('list.offset', $offset);
         $app = Factory::getApplication();
 
@@ -77,7 +77,7 @@ protected function populateState($ordering = null, $direction = null)
         }
 
         // Optional filter text
-        $itemid = $pid . ':' . $app->input->getInt('Itemid', 0);
+        $itemid = $pid . ':' . $app->getInput()->getInt('Itemid', 0);
         $filterSearch = $app->getUserStateFromRequest('com_tags.tags.list.' . $itemid . '.filter_search', 'filter-search', '', 'string');
         $this->setState('list.filter', $filterSearch);
     }
@@ -132,7 +132,7 @@ protected function getListQuery()
         }
 
         // List state information
-        $format = $app->input->getWord('format');
+        $format = $app->getInput()->getWord('format');
 
         if ($format === 'feed') {
             $limit = $app->get('feed_limit');
@@ -146,7 +146,7 @@ protected function getListQuery()
 
         $this->setState('list.limit', $limit);
 
-        $offset = $app->input->get('limitstart', 0, 'uint');
+        $offset = $app->getInput()->get('limitstart', 0, 'uint');
         $this->setState('list.start', $offset);
 
         // Optionally filter on entered value
diff --git a/components/com_tags/src/View/Tag/FeedView.php b/components/com_tags/src/View/Tag/FeedView.php
index 14be73a636b9a..e34ec78e37a1a 100644
--- a/components/com_tags/src/View/Tag/FeedView.php
+++ b/components/com_tags/src/View/Tag/FeedView.php
@@ -37,7 +37,7 @@ class FeedView extends BaseHtmlView
     public function display($tpl = null)
     {
         $app    = Factory::getApplication();
-        $ids    = (array) $app->input->get('id', array(), 'int');
+        $ids    = (array) $app->getInput()->get('id', array(), 'int');
         $i      = 0;
         $tagIds = '';
 
@@ -56,7 +56,7 @@ public function display($tpl = null)
 
         $this->document->link = Route::_('index.php?option=com_tags&view=tag&' . $tagIds);
 
-        $app->input->set('limit', $app->get('feed_limit'));
+        $app->getInput()->set('limit', $app->get('feed_limit'));
         $siteEmail = $app->get('mailfrom');
         $fromName  = $app->get('fromname');
         $feedEmail = $app->get('feed_email', 'none');
diff --git a/components/com_tags/src/View/Tags/FeedView.php b/components/com_tags/src/View/Tags/FeedView.php
index b6460ee44255b..b379de3f42129 100644
--- a/components/com_tags/src/View/Tags/FeedView.php
+++ b/components/com_tags/src/View/Tags/FeedView.php
@@ -38,7 +38,7 @@ public function display($tpl = null)
         $app                  = Factory::getApplication();
         $this->document->link = Route::_('index.php?option=com_tags&view=tags');
 
-        $app->input->set('limit', $app->get('feed_limit'));
+        $app->getInput()->set('limit', $app->get('feed_limit'));
         $siteEmail = $app->get('mailfrom');
         $fromName  = $app->get('fromname');
         $feedEmail = $app->get('feed_email', 'none');
diff --git a/components/com_users/src/Controller/ProfileController.php b/components/com_users/src/Controller/ProfileController.php
index 7db89ab9ee614..13732ada26bfe 100644
--- a/components/com_users/src/Controller/ProfileController.php
+++ b/components/com_users/src/Controller/ProfileController.php
@@ -91,7 +91,7 @@ public function save()
         $userId = (int) $user->get('id');
 
         // Get the user data.
-        $requestData = $app->input->post->get('jform', array(), 'array');
+        $requestData = $app->getInput()->post->get('jform', array(), 'array');
 
         // Force the ID to this user.
         $requestData['id'] = $userId;
diff --git a/components/com_users/src/Controller/UserController.php b/components/com_users/src/Controller/UserController.php
index df9861e31e03a..37e8c84a8bd79 100644
--- a/components/com_users/src/Controller/UserController.php
+++ b/components/com_users/src/Controller/UserController.php
@@ -127,7 +127,7 @@ public function logout()
 
         // Perform the log out.
         $error = $app->logout(null, $options);
-        $input = $app->input->getInputForRequestMethod();
+        $input = $app->getInput()->getInputForRequestMethod();
 
         // Check if the log out succeeded.
         if ($error instanceof \Exception) {
@@ -185,7 +185,7 @@ public function menulogout()
                 $url = 'index.php?Itemid=' . $itemid . ($language !== '*' ? '&lang=' . $language : '');
             } else {
                 // Logout is set to default. Get the home page ItemID
-                $lang_code = $app->input->cookie->getString(ApplicationHelper::getHash('language'));
+                $lang_code = $app->getInput()->cookie->getString(ApplicationHelper::getHash('language'));
                 $item      = $app->getMenu()->getDefault($lang_code);
                 $itemid    = $item->id;
 
diff --git a/components/com_users/src/Model/LoginModel.php b/components/com_users/src/Model/LoginModel.php
index 23329ba236786..6b9dedd936d04 100644
--- a/components/com_users/src/Model/LoginModel.php
+++ b/components/com_users/src/Model/LoginModel.php
@@ -67,7 +67,7 @@ protected function loadFormData()
         $app  = Factory::getApplication();
         $data = $app->getUserState('users.login.form.data', array());
 
-        $input = $app->input->getInputForRequestMethod();
+        $input = $app->getInput()->getInputForRequestMethod();
 
         // Check for return URL from the request first
         if ($return = $input->get('return', '', 'BASE64')) {
diff --git a/components/com_users/src/Model/ResetModel.php b/components/com_users/src/Model/ResetModel.php
index bf201ac401a00..3b5d29d3a5313 100644
--- a/components/com_users/src/Model/ResetModel.php
+++ b/components/com_users/src/Model/ResetModel.php
@@ -99,7 +99,7 @@ public function getResetConfirmForm($data = array(), $loadData = true)
         if (empty($form)) {
             return false;
         } else {
-            $form->setValue('token', '', Factory::getApplication()->input->get('token'));
+            $form->setValue('token', '', Factory::getApplication()->getInput()->get('token'));
         }
 
         return $form;
diff --git a/installation/src/Model/ChecksModel.php b/installation/src/Model/ChecksModel.php
index 462e6a8195654..fd32c42d7cfc8 100644
--- a/installation/src/Model/ChecksModel.php
+++ b/installation/src/Model/ChecksModel.php
@@ -250,7 +250,7 @@ public function getOptions()
     public function getForm($view = null)
     {
         if (!$view) {
-            $view = Factory::getApplication()->input->getWord('view', 'setup');
+            $view = Factory::getApplication()->getInput()->getWord('view', 'setup');
         }
 
         // Get the form.
diff --git a/installation/src/Model/LanguagesModel.php b/installation/src/Model/LanguagesModel.php
index f5a7ac89da24f..6974991c40208 100644
--- a/installation/src/Model/LanguagesModel.php
+++ b/installation/src/Model/LanguagesModel.php
@@ -514,7 +514,7 @@ public function getOptions()
     public function getForm($view = null)
     {
         if (!$view) {
-            $view = Factory::getApplication()->input->getWord('view', 'defaultlanguage');
+            $view = Factory::getApplication()->getInput()->getWord('view', 'defaultlanguage');
         }
 
         // Get the form.
diff --git a/installation/src/Model/SetupModel.php b/installation/src/Model/SetupModel.php
index 134afabcea37a..42d2ae9abc221 100644
--- a/installation/src/Model/SetupModel.php
+++ b/installation/src/Model/SetupModel.php
@@ -95,7 +95,7 @@ public function storeOptions($options)
     public function getForm($view = null)
     {
         if (!$view) {
-            $view = Factory::getApplication()->input->getWord('view', 'setup');
+            $view = Factory::getApplication()->getInput()->getWord('view', 'setup');
         }
 
         // Get the form.
@@ -132,7 +132,7 @@ public function getForm($view = null)
     public function checkForm($page = 'setup')
     {
         // Get the posted values from the request and validate them.
-        $data   = Factory::getApplication()->input->post->get('jform', array(), 'array');
+        $data   = Factory::getApplication()->getInput()->post->get('jform', array(), 'array');
         $return = $this->validate($data, $page);
 
         // Attempt to save the data before validation.
diff --git a/layouts/joomla/content/emptystate.php b/layouts/joomla/content/emptystate.php
index e78d3a2752897..2abe33d2ab641 100644
--- a/layouts/joomla/content/emptystate.php
+++ b/layouts/joomla/content/emptystate.php
@@ -18,7 +18,7 @@
 $textPrefix = $displayData['textPrefix'] ?? '';
 
 if (!$textPrefix) {
-    $textPrefix = strtoupper(Factory::getApplication()->input->get('option'));
+    $textPrefix = strtoupper(Factory::getApplication()->getInput()->get('option'));
 }
 
 $formURL    = $displayData['formURL'] ?? '';
@@ -41,7 +41,7 @@
                 <?php echo $content; ?>
             </p>
             <div class="d-grid gap-2 d-sm-flex justify-content-sm-center">
-                <?php if ($createURL && Factory::getApplication()->input->get('tmpl') !== 'component') : ?>
+                <?php if ($createURL && Factory::getApplication()->getInput()->get('tmpl') !== 'component') : ?>
                     <a href="<?php echo Route::_($createURL); ?>"
                      id="confirmButton" class="btn btn-primary btn-lg px-4 me-sm-3 emptystate-btnadd"><?php echo $btnadd; ?></a>
                 <?php endif; ?>
diff --git a/layouts/joomla/edit/admin_modules.php b/layouts/joomla/edit/admin_modules.php
index f5d84253ce2de..12e840d63c652 100644
--- a/layouts/joomla/edit/admin_modules.php
+++ b/layouts/joomla/edit/admin_modules.php
@@ -15,7 +15,7 @@
 
 $app    = Factory::getApplication();
 $form   = $displayData->getForm();
-$input  = $app->input;
+$input  = $app->getInput();
 
 $fields = $displayData->get('fields') ?: array(
     array('parent', 'parent_id'),
diff --git a/layouts/joomla/edit/frontediting_modules.php b/layouts/joomla/edit/frontediting_modules.php
index 373a2cde9ac4a..f45d8e09e206b 100644
--- a/layouts/joomla/edit/frontediting_modules.php
+++ b/layouts/joomla/edit/frontediting_modules.php
@@ -24,7 +24,7 @@
 $parameters   = ComponentHelper::getParams('com_modules');
 $redirectUri  = '&return=' . urlencode(base64_encode(Uri::getInstance()->toString()));
 $target       = '_blank';
-$itemid       = Factory::getApplication()->input->get('Itemid', '0', 'int');
+$itemid       = Factory::getApplication()->getInput()->get('Itemid', '0', 'int');
 $editUrl      = Uri::base() . 'administrator/index.php?option=com_modules&task=module.edit&id=' . (int) $mod->id;
 
 // If Module editing site
diff --git a/layouts/joomla/edit/global.php b/layouts/joomla/edit/global.php
index 35f72e68959da..602c17cd4fe09 100644
--- a/layouts/joomla/edit/global.php
+++ b/layouts/joomla/edit/global.php
@@ -17,7 +17,7 @@
 
 $app       = Factory::getApplication();
 $form      = $displayData->getForm();
-$input     = $app->input;
+$input     = $app->getInput();
 $component = $input->getCmd('option', 'com_content');
 
 if ($component === 'com_categories') {
diff --git a/layouts/joomla/edit/params.php b/layouts/joomla/edit/params.php
index dffef9fa7d1cb..ca99b8bfb553a 100644
--- a/layouts/joomla/edit/params.php
+++ b/layouts/joomla/edit/params.php
@@ -94,7 +94,7 @@
     } else {
         $label = strtoupper('JGLOBAL_FIELDSET_' . $name);
         if (Text::_($label) === $label) {
-            $label = strtoupper($app->input->get('option') . '_' . $name . '_FIELDSET_LABEL');
+            $label = strtoupper($app->getInput()->get('option') . '_' . $name . '_FIELDSET_LABEL');
         }
         $label = Text::_($label);
     }
diff --git a/libraries/src/Application/AdministratorApplication.php b/libraries/src/Application/AdministratorApplication.php
index 4bcf41c995215..8a567f1de4553 100644
--- a/libraries/src/Application/AdministratorApplication.php
+++ b/libraries/src/Application/AdministratorApplication.php
@@ -457,7 +457,7 @@ public function findOption(): string
     {
         /** @var self $app */
         $app    = Factory::getApplication();
-        $option = strtolower($app->input->get('option', ''));
+        $option = strtolower($app->getInput()->get('option', ''));
         $user   = $app->getIdentity();
 
         /**
@@ -484,7 +484,7 @@ public function findOption(): string
          * Force the option to the input object. This is necessary because we might have force-changed the component in
          * the two if-blocks above.
          */
-        $app->input->set('option', $option);
+        $app->getInput()->set('option', $option);
 
         return $option;
     }
diff --git a/libraries/src/Application/ApplicationHelper.php b/libraries/src/Application/ApplicationHelper.php
index e3271a0401637..70e90c9121cf6 100644
--- a/libraries/src/Application/ApplicationHelper.php
+++ b/libraries/src/Application/ApplicationHelper.php
@@ -49,7 +49,7 @@ public static function getComponentName($default = null)
             return $option;
         }
 
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
         $option = strtolower($input->get('option', ''));
 
         if (empty($option)) {
diff --git a/libraries/src/Cache/Cache.php b/libraries/src/Cache/Cache.php
index 21102d6974e00..00101721cf40e 100644
--- a/libraries/src/Cache/Cache.php
+++ b/libraries/src/Cache/Cache.php
@@ -761,7 +761,7 @@ public static function makeId()
 
 		foreach ($registeredurlparams as $key => $value)
 		{
-			$safeuriaddon->$key = $app->input->get($key, null, $value);
+			$safeuriaddon->$key = $app->getInput()->get($key, null, $value);
 		}
 
 		return md5(serialize($safeuriaddon));
diff --git a/libraries/src/Client/ClientHelper.php b/libraries/src/Client/ClientHelper.php
index d7eafa483671e..e2a30a674d71c 100644
--- a/libraries/src/Client/ClientHelper.php
+++ b/libraries/src/Client/ClientHelper.php
@@ -196,7 +196,7 @@ public static function hasCredentials($client)
     public static function setCredentialsFromRequest($client)
     {
         // Determine whether FTP credentials have been passed along with the current request
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
         $user = $input->post->getString('username', null);
         $pass = $input->post->getString('password', null);
 
diff --git a/libraries/src/Component/Router/Rules/NomenuRules.php b/libraries/src/Component/Router/Rules/NomenuRules.php
index c4b96dc453166..fa8e3b8220815 100644
--- a/libraries/src/Component/Router/Rules/NomenuRules.php
+++ b/libraries/src/Component/Router/Rules/NomenuRules.php
@@ -79,9 +79,9 @@ public function parse(&$segments, &$vars)
 
                 if (isset($view->key) && isset($segments[0])) {
                     if (\is_callable(array($this->router, 'get' . ucfirst($view->name) . 'Id'))) {
-                        if ($view->parent_key && $this->router->app->input->get($view->parent_key)) {
-                            $vars[$view->parent->key] = $this->router->app->input->get($view->parent_key);
-                            $vars[$view->parent_key] = $this->router->app->input->get($view->parent_key);
+                        if ($view->parent_key && $this->router->app->getInput()->get($view->parent_key)) {
+                            $vars[$view->parent->key] = $this->router->app->getInput()->get($view->parent_key);
+                            $vars[$view->parent_key] = $this->router->app->getInput()->get($view->parent_key);
                         }
 
                         if ($view->nestable) {
diff --git a/libraries/src/Document/FeedDocument.php b/libraries/src/Document/FeedDocument.php
index b8d18d0007a61..0e47260f8bc03 100644
--- a/libraries/src/Document/FeedDocument.php
+++ b/libraries/src/Document/FeedDocument.php
@@ -203,7 +203,7 @@ public function __construct($options = array())
     public function render($cache = false, $params = array())
     {
         // Get the feed type
-        $type = CmsFactory::getApplication()->input->get('type', 'rss');
+        $type = CmsFactory::getApplication()->getInput()->get('type', 'rss');
 
         // Instantiate feed renderer and set the mime encoding
         $renderer = $this->loadRenderer($type ?: 'rss');
diff --git a/libraries/src/Document/HtmlDocument.php b/libraries/src/Document/HtmlDocument.php
index ee4c33e9267c3..73a8df443c798 100644
--- a/libraries/src/Document/HtmlDocument.php
+++ b/libraries/src/Document/HtmlDocument.php
@@ -530,7 +530,7 @@ public function getBuffer($type = null, $name = null, $attribs = array())
             /** @var  \Joomla\CMS\Document\Renderer\Html\ModulesRenderer  $renderer */
             /** @var  \Joomla\CMS\Cache\Controller\OutputController  $cache */
             $cache  = $this->getCacheControllerFactory()->createCacheController('output', ['defaultgroup' => 'com_modules']);
-            $itemId = (int) CmsFactory::getApplication()->input->get('Itemid', 0, 'int');
+            $itemId = (int) CmsFactory::getApplication()->getInput()->get('Itemid', 0, 'int');
 
             $hash = md5(
                 serialize(
diff --git a/libraries/src/Document/ImageDocument.php b/libraries/src/Document/ImageDocument.php
index b62259b0385c0..8077e94c5cd7e 100644
--- a/libraries/src/Document/ImageDocument.php
+++ b/libraries/src/Document/ImageDocument.php
@@ -53,7 +53,7 @@ public function __construct($options = array())
     public function render($cache = false, $params = array())
     {
         // Get the image type
-        $type = Factory::getApplication()->input->get('type', 'png');
+        $type = Factory::getApplication()->getInput()->get('type', 'png');
 
         switch ($type) {
             case 'jpg':
diff --git a/libraries/src/Exception/ExceptionHandler.php b/libraries/src/Exception/ExceptionHandler.php
index 9caff3ca88802..039528158d08f 100644
--- a/libraries/src/Exception/ExceptionHandler.php
+++ b/libraries/src/Exception/ExceptionHandler.php
@@ -104,7 +104,7 @@ public static function render(\Throwable $error)
             if (Factory::$document) {
                 $format = Factory::$document->getType();
             } else {
-                $format = $app->input->getString('format', 'html');
+                $format = $app->getInput()->getString('format', 'html');
             }
 
             try {
diff --git a/libraries/src/Form/Field/ListField.php b/libraries/src/Form/Field/ListField.php
index 2f9b99752f218..045ac99511d49 100644
--- a/libraries/src/Form/Field/ListField.php
+++ b/libraries/src/Form/Field/ListField.php
@@ -148,7 +148,7 @@ protected function getOptions()
             $tmp        = new \stdClass();
             $tmp->value = '';
             $tmp->text  = Text::_('JGLOBAL_USE_GLOBAL');
-            $component  = Factory::getApplication()->input->getCmd('option');
+            $component  = Factory::getApplication()->getInput()->getCmd('option');
 
             // Get correct component for menu items
             if ($component === 'com_menus') {
@@ -166,7 +166,7 @@ protected function getOptions()
             }
 
             // Try with menu configuration
-            if (\is_null($value) && Factory::getApplication()->input->getCmd('option') === 'com_menus') {
+            if (\is_null($value) && Factory::getApplication()->getInput()->getCmd('option') === 'com_menus') {
                 $value = ComponentHelper::getParams('com_menus')->get($this->fieldname);
             }
 
diff --git a/libraries/src/Form/Field/MediaField.php b/libraries/src/Form/Field/MediaField.php
index 81175f95af846..13f2443d53115 100644
--- a/libraries/src/Form/Field/MediaField.php
+++ b/libraries/src/Form/Field/MediaField.php
@@ -259,7 +259,7 @@ public function getLayoutData()
         $asset = $this->asset;
 
         if ($asset === '') {
-            $asset = Factory::getApplication()->input->get('option');
+            $asset = Factory::getApplication()->getInput()->get('option');
         }
 
         // Value in new format such as images/headers/blue-flower.jpg#joomlaImage://local-images/headers/blue-flower.jpg?width=700&height=180
diff --git a/libraries/src/Form/Field/NumberField.php b/libraries/src/Form/Field/NumberField.php
index aaf0ea8836bd2..80f73f4605bd4 100644
--- a/libraries/src/Form/Field/NumberField.php
+++ b/libraries/src/Form/Field/NumberField.php
@@ -159,7 +159,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
     protected function getInput()
     {
         if ($this->element['useglobal']) {
-            $component = Factory::getApplication()->input->getCmd('option');
+            $component = Factory::getApplication()->getInput()->getCmd('option');
 
             // Get correct component for menu items
             if ($component === 'com_menus') {
@@ -177,7 +177,7 @@ protected function getInput()
             }
 
             // Try with menu configuration
-            if (\is_null($value) && Factory::getApplication()->input->getCmd('option') === 'com_menus') {
+            if (\is_null($value) && Factory::getApplication()->getInput()->getCmd('option') === 'com_menus') {
                 $value = ComponentHelper::getParams('com_menus')->get($this->fieldname);
             }
 
diff --git a/libraries/src/Form/Field/TextField.php b/libraries/src/Form/Field/TextField.php
index 6a0a5b63c17df..a1fdb49447ced 100644
--- a/libraries/src/Form/Field/TextField.php
+++ b/libraries/src/Form/Field/TextField.php
@@ -220,7 +220,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
     protected function getInput()
     {
         if ($this->element['useglobal']) {
-            $component = Factory::getApplication()->input->getCmd('option');
+            $component = Factory::getApplication()->getInput()->getCmd('option');
 
             // Get correct component for menu items
             if ($component === 'com_menus') {
@@ -238,7 +238,7 @@ protected function getInput()
             }
 
             // Try with menu configuration
-            if (\is_null($value) && Factory::getApplication()->input->getCmd('option') === 'com_menus') {
+            if (\is_null($value) && Factory::getApplication()->getInput()->getCmd('option') === 'com_menus') {
                 $value = ComponentHelper::getParams('com_menus')->get($this->fieldname);
             }
 
diff --git a/libraries/src/Form/Field/TransitionField.php b/libraries/src/Form/Field/TransitionField.php
index 0b1ac8f1b0e98..4c0ae25eed3a8 100644
--- a/libraries/src/Form/Field/TransitionField.php
+++ b/libraries/src/Form/Field/TransitionField.php
@@ -66,7 +66,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
         $result = parent::setup($element, $value, $group);
 
         if ($result) {
-            $input = Factory::getApplication()->input;
+            $input = Factory::getApplication()->getInput();
 
             if (\strlen($element['extension'])) {
                 $this->extension = (string) $element['extension'];
@@ -94,7 +94,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
     protected function getOptions()
     {
         // Let's get the id for the current item, either category or content item.
-        $jinput = Factory::getApplication()->input;
+        $jinput = Factory::getApplication()->getInput();
 
         // Initialise variable.
         $db = $this->getDatabase();
diff --git a/libraries/src/Form/Field/WorkflowconditionField.php b/libraries/src/Form/Field/WorkflowconditionField.php
index 21b74096ea966..7c51c5eeb7905 100644
--- a/libraries/src/Form/Field/WorkflowconditionField.php
+++ b/libraries/src/Form/Field/WorkflowconditionField.php
@@ -69,7 +69,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
             if (\strlen($element['extension'])) {
                 $this->extension = (string) $element['extension'];
             } else {
-                $this->extension = Factory::getApplication()->input->getCmd('extension');
+                $this->extension = Factory::getApplication()->getInput()->getCmd('extension');
             }
 
             if (\strlen($element['hide_all'])) {
diff --git a/libraries/src/Form/Field/WorkflowstageField.php b/libraries/src/Form/Field/WorkflowstageField.php
index 4a3c1d66febef..a8da1e5e94722 100644
--- a/libraries/src/Form/Field/WorkflowstageField.php
+++ b/libraries/src/Form/Field/WorkflowstageField.php
@@ -69,7 +69,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
             if (\strlen($element['extension'])) {
                 $this->extension = (string) $element['extension'];
             } else {
-                $this->extension = Factory::getApplication()->input->getCmd('extension');
+                $this->extension = Factory::getApplication()->getInput()->getCmd('extension');
             }
 
             if ((string) $element['activeonly'] === '1' || (string) $element['activeonly'] === 'true') {
diff --git a/libraries/src/HTML/Helpers/Dropdown.php b/libraries/src/HTML/Helpers/Dropdown.php
index 12ca12112d2e8..ee58df8fd7877 100644
--- a/libraries/src/HTML/Helpers/Dropdown.php
+++ b/libraries/src/HTML/Helpers/Dropdown.php
@@ -137,7 +137,7 @@ public static function edit($id, $prefix = '', $customLink = '')
         static::start();
 
         if (!$customLink) {
-            $option = Factory::getApplication()->input->getCmd('option');
+            $option = Factory::getApplication()->getInput()->getCmd('option');
             $link = 'index.php?option=' . $option;
         } else {
             $link = $customLink;
diff --git a/libraries/src/HTML/Helpers/Sidebar.php b/libraries/src/HTML/Helpers/Sidebar.php
index b900ebe23f7a8..4097d66d62845 100644
--- a/libraries/src/HTML/Helpers/Sidebar.php
+++ b/libraries/src/HTML/Helpers/Sidebar.php
@@ -63,7 +63,7 @@ public static function render()
         $data->action         = static::getAction();
         $data->displayMenu    = count($data->list);
         $data->displayFilters = count($data->filters);
-        $data->hide           = Factory::getApplication()->input->getBool('hidemainmenu');
+        $data->hide           = Factory::getApplication()->getInput()->getBool('hidemainmenu');
 
         // Create a layout object and ask it to render the sidebar
         $layout      = new FileLayout('joomla.sidebars.submenu');
diff --git a/libraries/src/Helper/CMSHelper.php b/libraries/src/Helper/CMSHelper.php
index 5eff1512a9308..d8ac843a3d240 100644
--- a/libraries/src/Helper/CMSHelper.php
+++ b/libraries/src/Helper/CMSHelper.php
@@ -49,7 +49,7 @@ public function getCurrentLanguage($detectBrowser = true)
             $pluginParams = new Registry($plugin->params);
 
             if ((int) $pluginParams->get('lang_cookie', 1) === 1) {
-                $langCode = $app->input->cookie->getString(ApplicationHelper::getHash('language'));
+                $langCode = $app->getInput()->cookie->getString(ApplicationHelper::getHash('language'));
             } else {
                 $langCode = $app->getSession()->get('plg_system_languagefilter.language');
             }
diff --git a/libraries/src/Helper/ContentHelper.php b/libraries/src/Helper/ContentHelper.php
index c83ad07adaaaa..5c72e576ab75c 100644
--- a/libraries/src/Helper/ContentHelper.php
+++ b/libraries/src/Helper/ContentHelper.php
@@ -212,7 +212,7 @@ public static function getCurrentLanguage($detectBrowser = true)
             $pluginParams = new Registry($plugin->params);
 
             if ((int) $pluginParams->get('lang_cookie', 1) === 1) {
-                $langCode = $app->input->cookie->getString(ApplicationHelper::getHash('language'));
+                $langCode = $app->getInput()->cookie->getString(ApplicationHelper::getHash('language'));
             } else {
                 $langCode = $app->getSession()->get('plg_system_languagefilter.language');
             }
diff --git a/libraries/src/Helper/ModuleHelper.php b/libraries/src/Helper/ModuleHelper.php
index 93bfbdcf7d402..260ec1d9355d5 100644
--- a/libraries/src/Helper/ModuleHelper.php
+++ b/libraries/src/Helper/ModuleHelper.php
@@ -84,7 +84,7 @@ public static function &getModules($position)
     {
         $position = strtolower($position);
         $result   = array();
-        $input    = Factory::getApplication()->input;
+        $input    = Factory::getApplication()->getInput();
         $modules  = &static::load();
         $total    = \count($modules);
 
@@ -199,7 +199,7 @@ public static function renderModule($module, $attribs = array())
         }
 
         // Dynamically add outline style
-        if ($app->input->getBool('tp') && ComponentHelper::getParams('com_templates')->get('template_positions_display')) {
+        if ($app->getInput()->getBool('tp') && ComponentHelper::getParams('com_templates')->get('template_positions_display')) {
             $attribs['style'] .= ' outline';
         }
 
@@ -390,7 +390,7 @@ protected static function &load()
     public static function getModuleList()
     {
         $app      = Factory::getApplication();
-        $itemId   = $app->input->getInt('Itemid', 0);
+        $itemId   = $app->getInput()->getInt('Itemid', 0);
         $groups   = $app->getIdentity()->getAuthorisedViewLevels();
         $clientId = (int) $app->getClientId();
 
@@ -492,7 +492,7 @@ public static function getModuleList()
     public static function cleanModuleList($modules)
     {
         // Apply negative selections and eliminate duplicates
-        $Itemid = Factory::getApplication()->input->getInt('Itemid');
+        $Itemid = Factory::getApplication()->getInput()->getInt('Itemid');
         $negId = $Itemid ? -(int) $Itemid : false;
         $clean = array();
         $dupes = array();
@@ -602,7 +602,7 @@ public static function moduleCache($module, $moduleparams, $cacheparams)
                 $secureid = null;
 
                 if (\is_array($cacheparams->modeparams)) {
-                    $input   = $app->input;
+                    $input   = $app->getInput();
                     $uri     = $input->getArray();
                     $safeuri = new \stdClass();
                     $noHtmlFilter = InputFilter::getInstance();
@@ -640,7 +640,7 @@ public static function moduleCache($module, $moduleparams, $cacheparams)
                 $ret = $cache->get(
                     array($cacheparams->class, $cacheparams->method),
                     $cacheparams->methodparams,
-                    $module->id . $view_levels . $app->input->getInt('Itemid', null) . $cacheparams->cachesuffix,
+                    $module->id . $view_levels . $app->getInput()->getInt('Itemid', null) . $cacheparams->cachesuffix,
                     $wrkarounds,
                     $wrkaroundoptions
                 );
diff --git a/libraries/src/Helper/RouteHelper.php b/libraries/src/Helper/RouteHelper.php
index f3f21bdbfc8fa..01202a130cda2 100644
--- a/libraries/src/Helper/RouteHelper.php
+++ b/libraries/src/Helper/RouteHelper.php
@@ -74,8 +74,8 @@ public function getRoute($id, $typealias, $link = '', $language = null, $catid =
             $this->view = $typeExploded[1];
             $this->extension = $typeExploded[0];
         } else {
-            $this->view = Factory::getApplication()->input->getString('view');
-            $this->extension = Factory::getApplication()->input->getCmd('option');
+            $this->view = Factory::getApplication()->getInput()->getString('view');
+            $this->extension = Factory::getApplication()->getInput()->getCmd('option');
         }
 
         $name = ucfirst(substr_replace($this->extension, '', 0, 4));
@@ -135,7 +135,7 @@ protected function findItem($needles = array())
 
         // $this->extension may not be set if coming from a static method, check it
         if ($this->extension === null) {
-            $this->extension = $app->input->getCmd('option');
+            $this->extension = $app->getInput()->getCmd('option');
         }
 
         // Prepare the reverse lookup array.
diff --git a/libraries/src/MVC/Controller/BaseController.php b/libraries/src/MVC/Controller/BaseController.php
index dc68c23234854..ca58f55c3c630 100644
--- a/libraries/src/MVC/Controller/BaseController.php
+++ b/libraries/src/MVC/Controller/BaseController.php
@@ -266,7 +266,7 @@ public static function getInstance($prefix, $config = array())
         );
 
         $app   = Factory::getApplication();
-        $input = $app->input;
+        $input = $app->getInput();
 
         // Get the environment configuration.
         $basePath = \array_key_exists('base_path', $config) ? $config['base_path'] : JPATH_COMPONENT;
@@ -358,7 +358,7 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
         $this->taskMap = array();
 
         $this->app   = $app ?: Factory::getApplication();
-        $this->input = $input ?: $this->app->input;
+        $this->input = $input ?: $this->app->getInput();
 
         if (\defined('JDEBUG') && JDEBUG) {
             Log::addLogger(array('text_file' => 'jcontroller.log.php'), Log::ALL, array('controller'));
diff --git a/libraries/src/MVC/Controller/FormController.php b/libraries/src/MVC/Controller/FormController.php
index 67f7a99eeff0c..a4c1e1dc75b57 100644
--- a/libraries/src/MVC/Controller/FormController.php
+++ b/libraries/src/MVC/Controller/FormController.php
@@ -874,7 +874,7 @@ public function editAssociations()
     {
         // Initialise variables.
         $app   = $this->app;
-        $input = $app->input;
+        $input = $app->getInput();
         $model = $this->getModel();
 
         $data = $input->get('jform', array(), 'array');
diff --git a/libraries/src/MVC/Model/AdminModel.php b/libraries/src/MVC/Model/AdminModel.php
index 3210adfc8c6ea..d0ebbb68788c5 100644
--- a/libraries/src/MVC/Model/AdminModel.php
+++ b/libraries/src/MVC/Model/AdminModel.php
@@ -1025,7 +1025,7 @@ protected function populateState()
         $key = $table->getKeyName();
 
         // Get the pk of the record from the request.
-        $pk = Factory::getApplication()->input->getInt($key);
+        $pk = Factory::getApplication()->getInput()->getInt($key);
         $this->setState($this->getName() . '.id', $pk);
 
         // Load the parameters.
@@ -1379,7 +1379,7 @@ public function save($data)
             }
         }
 
-        if ($app->input->get('task') == 'editAssociations') {
+        if ($app->getInput()->get('task') == 'editAssociations') {
             return $this->redirectToAssociations($data);
         }
 
@@ -1500,7 +1500,7 @@ protected function checkCategoryId($categoryId)
         }
 
         // Check that the user has create permission for the component
-        $extension = Factory::getApplication()->input->get('option', '');
+        $extension = Factory::getApplication()->getInput()->get('option', '');
         $user = Factory::getUser();
 
         if (!$user->authorise('core.create', $extension . '.category.' . $categoryId)) {
@@ -1596,7 +1596,7 @@ protected function redirectToAssociations($data)
 
         // Deal with categories associations
         if ($this->text_prefix === 'COM_CATEGORIES') {
-            $extension       = $app->input->get('extension', 'com_content');
+            $extension       = $app->getInput()->get('extension', 'com_content');
             $this->typeAlias = $extension . '.category';
             $component       = strtolower($this->text_prefix);
             $view            = 'category';
diff --git a/libraries/src/MVC/Model/BaseDatabaseModel.php b/libraries/src/MVC/Model/BaseDatabaseModel.php
index 6412d369db95c..ae8625a7dcef8 100644
--- a/libraries/src/MVC/Model/BaseDatabaseModel.php
+++ b/libraries/src/MVC/Model/BaseDatabaseModel.php
@@ -297,7 +297,7 @@ protected function cleanCache($group = null)
         $app = Factory::getApplication();
 
         $options = [
-            'defaultgroup' => $group ?: ($this->option ?? $app->input->get('option')),
+            'defaultgroup' => $group ?: ($this->option ?? $app->getInput()->get('option')),
             'cachebase'    => $app->get('cache_path', JPATH_CACHE),
             'result'       => true,
         ];
diff --git a/libraries/src/MVC/Model/ListModel.php b/libraries/src/MVC/Model/ListModel.php
index 03b94d0d93c0c..98f3be1df018e 100644
--- a/libraries/src/MVC/Model/ListModel.php
+++ b/libraries/src/MVC/Model/ListModel.php
@@ -592,14 +592,14 @@ protected function populateState($ordering = null, $direction = null)
             }
 
             // Support old ordering field
-            $oldOrdering = $app->input->get('filter_order');
+            $oldOrdering = $app->getInput()->get('filter_order');
 
             if (!empty($oldOrdering) && \in_array($oldOrdering, $this->filter_fields)) {
                 $this->setState('list.ordering', $oldOrdering);
             }
 
             // Support old direction field
-            $oldDirection = $app->input->get('filter_order_Dir');
+            $oldDirection = $app->getInput()->get('filter_order_Dir');
 
             if (!empty($oldDirection) && \in_array(strtoupper($oldDirection), array('ASC', 'DESC', ''))) {
                 $this->setState('list.direction', $oldDirection);
@@ -633,7 +633,7 @@ protected function populateState($ordering = null, $direction = null)
     public function getUserStateFromRequest($key, $request, $default = null, $type = 'none', $resetPage = true)
     {
         $app       = Factory::getApplication();
-        $input     = $app->input;
+        $input     = $app->getInput();
         $old_state = $app->getUserState($key);
         $cur_state = $old_state ?? $default;
         $new_state = $input->get($request, null, $type);
@@ -641,7 +641,7 @@ public function getUserStateFromRequest($key, $request, $default = null, $type =
         // BC for Search Tools which uses different naming
         if ($new_state === null && strpos($request, 'filter_') === 0) {
             $name    = substr($request, 7);
-            $filters = $app->input->get('filter', array(), 'array');
+            $filters = $app->getInput()->get('filter', array(), 'array');
 
             if (isset($filters[$name])) {
                 $new_state = $filters[$name];
diff --git a/libraries/src/MVC/View/CategoryFeedView.php b/libraries/src/MVC/View/CategoryFeedView.php
index c3f5d8db5c189..ff1eb2466556a 100644
--- a/libraries/src/MVC/View/CategoryFeedView.php
+++ b/libraries/src/MVC/View/CategoryFeedView.php
@@ -42,7 +42,7 @@ public function display($tpl = null)
         $app      = Factory::getApplication();
         $document = Factory::getDocument();
 
-        $extension      = $app->input->getString('option');
+        $extension      = $app->getInput()->getString('option');
         $contentType = $extension . '.' . $this->viewName;
 
         $ucmType = new UCMType();
@@ -59,9 +59,9 @@ public function display($tpl = null)
             $titleField = $ucmMapCommon[0]->core_title;
         }
 
-        $document->link = Route::_(RouteHelper::getCategoryRoute($app->input->getInt('id'), $language = 0, $extension));
+        $document->link = Route::_(RouteHelper::getCategoryRoute($app->getInput()->getInt('id'), $language = 0, $extension));
 
-        $app->input->set('limit', $app->get('feed_limit'));
+        $app->getInput()->set('limit', $app->get('feed_limit'));
         $siteEmail        = $app->get('mailfrom');
         $fromName         = $app->get('fromname');
         $feedEmail        = $app->get('feed_email', 'none');
diff --git a/libraries/src/MVC/View/FormView.php b/libraries/src/MVC/View/FormView.php
index 291244bb8a5d1..37abe48a38ec3 100644
--- a/libraries/src/MVC/View/FormView.php
+++ b/libraries/src/MVC/View/FormView.php
@@ -160,7 +160,7 @@ protected function initializeView()
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $user       = Factory::getUser();
         $userId     = $user->id;
diff --git a/libraries/src/Service/Provider/Session.php b/libraries/src/Service/Provider/Session.php
index 684fe6a6928b0..f2bda120042b2 100644
--- a/libraries/src/Service/Provider/Session.php
+++ b/libraries/src/Service/Provider/Session.php
@@ -87,7 +87,7 @@ function (Container $container) {
                 }
 
                 return $this->buildSession(
-                    new JoomlaStorage($app->input, $handler, $options),
+                    new JoomlaStorage($app->getInput(), $handler, $options),
                     $app,
                     $container->get(DispatcherInterface::class),
                     $options
@@ -132,7 +132,7 @@ function (Container $container) {
                 }
 
                 return $this->buildSession(
-                    new JoomlaStorage($app->input, $handler),
+                    new JoomlaStorage($app->getInput(), $handler),
                     $app,
                     $container->get(DispatcherInterface::class),
                     $options
@@ -171,7 +171,7 @@ function (Container $container) {
                 }
 
                 return $this->buildSession(
-                    new JoomlaStorage($app->input, $handler, $options),
+                    new JoomlaStorage($app->getInput(), $handler, $options),
                     $app,
                     $container->get(DispatcherInterface::class),
                     $options
@@ -304,7 +304,7 @@ private function buildSession(
         DispatcherInterface $dispatcher,
         array $options
     ): SessionInterface {
-        $input = $app->input;
+        $input = $app->getInput();
 
         if (method_exists($app, 'afterSessionStart')) {
             $dispatcher->addListener(SessionEvents::START, [$app, 'afterSessionStart'], Priority::HIGH);
diff --git a/libraries/src/Session/Session.php b/libraries/src/Session/Session.php
index 2114032e43cbd..b827f972c05fe 100644
--- a/libraries/src/Session/Session.php
+++ b/libraries/src/Session/Session.php
@@ -67,12 +67,12 @@ public static function checkToken($method = 'post')
         $token = static::getFormToken();
 
         // Check from header first
-        if ($token === $app->input->server->get('HTTP_X_CSRF_TOKEN', '', 'alnum')) {
+        if ($token === $app->getInput()->server->get('HTTP_X_CSRF_TOKEN', '', 'alnum')) {
             return true;
         }
 
         // Then fallback to HTTP query
-        if (!$app->input->$method->get($token, '', 'alnum')) {
+        if (!$app->getInput()->$method->get($token, '', 'alnum')) {
             if ($app->getSession()->isNew()) {
                 // Redirect to login screen.
                 $app->enqueueMessage(Text::_('JLIB_ENVIRONMENT_SESSION_EXPIRED'), 'warning');
diff --git a/libraries/src/UCM/UCMBase.php b/libraries/src/UCM/UCMBase.php
index f98f1c11bdadc..d638eaf8e6fcf 100644
--- a/libraries/src/UCM/UCMBase.php
+++ b/libraries/src/UCM/UCMBase.php
@@ -52,7 +52,7 @@ class UCMBase implements UCM
     public function __construct($alias = null, UCMType $type = null)
     {
         // Setup dependencies.
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
         $this->alias = $alias ?: $input->get('option') . '.' . $input->get('view');
 
         $this->type = $type ?: $this->getType();
diff --git a/libraries/src/UCM/UCMType.php b/libraries/src/UCM/UCMType.php
index 6d51f5fc53c2a..40415db9b84d7 100644
--- a/libraries/src/UCM/UCMType.php
+++ b/libraries/src/UCM/UCMType.php
@@ -97,7 +97,7 @@ public function __construct($alias = null, DatabaseDriver $database = null, Abst
         $app      = $application ?: Factory::getApplication();
 
         // Make the best guess we can in the absence of information.
-        $this->alias = $alias ?: $app->input->get('option') . '.' . $app->input->get('view');
+        $this->alias = $alias ?: $app->getInput()->get('option') . '.' . $app->getInput()->get('view');
         $this->type  = $this->getTypeByAlias($this->alias);
     }
 
diff --git a/libraries/src/Workflow/WorkflowPluginTrait.php b/libraries/src/Workflow/WorkflowPluginTrait.php
index 8a797ac5133be..7dbedfdb145f1 100644
--- a/libraries/src/Workflow/WorkflowPluginTrait.php
+++ b/libraries/src/Workflow/WorkflowPluginTrait.php
@@ -65,7 +65,7 @@ protected function enhanceWorkflowTransitionForm(Form $form, $data)
      */
     protected function getWorkflow(int $workflowId = null)
     {
-        $workflowId = !empty($workflowId) ? $workflowId : $this->app->input->getInt('workflow_id');
+        $workflowId = !empty($workflowId) ? $workflowId : $this->app->getInput()->getInt('workflow_id');
 
         if (is_array($workflowId)) {
             return false;
diff --git a/modules/mod_articles_categories/tmpl/default_items.php b/modules/mod_articles_categories/tmpl/default_items.php
index 9da1697523ede..1291a0b1d73d2 100644
--- a/modules/mod_articles_categories/tmpl/default_items.php
+++ b/modules/mod_articles_categories/tmpl/default_items.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Content\Site\Helper\RouteHelper;
 
-$input  = $app->input;
+$input  = $app->getInput();
 $option = $input->getCmd('option');
 $view   = $input->getCmd('view');
 $id     = $input->getInt('id');
diff --git a/modules/mod_articles_category/mod_articles_category.php b/modules/mod_articles_category/mod_articles_category.php
index 4f9db492ef80b..d0a7a52ff6e42 100644
--- a/modules/mod_articles_category/mod_articles_category.php
+++ b/modules/mod_articles_category/mod_articles_category.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\Module\ArticlesCategory\Site\Helper\ArticlesCategoryHelper;
 
-$input = $app->input;
+$input = $app->getInput();
 
 // Prep for Normal or Dynamic Modes
 $mode   = $params->get('mode', 'normal');
diff --git a/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php b/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php
index 2a3f70de18508..fb4037de46823 100644
--- a/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php
+++ b/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php
@@ -50,7 +50,7 @@ public static function getList(&$params)
         $articles = $factory->createModel('Articles', 'Site', ['ignore_request' => true]);
 
         // Set application parameters in model
-        $input     = $app->input;
+        $input     = $app->getInput();
         $appParams = $app->getParams();
         $articles->setState('params', $appParams);
 
diff --git a/modules/mod_articles_news/src/Helper/ArticlesNewsHelper.php b/modules/mod_articles_news/src/Helper/ArticlesNewsHelper.php
index 1461460934293..fc69cd2ba666c 100644
--- a/modules/mod_articles_news/src/Helper/ArticlesNewsHelper.php
+++ b/modules/mod_articles_news/src/Helper/ArticlesNewsHelper.php
@@ -92,11 +92,11 @@ public function getArticles(Registry $params, SiteApplication $app)
         // Filter by id in case it should be excluded
         if (
             $params->get('exclude_current', true)
-            && $app->input->get('option') === 'com_content'
-            && $app->input->get('view') === 'article'
+            && $app->getInput()->get('option') === 'com_content'
+            && $app->getInput()->get('view') === 'article'
         ) {
             // Exclude the current article from displaying in this module
-            $model->setState('filter.article_id', $app->input->get('id', 0, 'UINT'));
+            $model->setState('filter.article_id', $app->getInput()->get('id', 0, 'UINT'));
             $model->setState('filter.article_id.include', false);
         }
 
diff --git a/modules/mod_finder/src/Helper/FinderHelper.php b/modules/mod_finder/src/Helper/FinderHelper.php
index 3b63a8dfd1a49..ad529083caa37 100644
--- a/modules/mod_finder/src/Helper/FinderHelper.php
+++ b/modules/mod_finder/src/Helper/FinderHelper.php
@@ -65,7 +65,7 @@ public static function getGetFields($route = null, $paramItem = 0)
      */
     public static function getQuery($params)
     {
-        $request = Factory::getApplication()->input->request;
+        $request = Factory::getApplication()->getInput()->request;
         $filter  = InputFilter::getInstance();
 
         // Get the static taxonomy filters.
diff --git a/modules/mod_finder/tmpl/default.php b/modules/mod_finder/tmpl/default.php
index 2ec2c11e96100..74db922a1cae7 100644
--- a/modules/mod_finder/tmpl/default.php
+++ b/modules/mod_finder/tmpl/default.php
@@ -19,7 +19,7 @@
 $lang = $app->getLanguage();
 $lang->load('com_finder', JPATH_SITE);
 
-$input = '<input type="text" name="q" id="mod-finder-searchword' . $module->id . '" class="js-finder-search-query form-control" value="' . htmlspecialchars($app->input->get('q', '', 'string'), ENT_COMPAT, 'UTF-8') . '"'
+$input = '<input type="text" name="q" id="mod-finder-searchword' . $module->id . '" class="js-finder-search-query form-control" value="' . htmlspecialchars($app->getInput()->get('q', '', 'string'), ENT_COMPAT, 'UTF-8') . '"'
     . ' placeholder="' . Text::_('MOD_FINDER_SEARCH_VALUE') . '">';
 
 $showLabel  = $params->get('show_label', 1);
diff --git a/modules/mod_languages/src/Helper/LanguagesHelper.php b/modules/mod_languages/src/Helper/LanguagesHelper.php
index 6b1b61781d72d..1671a75f7e72e 100644
--- a/modules/mod_languages/src/Helper/LanguagesHelper.php
+++ b/modules/mod_languages/src/Helper/LanguagesHelper.php
@@ -66,7 +66,7 @@ public static function getList(&$params)
                 $associations = MenusHelper::getAssociations($active->id);
             }
 
-            $option = $app->input->get('option');
+            $option = $app->getInput()->get('option');
             $component = $app->bootComponent($option);
 
             if ($component instanceof AssociationServiceInterface) {
diff --git a/modules/mod_related_items/src/Helper/RelatedItemsHelper.php b/modules/mod_related_items/src/Helper/RelatedItemsHelper.php
index ac72904205e59..61573b7676674 100644
--- a/modules/mod_related_items/src/Helper/RelatedItemsHelper.php
+++ b/modules/mod_related_items/src/Helper/RelatedItemsHelper.php
@@ -40,7 +40,7 @@ public static function getList(&$params)
     {
         $db        = Factory::getDbo();
         $app       = Factory::getApplication();
-        $input     = $app->input;
+        $input     = $app->getInput();
         $groups    = Factory::getUser()->getAuthorisedViewLevels();
         $maximum   = (int) $params->get('maximum', 5);
         $factory   = $app->bootComponent('com_content')->getMVCFactory();
diff --git a/modules/mod_tags_similar/src/Helper/TagsSimilarHelper.php b/modules/mod_tags_similar/src/Helper/TagsSimilarHelper.php
index ddcc6cb065bce..d7f8257879aef 100644
--- a/modules/mod_tags_similar/src/Helper/TagsSimilarHelper.php
+++ b/modules/mod_tags_similar/src/Helper/TagsSimilarHelper.php
@@ -40,8 +40,8 @@ abstract class TagsSimilarHelper
     public static function getList(&$params)
     {
         $app    = Factory::getApplication();
-        $option = $app->input->get('option');
-        $view   = $app->input->get('view');
+        $option = $app->getInput()->get('option');
+        $view   = $app->getInput()->get('view');
 
         // For now assume com_tags and com_users do not have tags.
         // This module does not apply to list views in general at this point.
@@ -56,7 +56,7 @@ public static function getList(&$params)
         $ordering   = $params->get('ordering', 'count');
         $tagsHelper = new TagsHelper();
         $prefix     = $option . '.' . $view;
-        $id         = $app->input->getInt('id');
+        $id         = $app->getInput()->getInt('id');
         $now        = Factory::getDate()->toSql();
         $nullDate   = $db->getNullDate();
 
diff --git a/modules/mod_wrapper/src/Helper/WrapperHelper.php b/modules/mod_wrapper/src/Helper/WrapperHelper.php
index 9b6b3a4475f76..43773c7ebe15e 100644
--- a/modules/mod_wrapper/src/Helper/WrapperHelper.php
+++ b/modules/mod_wrapper/src/Helper/WrapperHelper.php
@@ -48,7 +48,7 @@ public static function getParams(&$params)
             // Adds 'http://' if none is set
             if (strpos($url, '/') === 0) {
                 // Relative URL in component. use server http_host.
-                $url = 'http://' . Factory::getApplication()->input->server->get('HTTP_HOST') . $url;
+                $url = 'http://' . Factory::getApplication()->getInput()->server->get('HTTP_HOST') . $url;
             } elseif (strpos($url, 'http') === false && strpos($url, 'https') === false) {
                 $url = 'http://' . $url;
             }
diff --git a/plugins/actionlog/joomla/src/Extension/Joomla.php b/plugins/actionlog/joomla/src/Extension/Joomla.php
index 6c4398d234c13..c2a354fdff675 100644
--- a/plugins/actionlog/joomla/src/Extension/Joomla.php
+++ b/plugins/actionlog/joomla/src/Extension/Joomla.php
@@ -163,7 +163,7 @@ public function onContentAfterSave($context, $article, $isNew): void
      */
     public function onContentAfterDelete($context, $article): void
     {
-        $option = $this->getApplication()->input->get('option');
+        $option = $this->getApplication()->getInput()->get('option');
 
         if (!$this->checkLoggable($option)) {
             return;
@@ -210,7 +210,7 @@ public function onContentAfterDelete($context, $article): void
      */
     public function onContentChangeState($context, $pks, $value)
     {
-        $option = $this->getApplication()->input->getCmd('option');
+        $option = $this->getApplication()->getInput()->getCmd('option');
 
         if (!$this->checkLoggable($option)) {
             return;
@@ -300,7 +300,7 @@ public function onContentChangeState($context, $pks, $value)
      */
     public function onApplicationAfterSave($config): void
     {
-        $option = $this->getApplication()->input->getCmd('option');
+        $option = $this->getApplication()->getInput()->getCmd('option');
 
         if (!$this->checkLoggable($option)) {
             return;
@@ -333,7 +333,7 @@ public function onApplicationAfterSave($config): void
      */
     public function onExtensionAfterInstall($installer, $eid)
     {
-        $context = $this->getApplication()->input->get('option');
+        $context = $this->getApplication()->getInput()->get('option');
 
         if (!$this->checkLoggable($context)) {
             return;
@@ -380,7 +380,7 @@ public function onExtensionAfterInstall($installer, $eid)
      */
     public function onExtensionAfterUninstall($installer, $eid, $result)
     {
-        $context = $this->getApplication()->input->get('option');
+        $context = $this->getApplication()->getInput()->get('option');
 
         if (!$this->checkLoggable($context)) {
             return;
@@ -431,7 +431,7 @@ public function onExtensionAfterUninstall($installer, $eid, $result)
      */
     public function onExtensionAfterUpdate($installer, $eid)
     {
-        $context = $this->getApplication()->input->get('option');
+        $context = $this->getApplication()->getInput()->get('option');
 
         if (!$this->checkLoggable($context)) {
             return;
@@ -477,7 +477,7 @@ public function onExtensionAfterUpdate($installer, $eid)
      */
     public function onExtensionAfterSave($context, $table, $isNew): void
     {
-        $option = $this->getApplication()->input->getCmd('option');
+        $option = $this->getApplication()->getInput()->getCmd('option');
 
         if ($table->get('module') != null) {
             $option = 'com_modules';
@@ -534,7 +534,7 @@ public function onExtensionAfterSave($context, $table, $isNew): void
      */
     public function onExtensionAfterDelete($context, $table): void
     {
-        if (!$this->checkLoggable($this->getApplication()->input->get('option'))) {
+        if (!$this->checkLoggable($this->getApplication()->getInput()->get('option'))) {
             return;
         }
 
@@ -573,8 +573,8 @@ public function onExtensionAfterDelete($context, $table): void
      */
     public function onUserAfterSave($user, $isnew, $success, $msg): void
     {
-        $context = $this->getApplication()->input->get('option');
-        $task    = $this->getApplication()->input->post->get('task');
+        $context = $this->getApplication()->getInput()->get('option');
+        $task    = $this->getApplication()->getInput()->post->get('task');
 
         if (!$this->checkLoggable($context)) {
             return;
@@ -643,7 +643,7 @@ public function onUserAfterSave($user, $isnew, $success, $msg): void
      */
     public function onUserAfterDelete($user, $success, $msg): void
     {
-        $context = $this->getApplication()->input->get('option');
+        $context = $this->getApplication()->getInput()->get('option');
 
         if (!$this->checkLoggable($context)) {
             return;
@@ -677,7 +677,7 @@ public function onUserAfterDelete($user, $success, $msg): void
     public function onUserAfterSaveGroup($context, $table, $isNew): void
     {
         // Override context (com_users.group) with the component context (com_users) to pass the checkLoggable
-        $context = $this->getApplication()->input->get('option');
+        $context = $this->getApplication()->getInput()->get('option');
 
         if (!$this->checkLoggable($context)) {
             return;
@@ -717,7 +717,7 @@ public function onUserAfterSaveGroup($context, $table, $isNew): void
      */
     public function onUserAfterDeleteGroup($group, $success, $msg): void
     {
-        $context = $this->getApplication()->input->get('option');
+        $context = $this->getApplication()->getInput()->get('option');
 
         if (!$this->checkLoggable($context)) {
             return;
@@ -886,7 +886,7 @@ protected function checkLoggable($extension)
      */
     public function onUserAfterRemind($user)
     {
-        $context = $this->getApplication()->input->get('option');
+        $context = $this->getApplication()->getInput()->get('option');
 
         if (!$this->checkLoggable($context)) {
             return;
@@ -954,7 +954,7 @@ public function onAfterCheckin($table)
      */
     public function onAfterLogPurge($group = '')
     {
-        $context = $this->getApplication()->input->get('option');
+        $context = $this->getApplication()->getInput()->get('option');
         $user    = Factory::getUser();
         $message = array(
             'action'      => 'actionlogs',
@@ -982,7 +982,7 @@ public function onAfterLogPurge($group = '')
      */
     public function onAfterLogExport($group = '')
     {
-        $context = $this->getApplication()->input->get('option');
+        $context = $this->getApplication()->getInput()->get('option');
         $user    = Factory::getUser();
         $message = array(
             'action'      => 'actionlogs',
@@ -1010,7 +1010,7 @@ public function onAfterLogExport($group = '')
      */
     public function onAfterPurge($group = 'all')
     {
-        $context = $this->getApplication()->input->get('option');
+        $context = $this->getApplication()->getInput()->get('option');
         $user    = Factory::getUser();
 
         if (!$this->checkLoggable($context)) {
@@ -1050,13 +1050,13 @@ public function onAfterDispatch()
             return;
         }
 
-        $verb = $this->getApplication()->input->getMethod();
+        $verb = $this->getApplication()->getInput()->getMethod();
 
         if (!in_array($verb, $this->loggableVerbs)) {
             return;
         }
 
-        $context = $this->getApplication()->input->get('option');
+        $context = $this->getApplication()->getInput()->get('option');
 
         if (!$this->checkLoggable($context)) {
             return;
@@ -1086,7 +1086,7 @@ public function onAfterDispatch()
      */
     public function onJoomlaAfterUpdate($oldVersion = null)
     {
-        $context = $this->getApplication()->input->get('option');
+        $context = $this->getApplication()->getInput()->get('option');
         $user    = Factory::getUser();
 
         if (empty($oldVersion)) {
diff --git a/plugins/api-authentication/basic/src/Extension/Basic.php b/plugins/api-authentication/basic/src/Extension/Basic.php
index 975b40cd83c61..544f7e82b1e68 100644
--- a/plugins/api-authentication/basic/src/Extension/Basic.php
+++ b/plugins/api-authentication/basic/src/Extension/Basic.php
@@ -69,8 +69,8 @@ public function onUserAuthenticate($credentials, $options, &$response)
     {
         $response->type = 'Basic';
 
-        $username = $this->getApplication()->input->server->get('PHP_AUTH_USER', '', 'USERNAME');
-        $password = $this->getApplication()->input->server->get('PHP_AUTH_PW', '', 'RAW');
+        $username = $this->getApplication()->getInput()->server->get('PHP_AUTH_USER', '', 'USERNAME');
+        $password = $this->getApplication()->getInput()->server->get('PHP_AUTH_PW', '', 'RAW');
 
         if ($password === '') {
             $response->status        = Authentication::STATUS_FAILURE;
diff --git a/plugins/api-authentication/token/src/Extension/Token.php b/plugins/api-authentication/token/src/Extension/Token.php
index 7f7a314df69f3..f439002638bd7 100644
--- a/plugins/api-authentication/token/src/Extension/Token.php
+++ b/plugins/api-authentication/token/src/Extension/Token.php
@@ -107,7 +107,7 @@ public function onUserAuthenticate($credentials, $options, &$response): void
          * Do keep in mind that Bearer is **case-sensitive**. Whitespace between Bearer and the
          * token, as well as any whitespace following the token is discarded.
          */
-        $authHeader  = $this->getApplication()->input->server->get('HTTP_AUTHORIZATION', '', 'string');
+        $authHeader  = $this->getApplication()->getInput()->server->get('HTTP_AUTHORIZATION', '', 'string');
         $tokenString = '';
 
         // Apache specific fixes. See https://github.com/symfony/symfony/issues/19693
@@ -129,7 +129,7 @@ public function onUserAuthenticate($credentials, $options, &$response): void
         }
 
         if (empty($tokenString)) {
-            $tokenString = $this->getApplication()->input->server->get('HTTP_X_JOOMLA_TOKEN', '', 'string');
+            $tokenString = $this->getApplication()->getInput()->server->get('HTTP_X_JOOMLA_TOKEN', '', 'string');
         }
 
         // No token: authentication failure
diff --git a/plugins/authentication/cookie/cookie.php b/plugins/authentication/cookie/cookie.php
index 80de221b74fb3..48d9c83ffcac7 100644
--- a/plugins/authentication/cookie/cookie.php
+++ b/plugins/authentication/cookie/cookie.php
@@ -85,12 +85,12 @@ public function onUserAuthenticate($credentials, $options, &$response)
 
         // Get cookie
         $cookieName  = 'joomla_remember_me_' . UserHelper::getShortHashedUserAgent();
-        $cookieValue = $this->app->input->cookie->get($cookieName);
+        $cookieValue = $this->app->getInput()->cookie->get($cookieName);
 
         // Try with old cookieName (pre 3.6.0) if not found
         if (!$cookieValue) {
             $cookieName  = UserHelper::getShortHashedUserAgent();
-            $cookieValue = $this->app->input->cookie->get($cookieName);
+            $cookieValue = $this->app->getInput()->cookie->get($cookieName);
         }
 
         if (!$cookieValue) {
@@ -102,7 +102,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
         // Check for valid cookie value
         if (count($cookieArray) !== 2) {
             // Destroy the cookie in the browser.
-            $this->app->input->cookie->set($cookieName, '', 1, $this->app->get('cookie_path', '/'), $this->app->get('cookie_domain', ''));
+            $this->app->getInput()->cookie->set($cookieName, '', 1, $this->app->get('cookie_path', '/'), $this->app->get('cookie_domain', ''));
             Log::add('Invalid cookie detected.', Log::WARNING, 'error');
 
             return false;
@@ -147,7 +147,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 
         if (count($results) !== 1) {
             // Destroy the cookie in the browser.
-            $this->app->input->cookie->set($cookieName, '', 1, $this->app->get('cookie_path', '/'), $this->app->get('cookie_domain', ''));
+            $this->app->getInput()->cookie->set($cookieName, '', 1, $this->app->get('cookie_path', '/'), $this->app->get('cookie_domain', ''));
             $response->status = Authentication::STATUS_FAILURE;
 
             return false;
@@ -177,7 +177,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
             }
 
             // Destroy the cookie in the browser.
-            $this->app->input->cookie->set($cookieName, '', 1, $this->app->get('cookie_path', '/'), $this->app->get('cookie_domain', ''));
+            $this->app->getInput()->cookie->set($cookieName, '', 1, $this->app->get('cookie_path', '/'), $this->app->get('cookie_domain', ''));
 
             // Issue warning by email to user and/or admin?
             Log::add(Text::sprintf('PLG_AUTHENTICATION_COOKIE_ERROR_LOG_LOGIN_FAILED', $results[0]->user_id), Log::WARNING, 'security');
@@ -245,15 +245,15 @@ public function onUserAfterLogin($options)
             $cookieName = 'joomla_remember_me_' . UserHelper::getShortHashedUserAgent();
 
             // We need the old data to get the existing series
-            $cookieValue = $this->app->input->cookie->get($cookieName);
+            $cookieValue = $this->app->getInput()->cookie->get($cookieName);
 
             // Try with old cookieName (pre 3.6.0) if not found
             if (!$cookieValue) {
                 $oldCookieName = UserHelper::getShortHashedUserAgent();
-                $cookieValue   = $this->app->input->cookie->get($oldCookieName);
+                $cookieValue   = $this->app->getInput()->cookie->get($oldCookieName);
 
                 // Destroy the old cookie in the browser
-                $this->app->input->cookie->set($oldCookieName, '', 1, $this->app->get('cookie_path', '/'), $this->app->get('cookie_domain', ''));
+                $this->app->getInput()->cookie->set($oldCookieName, '', 1, $this->app->get('cookie_path', '/'), $this->app->get('cookie_domain', ''));
             }
 
             $cookieArray = explode('.', $cookieValue);
@@ -305,7 +305,7 @@ public function onUserAfterLogin($options)
         $cookieValue = $token . '.' . $series;
 
         // Overwrite existing cookie with new value
-        $this->app->input->cookie->set(
+        $this->app->getInput()->cookie->set(
             $cookieName,
             $cookieValue,
             time() + $lifetime,
@@ -374,7 +374,7 @@ public function onUserAfterLogout($options)
         }
 
         $cookieName  = 'joomla_remember_me_' . UserHelper::getShortHashedUserAgent();
-        $cookieValue = $this->app->input->cookie->get($cookieName);
+        $cookieValue = $this->app->getInput()->cookie->get($cookieName);
 
         // There are no cookies to delete.
         if (!$cookieValue) {
@@ -400,7 +400,7 @@ public function onUserAfterLogout($options)
         }
 
         // Destroy the cookie
-        $this->app->input->cookie->set($cookieName, '', 1, $this->app->get('cookie_path', '/'), $this->app->get('cookie_domain', ''));
+        $this->app->getInput()->cookie->set($cookieName, '', 1, $this->app->get('cookie_path', '/'), $this->app->get('cookie_domain', ''));
 
         return true;
     }
diff --git a/plugins/behaviour/versionable/src/Extension/Versionable.php b/plugins/behaviour/versionable/src/Extension/Versionable.php
index b4205b2dfe36d..5f3efbac2a7f8 100644
--- a/plugins/behaviour/versionable/src/Extension/Versionable.php
+++ b/plugins/behaviour/versionable/src/Extension/Versionable.php
@@ -117,7 +117,7 @@ public function onTableAfterStore(AfterStoreEvent $event)
 
         $id     = $table->getId();
         $data   = $this->helper->getDataObject($table);
-        $input  = $this->getApplication()->input;
+        $input  = $this->getApplication()->getInput();
         $jform  = $input->get('jform', array(), 'array');
         $versionNote = '';
 
diff --git a/plugins/captcha/recaptcha/recaptcha.php b/plugins/captcha/recaptcha/recaptcha.php
index 7119a36a2fbc2..8772756965963 100644
--- a/plugins/captcha/recaptcha/recaptcha.php
+++ b/plugins/captcha/recaptcha/recaptcha.php
@@ -135,7 +135,7 @@ public function onDisplay($name = null, $id = 'dynamic_recaptcha_1', $class = ''
      */
     public function onCheckAnswer($code = null)
     {
-        $input      = Factory::getApplication()->input;
+        $input      = Factory::getApplication()->getInput();
         $privatekey = $this->params->get('private_key');
         $version    = $this->params->get('version', '2.0');
         $remoteip   = IpHelper::getIp();
diff --git a/plugins/captcha/recaptcha_invisible/recaptcha_invisible.php b/plugins/captcha/recaptcha_invisible/recaptcha_invisible.php
index 94196a8cccd67..bff1da87bb372 100644
--- a/plugins/captcha/recaptcha_invisible/recaptcha_invisible.php
+++ b/plugins/captcha/recaptcha_invisible/recaptcha_invisible.php
@@ -134,7 +134,7 @@ public function onDisplay($name = null, $id = 'dynamic_recaptcha_invisible_1', $
      */
     public function onCheckAnswer($code = null)
     {
-        $input      = Factory::getApplication()->input;
+        $input      = Factory::getApplication()->getInput();
         $privatekey = $this->params->get('private_key');
         $remoteip   = IpHelper::getIp();
 
diff --git a/plugins/content/joomla/joomla.php b/plugins/content/joomla/joomla.php
index 55d570c882165..a7e542a5b637d 100644
--- a/plugins/content/joomla/joomla.php
+++ b/plugins/content/joomla/joomla.php
@@ -234,7 +234,7 @@ private function _canDeleteCategories($data)
             return true;
         }
 
-        $extension = $this->app->input->getString('extension');
+        $extension = $this->app->getInput()->getString('extension');
 
         // Default to true if not a core extension
         $result = true;
diff --git a/plugins/content/pagebreak/pagebreak.php b/plugins/content/pagebreak/pagebreak.php
index e76f8710eb277..0396c9786aa26 100644
--- a/plugins/content/pagebreak/pagebreak.php
+++ b/plugins/content/pagebreak/pagebreak.php
@@ -74,7 +74,7 @@ public function onContentPrepare($context, &$row, &$params, $page = 0)
         // Expression to search for.
         $regex = '#<hr(.*)class="system-pagebreak"(.*)\/?>#iU';
 
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         $print = $input->getBool('print');
         $showall = $input->getBool('showall');
@@ -263,7 +263,7 @@ public function onContentPrepare($context, &$row, &$params, $page = 0)
     protected function _createToc(&$row, &$matches, &$page)
     {
         $heading     = $row->title ?? Text::_('PLG_CONTENT_PAGEBREAK_NO_TITLE');
-        $input       = Factory::getApplication()->input;
+        $input       = Factory::getApplication()->getInput();
         $limitstart  = $input->getUint('limitstart', 0);
         $showall     = $input->getInt('showall', 0);
         $headingtext = '';
diff --git a/plugins/content/pagenavigation/pagenavigation.php b/plugins/content/pagenavigation/pagenavigation.php
index 773dc814a06f4..d7a58f26c15e2 100644
--- a/plugins/content/pagenavigation/pagenavigation.php
+++ b/plugins/content/pagenavigation/pagenavigation.php
@@ -44,8 +44,8 @@ class PlgContentPagenavigation extends CMSPlugin
     public function onContentBeforeDisplay($context, &$row, &$params, $page = 0)
     {
         $app   = Factory::getApplication();
-        $view  = $app->input->get('view');
-        $print = $app->input->getBool('print');
+        $view  = $app->getInput()->get('view');
+        $print = $app->getInput()->getBool('print');
 
         if ($print) {
             return false;
diff --git a/plugins/content/vote/vote.php b/plugins/content/vote/vote.php
index a8f6fc269e776..be232652a1423 100644
--- a/plugins/content/vote/vote.php
+++ b/plugins/content/vote/vote.php
@@ -130,7 +130,7 @@ private function displayVotingData($context, &$row, &$params, $page)
         include $path;
         $html = ob_get_clean();
 
-        if ($this->app->input->getString('view', '') === 'article' && $row->state == 1) {
+        if ($this->app->getInput()->getString('view', '') === 'article' && $row->state == 1) {
             // Get the path for the voting form layout file
             $path = PluginHelper::getLayoutPath('content', 'vote', 'vote');
 
diff --git a/plugins/editors-xtd/fields/fields.php b/plugins/editors-xtd/fields/fields.php
index 8714dd62455dc..3abaf6760519f 100644
--- a/plugins/editors-xtd/fields/fields.php
+++ b/plugins/editors-xtd/fields/fields.php
@@ -53,7 +53,7 @@ public function onDisplay($name)
         }
 
         // Guess the field context based on view.
-        $jinput = Factory::getApplication()->input;
+        $jinput = Factory::getApplication()->getInput();
         $context = $jinput->get('option') . '.' . $jinput->get('view');
 
         // Special context for com_categories
diff --git a/plugins/editors-xtd/image/image.php b/plugins/editors-xtd/image/image.php
index 13eac64625380..c4390bdc78d13 100644
--- a/plugins/editors-xtd/image/image.php
+++ b/plugins/editors-xtd/image/image.php
@@ -51,11 +51,11 @@ public function onDisplay($name, $asset, $author)
         $app       = Factory::getApplication();
         $doc       = $app->getDocument();
         $user      = Factory::getUser();
-        $extension = $app->input->get('option');
+        $extension = $app->getInput()->get('option');
 
         // For categories we check the extension (ex: component.section)
         if ($extension === 'com_categories') {
-            $parts     = explode('.', $app->input->get('extension', 'com_content'));
+            $parts     = explode('.', $app->getInput()->get('extension', 'com_content'));
             $extension = $parts[0];
         }
 
diff --git a/plugins/installer/folderinstaller/tmpl/default.php b/plugins/installer/folderinstaller/tmpl/default.php
index 85ab4cd184b73..9f0bc8c6ec0ee 100644
--- a/plugins/installer/folderinstaller/tmpl/default.php
+++ b/plugins/installer/folderinstaller/tmpl/default.php
@@ -34,7 +34,7 @@
     </label>
     <div class="controls">
         <input type="text" id="install_directory" name="install_directory" class="form-control"
-            value="<?php echo $this->app->input->get('install_directory', $this->app->get('tmp_path')); ?>">
+            value="<?php echo $this->app->getInput()->get('install_directory', $this->app->get('tmp_path')); ?>">
     </div>
 </div>
 <div class="control-group">
diff --git a/plugins/installer/packageinstaller/tmpl/default.php b/plugins/installer/packageinstaller/tmpl/default.php
index 40f7992809723..4d1d3c82b811b 100644
--- a/plugins/installer/packageinstaller/tmpl/default.php
+++ b/plugins/installer/packageinstaller/tmpl/default.php
@@ -32,7 +32,7 @@
         ['core']
     );
 
-$return = $this->app->input->getBase64('return');
+$return = $this->app->getInput()->getBase64('return');
 $maxSizeBytes = FilesystemHelper::fileUploadMaxSize(false);
 $maxSize = HTMLHelper::_('number.bytes', $maxSizeBytes);
 ?>
diff --git a/plugins/installer/webinstaller/webinstaller.php b/plugins/installer/webinstaller/webinstaller.php
index ab007bdf31714..c1086eacd044f 100644
--- a/plugins/installer/webinstaller/webinstaller.php
+++ b/plugins/installer/webinstaller/webinstaller.php
@@ -153,7 +153,7 @@ private function isRTL()
     private function getInstallFrom()
     {
         if ($this->installfrom === null) {
-            $installfrom = base64_decode($this->app->input->getBase64('installfrom', ''));
+            $installfrom = base64_decode($this->app->getInput()->getBase64('installfrom', ''));
 
             $field = new SimpleXMLElement('<field></field>');
 
diff --git a/plugins/multifactorauth/webauthn/src/Extension/Webauthn.php b/plugins/multifactorauth/webauthn/src/Extension/Webauthn.php
index e6286cf098322..d8959c5a7c0ad 100644
--- a/plugins/multifactorauth/webauthn/src/Extension/Webauthn.php
+++ b/plugins/multifactorauth/webauthn/src/Extension/Webauthn.php
@@ -314,7 +314,7 @@ public function onUserMultifactorCaptive(Captive $event): void
         $session          = $this->getApplication()->getSession();
         $pkOptionsEncoded = $session->get('plg_multifactorauth_webauthn.publicKeyCredentialRequestOptions', null);
 
-        $force = $this->getApplication()->input->getInt('force', 0);
+        $force = $this->getApplication()->getInput()->getInt('force', 0);
 
         try {
             if ($force) {
diff --git a/plugins/quickicon/phpversioncheck/phpversioncheck.php b/plugins/quickicon/phpversioncheck/phpversioncheck.php
index 5865c7b13689c..55914483e25df 100644
--- a/plugins/quickicon/phpversioncheck/phpversioncheck.php
+++ b/plugins/quickicon/phpversioncheck/phpversioncheck.php
@@ -226,12 +226,12 @@ private function shouldDisplayMessage()
         }
 
         // Only on full page requests
-        if ($this->app->input->getCmd('tmpl', 'index') === 'component') {
+        if ($this->app->getInput()->getCmd('tmpl', 'index') === 'component') {
             return false;
         }
 
         // Only to com_cpanel
-        if ($this->app->input->get('option') !== 'com_cpanel') {
+        if ($this->app->getInput()->get('option') !== 'com_cpanel') {
             return false;
         }
 
diff --git a/plugins/sampledata/blog/blog.php b/plugins/sampledata/blog/blog.php
index 97febc9f2dc06..1db0e788806b4 100644
--- a/plugins/sampledata/blog/blog.php
+++ b/plugins/sampledata/blog/blog.php
@@ -96,7 +96,7 @@ public function onSampledataGetOverview()
      */
     public function onAjaxSampledataApplyStep1()
     {
-        if (!Session::checkToken('get') || $this->app->input->get('type') != $this->_name) {
+        if (!Session::checkToken('get') || $this->app->getInput()->get('type') != $this->_name) {
             return;
         }
 
@@ -789,7 +789,7 @@ public function onAjaxSampledataApplyStep1()
      */
     public function onAjaxSampledataApplyStep2()
     {
-        if (!Session::checkToken('get') || $this->app->input->get('type') != $this->_name) {
+        if (!Session::checkToken('get') || $this->app->getInput()->get('type') != $this->_name) {
             return;
         }
 
@@ -1336,7 +1336,7 @@ public function onAjaxSampledataApplyStep2()
      */
     public function onAjaxSampledataApplyStep3()
     {
-        if (!Session::checkToken('get') || $this->app->input->get('type') != $this->_name) {
+        if (!Session::checkToken('get') || $this->app->getInput()->get('type') != $this->_name) {
             return;
         }
 
@@ -1772,7 +1772,7 @@ public function onAjaxSampledataApplyStep3()
      */
     public function onAjaxSampledataApplyStep4()
     {
-        if ($this->app->input->get('type') != $this->_name) {
+        if ($this->app->getInput()->get('type') != $this->_name) {
             return;
         }
 
diff --git a/plugins/sampledata/multilang/multilang.php b/plugins/sampledata/multilang/multilang.php
index 75fb70e1230ed..f52705dd1374e 100644
--- a/plugins/sampledata/multilang/multilang.php
+++ b/plugins/sampledata/multilang/multilang.php
@@ -105,7 +105,7 @@ public function onSampledataGetOverview()
      */
     public function onAjaxSampledataApplyStep1()
     {
-        if (!Session::checkToken('get') || $this->app->input->get('type') != $this->_name) {
+        if (!Session::checkToken('get') || $this->app->getInput()->get('type') != $this->_name) {
             return;
         }
 
@@ -148,7 +148,7 @@ public function onAjaxSampledataApplyStep1()
      */
     public function onAjaxSampledataApplyStep2()
     {
-        if (!Session::checkToken('get') || $this->app->input->get('type') != $this->_name) {
+        if (!Session::checkToken('get') || $this->app->getInput()->get('type') != $this->_name) {
             return;
         }
 
@@ -189,7 +189,7 @@ public function onAjaxSampledataApplyStep2()
      */
     public function onAjaxSampledataApplyStep3()
     {
-        if (!Session::checkToken('get') || $this->app->input->get('type') != $this->_name) {
+        if (!Session::checkToken('get') || $this->app->getInput()->get('type') != $this->_name) {
             return;
         }
 
@@ -225,7 +225,7 @@ public function onAjaxSampledataApplyStep3()
      */
     public function onAjaxSampledataApplyStep4()
     {
-        if (!Session::checkToken('get') || $this->app->input->get('type') != $this->_name) {
+        if (!Session::checkToken('get') || $this->app->getInput()->get('type') != $this->_name) {
             return;
         }
 
@@ -283,7 +283,7 @@ public function onAjaxSampledataApplyStep4()
      */
     public function onAjaxSampledataApplyStep5()
     {
-        if (!Session::checkToken('get') || $this->app->input->get('type') != $this->_name) {
+        if (!Session::checkToken('get') || $this->app->getInput()->get('type') != $this->_name) {
             return;
         }
 
@@ -323,7 +323,7 @@ public function onAjaxSampledataApplyStep5()
      */
     public function onAjaxSampledataApplyStep6()
     {
-        if (!Session::checkToken('get') || $this->app->input->get('type') != $this->_name) {
+        if (!Session::checkToken('get') || $this->app->getInput()->get('type') != $this->_name) {
             return;
         }
 
@@ -403,7 +403,7 @@ public function onAjaxSampledataApplyStep6()
      */
     public function onAjaxSampledataApplyStep7()
     {
-        if (!Session::checkToken('get') || $this->app->input->get('type') != $this->_name) {
+        if (!Session::checkToken('get') || $this->app->getInput()->get('type') != $this->_name) {
             return;
         }
 
@@ -439,7 +439,7 @@ public function onAjaxSampledataApplyStep7()
      */
     public function onAjaxSampledataApplyStep8()
     {
-        if ($this->app->input->get('type') !== $this->_name) {
+        if ($this->app->getInput()->get('type') !== $this->_name) {
             return;
         }
 
diff --git a/plugins/sampledata/testing/testing.php b/plugins/sampledata/testing/testing.php
index ab53f071bd57f..3dc849ec36986 100644
--- a/plugins/sampledata/testing/testing.php
+++ b/plugins/sampledata/testing/testing.php
@@ -103,7 +103,7 @@ public function onSampledataGetOverview()
      */
     public function onAjaxSampledataApplyStep1()
     {
-        if ($this->app->input->get('type') !== $this->_name) {
+        if ($this->app->getInput()->get('type') !== $this->_name) {
             return;
         }
 
@@ -200,7 +200,7 @@ public function onAjaxSampledataApplyStep1()
      */
     public function onAjaxSampledataApplyStep2()
     {
-        if ($this->app->input->get('type') !== $this->_name) {
+        if ($this->app->getInput()->get('type') !== $this->_name) {
             return;
         }
 
@@ -364,7 +364,7 @@ public function onAjaxSampledataApplyStep2()
      */
     public function onAjaxSampledataApplyStep3()
     {
-        if ($this->app->input->get('type') !== $this->_name) {
+        if ($this->app->getInput()->get('type') !== $this->_name) {
             return;
         }
 
@@ -583,7 +583,7 @@ public function onAjaxSampledataApplyStep3()
      */
     public function onAjaxSampledataApplyStep4()
     {
-        if ($this->app->input->get('type') !== $this->_name) {
+        if ($this->app->getInput()->get('type') !== $this->_name) {
             return;
         }
 
@@ -992,7 +992,7 @@ public function onAjaxSampledataApplyStep4()
      */
     public function onAjaxSampledataApplyStep5()
     {
-        if ($this->app->input->get('type') !== $this->_name) {
+        if ($this->app->getInput()->get('type') !== $this->_name) {
             return;
         }
 
@@ -1319,7 +1319,7 @@ public function onAjaxSampledataApplyStep5()
      */
     public function onAjaxSampledataApplyStep6()
     {
-        if ($this->app->input->get('type') !== $this->_name) {
+        if ($this->app->getInput()->get('type') !== $this->_name) {
             return;
         }
 
@@ -1437,7 +1437,7 @@ public function onAjaxSampledataApplyStep6()
      */
     public function onAjaxSampledataApplyStep7()
     {
-        if ($this->app->input->get('type') !== $this->_name) {
+        if ($this->app->getInput()->get('type') !== $this->_name) {
             return;
         }
 
@@ -3122,7 +3122,7 @@ public function onAjaxSampledataApplyStep7()
      */
     public function onAjaxSampledataApplyStep8()
     {
-        if ($this->app->input->get('type') !== $this->_name) {
+        if ($this->app->getInput()->get('type') !== $this->_name) {
             return;
         }
 
diff --git a/plugins/system/accessibility/accessibility.php b/plugins/system/accessibility/accessibility.php
index 4bf7f8d9ae237..8e518ee5f9ed1 100644
--- a/plugins/system/accessibility/accessibility.php
+++ b/plugins/system/accessibility/accessibility.php
@@ -55,7 +55,7 @@ public function onBeforeCompileHead()
         }
 
         // Are we in a modal?
-        if ($this->app->input->get('tmpl', '', 'cmd') === 'component') {
+        if ($this->app->getInput()->get('tmpl', '', 'cmd') === 'component') {
             return;
         }
 
diff --git a/plugins/system/actionlogs/actionlogs.php b/plugins/system/actionlogs/actionlogs.php
index aced528c949e9..ebd60ffc080bb 100644
--- a/plugins/system/actionlogs/actionlogs.php
+++ b/plugins/system/actionlogs/actionlogs.php
@@ -110,7 +110,7 @@ public function onContentPrepareForm(Form $form, $data)
 		}
 
 		// If we are on the save command, no data is passed to $data variable, we need to get it directly from request
-		$jformData = $this->app->input->get('jform', [], 'array');
+		$jformData = $this->app->getInput()->get('jform', [], 'array');
 
 		if ($jformData && !$data)
 		{
diff --git a/plugins/system/cache/src/Extension/Cache.php b/plugins/system/cache/src/Extension/Cache.php
index 689af89340265..7a1b36b749c27 100644
--- a/plugins/system/cache/src/Extension/Cache.php
+++ b/plugins/system/cache/src/Extension/Cache.php
@@ -173,7 +173,7 @@ public function onAfterRoute(Event $event)
 		{
 			// Create a document instance and load it into the application.
 			$document = $this->documentFactory
-				->createDocument($this->getApplication()->input->get('format', 'html'));
+				->createDocument($this->getApplication()->getInput()->get('format', 'html'));
 			$this->getApplication()->loadDocument($document);
 
 			if ($this->profiler)
@@ -215,7 +215,7 @@ private function appStateSupportsCaching(): bool
 		if ($isSite === null)
 		{
 			$isSite = $this->getApplication()->isClient('site');
-			$isGET  = $this->getApplication()->input->getMethod() === 'GET';
+			$isGET  = $this->getApplication()->getInput()->getMethod() === 'GET';
 		}
 
 		// Boolean short–circuit evaluation means this returns fast false when $isSite is false.
diff --git a/plugins/system/debug/debug.php b/plugins/system/debug/debug.php
index 02d6acade7836..e5ac7be72cbb5 100644
--- a/plugins/system/debug/debug.php
+++ b/plugins/system/debug/debug.php
@@ -200,8 +200,8 @@ public function __construct(&$subject, $config)
         $this->debugBar->setStorage(new FileStorage($storagePath));
         $this->debugBar->setHttpDriver(new JoomlaHttpDriver($this->app));
 
-        $this->isAjax = $this->app->input->get('option') === 'com_ajax'
-            && $this->app->input->get('plugin') === 'debug' && $this->app->input->get('group') === 'system';
+        $this->isAjax = $this->app->getInput()->get('option') === 'com_ajax'
+            && $this->app->getInput()->get('plugin') === 'debug' && $this->app->getInput()->get('group') === 'system';
 
         $this->showLogs = (bool) $this->params->get('logs', true);
 
@@ -378,12 +378,12 @@ public function onAjaxDebug($event)
             return;
         }
 
-        switch ($this->app->input->get('action')) {
+        switch ($this->app->getInput()->get('action')) {
             case 'openhandler':
                 $result  = $event['result'] ?: [];
                 $handler = new OpenHandler($this->debugBar);
 
-                $result[] = $handler->handle($this->app->input->request->getArray(), false, false);
+                $result[] = $handler->handle($this->app->getInput()->request->getArray(), false, false);
                 $event['result'] = $result;
         }
     }
diff --git a/plugins/system/fields/fields.php b/plugins/system/fields/fields.php
index 3c5e15cdb9b82..5278db7d36506 100644
--- a/plugins/system/fields/fields.php
+++ b/plugins/system/fields/fields.php
@@ -177,7 +177,7 @@ public function onUserAfterSave($userData, $isNew, $success, $msg): void
 
         $user = Factory::getUser($userData['id']);
 
-        $task = Factory::getApplication()->input->getCmd('task');
+        $task = Factory::getApplication()->getInput()->getCmd('task');
 
         // Skip fields save when we activate a user, because we will lose the saved data
         if (in_array($task, array('activate', 'block', 'unblock'))) {
@@ -250,7 +250,7 @@ public function onContentPrepareForm(Form $form, $data)
         // When a category is edited, the context is com_categories.categorycom_content
         if (strpos($context, 'com_categories.category') === 0) {
             $context = str_replace('com_categories.category', '', $context) . '.categories';
-            $data    = $data ?: Factory::getApplication()->input->get('jform', [], 'array');
+            $data    = $data ?: Factory::getApplication()->getInput()->get('jform', [], 'array');
 
             // Set the catid on the category to get only the fields which belong to this category
             if (is_array($data) && array_key_exists('id', $data)) {
@@ -268,7 +268,7 @@ public function onContentPrepareForm(Form $form, $data)
             return true;
         }
 
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         // If we are on the save command we need the actual data
         $jformData = $input->get('jform', array(), 'array');
diff --git a/plugins/system/highlight/highlight.php b/plugins/system/highlight/highlight.php
index 7147155dbe1ab..473a1d836493a 100644
--- a/plugins/system/highlight/highlight.php
+++ b/plugins/system/highlight/highlight.php
@@ -54,7 +54,7 @@ public function onAfterDispatch()
         }
 
         // Set the variables.
-        $input     = $this->app->input;
+        $input     = $this->app->getInput();
         $extension = $input->get('option', '', 'cmd');
 
         // Check if the highlighter is enabled.
diff --git a/plugins/system/jooa11y/jooa11y.php b/plugins/system/jooa11y/jooa11y.php
index 0fb5f6d422367..83f2d5ab83fdd 100644
--- a/plugins/system/jooa11y/jooa11y.php
+++ b/plugins/system/jooa11y/jooa11y.php
@@ -107,7 +107,7 @@ private function isAuthorisedDisplayChecker(): bool
     public function initJooa11y()
     {
         // Check if we are in a preview modal or the plugin has enforced loading
-        $showJooa11y = $this->app->input->get('jooa11y', $this->params->get('showAlways', 0));
+        $showJooa11y = $this->app->getInput()->get('jooa11y', $this->params->get('showAlways', 0));
 
         // Load the checker if authorised
         if (!$showJooa11y || !$this->isAuthorisedDisplayChecker()) {
diff --git a/plugins/system/languagefilter/languagefilter.php b/plugins/system/languagefilter/languagefilter.php
index 4ae5c8e2a7493..6bc85a22f8bfc 100644
--- a/plugins/system/languagefilter/languagefilter.php
+++ b/plugins/system/languagefilter/languagefilter.php
@@ -373,10 +373,10 @@ public function parseRule(&$router, &$uri)
         // We are called via POST or the nolangfilter url parameter was set. We don't care about the language
         // and simply set the default language as our current language.
         if (
-            $this->app->input->getMethod() === 'POST'
-            || $this->app->input->get('nolangfilter', 0) == 1
-            || count($this->app->input->post) > 0
-            || count($this->app->input->files) > 0
+            $this->app->getInput()->getMethod() === 'POST'
+            || $this->app->getInput()->get('nolangfilter', 0) == 1
+            || count($this->app->getInput()->post) > 0
+            || count($this->app->getInput()->files) > 0
         ) {
             $found = true;
 
@@ -456,7 +456,7 @@ public function parseRule(&$router, &$uri)
         $this->current_lang = $lang_code;
 
         // Set the request var.
-        $this->app->input->set('language', $lang_code);
+        $this->app->getInput()->set('language', $lang_code);
         $this->app->set('language', $lang_code);
         $language = $this->app->getLanguage();
 
@@ -714,7 +714,7 @@ public function onAfterDispatch()
             }
 
             // Load component associations.
-            $option = $this->app->input->get('option');
+            $option = $this->app->getInput()->get('option');
 
             $component = $this->app->bootComponent($option);
 
@@ -806,7 +806,7 @@ private function setLanguageCookie($languageCode)
         // If is set to use language cookie for a year in plugin params, save the user language in a new cookie.
         if ((int) $this->params->get('lang_cookie', 0) === 1) {
             // Create a cookie with one year lifetime.
-            $this->app->input->cookie->set(
+            $this->app->getInput()->cookie->set(
                 ApplicationHelper::getHash('language'),
                 $languageCode,
                 time() + 365 * 86400,
@@ -832,7 +832,7 @@ private function getLanguageCookie()
     {
         // Is is set to use a year language cookie in plugin params, get the user language from the cookie.
         if ((int) $this->params->get('lang_cookie', 0) === 1) {
-            $languageCode = $this->app->input->cookie->get(ApplicationHelper::getHash('language'));
+            $languageCode = $this->app->getInput()->cookie->get(ApplicationHelper::getHash('language'));
         } else {
             // Else get the user language from the session.
             $languageCode = $this->app->getSession()->get('plg_system_languagefilter.language');
diff --git a/plugins/system/logout/logout.php b/plugins/system/logout/logout.php
index 866c27d773f15..85af72dbfcca1 100644
--- a/plugins/system/logout/logout.php
+++ b/plugins/system/logout/logout.php
@@ -57,9 +57,9 @@ public function __construct(&$subject, $config)
 
         $hash  = ApplicationHelper::getHash('PlgSystemLogout');
 
-        if ($this->app->input->cookie->getString($hash)) {
+        if ($this->app->getInput()->cookie->getString($hash)) {
             // Destroy the cookie.
-            $this->app->input->cookie->set(
+            $this->app->getInput()->cookie->set(
                 $hash,
                 '',
                 1,
@@ -83,7 +83,7 @@ public function onUserLogout($user, $options = [])
     {
         if ($this->app->isClient('site')) {
             // Create the cookie.
-            $this->app->input->cookie->set(
+            $this->app->getInput()->cookie->set(
                 ApplicationHelper::getHash('PlgSystemLogout'),
                 true,
                 time() + 86400,
diff --git a/plugins/system/privacyconsent/privacyconsent.php b/plugins/system/privacyconsent/privacyconsent.php
index f8d70d117ff76..ad7704f1130f7 100644
--- a/plugins/system/privacyconsent/privacyconsent.php
+++ b/plugins/system/privacyconsent/privacyconsent.php
@@ -134,9 +134,9 @@ public function onUserBeforeSave($user, $isNew, $data)
         }
 
         // Check that the privacy is checked if required ie only in registration from frontend.
-        $option = $this->app->input->get('option');
-        $task   = $this->app->input->post->get('task');
-        $form   = $this->app->input->post->get('jform', [], 'array');
+        $option = $this->app->getInput()->get('option');
+        $task   = $this->app->getInput()->post->get('task');
+        $form   = $this->app->getInput()->post->get('jform', [], 'array');
 
         if (
             $option == 'com_users' && in_array($task, array('registration.register', 'profile.save'))
@@ -175,9 +175,9 @@ public function onUserAfterSave($data, $isNew, $result, $error): void
             return;
         }
 
-        $option = $this->app->input->get('option');
-        $task   = $this->app->input->post->get('task');
-        $form   = $this->app->input->post->get('jform', [], 'array');
+        $option = $this->app->getInput()->get('option');
+        $task   = $this->app->getInput()->post->get('task');
+        $form   = $this->app->getInput()->post->get('jform', [], 'array');
 
         if (
             $option == 'com_users'
@@ -187,10 +187,10 @@ public function onUserAfterSave($data, $isNew, $result, $error): void
             $userId = ArrayHelper::getValue($data, 'id', 0, 'int');
 
             // Get the user's IP address
-            $ip = $this->app->input->server->get('REMOTE_ADDR', '', 'string');
+            $ip = $this->app->getInput()->server->get('REMOTE_ADDR', '', 'string');
 
             // Get the user agent string
-            $userAgent = $this->app->input->server->get('HTTP_USER_AGENT', '', 'string');
+            $userAgent = $this->app->getInput()->server->get('HTTP_USER_AGENT', '', 'string');
 
             // Create the user note
             $userNote = (object) [
@@ -284,11 +284,11 @@ public function onAfterRoute()
                 return;
             }
 
-            $option = $this->app->input->getCmd('option');
-            $task   = $this->app->input->get('task');
-            $view   = $this->app->input->getString('view', '');
-            $layout = $this->app->input->getString('layout', '');
-            $id     = $this->app->input->getInt('id');
+            $option = $this->app->getInput()->getCmd('option');
+            $task   = $this->app->getInput()->get('task');
+            $view   = $this->app->getInput()->getString('view', '');
+            $layout = $this->app->getInput()->getString('layout', '');
+            $id     = $this->app->getInput()->getInt('id');
 
             $privacyArticleId = $this->getPrivacyArticleId();
 
diff --git a/plugins/system/redirect/redirect.php b/plugins/system/redirect/redirect.php
index a8797c7d14050..f6b0645fde482 100644
--- a/plugins/system/redirect/redirect.php
+++ b/plugins/system/redirect/redirect.php
@@ -248,7 +248,7 @@ public function handleError(ErrorEvent $event)
                 $data = (object) array(
                     'id' => 0,
                     'old_url' => $url,
-                    'referer' => $app->input->server->getString('HTTP_REFERER', ''),
+                    'referer' => $app->getInput()->server->getString('HTTP_REFERER', ''),
                     'hits' => 1,
                     'published' => 0,
                     'created_date' => $nowDate,
diff --git a/plugins/system/remember/remember.php b/plugins/system/remember/remember.php
index 14e430827396a..15484186fda9e 100644
--- a/plugins/system/remember/remember.php
+++ b/plugins/system/remember/remember.php
@@ -63,7 +63,7 @@ public function onAfterInitialise()
             $cookieName = 'joomla_remember_me_' . UserHelper::getShortHashedUserAgent();
 
             // Check for the cookie
-            if ($this->app->input->cookie->get($cookieName)) {
+            if ($this->app->getInput()->cookie->get($cookieName)) {
                 $this->app->login(['username' => ''], ['silent' => true]);
             }
         }
@@ -87,7 +87,7 @@ public function onUserLogout($user, $options)
         $cookieName = 'joomla_remember_me_' . UserHelper::getShortHashedUserAgent();
 
         // Check for the cookie
-        if ($this->app->input->cookie->get($cookieName)) {
+        if ($this->app->getInput()->cookie->get($cookieName)) {
             // Make sure authentication group is loaded to process onUserAfterLogout event
             PluginHelper::importPlugin('authentication');
         }
diff --git a/plugins/system/schedulerunner/schedulerunner.php b/plugins/system/schedulerunner/schedulerunner.php
index e82aa5c8ba329..0d6238763c9e4 100644
--- a/plugins/system/schedulerunner/schedulerunner.php
+++ b/plugins/system/schedulerunner/schedulerunner.php
@@ -214,11 +214,11 @@ public function runWebCron(Event $event)
             throw new Exception(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
-        if (!strlen($hash) || $hash !== $this->app->input->get('hash')) {
+        if (!strlen($hash) || $hash !== $this->app->getInput()->get('hash')) {
             throw new Exception(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
-        $id = (int) $this->app->input->getInt('id', 0);
+        $id = (int) $this->app->getInput()->getInt('id', 0);
 
         $task = $this->runScheduler($id);
 
@@ -246,8 +246,8 @@ public function runTestCron(Event $event)
             return;
         }
 
-        $id = (int) $this->app->input->getInt('id');
-        $allowConcurrent = $this->app->input->getBool('allowConcurrent', false);
+        $id = (int) $this->app->getInput()->getInt('id');
+        $allowConcurrent = $this->app->getInput()->getBool('allowConcurrent', false);
 
         $user = Factory::getApplication()->getIdentity();
 
@@ -321,7 +321,7 @@ public function enhanceSchedulerConfig(EventInterface $event): void
 
         if (
             $form->getName() !== 'com_config.component'
-            || $this->app->input->get('component') !== 'com_scheduler'
+            || $this->app->getInput()->get('component') !== 'com_scheduler'
         ) {
             return;
         }
diff --git a/plugins/system/shortcut/src/Extension/Shortcut.php b/plugins/system/shortcut/src/Extension/Shortcut.php
index 411f0733527ec..f4e413913c850 100644
--- a/plugins/system/shortcut/src/Extension/Shortcut.php
+++ b/plugins/system/shortcut/src/Extension/Shortcut.php
@@ -75,7 +75,7 @@ public function initialize()
             return;
         }
 
-        $context = $this->getApplication()->input->get('option') . '.' . $this->getApplication()->input->get('view');
+        $context = $this->getApplication()->getInput()->get('option') . '.' . $this->getApplication()->getInput()->get('view');
 
         $shortcuts = [];
 
diff --git a/plugins/system/skipto/skipto.php b/plugins/system/skipto/skipto.php
index 785e5b624f823..89bbc1e711790 100644
--- a/plugins/system/skipto/skipto.php
+++ b/plugins/system/skipto/skipto.php
@@ -56,7 +56,7 @@ public function onAfterDispatch()
         }
 
         // Are we in a modal?
-        if ($this->app->input->get('tmpl', '', 'cmd') === 'component') {
+        if ($this->app->getInput()->get('tmpl', '', 'cmd') === 'component') {
             return;
         }
 
diff --git a/plugins/system/stats/stats.php b/plugins/system/stats/stats.php
index 28670a5e8af4c..22297c9dd1224 100644
--- a/plugins/system/stats/stats.php
+++ b/plugins/system/stats/stats.php
@@ -419,7 +419,7 @@ private function isUpdateRequired()
      */
     private function isAjaxRequest()
     {
-        return strtolower($this->app->input->server->get('HTTP_X_REQUESTED_WITH', '')) === 'xmlhttprequest';
+        return strtolower($this->app->getInput()->server->get('HTTP_X_REQUESTED_WITH', '')) === 'xmlhttprequest';
     }
 
     /**
diff --git a/plugins/system/webauthn/src/PluginTraits/AjaxHandler.php b/plugins/system/webauthn/src/PluginTraits/AjaxHandler.php
index 988017d7eed76..a4095bf7de6f3 100644
--- a/plugins/system/webauthn/src/PluginTraits/AjaxHandler.php
+++ b/plugins/system/webauthn/src/PluginTraits/AjaxHandler.php
@@ -57,7 +57,7 @@ trait AjaxHandler
      */
     public function onAjaxWebauthn(Ajax $event): void
     {
-        $input = $this->getApplication()->input;
+        $input = $this->getApplication()->getInput();
 
         // Get the return URL from the session
         $returnURL = $this->getApplication()->getSession()->get('plg_system_webauthn.returnUrl', Uri::base());
diff --git a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerChallenge.php b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerChallenge.php
index 06ebefead178b..d4f2ec6843398 100644
--- a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerChallenge.php
+++ b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerChallenge.php
@@ -48,7 +48,7 @@ public function onAjaxWebauthnChallenge(AjaxChallenge $event): void
     {
         // Initialize objects
         $session    = $this->getApplication()->getSession();
-        $input      = $this->getApplication()->input;
+        $input      = $this->getApplication()->getInput();
 
         // Retrieve data from the request
         $username  = $input->getUsername('username', '');
diff --git a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerCreate.php b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerCreate.php
index 68fa5e3236d94..129536e5b2de9 100644
--- a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerCreate.php
+++ b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerCreate.php
@@ -75,7 +75,7 @@ public function onAjaxWebauthnCreate(AjaxCreate $event): void
 
         // Try to validate the browser data. If there's an error I won't save anything and pass the message to the GUI.
         try {
-            $input = $this->getApplication()->input;
+            $input = $this->getApplication()->getInput();
 
             // Retrieve the data sent by the device
             $data = $input->get('data', '', 'raw');
diff --git a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerDelete.php b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerDelete.php
index 59636d9688302..b7238650baa4e 100644
--- a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerDelete.php
+++ b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerDelete.php
@@ -39,7 +39,7 @@ trait AjaxHandlerDelete
     public function onAjaxWebauthnDelete(AjaxDelete $event): void
     {
         // Initialize objects
-        $input      = $this->getApplication()->input;
+        $input      = $this->getApplication()->getInput();
         $repository = $this->authenticationHelper->getCredentialsRepository();
 
         // Retrieve data from the request
diff --git a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerLogin.php b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerLogin.php
index a2d441cb54ec5..9f184a8a6c437 100644
--- a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerLogin.php
+++ b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerLogin.php
@@ -299,7 +299,7 @@ private function getUserHandleFromResponse(User $user): ?string
     {
         // Retrieve data from the request and session
         $pubKeyCredentialSource = $this->authenticationHelper->validateAssertionResponse(
-            $this->getApplication()->input->getBase64('data', ''),
+            $this->getApplication()->getInput()->getBase64('data', ''),
             $user
         );
 
diff --git a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerSaveLabel.php b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerSaveLabel.php
index bedb50f2ff166..5147cbab4e78c 100644
--- a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerSaveLabel.php
+++ b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerSaveLabel.php
@@ -39,7 +39,7 @@ trait AjaxHandlerSaveLabel
     public function onAjaxWebauthnSavelabel(AjaxSaveLabel $event): void
     {
         // Initialize objects
-        $input      = $this->getApplication()->input;
+        $input      = $this->getApplication()->getInput();
         $repository = $this->authenticationHelper->getCredentialsRepository();
 
         // Retrieve data from the request
diff --git a/plugins/user/joomla/joomla.php b/plugins/user/joomla/joomla.php
index 82bbc992ae634..3ee0dbba99e49 100644
--- a/plugins/user/joomla/joomla.php
+++ b/plugins/user/joomla/joomla.php
@@ -68,7 +68,7 @@ public function onContentPrepareForm($form, $data)
             // In case there is a validation error (like duplicated user), $data is an empty array on save.
             // After returning from error, $data is an array but populated
             if (!$data) {
-                $data = Factory::getApplication()->input->get('jform', array(), 'array');
+                $data = Factory::getApplication()->getInput()->get('jform', array(), 'array');
             }
 
             if (is_array($data)) {
@@ -323,7 +323,7 @@ public function onUserLogin($user, $options = [])
 
         // Add "user state" cookie used for reverse caching proxies like Varnish, Nginx etc.
         if ($this->app->isClient('site')) {
-            $this->app->input->cookie->set(
+            $this->app->getInput()->cookie->set(
                 'joomla_user_state',
                 'logged_in',
                 0,
@@ -380,7 +380,7 @@ public function onUserLogout($user, $options = [])
 
         // Delete "user state" cookie used for reverse caching proxies like Varnish, Nginx etc.
         if ($this->app->isClient('site')) {
-            $this->app->input->cookie->set('joomla_user_state', '', 1, $this->app->get('cookie_path', '/'), $this->app->get('cookie_domain', ''));
+            $this->app->getInput()->cookie->set('joomla_user_state', '', 1, $this->app->get('cookie_path', '/'), $this->app->get('cookie_domain', ''));
         }
 
         return true;
diff --git a/plugins/user/profile/profile.php b/plugins/user/profile/profile.php
index 55cffea7073fc..0d68bfb75c952 100644
--- a/plugins/user/profile/profile.php
+++ b/plugins/user/profile/profile.php
@@ -330,8 +330,8 @@ public function onUserBeforeSave($user, $isnew, $data)
         }
 
         // Check that the tos is checked if required ie only in registration from frontend.
-        $task       = $this->app->input->getCmd('task');
-        $option     = $this->app->input->getCmd('option');
+        $task       = $this->app->getInput()->getCmd('task');
+        $option     = $this->app->getInput()->getCmd('option');
         $tosEnabled = ($this->params->get('register-require_tos', 0) == 2);
 
         // Check that the tos is checked.
diff --git a/plugins/user/terms/terms.php b/plugins/user/terms/terms.php
index d1be25f388482..1e10d24503a1d 100644
--- a/plugins/user/terms/terms.php
+++ b/plugins/user/terms/terms.php
@@ -110,9 +110,9 @@ public function onUserBeforeSave($user, $isNew, $data)
         }
 
         // Check that the terms is checked if required ie only in registration from frontend.
-        $option = $this->app->input->get('option');
-        $task   = $this->app->input->post->get('task');
-        $form   = $this->app->input->post->get('jform', [], 'array');
+        $option = $this->app->getInput()->get('option');
+        $task   = $this->app->getInput()->post->get('task');
+        $form   = $this->app->getInput()->post->get('jform', [], 'array');
 
         if ($option == 'com_users' && in_array($task, ['registration.register']) && empty($form['terms']['terms'])) {
             throw new InvalidArgumentException(Text::_('PLG_USER_TERMS_FIELD_ERROR'));
diff --git a/plugins/user/token/token.php b/plugins/user/token/token.php
index 9fc10f42f7b31..e7a47b5e157a7 100644
--- a/plugins/user/token/token.php
+++ b/plugins/user/token/token.php
@@ -164,7 +164,7 @@ public function onContentPrepareData(string $context, &$data): bool
          * generic and we run the risk of creating naming clashes. Instead, we manipulate the data
          * directly.
          */
-        if (($context === 'com_users.profile') && ($this->app->input->get('layout') !== 'edit')) {
+        if (($context === 'com_users.profile') && ($this->app->getInput()->get('layout') !== 'edit')) {
             $pluginData = $data->{$this->profileKeyPrefix} ?? [];
             $enabled    = $pluginData['enabled'] ?? false;
             $token      = $pluginData['token'] ?? '';
@@ -208,7 +208,7 @@ public function onContentPrepareForm(Form $form, $data): bool
         }
 
         // If we are on the save command, no data is passed to $data variable, we need to get it directly from request
-        $jformData = $this->app->input->get('jform', [], 'array');
+        $jformData = $this->app->getInput()->get('jform', [], 'array');
 
         if ($jformData && !$data) {
             $data = $jformData;
@@ -255,7 +255,7 @@ public function onContentPrepareForm(Form $form, $data): bool
         }
 
         // Remove the Reset field when displaying the user profile form
-        if (($form->getName() === 'com_users.profile') && ($this->app->input->get('layout') !== 'edit')) {
+        if (($form->getName() === 'com_users.profile') && ($this->app->getInput()->get('layout') !== 'edit')) {
             $form->removeField('reset', 'joomlatoken');
         }
 
diff --git a/templates/cassiopeia/error.php b/templates/cassiopeia/error.php
index 4dbb6e7f93996..a18bbbbd342c1 100644
--- a/templates/cassiopeia/error.php
+++ b/templates/cassiopeia/error.php
@@ -21,11 +21,11 @@
 $wa  = $this->getWebAssetManager();
 
 // Detecting Active Variables
-$option   = $app->input->getCmd('option', '');
-$view     = $app->input->getCmd('view', '');
-$layout   = $app->input->getCmd('layout', '');
-$task     = $app->input->getCmd('task', '');
-$itemid   = $app->input->getCmd('Itemid', '');
+$option   = $app->getInput()->getCmd('option', '');
+$view     = $app->getInput()->getCmd('view', '');
+$layout   = $app->getInput()->getCmd('layout', '');
+$task     = $app->getInput()->getCmd('task', '');
+$itemid   = $app->getInput()->getCmd('Itemid', '');
 $sitename = htmlspecialchars($app->get('sitename'), ENT_QUOTES, 'UTF-8');
 $menu     = $app->getMenu()->getActive();
 $pageclass = $menu !== null ? $menu->getParams()->get('pageclass_sfx', '') : '';
diff --git a/templates/cassiopeia/index.php b/templates/cassiopeia/index.php
index c1f6c14868417..be01b7305b865 100644
--- a/templates/cassiopeia/index.php
+++ b/templates/cassiopeia/index.php
@@ -26,11 +26,11 @@
 $this->addHeadLink(HTMLHelper::_('image', 'joomla-favicon-pinned.svg', '', [], true, 1), 'mask-icon', 'rel', ['color' => '#000']);
 
 // Detecting Active Variables
-$option   = $app->input->getCmd('option', '');
-$view     = $app->input->getCmd('view', '');
-$layout   = $app->input->getCmd('layout', '');
-$task     = $app->input->getCmd('task', '');
-$itemid   = $app->input->getCmd('Itemid', '');
+$option   = $app->getInput()->getCmd('option', '');
+$view     = $app->getInput()->getCmd('view', '');
+$layout   = $app->getInput()->getCmd('layout', '');
+$task     = $app->getInput()->getCmd('task', '');
+$itemid   = $app->getInput()->getCmd('Itemid', '');
 $sitename = htmlspecialchars($app->get('sitename'), ENT_QUOTES, 'UTF-8');
 $menu     = $app->getMenu()->getActive();
 $pageclass = $menu !== null ? $menu->getParams()->get('pageclass_sfx', '') : '';

From 1fe1c0e9fb5a377d57bcaddd99e0977d71cca780 Mon Sep 17 00:00:00 2001
From: Allon Moritz <allon.moritz@digital-peak.com>
Date: Sat, 22 Oct 2022 19:16:31 +0200
Subject: [PATCH 2/3] variable

---
 .../com_config/src/Model/ApplicationModel.php | 11 +++----
 .../com_content/src/Model/ArticlesModel.php   | 17 ++++++-----
 .../com_fields/src/Model/FieldModel.php       | 15 +++++-----
 .../com_fields/src/Model/GroupModel.php       | 11 +++----
 .../com_modules/src/Model/ModuleModel.php     | 13 ++++----
 .../com_users/src/Model/UsersModel.php        |  9 +++---
 .../src/Controller/StringsController.php      |  7 ++---
 .../com_contact/src/Model/CategoryModel.php   | 15 +++++-----
 .../com_contact/src/Model/FeaturedModel.php   | 11 +++----
 .../com_contact/src/Model/FormModel.php       | 11 +++----
 .../com_content/src/Model/ArchiveModel.php    | 11 +++----
 .../com_content/src/Model/ArticlesModel.php   | 15 +++++-----
 .../com_content/src/Model/FormModel.php       | 11 +++----
 .../com_newsfeeds/src/Model/CategoryModel.php | 13 ++++----
 .../Component/Router/Rules/NomenuRules.php    |  7 +++--
 .../src/Helper/ArticlesNewsHelper.php         |  8 +++--
 .../system/privacyconsent/privacyconsent.php  | 30 +++++++++++--------
 plugins/user/terms/terms.php                  |  7 +++--
 templates/cassiopeia/error.php                | 15 +++++-----
 templates/cassiopeia/index.php                | 15 +++++-----
 20 files changed, 137 insertions(+), 115 deletions(-)

diff --git a/administrator/components/com_config/src/Model/ApplicationModel.php b/administrator/components/com_config/src/Model/ApplicationModel.php
index d5f952b96b966..b8a02e54f8b2f 100644
--- a/administrator/components/com_config/src/Model/ApplicationModel.php
+++ b/administrator/components/com_config/src/Model/ApplicationModel.php
@@ -846,16 +846,17 @@ private function writeConfigFile(Registry $config)
     public function storePermissions($permission = null)
     {
         $app  = Factory::getApplication();
+        $input = $app->getInput();
         $user = $this->getCurrentUser();
 
         if (is_null($permission)) {
             // Get data from input.
             $permission = array(
-                'component' => $app->getInput()->Json->get('comp'),
-                'action'    => $app->getInput()->Json->get('action'),
-                'rule'      => $app->getInput()->Json->get('rule'),
-                'value'     => $app->getInput()->Json->get('value'),
-                'title'     => $app->getInput()->Json->get('title', '', 'RAW')
+                'component' => $input->Json->get('comp'),
+                'action'    => $input->Json->get('action'),
+                'rule'      => $input->Json->get('rule'),
+                'value'     => $input->Json->get('value'),
+                'title'     => $input->Json->get('title', '', 'RAW')
             );
         }
 
diff --git a/administrator/components/com_content/src/Model/ArticlesModel.php b/administrator/components/com_content/src/Model/ArticlesModel.php
index 2753d0949bac5..426d98588aae9 100644
--- a/administrator/components/com_content/src/Model/ArticlesModel.php
+++ b/administrator/components/com_content/src/Model/ArticlesModel.php
@@ -125,12 +125,13 @@ public function getFilterForm($data = array(), $loadData = true)
      */
     protected function populateState($ordering = 'a.id', $direction = 'desc')
     {
-        $app = Factory::getApplication();
+        $app   = Factory::getApplication();
+        $input = $app->getInput();
 
-        $forcedLanguage = $app->getInput()->get('forcedLanguage', '', 'cmd');
+        $forcedLanguage = $input->get('forcedLanguage', '', 'cmd');
 
         // Adjust the context to support modal layouts.
-        if ($layout = $app->getInput()->get('layout')) {
+        if ($layout = $input->get('layout')) {
             $this->context .= '.' . $layout;
         }
 
@@ -154,7 +155,7 @@ protected function populateState($ordering = 'a.id', $direction = 'desc')
         $language = $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '');
         $this->setState('filter.language', $language);
 
-        $formSubmitted = $app->getInput()->post->get('form_submitted');
+        $formSubmitted = $input->post->get('form_submitted');
 
         // Gets the value of a user state variable and sets it in the session
         $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access');
@@ -163,16 +164,16 @@ protected function populateState($ordering = 'a.id', $direction = 'desc')
         $this->getUserStateFromRequest($this->context . '.filter.tag', 'filter_tag', '');
 
         if ($formSubmitted) {
-            $access = $app->getInput()->post->get('access');
+            $access = $input->post->get('access');
             $this->setState('filter.access', $access);
 
-            $authorId = $app->getInput()->post->get('author_id');
+            $authorId = $input->post->get('author_id');
             $this->setState('filter.author_id', $authorId);
 
-            $categoryId = $app->getInput()->post->get('category_id');
+            $categoryId = $input->post->get('category_id');
             $this->setState('filter.category_id', $categoryId);
 
-            $tag = $app->getInput()->post->get('tag');
+            $tag = $input->post->get('tag');
             $this->setState('filter.tag', $tag);
         }
 
diff --git a/administrator/components/com_fields/src/Model/FieldModel.php b/administrator/components/com_fields/src/Model/FieldModel.php
index 245a3e7ea9fca..0355b4c38993b 100644
--- a/administrator/components/com_fields/src/Model/FieldModel.php
+++ b/administrator/components/com_fields/src/Model/FieldModel.php
@@ -879,8 +879,9 @@ protected function getReorderConditions($table)
     protected function loadFormData()
     {
         // Check the session for previously entered form data.
-        $app  = Factory::getApplication();
-        $data = $app->getUserState('com_fields.edit.field.data', array());
+        $app   = Factory::getApplication();
+        $input = $app->getInput();
+        $data  = $app->getUserState('com_fields.edit.field.data', array());
 
         if (empty($data)) {
             $data = $this->getItem();
@@ -892,16 +893,16 @@ protected function loadFormData()
                 // get selected fields
                 $filters = (array) $app->getUserState('com_fields.fields.filter');
 
-                $data->set('state', $app->getInput()->getInt('state', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null)));
-                $data->set('language', $app->getInput()->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
-                $data->set('group_id', $app->getInput()->getString('group_id', (!empty($filters['group_id']) ? $filters['group_id'] : null)));
+                $data->set('state', $input->getInt('state', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null)));
+                $data->set('language', $input->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
+                $data->set('group_id', $input->getString('group_id', (!empty($filters['group_id']) ? $filters['group_id'] : null)));
                 $data->set(
                     'access',
-                    $app->getInput()->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')))
+                    $input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')))
                 );
 
                 // Set the type if available from the request
-                $data->set('type', $app->getInput()->getWord('type', $this->state->get('field.type', $data->get('type'))));
+                $data->set('type', $input->getWord('type', $this->state->get('field.type', $data->get('type'))));
             }
 
             if ($data->label && !isset($data->params['label'])) {
diff --git a/administrator/components/com_fields/src/Model/GroupModel.php b/administrator/components/com_fields/src/Model/GroupModel.php
index da3e58d7058f9..3fb0a37b2678b 100644
--- a/administrator/components/com_fields/src/Model/GroupModel.php
+++ b/administrator/components/com_fields/src/Model/GroupModel.php
@@ -301,8 +301,9 @@ public function validate($form, $data, $group = null)
     protected function loadFormData()
     {
         // Check the session for previously entered form data.
-        $app = Factory::getApplication();
-        $data = $app->getUserState('com_fields.edit.group.data', array());
+        $app   = Factory::getApplication();
+        $input = $app->getInput();
+        $data  = $app->getUserState('com_fields.edit.group.data', array());
 
         if (empty($data)) {
             $data = $this->getItem();
@@ -315,15 +316,15 @@ protected function loadFormData()
 
                 $data->set(
                     'state',
-                    $app->getInput()->getInt('state', (!empty($filters['state']) ? $filters['state'] : null))
+                    $input->getInt('state', (!empty($filters['state']) ? $filters['state'] : null))
                 );
                 $data->set(
                     'language',
-                    $app->getInput()->getString('language', (!empty($filters['language']) ? $filters['language'] : null))
+                    $input->getString('language', (!empty($filters['language']) ? $filters['language'] : null))
                 );
                 $data->set(
                     'access',
-                    $app->getInput()->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')))
+                    $input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')))
                 );
             }
         }
diff --git a/administrator/components/com_modules/src/Model/ModuleModel.php b/administrator/components/com_modules/src/Model/ModuleModel.php
index 40977cb0ab738..9c892fc529742 100644
--- a/administrator/components/com_modules/src/Model/ModuleModel.php
+++ b/administrator/components/com_modules/src/Model/ModuleModel.php
@@ -580,7 +580,8 @@ public function getForm($data = array(), $loadData = true)
      */
     protected function loadFormData()
     {
-        $app = Factory::getApplication();
+        $app   = Factory::getApplication();
+        $input = $app->getInput();
 
         // Check the session for previously entered form data.
         $data = $app->getUserState('com_modules.edit.module.data', array());
@@ -590,12 +591,12 @@ protected function loadFormData()
 
             // Pre-select some filters (Status, Module Position, Language, Access Level) in edit form if those have been selected in Module Manager
             if (!$data->id) {
-                $clientId = $app->getInput()->getInt('client_id', 0);
+                $clientId = $input->getInt('client_id', 0);
                 $filters  = (array) $app->getUserState('com_modules.modules.' . $clientId . '.filter');
-                $data->set('published', $app->getInput()->getInt('published', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null)));
-                $data->set('position', $app->getInput()->getInt('position', (!empty($filters['position']) ? $filters['position'] : null)));
-                $data->set('language', $app->getInput()->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
-                $data->set('access', $app->getInput()->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access'))));
+                $data->set('published', $input->getInt('published', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null)));
+                $data->set('position', $input->getInt('position', (!empty($filters['position']) ? $filters['position'] : null)));
+                $data->set('language', $input->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
+                $data->set('access', $input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access'))));
             }
 
             // Avoid to delete params of a second module opened in a new browser tab while new one is not saved yet.
diff --git a/administrator/components/com_users/src/Model/UsersModel.php b/administrator/components/com_users/src/Model/UsersModel.php
index b8fd8c3e8c577..b7093fd326375 100644
--- a/administrator/components/com_users/src/Model/UsersModel.php
+++ b/administrator/components/com_users/src/Model/UsersModel.php
@@ -89,14 +89,15 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
      */
     protected function populateState($ordering = 'a.name', $direction = 'asc')
     {
-        $app = Factory::getApplication();
+        $app   = Factory::getApplication();
+        $input = $app->getInput();
 
         // Adjust the context to support modal layouts.
-        if ($layout = $app->getInput()->get('layout', 'default', 'cmd')) {
+        if ($layout = $input->get('layout', 'default', 'cmd')) {
             $this->context .= '.' . $layout;
         }
 
-        $groups = json_decode(base64_decode($app->getInput()->get('groups', '', 'BASE64')));
+        $groups = json_decode(base64_decode($input->get('groups', '', 'BASE64')));
 
         if (isset($groups)) {
             $groups = ArrayHelper::toInteger($groups);
@@ -104,7 +105,7 @@ protected function populateState($ordering = 'a.name', $direction = 'asc')
 
         $this->setState('filter.groups', $groups);
 
-        $excluded = json_decode(base64_decode($app->getInput()->get('excluded', '', 'BASE64')));
+        $excluded = json_decode(base64_decode($input->get('excluded', '', 'BASE64')));
 
         if (isset($excluded)) {
             $excluded = ArrayHelper::toInteger($excluded);
diff --git a/api/components/com_languages/src/Controller/StringsController.php b/api/components/com_languages/src/Controller/StringsController.php
index 3956f33c4d44b..b88e80ff3d16c 100644
--- a/api/components/com_languages/src/Controller/StringsController.php
+++ b/api/components/com_languages/src/Controller/StringsController.php
@@ -62,10 +62,9 @@ public function search()
             throw new InvalidParameterException("Invalid param 'searchtype'");
         }
 
-        $app = Factory::getApplication();
-        $app->getInput()->set('searchstring', $data['searchstring']);
-        $app->getInput()->set('searchtype', $data['searchtype']);
-        $app->getInput()->set('more', 0);
+        $this->input->set('searchstring', $data['searchstring']);
+        $this->input->set('searchtype', $data['searchtype']);
+        $this->input->set('more', 0);
 
         $viewType   = $this->app->getDocument()->getType();
         $viewName   = $this->input->get('view', $this->default_view);
diff --git a/components/com_contact/src/Model/CategoryModel.php b/components/com_contact/src/Model/CategoryModel.php
index b7072c997d955..eee5f8f86c4a2 100644
--- a/components/com_contact/src/Model/CategoryModel.php
+++ b/components/com_contact/src/Model/CategoryModel.php
@@ -261,13 +261,14 @@ protected function getListQuery()
      */
     protected function populateState($ordering = null, $direction = null)
     {
-        $app = Factory::getApplication();
+        $app   = Factory::getApplication();
+        $input = $app->getInput();
 
         $params = $app->getParams();
         $this->setState('params', $params);
 
         // List state information
-        $format = $app->getInput()->getWord('format');
+        $format = $input->getWord('format');
 
         if ($format === 'feed') {
             $limit = $app->get('feed_limit');
@@ -282,15 +283,15 @@ protected function populateState($ordering = null, $direction = null)
 
         $this->setState('list.limit', $limit);
 
-        $limitstart = $app->getInput()->get('limitstart', 0, 'uint');
+        $limitstart = $input->get('limitstart', 0, 'uint');
         $this->setState('list.start', $limitstart);
 
         // Optional filter text
-        $itemid = $app->getInput()->get('Itemid', 0, 'int');
+        $itemid = $input->get('Itemid', 0, 'int');
         $search = $app->getUserStateFromRequest('com_contact.category.list.' . $itemid . '.filter-search', 'filter-search', '', 'string');
         $this->setState('list.filter', $search);
 
-        $orderCol = $app->getInput()->get('filter_order', $params->get('initial_sort', 'ordering'));
+        $orderCol = $input->get('filter_order', $params->get('initial_sort', 'ordering'));
 
         if (!in_array($orderCol, $this->filter_fields)) {
             $orderCol = 'ordering';
@@ -298,7 +299,7 @@ protected function populateState($ordering = null, $direction = null)
 
         $this->setState('list.ordering', $orderCol);
 
-        $listOrder = $app->getInput()->get('filter_order_Dir', 'ASC');
+        $listOrder = $input->get('filter_order_Dir', 'ASC');
 
         if (!in_array(strtoupper($listOrder), array('ASC', 'DESC', ''))) {
             $listOrder = 'ASC';
@@ -306,7 +307,7 @@ protected function populateState($ordering = null, $direction = null)
 
         $this->setState('list.direction', $listOrder);
 
-        $id = $app->getInput()->get('id', 0, 'int');
+        $id = $input->get('id', 0, 'int');
         $this->setState('category.id', $id);
 
         $user = $this->getCurrentUser();
diff --git a/components/com_contact/src/Model/FeaturedModel.php b/components/com_contact/src/Model/FeaturedModel.php
index 2c7838fed5e6b..f2e99d8b9c6a6 100644
--- a/components/com_contact/src/Model/FeaturedModel.php
+++ b/components/com_contact/src/Model/FeaturedModel.php
@@ -160,20 +160,21 @@ protected function getListQuery()
      */
     protected function populateState($ordering = null, $direction = null)
     {
-        $app = Factory::getApplication();
+        $app   = Factory::getApplication();
+        $input = $app->getInput();
         $params = ComponentHelper::getParams('com_contact');
 
         // List state information
         $limit = $app->getUserStateFromRequest('global.list.limit', 'limit', $app->get('list_limit'), 'uint');
         $this->setState('list.limit', $limit);
 
-        $limitstart = $app->getInput()->get('limitstart', 0, 'uint');
+        $limitstart = $input->get('limitstart', 0, 'uint');
         $this->setState('list.start', $limitstart);
 
         // Optional filter text
-        $this->setState('list.filter', $app->getInput()->getString('filter-search'));
+        $this->setState('list.filter', $input->getString('filter-search'));
 
-        $orderCol = $app->getInput()->get('filter_order', 'ordering');
+        $orderCol = $input->get('filter_order', 'ordering');
 
         if (!in_array($orderCol, $this->filter_fields)) {
             $orderCol = 'ordering';
@@ -181,7 +182,7 @@ protected function populateState($ordering = null, $direction = null)
 
         $this->setState('list.ordering', $orderCol);
 
-        $listOrder = $app->getInput()->get('filter_order_Dir', 'ASC');
+        $listOrder = $input->get('filter_order_Dir', 'ASC');
 
         if (!in_array(strtoupper($listOrder), array('ASC', 'DESC', ''))) {
             $listOrder = 'ASC';
diff --git a/components/com_contact/src/Model/FormModel.php b/components/com_contact/src/Model/FormModel.php
index ea655ebb4a5cb..08715e6578bf5 100644
--- a/components/com_contact/src/Model/FormModel.php
+++ b/components/com_contact/src/Model/FormModel.php
@@ -178,22 +178,23 @@ public function save($data)
      */
     protected function populateState()
     {
-        $app = Factory::getApplication();
+        $app   = Factory::getApplication();
+        $input = $app->getInput();
 
         // Load state from the request.
-        $pk = $app->getInput()->getInt('id');
+        $pk = $input->getInt('id');
         $this->setState('contact.id', $pk);
 
-        $this->setState('contact.catid', $app->getInput()->getInt('catid'));
+        $this->setState('contact.catid', $input->getInt('catid'));
 
-        $return = $app->getInput()->get('return', '', 'base64');
+        $return = $input->get('return', '', 'base64');
         $this->setState('return_page', base64_decode($return));
 
         // Load the parameters.
         $params = $app->getParams();
         $this->setState('params', $params);
 
-        $this->setState('layout', $app->getInput()->getString('layout'));
+        $this->setState('layout', $input->getString('layout'));
     }
 
     /**
diff --git a/components/com_content/src/Model/ArchiveModel.php b/components/com_content/src/Model/ArchiveModel.php
index 56557b69f1df5..882a6f36ab726 100644
--- a/components/com_content/src/Model/ArchiveModel.php
+++ b/components/com_content/src/Model/ArchiveModel.php
@@ -49,7 +49,8 @@ protected function populateState($ordering = null, $direction = null)
     {
         parent::populateState();
 
-        $app = Factory::getApplication();
+        $app   = Factory::getApplication();
+        $input = $app->getInput();
 
         // Add archive properties
         $params = $this->state->get('params');
@@ -58,14 +59,14 @@ protected function populateState($ordering = null, $direction = null)
         $this->setState('filter.published', ContentComponent::CONDITION_ARCHIVED);
 
         // Filter on month, year
-        $this->setState('filter.month', $app->getInput()->getInt('month'));
-        $this->setState('filter.year', $app->getInput()->getInt('year'));
+        $this->setState('filter.month', $input->getInt('month'));
+        $this->setState('filter.year', $input->getInt('year'));
 
         // Optional filter text
-        $this->setState('list.filter', $app->getInput()->getString('filter-search'));
+        $this->setState('list.filter', $input->getString('filter-search'));
 
         // Get list limit
-        $itemid = $app->getInput()->get('Itemid', 0, 'int');
+        $itemid = $input->get('Itemid', 0, 'int');
         $limit = $app->getUserStateFromRequest('com_content.archive.list' . $itemid . '.limit', 'limit', $params->get('display_num', 20), 'uint');
         $this->setState('list.limit', $limit);
 
diff --git a/components/com_content/src/Model/ArticlesModel.php b/components/com_content/src/Model/ArticlesModel.php
index b50fc6d1f73e5..c0c323b477b24 100644
--- a/components/com_content/src/Model/ArticlesModel.php
+++ b/components/com_content/src/Model/ArticlesModel.php
@@ -90,19 +90,20 @@ public function __construct($config = array())
      */
     protected function populateState($ordering = 'ordering', $direction = 'ASC')
     {
-        $app = Factory::getApplication();
+        $app   = Factory::getApplication();
+        $input = $app->getInput();
 
         // List state information
-        $value = $app->getInput()->get('limit', $app->get('list_limit', 0), 'uint');
+        $value = $input->get('limit', $app->get('list_limit', 0), 'uint');
         $this->setState('list.limit', $value);
 
-        $value = $app->getInput()->get('limitstart', 0, 'uint');
+        $value = $input->get('limitstart', 0, 'uint');
         $this->setState('list.start', $value);
 
-        $value = $app->getInput()->get('filter_tag', 0, 'uint');
+        $value = $input->get('filter_tag', 0, 'uint');
         $this->setState('filter.tag', $value);
 
-        $orderCol = $app->getInput()->get('filter_order', 'a.ordering');
+        $orderCol = $input->get('filter_order', 'a.ordering');
 
         if (!in_array($orderCol, $this->filter_fields)) {
             $orderCol = 'a.ordering';
@@ -110,7 +111,7 @@ protected function populateState($ordering = 'ordering', $direction = 'ASC')
 
         $this->setState('list.ordering', $orderCol);
 
-        $listOrder = $app->getInput()->get('filter_order_Dir', 'ASC');
+        $listOrder = $input->get('filter_order_Dir', 'ASC');
 
         if (!in_array(strtoupper($listOrder), array('ASC', 'DESC', ''))) {
             $listOrder = 'ASC';
@@ -137,7 +138,7 @@ protected function populateState($ordering = 'ordering', $direction = 'ASC')
             $this->setState('filter.access', false);
         }
 
-        $this->setState('layout', $app->getInput()->getString('layout'));
+        $this->setState('layout', $input->getString('layout'));
     }
 
     /**
diff --git a/components/com_content/src/Model/FormModel.php b/components/com_content/src/Model/FormModel.php
index e0783afc17bf8..3aaf8547a56a5 100644
--- a/components/com_content/src/Model/FormModel.php
+++ b/components/com_content/src/Model/FormModel.php
@@ -50,7 +50,8 @@ class FormModel extends \Joomla\Component\Content\Administrator\Model\ArticleMod
      */
     protected function populateState()
     {
-        $app = Factory::getApplication();
+        $app   = Factory::getApplication();
+        $input = $app->getInput();
 
         // Load the parameters.
         $params = $app->getParams();
@@ -63,15 +64,15 @@ protected function populateState()
         }
 
         // Load state from the request.
-        $pk = $app->getInput()->getInt('a_id');
+        $pk = $input->getInt('a_id');
         $this->setState('article.id', $pk);
 
-        $this->setState('article.catid', $app->getInput()->getInt('catid', $catId));
+        $this->setState('article.catid', $input->getInt('catid', $catId));
 
-        $return = $app->getInput()->get('return', '', 'base64');
+        $return = $input->get('return', '', 'base64');
         $this->setState('return_page', base64_decode($return));
 
-        $this->setState('layout', $app->getInput()->getString('layout'));
+        $this->setState('layout', $input->getString('layout'));
     }
 
     /**
diff --git a/components/com_newsfeeds/src/Model/CategoryModel.php b/components/com_newsfeeds/src/Model/CategoryModel.php
index d7586f8621cee..43678dace9f5b 100644
--- a/components/com_newsfeeds/src/Model/CategoryModel.php
+++ b/components/com_newsfeeds/src/Model/CategoryModel.php
@@ -242,7 +242,8 @@ protected function getListQuery()
      */
     protected function populateState($ordering = null, $direction = null)
     {
-        $app = Factory::getApplication();
+        $app   = Factory::getApplication();
+        $input = $app->getInput();
 
         $params = $app->getParams();
         $this->setState('params', $params);
@@ -251,13 +252,13 @@ protected function populateState($ordering = null, $direction = null)
         $limit = $app->getUserStateFromRequest('global.list.limit', 'limit', $app->get('list_limit'), 'uint');
         $this->setState('list.limit', $limit);
 
-        $limitstart = $app->getInput()->get('limitstart', 0, 'uint');
+        $limitstart = $input->get('limitstart', 0, 'uint');
         $this->setState('list.start', $limitstart);
 
         // Optional filter text
-        $this->setState('list.filter', $app->getInput()->getString('filter-search'));
+        $this->setState('list.filter', $input->getString('filter-search'));
 
-        $orderCol = $app->getInput()->get('filter_order', 'ordering');
+        $orderCol = $input->get('filter_order', 'ordering');
 
         if (!in_array($orderCol, $this->filter_fields)) {
             $orderCol = 'ordering';
@@ -265,7 +266,7 @@ protected function populateState($ordering = null, $direction = null)
 
         $this->setState('list.ordering', $orderCol);
 
-        $listOrder = $app->getInput()->get('filter_order_Dir', 'ASC');
+        $listOrder = $input->get('filter_order_Dir', 'ASC');
 
         if (!in_array(strtoupper($listOrder), array('ASC', 'DESC', ''))) {
             $listOrder = 'ASC';
@@ -273,7 +274,7 @@ protected function populateState($ordering = null, $direction = null)
 
         $this->setState('list.direction', $listOrder);
 
-        $id = $app->getInput()->get('id', 0, 'int');
+        $id = $input->get('id', 0, 'int');
         $this->setState('category.id', $id);
 
         $user = $this->getCurrentUser();
diff --git a/libraries/src/Component/Router/Rules/NomenuRules.php b/libraries/src/Component/Router/Rules/NomenuRules.php
index fa8e3b8220815..427a333d425ed 100644
--- a/libraries/src/Component/Router/Rules/NomenuRules.php
+++ b/libraries/src/Component/Router/Rules/NomenuRules.php
@@ -79,9 +79,10 @@ public function parse(&$segments, &$vars)
 
                 if (isset($view->key) && isset($segments[0])) {
                     if (\is_callable(array($this->router, 'get' . ucfirst($view->name) . 'Id'))) {
-                        if ($view->parent_key && $this->router->app->getInput()->get($view->parent_key)) {
-                            $vars[$view->parent->key] = $this->router->app->getInput()->get($view->parent_key);
-                            $vars[$view->parent_key] = $this->router->app->getInput()->get($view->parent_key);
+                        $input = $this->app->getInput;
+                        if ($view->parent_key && $input->get($view->parent_key)) {
+                            $vars[$view->parent->key] = $input->get($view->parent_key);
+                            $vars[$view->parent_key] = $input->get($view->parent_key);
                         }
 
                         if ($view->nestable) {
diff --git a/modules/mod_articles_news/src/Helper/ArticlesNewsHelper.php b/modules/mod_articles_news/src/Helper/ArticlesNewsHelper.php
index fc69cd2ba666c..3899c1caaaa56 100644
--- a/modules/mod_articles_news/src/Helper/ArticlesNewsHelper.php
+++ b/modules/mod_articles_news/src/Helper/ArticlesNewsHelper.php
@@ -89,14 +89,16 @@ public function getArticles(Registry $params, SiteApplication $app)
             $model->setState('filter.featured', 'hide');
         }
 
+        $input = $app->getInput();
+
         // Filter by id in case it should be excluded
         if (
             $params->get('exclude_current', true)
-            && $app->getInput()->get('option') === 'com_content'
-            && $app->getInput()->get('view') === 'article'
+            && $input->get('option') === 'com_content'
+            && $input->get('view') === 'article'
         ) {
             // Exclude the current article from displaying in this module
-            $model->setState('filter.article_id', $app->getInput()->get('id', 0, 'UINT'));
+            $model->setState('filter.article_id', $input->get('id', 0, 'UINT'));
             $model->setState('filter.article_id.include', false);
         }
 
diff --git a/plugins/system/privacyconsent/privacyconsent.php b/plugins/system/privacyconsent/privacyconsent.php
index ad7704f1130f7..ad8645d817a5f 100644
--- a/plugins/system/privacyconsent/privacyconsent.php
+++ b/plugins/system/privacyconsent/privacyconsent.php
@@ -134,9 +134,10 @@ public function onUserBeforeSave($user, $isNew, $data)
         }
 
         // Check that the privacy is checked if required ie only in registration from frontend.
-        $option = $this->app->getInput()->get('option');
-        $task   = $this->app->getInput()->post->get('task');
-        $form   = $this->app->getInput()->post->get('jform', [], 'array');
+        $input  = $this->app->getInput();
+        $option = $input->get('option');
+        $task   = $input->post->get('task');
+        $form   = $input->post->get('jform', [], 'array');
 
         if (
             $option == 'com_users' && in_array($task, array('registration.register', 'profile.save'))
@@ -175,9 +176,11 @@ public function onUserAfterSave($data, $isNew, $result, $error): void
             return;
         }
 
-        $option = $this->app->getInput()->get('option');
-        $task   = $this->app->getInput()->post->get('task');
-        $form   = $this->app->getInput()->post->get('jform', [], 'array');
+        $input = $this->app->getInput();
+
+        $option = $input->get('option');
+        $task   = $input->post->get('task');
+        $form   = $input->post->get('jform', [], 'array');
 
         if (
             $option == 'com_users'
@@ -187,10 +190,10 @@ public function onUserAfterSave($data, $isNew, $result, $error): void
             $userId = ArrayHelper::getValue($data, 'id', 0, 'int');
 
             // Get the user's IP address
-            $ip = $this->app->getInput()->server->get('REMOTE_ADDR', '', 'string');
+            $ip = $input->server->get('REMOTE_ADDR', '', 'string');
 
             // Get the user agent string
-            $userAgent = $this->app->getInput()->server->get('HTTP_USER_AGENT', '', 'string');
+            $userAgent = $input->server->get('HTTP_USER_AGENT', '', 'string');
 
             // Create the user note
             $userNote = (object) [
@@ -284,11 +287,12 @@ public function onAfterRoute()
                 return;
             }
 
-            $option = $this->app->getInput()->getCmd('option');
-            $task   = $this->app->getInput()->get('task');
-            $view   = $this->app->getInput()->getString('view', '');
-            $layout = $this->app->getInput()->getString('layout', '');
-            $id     = $this->app->getInput()->getInt('id');
+            $input  = $this->app->getInput();
+            $option = $input->getCmd('option');
+            $task   = $input->get('task');
+            $view   = $input->getString('view', '');
+            $layout = $input->getString('layout', '');
+            $id     = $input->getInt('id');
 
             $privacyArticleId = $this->getPrivacyArticleId();
 
diff --git a/plugins/user/terms/terms.php b/plugins/user/terms/terms.php
index 1e10d24503a1d..a4b71041bebc0 100644
--- a/plugins/user/terms/terms.php
+++ b/plugins/user/terms/terms.php
@@ -110,9 +110,10 @@ public function onUserBeforeSave($user, $isNew, $data)
         }
 
         // Check that the terms is checked if required ie only in registration from frontend.
-        $option = $this->app->getInput()->get('option');
-        $task   = $this->app->getInput()->post->get('task');
-        $form   = $this->app->getInput()->post->get('jform', [], 'array');
+        $input  = $this->app->getInput();
+        $option = $input->get('option');
+        $task   = $input->post->get('task');
+        $form   = $input->post->get('jform', [], 'array');
 
         if ($option == 'com_users' && in_array($task, ['registration.register']) && empty($form['terms']['terms'])) {
             throw new InvalidArgumentException(Text::_('PLG_USER_TERMS_FIELD_ERROR'));
diff --git a/templates/cassiopeia/error.php b/templates/cassiopeia/error.php
index a18bbbbd342c1..9e6eefb46e0a4 100644
--- a/templates/cassiopeia/error.php
+++ b/templates/cassiopeia/error.php
@@ -17,15 +17,16 @@
 
 /** @var Joomla\CMS\Document\ErrorDocument $this */
 
-$app = Factory::getApplication();
-$wa  = $this->getWebAssetManager();
+$app   = Factory::getApplication();
+$input = $app->getInput();
+$wa    = $this->getWebAssetManager();
 
 // Detecting Active Variables
-$option   = $app->getInput()->getCmd('option', '');
-$view     = $app->getInput()->getCmd('view', '');
-$layout   = $app->getInput()->getCmd('layout', '');
-$task     = $app->getInput()->getCmd('task', '');
-$itemid   = $app->getInput()->getCmd('Itemid', '');
+$option   = $input->getCmd('option', '');
+$view     = $input->getCmd('view', '');
+$layout   = $input->getCmd('layout', '');
+$task     = $input->getCmd('task', '');
+$itemid   = $input->getCmd('Itemid', '');
 $sitename = htmlspecialchars($app->get('sitename'), ENT_QUOTES, 'UTF-8');
 $menu     = $app->getMenu()->getActive();
 $pageclass = $menu !== null ? $menu->getParams()->get('pageclass_sfx', '') : '';
diff --git a/templates/cassiopeia/index.php b/templates/cassiopeia/index.php
index be01b7305b865..1663dce1f494b 100644
--- a/templates/cassiopeia/index.php
+++ b/templates/cassiopeia/index.php
@@ -17,8 +17,9 @@
 
 /** @var Joomla\CMS\Document\HtmlDocument $this */
 
-$app = Factory::getApplication();
-$wa  = $this->getWebAssetManager();
+$app   = Factory::getApplication();
+$input = $app->getInput();
+$wa    = $this->getWebAssetManager();
 
 // Browsers support SVG favicons
 $this->addHeadLink(HTMLHelper::_('image', 'joomla-favicon.svg', '', [], true, 1), 'icon', 'rel', ['type' => 'image/svg+xml']);
@@ -26,11 +27,11 @@
 $this->addHeadLink(HTMLHelper::_('image', 'joomla-favicon-pinned.svg', '', [], true, 1), 'mask-icon', 'rel', ['color' => '#000']);
 
 // Detecting Active Variables
-$option   = $app->getInput()->getCmd('option', '');
-$view     = $app->getInput()->getCmd('view', '');
-$layout   = $app->getInput()->getCmd('layout', '');
-$task     = $app->getInput()->getCmd('task', '');
-$itemid   = $app->getInput()->getCmd('Itemid', '');
+$option   = $input->getCmd('option', '');
+$view     = $input->getCmd('view', '');
+$layout   = $input->getCmd('layout', '');
+$task     = $input->getCmd('task', '');
+$itemid   = $input->getCmd('Itemid', '');
 $sitename = htmlspecialchars($app->get('sitename'), ENT_QUOTES, 'UTF-8');
 $menu     = $app->getMenu()->getActive();
 $pageclass = $menu !== null ? $menu->getParams()->get('pageclass_sfx', '') : '';

From 9a493b1c56dda635058f50231c0ec9f8854d1bd3 Mon Sep 17 00:00:00 2001
From: Allon Moritz <allon.moritz@digital-peak.com>
Date: Sun, 23 Oct 2022 10:44:56 +0200
Subject: [PATCH 3/3] Update
 libraries/src/Component/Router/Rules/NomenuRules.php

Co-authored-by: Harald Leithner <leithner@itronic.at>
---
 libraries/src/Component/Router/Rules/NomenuRules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/src/Component/Router/Rules/NomenuRules.php b/libraries/src/Component/Router/Rules/NomenuRules.php
index 427a333d425ed..76ad1e3e5fb85 100644
--- a/libraries/src/Component/Router/Rules/NomenuRules.php
+++ b/libraries/src/Component/Router/Rules/NomenuRules.php
@@ -79,7 +79,7 @@ public function parse(&$segments, &$vars)
 
                 if (isset($view->key) && isset($segments[0])) {
                     if (\is_callable(array($this->router, 'get' . ucfirst($view->name) . 'Id'))) {
-                        $input = $this->app->getInput;
+                        $input = $this->app->getInput();
                         if ($view->parent_key && $input->get($view->parent_key)) {
                             $vars[$view->parent->key] = $input->get($view->parent_key);
                             $vars[$view->parent_key] = $input->get($view->parent_key);