From dfbc9fdacd838ad4285228e93402c4d278df57bb Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 29 Oct 2021 14:49:55 +0200 Subject: [PATCH] bug and media fixes --- Models/Event.php | 30 +++++++++++++++--------------- tests/Bootstrap.php | 2 +- tests/Models/EventMapperTest.php | 18 +++++++++--------- tests/Models/EventTest.php | 32 ++++++++++++++++---------------- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Models/Event.php b/Models/Event.php index c67c01e..e8aaf14 100755 --- a/Models/Event.php +++ b/Models/Event.php @@ -17,8 +17,8 @@ namespace Modules\EventManagement\Models; use Modules\Admin\Models\Account; use Modules\Admin\Models\NullAccount; use Modules\Calendar\Models\Calendar; -use Modules\Tasks\Models\Task; use Modules\Tasks\Models\NullTask; +use Modules\Tasks\Models\Task; use phpOMS\Localization\Money; use phpOMS\Stdlib\Base\Exception\InvalidEnumValue; @@ -353,21 +353,21 @@ class Event public function toArray() : array { return [ - 'id' => $this->id, - 'type' => $this->type, - 'start' => $this->start, - 'end' => $this->end, - 'name' => $this->name, - 'description' => $this->description, - 'calendar' => $this->calendar, - 'costs' => $this->costs, - 'budget' => $this->budget, - 'earnings' => $this->earnings, - 'tasks' => $this->tasks, - 'media' => $this->media, - 'progress' => $this->progress, + 'id' => $this->id, + 'type' => $this->type, + 'start' => $this->start, + 'end' => $this->end, + 'name' => $this->name, + 'description' => $this->description, + 'calendar' => $this->calendar, + 'costs' => $this->costs, + 'budget' => $this->budget, + 'earnings' => $this->earnings, + 'tasks' => $this->tasks, + 'media' => $this->media, + 'progress' => $this->progress, 'progressType' => $this->progressType, - 'createdAt' => $this->createdAt, + 'createdAt' => $this->createdAt, ]; } diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 051ac7e..f5fc99c 100755 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -392,4 +392,4 @@ function phpServe() : void }); } -phpServe(); +\phpServe(); diff --git a/tests/Models/EventMapperTest.php b/tests/Models/EventMapperTest.php index f4ca453..46218ad 100755 --- a/tests/Models/EventMapperTest.php +++ b/tests/Models/EventMapperTest.php @@ -41,14 +41,14 @@ final class EventMapperTest extends \PHPUnit\Framework\TestCase $event->name = 'Eventname'; $event->description = 'Event description'; $event->createdBy = new NullAccount(1); - $event->start = new \DateTime('2000-05-05'); - $event->end = new \DateTime('2005-05-05'); + $event->start = new \DateTime('2000-05-05'); + $event->end = new \DateTime('2005-05-05'); $money = new Money(); $money->setString('1.23'); - $event->costs = $money; - $event->budget = $money; + $event->costs = $money; + $event->budget = $money; $event->earnings = $money; $task = new Task(); @@ -124,16 +124,16 @@ final class EventMapperTest extends \PHPUnit\Framework\TestCase $event->name = $text->generateText(\mt_rand(3, 7)); $event->description = $text->generateText(\mt_rand(20, 100)); $event->createdBy = new NullAccount(1); - $event->start = new \DateTime('2000-05-05'); - $event->end = new \DateTime('2005-05-05'); - $event->progress = \mt_rand(0, 100); + $event->start = new \DateTime('2000-05-05'); + $event->end = new \DateTime('2005-05-05'); + $event->progress = \mt_rand(0, 100); $event->setProgressType(\mt_rand(0, 4)); $money = new Money(); $money->setString('1.23'); - $event->costs = $money; - $event->budget = $money; + $event->costs = $money; + $event->budget = $money; $event->earnings = $money; $id = EventMapper::create($event); diff --git a/tests/Models/EventTest.php b/tests/Models/EventTest.php index 5071695..5cae111 100755 --- a/tests/Models/EventTest.php +++ b/tests/Models/EventTest.php @@ -17,8 +17,8 @@ namespace Modules\EventManagement\tests\Models; use Modules\EventManagement\Models\Event; use Modules\EventManagement\Models\EventType; use Modules\EventManagement\Models\ProgressType; -use Modules\Tasks\Models\Task; use Modules\Media\Models\Media; +use Modules\Tasks\Models\Task; use phpOMS\Localization\Money; /** @@ -172,10 +172,10 @@ final class EventTest extends \PHPUnit\Framework\TestCase */ public function testSerialize() : void { - $this->event->name = 'Name'; + $this->event->name = 'Name'; $this->event->description = 'Description'; - $this->event->start = new \DateTime(); - $this->event->end = new \DateTime(); + $this->event->start = new \DateTime(); + $this->event->end = new \DateTime(); $this->event->setType(EventType::SEMINAR); $this->event->progress = 10; $this->event->setProgressType(ProgressType::TASKS); @@ -186,18 +186,18 @@ final class EventTest extends \PHPUnit\Framework\TestCase self::assertEquals( [ - 'id' => 0, - 'type' => EventType::SEMINAR, - 'start' => $this->event->start, - 'end' => $this->event->end, - 'name' => 'Name', - 'description' => 'Description', - 'costs' => new Money(), - 'budget' => new Money(), - 'earnings' => new Money(), - 'tasks' => [], - 'media' => [], - 'progress' => 10, + 'id' => 0, + 'type' => EventType::SEMINAR, + 'start' => $this->event->start, + 'end' => $this->event->end, + 'name' => 'Name', + 'description' => 'Description', + 'costs' => new Money(), + 'budget' => new Money(), + 'earnings' => new Money(), + 'tasks' => [], + 'media' => [], + 'progress' => 10, 'progressType' => ProgressType::TASKS, ], $serialized