From d54df824dd9a8946cd8b2e029727c44d2b94a8ac 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 | 26 +++--- .../BackendController.php | 53 +---------- Controller/Controller.php | 88 +++++++++++++++++++ 3 files changed, 103 insertions(+), 64 deletions(-) rename Controller.php => Controller/BackendController.php (86%) create mode 100644 Controller/Controller.php diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index d64645d..0c347d0 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\Marketing\Models\PermissionState; -use Modules\Marketing\Controller; +use Modules\Marketing\Controller\BackendController; return [ '^.*/backend/marketing/promotion/list.*$' => [ [ - 'dest' => '\Modules\Marketing\Controller:viewMarketingPromotionList', + 'dest' => '\Modules\Marketing\Controller\BackendController:viewMarketingPromotionList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => Controller::MODULE_NAME, + 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, 'state' => PermissionState::PROMOTION, ], @@ -19,10 +19,10 @@ return [ ], '^.*/backend/marketing/promotion/create.*$' => [ [ - 'dest' => '\Modules\Marketing\Controller:viewMarketingPromotionCreate', + 'dest' => '\Modules\Marketing\Controller\BackendController:viewMarketingPromotionCreate', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => Controller::MODULE_NAME, + 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::PROMOTION, ], @@ -30,10 +30,10 @@ return [ ], '^.*/backend/marketing/promotion/profile.*$' => [ [ - 'dest' => '\Modules\Marketing\Controller:viewMarketingPromotionProfile', + 'dest' => '\Modules\Marketing\Controller\BackendController:viewMarketingPromotionProfile', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => Controller::MODULE_NAME, + 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, 'state' => PermissionState::PROMOTION, ], @@ -41,10 +41,10 @@ return [ ], '^.*/backend/marketing/event/list.*$' => [ [ - 'dest' => '\Modules\Marketing\Controller:viewMarketingEventList', + 'dest' => '\Modules\Marketing\Controller\BackendController:viewMarketingEventList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => Controller::MODULE_NAME, + 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, 'state' => PermissionState::EVENT, ], @@ -52,10 +52,10 @@ return [ ], '^.*/backend/marketing/event/create.*$' => [ [ - 'dest' => '\Modules\Marketing\Controller:viewMarketingEventCreate', + 'dest' => '\Modules\Marketing\Controller\BackendController:viewMarketingEventCreate', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => Controller::MODULE_NAME, + 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::EVENT, ], @@ -63,10 +63,10 @@ return [ ], '^.*/backend/marketing/event/profile.*$' => [ [ - 'dest' => '\Modules\Marketing\Controller:viewMarketingEventProfile', + 'dest' => '\Modules\Marketing\Controller\BackendController:viewMarketingEventProfile', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => Controller::MODULE_NAME, + 'module' => BackendController::MODULE_NAME, 'type' => PermissionType::READ, 'state' => PermissionState::EVENT, ], diff --git a/Controller.php b/Controller/BackendController.php similarity index 86% rename from Controller.php rename to Controller/BackendController.php index 98bef8a..ddc11dd 100644 --- a/Controller.php +++ b/Controller/BackendController.php @@ -12,7 +12,7 @@ */ declare(strict_types=1); -namespace Modules\Marketing; +namespace Modules\Marketing\Controller; use Modules\Navigation\Models\Navigation; use Modules\Navigation\Views\NavigationView; @@ -34,58 +34,9 @@ use phpOMS\Asset\AssetType; * @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 = 'Marketing'; - - /** - * Module id. - * - * @var int - * @since 1.0.0 - */ - public const MODULE_ID = 1001900000; - - /** - * 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..9cf1c56 --- /dev/null +++ b/Controller/Controller.php @@ -0,0 +1,88 @@ +