From 27f495879f00e6ce91219129e3387482176a7eae Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 3 Feb 2018 13:09:09 +0100 Subject: [PATCH] phpcbf --- Admin/Update.php | 1 - Controller.php | 6 ++---- Models/PermissionState.php | 4 ++-- Models/Task.php | 7 ++++--- Models/TaskElement.php | 9 ++++++--- Models/TaskPriority.php | 10 +++++----- Models/TaskStatus.php | 8 ++++---- Theme/Backend/Components/Tasks/BaseView.php | 2 +- 8 files changed, 24 insertions(+), 23 deletions(-) diff --git a/Admin/Update.php b/Admin/Update.php index 0507111..f243d4f 100644 --- a/Admin/Update.php +++ b/Admin/Update.php @@ -19,7 +19,6 @@ use phpOMS\Module\UpdateAbstract; use phpOMS\System\File\Directory; use phpOMS\Module\InfoManager; - /** * Navigation class. * diff --git a/Controller.php b/Controller.php index ea0ea5d..6951f57 100644 --- a/Controller.php +++ b/Controller.php @@ -244,8 +244,7 @@ class Controller extends ModuleAbstract implements WebInterface private function validateTaskCreate(RequestAbstract $request) : array { $val = []; - if ( - ($val['title'] = empty($request->getData('title'))) + if (($val['title'] = empty($request->getData('title'))) || ($val['description'] = empty($request->getData('description'))) || ($val['due'] = !((bool) strtotime((string) $request->getData('due')))) || ($val['forward'] = !(is_numeric($request->getData('forward') ?? 0))) @@ -317,8 +316,7 @@ class Controller extends ModuleAbstract implements WebInterface private function validateTaskElementCreate(RequestAbstract $request) : array { $val = []; - if ( - ($val['status'] = !TaskStatus::isValidValue((int) $request->getData('status'))) + if (($val['status'] = !TaskStatus::isValidValue((int) $request->getData('status'))) || ($val['due'] = !((bool) strtotime((string) $request->getData('due')))) || ($val['task'] = !(is_numeric($request->getData('task')))) || ($val['forward'] = !(is_numeric(empty($request->getData('forward')) ? $request->getHeader()->getAccount() : $request->getData('forward')))) diff --git a/Models/PermissionState.php b/Models/PermissionState.php index 27c05d8..16cb7b8 100644 --- a/Models/PermissionState.php +++ b/Models/PermissionState.php @@ -26,7 +26,7 @@ use phpOMS\Stdlib\Base\Enum; */ abstract class PermissionState extends Enum { - /* public */ const DASHBOARD = 1; - /* public */ const TASK = 2; + /* public */ const DASHBOARD = 1; + /* public */ const TASK = 2; /* public */ const TASKELEMENT = 3; } diff --git a/Models/Task.php b/Models/Task.php index 56afe5d..3aeac51 100644 --- a/Models/Task.php +++ b/Models/Task.php @@ -148,8 +148,8 @@ class Task implements \JsonSerializable public function __construct() { $this->createdAt = new \DateTime('now'); - $this->start = new \DateTime('now'); - $this->due = new \DateTime('now'); + $this->start = new \DateTime('now'); + $this->due = new \DateTime('now'); $this->due->modify('+1 day'); $this->schedule = new Schedule(); } @@ -502,7 +502,8 @@ class Task implements \JsonSerializable * * @since 1.0.0 */ - public function getSchedule() : Schedule { + public function getSchedule() : Schedule + { return $this->schedule; } diff --git a/Models/TaskElement.php b/Models/TaskElement.php index 1ca2662..8b43587 100644 --- a/Models/TaskElement.php +++ b/Models/TaskElement.php @@ -13,6 +13,7 @@ declare(strict_types = 1); namespace Modules\Tasks\Models; + use phpOMS\Stdlib\Base\Exception\InvalidEnumValue; /** @@ -107,7 +108,7 @@ class TaskElement implements \JsonSerializable */ public function __construct() { - $this->due = new \DateTime('now'); + $this->due = new \DateTime('now'); $this->due->modify('+1 day'); $this->createdAt = new \DateTime('now'); } @@ -306,7 +307,8 @@ class TaskElement implements \JsonSerializable $this->task = $task; } - public function toArray() : array { + public function toArray() : array + { return [ 'id' => $this->id, 'task' => $this->task, @@ -319,7 +321,8 @@ class TaskElement implements \JsonSerializable ]; } - public function jsonSerialize() { + public function jsonSerialize() + { return $this->toArray(); } } diff --git a/Models/TaskPriority.php b/Models/TaskPriority.php index ea82cb1..2d9f1cd 100644 --- a/Models/TaskPriority.php +++ b/Models/TaskPriority.php @@ -26,10 +26,10 @@ use phpOMS\Stdlib\Base\Enum; */ abstract class TaskPriority extends Enum { - /* public */ const NONE = 0; - /* public */ const VLOW = 1; - /* public */ const LOW = 2; + /* public */ const NONE = 0; + /* public */ const VLOW = 1; + /* public */ const LOW = 2; /* public */ const MEDIUM = 3; - /* public */ const HIGH = 4; - /* public */ const VHIGH = 5; + /* public */ const HIGH = 4; + /* public */ const VHIGH = 5; } diff --git a/Models/TaskStatus.php b/Models/TaskStatus.php index 2d5d66b..8cf9528 100644 --- a/Models/TaskStatus.php +++ b/Models/TaskStatus.php @@ -26,9 +26,9 @@ use phpOMS\Stdlib\Base\Enum; */ abstract class TaskStatus extends Enum { - /* public */ const OPEN = 1; - /* public */ const WORKING = 2; + /* public */ const OPEN = 1; + /* public */ const WORKING = 2; /* public */ const SUSPENDED = 3; - /* public */ const CANCELED = 4; - /* public */ const DONE = 5; + /* public */ const CANCELED = 4; + /* public */ const DONE = 5; } diff --git a/Theme/Backend/Components/Tasks/BaseView.php b/Theme/Backend/Components/Tasks/BaseView.php index 0404866..bcec0a1 100644 --- a/Theme/Backend/Components/Tasks/BaseView.php +++ b/Theme/Backend/Components/Tasks/BaseView.php @@ -34,4 +34,4 @@ class BaseView extends View $this->tasks = $data[0]; return parent::render(); } -} \ No newline at end of file +}