diff --git a/administrator/components/com_actionlogs/src/Controller/ActionlogsController.php b/administrator/components/com_actionlogs/src/Controller/ActionlogsController.php index 1d38d94cce466..eb73bf333cefd 100644 --- a/administrator/components/com_actionlogs/src/Controller/ActionlogsController.php +++ b/administrator/components/com_actionlogs/src/Controller/ActionlogsController.php @@ -16,13 +16,13 @@ use Joomla\CMS\Application\CMSApplication; use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Date\Date; -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 @@ -39,12 +39,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 cca64525cd399..7acd993197db0 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 1500cf584790f..0b40b947c408c 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\CMS\Input\Input + * @var \Joomla\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 5866bc0955b44..a9f8630f51f97 100644 --- a/components/com_config/src/Controller/ConfigController.php +++ b/components/com_config/src/Controller/ConfigController.php @@ -17,6 +17,7 @@ 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; @@ -30,12 +31,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|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 + * @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 * * @since 1.6 */ diff --git a/components/com_config/src/Controller/ModulesController.php b/components/com_config/src/Controller/ModulesController.php index 97882c670d850..41afeab23cba7 100644 --- a/components/com_config/src/Controller/ModulesController.php +++ b/components/com_config/src/Controller/ModulesController.php @@ -21,6 +21,7 @@ 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; @@ -34,12 +35,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|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 + * @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 * * @since 1.6 */ diff --git a/components/com_config/src/Controller/TemplatesController.php b/components/com_config/src/Controller/TemplatesController.php index e4b54296263ab..6d1039e08cf9e 100644 --- a/components/com_config/src/Controller/TemplatesController.php +++ b/components/com_config/src/Controller/TemplatesController.php @@ -17,6 +17,7 @@ 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; @@ -30,12 +31,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|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 + * @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 * * @since 1.6 */ diff --git a/components/com_contact/src/Controller/DisplayController.php b/components/com_contact/src/Controller/DisplayController.php index 076f65a14061e..8fe3a89b46471 100644 --- a/components/com_contact/src/Controller/DisplayController.php +++ b/components/com_contact/src/Controller/DisplayController.php @@ -14,6 +14,7 @@ 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; @@ -27,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|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 + * @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 * * @since 3.0 */ diff --git a/components/com_content/src/Controller/DisplayController.php b/components/com_content/src/Controller/DisplayController.php index 627fa62534297..b9e898d7dc733 100644 --- a/components/com_content/src/Controller/DisplayController.php +++ b/components/com_content/src/Controller/DisplayController.php @@ -15,6 +15,7 @@ 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; @@ -28,12 +29,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|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 + * @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 * * @since 3.0.1 */ diff --git a/components/com_contenthistory/src/Controller/DisplayController.php b/components/com_contenthistory/src/Controller/DisplayController.php index 66f8195de3960..16fd5191d4891 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|null $factory The factory. - * @param CMSApplication|null $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 $factory The factory. + * @param ?CMSApplication $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 99bc0c0a2b217..4ae7117ac67df 100644 --- a/components/com_fields/src/Controller/DisplayController.php +++ b/components/com_fields/src/Controller/DisplayController.php @@ -12,6 +12,7 @@ use Joomla\CMS\Application\CMSApplication; use Joomla\CMS\MVC\Factory\MVCFactoryInterface; +use Joomla\Input\Input; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -25,12 +26,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|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 + * @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 * * @since 3.7.0 */ diff --git a/components/com_modules/src/Controller/DisplayController.php b/components/com_modules/src/Controller/DisplayController.php index 9057dffd609cd..40a509db8feae 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|null $factory The factory. - * @param CMSApplication|null $app The Application for the dispatcher - * @param Input|null $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 $factory The factory. + * @param ?CMSApplication $app The Application for the dispatcher + * @param ?Input $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 44f54b55f40e8..2dc7d06adafa9 100644 --- a/installation/src/Application/InstallationApplication.php +++ b/installation/src/Application/InstallationApplication.php @@ -19,13 +19,13 @@ use Joomla\CMS\Exception\ExceptionHandler; use Joomla\CMS\Factory; use Joomla\CMS\Filesystem\Folder; -use Joomla\CMS\Input\Input; use Joomla\CMS\Language\LanguageHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Factory\MVCFactory; 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; @@ -45,16 +45,16 @@ final class InstallationApplication extends CMSApplication /** * Class constructor. * - * @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. + * @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. * * @since 3.1 */ diff --git a/installation/src/Controller/InstallationController.php b/installation/src/Controller/InstallationController.php index 260dcb29853bd..1ff5a04141036 100644 --- a/installation/src/Controller/InstallationController.php +++ b/installation/src/Controller/InstallationController.php @@ -15,6 +15,7 @@ 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 +29,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|null $factory The factory. - * @param CMSApplication|null $app The Application for the dispatcher - * @param \Joomla\CMS\Input\Input|null $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 $factory The factory. + * @param ?CMSApplication $app The Application for the dispatcher + * @param ?Input $input The Input object. * * @since 3.0 */ diff --git a/libraries/src/Application/AdministratorApplication.php b/libraries/src/Application/AdministratorApplication.php index a785b8183b67d..1c2662b17ea9a 100644 --- a/libraries/src/Application/AdministratorApplication.php +++ b/libraries/src/Application/AdministratorApplication.php @@ -13,7 +13,6 @@ use Joomla\CMS\Component\ComponentHelper; 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; @@ -21,6 +20,7 @@ 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 @@ -56,7 +56,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 JInput object that object will become the + * 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 @@ -385,7 +385,7 @@ public static function purgeMessages() */ protected function render() { - // Get the \JInput object + // Get the Input 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 11080c64d0bdf..9e986fa9366a5 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 \JInput object that object will become + * 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 diff --git a/libraries/src/Application/CMSApplication.php b/libraries/src/Application/CMSApplication.php index f049e8d7d0561..7c513827e29ca 100644 --- a/libraries/src/Application/CMSApplication.php +++ b/libraries/src/Application/CMSApplication.php @@ -18,7 +18,6 @@ use Joomla\CMS\Extension\ExtensionManagerTrait; use Joomla\CMS\Factory; use Joomla\CMS\Filter\InputFilter; -use Joomla\CMS\Input\Input; use Joomla\CMS\Language\Language; use Joomla\CMS\Language\Text; use Joomla\CMS\Log\Log; @@ -35,6 +34,7 @@ use Joomla\DI\Container; use Joomla\DI\ContainerAwareInterface; use Joomla\DI\ContainerAwareTrait; +use Joomla\Input\Input; use Joomla\Registry\Registry; use Joomla\String\StringHelper; @@ -155,7 +155,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 JInput object that object will become the + * 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 diff --git a/libraries/src/Application/SiteApplication.php b/libraries/src/Application/SiteApplication.php index 5506fe9043c50..edcffb5abee38 100644 --- a/libraries/src/Application/SiteApplication.php +++ b/libraries/src/Application/SiteApplication.php @@ -15,7 +15,6 @@ use Joomla\CMS\Component\ComponentHelper; 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; @@ -24,6 +23,7 @@ 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; @@ -69,7 +69,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 JInput object that object will become the + * 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 diff --git a/libraries/src/Application/WebApplication.php b/libraries/src/Application/WebApplication.php index de21e3fbcabc4..123e0926e411f 100644 --- a/libraries/src/Application/WebApplication.php +++ b/libraries/src/Application/WebApplication.php @@ -13,12 +13,12 @@ use Joomla\Application\Web\WebClient; use Joomla\CMS\Document\Document; 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\Input\Input; use Joomla\Registry\Registry; use Joomla\Session\SessionEvent; use Psr\Http\Message\ResponseInterface; @@ -83,7 +83,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 JInput object that object will become + * 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 @@ -100,7 +100,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 CMS Input object otherwise the DI for \Joomla\CMS\Session\Storage\JoomlaStorage fails + // Ensure we have a 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 998d8fb41669c..e9d868f0855a3 100644 --- a/plugins/multifactorauth/email/src/Extension/Email.php +++ b/plugins/multifactorauth/email/src/Extension/Email.php @@ -19,7 +19,6 @@ 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; @@ -35,6 +34,7 @@ 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;