From d418756dd817a11096f890da4f8bfcf14a226bc0 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 | 6 +++--- Controller/BackendController.php | 6 +++--- Models/TaskElementMapper.php | 1 - Models/TaskMapper.php | 3 --- Theme/Backend/Components/Tasks/BaseView.php | 2 +- Theme/Backend/task-single.tpl.php | 2 +- Views/TaskView.php | 5 +---- 13 files changed, 17 insertions(+), 29 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index 84dce4a..19ad86d 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -14,8 +14,8 @@ declare(strict_types=1); namespace Modules\Tasks\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 5619482..cf43f09 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 7d87653..194f300 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 be1963a..54bdf10 100644 --- a/Admin/Status.php +++ b/Admin/Status.php @@ -14,9 +14,7 @@ declare(strict_types=1); namespace Modules\Tasks\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 4e47311..8f4e070 100644 --- a/Admin/Uninstaller.php +++ b/Admin/Uninstaller.php @@ -16,8 +16,8 @@ namespace Modules\Tasks\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 367214f..5bd15ab 100644 --- a/Admin/Updater.php +++ b/Admin/Updater.php @@ -14,10 +14,7 @@ declare(strict_types=1); namespace Modules\Tasks\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 857f2c8..fcc9d58 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -14,18 +14,18 @@ declare(strict_types=1); namespace Modules\Tasks\Controller; -use phpOMS\Model\Message\FormValidation; - use Modules\Tasks\Models\Task; + use Modules\Tasks\Models\TaskElement; use Modules\Tasks\Models\TaskElementMapper; use Modules\Tasks\Models\TaskMapper; use Modules\Tasks\Models\TaskStatus; use Modules\Tasks\Models\TaskType; +use phpOMS\Message\NotificationLevel; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; -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 9f477e8..a065d81 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -14,17 +14,17 @@ declare(strict_types=1); namespace Modules\Tasks\Controller; +use Modules\Tasks\Models\PermissionState; use Modules\Tasks\Models\Task; use Modules\Tasks\Models\TaskMapper; -use Modules\Tasks\Models\PermissionState; use Modules\Tasks\Views\TaskView; +use phpOMS\Account\PermissionType; +use phpOMS\DataStorage\Database\RelationType; use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Views\View; -use phpOMS\Account\PermissionType; -use phpOMS\DataStorage\Database\RelationType; /** * Task class. diff --git a/Models/TaskElementMapper.php b/Models/TaskElementMapper.php index 334c7ad..7317d97 100644 --- a/Models/TaskElementMapper.php +++ b/Models/TaskElementMapper.php @@ -17,7 +17,6 @@ namespace Modules\Tasks\Models; use Modules\Admin\Models\AccountMapper; use Modules\Media\Models\MediaMapper; use phpOMS\DataStorage\Database\DataMapperAbstract; -use phpOMS\DataStorage\Database\RelationType; /** * Mapper class. diff --git a/Models/TaskMapper.php b/Models/TaskMapper.php index 441e4d3..35630dd 100644 --- a/Models/TaskMapper.php +++ b/Models/TaskMapper.php @@ -17,11 +17,8 @@ namespace Modules\Tasks\Models; use Modules\Admin\Models\AccountMapper; use Modules\Calendar\Models\ScheduleMapper; use Modules\Media\Models\MediaMapper; -use Modules\Tasks\Models\TaskElementMapper; use phpOMS\DataStorage\Database\DataMapperAbstract; use phpOMS\DataStorage\Database\Query\Builder; -use phpOMS\DataStorage\Database\Query\Column; -use phpOMS\DataStorage\Database\RelationType; /** * Mapper class. diff --git a/Theme/Backend/Components/Tasks/BaseView.php b/Theme/Backend/Components/Tasks/BaseView.php index 4b511b4..f375886 100644 --- a/Theme/Backend/Components/Tasks/BaseView.php +++ b/Theme/Backend/Components/Tasks/BaseView.php @@ -14,10 +14,10 @@ declare(strict_types=1); namespace Modules\Tasks\Theme\Backend\Components\Tasks; -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/task-single.tpl.php b/Theme/Backend/task-single.tpl.php index 314f87e..263fa05 100644 --- a/Theme/Backend/task-single.tpl.php +++ b/Theme/Backend/task-single.tpl.php @@ -11,8 +11,8 @@ * @link http://website.orange-management.de */ -use \Modules\Tasks\Models\TaskStatus; use \Modules\Tasks\Models\TaskPriority; +use \Modules\Tasks\Models\TaskStatus; /** * @var \phpOMS\Views\View $this diff --git a/Views/TaskView.php b/Views/TaskView.php index 72adc8a..486c8bf 100644 --- a/Views/TaskView.php +++ b/Views/TaskView.php @@ -14,11 +14,8 @@ declare(strict_types=1); namespace Modules\Tasks\Views; -use phpOMS\Views\View; -use phpOMS\ApplicationAbstract; -use phpOMS\Message\RequestAbstract; -use phpOMS\Message\ResponseAbstract; use Modules\Tasks\Models\TaskStatus; +use phpOMS\Views\View; class TaskView extends View {