Skip to content

Commit

Permalink
Alpha order imports in installation app
Browse files Browse the repository at this point in the history
  • Loading branch information
laoneo committed Oct 16, 2018
1 parent 992cd10 commit 24eeb7c
Show file tree
Hide file tree
Showing 16 changed files with 23 additions and 28 deletions.
10 changes: 5 additions & 5 deletions installation/src/Application/InstallationApplication.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@
defined('_JEXEC') or die;

use Joomla\Application\Web\WebClient;
use Joomla\CMS\Application\CMSApplication;
use Joomla\CMS\Date\Date;
use Joomla\CMS\Document\HtmlDocument;
use Joomla\CMS\Document\Document;
use Joomla\CMS\Document\FactoryInterface;
use Joomla\CMS\Document\HtmlDocument;
use Joomla\CMS\Exception\ExceptionHandler;
use Joomla\CMS\Factory;
use Joomla\CMS\Filesystem\Folder;
use Joomla\CMS\Input\Input;
use Joomla\CMS\Language\LanguageHelper;
use Joomla\CMS\Application\CMSApplication;
use Joomla\CMS\Document\Document;
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\Factory\MVCFactory;
use Joomla\CMS\Uri\Uri;
use Joomla\Database\DatabaseInterface;
use Joomla\DI\Container;
use Joomla\Registry\Registry;
use Joomla\Session\SessionEvent;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Filesystem\Folder;

/**
* Joomla! Installation Application class.
Expand Down
1 change: 0 additions & 1 deletion installation/src/Controller/DisplayController.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

defined('_JEXEC') or die;

use Joomla\CMS\Installation\Model\ChecksModel;
use Joomla\CMS\MVC\Controller\BaseController;
use Joomla\CMS\MVC\View\AbstractView;

Expand Down
4 changes: 2 additions & 2 deletions installation/src/Controller/JSONController.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

defined('_JEXEC') or die;

use Joomla\CMS\Factory;
use Joomla\CMS\Installation\Response\JsonResponse;
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\Controller\BaseController;
use Joomla\CMS\Session\Session;
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;

/**
* Default JSON controller class for the Joomla Installer controllers.
Expand Down
2 changes: 1 addition & 1 deletion installation/src/Controller/LanguageController.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
use Joomla\CMS\Factory;
use Joomla\CMS\Installation\Model\SetupModel;
use Joomla\CMS\Language\Language;
use Joomla\CMS\Table\Table;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Table\Table;

/**
* Language controller class for the Joomla Installer.
Expand Down
6 changes: 3 additions & 3 deletions installation/src/Form/Field/Installation/SampleField.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
defined('JPATH_BASE') or die;

use Joomla\CMS\Factory;
use Joomla\CMS\Form\Field\RadioField;
use Joomla\CMS\Language\Text;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Filesystem\File;
use Joomla\CMS\Filesystem\Folder;
use Joomla\CMS\Form\Field\RadioField;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;

/**
* Install Sample Data field.
Expand Down
2 changes: 1 addition & 1 deletion installation/src/Model/ConfigurationModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@

use Joomla\CMS\Factory;
use Joomla\CMS\Installation\Helper\DatabaseHelper;
use Joomla\CMS\Language\Text;
use Joomla\CMS\User\UserHelper;
use Joomla\Registry\Registry;
use Joomla\Utilities\ArrayHelper;
use Joomla\CMS\Language\Text;

/**
* Configuration setup model for the Joomla Core Installer.
Expand Down
6 changes: 3 additions & 3 deletions installation/src/Model/DatabaseModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
defined('_JEXEC') or die;

use Joomla\CMS\Factory;
use Joomla\CMS\Filesystem\File;
use Joomla\CMS\Filesystem\Folder;
use Joomla\CMS\Installation\Helper\DatabaseHelper;
use Joomla\CMS\Installer\Installer;
use Joomla\CMS\Language\LanguageHelper;
use Joomla\CMS\Language\Text;
use Joomla\Database\DatabaseInterface;
use Joomla\Database\UTF8MB4SupportInterface;
use Joomla\Utilities\ArrayHelper;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Filesystem\File;
use Joomla\CMS\Filesystem\Folder;

/**
* Database configuration model for the Joomla Core Installer.
Expand Down
2 changes: 1 addition & 1 deletion installation/src/Model/LanguagesModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
use Joomla\CMS\Installer\InstallerHelper;
use Joomla\CMS\Language\Language;
use Joomla\CMS\Language\LanguageHelper;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Table\Table;
use Joomla\CMS\Updater\Update;
use Joomla\CMS\Updater\Updater;
use Joomla\CMS\Language\Text;

/**
* Language Installer model for the Joomla Core Installer.
Expand Down
5 changes: 1 addition & 4 deletions installation/src/Model/SetupModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,12 @@

defined('_JEXEC') or die;

use Joomla\CMS\Installer\Installer;
use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Factory;
use Joomla\CMS\Form\Form;
use Joomla\CMS\Installation\Helper\DatabaseHelper;
use Joomla\CMS\Language\LanguageHelper;
use Joomla\Database\UTF8MB4SupportInterface;
use Joomla\Utilities\ArrayHelper;
use Joomla\CMS\Language\Text;
use Joomla\Utilities\ArrayHelper;

/**
* Setup model for the Joomla Core Installer.
Expand Down
2 changes: 1 addition & 1 deletion installation/src/Response/JsonResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
defined('_JEXEC') or die;

use Joomla\CMS\Factory;
use Joomla\CMS\Session\Session;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Session\Session;

/**
* JSON Response class for the Joomla Installer.
Expand Down
1 change: 0 additions & 1 deletion installation/src/Service/Provider/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
use Joomla\CMS\Error\Renderer\JsonRenderer;
use Joomla\CMS\Factory;
use Joomla\CMS\Installation\Application\InstallationApplication;
use Joomla\CMS\Log\Log;
use Joomla\DI\Container;
use Joomla\DI\ServiceProviderInterface;
use Psr\Log\LoggerInterface;
Expand Down
2 changes: 1 addition & 1 deletion installation/template/error.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

defined('_JEXEC') or die;

use Joomla\CMS\Language\Text;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;

/** @var JDocumentError $this */

Expand Down
2 changes: 1 addition & 1 deletion installation/template/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

defined('_JEXEC') or die;

use Joomla\CMS\Language\Text;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;

/** @var JDocumentHtml $this */

Expand Down
2 changes: 1 addition & 1 deletion installation/tmpl/preinstall/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

defined('_JEXEC') or die;

use Joomla\CMS\Language\Text;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;

/** @var \Joomla\CMS\Installation\View\Preinstall\HtmlView $this */
?>
Expand Down
2 changes: 1 addition & 1 deletion installation/tmpl/remove/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

defined('_JEXEC') or die;

use Joomla\CMS\Language\Text;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;

/** @var \Joomla\CMS\Installation\View\Remove\HtmlView $this */
?>
Expand Down
2 changes: 1 addition & 1 deletion installation/tmpl/setup/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

defined('_JEXEC') or die;

use Joomla\CMS\Language\Text;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;

/** @var \Joomla\CMS\Installation\View\Setup\HtmlView $this */
?>
Expand Down

0 comments on commit 24eeb7c

Please sign in to comment.