From a9b5dfcf3ef238bca50d6f09e8fe239302d5e981 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 1 Dec 2018 20:50:27 +0100 Subject: [PATCH] Make classes final --- Controller/ApiController.php | 18 ++++++++++++++---- Controller/BackendController.php | 2 +- Models/Task.php | 2 +- Models/TaskElement.php | 2 +- Models/TaskElementMapper.php | 2 +- Models/TaskMapper.php | 2 +- Models/TaskTemplate.php | 2 +- 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 64c35f8..b3be308 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -31,7 +31,6 @@ use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Message\NotificationLevel; use phpOMS\Module\ModuleAbstract; -use phpOMS\Module\WebInterface; use phpOMS\Utils\Parser\Markdown\Markdown; use phpOMS\Views\View; use phpOMS\Account\PermissionType; @@ -45,7 +44,7 @@ use phpOMS\DataStorage\Database\RelationType; * @link http://website.orange-management.de * @since 1.0.0 */ -class ApiController extends Controller +final class ApiController extends Controller { /** * Validate task create request @@ -91,7 +90,10 @@ class ApiController extends Controller $task = $this->createTaskFromRequest($request); + $this->app->eventManager->trigger('PRE:Module:Tasks-task-create', '', $task); TaskMapper::create($task); + $this->app->eventManager->trigger('POST:Module:Tasks-task-create', '', $task); + $response->set($request->getUri()->__toString(), [ 'status' => NotificationLevel::OK, 'title' => 'Task', @@ -172,8 +174,11 @@ class ApiController extends Controller */ public function apiTaskSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void { - $task = $this->updateTaskFromRequest($request); + $task = $this->updateTaskFromRequest($request); + + $this->app->eventManager->trigger('PRE:Module:Tasks-task-update', '', $task); $status = TaskMapper::update($task); + $this->app->eventManager->trigger('POST:Module:Tasks-task-update', '', $task); $response->set($request->getUri()->__toString(), [ 'status' => NotificationLevel::OK, @@ -252,8 +257,10 @@ class ApiController extends Controller $task = TaskMapper::get($element->getTask()); $task->setStatus($element->getStatus()); + $this->app->eventManager->trigger('PRE:Module:Tasks-taskelement-create', '', $element); TaskElementMapper::create($element); TaskMapper::update($task); + $this->app->eventManager->trigger('POST:Module:Tasks-taskelement-create', '', $element); $response->set($request->getUri()->__toString(), [ 'status' => NotificationLevel::OK, @@ -326,8 +333,11 @@ class ApiController extends Controller */ public function apiTaskElementSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void { - $task = $this->updateTaskElementFromRequest($request); + $task = $this->updateTaskElementFromRequest($request); + + $this->app->eventManager->trigger('PRE:Module:Tasks-taskelement-update', '', $task); $status = TaskElementMapper::update($task); + $this->app->eventManager->trigger('POST:Module:Tasks-taskelement-update', '', $task); $response->set($request->getUri()->__toString(), [ 'status' => NotificationLevel::OK, diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 25e5200..f01ddc5 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -45,7 +45,7 @@ use phpOMS\DataStorage\Database\RelationType; * @link http://website.orange-management.de * @since 1.0.0 */ -class BackendController extends Controller +final class BackendController extends Controller { /** * @param RequestAbstract $request Request diff --git a/Models/Task.php b/Models/Task.php index 2933670..ce8d202 100644 --- a/Models/Task.php +++ b/Models/Task.php @@ -25,7 +25,7 @@ use phpOMS\Stdlib\Base\Exception\InvalidEnumValue; * @link http://website.orange-management.de * @since 1.0.0 */ -class Task implements \JsonSerializable +final class Task implements \JsonSerializable { /** diff --git a/Models/TaskElement.php b/Models/TaskElement.php index 745725d..cd0427b 100644 --- a/Models/TaskElement.php +++ b/Models/TaskElement.php @@ -24,7 +24,7 @@ use phpOMS\Stdlib\Base\Exception\InvalidEnumValue; * @link http://website.orange-management.de * @since 1.0.0 */ -class TaskElement implements \JsonSerializable +final class TaskElement implements \JsonSerializable { /** diff --git a/Models/TaskElementMapper.php b/Models/TaskElementMapper.php index 95c4b97..334c7ad 100644 --- a/Models/TaskElementMapper.php +++ b/Models/TaskElementMapper.php @@ -27,7 +27,7 @@ use phpOMS\DataStorage\Database\RelationType; * @link http://website.orange-management.de * @since 1.0.0 */ -class TaskElementMapper extends DataMapperAbstract +final class TaskElementMapper extends DataMapperAbstract { /** diff --git a/Models/TaskMapper.php b/Models/TaskMapper.php index 2229a7c..441e4d3 100644 --- a/Models/TaskMapper.php +++ b/Models/TaskMapper.php @@ -31,7 +31,7 @@ use phpOMS\DataStorage\Database\RelationType; * @link http://website.orange-management.de * @since 1.0.0 */ -class TaskMapper extends DataMapperAbstract +final class TaskMapper extends DataMapperAbstract { /** diff --git a/Models/TaskTemplate.php b/Models/TaskTemplate.php index 48e6aed..6767c91 100644 --- a/Models/TaskTemplate.php +++ b/Models/TaskTemplate.php @@ -22,7 +22,7 @@ namespace Modules\Tasks\Models; * @link http://website.orange-management.de * @since 1.0.0 */ -class TaskTemplate extends Task +final class TaskTemplate extends Task { /** * Type.