From 4718532ab17b1ecf9112d7690b21016a8e604f79 Mon Sep 17 00:00:00 2001 From: Martina Scholz <64533137+LadySolveig@users.noreply.github.com> Date: Mon, 5 Feb 2024 12:09:24 +0100 Subject: [PATCH] Revert "Switching Input object from CMS to framework class (#40415)" This reverts commit 572f686a49ae65ace1b641f35ef79fdfeae76cbf. --- .../src/Controller/ActionlogsController.php | 14 ++++++------ .../src/Controller/UsersController.php | 10 ++++----- .../src/View/Transition/HtmlView.php | 2 +- .../src/Controller/ConfigController.php | 13 +++++------ .../src/Controller/ModulesController.php | 13 +++++------ .../src/Controller/TemplatesController.php | 13 +++++------ .../src/Controller/DisplayController.php | 13 +++++------ .../src/Controller/DisplayController.php | 13 +++++------ .../src/Controller/DisplayController.php | 10 ++++----- .../src/Controller/DisplayController.php | 13 +++++------ .../src/Controller/DisplayController.php | 14 ++++++------ .../Application/InstallationApplication.php | 22 +++++++++---------- .../src/Controller/InstallationController.php | 13 +++++------ .../Application/AdministratorApplication.php | 6 ++--- libraries/src/Application/BaseApplication.php | 4 ++-- libraries/src/Application/CMSApplication.php | 4 ++-- libraries/src/Application/SiteApplication.php | 4 ++-- libraries/src/Application/WebApplication.php | 6 ++--- .../email/src/Extension/Email.php | 2 +- 19 files changed, 91 insertions(+), 98 deletions(-) diff --git a/administrator/components/com_actionlogs/src/Controller/ActionlogsController.php b/administrator/components/com_actionlogs/src/Controller/ActionlogsController.php index 8fed469a766cb..fee0dc2470129 100644 --- a/administrator/components/com_actionlogs/src/Controller/ActionlogsController.php +++ b/administrator/components/com_actionlogs/src/Controller/ActionlogsController.php @@ -14,13 +14,13 @@ use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Date\Date; use Joomla\CMS\Event\ActionLog\AfterLogExportEvent; +use Joomla\CMS\Input\Input; use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Controller\AdminController; use Joomla\CMS\MVC\Factory\MVCFactoryInterface; use Joomla\CMS\Router\Route; use Joomla\Component\Actionlogs\Administrator\Helper\ActionlogsHelper; use Joomla\Component\Actionlogs\Administrator\Model\ActionlogsModel; -use Joomla\Input\Input; use Joomla\Utilities\ArrayHelper; // phpcs:disable PSR1.Files.SideEffects @@ -37,12 +37,12 @@ class ActionlogsController extends AdminController /** * Constructor. * - * @param array $config An optional associative array of configuration settings. - * Recognized key values include 'name', 'default_task', 'model_path', and - * 'view_path' (this list is not meant to be comprehensive). - * @param ?MVCFactoryInterface $factory The factory. - * @param ?CMSApplication $app The Application for the dispatcher - * @param ?Input $input Input + * @param array $config An optional associative array of configuration settings. + * Recognized key values include 'name', 'default_task', 'model_path', and + * 'view_path' (this list is not meant to be comprehensive). + * @param MVCFactoryInterface $factory The factory. + * @param CMSApplication $app The Application for the dispatcher + * @param Input $input Input * * @since 3.9.0 * diff --git a/administrator/components/com_users/src/Controller/UsersController.php b/administrator/components/com_users/src/Controller/UsersController.php index f0eb47003fe94..04cb09ebd3bc8 100644 --- a/administrator/components/com_users/src/Controller/UsersController.php +++ b/administrator/components/com_users/src/Controller/UsersController.php @@ -11,12 +11,12 @@ namespace Joomla\Component\Users\Administrator\Controller; use Joomla\CMS\Application\CMSApplication; +use Joomla\CMS\Input\Input; use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Controller\AdminController; use Joomla\CMS\MVC\Controller\BaseController; use Joomla\CMS\MVC\Factory\MVCFactoryInterface; use Joomla\CMS\Response\JsonResponse; -use Joomla\Input\Input; use Joomla\Utilities\ArrayHelper; // phpcs:disable PSR1.Files.SideEffects @@ -39,10 +39,10 @@ class UsersController extends AdminController /** * Constructor. * - * @param array $config An optional associative array of configuration settings. - * @param ?MVCFactoryInterface $factory The factory. - * @param ?CMSApplication $app The CMSApplication for the dispatcher - * @param ?Input $input Input + * @param array $config An optional associative array of configuration settings. + * @param MVCFactoryInterface $factory The factory. + * @param CMSApplication $app The CMSApplication for the dispatcher + * @param Input $input Input * * @since 1.6 * @see BaseController diff --git a/administrator/components/com_workflow/src/View/Transition/HtmlView.php b/administrator/components/com_workflow/src/View/Transition/HtmlView.php index 133a4855b5d51..f7d198222c1ad 100644 --- a/administrator/components/com_workflow/src/View/Transition/HtmlView.php +++ b/administrator/components/com_workflow/src/View/Transition/HtmlView.php @@ -65,7 +65,7 @@ class HtmlView extends BaseHtmlView /** * The application input object. * - * @var \Joomla\Input\Input + * @var \Joomla\CMS\Input\Input * @since 4.0.0 */ protected $input; diff --git a/components/com_config/src/Controller/ConfigController.php b/components/com_config/src/Controller/ConfigController.php index a9f8630f51f97..5866bc0955b44 100644 --- a/components/com_config/src/Controller/ConfigController.php +++ b/components/com_config/src/Controller/ConfigController.php @@ -17,7 +17,6 @@ use Joomla\CMS\MVC\Factory\MVCFactoryInterface; use Joomla\CMS\Router\Route; use Joomla\CMS\Uri\Uri; -use Joomla\Input\Input; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -31,12 +30,12 @@ class ConfigController extends BaseController { /** - * @param array $config An optional associative array of configuration settings. - * Recognized key values include 'name', 'default_task', 'model_path', and - * 'view_path' (this list is not meant to be comprehensive). - * @param ?MVCFactoryInterface $factory The factory. - * @param ?CMSApplication $app The JApplication for the dispatcher - * @param ?Input $input The Input object for the request + * @param array $config An optional associative array of configuration settings. + * Recognized key values include 'name', 'default_task', 'model_path', and + * 'view_path' (this list is not meant to be comprehensive). + * @param MVCFactoryInterface|null $factory The factory. + * @param CMSApplication|null $app The JApplication for the dispatcher + * @param \Joomla\CMS\Input\Input|null $input The Input object for the request * * @since 1.6 */ diff --git a/components/com_config/src/Controller/ModulesController.php b/components/com_config/src/Controller/ModulesController.php index 41afeab23cba7..97882c670d850 100644 --- a/components/com_config/src/Controller/ModulesController.php +++ b/components/com_config/src/Controller/ModulesController.php @@ -21,7 +21,6 @@ use Joomla\CMS\Router\Route; use Joomla\CMS\Uri\Uri; use Joomla\Component\Modules\Administrator\Controller\ModuleController; -use Joomla\Input\Input; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -35,12 +34,12 @@ class ModulesController extends BaseController { /** - * @param array $config An optional associative array of configuration settings. - * Recognized key values include 'name', 'default_task', 'model_path', and - * 'view_path' (this list is not meant to be comprehensive). - * @param ?MVCFactoryInterface $factory The factory. - * @param ?CMSApplication $app The Application for the dispatcher - * @param ?Input $input The Input object for the request + * @param array $config An optional associative array of configuration settings. + * Recognized key values include 'name', 'default_task', 'model_path', and + * 'view_path' (this list is not meant to be comprehensive). + * @param MVCFactoryInterface|null $factory The factory. + * @param CMSApplication|null $app The Application for the dispatcher + * @param \Joomla\CMS\Input\Input|null $input The Input object for the request * * @since 1.6 */ diff --git a/components/com_config/src/Controller/TemplatesController.php b/components/com_config/src/Controller/TemplatesController.php index 6d1039e08cf9e..e4b54296263ab 100644 --- a/components/com_config/src/Controller/TemplatesController.php +++ b/components/com_config/src/Controller/TemplatesController.php @@ -17,7 +17,6 @@ use Joomla\CMS\MVC\Factory\MVCFactoryInterface; use Joomla\CMS\Router\Route; use Joomla\CMS\Uri\Uri; -use Joomla\Input\Input; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -31,12 +30,12 @@ class TemplatesController extends BaseController { /** - * @param array $config An optional associative array of configuration settings. - * Recognized key values include 'name', 'default_task', 'model_path', and - * 'view_path' (this list is not meant to be comprehensive). - * @param ?MVCFactoryInterface $factory The factory. - * @param ?CMSApplication $app The Application for the dispatcher - * @param ?Input $input The Input object for the request + * @param array $config An optional associative array of configuration settings. + * Recognized key values include 'name', 'default_task', 'model_path', and + * 'view_path' (this list is not meant to be comprehensive). + * @param MVCFactoryInterface|null $factory The factory. + * @param CMSApplication|null $app The Application for the dispatcher + * @param \Joomla\CMS\Input\Input|null $input The Input object for the request * * @since 1.6 */ diff --git a/components/com_contact/src/Controller/DisplayController.php b/components/com_contact/src/Controller/DisplayController.php index 0b8d8a9ccb4b5..74fce34b4da98 100644 --- a/components/com_contact/src/Controller/DisplayController.php +++ b/components/com_contact/src/Controller/DisplayController.php @@ -14,7 +14,6 @@ use Joomla\CMS\Factory; use Joomla\CMS\MVC\Controller\BaseController; use Joomla\CMS\MVC\Factory\MVCFactoryInterface; -use Joomla\Input\Input; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -28,12 +27,12 @@ class DisplayController extends BaseController { /** - * @param array $config An optional associative array of configuration settings. - * Recognized key values include 'name', 'default_task', 'model_path', and - * 'view_path' (this list is not meant to be comprehensive). - * @param ?MVCFactoryInterface $factory The factory. - * @param ?CMSApplication $app The Application for the dispatcher - * @param ?Input $input The Input object for the request + * @param array $config An optional associative array of configuration settings. + * Recognized key values include 'name', 'default_task', 'model_path', and + * 'view_path' (this list is not meant to be comprehensive). + * @param MVCFactoryInterface|null $factory The factory. + * @param CMSApplication|null $app The Application for the dispatcher + * @param \Joomla\CMS\Input\Input|null $input The Input object for the request * * @since 3.0 */ diff --git a/components/com_content/src/Controller/DisplayController.php b/components/com_content/src/Controller/DisplayController.php index bab291c7d39b3..20ede3f6f5510 100644 --- a/components/com_content/src/Controller/DisplayController.php +++ b/components/com_content/src/Controller/DisplayController.php @@ -15,7 +15,6 @@ use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Factory\MVCFactoryInterface; -use Joomla\Input\Input; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -29,12 +28,12 @@ class DisplayController extends \Joomla\CMS\MVC\Controller\BaseController { /** - * @param array $config An optional associative array of configuration settings. - * Recognized key values include 'name', 'default_task', 'model_path', and - * 'view_path' (this list is not meant to be comprehensive). - * @param ?MVCFactoryInterface $factory The factory. - * @param ?CMSApplication $app The Application for the dispatcher - * @param ?Input $input The Input object for the request + * @param array $config An optional associative array of configuration settings. + * Recognized key values include 'name', 'default_task', 'model_path', and + * 'view_path' (this list is not meant to be comprehensive). + * @param MVCFactoryInterface|null $factory The factory. + * @param CMSApplication|null $app The Application for the dispatcher + * @param \Joomla\CMS\Input\Input|null $input The Input object for the request * * @since 3.0.1 */ diff --git a/components/com_contenthistory/src/Controller/DisplayController.php b/components/com_contenthistory/src/Controller/DisplayController.php index d6dabea44693c..bffb0d31e856d 100644 --- a/components/com_contenthistory/src/Controller/DisplayController.php +++ b/components/com_contenthistory/src/Controller/DisplayController.php @@ -11,9 +11,9 @@ namespace Joomla\Component\Contenthistory\Site\Controller; use Joomla\CMS\Application\CMSApplication; +use Joomla\CMS\Input\Input; use Joomla\CMS\MVC\Controller\BaseController; use Joomla\CMS\MVC\Factory\MVCFactoryInterface; -use Joomla\Input\Input; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -27,10 +27,10 @@ class DisplayController extends BaseController { /** - * @param array $config An optional associative array of configuration settings. - * @param ?MVCFactoryInterface $factory The factory. - * @param ?CMSApplication $app The Application for the dispatcher - * @param ?Input $input The Input object for the request + * @param array $config An optional associative array of configuration settings. + * @param MVCFactoryInterface|null $factory The factory. + * @param CMSApplication|null $app The Application for the dispatcher + * @param ?Input $input The Input object for the request * * @since 3.0 */ diff --git a/components/com_fields/src/Controller/DisplayController.php b/components/com_fields/src/Controller/DisplayController.php index 4ae7117ac67df..99bc0c0a2b217 100644 --- a/components/com_fields/src/Controller/DisplayController.php +++ b/components/com_fields/src/Controller/DisplayController.php @@ -12,7 +12,6 @@ use Joomla\CMS\Application\CMSApplication; use Joomla\CMS\MVC\Factory\MVCFactoryInterface; -use Joomla\Input\Input; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -26,12 +25,12 @@ class DisplayController extends \Joomla\CMS\MVC\Controller\BaseController { /** - * @param array $config An optional associative array of configuration settings. - * Recognized key values include 'name', 'default_task', 'model_path', and - * 'view_path' (this list is not meant to be comprehensive). - * @param ?MVCFactoryInterface $factory The factory. - * @param ?CMSApplication $app The Application for the dispatcher - * @param ?Input $input The request's input object + * @param array $config An optional associative array of configuration settings. + * Recognized key values include 'name', 'default_task', 'model_path', and + * 'view_path' (this list is not meant to be comprehensive). + * @param MVCFactoryInterface|null $factory The factory. + * @param CMSApplication|null $app The Application for the dispatcher + * @param \Joomla\CMS\Input\Input|null $input The request's input object * * @since 3.7.0 */ diff --git a/components/com_modules/src/Controller/DisplayController.php b/components/com_modules/src/Controller/DisplayController.php index c268d653473a5..7123321240811 100644 --- a/components/com_modules/src/Controller/DisplayController.php +++ b/components/com_modules/src/Controller/DisplayController.php @@ -12,9 +12,9 @@ use Joomla\CMS\Application\CMSApplication; use Joomla\CMS\Factory; +use Joomla\CMS\Input\Input; use Joomla\CMS\MVC\Controller\BaseController; use Joomla\CMS\MVC\Factory\MVCFactoryInterface; -use Joomla\Input\Input; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -28,12 +28,12 @@ class DisplayController extends BaseController { /** - * @param array $config An optional associative array of configuration settings. - * Recognized key values include 'name', 'default_task', 'model_path', and - * 'view_path' (this list is not meant to be comprehensive). - * @param ?MVCFactoryInterface $factory The factory. - * @param ?CMSApplication $app The Application for the dispatcher - * @param ?Input $input The Input object for the request + * @param array $config An optional associative array of configuration settings. + * Recognized key values include 'name', 'default_task', 'model_path', and + * 'view_path' (this list is not meant to be comprehensive). + * @param MVCFactoryInterface|null $factory The factory. + * @param CMSApplication|null $app The Application for the dispatcher + * @param Input|null $input The Input object for the request * * @since 3.0 */ diff --git a/installation/src/Application/InstallationApplication.php b/installation/src/Application/InstallationApplication.php index 6a5eb2571b870..543b0f8c2f921 100644 --- a/installation/src/Application/InstallationApplication.php +++ b/installation/src/Application/InstallationApplication.php @@ -19,6 +19,7 @@ use Joomla\CMS\Exception\ExceptionHandler; use Joomla\CMS\Factory; use Joomla\CMS\Filesystem\Folder; +use Joomla\CMS\Input\Input; use Joomla\CMS\Language\LanguageFactoryInterface; use Joomla\CMS\Language\LanguageHelper; use Joomla\CMS\Language\Text; @@ -26,7 +27,6 @@ use Joomla\CMS\Uri\Uri; use Joomla\Database\DatabaseInterface; use Joomla\DI\Container; -use Joomla\Input\Input; use Joomla\Registry\Registry; use Joomla\Session\SessionEvent; @@ -46,16 +46,16 @@ final class InstallationApplication extends CMSApplication /** * Class constructor. * - * @param ?Input $input An optional argument to provide dependency injection for the application's input - * object. If the argument is a Input object that object will become the - * application's input object, otherwise a default input object is created. - * @param ?Registry $config An optional argument to provide dependency injection for the application's - * config object. If the argument is a Registry object that object will become - * the application's config object, otherwise a default config object is created. - * @param ?WebClient $client An optional argument to provide dependency injection for the application's - * client object. If the argument is a WebClient object that object will become the - * application's client object, otherwise a default client object is created. - * @param ?Container $container Dependency injection container. + * @param Input|null $input An optional argument to provide dependency injection for the application's input + * object. If the argument is a JInput object that object will become the + * application's input object, otherwise a default input object is created. + * @param Registry|null $config An optional argument to provide dependency injection for the application's + * config object. If the argument is a Registry object that object will become + * the application's config object, otherwise a default config object is created. + * @param WebClient|null $client An optional argument to provide dependency injection for the application's + * client object. If the argument is a WebClient object that object will become the + * application's client object, otherwise a default client object is created. + * @param Container|null $container Dependency injection container. * * @since 3.1 */ diff --git a/installation/src/Controller/InstallationController.php b/installation/src/Controller/InstallationController.php index 5e24f91681fff..558f5fe20d34f 100644 --- a/installation/src/Controller/InstallationController.php +++ b/installation/src/Controller/InstallationController.php @@ -14,7 +14,6 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Factory\MVCFactoryInterface; use Joomla\CMS\Session\Session; -use Joomla\Input\Input; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -28,12 +27,12 @@ class InstallationController extends JSONController { /** - * @param array $config An optional associative array of configuration settings. - * Recognized key values include 'name', 'default_task', 'model_path', and - * 'view_path' (this list is not meant to be comprehensive). - * @param ?MVCFactoryInterface $factory The factory. - * @param ?CMSApplication $app The Application for the dispatcher - * @param ?Input $input The Input object. + * @param array $config An optional associative array of configuration settings. + * Recognized key values include 'name', 'default_task', 'model_path', and + * 'view_path' (this list is not meant to be comprehensive). + * @param MVCFactoryInterface|null $factory The factory. + * @param CMSApplication|null $app The Application for the dispatcher + * @param \Joomla\CMS\Input\Input|null $input The Input object. * * @since 3.0 */ diff --git a/libraries/src/Application/AdministratorApplication.php b/libraries/src/Application/AdministratorApplication.php index b76626d3456c3..672a206e4416c 100644 --- a/libraries/src/Application/AdministratorApplication.php +++ b/libraries/src/Application/AdministratorApplication.php @@ -16,6 +16,7 @@ use Joomla\CMS\Event\Application\AfterRouteEvent; use Joomla\CMS\Factory; use Joomla\CMS\Filter\InputFilter; +use Joomla\CMS\Input\Input; use Joomla\CMS\Language\LanguageHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Plugin\PluginHelper; @@ -23,7 +24,6 @@ use Joomla\CMS\Session\Session; use Joomla\CMS\Uri\Uri; use Joomla\DI\Container; -use Joomla\Input\Input; use Joomla\Registry\Registry; // phpcs:disable PSR1.Files.SideEffects @@ -59,7 +59,7 @@ class AdministratorApplication extends CMSApplication * Class constructor. * * @param ?Input $input An optional argument to provide dependency injection for the application's input - * object. If the argument is a Input object that object will become the + * object. If the argument is a JInput object that object will become the * application's input object, otherwise a default input object is created. * @param ?Registry $config An optional argument to provide dependency injection for the application's config * object. If the argument is a Registry object that object will become the @@ -394,7 +394,7 @@ public static function purgeMessages() */ protected function render() { - // Get the Input object + // Get the \JInput object $input = $this->input; $component = $input->getCmd('option', 'com_login'); diff --git a/libraries/src/Application/BaseApplication.php b/libraries/src/Application/BaseApplication.php index 9b1dd1e3bfbfd..365bf91eb7662 100644 --- a/libraries/src/Application/BaseApplication.php +++ b/libraries/src/Application/BaseApplication.php @@ -10,9 +10,9 @@ namespace Joomla\CMS\Application; use Joomla\Application\AbstractApplication; +use Joomla\CMS\Input\Input; use Joomla\Event\DispatcherAwareInterface; use Joomla\Event\DispatcherAwareTrait; -use Joomla\Input\Input; use Joomla\Registry\Registry; // phpcs:disable PSR1.Files.SideEffects @@ -40,7 +40,7 @@ abstract class BaseApplication extends AbstractApplication implements Dispatcher * Class constructor. * * @param ?Input $input An optional argument to provide dependency injection for the application's - * input object. If the argument is a Input object that object will become + * input object. If the argument is a \JInput object that object will become * the application's input object, otherwise a default input object is created. * @param ?Registry $config An optional argument to provide dependency injection for the application's * config object. If the argument is a Registry object that object will become diff --git a/libraries/src/Application/CMSApplication.php b/libraries/src/Application/CMSApplication.php index ea822c43d1b93..6332f1e3e2906 100644 --- a/libraries/src/Application/CMSApplication.php +++ b/libraries/src/Application/CMSApplication.php @@ -31,6 +31,7 @@ use Joomla\CMS\Extension\ExtensionManagerTrait; use Joomla\CMS\Factory; use Joomla\CMS\Filter\InputFilter; +use Joomla\CMS\Input\Input; use Joomla\CMS\Language\LanguageFactoryInterface; use Joomla\CMS\Language\Text; use Joomla\CMS\Log\Log; @@ -47,7 +48,6 @@ use Joomla\DI\Container; use Joomla\DI\ContainerAwareInterface; use Joomla\DI\ContainerAwareTrait; -use Joomla\Input\Input; use Joomla\Registry\Registry; use Joomla\String\StringHelper; @@ -168,7 +168,7 @@ abstract class CMSApplication extends WebApplication implements ContainerAwareIn * Class constructor. * * @param ?Input $input An optional argument to provide dependency injection for the application's input - * object. If the argument is a Input object that object will become the + * object. If the argument is a JInput object that object will become the * application's input object, otherwise a default input object is created. * @param ?Registry $config An optional argument to provide dependency injection for the application's config * object. If the argument is a Registry object that object will become the diff --git a/libraries/src/Application/SiteApplication.php b/libraries/src/Application/SiteApplication.php index 4d281e451efd0..5450677e9209a 100644 --- a/libraries/src/Application/SiteApplication.php +++ b/libraries/src/Application/SiteApplication.php @@ -18,6 +18,7 @@ use Joomla\CMS\Event\Application\AfterRouteEvent; use Joomla\CMS\Factory; use Joomla\CMS\Filter\InputFilter; +use Joomla\CMS\Input\Input; use Joomla\CMS\Language\LanguageHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Pathway\Pathway; @@ -26,7 +27,6 @@ use Joomla\CMS\Router\SiteRouter; use Joomla\CMS\Uri\Uri; use Joomla\DI\Container; -use Joomla\Input\Input; use Joomla\Registry\Registry; use Joomla\String\StringHelper; @@ -72,7 +72,7 @@ final class SiteApplication extends CMSApplication * Class constructor. * * @param ?Input $input An optional argument to provide dependency injection for the application's input - * object. If the argument is a Input object that object will become the + * object. If the argument is a JInput object that object will become the * application's input object, otherwise a default input object is created. * @param ?Registry $config An optional argument to provide dependency injection for the application's config * object. If the argument is a Registry object that object will become the diff --git a/libraries/src/Application/WebApplication.php b/libraries/src/Application/WebApplication.php index 09122ff985cb2..5e1635ae9355f 100644 --- a/libraries/src/Application/WebApplication.php +++ b/libraries/src/Application/WebApplication.php @@ -19,13 +19,13 @@ use Joomla\CMS\Event\Application\BeforeRenderEvent; use Joomla\CMS\Event\Application\BeforeRespondEvent; use Joomla\CMS\Factory; +use Joomla\CMS\Input\Input; use Joomla\CMS\Language\Language; use Joomla\CMS\Session\Session; use Joomla\CMS\Uri\Uri; use Joomla\CMS\User\User; use Joomla\CMS\Version; use Joomla\Filter\OutputFilter; -use Joomla\Input\Input; use Joomla\Registry\Registry; use Joomla\Session\SessionEvent; use Psr\Http\Message\ResponseInterface; @@ -90,7 +90,7 @@ abstract class WebApplication extends AbstractWebApplication * Class constructor. * * @param ?Input $input An optional argument to provide dependency injection for the application's - * input object. If the argument is a Input object that object will become + * input object. If the argument is a JInput object that object will become * the application's input object, otherwise a default input object is created. * @param ?Registry $config An optional argument to provide dependency injection for the application's * config object. If the argument is a Registry object that object will become @@ -107,7 +107,7 @@ abstract class WebApplication extends AbstractWebApplication */ public function __construct(Input $input = null, Registry $config = null, WebClient $client = null, ResponseInterface $response = null) { - // Ensure we have a Input object otherwise the DI for \Joomla\CMS\Session\Storage\JoomlaStorage fails + // Ensure we have a CMS Input object otherwise the DI for \Joomla\CMS\Session\Storage\JoomlaStorage fails $input = $input ?: new Input(); parent::__construct($input, $config, $client, $response); diff --git a/plugins/multifactorauth/email/src/Extension/Email.php b/plugins/multifactorauth/email/src/Extension/Email.php index 736d5f96878b0..1703e9989cf1e 100644 --- a/plugins/multifactorauth/email/src/Extension/Email.php +++ b/plugins/multifactorauth/email/src/Extension/Email.php @@ -19,6 +19,7 @@ use Joomla\CMS\Event\MultiFactor\SaveSetup; use Joomla\CMS\Event\MultiFactor\Validate; use Joomla\CMS\Factory; +use Joomla\CMS\Input\Input; use Joomla\CMS\Language\Text; use Joomla\CMS\Log\Log; use Joomla\CMS\Mail\Exception\MailDisabledException; @@ -34,7 +35,6 @@ use Joomla\Component\Users\Administrator\Helper\Mfa as MfaHelper; use Joomla\Component\Users\Administrator\Table\MfaTable; use Joomla\Event\SubscriberInterface; -use Joomla\Input\Input; use PHPMailer\PHPMailer\Exception as phpMailerException; use RuntimeException;