From e78f308cf0e1d3e240749f15dfb1bb82621c4d82 Mon Sep 17 00:00:00 2001 From: Roland Dalmulder Date: Sun, 12 Aug 2018 22:36:48 +0200 Subject: [PATCH] Clean up and alpha-order imports Signed-off-by: Roland Dalmulder --- libraries/cms/html/access.php | 4 ++-- libraries/cms/html/adminlanguage.php | 2 +- libraries/cms/html/behavior.php | 4 ++-- libraries/cms/html/bootstrap.php | 2 +- libraries/cms/html/category.php | 2 +- libraries/cms/html/date.php | 2 +- libraries/cms/html/email.php | 3 +-- libraries/cms/html/form.php | 2 +- libraries/cms/html/formbehavior.php | 2 +- libraries/cms/html/jgrid.php | 3 +-- libraries/cms/html/list.php | 2 +- libraries/cms/html/searchtools.php | 2 +- libraries/cms/html/select.php | 2 +- libraries/cms/html/string.php | 2 +- libraries/cms/html/tag.php | 4 ++-- libraries/cms/html/uitab.php | 2 -- libraries/cms/html/user.php | 2 +- libraries/src/Access/Access.php | 6 +++--- .../src/Application/AdministratorApplication.php | 10 +++++----- libraries/src/Application/CMSApplication.php | 9 ++++----- libraries/src/Application/CliApplication.php | 6 +++--- libraries/src/Application/ConsoleApplication.php | 4 ++-- libraries/src/Application/DaemonApplication.php | 4 ++-- libraries/src/Application/SiteApplication.php | 10 +++++----- libraries/src/Application/WebApplication.php | 6 +++--- libraries/src/Authentication/Authentication.php | 8 ++++---- .../CheckIfRehashNeededHandlerInterface.php | 4 ---- libraries/src/Cache/Cache.php | 4 ++-- libraries/src/Cache/CacheStorage.php | 1 - .../src/Cache/Controller/OutputController.php | 1 - libraries/src/Cache/Storage/FileStorage.php | 2 +- libraries/src/Cache/Storage/RedisStorage.php | 2 +- libraries/src/Captcha/Captcha.php | 10 +++++----- .../src/Categories/CategoriesServiceTrait.php | 2 +- libraries/src/Categories/CategoryNode.php | 2 +- libraries/src/Client/FtpClient.php | 2 +- libraries/src/Component/ComponentHelper.php | 4 ++-- libraries/src/Dispatcher/Dispatcher.php | 2 +- libraries/src/Dispatcher/DispatcherFactory.php | 2 +- libraries/src/Dispatcher/LegacyDispatcher.php | 2 +- libraries/src/Document/Document.php | 2 +- libraries/src/Document/ErrorDocument.php | 2 +- libraries/src/Document/HtmlDocument.php | 6 +++--- libraries/src/Document/OpensearchDocument.php | 2 +- .../src/Document/Renderer/Feed/AtomRenderer.php | 2 +- .../src/Document/Renderer/Feed/RssRenderer.php | 2 +- .../src/Document/Renderer/Html/HeadRenderer.php | 3 --- .../src/Document/Renderer/Html/MessageRenderer.php | 4 ++-- .../src/Document/Renderer/Html/MetasRenderer.php | 4 ++-- .../src/Document/Renderer/Html/ModuleRenderer.php | 4 +--- .../src/Document/Renderer/Html/ModulesRenderer.php | 2 +- libraries/src/Editor/Editor.php | 10 +++++----- libraries/src/Event/AbstractEvent.php | 2 +- libraries/src/Event/AfterExtensionBootEvent.php | 2 -- libraries/src/Event/BeforeExtensionBootEvent.php | 1 - libraries/src/Event/Table/AfterReorderEvent.php | 1 - libraries/src/Extension/LegacyComponent.php | 2 +- libraries/src/Factory.php | 3 +-- libraries/src/Filesystem/Folder.php | 8 ++++---- libraries/src/Filesystem/Patcher.php | 1 - libraries/src/Filesystem/Path.php | 4 ++-- libraries/src/Filesystem/Stream.php | 3 +-- libraries/src/Filter/InputFilter.php | 2 +- libraries/src/Filter/OutputFilter.php | 4 ++-- libraries/src/Form/Field/AliastagField.php | 2 +- libraries/src/Form/Field/CategoryField.php | 2 +- libraries/src/Form/Field/CheckboxField.php | 1 - libraries/src/Form/Field/ChromestyleField.php | 4 ++-- libraries/src/Form/Field/ComponentlayoutField.php | 4 ++-- libraries/src/Form/Field/ComponentsField.php | 2 +- libraries/src/Form/Field/ContenthistoryField.php | 2 +- .../src/Form/Field/DatabaseconnectionField.php | 2 +- libraries/src/Form/Field/FilelistField.php | 2 +- libraries/src/Form/Field/HiddenField.php | 1 - libraries/src/Form/Field/LanguageField.php | 2 +- libraries/src/Form/Field/ListField.php | 2 +- libraries/src/Form/Field/ModulelayoutField.php | 4 ++-- libraries/src/Form/Field/PredefinedlistField.php | 1 - libraries/src/Form/Field/RulesField.php | 1 - libraries/src/Form/Field/SpacerField.php | 1 - libraries/src/Form/Field/SubformField.php | 2 +- libraries/src/Form/Field/TimezoneField.php | 1 - libraries/src/Form/Field/TransitionField.php | 3 +-- libraries/src/Form/Field/UrlField.php | 1 - libraries/src/Form/Field/UsergroupField.php | 1 - libraries/src/Form/Field/WorkflowStateField.php | 1 - libraries/src/Form/Form.php | 12 ++++++------ libraries/src/Form/FormField.php | 4 ++-- libraries/src/Form/Rule/CalendarRule.php | 2 +- libraries/src/Form/Rule/CaptchaRule.php | 2 +- libraries/src/Form/Rule/EmailRule.php | 4 ++-- libraries/src/Form/Rule/PasswordRule.php | 4 ++-- libraries/src/Form/Rule/UrlRule.php | 2 +- libraries/src/Form/Rule/UsernameRule.php | 2 +- libraries/src/HTML/HTMLHelper.php | 6 +++--- libraries/src/Help/Help.php | 2 +- libraries/src/Helper/AuthenticationHelper.php | 2 +- libraries/src/Helper/ContentHelper.php | 4 ++-- libraries/src/Helper/ContentHistoryHelper.php | 2 +- libraries/src/Helper/LibraryHelper.php | 2 +- libraries/src/Helper/ModuleHelper.php | 6 +++--- libraries/src/Helper/RouteHelper.php | 2 +- libraries/src/Helper/TagsHelper.php | 2 +- libraries/src/Http/Transport/CurlTransport.php | 2 +- libraries/src/Http/Transport/SocketTransport.php | 2 +- libraries/src/Http/Transport/StreamTransport.php | 6 +++--- libraries/src/Image/Image.php | 2 +- .../src/Installer/Adapter/ComponentAdapter.php | 10 +++++----- libraries/src/Installer/Adapter/FileAdapter.php | 8 ++++---- .../src/Installer/Adapter/LanguageAdapter.php | 10 +++++----- libraries/src/Installer/Adapter/LibraryAdapter.php | 12 ++++++------ libraries/src/Installer/Adapter/ModuleAdapter.php | 6 +++--- libraries/src/Installer/Adapter/PackageAdapter.php | 12 ++++++------ libraries/src/Installer/Adapter/PluginAdapter.php | 8 ++++---- .../src/Installer/Adapter/TemplateAdapter.php | 8 ++++---- libraries/src/Installer/Installer.php | 14 +++++++------- libraries/src/Installer/InstallerAdapter.php | 10 +++++----- libraries/src/Installer/InstallerExtension.php | 2 +- libraries/src/Installer/InstallerHelper.php | 10 +++++----- libraries/src/Installer/InstallerScript.php | 2 +- libraries/src/Language/Associations.php | 2 +- libraries/src/Language/Language.php | 2 +- libraries/src/Language/LanguageHelper.php | 5 ++--- libraries/src/Language/LanguageStemmer.php | 2 -- libraries/src/Language/Multilanguage.php | 1 - libraries/src/Log/Logger/DatabaseLogger.php | 2 +- libraries/src/Log/Logger/FormattedtextLogger.php | 4 ++-- libraries/src/Log/Logger/MessagequeueLogger.php | 2 +- libraries/src/MVC/Controller/AdminController.php | 10 +++++----- libraries/src/MVC/Controller/BaseController.php | 12 ++++++------ libraries/src/MVC/Controller/FormController.php | 10 +++++----- libraries/src/MVC/Factory/LegacyFactory.php | 4 ++-- libraries/src/MVC/Model/AdminModel.php | 14 +++++++------- libraries/src/MVC/Model/BaseDatabaseModel.php | 10 +++++----- libraries/src/MVC/Model/FormModel.php | 4 ++-- libraries/src/MVC/Model/ListModel.php | 4 ++-- libraries/src/MVC/View/AbstractView.php | 2 +- libraries/src/MVC/View/HtmlView.php | 4 ++-- libraries/src/MVC/View/ListView.php | 4 ++-- libraries/src/Mail/Mail.php | 2 +- libraries/src/Menu/AbstractMenu.php | 2 +- libraries/src/Menu/MenuHelper.php | 2 +- libraries/src/Menu/Node/Component.php | 2 +- libraries/src/Menu/Node/Url.php | 2 +- libraries/src/Menu/SiteMenu.php | 2 +- libraries/src/Pagination/Pagination.php | 6 +++--- libraries/src/Plugin/CMSPlugin.php | 2 +- libraries/src/Plugin/PluginHelper.php | 2 +- libraries/src/Router/Router.php | 2 +- libraries/src/Schema/ChangeItem.php | 3 +-- libraries/src/Schema/ChangeSet.php | 4 ++-- libraries/src/Service/Provider/Application.php | 6 +++--- libraries/src/Service/Provider/Authentication.php | 4 ++-- libraries/src/Session/Session.php | 4 ++-- libraries/src/Session/Storage/JoomlaStorage.php | 2 +- libraries/src/Table/Category.php | 6 +++--- libraries/src/Table/Content.php | 4 ++-- libraries/src/Table/CoreContent.php | 6 +++--- libraries/src/Table/Extension.php | 4 ++-- libraries/src/Table/Menu.php | 6 +++--- libraries/src/Table/Module.php | 2 +- libraries/src/Table/Nested.php | 2 +- libraries/src/Table/Table.php | 10 +++++----- libraries/src/Table/Update.php | 2 +- libraries/src/Table/User.php | 6 +++--- libraries/src/Toolbar/Button/SliderButton.php | 4 ++-- .../src/Toolbar/ContainerAwareToolbarFactory.php | 8 ++++---- libraries/src/Toolbar/CoreButtonsTrait.php | 2 +- libraries/src/Toolbar/ToolbarHelper.php | 4 ++-- libraries/src/UCM/UCMBase.php | 2 +- libraries/src/UCM/UCMContent.php | 2 +- .../src/Updater/Adapter/CollectionAdapter.php | 2 +- libraries/src/Updater/Adapter/ExtensionAdapter.php | 2 +- libraries/src/Updater/Update.php | 4 ++-- libraries/src/Updater/UpdateAdapter.php | 2 +- libraries/src/User/User.php | 8 ++++---- libraries/src/User/UserHelper.php | 10 +++++----- libraries/src/Version.php | 1 - libraries/src/Workflow/Workflow.php | 2 -- 179 files changed, 326 insertions(+), 367 deletions(-) diff --git a/libraries/cms/html/access.php b/libraries/cms/html/access.php index e1e7dd629d734..0d82398ff1264 100644 --- a/libraries/cms/html/access.php +++ b/libraries/cms/html/access.php @@ -9,11 +9,11 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Access\Access; use Joomla\CMS\Factory; +use Joomla\CMS\Helper\UserGroupsHelper; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -use Joomla\CMS\Access\Access; -use Joomla\CMS\Helper\UserGroupsHelper; use Joomla\CMS\Layout\LayoutHelper; /** diff --git a/libraries/cms/html/adminlanguage.php b/libraries/cms/html/adminlanguage.php index 60db7d1993ac9..3e21ead078f7b 100644 --- a/libraries/cms/html/adminlanguage.php +++ b/libraries/cms/html/adminlanguage.php @@ -9,8 +9,8 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Language\Text; use Joomla\CMS\Language\LanguageHelper; +use Joomla\CMS\Language\Text; use Joomla\CMS\Object\CMSObject; /** diff --git a/libraries/cms/html/behavior.php b/libraries/cms/html/behavior.php index 49338f864f3a1..daf3815f568c5 100644 --- a/libraries/cms/html/behavior.php +++ b/libraries/cms/html/behavior.php @@ -10,12 +10,12 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Factory; +use Joomla\CMS\Filter\OutputFilter; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -use Joomla\CMS\Filter\OutputFilter; +use Joomla\CMS\Log\Log; use Joomla\CMS\Router\Route; use Joomla\CMS\Uri\Uri; -use Joomla\CMS\Log\Log; /** * Utility class for JavaScript behaviors diff --git a/libraries/cms/html/bootstrap.php b/libraries/cms/html/bootstrap.php index 5fb8be52f3a6d..4d8213bcafc65 100644 --- a/libraries/cms/html/bootstrap.php +++ b/libraries/cms/html/bootstrap.php @@ -11,8 +11,8 @@ use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; -use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Layout\FileLayout; +use Joomla\CMS\Layout\LayoutHelper; /** * Utility class for Bootstrap elements. diff --git a/libraries/cms/html/category.php b/libraries/cms/html/category.php index 417193b96e9fa..caf5cc11cea04 100644 --- a/libraries/cms/html/category.php +++ b/libraries/cms/html/category.php @@ -9,10 +9,10 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; +use Joomla\Utilities\ArrayHelper; /** * Utility class for categories diff --git a/libraries/cms/html/date.php b/libraries/cms/html/date.php index 0dfb056c82056..99ce1891857a5 100644 --- a/libraries/cms/html/date.php +++ b/libraries/cms/html/date.php @@ -9,9 +9,9 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Date\Date; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -use Joomla\CMS\Date\Date; /** * Extended Utility class for handling date display. diff --git a/libraries/cms/html/email.php b/libraries/cms/html/email.php index 545a79fec47c2..b19a0331f3b8e 100644 --- a/libraries/cms/html/email.php +++ b/libraries/cms/html/email.php @@ -7,10 +7,9 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\String\PunycodeHelper; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Uri\Uri; defined('JPATH_PLATFORM') or die; diff --git a/libraries/cms/html/form.php b/libraries/cms/html/form.php index 1b35089419d6e..e094c930d3d69 100644 --- a/libraries/cms/html/form.php +++ b/libraries/cms/html/form.php @@ -10,9 +10,9 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Document\HtmlDocument; -use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Factory; use Joomla\CMS\Session\Session; +use Joomla\Utilities\ArrayHelper; /** * Utility class for form elements diff --git a/libraries/cms/html/formbehavior.php b/libraries/cms/html/formbehavior.php index 45afb11c1c257..7f11ef17c0f01 100644 --- a/libraries/cms/html/formbehavior.php +++ b/libraries/cms/html/formbehavior.php @@ -9,10 +9,10 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Registry\Registry; use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; +use Joomla\Registry\Registry; /** * Utility class for form related behaviors diff --git a/libraries/cms/html/jgrid.php b/libraries/cms/html/jgrid.php index dda55f2a9584b..8a3474641e304 100644 --- a/libraries/cms/html/jgrid.php +++ b/libraries/cms/html/jgrid.php @@ -9,11 +9,10 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Button\PublishedButton; use Joomla\CMS\Factory; -use Joomla\Utilities\ArrayHelper; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; +use Joomla\Utilities\ArrayHelper; /** * Utility class for creating HTML Grids diff --git a/libraries/cms/html/list.php b/libraries/cms/html/list.php index c3ef48f1d68a8..5c75acfa94c60 100644 --- a/libraries/cms/html/list.php +++ b/libraries/cms/html/list.php @@ -9,10 +9,10 @@ defined('JPATH_PLATFORM') or die; -use Joomla\String\StringHelper; use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; +use Joomla\String\StringHelper; /** * Utility class for creating different select lists diff --git a/libraries/cms/html/searchtools.php b/libraries/cms/html/searchtools.php index 9390b509f4dc1..5573feed6d751 100644 --- a/libraries/cms/html/searchtools.php +++ b/libraries/cms/html/searchtools.php @@ -9,10 +9,10 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Registry\Registry; use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Layout\LayoutHelper; +use Joomla\Registry\Registry; /** * Searchtools elements. diff --git a/libraries/cms/html/select.php b/libraries/cms/html/select.php index 1e4fb3cea1291..5ece3d6e8834c 100644 --- a/libraries/cms/html/select.php +++ b/libraries/cms/html/select.php @@ -9,9 +9,9 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Utilities\ArrayHelper; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; +use Joomla\Utilities\ArrayHelper; /** * Utility class for creating HTML select lists diff --git a/libraries/cms/html/string.php b/libraries/cms/html/string.php index 54cfbffd65695..73303b04c879e 100644 --- a/libraries/cms/html/string.php +++ b/libraries/cms/html/string.php @@ -9,8 +9,8 @@ defined('JPATH_PLATFORM') or die; -use Joomla\String\StringHelper; use Joomla\CMS\HTML\HTMLHelper; +use Joomla\String\StringHelper; /** * HTML helper class for rendering manipulated strings. diff --git a/libraries/cms/html/tag.php b/libraries/cms/html/tag.php index 2cce2a82e6af3..9559664f55c5e 100644 --- a/libraries/cms/html/tag.php +++ b/libraries/cms/html/tag.php @@ -9,12 +9,12 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Utilities\ArrayHelper; +use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Uri\Uri; +use Joomla\Utilities\ArrayHelper; /** * Utility class for tags diff --git a/libraries/cms/html/uitab.php b/libraries/cms/html/uitab.php index fb6c4cfe81a1c..93b4b60188c81 100644 --- a/libraries/cms/html/uitab.php +++ b/libraries/cms/html/uitab.php @@ -9,8 +9,6 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\HTML\HTMLHelper; - /** * Utility class for the Joomla core UI Tab element. * diff --git a/libraries/cms/html/user.php b/libraries/cms/html/user.php index e867b9875677a..6383b8fef80f7 100644 --- a/libraries/cms/html/user.php +++ b/libraries/cms/html/user.php @@ -9,9 +9,9 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Access\Access; use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; -use Joomla\CMS\Access\Access; /** * Utility class working with users diff --git a/libraries/src/Access/Access.php b/libraries/src/Access/Access.php index 78e0bdd4c31c8..aa9c37950890b 100644 --- a/libraries/src/Access/Access.php +++ b/libraries/src/Access/Access.php @@ -10,11 +10,11 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Utilities\ArrayHelper; -use Joomla\CMS\Table\Asset; +use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Factory; use Joomla\CMS\Log\Log; -use Joomla\CMS\Component\ComponentHelper; +use Joomla\CMS\Table\Asset; +use Joomla\Utilities\ArrayHelper; /** * Class that handles all access authorisation routines. diff --git a/libraries/src/Application/AdministratorApplication.php b/libraries/src/Application/AdministratorApplication.php index c4058a1e61237..b6ff3ed1480bc 100644 --- a/libraries/src/Application/AdministratorApplication.php +++ b/libraries/src/Application/AdministratorApplication.php @@ -12,16 +12,16 @@ use Joomla\Application\Web\WebClient; 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\Plugin\PluginHelper; -use Joomla\DI\Container; -use Joomla\Registry\Registry; -use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; -use Joomla\CMS\Filter\InputFilter; +use Joomla\CMS\Plugin\PluginHelper; use Joomla\CMS\Session\Session; use Joomla\CMS\Uri\Uri; +use Joomla\DI\Container; +use Joomla\Registry\Registry; /** * Joomla! Administrator Application class diff --git a/libraries/src/Application/CMSApplication.php b/libraries/src/Application/CMSApplication.php index cec79f64bb17b..fe4ce1a1a74b9 100644 --- a/libraries/src/Application/CMSApplication.php +++ b/libraries/src/Application/CMSApplication.php @@ -17,24 +17,23 @@ use Joomla\CMS\Event\ErrorEvent; use Joomla\CMS\Exception\ExceptionHandler; use Joomla\CMS\Extension\ExtensionManagerTrait; +use Joomla\CMS\Factory; use Joomla\CMS\Input\Input; -use Joomla\CMS\Filter\InputFilter; use Joomla\CMS\Language\Language; use Joomla\CMS\Language\Text; use Joomla\CMS\Menu\AbstractMenu; use Joomla\CMS\Pathway\Pathway; use Joomla\CMS\Plugin\PluginHelper; use Joomla\CMS\Profiler\Profiler; +use Joomla\CMS\Router\Route; +use Joomla\CMS\Router\Router; use Joomla\CMS\Session\MetadataManager; use Joomla\CMS\Session\Session; +use Joomla\CMS\Uri\Uri; use Joomla\DI\Container; use Joomla\DI\ContainerAwareInterface; use Joomla\DI\ContainerAwareTrait; use Joomla\Registry\Registry; -use Joomla\CMS\Factory; -use Joomla\CMS\Uri\Uri; -use Joomla\CMS\Router\Router; -use Joomla\CMS\Router\Route; /** * Joomla! CMS Application class diff --git a/libraries/src/Application/CliApplication.php b/libraries/src/Application/CliApplication.php index fb35bf43fb405..a905e6dd5421b 100644 --- a/libraries/src/Application/CliApplication.php +++ b/libraries/src/Application/CliApplication.php @@ -16,16 +16,16 @@ use Joomla\CMS\Application\CLI\Output\Stdout; use Joomla\CMS\Event\BeforeExecuteEvent; use Joomla\CMS\Extension\ExtensionManagerTrait; -use Joomla\Input\Cli; -use Joomla\Input\Input; +use Joomla\CMS\Factory; use Joomla\DI\Container; use Joomla\DI\ContainerAwareTrait; use Joomla\Event\DispatcherAwareInterface; use Joomla\Event\DispatcherAwareTrait; use Joomla\Event\DispatcherInterface; +use Joomla\Input\Cli; +use Joomla\Input\Input; use Joomla\Registry\Registry; use Joomla\Session\SessionInterface; -use Joomla\CMS\Factory; /** * Base class for a Joomla! command line application. diff --git a/libraries/src/Application/ConsoleApplication.php b/libraries/src/Application/ConsoleApplication.php index 41fc683349830..66b626abd36d5 100644 --- a/libraries/src/Application/ConsoleApplication.php +++ b/libraries/src/Application/ConsoleApplication.php @@ -12,7 +12,7 @@ use Joomla\CMS\Console; use Joomla\CMS\Extension\ExtensionManagerTrait; -use Joomla\Input\Cli; +use Joomla\CMS\Factory; use Joomla\CMS\Plugin\PluginHelper; use Joomla\Console\Application; use Joomla\DI\Container; @@ -20,10 +20,10 @@ use Joomla\Event\DispatcherAwareInterface; use Joomla\Event\DispatcherAwareTrait; use Joomla\Event\DispatcherInterface; +use Joomla\Input\Cli; use Joomla\Registry\Registry; use Joomla\Session\SessionInterface; use Symfony\Component\Console\Style\SymfonyStyle; -use Joomla\CMS\Factory; /** * The Joomla! CMS Console Application diff --git a/libraries/src/Application/DaemonApplication.php b/libraries/src/Application/DaemonApplication.php index c21ded0ec1feb..cdc180bc15f3e 100644 --- a/libraries/src/Application/DaemonApplication.php +++ b/libraries/src/Application/DaemonApplication.php @@ -13,10 +13,10 @@ jimport('joomla.filesystem.folder'); use Joomla\CMS\Event\BeforeExecuteEvent; -use Joomla\Event\DispatcherInterface; -use Joomla\Registry\Registry; use Joomla\CMS\Filesystem\Folder; use Joomla\CMS\Log\Log; +use Joomla\Event\DispatcherInterface; +use Joomla\Registry\Registry; /** * Class to turn CliApplication applications into daemons. It requires CLI and PCNTL support built into PHP. diff --git a/libraries/src/Application/SiteApplication.php b/libraries/src/Application/SiteApplication.php index b9562dcc9a4b7..6cdaf3f447b05 100644 --- a/libraries/src/Application/SiteApplication.php +++ b/libraries/src/Application/SiteApplication.php @@ -12,18 +12,18 @@ use Joomla\Application\Web\WebClient; 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\Menu\AbstractMenu; use Joomla\CMS\Pathway\Pathway; use Joomla\CMS\Plugin\PluginHelper; +use Joomla\CMS\Router\Route; +use Joomla\CMS\Uri\Uri; use Joomla\DI\Container; use Joomla\Registry\Registry; -use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Filter\InputFilter; -use Joomla\CMS\Uri\Uri; -use Joomla\CMS\Router\Route; /** * Joomla! Site Application class diff --git a/libraries/src/Application/WebApplication.php b/libraries/src/Application/WebApplication.php index c7be27ecd7e7d..94c140b349dab 100644 --- a/libraries/src/Application/WebApplication.php +++ b/libraries/src/Application/WebApplication.php @@ -14,8 +14,11 @@ use Joomla\Application\Web\WebClient; use Joomla\CMS\Document\Document; use Joomla\CMS\Event\BeforeExecuteEvent; +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\Event\DispatcherAwareInterface; @@ -23,9 +26,6 @@ use Joomla\Registry\Registry; use Joomla\Session\SessionEvent; use Psr\Http\Message\ResponseInterface; -use Joomla\CMS\Factory; -use Joomla\CMS\Session\Session; -use Joomla\CMS\Uri\Uri; /** * Base class for a Joomla! Web application. diff --git a/libraries/src/Authentication/Authentication.php b/libraries/src/Authentication/Authentication.php index 807426b2fee18..fce7104bb3ae1 100644 --- a/libraries/src/Authentication/Authentication.php +++ b/libraries/src/Authentication/Authentication.php @@ -10,13 +10,13 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Plugin\PluginHelper; -use Joomla\Event\DispatcherAwareTrait; -use Joomla\Event\DispatcherInterface; use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; -use Joomla\CMS\Object\CMSObject; use Joomla\CMS\Log\Log; +use Joomla\CMS\Object\CMSObject; +use Joomla\CMS\Plugin\PluginHelper; +use Joomla\Event\DispatcherAwareTrait; +use Joomla\Event\DispatcherInterface; /** * Authentication class, provides an interface for the Joomla authentication system diff --git a/libraries/src/Authentication/Password/CheckIfRehashNeededHandlerInterface.php b/libraries/src/Authentication/Password/CheckIfRehashNeededHandlerInterface.php index 3740bc2b5a046..0256f10dc06c0 100644 --- a/libraries/src/Authentication/Password/CheckIfRehashNeededHandlerInterface.php +++ b/libraries/src/Authentication/Password/CheckIfRehashNeededHandlerInterface.php @@ -10,10 +10,6 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Authentication\Password\HandlerInterface; -use Joomla\CMS\Crypt\Crypt; -use Joomla\CMS\User\UserHelper; - /** * Interface for a password handler which supports checking if the password requires rehashing * diff --git a/libraries/src/Cache/Cache.php b/libraries/src/Cache/Cache.php index a2823becf6d71..7a77ff34f4c28 100644 --- a/libraries/src/Cache/Cache.php +++ b/libraries/src/Cache/Cache.php @@ -12,10 +12,10 @@ use Joomla\Application\Web\WebClient; use Joomla\CMS\Cache\Exception\CacheExceptionInterface; -use Joomla\String\StringHelper; use Joomla\CMS\Factory; -use Joomla\CMS\Session\Session; use Joomla\CMS\Filesystem\Path; +use Joomla\CMS\Session\Session; +use Joomla\String\StringHelper; /** * Joomla! Cache base object diff --git a/libraries/src/Cache/CacheStorage.php b/libraries/src/Cache/CacheStorage.php index 980ec1834a972..a32466c8328d5 100644 --- a/libraries/src/Cache/CacheStorage.php +++ b/libraries/src/Cache/CacheStorage.php @@ -11,7 +11,6 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Cache\Exception\UnsupportedCacheException; -use Joomla\CMS\Log\Log; use Joomla\CMS\Factory; use Joomla\CMS\Filesystem\Path; diff --git a/libraries/src/Cache/Controller/OutputController.php b/libraries/src/Cache/Controller/OutputController.php index 523de95eb72ae..c25731af3d3d7 100644 --- a/libraries/src/Cache/Controller/OutputController.php +++ b/libraries/src/Cache/Controller/OutputController.php @@ -11,7 +11,6 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Cache\CacheController; -use Joomla\CMS\Log\Log; /** * Joomla Cache output type object diff --git a/libraries/src/Cache/Storage/FileStorage.php b/libraries/src/Cache/Storage/FileStorage.php index 548824c88616c..daba283056f90 100644 --- a/libraries/src/Cache/Storage/FileStorage.php +++ b/libraries/src/Cache/Storage/FileStorage.php @@ -11,9 +11,9 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Cache\CacheStorage; -use Joomla\CMS\Log\Log; use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; +use Joomla\CMS\Log\Log; /** * File cache storage handler diff --git a/libraries/src/Cache/Storage/RedisStorage.php b/libraries/src/Cache/Storage/RedisStorage.php index 0d3dd8ba81cfc..5d9167bd88dbe 100644 --- a/libraries/src/Cache/Storage/RedisStorage.php +++ b/libraries/src/Cache/Storage/RedisStorage.php @@ -11,8 +11,8 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Cache\CacheStorage; -use Joomla\CMS\Log\Log; use Joomla\CMS\Factory; +use Joomla\CMS\Log\Log; /** * Redis cache storage handler for PECL diff --git a/libraries/src/Captcha/Captcha.php b/libraries/src/Captcha/Captcha.php index 1eb119240ca06..4786edd48978c 100644 --- a/libraries/src/Captcha/Captcha.php +++ b/libraries/src/Captcha/Captcha.php @@ -10,15 +10,15 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Factory; +use Joomla\CMS\Filter\InputFilter; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Plugin\CMSPlugin; +use Joomla\CMS\Plugin\PluginHelper; use Joomla\Event\DispatcherAwareInterface; use Joomla\Event\DispatcherAwareTrait; use Joomla\Event\Event; -use Joomla\CMS\Plugin\CMSPlugin; -use Joomla\CMS\Plugin\PluginHelper; use Joomla\Registry\Registry; -use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Filter\InputFilter; /** * Joomla! Captcha base object diff --git a/libraries/src/Categories/CategoriesServiceTrait.php b/libraries/src/Categories/CategoriesServiceTrait.php index f5f06c537fba1..1b06623df3c67 100644 --- a/libraries/src/Categories/CategoriesServiceTrait.php +++ b/libraries/src/Categories/CategoriesServiceTrait.php @@ -10,8 +10,8 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\Form; use Joomla\CMS\Factory; +use Joomla\CMS\Form\Form; /** * Trait for component categories service. diff --git a/libraries/src/Categories/CategoryNode.php b/libraries/src/Categories/CategoryNode.php index b2ae44b9cda07..2eb5f82aa035a 100644 --- a/libraries/src/Categories/CategoryNode.php +++ b/libraries/src/Categories/CategoryNode.php @@ -10,9 +10,9 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Registry\Registry; use Joomla\CMS\Factory; use Joomla\CMS\Object\CMSObject; +use Joomla\Registry\Registry; /** * Helper class to load Categorytree diff --git a/libraries/src/Client/FtpClient.php b/libraries/src/Client/FtpClient.php index 21782f3530577..9d5b46d42beb7 100644 --- a/libraries/src/Client/FtpClient.php +++ b/libraries/src/Client/FtpClient.php @@ -10,9 +10,9 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Language\Text; use Joomla\CMS\Log\Log; use Joomla\CMS\Utility\BufferStreamHandler; -use Joomla\CMS\Language\Text; /** Error Codes: * - 30 : Unable to connect to host diff --git a/libraries/src/Component/ComponentHelper.php b/libraries/src/Component/ComponentHelper.php index 16be1946b95da..d36247c36f7d1 100644 --- a/libraries/src/Component/ComponentHelper.php +++ b/libraries/src/Component/ComponentHelper.php @@ -12,12 +12,12 @@ use Joomla\CMS\Access\Access; use Joomla\CMS\Component\Exception\MissingComponentException; -use Joomla\Registry\Registry; use Joomla\CMS\Dispatcher\Dispatcher; use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; use Joomla\CMS\Filter\InputFilter; +use Joomla\CMS\Language\Text; use Joomla\CMS\Log\Log; +use Joomla\Registry\Registry; /** * Component helper class diff --git a/libraries/src/Dispatcher/Dispatcher.php b/libraries/src/Dispatcher/Dispatcher.php index ddbcbab21f131..69e315bd142e5 100644 --- a/libraries/src/Dispatcher/Dispatcher.php +++ b/libraries/src/Dispatcher/Dispatcher.php @@ -13,10 +13,10 @@ use Joomla\CMS\Access\Exception\NotAllowed; use Joomla\CMS\Application\CMSApplication; use Joomla\CMS\Component\ComponentHelper; +use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Controller\BaseController; use Joomla\CMS\MVC\Factory\MVCFactoryFactoryInterface; use Joomla\Input\Input; -use Joomla\CMS\Language\Text; /** * Base class for a Joomla Dispatcher diff --git a/libraries/src/Dispatcher/DispatcherFactory.php b/libraries/src/Dispatcher/DispatcherFactory.php index 1de699f0d9898..6fe2fd4b7bf74 100644 --- a/libraries/src/Dispatcher/DispatcherFactory.php +++ b/libraries/src/Dispatcher/DispatcherFactory.php @@ -11,8 +11,8 @@ defined('_JEXEC') or die; use Joomla\CMS\Application\CMSApplicationInterface; -use Joomla\Input\Input; use Joomla\CMS\MVC\Factory\MVCFactoryFactoryInterface; +use Joomla\Input\Input; /** * Namesapce based implementation of the DispatcherFactoryInterface diff --git a/libraries/src/Dispatcher/LegacyDispatcher.php b/libraries/src/Dispatcher/LegacyDispatcher.php index 8c0a335d07694..f5ba51d368ad1 100644 --- a/libraries/src/Dispatcher/LegacyDispatcher.php +++ b/libraries/src/Dispatcher/LegacyDispatcher.php @@ -11,8 +11,8 @@ defined('_JEXEC') or die; use Joomla\CMS\Application\CMSApplication; -use Joomla\CMS\MVC\Factory\MVCFactoryFactory; use Joomla\CMS\Language\Text; +use Joomla\CMS\MVC\Factory\MVCFactoryFactory; /** * Base class for a legacy Joomla Dispatcher diff --git a/libraries/src/Document/Document.php b/libraries/src/Document/Document.php index 27bb37b8393c9..6550ce20c1552 100644 --- a/libraries/src/Document/Document.php +++ b/libraries/src/Document/Document.php @@ -12,9 +12,9 @@ use Joomla\Application\AbstractWebApplication; use Joomla\CMS\Date\Date; -use Symfony\Component\WebLink\HttpHeaderSerializer; use Joomla\CMS\Factory; use Joomla\CMS\Log\Log; +use Symfony\Component\WebLink\HttpHeaderSerializer; /** * Document class, provides an easy interface to parse and display a document diff --git a/libraries/src/Document/ErrorDocument.php b/libraries/src/Document/ErrorDocument.php index 873cb5fd5b601..6049a2540b4a7 100644 --- a/libraries/src/Document/ErrorDocument.php +++ b/libraries/src/Document/ErrorDocument.php @@ -10,8 +10,8 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Factory; +use Joomla\CMS\Layout\LayoutHelper; /** * ErrorDocument class, provides an easy interface to parse and display an HTML based error page diff --git a/libraries/src/Document/HtmlDocument.php b/libraries/src/Document/HtmlDocument.php index 6bd9f7e8be237..7fdc69f665091 100644 --- a/libraries/src/Document/HtmlDocument.php +++ b/libraries/src/Document/HtmlDocument.php @@ -11,13 +11,13 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Cache\Cache; +use Joomla\CMS\Factory; +use Joomla\CMS\Filter\InputFilter; use Joomla\CMS\Helper\ModuleHelper; +use Joomla\CMS\Language\Text; use Joomla\CMS\Log\Log; use Joomla\CMS\Uri\Uri; use Joomla\Registry\Registry; -use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Filter\InputFilter; jimport('joomla.utilities.utility'); diff --git a/libraries/src/Document/OpensearchDocument.php b/libraries/src/Document/OpensearchDocument.php index 6c8c5978a8ce4..b12f0dbf91da1 100644 --- a/libraries/src/Document/OpensearchDocument.php +++ b/libraries/src/Document/OpensearchDocument.php @@ -12,9 +12,9 @@ use Joomla\CMS\Document\Opensearch\OpensearchImage; use Joomla\CMS\Document\Opensearch\OpensearchUrl; -use Joomla\CMS\Uri\Uri; use Joomla\CMS\Factory; use Joomla\CMS\Router\Route; +use Joomla\CMS\Uri\Uri; /** * Opensearch class, provides an easy interface to display an Opensearch document diff --git a/libraries/src/Document/Renderer/Feed/AtomRenderer.php b/libraries/src/Document/Renderer/Feed/AtomRenderer.php index 8ba81affc183f..5067e0b50d622 100644 --- a/libraries/src/Document/Renderer/Feed/AtomRenderer.php +++ b/libraries/src/Document/Renderer/Feed/AtomRenderer.php @@ -11,10 +11,10 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Document\DocumentRenderer; -use Joomla\CMS\Uri\Uri; use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; +use Joomla\CMS\Uri\Uri; /** * AtomRenderer is a feed that implements the atom specification diff --git a/libraries/src/Document/Renderer/Feed/RssRenderer.php b/libraries/src/Document/Renderer/Feed/RssRenderer.php index 69fba580b3ee9..dd8f513b32682 100644 --- a/libraries/src/Document/Renderer/Feed/RssRenderer.php +++ b/libraries/src/Document/Renderer/Feed/RssRenderer.php @@ -11,10 +11,10 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Document\DocumentRenderer; -use Joomla\CMS\Uri\Uri; use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; +use Joomla\CMS\Uri\Uri; /** * RssRenderer is a feed that implements RSS 2.0 Specification diff --git a/libraries/src/Document/Renderer/Html/HeadRenderer.php b/libraries/src/Document/Renderer/Html/HeadRenderer.php index 4d5cbca2fd29d..71e6cce637919 100644 --- a/libraries/src/Document/Renderer/Html/HeadRenderer.php +++ b/libraries/src/Document/Renderer/Html/HeadRenderer.php @@ -11,9 +11,6 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Document\DocumentRenderer; -use Joomla\CMS\Helper\TagsHelper; -use Joomla\CMS\Uri\Uri; -use Joomla\Utilities\ArrayHelper; /** * HTML document renderer for the document `` element diff --git a/libraries/src/Document/Renderer/Html/MessageRenderer.php b/libraries/src/Document/Renderer/Html/MessageRenderer.php index d28968e6a0296..63f34db794076 100644 --- a/libraries/src/Document/Renderer/Html/MessageRenderer.php +++ b/libraries/src/Document/Renderer/Html/MessageRenderer.php @@ -11,9 +11,9 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Document\DocumentRenderer; -use Joomla\CMS\Log\Log; -use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Factory; +use Joomla\CMS\Layout\LayoutHelper; +use Joomla\CMS\Log\Log; /** * HTML document renderer for the system message queue diff --git a/libraries/src/Document/Renderer/Html/MetasRenderer.php b/libraries/src/Document/Renderer/Html/MetasRenderer.php index b7f10f630e43f..3b8cdcde74fdb 100644 --- a/libraries/src/Document/Renderer/Html/MetasRenderer.php +++ b/libraries/src/Document/Renderer/Html/MetasRenderer.php @@ -12,10 +12,10 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Document\DocumentRenderer; -use Joomla\CMS\Helper\TagsHelper; use Joomla\CMS\Factory; -use Joomla\Utilities\ArrayHelper; +use Joomla\CMS\Helper\TagsHelper; use Joomla\CMS\HTML\HTMLHelper; +use Joomla\Utilities\ArrayHelper; /** * JDocument metas renderer diff --git a/libraries/src/Document/Renderer/Html/ModuleRenderer.php b/libraries/src/Document/Renderer/Html/ModuleRenderer.php index 6251fe2012851..71eb6adeb0bf7 100644 --- a/libraries/src/Document/Renderer/Html/ModuleRenderer.php +++ b/libraries/src/Document/Renderer/Html/ModuleRenderer.php @@ -11,11 +11,9 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Document\DocumentRenderer; +use Joomla\CMS\Factory; use Joomla\CMS\Helper\ModuleHelper; -use Joomla\CMS\Log\Log; -use Joomla\CMS\Layout\LayoutHelper; use Joomla\Registry\Registry; -use Joomla\CMS\Factory; /** * HTML document renderer for a single module diff --git a/libraries/src/Document/Renderer/Html/ModulesRenderer.php b/libraries/src/Document/Renderer/Html/ModulesRenderer.php index 5ed6410657515..f51522553754b 100644 --- a/libraries/src/Document/Renderer/Html/ModulesRenderer.php +++ b/libraries/src/Document/Renderer/Html/ModulesRenderer.php @@ -11,9 +11,9 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Document\DocumentRenderer; +use Joomla\CMS\Factory; use Joomla\CMS\Helper\ModuleHelper; use Joomla\CMS\Layout\LayoutHelper; -use Joomla\CMS\Factory; /** * HTML document renderer for a module position diff --git a/libraries/src/Editor/Editor.php b/libraries/src/Editor/Editor.php index 06d2bdbb81795..767668136b053 100644 --- a/libraries/src/Editor/Editor.php +++ b/libraries/src/Editor/Editor.php @@ -10,16 +10,16 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Factory; +use Joomla\CMS\Filter\InputFilter; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Log\Log; +use Joomla\Event\AbstractEvent; use Joomla\Event\DispatcherAwareInterface; use Joomla\Event\DispatcherAwareTrait; use Joomla\Event\DispatcherInterface; use Joomla\Event\Event; -use Joomla\Event\AbstractEvent; use Joomla\Registry\Registry; -use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Filter\InputFilter; -use Joomla\CMS\Log\Log; /** * Editor class to handle WYSIWYG editors diff --git a/libraries/src/Event/AbstractEvent.php b/libraries/src/Event/AbstractEvent.php index 986793369e64e..d8afb2bfef64d 100644 --- a/libraries/src/Event/AbstractEvent.php +++ b/libraries/src/Event/AbstractEvent.php @@ -10,9 +10,9 @@ defined('JPATH_PLATFORM') or die; +use BadMethodCallException; use Joomla\Event\Event as BaseEvent; use Joomla\String\Normalise; -use BadMethodCallException; /** * This class implements the base Event object used system-wide to offer orthogonality. Core objects such as Models, diff --git a/libraries/src/Event/AfterExtensionBootEvent.php b/libraries/src/Event/AfterExtensionBootEvent.php index 9a4f59bd4f255..2ab9e664d78a5 100644 --- a/libraries/src/Event/AfterExtensionBootEvent.php +++ b/libraries/src/Event/AfterExtensionBootEvent.php @@ -8,8 +8,6 @@ namespace Joomla\CMS\Event; -use Joomla\CMS\Application\CMSApplication; -use Joomla\CMS\Extension\ComponentInterface; use Joomla\DI\Container; defined('JPATH_PLATFORM') or die; diff --git a/libraries/src/Event/BeforeExtensionBootEvent.php b/libraries/src/Event/BeforeExtensionBootEvent.php index bf0c1f978c50b..77dc6b4fe8bc4 100644 --- a/libraries/src/Event/BeforeExtensionBootEvent.php +++ b/libraries/src/Event/BeforeExtensionBootEvent.php @@ -8,7 +8,6 @@ namespace Joomla\CMS\Event; -use Joomla\CMS\Application\CMSApplication; use Joomla\DI\Container; defined('JPATH_PLATFORM') or die; diff --git a/libraries/src/Event/Table/AfterReorderEvent.php b/libraries/src/Event/Table/AfterReorderEvent.php index d4b9ef64aec53..260cc2adf805f 100644 --- a/libraries/src/Event/Table/AfterReorderEvent.php +++ b/libraries/src/Event/Table/AfterReorderEvent.php @@ -11,7 +11,6 @@ defined('JPATH_PLATFORM') or die; use BadMethodCallException; -use stdClass; /** * Event class for JTable's onAfterReorder event diff --git a/libraries/src/Extension/LegacyComponent.php b/libraries/src/Extension/LegacyComponent.php index c105ff3761ed1..0356730dfb926 100644 --- a/libraries/src/Extension/LegacyComponent.php +++ b/libraries/src/Extension/LegacyComponent.php @@ -18,11 +18,11 @@ use Joomla\CMS\Dispatcher\DispatcherInterface; use Joomla\CMS\Dispatcher\LegacyDispatcher; use Joomla\CMS\Fields\FieldsServiceInterface; +use Joomla\CMS\Filesystem\Path; use Joomla\CMS\MVC\Factory\LegacyFactory; use Joomla\CMS\MVC\Factory\MVCFactory; use Joomla\CMS\MVC\Factory\MVCFactoryInterface; use Joomla\CMS\MVC\Factory\MVCFactoryServiceInterface; -use Joomla\CMS\Filesystem\Path; /** * Access to component specific services. diff --git a/libraries/src/Factory.php b/libraries/src/Factory.php index f6c807df7cfd5..9e0bcd30b74d3 100644 --- a/libraries/src/Factory.php +++ b/libraries/src/Factory.php @@ -21,13 +21,12 @@ use Joomla\CMS\Mail\Mail; use Joomla\CMS\Mail\MailHelper; use Joomla\CMS\Session\Session; +use Joomla\CMS\User\User; use Joomla\Database\DatabaseDriver; use Joomla\Database\DatabaseInterface; use Joomla\DI\Container; -use Joomla\CMS\User\User; use Joomla\Registry\Registry; use PHPMailer\PHPMailer\Exception as phpmailerException; -use Psr\Log\LoggerInterface; /** * Joomla Platform Factory class. diff --git a/libraries/src/Filesystem/Folder.php b/libraries/src/Filesystem/Folder.php index 3388fdff69949..0a8b3e4c35883 100644 --- a/libraries/src/Filesystem/Folder.php +++ b/libraries/src/Filesystem/Folder.php @@ -10,13 +10,13 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Factory; -use Joomla\CMS\Log\Log; -use Joomla\CMS\Filesystem\Wrapper\PathWrapper; -use Joomla\CMS\Filesystem\Wrapper\FileWrapper; use Joomla\CMS\Client\ClientHelper; use Joomla\CMS\Client\FtpClient; +use Joomla\CMS\Factory; +use Joomla\CMS\Filesystem\Wrapper\FileWrapper; +use Joomla\CMS\Filesystem\Wrapper\PathWrapper; use Joomla\CMS\Language\Text; +use Joomla\CMS\Log\Log; /** * A Folder handling class diff --git a/libraries/src/Filesystem/Patcher.php b/libraries/src/Filesystem/Patcher.php index 5b3ef15f1229e..312e3ca38ebd2 100644 --- a/libraries/src/Filesystem/Patcher.php +++ b/libraries/src/Filesystem/Patcher.php @@ -10,7 +10,6 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Log\Log; use Joomla\CMS\Language\Text; /** diff --git a/libraries/src/Filesystem/Path.php b/libraries/src/Filesystem/Path.php index 930b730bc2e83..11253b8bb5f06 100644 --- a/libraries/src/Filesystem/Path.php +++ b/libraries/src/Filesystem/Path.php @@ -10,9 +10,9 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Filesystem\Wrapper\PathWrapper; -use Joomla\CMS\Filesystem\Wrapper\FileWrapper; use Joomla\CMS\Crypt\Crypt; +use Joomla\CMS\Filesystem\Wrapper\FileWrapper; +use Joomla\CMS\Filesystem\Wrapper\PathWrapper; if (!defined('JPATH_ROOT')) { diff --git a/libraries/src/Filesystem/Stream.php b/libraries/src/Filesystem/Stream.php index 8ffe68836b6a5..cfeeea159ff2e 100644 --- a/libraries/src/Filesystem/Stream.php +++ b/libraries/src/Filesystem/Stream.php @@ -10,9 +10,8 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Object\CMSObject; -use Joomla\CMS\Filesystem\FilesystemHelper; use Joomla\CMS\Language\Text; +use Joomla\CMS\Object\CMSObject; /** * Joomla! Stream Interface diff --git a/libraries/src/Filter/InputFilter.php b/libraries/src/Filter/InputFilter.php index b9c1f3b0dcf06..904c7fec8c8d4 100644 --- a/libraries/src/Filter/InputFilter.php +++ b/libraries/src/Filter/InputFilter.php @@ -10,9 +10,9 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Factory; use Joomla\Database\UTF8MB4SupportInterface; use Joomla\Filter\InputFilter as BaseInputFilter; -use Joomla\CMS\Factory; /** * InputFilter is a class for filtering input from any data source diff --git a/libraries/src/Filter/OutputFilter.php b/libraries/src/Filter/OutputFilter.php index e551bdabd8bae..6948b1953c291 100644 --- a/libraries/src/Filter/OutputFilter.php +++ b/libraries/src/Filter/OutputFilter.php @@ -10,10 +10,10 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Factory; +use Joomla\CMS\Language\Language; use Joomla\Filter\OutputFilter as BaseOutputFilter; use Joomla\String\StringHelper; -use Joomla\CMS\Language\Language; -use Joomla\CMS\Factory; /** * OutputFilter diff --git a/libraries/src/Form/Field/AliastagField.php b/libraries/src/Form/Field/AliastagField.php index 2e51991ae4b4a..870361bdb8c58 100644 --- a/libraries/src/Form/Field/AliastagField.php +++ b/libraries/src/Form/Field/AliastagField.php @@ -11,8 +11,8 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Factory; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\Filesystem\Path; +use Joomla\CMS\Form\FormHelper; use Joomla\CMS\Language\Text; FormHelper::loadFieldClass('list'); diff --git a/libraries/src/Form/Field/CategoryField.php b/libraries/src/Form/Field/CategoryField.php index f82dbaa19b4a5..401ffb03353bc 100644 --- a/libraries/src/Form/Field/CategoryField.php +++ b/libraries/src/Form/Field/CategoryField.php @@ -12,9 +12,9 @@ use Joomla\CMS\Factory; use Joomla\CMS\Form\FormHelper; -use Joomla\CMS\Log\Log; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; +use Joomla\CMS\Log\Log; FormHelper::loadFieldClass('list'); diff --git a/libraries/src/Form/Field/CheckboxField.php b/libraries/src/Form/Field/CheckboxField.php index f6150c27bd875..a43bef694c82b 100644 --- a/libraries/src/Form/Field/CheckboxField.php +++ b/libraries/src/Form/Field/CheckboxField.php @@ -10,7 +10,6 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Factory; use Joomla\CMS\Form\FormField; /** diff --git a/libraries/src/Form/Field/ChromestyleField.php b/libraries/src/Form/Field/ChromestyleField.php index 213b3d5edbfa7..d3125ee5ec524 100644 --- a/libraries/src/Form/Field/ChromestyleField.php +++ b/libraries/src/Form/Field/ChromestyleField.php @@ -10,10 +10,10 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Factory; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\Application\ApplicationHelper; +use Joomla\CMS\Factory; use Joomla\CMS\Form\Form; +use Joomla\CMS\Form\FormHelper; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; diff --git a/libraries/src/Form/Field/ComponentlayoutField.php b/libraries/src/Form/Field/ComponentlayoutField.php index af86f91b1120b..d939b5506a313 100644 --- a/libraries/src/Form/Field/ComponentlayoutField.php +++ b/libraries/src/Form/Field/ComponentlayoutField.php @@ -12,10 +12,10 @@ use Joomla\CMS\Application\ApplicationHelper; use Joomla\CMS\Factory; +use Joomla\CMS\Filesystem\Folder; +use Joomla\CMS\Filesystem\Path; use Joomla\CMS\Form\Form; use Joomla\CMS\Form\FormField; -use Joomla\CMS\Filesystem\Path; -use Joomla\CMS\Filesystem\Folder; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; diff --git a/libraries/src/Form/Field/ComponentsField.php b/libraries/src/Form/Field/ComponentsField.php index 47bf23adbd3c6..39c54b6df407c 100644 --- a/libraries/src/Form/Field/ComponentsField.php +++ b/libraries/src/Form/Field/ComponentsField.php @@ -10,10 +10,10 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Factory; use Joomla\CMS\Form\FormHelper; use Joomla\CMS\Language\Text; +use Joomla\Utilities\ArrayHelper; FormHelper::loadFieldClass('list'); diff --git a/libraries/src/Form/Field/ContenthistoryField.php b/libraries/src/Form/Field/ContenthistoryField.php index f4d745cd2b5b8..1bc9e290407c2 100644 --- a/libraries/src/Form/Field/ContenthistoryField.php +++ b/libraries/src/Form/Field/ContenthistoryField.php @@ -11,9 +11,9 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Form\FormField; +use Joomla\CMS\Language\Text; use Joomla\CMS\Session\Session; use Joomla\CMS\Table\Table; -use Joomla\CMS\Language\Text; /** * Field to select Content History from a modal list. diff --git a/libraries/src/Form/Field/DatabaseconnectionField.php b/libraries/src/Form/Field/DatabaseconnectionField.php index c899aac42bdf4..2a25c8a8763a9 100644 --- a/libraries/src/Form/Field/DatabaseconnectionField.php +++ b/libraries/src/Form/Field/DatabaseconnectionField.php @@ -10,9 +10,9 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Form\FormHelper; use Joomla\CMS\Language\Text; use Joomla\Database\DatabaseDriver; -use Joomla\CMS\Form\FormHelper; FormHelper::loadFieldClass('list'); diff --git a/libraries/src/Form/Field/FilelistField.php b/libraries/src/Form/Field/FilelistField.php index 9d67cd7aa972a..5c98c47252033 100644 --- a/libraries/src/Form/Field/FilelistField.php +++ b/libraries/src/Form/Field/FilelistField.php @@ -13,8 +13,8 @@ use Joomla\CMS\Form\FormHelper; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -use Joomla\Filesystem\Folder; use Joomla\Filesystem\File; +use Joomla\Filesystem\Folder; use Joomla\Filesystem\Path; FormHelper::loadFieldClass('list'); diff --git a/libraries/src/Form/Field/HiddenField.php b/libraries/src/Form/Field/HiddenField.php index 4a9294fc11827..179832ab794fd 100644 --- a/libraries/src/Form/Field/HiddenField.php +++ b/libraries/src/Form/Field/HiddenField.php @@ -10,7 +10,6 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Factory; use Joomla\CMS\Form\FormField; /** diff --git a/libraries/src/Form/Field/LanguageField.php b/libraries/src/Form/Field/LanguageField.php index b2da68d90c03c..2a3dbabc854a8 100644 --- a/libraries/src/Form/Field/LanguageField.php +++ b/libraries/src/Form/Field/LanguageField.php @@ -10,9 +10,9 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Factory; use Joomla\CMS\Form\FormHelper; -use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Language\LanguageHelper; FormHelper::loadFieldClass('list'); diff --git a/libraries/src/Form/Field/ListField.php b/libraries/src/Form/Field/ListField.php index d5e68eec72692..1881892cd66b7 100644 --- a/libraries/src/Form/Field/ListField.php +++ b/libraries/src/Form/Field/ListField.php @@ -18,8 +18,8 @@ use Joomla\CMS\Language\Associations; use Joomla\CMS\Language\Multilanguage; use Joomla\CMS\Language\Text; -use Joomla\CMS\Uri\Uri; use Joomla\CMS\Plugin\PluginHelper; +use Joomla\CMS\Uri\Uri; /** * Form Field class for the Joomla Platform. diff --git a/libraries/src/Form/Field/ModulelayoutField.php b/libraries/src/Form/Field/ModulelayoutField.php index 6283cf9dfbc83..b9c293cd4bdb2 100644 --- a/libraries/src/Form/Field/ModulelayoutField.php +++ b/libraries/src/Form/Field/ModulelayoutField.php @@ -12,12 +12,12 @@ use Joomla\CMS\Application\ApplicationHelper; use Joomla\CMS\Factory; +use Joomla\CMS\Filesystem\Folder; +use Joomla\CMS\Filesystem\Path; use Joomla\CMS\Form\Form; use Joomla\CMS\Form\FormField; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -use Joomla\CMS\Filesystem\Folder; -use Joomla\CMS\Filesystem\Path; \JLoader::import('joomla.filesystem.folder'); diff --git a/libraries/src/Form/Field/PredefinedlistField.php b/libraries/src/Form/Field/PredefinedlistField.php index ced50818fdde2..9ff03fcda2833 100644 --- a/libraries/src/Form/Field/PredefinedlistField.php +++ b/libraries/src/Form/Field/PredefinedlistField.php @@ -10,7 +10,6 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\Language\Text; /** diff --git a/libraries/src/Form/Field/RulesField.php b/libraries/src/Form/Field/RulesField.php index a54da871cad3e..92a4f5cf675bb 100644 --- a/libraries/src/Form/Field/RulesField.php +++ b/libraries/src/Form/Field/RulesField.php @@ -14,7 +14,6 @@ use Joomla\CMS\Factory; use Joomla\CMS\Form\FormField; use Joomla\CMS\Helper\UserGroupsHelper; -use Joomla\CMS\Layout\LayoutHelper; /** * Form Field class for the Joomla Platform. diff --git a/libraries/src/Form/Field/SpacerField.php b/libraries/src/Form/Field/SpacerField.php index 4317d568440aa..7480ebc3a0c0e 100644 --- a/libraries/src/Form/Field/SpacerField.php +++ b/libraries/src/Form/Field/SpacerField.php @@ -10,7 +10,6 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Factory; use Joomla\CMS\Form\FormField; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; diff --git a/libraries/src/Form/Field/SubformField.php b/libraries/src/Form/Field/SubformField.php index e3f662809a694..623316a8d984a 100644 --- a/libraries/src/Form/Field/SubformField.php +++ b/libraries/src/Form/Field/SubformField.php @@ -10,9 +10,9 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Filesystem\Path; use Joomla\CMS\Form\Form; use Joomla\CMS\Form\FormField; -use Joomla\CMS\Filesystem\Path; /** * The Field to load the form inside current form diff --git a/libraries/src/Form/Field/TimezoneField.php b/libraries/src/Form/Field/TimezoneField.php index a60e0299550d1..c72f79106c791 100644 --- a/libraries/src/Form/Field/TimezoneField.php +++ b/libraries/src/Form/Field/TimezoneField.php @@ -10,7 +10,6 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Factory; use Joomla\CMS\Form\FormHelper; use Joomla\CMS\HTML\HTMLHelper; diff --git a/libraries/src/Form/Field/TransitionField.php b/libraries/src/Form/Field/TransitionField.php index c8796a84a0ebd..589217814008c 100644 --- a/libraries/src/Form/Field/TransitionField.php +++ b/libraries/src/Form/Field/TransitionField.php @@ -12,9 +12,8 @@ use Joomla\CMS\Factory; use Joomla\CMS\Form\FormHelper; -use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Workflow\Workflow; -use Joomla\CMS\Form\Field\ListField; +use Joomla\Utilities\ArrayHelper; FormHelper::loadFieldClass('list'); diff --git a/libraries/src/Form/Field/UrlField.php b/libraries/src/Form/Field/UrlField.php index 12bc8fb3e8fc4..6c0cae37f7b65 100644 --- a/libraries/src/Form/Field/UrlField.php +++ b/libraries/src/Form/Field/UrlField.php @@ -10,7 +10,6 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Factory; use Joomla\CMS\Form\FormHelper; FormHelper::loadFieldClass('text'); diff --git a/libraries/src/Form/Field/UsergroupField.php b/libraries/src/Form/Field/UsergroupField.php index 775293d469ff3..6b601824023b8 100644 --- a/libraries/src/Form/Field/UsergroupField.php +++ b/libraries/src/Form/Field/UsergroupField.php @@ -10,7 +10,6 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Factory; use Joomla\CMS\Form\FormField; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Log\Log; diff --git a/libraries/src/Form/Field/WorkflowStateField.php b/libraries/src/Form/Field/WorkflowStateField.php index b356aaf141246..f29308d345aa4 100644 --- a/libraries/src/Form/Field/WorkflowStateField.php +++ b/libraries/src/Form/Field/WorkflowStateField.php @@ -12,7 +12,6 @@ use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; -use Joomla\CMS\Form\Field\GroupedlistField; /** * Workflow States field. diff --git a/libraries/src/Form/Form.php b/libraries/src/Form/Form.php index 0acbd8b89b4b1..74e3e86c48539 100644 --- a/libraries/src/Form/Form.php +++ b/libraries/src/Form/Form.php @@ -10,16 +10,16 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Uri\Uri; -use Joomla\Registry\Registry; -use Joomla\Utilities\ArrayHelper; -use Joomla\CMS\Language\Text; use Joomla\CMS\Factory; -use Joomla\CMS\Object\CMSObject; -use Joomla\CMS\Log\Log; use Joomla\CMS\Filesystem\Path; use Joomla\CMS\Filter\InputFilter; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Log\Log; +use Joomla\CMS\Object\CMSObject; use Joomla\CMS\String\PunycodeHelper; +use Joomla\CMS\Uri\Uri; +use Joomla\Registry\Registry; +use Joomla\Utilities\ArrayHelper; /** * Form Class for the Joomla Platform. diff --git a/libraries/src/Form/FormField.php b/libraries/src/Form/FormField.php index d08e095665eb4..c82cc62e768f4 100644 --- a/libraries/src/Form/FormField.php +++ b/libraries/src/Form/FormField.php @@ -10,11 +10,11 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\FileLayout; +use Joomla\CMS\Log\Log; use Joomla\String\Normalise; use Joomla\String\StringHelper; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Log\Log; /** * Abstract Form Field class for the Joomla Platform. diff --git a/libraries/src/Form/Rule/CalendarRule.php b/libraries/src/Form/Rule/CalendarRule.php index 106d2e72285ed..96cf514809578 100644 --- a/libraries/src/Form/Rule/CalendarRule.php +++ b/libraries/src/Form/Rule/CalendarRule.php @@ -11,10 +11,10 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Date\Date; +use Joomla\CMS\Factory; use Joomla\CMS\Form\Form; use Joomla\CMS\Form\FormRule; use Joomla\Registry\Registry; -use Joomla\CMS\Factory; /** * Form Rule class for the Joomla Platform diff --git a/libraries/src/Form/Rule/CaptchaRule.php b/libraries/src/Form/Rule/CaptchaRule.php index f7fce03b3bcd4..f77bca316e55c 100644 --- a/libraries/src/Form/Rule/CaptchaRule.php +++ b/libraries/src/Form/Rule/CaptchaRule.php @@ -11,10 +11,10 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Captcha\Captcha; +use Joomla\CMS\Factory; use Joomla\CMS\Form\Form; use Joomla\CMS\Form\FormRule; use Joomla\Registry\Registry; -use Joomla\CMS\Factory; /** * Form Rule class for the Joomla Framework. diff --git a/libraries/src/Form/Rule/EmailRule.php b/libraries/src/Form/Rule/EmailRule.php index 043f04ef72322..d241849c3312c 100644 --- a/libraries/src/Form/Rule/EmailRule.php +++ b/libraries/src/Form/Rule/EmailRule.php @@ -10,11 +10,11 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Factory; use Joomla\CMS\Form\Form; use Joomla\CMS\Form\FormRule; -use Joomla\Registry\Registry; -use Joomla\CMS\Factory; use Joomla\CMS\String\PunycodeHelper; +use Joomla\Registry\Registry; /** * Form Rule class for the Joomla Platform. diff --git a/libraries/src/Form/Rule/PasswordRule.php b/libraries/src/Form/Rule/PasswordRule.php index e67fc3268857b..31307b4d6fe2c 100644 --- a/libraries/src/Form/Rule/PasswordRule.php +++ b/libraries/src/Form/Rule/PasswordRule.php @@ -11,11 +11,11 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Component\ComponentHelper; +use Joomla\CMS\Factory; use Joomla\CMS\Form\Form; use Joomla\CMS\Form\FormRule; -use Joomla\Registry\Registry; use Joomla\CMS\Language\Text; -use Joomla\CMS\Factory; +use Joomla\Registry\Registry; /** * Form Rule class for the Joomla Platform. diff --git a/libraries/src/Form/Rule/UrlRule.php b/libraries/src/Form/Rule/UrlRule.php index e0a3a94a99fc3..1727f1d7faa25 100644 --- a/libraries/src/Form/Rule/UrlRule.php +++ b/libraries/src/Form/Rule/UrlRule.php @@ -12,10 +12,10 @@ use Joomla\CMS\Form\Form; use Joomla\CMS\Form\FormRule; +use Joomla\CMS\Language\Text; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Uri\UriHelper; -use Joomla\CMS\Language\Text; /** * Form Rule class for the Joomla Platform. diff --git a/libraries/src/Form/Rule/UsernameRule.php b/libraries/src/Form/Rule/UsernameRule.php index 66c6382071e7c..e42c1a1b9fd83 100644 --- a/libraries/src/Form/Rule/UsernameRule.php +++ b/libraries/src/Form/Rule/UsernameRule.php @@ -10,10 +10,10 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Factory; use Joomla\CMS\Form\Form; use Joomla\CMS\Form\FormRule; use Joomla\Registry\Registry; -use Joomla\CMS\Factory; /** * Form Rule class for the Joomla Platform. diff --git a/libraries/src/HTML/HTMLHelper.php b/libraries/src/HTML/HTMLHelper.php index 757f6d3cc2c9c..e07256d7b6f14 100644 --- a/libraries/src/HTML/HTMLHelper.php +++ b/libraries/src/HTML/HTMLHelper.php @@ -10,15 +10,15 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Environment\Browser; use Joomla\CMS\Factory; use Joomla\CMS\Filesystem\File; -use Joomla\CMS\Layout\LayoutHelper; -use Joomla\CMS\Log\Log; use Joomla\CMS\Filesystem\Path; use Joomla\CMS\Language\Text; +use Joomla\CMS\Layout\LayoutHelper; +use Joomla\CMS\Log\Log; use Joomla\CMS\Uri\Uri; +use Joomla\Utilities\ArrayHelper; /** * Utility class for all HTML drawing classes diff --git a/libraries/src/Help/Help.php b/libraries/src/Help/Help.php index 47b3421448e27..fc385cf103b2b 100644 --- a/libraries/src/Help/Help.php +++ b/libraries/src/Help/Help.php @@ -11,9 +11,9 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Application\ApplicationHelper; +use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; -use Joomla\CMS\Component\ComponentHelper; /** * Help system class diff --git a/libraries/src/Helper/AuthenticationHelper.php b/libraries/src/Helper/AuthenticationHelper.php index 01004b2c9ffd3..283f0a453ac67 100644 --- a/libraries/src/Helper/AuthenticationHelper.php +++ b/libraries/src/Helper/AuthenticationHelper.php @@ -11,8 +11,8 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; /** * Authentication helper class diff --git a/libraries/src/Helper/ContentHelper.php b/libraries/src/Helper/ContentHelper.php index 3c8d77cdbe792..ba56746e0a3a9 100644 --- a/libraries/src/Helper/ContentHelper.php +++ b/libraries/src/Helper/ContentHelper.php @@ -16,12 +16,12 @@ use Joomla\CMS\Factory; use Joomla\CMS\Language\LanguageHelper; use Joomla\CMS\Language\Multilanguage; +use Joomla\CMS\Language\Text; use Joomla\CMS\Log\Log; +use Joomla\CMS\Object\CMSObject; use Joomla\CMS\Plugin\PluginHelper; use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Object\CMSObject; /** * Helper for standard content style extensions. diff --git a/libraries/src/Helper/ContentHistoryHelper.php b/libraries/src/Helper/ContentHistoryHelper.php index 93fa234a9206a..7ba6aea99c306 100644 --- a/libraries/src/Helper/ContentHistoryHelper.php +++ b/libraries/src/Helper/ContentHistoryHelper.php @@ -11,9 +11,9 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Component\ComponentHelper; -use Joomla\CMS\Table\Table; use Joomla\CMS\Factory; use Joomla\CMS\Filter\InputFilter; +use Joomla\CMS\Table\Table; /** * Versions helper class, provides methods to perform various tasks relevant diff --git a/libraries/src/Helper/LibraryHelper.php b/libraries/src/Helper/LibraryHelper.php index 7738de721e33c..c8976b0aa2b68 100644 --- a/libraries/src/Helper/LibraryHelper.php +++ b/libraries/src/Helper/LibraryHelper.php @@ -10,10 +10,10 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Registry\Registry; use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; use Joomla\CMS\Log\Log; +use Joomla\Registry\Registry; /** * Library helper class diff --git a/libraries/src/Helper/ModuleHelper.php b/libraries/src/Helper/ModuleHelper.php index fb6d22d9d7d3b..24362ecc7c99a 100644 --- a/libraries/src/Helper/ModuleHelper.php +++ b/libraries/src/Helper/ModuleHelper.php @@ -11,12 +11,12 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Component\ComponentHelper; -use Joomla\CMS\Language\LanguageHelper; -use Joomla\Registry\Registry; use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; use Joomla\CMS\Filter\InputFilter; +use Joomla\CMS\Language\LanguageHelper; +use Joomla\CMS\Language\Text; use Joomla\CMS\Log\Log; +use Joomla\Registry\Registry; /** * Module helper class diff --git a/libraries/src/Helper/RouteHelper.php b/libraries/src/Helper/RouteHelper.php index 24d611828df6e..f82cfc5c237da 100644 --- a/libraries/src/Helper/RouteHelper.php +++ b/libraries/src/Helper/RouteHelper.php @@ -11,8 +11,8 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Component\ComponentHelper; -use Joomla\CMS\Language\Multilanguage; use Joomla\CMS\Factory; +use Joomla\CMS\Language\Multilanguage; /** * Route Helper diff --git a/libraries/src/Helper/TagsHelper.php b/libraries/src/Helper/TagsHelper.php index ffe8a729619af..54cae5356f26a 100644 --- a/libraries/src/Helper/TagsHelper.php +++ b/libraries/src/Helper/TagsHelper.php @@ -11,11 +11,11 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Component\ComponentHelper; +use Joomla\CMS\Factory; use Joomla\CMS\Table\CoreContent; use Joomla\CMS\Table\Table; use Joomla\CMS\Table\TableInterface; use Joomla\Utilities\ArrayHelper; -use Joomla\CMS\Factory; /** * Tags helper class, provides methods to perform various tasks relevant diff --git a/libraries/src/Http/Transport/CurlTransport.php b/libraries/src/Http/Transport/CurlTransport.php index c09042d40bff5..5c96e6814cc50 100644 --- a/libraries/src/Http/Transport/CurlTransport.php +++ b/libraries/src/Http/Transport/CurlTransport.php @@ -10,6 +10,7 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Factory; use Joomla\CMS\Http\Response; use Joomla\CMS\Http\TransportInterface; use Joomla\CMS\Uri\Uri; @@ -17,7 +18,6 @@ use Joomla\Http\Exception\InvalidResponseCodeException; use Joomla\Uri\UriInterface; use Zend\Diactoros\Stream as StreamResponse; -use Joomla\CMS\Factory; /** * HTTP transport class for using cURL. diff --git a/libraries/src/Http/Transport/SocketTransport.php b/libraries/src/Http/Transport/SocketTransport.php index e14042c1d8a4d..20bd2a2bed6b8 100644 --- a/libraries/src/Http/Transport/SocketTransport.php +++ b/libraries/src/Http/Transport/SocketTransport.php @@ -10,6 +10,7 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Factory; use Joomla\CMS\Http\Response; use Joomla\CMS\Http\TransportInterface; use Joomla\CMS\Uri\Uri; @@ -17,7 +18,6 @@ use Joomla\Http\Exception\InvalidResponseCodeException; use Joomla\Uri\UriInterface; use Zend\Diactoros\Stream as StreamResponse; -use Joomla\CMS\Factory; /** * HTTP transport class for using sockets directly. diff --git a/libraries/src/Http/Transport/StreamTransport.php b/libraries/src/Http/Transport/StreamTransport.php index 21e6e4e8b2ad9..6ae17ae1e2a52 100644 --- a/libraries/src/Http/Transport/StreamTransport.php +++ b/libraries/src/Http/Transport/StreamTransport.php @@ -10,14 +10,14 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Http\AbstractTransport; -use Joomla\Http\Exception\InvalidResponseCodeException; +use Joomla\CMS\Factory; use Joomla\CMS\Http\Response; use Joomla\CMS\Http\TransportInterface; +use Joomla\Http\AbstractTransport; +use Joomla\Http\Exception\InvalidResponseCodeException; use Joomla\Uri\Uri; use Joomla\Uri\UriInterface; use Zend\Diactoros\Stream as StreamResponse; -use Joomla\CMS\Factory; /** * HTTP transport class for using PHP streams. diff --git a/libraries/src/Image/Image.php b/libraries/src/Image/Image.php index ccb77dfb78834..2c33418a9c42e 100644 --- a/libraries/src/Image/Image.php +++ b/libraries/src/Image/Image.php @@ -11,8 +11,8 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Image\Image as FrameworkImage; use Joomla\CMS\Log\Log; +use Joomla\Image\Image as FrameworkImage; /** * Class to manipulate an image. diff --git a/libraries/src/Installer/Adapter/ComponentAdapter.php b/libraries/src/Installer/Adapter/ComponentAdapter.php index 926bf9fb9a844..e131392c72e5e 100644 --- a/libraries/src/Installer/Adapter/ComponentAdapter.php +++ b/libraries/src/Installer/Adapter/ComponentAdapter.php @@ -11,17 +11,17 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Application\ApplicationHelper; +use Joomla\CMS\Factory; +use Joomla\CMS\Filesystem\Folder; +use Joomla\CMS\Filesystem\Path; use Joomla\CMS\Installer\Installer; use Joomla\CMS\Installer\InstallerAdapter; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Log\Log; use Joomla\CMS\Table\Asset; use Joomla\CMS\Table\Extension; use Joomla\CMS\Table\Table; use Joomla\CMS\Table\Update; -use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Filesystem\Folder; -use Joomla\CMS\Log\Log; -use Joomla\CMS\Filesystem\Path; use Joomla\Database\ParameterType; /** diff --git a/libraries/src/Installer/Adapter/FileAdapter.php b/libraries/src/Installer/Adapter/FileAdapter.php index c111def900208..4e55ac301a84d 100644 --- a/libraries/src/Installer/Adapter/FileAdapter.php +++ b/libraries/src/Installer/Adapter/FileAdapter.php @@ -10,14 +10,14 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Filesystem\File; +use Joomla\CMS\Filesystem\Folder; +use Joomla\CMS\Filesystem\Path; use Joomla\CMS\Installer\Installer; use Joomla\CMS\Installer\InstallerAdapter; -use Joomla\CMS\Table\Table; use Joomla\CMS\Language\Text; -use Joomla\CMS\Filesystem\File; -use Joomla\CMS\Filesystem\Folder; use Joomla\CMS\Log\Log; -use Joomla\CMS\Filesystem\Path; +use Joomla\CMS\Table\Table; use Joomla\Database\ParameterType; /** diff --git a/libraries/src/Installer/Adapter/LanguageAdapter.php b/libraries/src/Installer/Adapter/LanguageAdapter.php index 869c1702e36fb..ef099d3744419 100644 --- a/libraries/src/Installer/Adapter/LanguageAdapter.php +++ b/libraries/src/Installer/Adapter/LanguageAdapter.php @@ -12,19 +12,19 @@ use Joomla\CMS\Application\ApplicationHelper; use Joomla\CMS\Component\ComponentHelper; +use Joomla\CMS\Factory; +use Joomla\CMS\Filesystem\Folder; +use Joomla\CMS\Filter\InputFilter; use Joomla\CMS\Installer\Installer; use Joomla\CMS\Installer\InstallerAdapter; use Joomla\CMS\Language\Language; use Joomla\CMS\Language\LanguageHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Log\Log; use Joomla\CMS\Table\Table; use Joomla\CMS\Table\Update; use Joomla\Database\ParameterType; use Joomla\Registry\Registry; -use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Filter\InputFilter; -use Joomla\CMS\Filesystem\Folder; -use Joomla\CMS\Log\Log; /** * Language installer diff --git a/libraries/src/Installer/Adapter/LibraryAdapter.php b/libraries/src/Installer/Adapter/LibraryAdapter.php index 16c9a2edab572..787d182805b41 100644 --- a/libraries/src/Installer/Adapter/LibraryAdapter.php +++ b/libraries/src/Installer/Adapter/LibraryAdapter.php @@ -10,17 +10,17 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Filesystem\File; +use Joomla\CMS\Filesystem\Folder; +use Joomla\CMS\Filesystem\Path; +use Joomla\CMS\Filter\InputFilter; use Joomla\CMS\Installer\Installer; use Joomla\CMS\Installer\InstallerAdapter; use Joomla\CMS\Installer\Manifest\LibraryManifest; -use Joomla\CMS\Table\Table; -use Joomla\CMS\Table\Update; use Joomla\CMS\Language\Text; -use Joomla\CMS\Filter\InputFilter; -use Joomla\CMS\Filesystem\File; -use Joomla\CMS\Filesystem\Folder; use Joomla\CMS\Log\Log; -use Joomla\CMS\Filesystem\Path; +use Joomla\CMS\Table\Table; +use Joomla\CMS\Table\Update; use Joomla\Database\ParameterType; /** diff --git a/libraries/src/Installer/Adapter/ModuleAdapter.php b/libraries/src/Installer/Adapter/ModuleAdapter.php index 3b57eb4dcc70b..fc943e925bce8 100644 --- a/libraries/src/Installer/Adapter/ModuleAdapter.php +++ b/libraries/src/Installer/Adapter/ModuleAdapter.php @@ -11,14 +11,14 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Application\ApplicationHelper; +use Joomla\CMS\Filesystem\Folder; use Joomla\CMS\Installer\Installer; use Joomla\CMS\Installer\InstallerAdapter; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Log\Log; use Joomla\CMS\Table\Table; use Joomla\Database\ParameterType; use Joomla\Utilities\ArrayHelper; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Filesystem\Folder; -use Joomla\CMS\Log\Log; /** * Module installer diff --git a/libraries/src/Installer/Adapter/PackageAdapter.php b/libraries/src/Installer/Adapter/PackageAdapter.php index 6ba7d88d1ec46..31a1f9cb5d7aa 100644 --- a/libraries/src/Installer/Adapter/PackageAdapter.php +++ b/libraries/src/Installer/Adapter/PackageAdapter.php @@ -11,20 +11,20 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Application\ApplicationHelper; +use Joomla\CMS\Factory; +use Joomla\CMS\Filesystem\File; +use Joomla\CMS\Filesystem\Folder; +use Joomla\CMS\Filter\InputFilter; use Joomla\CMS\Installer\Installer; use Joomla\CMS\Installer\InstallerAdapter; use Joomla\CMS\Installer\InstallerHelper; use Joomla\CMS\Installer\Manifest\PackageManifest; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Log\Log; use Joomla\CMS\Table\Table; use Joomla\CMS\Table\Update; use Joomla\Database\ParameterType; use Joomla\Event\Event; -use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Filter\InputFilter; -use Joomla\CMS\Filesystem\File; -use Joomla\CMS\Filesystem\Folder; -use Joomla\CMS\Log\Log; /** * Package installer diff --git a/libraries/src/Installer/Adapter/PluginAdapter.php b/libraries/src/Installer/Adapter/PluginAdapter.php index 43166c2747d3e..4dd2978b4f4cb 100644 --- a/libraries/src/Installer/Adapter/PluginAdapter.php +++ b/libraries/src/Installer/Adapter/PluginAdapter.php @@ -11,14 +11,14 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Application\ApplicationHelper; +use Joomla\CMS\Filesystem\File; +use Joomla\CMS\Filesystem\Folder; use Joomla\CMS\Installer\Installer; use Joomla\CMS\Installer\InstallerAdapter; -use Joomla\CMS\Table\Table; -use Joomla\CMS\Table\Update; use Joomla\CMS\Language\Text; -use Joomla\CMS\Filesystem\File; -use Joomla\CMS\Filesystem\Folder; use Joomla\CMS\Log\Log; +use Joomla\CMS\Table\Table; +use Joomla\CMS\Table\Update; /** * Plugin installer diff --git a/libraries/src/Installer/Adapter/TemplateAdapter.php b/libraries/src/Installer/Adapter/TemplateAdapter.php index ba659a974117e..5bfe4cdad9873 100644 --- a/libraries/src/Installer/Adapter/TemplateAdapter.php +++ b/libraries/src/Installer/Adapter/TemplateAdapter.php @@ -11,14 +11,14 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Application\ApplicationHelper; +use Joomla\CMS\Factory; +use Joomla\CMS\Filesystem\Folder; use Joomla\CMS\Installer\Installer; use Joomla\CMS\Installer\InstallerAdapter; -use Joomla\CMS\Table\Table; -use Joomla\CMS\Table\Update; -use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; -use Joomla\CMS\Filesystem\Folder; use Joomla\CMS\Log\Log; +use Joomla\CMS\Table\Table; +use Joomla\CMS\Table\Update; use Joomla\Database\ParameterType; /** diff --git a/libraries/src/Installer/Installer.php b/libraries/src/Installer/Installer.php index e67c4394f0ab0..378f27744d165 100644 --- a/libraries/src/Installer/Installer.php +++ b/libraries/src/Installer/Installer.php @@ -11,19 +11,19 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Application\ApplicationHelper; +use Joomla\CMS\Factory; +use Joomla\CMS\Filesystem\File; +use Joomla\CMS\Filesystem\Folder; +use Joomla\CMS\Filesystem\Path; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Log\Log; use Joomla\CMS\Plugin\PluginHelper; use Joomla\CMS\Table\Extension; use Joomla\CMS\Table\Table; +use Joomla\Database\DatabaseDriver; use Joomla\Database\Exception\ExecutionFailureException; use Joomla\Database\ParameterType; use Joomla\Database\UTF8MB4SupportInterface; -use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; -use Joomla\Database\DatabaseDriver; -use Joomla\CMS\Filesystem\File; -use Joomla\CMS\Filesystem\Folder; -use Joomla\CMS\Log\Log; -use Joomla\CMS\Filesystem\Path; \JLoader::import('joomla.base.adapter'); diff --git a/libraries/src/Installer/InstallerAdapter.php b/libraries/src/Installer/InstallerAdapter.php index acefacc95b56b..8869bd6658a07 100644 --- a/libraries/src/Installer/InstallerAdapter.php +++ b/libraries/src/Installer/InstallerAdapter.php @@ -10,16 +10,16 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Factory; +use Joomla\CMS\Filesystem\Folder; +use Joomla\CMS\Filter\InputFilter; use Joomla\CMS\Installer\Manifest\PackageManifest; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Log\Log; use Joomla\CMS\Table\Extension; use Joomla\CMS\Table\Table; use Joomla\CMS\Table\TableInterface; -use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; use Joomla\Database\DatabaseDriver; -use Joomla\CMS\Filter\InputFilter; -use Joomla\CMS\Filesystem\Folder; -use Joomla\CMS\Log\Log; /** * Abstract adapter for the installer. diff --git a/libraries/src/Installer/InstallerExtension.php b/libraries/src/Installer/InstallerExtension.php index 194493132b872..0ddbad93d1b17 100644 --- a/libraries/src/Installer/InstallerExtension.php +++ b/libraries/src/Installer/InstallerExtension.php @@ -12,8 +12,8 @@ use Joomla\CMS\Application\ApplicationHelper; use Joomla\CMS\Language\Text; -use Joomla\CMS\Object\CMSObject; use Joomla\CMS\Log\Log; +use Joomla\CMS\Object\CMSObject; /** * Extension object diff --git a/libraries/src/Installer/InstallerHelper.php b/libraries/src/Installer/InstallerHelper.php index d20fabe19a0b7..2232abafcd8a6 100644 --- a/libraries/src/Installer/InstallerHelper.php +++ b/libraries/src/Installer/InstallerHelper.php @@ -10,15 +10,15 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Factory; use Joomla\Archive\Archive; -use Joomla\CMS\Plugin\PluginHelper; -use Joomla\CMS\Version; -use Joomla\CMS\Language\Text; +use Joomla\CMS\Factory; use Joomla\CMS\Filesystem\File; use Joomla\CMS\Filesystem\Folder; -use Joomla\CMS\Log\Log; use Joomla\CMS\Filesystem\Path; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Log\Log; +use Joomla\CMS\Plugin\PluginHelper; +use Joomla\CMS\Version; /** * Installer helper class diff --git a/libraries/src/Installer/InstallerScript.php b/libraries/src/Installer/InstallerScript.php index 02525e0e91a9a..899198aa28960 100644 --- a/libraries/src/Installer/InstallerScript.php +++ b/libraries/src/Installer/InstallerScript.php @@ -11,9 +11,9 @@ defined('_JEXEC') or die; use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; use Joomla\CMS\Filesystem\File; use Joomla\CMS\Filesystem\Folder; +use Joomla\CMS\Language\Text; use Joomla\CMS\Log\Log; use Joomla\Database\ParameterType; diff --git a/libraries/src/Language/Associations.php b/libraries/src/Language/Associations.php index 8bfc1af3ab073..712a6e76a95df 100644 --- a/libraries/src/Language/Associations.php +++ b/libraries/src/Language/Associations.php @@ -10,8 +10,8 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Registry\Registry; use Joomla\CMS\Factory; +use Joomla\Registry\Registry; /** * Utitlity class for associations in multilang diff --git a/libraries/src/Language/Language.php b/libraries/src/Language/Language.php index e9cff7138cc07..1e684982e10ac 100644 --- a/libraries/src/Language/Language.php +++ b/libraries/src/Language/Language.php @@ -10,8 +10,8 @@ defined('JPATH_PLATFORM') or die; -use Joomla\String\StringHelper; use Joomla\CMS\Log\Log; +use Joomla\String\StringHelper; /** * Allows for quoting in language .ini files. diff --git a/libraries/src/Language/LanguageHelper.php b/libraries/src/Language/LanguageHelper.php index f6800f009ba75..6a72344803036 100644 --- a/libraries/src/Language/LanguageHelper.php +++ b/libraries/src/Language/LanguageHelper.php @@ -10,12 +10,11 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Registry\Registry; -use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; use Joomla\CMS\Filesystem\File; use Joomla\CMS\Log\Log; +use Joomla\Registry\Registry; +use Joomla\Utilities\ArrayHelper; /** * Language helper class diff --git a/libraries/src/Language/LanguageStemmer.php b/libraries/src/Language/LanguageStemmer.php index 4ebf2a7b45022..64e1abf197b62 100644 --- a/libraries/src/Language/LanguageStemmer.php +++ b/libraries/src/Language/LanguageStemmer.php @@ -10,8 +10,6 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Language\Text; - /** * Stemmer base class. * diff --git a/libraries/src/Language/Multilanguage.php b/libraries/src/Language/Multilanguage.php index 5d46cea35b46b..1c693194ca087 100644 --- a/libraries/src/Language/Multilanguage.php +++ b/libraries/src/Language/Multilanguage.php @@ -12,7 +12,6 @@ use Joomla\CMS\Factory; use Joomla\CMS\Log\Log; -use Joomla\CMS\Language\LanguageHelper; /** * Utitlity class for multilang diff --git a/libraries/src/Log/Logger/DatabaseLogger.php b/libraries/src/Log/Logger/DatabaseLogger.php index ce017bb8004e7..58073a46023f1 100644 --- a/libraries/src/Log/Logger/DatabaseLogger.php +++ b/libraries/src/Log/Logger/DatabaseLogger.php @@ -10,9 +10,9 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Factory; use Joomla\CMS\Log\LogEntry; use Joomla\CMS\Log\Logger; -use Joomla\CMS\Factory; use Joomla\Database\DatabaseDriver; /** diff --git a/libraries/src/Log/Logger/FormattedtextLogger.php b/libraries/src/Log/Logger/FormattedtextLogger.php index 20b6f5c73ae7a..a2f4168fe6410 100644 --- a/libraries/src/Log/Logger/FormattedtextLogger.php +++ b/libraries/src/Log/Logger/FormattedtextLogger.php @@ -10,11 +10,11 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Log\LogEntry; -use Joomla\CMS\Log\Logger; use Joomla\CMS\Factory; use Joomla\CMS\Filesystem\File; use Joomla\CMS\Filesystem\Folder; +use Joomla\CMS\Log\LogEntry; +use Joomla\CMS\Log\Logger; /** * Joomla! Formatted Text File Log class diff --git a/libraries/src/Log/Logger/MessagequeueLogger.php b/libraries/src/Log/Logger/MessagequeueLogger.php index 247f5065d7541..310ec4bc8376a 100644 --- a/libraries/src/Log/Logger/MessagequeueLogger.php +++ b/libraries/src/Log/Logger/MessagequeueLogger.php @@ -10,10 +10,10 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Factory; use Joomla\CMS\Log\Log; use Joomla\CMS\Log\LogEntry; use Joomla\CMS\Log\Logger; -use Joomla\CMS\Factory; /** * Joomla MessageQueue logger class. diff --git a/libraries/src/MVC/Controller/AdminController.php b/libraries/src/MVC/Controller/AdminController.php index a047243131cc1..b4bc0eb6fb102 100644 --- a/libraries/src/MVC/Controller/AdminController.php +++ b/libraries/src/MVC/Controller/AdminController.php @@ -10,14 +10,14 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\MVC\Factory\MVCFactoryInterface; -use Joomla\CMS\MVC\Model\BaseDatabaseModel; -use Joomla\Utilities\ArrayHelper; +use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; -use Joomla\CMS\Session\Session; +use Joomla\CMS\MVC\Factory\MVCFactoryInterface; +use Joomla\CMS\MVC\Model\BaseDatabaseModel; use Joomla\CMS\Router\Route; -use Joomla\CMS\Component\ComponentHelper; +use Joomla\CMS\Session\Session; +use Joomla\Utilities\ArrayHelper; /** * Base class for a Joomla Administrator Controller diff --git a/libraries/src/MVC/Controller/BaseController.php b/libraries/src/MVC/Controller/BaseController.php index 2ee891165be99..eb701e6153278 100644 --- a/libraries/src/MVC/Controller/BaseController.php +++ b/libraries/src/MVC/Controller/BaseController.php @@ -11,17 +11,17 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Application\CMSApplication; -use Joomla\CMS\MVC\Model\BaseDatabaseModel; +use Joomla\CMS\Factory; +use Joomla\CMS\Filesystem\Path; +use Joomla\CMS\Filter\InputFilter; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Log\Log; use Joomla\CMS\MVC\Factory\LegacyFactory; use Joomla\CMS\MVC\Factory\MVCFactoryInterface; +use Joomla\CMS\MVC\Model\BaseDatabaseModel; use Joomla\CMS\MVC\View\AbstractView; -use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Filter\InputFilter; use Joomla\CMS\Session\Session; use Joomla\CMS\Uri\Uri; -use Joomla\CMS\Log\Log; -use Joomla\CMS\Filesystem\Path; /** * Base class for a Joomla Controller diff --git a/libraries/src/MVC/Controller/FormController.php b/libraries/src/MVC/Controller/FormController.php index 4e6a71a70dfe4..579da57e28d6c 100644 --- a/libraries/src/MVC/Controller/FormController.php +++ b/libraries/src/MVC/Controller/FormController.php @@ -11,17 +11,17 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Application\CMSApplication; -use Joomla\CMS\MVC\Factory\MVCFactoryInterface; -use Joomla\CMS\MVC\Model\BaseDatabaseModel; +use Joomla\CMS\Component\ComponentHelper; +use Joomla\CMS\Factory; use Joomla\CMS\Form\FormFactoryAwareInterface; use Joomla\CMS\Form\FormFactoryAwareTrait; use Joomla\CMS\Form\FormFactoryInterface; -use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; +use Joomla\CMS\MVC\Factory\MVCFactoryInterface; +use Joomla\CMS\MVC\Model\BaseDatabaseModel; +use Joomla\CMS\Router\Route; use Joomla\CMS\Session\Session; use Joomla\CMS\Uri\Uri; -use Joomla\CMS\Router\Route; -use Joomla\CMS\Component\ComponentHelper; /** * Controller tailored to suit most form-based admin operations. diff --git a/libraries/src/MVC/Factory/LegacyFactory.php b/libraries/src/MVC/Factory/LegacyFactory.php index d390ab7051819..fca90d5ff3c3e 100644 --- a/libraries/src/MVC/Factory/LegacyFactory.php +++ b/libraries/src/MVC/Factory/LegacyFactory.php @@ -11,12 +11,12 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Application\CMSApplicationInterface; +use Joomla\CMS\Filesystem\Path; +use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Controller\BaseController; use Joomla\CMS\MVC\Model\BaseDatabaseModel; use Joomla\CMS\Table\Table; use Joomla\Input\Input; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Filesystem\Path; /** * Factory to create MVC objects in legacy mode. diff --git a/libraries/src/MVC/Model/AdminModel.php b/libraries/src/MVC/Model/AdminModel.php index ebef596d24728..66ba369cfe8cd 100644 --- a/libraries/src/MVC/Model/AdminModel.php +++ b/libraries/src/MVC/Model/AdminModel.php @@ -10,18 +10,18 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Component\ComponentHelper; +use Joomla\CMS\Factory; +use Joomla\CMS\Form\FormFactoryInterface; +use Joomla\CMS\Language\Associations; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Log\Log; use Joomla\CMS\MVC\Factory\MVCFactoryInterface; +use Joomla\CMS\Object\CMSObject; use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; -use Joomla\CMS\Form\FormFactoryInterface; -use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Object\CMSObject; -use Joomla\CMS\Log\Log; -use Joomla\CMS\Language\Associations; -use Joomla\CMS\Component\ComponentHelper; /** * Prototype admin model. diff --git a/libraries/src/MVC/Model/BaseDatabaseModel.php b/libraries/src/MVC/Model/BaseDatabaseModel.php index 4db71dc0d5bff..db57ebcef4a01 100644 --- a/libraries/src/MVC/Model/BaseDatabaseModel.php +++ b/libraries/src/MVC/Model/BaseDatabaseModel.php @@ -10,20 +10,20 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Extension\ComponentInterface; use Joomla\CMS\Component\ComponentHelper; +use Joomla\CMS\Extension\ComponentInterface; use Joomla\CMS\Factory; +use Joomla\CMS\Filesystem\Path; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Log\Log; use Joomla\CMS\MVC\Factory\LegacyFactory; use Joomla\CMS\MVC\Factory\MVCFactoryInterface; use Joomla\CMS\MVC\Factory\MVCFactoryServiceInterface; use Joomla\CMS\Object\CMSObject; use Joomla\CMS\Table\Table; use Joomla\Database\DatabaseDriver; -use Joomla\Utilities\ArrayHelper; -use Joomla\CMS\Language\Text; use Joomla\Database\DatabaseQuery; -use Joomla\CMS\Log\Log; -use Joomla\CMS\Filesystem\Path; +use Joomla\Utilities\ArrayHelper; /** * Base class for a database aware Joomla Model diff --git a/libraries/src/MVC/Model/FormModel.php b/libraries/src/MVC/Model/FormModel.php index 72b1657ff8092..f8fe5069b50f0 100644 --- a/libraries/src/MVC/Model/FormModel.php +++ b/libraries/src/MVC/Model/FormModel.php @@ -10,13 +10,13 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\MVC\Factory\MVCFactoryInterface; use Joomla\CMS\Factory; use Joomla\CMS\Form\FormFactoryAwareInterface; use Joomla\CMS\Form\FormFactoryAwareTrait; use Joomla\CMS\Form\FormFactoryInterface; -use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Language\Text; +use Joomla\CMS\MVC\Factory\MVCFactoryInterface; +use Joomla\Utilities\ArrayHelper; /** * Prototype form model. diff --git a/libraries/src/MVC/Model/ListModel.php b/libraries/src/MVC/Model/ListModel.php index 4d0938a3239be..927902fa4fdce 100644 --- a/libraries/src/MVC/Model/ListModel.php +++ b/libraries/src/MVC/Model/ListModel.php @@ -10,10 +10,10 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\MVC\Factory\MVCFactoryInterface; -use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Factory; use Joomla\CMS\Filter\InputFilter; +use Joomla\CMS\MVC\Factory\MVCFactoryInterface; +use Joomla\Utilities\ArrayHelper; /** * Model class for handling lists of items. diff --git a/libraries/src/MVC/View/AbstractView.php b/libraries/src/MVC/View/AbstractView.php index 720ee4d2ae901..09e4e6ea04477 100644 --- a/libraries/src/MVC/View/AbstractView.php +++ b/libraries/src/MVC/View/AbstractView.php @@ -11,8 +11,8 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Document\Document; -use Joomla\CMS\MVC\Model\BaseDatabaseModel; use Joomla\CMS\Language\Text; +use Joomla\CMS\MVC\Model\BaseDatabaseModel; use Joomla\CMS\Object\CMSObject; /** diff --git a/libraries/src/MVC/View/HtmlView.php b/libraries/src/MVC/View/HtmlView.php index 78fa4072e21a3..7734d53863532 100644 --- a/libraries/src/MVC/View/HtmlView.php +++ b/libraries/src/MVC/View/HtmlView.php @@ -12,10 +12,10 @@ use Joomla\CMS\Application\ApplicationHelper; use Joomla\CMS\Factory; +use Joomla\CMS\Filesystem\Path; use Joomla\CMS\Language\Text; -use Joomla\CMS\Uri\Uri; use Joomla\CMS\Log\Log; -use Joomla\CMS\Filesystem\Path; +use Joomla\CMS\Uri\Uri; /** * Base class for a Joomla Html View diff --git a/libraries/src/MVC/View/ListView.php b/libraries/src/MVC/View/ListView.php index c354a3073c0e2..a0edd2c011bf0 100644 --- a/libraries/src/MVC/View/ListView.php +++ b/libraries/src/MVC/View/ListView.php @@ -12,10 +12,10 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper; -use Joomla\CMS\Object\CMSObject; +use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\FileLayout; +use Joomla\CMS\Object\CMSObject; /** * Base class for a Joomla List View diff --git a/libraries/src/Mail/Mail.php b/libraries/src/Mail/Mail.php index eac8b31c170f1..65ea824e96c80 100644 --- a/libraries/src/Mail/Mail.php +++ b/libraries/src/Mail/Mail.php @@ -11,8 +11,8 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Factory; -use Joomla\CMS\Log\Log; use Joomla\CMS\Language\Text; +use Joomla\CMS\Log\Log; use PHPMailer\PHPMailer\Exception as phpmailerException; use PHPMailer\PHPMailer\PHPMailer; diff --git a/libraries/src/Menu/AbstractMenu.php b/libraries/src/Menu/AbstractMenu.php index 4ea0f13e5cf82..e99eb7fbebb35 100644 --- a/libraries/src/Menu/AbstractMenu.php +++ b/libraries/src/Menu/AbstractMenu.php @@ -10,9 +10,9 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Registry\Registry; use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; +use Joomla\Registry\Registry; /** * Menu class diff --git a/libraries/src/Menu/MenuHelper.php b/libraries/src/Menu/MenuHelper.php index f7f133a6110b4..ebe48bd094139 100644 --- a/libraries/src/Menu/MenuHelper.php +++ b/libraries/src/Menu/MenuHelper.php @@ -9,9 +9,9 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Registry\Registry; use Joomla\CMS\Factory; use Joomla\CMS\Filesystem\Folder; +use Joomla\Registry\Registry; /** * Menu Helper utility diff --git a/libraries/src/Menu/Node/Component.php b/libraries/src/Menu/Node/Component.php index 878dae35c6cd7..eb16726d5523c 100644 --- a/libraries/src/Menu/Node/Component.php +++ b/libraries/src/Menu/Node/Component.php @@ -9,8 +9,8 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Menu\Node; use Joomla\CMS\Filter\OutputFilter; +use Joomla\CMS\Menu\Node; /** * A Component type of node for MenuTree diff --git a/libraries/src/Menu/Node/Url.php b/libraries/src/Menu/Node/Url.php index d3b58b956bc62..6d043520cffca 100644 --- a/libraries/src/Menu/Node/Url.php +++ b/libraries/src/Menu/Node/Url.php @@ -9,8 +9,8 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Menu\Node; use Joomla\CMS\Filter\OutputFilter; +use Joomla\CMS\Menu\Node; /** * An external Url type of node for MenuTree diff --git a/libraries/src/Menu/SiteMenu.php b/libraries/src/Menu/SiteMenu.php index 7c7bbb5ca900c..9ff4a56f32ccb 100644 --- a/libraries/src/Menu/SiteMenu.php +++ b/libraries/src/Menu/SiteMenu.php @@ -11,9 +11,9 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Application\CMSApplication; +use Joomla\CMS\Factory; use Joomla\CMS\Language\Language; use Joomla\CMS\Language\Multilanguage; -use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; use Joomla\Database\DatabaseDriver; diff --git a/libraries/src/Pagination/Pagination.php b/libraries/src/Pagination/Pagination.php index 9e545da6d0656..1e91361fd9f71 100644 --- a/libraries/src/Pagination/Pagination.php +++ b/libraries/src/Pagination/Pagination.php @@ -12,11 +12,11 @@ use Joomla\CMS\Application\CMSApplication; use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper; -use Joomla\CMS\Router\Route; -use Joomla\CMS\Log\Log; +use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\LayoutHelper; +use Joomla\CMS\Log\Log; +use Joomla\CMS\Router\Route; /** * Pagination Class. Provides a common interface for content pagination for the Joomla! CMS. diff --git a/libraries/src/Plugin/CMSPlugin.php b/libraries/src/Plugin/CMSPlugin.php index 353c3b1c2ac52..aefec1c29c707 100644 --- a/libraries/src/Plugin/CMSPlugin.php +++ b/libraries/src/Plugin/CMSPlugin.php @@ -12,9 +12,9 @@ use Joomla\CMS\Factory; use Joomla\Event\AbstractEvent; -use Joomla\Event\DispatcherInterface; use Joomla\Event\DispatcherAwareInterface; use Joomla\Event\DispatcherAwareTrait; +use Joomla\Event\DispatcherInterface; use Joomla\Event\SubscriberInterface; use Joomla\Registry\Registry; diff --git a/libraries/src/Plugin/PluginHelper.php b/libraries/src/Plugin/PluginHelper.php index b7b308a9df976..aad3de3ff8d49 100644 --- a/libraries/src/Plugin/PluginHelper.php +++ b/libraries/src/Plugin/PluginHelper.php @@ -10,8 +10,8 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Event\DispatcherInterface; use Joomla\CMS\Factory; +use Joomla\Event\DispatcherInterface; /** * Plugin helper class diff --git a/libraries/src/Router/Router.php b/libraries/src/Router/Router.php index 6deb9344e7e62..06a46d94a3668 100644 --- a/libraries/src/Router/Router.php +++ b/libraries/src/Router/Router.php @@ -10,9 +10,9 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Exception\RouteNotFoundException; -use Joomla\CMS\Factory; use Joomla\CMS\Uri\Uri; /** diff --git a/libraries/src/Schema/ChangeItem.php b/libraries/src/Schema/ChangeItem.php index 23e2e93225cdc..be9d41acd5368 100644 --- a/libraries/src/Schema/ChangeItem.php +++ b/libraries/src/Schema/ChangeItem.php @@ -10,10 +10,9 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Factory; use Joomla\Database\Exception\ExecutionFailureException; use Joomla\Database\UTF8MB4SupportInterface; -use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; /** * Each object represents one query, which is one line from a DDL SQL query. diff --git a/libraries/src/Schema/ChangeSet.php b/libraries/src/Schema/ChangeSet.php index b7b5ee6a5e388..1c0c1c02e9f9a 100644 --- a/libraries/src/Schema/ChangeSet.php +++ b/libraries/src/Schema/ChangeSet.php @@ -10,10 +10,10 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Database\UTF8MB4SupportInterface; use Joomla\CMS\Factory; -use Joomla\Database\DatabaseDriver; use Joomla\CMS\Filesystem\Folder; +use Joomla\Database\DatabaseDriver; +use Joomla\Database\UTF8MB4SupportInterface; /** * Contains a set of JSchemaChange objects for a particular instance of Joomla. diff --git a/libraries/src/Service/Provider/Application.php b/libraries/src/Service/Provider/Application.php index c237c9e25ce4d..11f88eba243a2 100644 --- a/libraries/src/Service/Provider/Application.php +++ b/libraries/src/Service/Provider/Application.php @@ -11,14 +11,14 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Console\SessionGcCommand; -use Joomla\CMS\Console\SessionMetadataGcCommand; -use Joomla\Console\Application as BaseConsoleApplication; use Joomla\CMS\Application\AdministratorApplication; use Joomla\CMS\Application\ConsoleApplication; use Joomla\CMS\Application\SiteApplication; +use Joomla\CMS\Console\SessionGcCommand; +use Joomla\CMS\Console\SessionMetadataGcCommand; use Joomla\CMS\Factory; use Joomla\CMS\Session\Session; +use Joomla\Console\Application as BaseConsoleApplication; use Joomla\Console\Loader\ContainerLoader; use Joomla\Console\Loader\LoaderInterface; use Joomla\DI\Container; diff --git a/libraries/src/Service/Provider/Authentication.php b/libraries/src/Service/Provider/Authentication.php index e85a4d43fc83c..c177a8d2dfa31 100644 --- a/libraries/src/Service/Provider/Authentication.php +++ b/libraries/src/Service/Provider/Authentication.php @@ -10,11 +10,11 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Authentication\Password\Argon2iHandler as BaseArgon2iHandler; use Joomla\Authentication\Password\Argon2idHandler as BaseArgon2idHandler; +use Joomla\Authentication\Password\Argon2iHandler as BaseArgon2iHandler; use Joomla\Authentication\Password\BCryptHandler as BaseBCryptHandler; -use Joomla\CMS\Authentication\Password\Argon2iHandler; use Joomla\CMS\Authentication\Password\Argon2idHandler; +use Joomla\CMS\Authentication\Password\Argon2iHandler; use Joomla\CMS\Authentication\Password\BCryptHandler; use Joomla\CMS\Authentication\Password\ChainedHandler; use Joomla\CMS\Authentication\Password\MD5Handler; diff --git a/libraries/src/Session/Session.php b/libraries/src/Session/Session.php index a95497036027d..f567806625d25 100644 --- a/libraries/src/Session/Session.php +++ b/libraries/src/Session/Session.php @@ -11,11 +11,11 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Application\ApplicationHelper; -use Joomla\Session\Session as BaseSession; use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; -use Joomla\CMS\Router\Route; use Joomla\CMS\Log\Log; +use Joomla\CMS\Router\Route; +use Joomla\Session\Session as BaseSession; /** * Class for managing HTTP sessions diff --git a/libraries/src/Session/Storage/JoomlaStorage.php b/libraries/src/Session/Storage/JoomlaStorage.php index d24f41b5d12b5..9dbbc39be93d1 100644 --- a/libraries/src/Session/Storage/JoomlaStorage.php +++ b/libraries/src/Session/Storage/JoomlaStorage.php @@ -10,10 +10,10 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Factory; use Joomla\Input\Input; use Joomla\Registry\Registry; use Joomla\Session\Storage\NativeStorage; -use Joomla\CMS\Factory; /** * Service provider for the application's session dependency diff --git a/libraries/src/Table/Category.php b/libraries/src/Table/Category.php index 5f6651011b735..c06dfdae6a631 100644 --- a/libraries/src/Table/Category.php +++ b/libraries/src/Table/Category.php @@ -12,12 +12,12 @@ use Joomla\CMS\Access\Rules; use Joomla\CMS\Application\ApplicationHelper; -use Joomla\CMS\Table\Observer\ContentHistory; -use Joomla\CMS\Table\Observer\Tags; -use Joomla\Registry\Registry; use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; +use Joomla\CMS\Table\Observer\ContentHistory; +use Joomla\CMS\Table\Observer\Tags; use Joomla\Database\DatabaseDriver; +use Joomla\Registry\Registry; /** * Category table diff --git a/libraries/src/Table/Content.php b/libraries/src/Table/Content.php index be9af6236713d..979fe397f3182 100644 --- a/libraries/src/Table/Content.php +++ b/libraries/src/Table/Content.php @@ -13,11 +13,11 @@ use Joomla\CMS\Access\Access; use Joomla\CMS\Access\Rules; use Joomla\CMS\Application\ApplicationHelper; -use Joomla\Registry\Registry; -use Joomla\String\StringHelper; use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; use Joomla\Database\DatabaseDriver; +use Joomla\Registry\Registry; +use Joomla\String\StringHelper; /** * Content table diff --git a/libraries/src/Table/CoreContent.php b/libraries/src/Table/CoreContent.php index 6a8a0bf16e578..47b85f77c8595 100644 --- a/libraries/src/Table/CoreContent.php +++ b/libraries/src/Table/CoreContent.php @@ -11,12 +11,12 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Application\ApplicationHelper; -use Joomla\Registry\Registry; -use Joomla\String\StringHelper; -use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; use Joomla\Database\DatabaseDriver; +use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Core content table diff --git a/libraries/src/Table/Extension.php b/libraries/src/Table/Extension.php index 161aecaa0083e..94337f5c584f6 100644 --- a/libraries/src/Table/Extension.php +++ b/libraries/src/Table/Extension.php @@ -10,10 +10,10 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Registry\Registry; -use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Language\Text; use Joomla\Database\DatabaseDriver; +use Joomla\Registry\Registry; +use Joomla\Utilities\ArrayHelper; /** * Extension table diff --git a/libraries/src/Table/Menu.php b/libraries/src/Table/Menu.php index 9ad9bf59261b0..0a0fc97718d9f 100644 --- a/libraries/src/Table/Menu.php +++ b/libraries/src/Table/Menu.php @@ -11,12 +11,12 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Application\ApplicationHelper; -use Joomla\CMS\Language\Multilanguage; -use Joomla\Registry\Registry; use Joomla\CMS\Factory; +use Joomla\CMS\Filesystem\Folder; +use Joomla\CMS\Language\Multilanguage; use Joomla\CMS\Language\Text; use Joomla\Database\DatabaseDriver; -use Joomla\CMS\Filesystem\Folder; +use Joomla\Registry\Registry; /** * Menu table diff --git a/libraries/src/Table/Module.php b/libraries/src/Table/Module.php index ae9faf4d00488..27a172febcfc8 100644 --- a/libraries/src/Table/Module.php +++ b/libraries/src/Table/Module.php @@ -11,10 +11,10 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Access\Rules; -use Joomla\Registry\Registry; use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; use Joomla\Database\DatabaseDriver; +use Joomla\Registry\Registry; /** * Module table diff --git a/libraries/src/Table/Nested.php b/libraries/src/Table/Nested.php index caef44eee8da4..2688e56fee453 100644 --- a/libraries/src/Table/Nested.php +++ b/libraries/src/Table/Nested.php @@ -10,9 +10,9 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Event\AbstractEvent; use Joomla\Event\Dispatcher; use Joomla\Event\Event; -use Joomla\CMS\Event\AbstractEvent; use Joomla\Utilities\ArrayHelper; /** diff --git a/libraries/src/Table/Table.php b/libraries/src/Table/Table.php index 6b041c418a810..1320aea328698 100644 --- a/libraries/src/Table/Table.php +++ b/libraries/src/Table/Table.php @@ -10,17 +10,17 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Access\Rules; use Joomla\CMS\Event\AbstractEvent; +use Joomla\CMS\Factory; +use Joomla\CMS\Filesystem\Path; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Object\CMSObject; use Joomla\Database\DatabaseDriver; use Joomla\Database\DatabaseQuery; use Joomla\Event\DispatcherAwareInterface; use Joomla\Event\DispatcherAwareTrait; use Joomla\Event\DispatcherInterface; -use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Access\Rules; -use Joomla\CMS\Object\CMSObject; -use Joomla\CMS\Filesystem\Path; /** * Abstract Table class diff --git a/libraries/src/Table/Update.php b/libraries/src/Table/Update.php index 559b34b466401..1362da61c281b 100644 --- a/libraries/src/Table/Update.php +++ b/libraries/src/Table/Update.php @@ -10,9 +10,9 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Registry\Registry; use Joomla\CMS\Language\Text; use Joomla\Database\DatabaseDriver; +use Joomla\Registry\Registry; /** * Update table diff --git a/libraries/src/Table/User.php b/libraries/src/Table/User.php index 12badf578105c..ba3c0e747b542 100644 --- a/libraries/src/Table/User.php +++ b/libraries/src/Table/User.php @@ -10,12 +10,12 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Registry\Registry; -use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Factory; +use Joomla\CMS\Filter\InputFilter; use Joomla\CMS\Language\Text; use Joomla\Database\DatabaseDriver; -use Joomla\CMS\Filter\InputFilter; +use Joomla\Registry\Registry; +use Joomla\Utilities\ArrayHelper; /** * Users table diff --git a/libraries/src/Toolbar/Button/SliderButton.php b/libraries/src/Toolbar/Button/SliderButton.php index be4bb95eab001..0f38a2e5d2e14 100644 --- a/libraries/src/Toolbar/Button/SliderButton.php +++ b/libraries/src/Toolbar/Button/SliderButton.php @@ -10,10 +10,10 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\FileLayout; use Joomla\CMS\Toolbar\ToolbarButton; -use Joomla\CMS\Language\Text; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Uri\Uri; /** diff --git a/libraries/src/Toolbar/ContainerAwareToolbarFactory.php b/libraries/src/Toolbar/ContainerAwareToolbarFactory.php index 5ed37adb60d1c..d07e48e7cc073 100644 --- a/libraries/src/Toolbar/ContainerAwareToolbarFactory.php +++ b/libraries/src/Toolbar/ContainerAwareToolbarFactory.php @@ -10,12 +10,12 @@ defined('_JEXEC') or die; -use Joomla\DI\ContainerAwareInterface; -use Joomla\DI\ContainerAwareTrait; -use Joomla\CMS\Language\Text; +use Joomla\CMS\Filesystem\Path; use Joomla\CMS\Filter\InputFilter; +use Joomla\CMS\Language\Text; use Joomla\CMS\Log\Log; -use Joomla\CMS\Filesystem\Path; +use Joomla\DI\ContainerAwareInterface; +use Joomla\DI\ContainerAwareTrait; /** * Default factory for creating toolbar objects diff --git a/libraries/src/Toolbar/CoreButtonsTrait.php b/libraries/src/Toolbar/CoreButtonsTrait.php index 0abc928f948a0..b645aad494e34 100644 --- a/libraries/src/Toolbar/CoreButtonsTrait.php +++ b/libraries/src/Toolbar/CoreButtonsTrait.php @@ -9,6 +9,7 @@ namespace Joomla\CMS\Toolbar; use Joomla\CMS\Factory; +use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\FileLayout; use Joomla\CMS\Table\Table; use Joomla\CMS\Toolbar\Button\ConfirmButton; @@ -19,7 +20,6 @@ use Joomla\CMS\Toolbar\Button\SeparatorButton; use Joomla\CMS\Toolbar\Button\StandardButton; use Joomla\CMS\Uri\Uri; -use Joomla\CMS\Language\Text; /** * Enhance Toolbar class to add more pre-defined methods. diff --git a/libraries/src/Toolbar/ToolbarHelper.php b/libraries/src/Toolbar/ToolbarHelper.php index c142cbb85a6bf..6839a84753afc 100644 --- a/libraries/src/Toolbar/ToolbarHelper.php +++ b/libraries/src/Toolbar/ToolbarHelper.php @@ -10,10 +10,10 @@ defined('_JEXEC') or die; -use Joomla\CMS\Layout\FileLayout; -use Joomla\CMS\Table\Table; use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; +use Joomla\CMS\Layout\FileLayout; +use Joomla\CMS\Table\Table; use Joomla\CMS\Uri\Uri; /** diff --git a/libraries/src/UCM/UCMBase.php b/libraries/src/UCM/UCMBase.php index ba55e3102d0e2..3fcc2eea53543 100644 --- a/libraries/src/UCM/UCMBase.php +++ b/libraries/src/UCM/UCMBase.php @@ -10,10 +10,10 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Factory; use Joomla\CMS\Helper\ContentHelper; use Joomla\CMS\Table\Table; use Joomla\CMS\Table\TableInterface; -use Joomla\CMS\Factory; /** * Base class for implementing UCM diff --git a/libraries/src/UCM/UCMContent.php b/libraries/src/UCM/UCMContent.php index 9e030cecf43e1..fae600525e77e 100644 --- a/libraries/src/UCM/UCMContent.php +++ b/libraries/src/UCM/UCMContent.php @@ -10,10 +10,10 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Factory; use Joomla\CMS\Helper\ContentHelper; use Joomla\CMS\Table\Table; use Joomla\CMS\Table\TableInterface; -use Joomla\CMS\Factory; /** * Base class for implementing UCM diff --git a/libraries/src/Updater/Adapter/CollectionAdapter.php b/libraries/src/Updater/Adapter/CollectionAdapter.php index 42549c4bd53ef..57e4e60887088 100644 --- a/libraries/src/Updater/Adapter/CollectionAdapter.php +++ b/libraries/src/Updater/Adapter/CollectionAdapter.php @@ -13,10 +13,10 @@ use Joomla\CMS\Application\ApplicationHelper; use Joomla\CMS\Factory; use Joomla\CMS\Filter\InputFilter; +use Joomla\CMS\Language\Text; use Joomla\CMS\Table\Table; use Joomla\CMS\Updater\UpdateAdapter; use Joomla\CMS\Version; -use Joomla\CMS\Language\Text; /** * Collection Update Adapter Class diff --git a/libraries/src/Updater/Adapter/ExtensionAdapter.php b/libraries/src/Updater/Adapter/ExtensionAdapter.php index e76a1027f0832..7c56c49c86ec9 100644 --- a/libraries/src/Updater/Adapter/ExtensionAdapter.php +++ b/libraries/src/Updater/Adapter/ExtensionAdapter.php @@ -13,12 +13,12 @@ use Joomla\CMS\Application\ApplicationHelper; use Joomla\CMS\Factory; use Joomla\CMS\Filter\InputFilter; +use Joomla\CMS\Language\Text; use Joomla\CMS\Log\Log; use Joomla\CMS\Table\Table; use Joomla\CMS\Updater\UpdateAdapter; use Joomla\CMS\Updater\Updater; use Joomla\CMS\Version; -use Joomla\CMS\Language\Text; /** * Extension class for updater diff --git a/libraries/src/Updater/Update.php b/libraries/src/Updater/Update.php index d99dbcf8677d4..86bf3f640fbf3 100644 --- a/libraries/src/Updater/Update.php +++ b/libraries/src/Updater/Update.php @@ -13,11 +13,11 @@ use Joomla\CMS\Factory; use Joomla\CMS\Filter\InputFilter; use Joomla\CMS\Http\HttpFactory; +use Joomla\CMS\Language\Text; use Joomla\CMS\Log\Log; +use Joomla\CMS\Object\CMSObject; use Joomla\CMS\Version; use Joomla\Registry\Registry; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Object\CMSObject; /** * Update class. It is used by Updater::update() to install an update. Use Updater::findUpdates() to find updates for diff --git a/libraries/src/Updater/UpdateAdapter.php b/libraries/src/Updater/UpdateAdapter.php index 6feb7bac19a12..9f588fed91084 100644 --- a/libraries/src/Updater/UpdateAdapter.php +++ b/libraries/src/Updater/UpdateAdapter.php @@ -12,10 +12,10 @@ use Joomla\CMS\Factory; use Joomla\CMS\Http\HttpFactory; +use Joomla\CMS\Language\Text; use Joomla\CMS\Log\Log; use Joomla\CMS\Version; use Joomla\Registry\Registry; -use Joomla\CMS\Language\Text; \JLoader::import('joomla.base.adapterinstance'); diff --git a/libraries/src/User/User.php b/libraries/src/User/User.php index 928a23799c0bc..1921925bbdc5c 100644 --- a/libraries/src/User/User.php +++ b/libraries/src/User/User.php @@ -11,14 +11,14 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Access\Access; +use Joomla\CMS\Factory; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Log\Log; +use Joomla\CMS\Object\CMSObject; use Joomla\CMS\Plugin\PluginHelper; use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\Utilities\ArrayHelper; -use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Object\CMSObject; -use Joomla\CMS\Log\Log; /** * User class. Handles all application interaction with a user diff --git a/libraries/src/User/UserHelper.php b/libraries/src/User/UserHelper.php index 03cf093d9b12b..a4b0fc2d44db2 100644 --- a/libraries/src/User/UserHelper.php +++ b/libraries/src/User/UserHelper.php @@ -10,8 +10,8 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Authentication\Password\Argon2iHandler; use Joomla\Authentication\Password\Argon2idHandler; +use Joomla\Authentication\Password\Argon2iHandler; use Joomla\Authentication\Password\BCryptHandler; use Joomla\CMS\Access\Access; use Joomla\CMS\Authentication\Password\ChainedHandler; @@ -20,12 +20,12 @@ use Joomla\CMS\Authentication\Password\PHPassHandler; use Joomla\CMS\Authentication\Password\SHA256Handler; use Joomla\CMS\Factory; -use Joomla\CMS\Plugin\PluginHelper; -use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Language\Text; -use Joomla\CMS\Uri\Uri; -use Joomla\CMS\Object\CMSObject; use Joomla\CMS\Log\Log; +use Joomla\CMS\Object\CMSObject; +use Joomla\CMS\Plugin\PluginHelper; +use Joomla\CMS\Uri\Uri; +use Joomla\Utilities\ArrayHelper; /** * Authorisation helper class, provides static methods to perform various tasks relevant diff --git a/libraries/src/Version.php b/libraries/src/Version.php index 09c8c7a1502bb..726d75a96052e 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -11,7 +11,6 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Helper\LibraryHelper; -use Joomla\CMS\Factory; /** * Version information class for the Joomla CMS. diff --git a/libraries/src/Workflow/Workflow.php b/libraries/src/Workflow/Workflow.php index 7b2a03eb98c2f..ba9cfb7e42cae 100644 --- a/libraries/src/Workflow/Workflow.php +++ b/libraries/src/Workflow/Workflow.php @@ -12,8 +12,6 @@ use Joomla\CMS\Factory; use Joomla\Utilities\ArrayHelper; -use Joomla\CMS\HTML\HTMLHelper; -use Joomla\CMS\Language\Text; /** * Workflow Class.