diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 517acdc7181..3896f0b6b69 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -82,6 +82,8 @@ $config 'no_unused_imports' => true, // Classes from the global namespace should not be imported 'global_namespace_import' => ['import_classes' => false, 'import_constants' => false, 'import_functions' => false], + // Alpha order imports + 'ordered_imports' => ['imports_order' => ['class', 'function', 'const'], 'sort_algorithm' => 'alpha'], ] ) ->setFinder($finder); diff --git a/administrator/components/com_fields/src/Helper/FieldsHelper.php b/administrator/components/com_fields/src/Helper/FieldsHelper.php index f6afbd77637..fc3b430564e 100644 --- a/administrator/components/com_fields/src/Helper/FieldsHelper.php +++ b/administrator/components/com_fields/src/Helper/FieldsHelper.php @@ -18,8 +18,8 @@ use Joomla\CMS\Language\Multilanguage; use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Object\CMSObject; use Joomla\CMS\Plugin\PluginHelper; -use Joomla\Component\Fields\Administrator\Model\FieldsModel; use Joomla\Component\Fields\Administrator\Model\FieldModel; +use Joomla\Component\Fields\Administrator\Model\FieldsModel; use Joomla\Database\ParameterType; // phpcs:disable PSR1.Files.SideEffects diff --git a/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php b/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php index ed054bb13d9..f92bdd90a4f 100644 --- a/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php +++ b/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php @@ -15,9 +15,9 @@ use Joomla\CMS\Helper\ContentHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\View\GenericDataException; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; +use Joomla\CMS\Router\Route; use Joomla\CMS\Toolbar\Toolbar; use Joomla\CMS\Toolbar\ToolbarHelper; -use Joomla\CMS\Router\Route; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; diff --git a/administrator/components/com_languages/src/Controller/InstalledController.php b/administrator/components/com_languages/src/Controller/InstalledController.php index 421f7873943..d92d01a8d93 100644 --- a/administrator/components/com_languages/src/Controller/InstalledController.php +++ b/administrator/components/com_languages/src/Controller/InstalledController.php @@ -11,8 +11,8 @@ namespace Joomla\Component\Languages\Administrator\Controller; use Joomla\CMS\Factory; -use Joomla\CMS\Language\LanguageHelper; use Joomla\CMS\Language\Language; +use Joomla\CMS\Language\LanguageHelper; use Joomla\CMS\Language\Multilanguage; use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Controller\BaseController; diff --git a/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php b/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php index bb88c58be18..593e6640f5d 100644 --- a/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php +++ b/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php @@ -10,16 +10,16 @@ namespace Joomla\Module\ArticlesCategory\Site\Helper; -use Joomla\Component\Content\Administrator\Extension\ContentComponent; -use Joomla\Component\Content\Site\Helper\RouteHelper; use Joomla\CMS\Access\Access; use Joomla\CMS\Application\SiteApplication; use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Date\Date; use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; -use Joomla\CMS\Router\Route; use Joomla\CMS\Plugin\PluginHelper; +use Joomla\CMS\Router\Route; +use Joomla\Component\Content\Administrator\Extension\ContentComponent; +use Joomla\Component\Content\Site\Helper\RouteHelper; use Joomla\Database\DatabaseAwareInterface; use Joomla\Database\DatabaseAwareTrait; use Joomla\Registry\Registry; diff --git a/tests/Unit/Libraries/Cms/Document/DocumentAwareTraitTest.php b/tests/Unit/Libraries/Cms/Document/DocumentAwareTraitTest.php index 4bc9a582d16..a41ada99319 100644 --- a/tests/Unit/Libraries/Cms/Document/DocumentAwareTraitTest.php +++ b/tests/Unit/Libraries/Cms/Document/DocumentAwareTraitTest.php @@ -10,8 +10,8 @@ namespace Joomla\Tests\Unit\Libraries\Cms\Document; -use Joomla\CMS\Document\DocumentAwareTrait; use Joomla\CMS\Document\Document; +use Joomla\CMS\Document\DocumentAwareTrait; use Joomla\Tests\Unit\UnitTestCase; /** diff --git a/tests/Unit/Libraries/Cms/Language/LanguageAwareTraitTest.php b/tests/Unit/Libraries/Cms/Language/LanguageAwareTraitTest.php index 5bd3800ec8d..379029c6b68 100644 --- a/tests/Unit/Libraries/Cms/Language/LanguageAwareTraitTest.php +++ b/tests/Unit/Libraries/Cms/Language/LanguageAwareTraitTest.php @@ -10,8 +10,8 @@ namespace Joomla\Tests\Unit\Libraries\Cms\Language; -use Joomla\CMS\Language\LanguageAwareTrait; use Joomla\CMS\Language\Language; +use Joomla\CMS\Language\LanguageAwareTrait; use Joomla\Tests\Unit\UnitTestCase; /** diff --git a/tests/Unit/Libraries/Cms/User/UserFactoryAwareTraitTest.php b/tests/Unit/Libraries/Cms/User/UserFactoryAwareTraitTest.php index d28e1aa0310..83cd5f983ca 100644 --- a/tests/Unit/Libraries/Cms/User/UserFactoryAwareTraitTest.php +++ b/tests/Unit/Libraries/Cms/User/UserFactoryAwareTraitTest.php @@ -10,8 +10,8 @@ namespace Joomla\Tests\Unit\Libraries\Cms\User; -use Joomla\CMS\User\UserFactoryAwareTrait; use Joomla\CMS\User\User; +use Joomla\CMS\User\UserFactoryAwareTrait; use Joomla\CMS\User\UserFactoryInterface; use Joomla\Tests\Unit\UnitTestCase;