From fdc44f9390f6dd4f1494138ba4aa931a3d873111 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 13 Feb 2020 18:54:21 +0100 Subject: [PATCH] typehint fixes --- Controller/ApiController.php | 2 +- Models/Task.php | 14 +++++++------- Models/TaskElement.php | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 56d9272..a658757 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -119,7 +119,7 @@ final class ApiController extends Controller $task->setDescription(Markdown::parse((string) ($request->getData('plain') ?? ''))); $task->setDescriptionRaw((string) ($request->getData('plain') ?? '')); $task->setCreatedBy($request->getHeader()->getAccount()); - $task->setDue(new \DateTime((string) ($request->getData('due') ?? 'now'))); + $task->setDue(new \DateTime($request->getData('due'))); $task->setStatus(TaskStatus::OPEN); $task->setType(TaskType::SINGLE); $task->setPriority((int) $request->getData('priority')); diff --git a/Models/Task.php b/Models/Task.php index 633a4f9..b7d523e 100644 --- a/Models/Task.php +++ b/Models/Task.php @@ -517,13 +517,13 @@ class Task implements \JsonSerializable /** * Get done date * - * @return \DateTime + * @return null|\DateTime * * @since 1.0.0 */ - public function getDone() : \DateTime + public function getDone() : ?\DateTime { - return $this->done ?? new \DateTime('now'); + return $this->done; } /** @@ -543,11 +543,11 @@ class Task implements \JsonSerializable /** * Get due date * - * @return \DateTime + * @return null|\DateTime * * @since 1.0.0 */ - public function getDue() : \DateTime + public function getDue() : ?\DateTime { return $this->due; } @@ -555,13 +555,13 @@ class Task implements \JsonSerializable /** * Set due date * - * @param \DateTime $due Due date + * @param null|\DateTime $due Due date * * @return void * * @since 1.0.0 */ - public function setDue(\DateTime $due) : void + public function setDue(?\DateTime $due) : void { $this->due = $due; } diff --git a/Models/TaskElement.php b/Models/TaskElement.php index 2f025aa..f0a00ea 100644 --- a/Models/TaskElement.php +++ b/Models/TaskElement.php @@ -263,11 +263,11 @@ class TaskElement implements \JsonSerializable /** * Get due date * - * @return \DateTime + * @return null|\DateTime * * @since 1.0.0 */ - public function getDue() : \DateTime + public function getDue() : ?\DateTime { return $this->due; } @@ -275,13 +275,13 @@ class TaskElement implements \JsonSerializable /** * Set due date * - * @param \DateTime $due Due date + * @param null|\DateTime $due Due date * * @return void * * @since 1.0.0 */ - public function setDue(\DateTime $due) : void + public function setDue(?\DateTime $due) : void { $this->due = $due; }