From ff81707d1e9b90391f17fce76a8236494389aea8 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 | 3 --- Controller/ApiController.php | 4 ++-- Controller/BackendController.php | 2 +- Models/AddressMapper.php | 5 ----- Models/ContactElementMapper.php | 3 --- Models/ProfileMapper.php | 7 +------ Theme/Backend/Components/AccountGroupSelector/BaseView.php | 2 +- .../Backend/Components/AccountGroupSelector/PopupView.php | 2 +- 13 files changed, 14 insertions(+), 32 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index ddca804..1191d6f 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -14,8 +14,8 @@ declare(strict_types=1); namespace Modules\Profile\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 9601485..c6bb98a 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 27ce955..34f88e8 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 e7d6e63..3dd9868 100644 --- a/Admin/Status.php +++ b/Admin/Status.php @@ -14,9 +14,7 @@ declare(strict_types=1); namespace Modules\Profile\Admin; -use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\StatusAbstract; -use phpOMS\Module\InfoManager; /** * Navigation class. diff --git a/Admin/Uninstaller.php b/Admin/Uninstaller.php index 9c1237f..0fbda96 100644 --- a/Admin/Uninstaller.php +++ b/Admin/Uninstaller.php @@ -16,8 +16,8 @@ namespace Modules\Profile\Admin; use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\DataStorage\Database\Schema\Builder; -use phpOMS\Module\UninstallerAbstract; use phpOMS\Module\InfoManager; +use phpOMS\Module\UninstallerAbstract; /** * Navigation class. diff --git a/Admin/Updater.php b/Admin/Updater.php index 1e4b1db..b70aa8e 100644 --- a/Admin/Updater.php +++ b/Admin/Updater.php @@ -14,10 +14,7 @@ declare(strict_types=1); namespace Modules\Profile\Admin; -use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\UpdaterAbstract; -use phpOMS\System\File\Local\Directory; -use phpOMS\Module\InfoManager; /** * Updater class. diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 1bed8f6..77c7cd0 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -14,13 +14,13 @@ declare(strict_types=1); namespace Modules\Profile\Controller; +use Modules\Admin\Models\AccountMapper; use Modules\Profile\Models\Profile; use Modules\Profile\Models\ProfileMapper; -use Modules\Admin\Models\AccountMapper; +use phpOMS\Message\NotificationLevel; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; -use phpOMS\Message\NotificationLevel; /** * Profile class. diff --git a/Controller/BackendController.php b/Controller/BackendController.php index de13a4b..1fa9ba2 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -17,10 +17,10 @@ namespace Modules\Profile\Controller; use Modules\Profile\Models\Profile; use Modules\Profile\Models\ProfileMapper; +use phpOMS\Asset\AssetType; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Views\View; -use phpOMS\Asset\AssetType; /** * Profile class. diff --git a/Models/AddressMapper.php b/Models/AddressMapper.php index dcab203..3a86664 100644 --- a/Models/AddressMapper.php +++ b/Models/AddressMapper.php @@ -14,12 +14,7 @@ declare(strict_types=1); namespace Modules\Profile\Models; -use Modules\Media\Models\MediaMapper; use phpOMS\DataStorage\Database\DataMapperAbstract; -use phpOMS\DataStorage\Database\Query\Builder; -use phpOMS\DataStorage\Database\Query\Column; -use phpOMS\DataStorage\Database\RelationType; -use phpOMS\Stdlib\Base\Location; /** * Address mapper. diff --git a/Models/ContactElementMapper.php b/Models/ContactElementMapper.php index 35a8cc3..81772e3 100644 --- a/Models/ContactElementMapper.php +++ b/Models/ContactElementMapper.php @@ -15,9 +15,6 @@ declare(strict_types=1); namespace Modules\Profile\Models; use phpOMS\DataStorage\Database\DataMapperAbstract; -use phpOMS\DataStorage\Database\Query\Builder; -use phpOMS\DataStorage\Database\Query\Column; -use phpOMS\DataStorage\Database\RelationType; final class ContactElementMapper extends DataMapperAbstract { diff --git a/Models/ProfileMapper.php b/Models/ProfileMapper.php index d1aa16a..02b3647 100644 --- a/Models/ProfileMapper.php +++ b/Models/ProfileMapper.php @@ -14,14 +14,9 @@ declare(strict_types=1); namespace Modules\Profile\Models; +use Modules\Admin\Models\AccountMapper; use Modules\Media\Models\MediaMapper; use phpOMS\DataStorage\Database\DataMapperAbstract; -use phpOMS\DataStorage\Database\Query\Builder; -use phpOMS\DataStorage\Database\Query\Column; -use phpOMS\DataStorage\Database\RelationType; -use Modules\Admin\Models\Account; -use Modules\Admin\Models\AccountMapper; -use Modules\Calendar\Models\CalendarMapper; /** * Profile mapper. diff --git a/Theme/Backend/Components/AccountGroupSelector/BaseView.php b/Theme/Backend/Components/AccountGroupSelector/BaseView.php index 6f3b16e..a93d944 100644 --- a/Theme/Backend/Components/AccountGroupSelector/BaseView.php +++ b/Theme/Backend/Components/AccountGroupSelector/BaseView.php @@ -14,10 +14,10 @@ declare(strict_types=1); namespace Modules\Profile\Theme\Backend\Components\AccountGroupSelector; -use phpOMS\Views\View; use phpOMS\ApplicationAbstract; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; +use phpOMS\Views\View; class BaseView extends View { diff --git a/Theme/Backend/Components/AccountGroupSelector/PopupView.php b/Theme/Backend/Components/AccountGroupSelector/PopupView.php index 5a6ee0c..df5474c 100644 --- a/Theme/Backend/Components/AccountGroupSelector/PopupView.php +++ b/Theme/Backend/Components/AccountGroupSelector/PopupView.php @@ -14,10 +14,10 @@ declare(strict_types=1); namespace Modules\Profile\Theme\Backend\Components\AccountGroupSelector; -use phpOMS\Views\View; use phpOMS\ApplicationAbstract; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; +use phpOMS\Views\View; class PopupView extends View {