From 4f3b62909f9b37bccf704c894befee96d1ce23fb Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 19 Sep 2018 21:34:04 +0200 Subject: [PATCH] Split controllers per application --- Admin/Routes/Web/Backend.php | 22 ++--- .../BackendController.php | 53 +----------- Controller/Controller.php | 85 +++++++++++++++++++ 3 files changed, 98 insertions(+), 62 deletions(-) rename Controller.php => Controller/BackendController.php (80%) create mode 100644 Controller/Controller.php diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 1f7fd17..0854d3f 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -3,15 +3,15 @@ use phpOMS\Router\RouteVerb; use phpOMS\Account\PermissionType; use Modules\Monitoring\Models\PermissionState; -use Modules\Monitoring\Controller; +use Modules\Monitoring\Controller\BackendController; return [ '^.*/backend/admin/monitoring/general.*$' => [ [ - 'dest' => '\Modules\Monitoring\Controller:viewMonitoringGeneral', + 'dest' => '\Modules\Monitoring\Controller\BackendController:viewMonitoringGeneral', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => Controller::MODULE_NAME, + 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, 'state' => PermissionState::DASHBOARD, ], @@ -19,10 +19,10 @@ return [ ], '^.*/backend/admin/monitoring/log/list.*$' => [ [ - 'dest' => '\Modules\Monitoring\Controller:viewMonitoringLogList', + 'dest' => '\Modules\Monitoring\Controller\BackendController:viewMonitoringLogList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => Controller::MODULE_NAME, + 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, 'state' => PermissionState::LOG, ], @@ -30,10 +30,10 @@ return [ ], '^.*/backend/admin/monitoring/log/single.*$' => [ [ - 'dest' => '\Modules\Monitoring\Controller:viewMonitoringLogEntry', + 'dest' => '\Modules\Monitoring\Controller\BackendController:viewMonitoringLogEntry', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => Controller::MODULE_NAME, + 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, 'state' => PermissionState::LOG, ], @@ -41,10 +41,10 @@ return [ ], '^.*/backend/admin/monitoring/security/dashboard.*$' => [ [ - 'dest' => '\Modules\Monitoring\Controller:viewMonitoringSecurityDashboard', + 'dest' => '\Modules\Monitoring\Controller\BackendController:viewMonitoringSecurityDashboard', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => Controller::MODULE_NAME, + 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, 'state' => PermissionState::SECURITY, ], @@ -52,10 +52,10 @@ return [ ], '^.*/backend/admin/monitoring/security/file/list.*$' => [ [ - 'dest' => '\Modules\Monitoring\Controller:viewMonitoringSecurityFileList', + 'dest' => '\Modules\Monitoring\Controller\BackendController:viewMonitoringSecurityFileList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => Controller::MODULE_NAME, + 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, 'state' => PermissionState::SECURITY, ], diff --git a/Controller.php b/Controller/BackendController.php similarity index 80% rename from Controller.php rename to Controller/BackendController.php index f9ce311..06b838e 100644 --- a/Controller.php +++ b/Controller/BackendController.php @@ -12,7 +12,7 @@ */ declare(strict_types=1); -namespace Modules\Monitoring; +namespace Modules\Monitoring\Controller; use Modules\Navigation\Models\Navigation; use Modules\Navigation\Views\NavigationView; @@ -31,58 +31,9 @@ use phpOMS\Views\View; * @link http://website.orange-management.de * @since 1.0.0 */ -final class Controller extends ModuleAbstract implements WebInterface +class BackendController extends Controller { - /** - * Module path. - * - * @var string - * @since 1.0.0 - */ - public const MODULE_PATH = __DIR__; - - /** - * Module version. - * - * @var string - * @since 1.0.0 - */ - public const MODULE_VERSION = '1.0.0'; - - /** - * Module name. - * - * @var string - * @since 1.0.0 - */ - public const MODULE_NAME = 'Monitoring'; - - /** - * Module id. - * - * @var int - * @since 1.0.0 - */ - public const MODULE_ID = 1000700000; - - /** - * Providing. - * - * @var string[] - * @since 1.0.0 - */ - protected static $providing = []; - - /** - * Dependencies. - * - * @var string[] - * @since 1.0.0 - */ - protected static $dependencies = [ - ]; - /** * @param RequestAbstract $request Request * @param ResponseAbstract $response Response diff --git a/Controller/Controller.php b/Controller/Controller.php new file mode 100644 index 0000000..d39a08b --- /dev/null +++ b/Controller/Controller.php @@ -0,0 +1,85 @@ +