remove some getter/setter

This commit is contained in:
Dennis Eichhorn 2020-11-24 17:31:19 +01:00
parent 905b58f923
commit 0422c2cd87
7 changed files with 41 additions and 167 deletions

View File

@ -40,7 +40,7 @@ class Calendar
* @var string
* @since 1.0.0
*/
private string $name = '';
public string $name = '';
/**
* Description.
@ -48,7 +48,7 @@ class Calendar
* @var string
* @since 1.0.0
*/
private string $description = '';
public string $description = '';
/**
* Created at.
@ -56,7 +56,7 @@ class Calendar
* @var \DateTimeImmutable
* @since 1.0.0
*/
private \DateTimeImmutable $createdAt;
public \DateTimeImmutable $createdAt;
/**
* Current date of the calendar.
@ -95,48 +95,6 @@ class Calendar
return $this->id;
}
/**
* @return string
*
* @since 1.0.0
*/
public function getName() : string
{
return $this->name;
}
/**
* @param string $name Calendar name/title
*
* @since 1.0.0
*/
public function setName(string $name) : void
{
$this->name = $name;
}
/**
* @return string
*
* @since 1.0.0
*/
public function getDescription() : string
{
return $this->description;
}
/**
* @param string $desc Calendar description
*
* @return void
*
* @since 1.0.0
*/
public function setDescription(string $desc) : void
{
$this->description = $desc;
}
/**
* @param Event $event Calendar event
*
@ -195,16 +153,6 @@ class Calendar
return $this->events[$id] ?? new NullEvent();
}
/**
* @return \DateTimeImmutable
*
* @since 1.0.0
*/
public function getCreatedAt() : \DateTimeImmutable
{
return $this->createdAt;
}
/**
* Get current date
*
@ -242,7 +190,7 @@ class Calendar
{
$events = [];
foreach ($this->events as $event) {
if ($event->getCreatedAt()->format('Y-m-d') === $date->format('Y-m-d')) {
if ($event->createdAt->format('Y-m-d') === $date->format('Y-m-d')) {
$events[] = $event;
}
}
@ -262,7 +210,7 @@ class Calendar
public function hasEventOnDate(\DateTime $date) : bool
{
foreach ($this->events as $event) {
if ($event->getCreatedAt()->format('Y-m-d') === $date->format('Y-m-d')) {
if ($event->createdAt->format('Y-m-d') === $date->format('Y-m-d')) {
return true;
}
}

View File

@ -42,7 +42,7 @@ class Event
* @var string
* @since 1.0.0
*/
private string $name = '';
public string $name = '';
/**
* Description.
@ -50,7 +50,7 @@ class Event
* @var string
* @since 1.0.0
*/
private string $description = '';
public string $description = '';
/**
* Created.
@ -58,7 +58,7 @@ class Event
* @var \DateTimeImmutable
* @since 1.0.0
*/
private \DateTimeImmutable $createdAt;
public \DateTimeImmutable $createdAt;
/**
* Creator.
@ -143,16 +143,6 @@ class Event
return $this->id;
}
/**
* @return string
*
* @since 1.0.0
*/
public function getName() : string
{
return $this->name;
}
/**
* @return Account[]
*
@ -207,46 +197,6 @@ class Event
return false;
}
/**
* @param string $name Event name/title
*
* @since 1.0.0
*/
public function setName(string $name) : void
{
$this->name = $name;
}
/**
* @return string
*
* @since 1.0.0
*/
public function getDescription() : string
{
return $this->description;
}
/**
* @param string $desc Event description
*
* @since 1.0.0
*/
public function setDescription(string $desc) : void
{
$this->description = $desc;
}
/**
* @return \DateTimeImmutable
*
* @since 1.0.0
*/
public function getCreatedAt() : \DateTimeImmutable
{
return $this->createdAt;
}
/**
* @return Account
*
@ -271,7 +221,7 @@ class Event
$this->createdBy = $createdBy;
if ($this->schedule instanceof Schedule) {
$this->schedule->setCreatedBy($this->createdBy);
$this->schedule->createdBy = $this->createdBy;
}
}

View File

@ -122,7 +122,7 @@ class Schedule
* @var \DateTimeImmutable
* @since 1.0.0
*/
private \DateTimeImmutable $createdAt;
public \DateTimeImmutable $createdAt;
/**
* Created by.
@ -130,7 +130,7 @@ class Schedule
* @var Account
* @since 1.0.0
*/
private Account $createdBy;
public Account $createdBy;
/**
* Constructor.
@ -395,28 +395,4 @@ class Schedule
return $this;
}
/**
* @param Account $creator Creator
*
* @return $this
*
* @since 1.0.0
*/
public function setCreatedBy(Account $creator) : self
{
$this->createdBy = $creator;
return $this;
}
/**
* @return Account
*
* @since 1.0.0
*/
public function getCreatedBy() : Account
{
return $this->createdBy;
}
}

View File

