make id public, organigram impl. media password/encryption, settings bug fix, Money->FloatInt change, ...

Models/Calendar.php

@@ -32,7 +32,7 @@ class Calendar
      * @var int
      * @since 1.0.0
      */
-    protected int $id = 0;
+    public int $id = 0;
 
     /**
      * Name.

Models/Event.php

@@ -36,7 +36,7 @@ class Event
      * @var int
      * @since 1.0.0
      */
-    protected int $id = 0;
+    public int $id = 0;
 
     /**
      * Name.
@@ -78,7 +78,7 @@ class Event
      * @var int
      * @since 1.0.0
      */
-    private int $type = EventType::SINGLE;
+    public int $type = EventType::SINGLE;
 
     /**
      * Event status.
@@ -88,7 +88,7 @@ class Event
      * @var int
      * @since 1.0.0
      */
-    private int $status = EventStatus::ACTIVE;
+    public int $status = EventStatus::ACTIVE;
 
     /**
      * Schedule
@@ -206,7 +206,7 @@ class Event
      */
     public function addPerson(Account $person) : void
     {
-        $this->people[$person->getId()] = $person;
+        $this->people[$person->id] = $person;
     }
 
     /**

Models/EventTemplate.php

@@ -30,7 +30,7 @@ class EventTemplate extends Event
      * @var int
      * @since 1.0.0
      */
-    private int $type = EventType::TEMPLATE;
+    public int $type = EventType::TEMPLATE;
 
     /**
      * Get event type.

Models/Schedule.php

@@ -34,7 +34,7 @@ class Schedule
      * @var int
      * @since 1.0.0
      */
-    protected int $id = 0;
+    public int $id = 0;
 
     /**
      * Calendar uid.
@@ -50,7 +50,7 @@ class Schedule
      * @var int
      * @since 1.0.0
      */
-    private int $status = ScheduleStatus::ACTIVE;
+    public int $status = ScheduleStatus::ACTIVE;
 
     /**
      * Frequency type.

Theme/Backend/calendar-dashboard.tpl.php

@@ -61,7 +61,7 @@ $calendar = $this->getData('calendar');
                             <?php
                             $events = $calendar->getEventsOnDate($current[$i * 7 + $j]);
                             foreach ($events as $event) : ?>
-                                <div id="event-tag-<?= $event->getId(); ?>" class="event">
+                                <div id="event-tag-<?= $event->id; ?>" class="event">
                         <div class="event-desc"><?= $this->printHtml($event->getName()); ?></div>
                         <div class="event-time">2:00pm to 5:00pm</div>
                                 </div>

tests/Models/CalendarMapperTest.php

@@ -50,10 +50,10 @@ final class CalendarMapperTest extends \PHPUnit\Framework\TestCase
         $calendar->addEvent($calendarEvent2);
 
         $id = CalendarMapper::create()->execute($calendar);
-        self::assertGreaterThan(0, $calendar->getId());
+        self::assertGreaterThan(0, $calendar->id);
-        self::assertEquals($id, $calendar->getId());
+        self::assertEquals($id, $calendar->id);
 
-        $calendarR = CalendarMapper::get()->with('events')->where('id', $calendar->getId())->execute();
+        $calendarR = CalendarMapper::get()->with('events')->where('id', $calendar->id)->execute();
         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);

tests/Models/CalendarTest.php

@@ -38,7 +38,7 @@ final class CalendarTest extends \PHPUnit\Framework\TestCase
      */
     public function testDefault() : void
     {
-        self::assertEquals(0, $this->calendar->getId());
+        self::assertEquals(0, $this->calendar->id);
         self::assertEquals('', $this->calendar->name);
         self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->calendar->createdAt->format('Y-m-d'));
         self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->calendar->date->format('Y-m-d'));
@@ -88,8 +88,8 @@ final class CalendarTest extends \PHPUnit\Framework\TestCase
         $id   = [];
         $id[] = $this->calendar->addEvent(new Event());
 
