From c2bfe323fb45b0ee8eb830e4d7bef60779229a07 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 | 14 ++------------ Controller/BackendController.php | 12 ++---------- Controller/Controller.php | 14 -------------- Models/EditorDocMapper.php | 3 --- Theme/Backend/Components/Editor/BaseView.php | 4 ++-- Theme/Backend/Components/Editor/TextView.php | 2 +- 12 files changed, 14 insertions(+), 56 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index 13d160a..5ccbc16 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -14,8 +14,8 @@ declare(strict_types=1); namespace Modules\Editor\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 9e3a132..d672568 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 52046aa..18de8c4 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 557150c..a161e38 100644 --- a/Admin/Status.php +++ b/Admin/Status.php @@ -14,9 +14,7 @@ declare(strict_types=1); namespace Modules\Editor\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 a3a1833..a2f0046 100644 --- a/Admin/Uninstaller.php +++ b/Admin/Uninstaller.php @@ -14,9 +14,7 @@ declare(strict_types=1); namespace Modules\Editor\Admin; -use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\UninstallerAbstract; -use phpOMS\Module\InfoManager; /** * Navigation class. diff --git a/Admin/Updater.php b/Admin/Updater.php index 13e3d96..3d05ca3 100644 --- a/Admin/Updater.php +++ b/Admin/Updater.php @@ -14,10 +14,7 @@ declare(strict_types=1); namespace Modules\Editor\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 ce2f576..40fd4ca 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -14,23 +14,13 @@ declare(strict_types=1); namespace Modules\Editor\Controller; -use Modules\Navigation\Models\Navigation; -use Modules\Navigation\Views\NavigationView; use Modules\Editor\Models\EditorDoc; use Modules\Editor\Models\EditorDocMapper; -use Modules\Editor\Models\PermissionState; -use phpOMS\Model\Message\FormValidation; -use phpOMS\Asset\AssetType; -use phpOMS\Contract\RenderableInterface; +use phpOMS\Message\NotificationLevel; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; -use phpOMS\Module\ModuleAbstract; -use phpOMS\Module\WebInterface; -use phpOMS\Views\View; -use phpOMS\Account\PermissionType; -use phpOMS\Message\Http\RequestStatusCode; -use phpOMS\Message\NotificationLevel; +use phpOMS\Model\Message\FormValidation; use phpOMS\Utils\Parser\Markdown\Markdown; /** diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 2de268e..4985922 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -14,22 +14,14 @@ declare(strict_types=1); namespace Modules\Editor\Controller; -use phpOMS\Model\Message\FormValidation; -use Modules\Navigation\Models\Navigation; -use Modules\Navigation\Views\NavigationView; -use Modules\Editor\Models\EditorDoc; use Modules\Editor\Models\EditorDocMapper; use Modules\Editor\Models\PermissionState; +use phpOMS\Account\PermissionType; use phpOMS\Asset\AssetType; -use phpOMS\Contract\RenderableInterface; +use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; -use phpOMS\Module\ModuleAbstract; -use phpOMS\Module\WebInterface; use phpOMS\Views\View; -use phpOMS\Account\PermissionType; -use phpOMS\Message\Http\RequestStatusCode; -use phpOMS\Utils\Parser\Markdown\Markdown; /** * Calendar controller class. diff --git a/Controller/Controller.php b/Controller/Controller.php index d72d378..cefa05b 100644 --- a/Controller/Controller.php +++ b/Controller/Controller.php @@ -14,22 +14,8 @@ declare(strict_types=1); namespace Modules\Editor\Controller; -use phpOMS\Model\Message\FormValidation; -use Modules\Navigation\Models\Navigation; -use Modules\Navigation\Views\NavigationView; -use Modules\Editor\Models\EditorDoc; -use Modules\Editor\Models\EditorDocMapper; -use Modules\Editor\Models\PermissionState; -use phpOMS\Asset\AssetType; -use phpOMS\Contract\RenderableInterface; -use phpOMS\Message\RequestAbstract; -use phpOMS\Message\ResponseAbstract; use phpOMS\Module\ModuleAbstract; use phpOMS\Module\WebInterface; -use phpOMS\Views\View; -use phpOMS\Account\PermissionType; -use phpOMS\Message\Http\RequestStatusCode; -use phpOMS\Utils\Parser\Markdown\Markdown; /** * Calendar controller class. diff --git a/Models/EditorDocMapper.php b/Models/EditorDocMapper.php index 0d97460..55ba12b 100644 --- a/Models/EditorDocMapper.php +++ b/Models/EditorDocMapper.php @@ -16,9 +16,6 @@ namespace Modules\Editor\Models; use Modules\Admin\Models\AccountMapper; use phpOMS\DataStorage\Database\DataMapperAbstract; -use phpOMS\DataStorage\Database\Query\Builder; -use phpOMS\DataStorage\Database\Query\Column; -use phpOMS\DataStorage\Database\RelationType; final class EditorDocMapper extends DataMapperAbstract { diff --git a/Theme/Backend/Components/Editor/BaseView.php b/Theme/Backend/Components/Editor/BaseView.php index 963b40e..4b657c3 100644 --- a/Theme/Backend/Components/Editor/BaseView.php +++ b/Theme/Backend/Components/Editor/BaseView.php @@ -14,11 +14,11 @@ declare(strict_types=1); namespace Modules\Editor\Theme\Backend\Components\Editor; -use phpOMS\Views\View; use phpOMS\ApplicationAbstract; +use phpOMS\Asset\AssetType; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; -use phpOMS\Asset\AssetType; +use phpOMS\Views\View; class BaseView extends View { diff --git a/Theme/Backend/Components/Editor/TextView.php b/Theme/Backend/Components/Editor/TextView.php index 83aa8a1..2bf52af 100644 --- a/Theme/Backend/Components/Editor/TextView.php +++ b/Theme/Backend/Components/Editor/TextView.php @@ -14,10 +14,10 @@ declare(strict_types=1); namespace Modules\Editor\Theme\Backend\Components\Editor; -use phpOMS\Views\View; use phpOMS\ApplicationAbstract; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; +use phpOMS\Views\View; class TextView extends View {