@ -32,21 +32,21 @@ class CalendarMapperTest extends \PHPUnit\Framework\TestCase
{
$calendar = new Calendar();
$calendar->setName('Title');
$calendar->setDescription('Description');
$calendar->name = 'Title';
$calendar->description = 'Description';
$calendarEvent1 = new Event();
$calendarEvent1->setName('Running test');
$calendarEvent1->setDescription('Desc1');
$calendarEvent1->name = 'Running test';
$calendarEvent1->description = 'Desc1';
$calendarEvent1->setCreatedBy(new NullAccount(1));
$calendarEvent1->getSchedule()->setCreatedBy(new NullAccount(1));
$calendarEvent1->getSchedule()->createdBy = new NullAccount(1);
$calendar->addEvent($calendarEvent1);
$calendarEvent2 = new Event();
$calendarEvent2->setName('Running test2');
$calendarEvent2->setDescription('Desc2');
$calendarEvent2->name = 'Running test2';
$calendarEvent2->description = 'Desc2';
$calendarEvent2->setCreatedBy(new NullAccount(1));
$calendarEvent2->getSchedule()->setCreatedBy(new NullAccount(1));
$calendarEvent2->getSchedule()->createdBy = new NullAccount(1);
$calendar->addEvent($calendarEvent2);
$id = CalendarMapper::create($calendar);
@ -54,13 +54,13 @@ class CalendarMapperTest extends \PHPUnit\Framework\TestCase
self::assertEquals($id, $calendar->getId());
$calendarR = CalendarMapper::get($calendar->getId());
self::assertEquals($calendar->getCreatedAt()->format('Y-m-d'), $calendarR->getCreatedAt()->format('Y-m-d'));
self::assertEquals($calendar->getDescription(), $calendarR->getDescription());
self::assertEquals($calendar->getName(), $calendarR->getName());
self::assertEquals($calendar->createdAt->format('Y-m-d'), $calendarR->createdAt->format('Y-m-d'));
self::assertEquals($calendar->description, $calendarR->description);
self::assertEquals($calendar->name, $calendarR->name);
$expected = $calendar->getEvents();
$actual = $calendarR->getEvents();
self::assertEquals(\end($expected)->getDescription(), \end($actual)->getDescription());
self::assertEquals(\end($expected)->description, \end($actual)->description);
}
}

View File

@ -31,10 +31,10 @@ class CalendarTest extends \PHPUnit\Framework\TestCase
$calendar = new Calendar();
self::assertEquals(0, $calendar->getId());
self::assertEquals('', $calendar->getName());
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $calendar->getCreatedAt()->format('Y-m-d'));
self::assertEquals('', $calendar->name);
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $calendar->createdAt->format('Y-m-d'));
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $calendar->getDate()->format('Y-m-d'));
self::assertEquals('', $calendar->getDescription());
self::assertEquals('', $calendar->description);
self::assertEquals([], $calendar->getEvents());
self::assertInstanceOf('\Modules\Calendar\Models\NullEvent', $calendar->getEvent(0));
self::assertFalse($calendar->hasEventOnDate(new \DateTime('now')));
@ -52,11 +52,11 @@ class CalendarTest extends \PHPUnit\Framework\TestCase
$calendar->setDate($date = new \DateTime('2000-05-05'));
self::assertEquals($date->format('Y-m-d'), $calendar->getDate()->format('Y-m-d'));
$calendar->setName('Title');
self::assertEquals('Title', $calendar->getName());
$calendar->name = 'Title';
self::assertEquals('Title', $calendar->name );
$calendar->setDescription('Description');
self::assertEquals('Description', $calendar->getDescription());
$calendar->description = 'Description';
self::assertEquals('Description', $calendar->description);
$id = [];
$id[] = $calendar->addEvent(new Event());

View File

@ -31,10 +31,10 @@ class EventMapperTest extends \PHPUnit\Framework\TestCase
{
$calendarEvent1 = new Event();
$calendarEvent1->setName('Running test');
$calendarEvent1->setDescription('Desc1');
$calendarEvent1->name = 'Running test';
$calendarEvent1->description = 'Desc1';
$calendarEvent1->setCreatedBy(new NullAccount(1));
$calendarEvent1->getSchedule()->setCreatedBy(new NullAccount(1));
$calendarEvent1->getSchedule()->createdBy = new NullAccount(1);
$calendarEvent1->setCalendar(1);
$id = EventMapper::create($calendarEvent1);
@ -43,6 +43,6 @@ class EventMapperTest extends \PHPUnit\Framework\TestCase
$eventR = EventMapper::get($calendarEvent1->getId());
self::assertEquals($calendarEvent1->getCreatedBy()->getId(), $eventR->getCreatedBy()->getId());
self::assertEquals($calendarEvent1->getDescription(), $eventR->getDescription());
self::assertEquals($calendarEvent1->description, $eventR->description);
}
}

View File

@ -33,9 +33,9 @@ class EventTest extends \PHPUnit\Framework\TestCase
self::assertEquals(0, $event->getId());
self::assertEquals(0, $event->getCreatedBy()->getId());
self::assertEquals('', $event->getName());
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $event->getCreatedAt()->format('Y-m-d'));
self::assertEquals('', $event->getDescription());
self::assertEquals('', $event->name);
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $event->createdAt->format('Y-m-d'));
self::assertEquals('', $event->description);
self::assertEquals([], $event->getPeople());
self::assertInstanceOf('\Modules\Admin\Models\NullAccount', $event->getPerson(1));
self::assertInstanceOf('\phpOMS\Stdlib\Base\Location', $event->getLocation());
@ -52,11 +52,11 @@ class EventTest extends \PHPUnit\Framework\TestCase
$event->setCreatedBy(new NullAccount(1));
self::assertEquals(1, $event->getCreatedBy()->getId());
$event->setName('Name');
self::assertEquals('Name', $event->getName());
$event->name = 'Name';
self::assertEquals('Name', $event->name);
$event->setDescription('Description');
self::assertEquals('Description', $event->getDescription());
$event->description = 'Description';
self::assertEquals('Description', $event->description);
$event->addPerson(new Account());
$event->addPerson(new Account());