From 82e0bd53152fd875d97703fc4e7a37d44908f3fa Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 9 Dec 2018 22:16:55 +0100 Subject: [PATCH] Fix use order --- Admin/Installer.php | 2 +- Admin/Routes/Web/Api.php | 6 +++--- Admin/Routes/Web/Backend.php | 6 +++--- Admin/Status.php | 2 -- Admin/Uninstaller.php | 2 -- Admin/Updater.php | 2 +- Controller/ApiController.php | 19 +++++++++---------- Controller/BackendController.php | 8 +++----- Models/AccountMapper.php | 4 +--- .../GroupTagSelectorPopupView.php | 2 +- .../GroupTagSelector/GroupTagSelectorView.php | 2 +- 11 files changed, 23 insertions(+), 32 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index ab7a8c1..59e693f 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -14,8 +14,8 @@ declare(strict_types=1); namespace Modules\Admin\Admin; -use phpOMS\DataStorage\Database\DatabaseType; use phpOMS\DataStorage\Database\DatabasePool; +use phpOMS\DataStorage\Database\DatabaseType; use phpOMS\Module\InfoManager; use phpOMS\Module\InstallerAbstract; diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 47ecad8..369ee74 100644 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -1,9 +1,9 @@ [ diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index e058af0..d2159b1 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -1,9 +1,9 @@ [ diff --git a/Admin/Status.php b/Admin/Status.php index 57c870a..16db84c 100644 --- a/Admin/Status.php +++ b/Admin/Status.php @@ -14,9 +14,7 @@ declare(strict_types=1); namespace Modules\Admin\Admin; -use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\StatusAbstract; -use phpOMS\Module\InfoManager; /** * Activate class. diff --git a/Admin/Uninstaller.php b/Admin/Uninstaller.php index 600206c..c691100 100644 --- a/Admin/Uninstaller.php +++ b/Admin/Uninstaller.php @@ -14,9 +14,7 @@ declare(strict_types=1); namespace Modules\Admin\Admin; -use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\UninstallerAbstract; -use phpOMS\Module\InfoManager; /** * Uninstall class. diff --git a/Admin/Updater.php b/Admin/Updater.php index c8120b0..65caabb 100644 --- a/Admin/Updater.php +++ b/Admin/Updater.php @@ -15,8 +15,8 @@ declare(strict_types=1); namespace Modules\Admin\Admin; use phpOMS\DataStorage\Database\DatabasePool; -use phpOMS\Module\UpdaterAbstract; use phpOMS\Module\InfoManager; +use phpOMS\Module\UpdaterAbstract; use phpOMS\System\File\Local\Directory; /** diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 16b6076..2559698 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -14,7 +14,7 @@ declare(strict_types=1); namespace Modules\Admin\Controller; -use phpOMS\Model\Message\FormValidation; +use Model\Settings; use Modules\Admin\Models\Account; use Modules\Admin\Models\AccountMapper; @@ -29,18 +29,17 @@ use Modules\Admin\Models\ModuleStatusUpdateType; use phpOMS\Account\AccountStatus; use phpOMS\Account\AccountType; use phpOMS\Account\GroupStatus; -use phpOMS\Account\PermissionType; -use phpOMS\Message\RequestAbstract; -use phpOMS\Message\ResponseAbstract; -use phpOMS\Message\NotificationLevel; -use phpOMS\Message\Http\RequestStatusCode; -use phpOMS\System\MimeType; -use phpOMS\Utils\Parser\Markdown\Markdown; use phpOMS\Account\PermissionAbstract; use phpOMS\Account\PermissionOwner; -use phpOMS\Validation\Network\Email; +use phpOMS\Message\Http\RequestStatusCode; +use phpOMS\Message\NotificationLevel; +use phpOMS\Message\RequestAbstract; +use phpOMS\Message\ResponseAbstract; +use phpOMS\Model\Message\FormValidation; +use phpOMS\System\MimeType; +use phpOMS\Utils\Parser\Markdown\Markdown; -use Model\Settings; +use phpOMS\Validation\Network\Email; /** * Admin controller class. diff --git a/Controller/BackendController.php b/Controller/BackendController.php index e737b5b..c8822ed 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -16,20 +16,18 @@ namespace Modules\Admin\Controller; use Modules\Admin\Models\Account; use Modules\Admin\Models\AccountMapper; -use Modules\Admin\Models\AccountPermission; use Modules\Admin\Models\AccountPermissionMapper; -use Modules\Admin\Models\NullAccountPermission; use Modules\Admin\Models\Group; use Modules\Admin\Models\GroupMapper; -use Modules\Admin\Models\GroupPermission; use Modules\Admin\Models\GroupPermissionMapper; +use Modules\Admin\Models\NullAccountPermission; use Modules\Admin\Models\NullGroupPermission; +use phpOMS\DataStorage\Database\RelationType; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; -use phpOMS\Views\View; -use phpOMS\DataStorage\Database\RelationType; use phpOMS\Module\InfoManager; +use phpOMS\Views\View; /** * Admin controller class. diff --git a/Models/AccountMapper.php b/Models/AccountMapper.php index 7d56c0d..498603f 100644 --- a/Models/AccountMapper.php +++ b/Models/AccountMapper.php @@ -14,12 +14,10 @@ declare(strict_types=1); namespace Modules\Admin\Models; -use Modules\Media\Models\MediaMapper; +use phpOMS\Auth\LoginReturnType; use phpOMS\DataStorage\Database\DataMapperAbstract; use phpOMS\DataStorage\Database\Query\Builder; -use phpOMS\DataStorage\Database\DatabaseType; -use phpOMS\Auth\LoginReturnType; /** * Account mapper class. diff --git a/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorPopupView.php b/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorPopupView.php index 4d1c774..1f6d4dd 100644 --- a/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorPopupView.php +++ b/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorPopupView.php @@ -14,10 +14,10 @@ declare(strict_types=1); namespace Modules\Admin\Theme\Backend\Components\GroupTagSelector; -use phpOMS\Views\View; use phpOMS\ApplicationAbstract; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; +use phpOMS\Views\View; class GroupTagSelectorPopupView extends View { diff --git a/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorView.php b/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorView.php index 483a545..088aed9 100644 --- a/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorView.php +++ b/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorView.php @@ -14,10 +14,10 @@ declare(strict_types=1); namespace Modules\Admin\Theme\Backend\Components\GroupTagSelector; -use phpOMS\Views\View; use phpOMS\ApplicationAbstract; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; +use phpOMS\Views\View; class GroupTagSelectorView extends View {