-        self::assertEquals(0, $this->calendar->getEvents()[0]->getId());
+        self::assertEquals(0, $this->calendar->getEvents()[0]->id);
-        self::assertEquals(0, $this->calendar->getEvent(0)->getId());
+        self::assertEquals(0, $this->calendar->getEvent(0)->id);
         self::assertInstanceOf('\Modules\Calendar\Models\Event', $this->calendar->getEvent(1));
     }
 

tests/Models/EventMapperTest.php

@@ -38,11 +38,11 @@ final class EventMapperTest extends \PHPUnit\Framework\TestCase
         $calendarEvent1->calendar            = 1;
 
         $id = EventMapper::create()->execute($calendarEvent1);
-        self::assertGreaterThan(0, $calendarEvent1->getId());
+        self::assertGreaterThan(0, $calendarEvent1->id);
-        self::assertEquals($id, $calendarEvent1->getId());
+        self::assertEquals($id, $calendarEvent1->id);
 
-        $eventR = EventMapper::get()->where('id', $calendarEvent1->getId())->execute();
+        $eventR = EventMapper::get()->where('id', $calendarEvent1->id)->execute();
-        self::assertEquals($calendarEvent1->getCreatedBy()->getId(), $eventR->getCreatedBy()->getId());
+        self::assertEquals($calendarEvent1->getCreatedBy()->id, $eventR->getCreatedBy()->id);
         self::assertEquals($calendarEvent1->description, $eventR->description);
     }
 }

tests/Models/EventTest.php

@@ -42,8 +42,8 @@ final class EventTest extends \PHPUnit\Framework\TestCase
      */
     public function testDefault() : void
     {
-        self::assertEquals(0, $this->event->getId());
+        self::assertEquals(0, $this->event->id);
-        self::assertEquals(0, $this->event->getCreatedBy()->getId());
+        self::assertEquals(0, $this->event->getCreatedBy()->id);
         self::assertEquals('', $this->event->name);
         self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->event->createdAt->format('Y-m-d'));
         self::assertEquals('', $this->event->description);
@@ -59,7 +59,7 @@ final class EventTest extends \PHPUnit\Framework\TestCase
     public function testCreatedByInputOutput() : void
     {
         $this->event->setCreatedBy(new NullAccount(1));
-        self::assertEquals(1, $this->event->getCreatedBy()->getId());
+        self::assertEquals(1, $this->event->getCreatedBy()->id);
     }
 
     /**

tests/Models/NullCalendarTest.php

@@ -37,6 +37,6 @@ final class NullCalendarTest extends \PHPUnit\Framework\TestCase
     public function testId() : void
     {
         $null = new NullCalendar(2);
-        self::assertEquals(2, $null->getId());
+        self::assertEquals(2, $null->id);
     }
 }

tests/Models/NullEventTest.php

@@ -37,6 +37,6 @@ final class NullEventTest extends \PHPUnit\Framework\TestCase
     public function testId() : void
     {
         $null = new NullEvent(2);
-        self::assertEquals(2, $null->getId());
+        self::assertEquals(2, $null->id);
     }
 }

tests/Models/NullScheduleTest.php

@@ -37,6 +37,6 @@ final class NullScheduleTest extends \PHPUnit\Framework\TestCase
     public function testId() : void
     {
         $null = new NullSchedule(2);
-        self::assertEquals(2, $null->getId());
+        self::assertEquals(2, $null->id);
     }
 }

tests/Models/ScheduleTest.php

@@ -42,7 +42,7 @@ final class ScheduleTest extends \PHPUnit\Framework\TestCase
      */
     public function testDefault() : void
     {
-        self::assertEquals(0, $this->schedule->getId());
+        self::assertEquals(0, $this->schedule->id);
         self::assertEquals(ScheduleStatus::ACTIVE, $this->schedule->getStatus());
         self::assertEquals(FrequencyType::ONCE, $this->schedule->getFreqType());
         self::assertEquals(IntervalType::ABSOLUTE, $this->schedule->getIntervalType());