From bf290b7fcc460061e3971313efcffa35722bda25 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/Calendar.php | 6 +++--- Models/Event.php | 20 ++++++++++---------- Models/NullCalendar.php | 2 +- Models/NullEvent.php | 2 +- Models/NullSchedule.php | 2 +- Models/Schedule.php | 16 ++++++++-------- tests/Bootstrap.php | 2 +- tests/Models/CalendarTest.php | 12 ++++++------ tests/Models/EventMapperTest.php | 2 +- tests/Models/EventTest.php | 16 ++++++++-------- tests/Models/ScheduleTest.php | 20 +++++++++----------- 11 files changed, 49 insertions(+), 51 deletions(-) diff --git a/Models/Calendar.php b/Models/Calendar.php index 71acbb6..6301b77 100755 --- a/Models/Calendar.php +++ b/Models/Calendar.php @@ -200,10 +200,10 @@ class Calendar public function toArray() : array { return [ - 'id' => $this->id, - 'name' => $this->name, + 'id' => $this->id, + 'name' => $this->name, 'description' => $this->description, - 'createdAt' => $this->createdAt, + 'createdAt' => $this->createdAt, ]; } diff --git a/Models/Event.php b/Models/Event.php index 42dd156..79c84a0 100755 --- a/Models/Event.php +++ b/Models/Event.php @@ -356,17 +356,17 @@ class Event public function toArray() : array { return [ - 'id' => $this->id, - 'name' => $this->name, + 'id' => $this->id, + 'name' => $this->name, 'description' => $this->description, - 'type' => $this->type, - 'status' => $this->status, - 'schedule' => $this->schedule, - 'location' => $this->location, - 'calendar' => $this->calendar, - 'people' => $this->people, - 'tags' => $this->tags, - 'createdAt' => $this->createdAt, + 'type' => $this->type, + 'status' => $this->status, + 'schedule' => $this->schedule, + 'location' => $this->location, + 'calendar' => $this->calendar, + 'people' => $this->people, + 'tags' => $this->tags, + 'createdAt' => $this->createdAt, ]; } diff --git a/Models/NullCalendar.php b/Models/NullCalendar.php index 651fa35..a2ed399 100755 --- a/Models/NullCalendar.php +++ b/Models/NullCalendar.php @@ -24,7 +24,7 @@ namespace Modules\Calendar\Models; */ final class NullCalendar extends Calendar { - /** + /** * Constructor * * @param int $id Model id diff --git a/Models/NullEvent.php b/Models/NullEvent.php index 3b9dd66..bf350f2 100755 --- a/Models/NullEvent.php +++ b/Models/NullEvent.php @@ -24,7 +24,7 @@ namespace Modules\Calendar\Models; */ final class NullEvent extends Event { - /** + /** * Constructor * * @param int $id Model id diff --git a/Models/NullSchedule.php b/Models/NullSchedule.php index 2cb4fc2..65e2bed 100755 --- a/Models/NullSchedule.php +++ b/Models/NullSchedule.php @@ -24,7 +24,7 @@ namespace Modules\Calendar\Models; */ final class NullSchedule extends Schedule { - /** + /** * Constructor * * @param int $id Model id diff --git a/Models/Schedule.php b/Models/Schedule.php index 3ce3e25..ca5883a 100755 --- a/Models/Schedule.php +++ b/Models/Schedule.php @@ -302,16 +302,16 @@ class Schedule public function toArray() : array { return [ - 'id' => $this->id, - 'uuid' => $this->uid, - 'status' => $this->status, - 'freqType' => $this->freqType, - 'freqInterval' => $this->freqInterval, + 'id' => $this->id, + 'uuid' => $this->uid, + 'status' => $this->status, + 'freqType' => $this->freqType, + 'freqInterval' => $this->freqInterval, 'relativeInternal' => $this->relativeInternal, - 'intervalType' => $this->intervalType, + 'intervalType' => $this->intervalType, 'recurrenceFactor' => $this->recurrenceFactor, - 'start' => $this->start, - 'createdAt' => $this->createdAt, + 'start' => $this->start, + '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/CalendarTest.php b/tests/Models/CalendarTest.php index 8f21e49..2c20f3e 100755 --- a/tests/Models/CalendarTest.php +++ b/tests/Models/CalendarTest.php @@ -116,7 +116,7 @@ final class CalendarTest extends \PHPUnit\Framework\TestCase */ public function testHasEventOnDate() : void { - $event = new Event(); + $event = new Event(); $event->schedule->start = new \DateTime('2005-10-09'); $this->calendar->addEvent($event); @@ -130,8 +130,8 @@ final class CalendarTest extends \PHPUnit\Framework\TestCase */ public function testGetEventsOnDate() : void { - $event = new Event(); - $event->name = 'Test'; + $event = new Event(); + $event->name = 'Test'; $event->schedule->start = new \DateTime('2005-10-09'); $this->calendar->addEvent($event); @@ -145,7 +145,7 @@ final class CalendarTest extends \PHPUnit\Framework\TestCase */ public function testSerialize() : void { - $this->calendar->name = 'Name'; + $this->calendar->name = 'Name'; $this->calendar->description = 'Description'; $serialized = $this->calendar->jsonSerialize(); @@ -153,8 +153,8 @@ final class CalendarTest extends \PHPUnit\Framework\TestCase self::assertEquals( [ - 'id' => 0, - 'name' => 'Name', + 'id' => 0, + 'name' => 'Name', 'description' => 'Description', ], $serialized diff --git a/tests/Models/EventMapperTest.php b/tests/Models/EventMapperTest.php index cf12e49..80d741a 100755 --- a/tests/Models/EventMapperTest.php +++ b/tests/Models/EventMapperTest.php @@ -35,7 +35,7 @@ final class EventMapperTest extends \PHPUnit\Framework\TestCase $calendarEvent1->description = 'Desc1'; $calendarEvent1->setCreatedBy(new NullAccount(1)); $calendarEvent1->schedule->createdBy = new NullAccount(1); - $calendarEvent1->calendar = 1; + $calendarEvent1->calendar = 1; $id = EventMapper::create($calendarEvent1); self::assertGreaterThan(0, $calendarEvent1->getId()); diff --git a/tests/Models/EventTest.php b/tests/Models/EventTest.php index d07f283..ba67548 100755 --- a/tests/Models/EventTest.php +++ b/tests/Models/EventTest.php @@ -173,7 +173,7 @@ 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->setType(EventType::TEMPLATE); $this->event->setStatus(EventStatus::INACTIVE); @@ -185,14 +185,14 @@ final class EventTest extends \PHPUnit\Framework\TestCase self::assertEquals( [ - 'id' => 0, - 'name' => 'Name', + 'id' => 0, + 'name' => 'Name', 'description' => 'Description', - 'type' => EventType::TEMPLATE, - 'status' => EventStatus::INACTIVE, - 'calendar' => 0, - 'people' => [], - 'tags' => [], + 'type' => EventType::TEMPLATE, + 'status' => EventStatus::INACTIVE, + 'calendar' => 0, + 'people' => [], + 'tags' => [], ], $serialized ); diff --git a/tests/Models/ScheduleTest.php b/tests/Models/ScheduleTest.php index 88fec9d..4d9d6a7 100644 --- a/tests/Models/ScheduleTest.php +++ b/tests/Models/ScheduleTest.php @@ -14,14 +14,12 @@ declare(strict_types=1); namespace Modules\Calendar\tests\Models; -use Modules\Admin\Models\Account; -use Modules\Admin\Models\NullAccount; -use Modules\Calendar\Models\Schedule; -use Modules\Calendar\Models\ScheduleStatus; -use Modules\Calendar\Models\FrequencyType; use Modules\Calendar\Models\FrequencyInterval; use Modules\Calendar\Models\FrequencyRelative; +use Modules\Calendar\Models\FrequencyType; use Modules\Calendar\Models\IntervalType; +use Modules\Calendar\Models\Schedule; +use Modules\Calendar\Models\ScheduleStatus; /** * @internal @@ -171,13 +169,13 @@ final class ScheduleTest extends \PHPUnit\Framework\TestCase self::assertEquals( [ - 'id' => 0, - 'uuid' => '', - 'status' => ScheduleStatus::INACTIVE, - 'freqType' => FrequencyType::YEARLY, - 'freqInterval' => FrequencyInterval::DAY, + 'id' => 0, + 'uuid' => '', + 'status' => ScheduleStatus::INACTIVE, + 'freqType' => FrequencyType::YEARLY, + 'freqInterval' => FrequencyInterval::DAY, 'relativeInternal' => FrequencyRelative::LAST, - 'intervalType' => IntervalType::RELATIVE, + 'intervalType' => IntervalType::RELATIVE, 'recurrenceFactor' => 0, ], $serialized