From 53fa3aa631f8f6ad32dc03d768b72cad80eecccd Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 17 Aug 2019 14:14:51 +0200 Subject: [PATCH] fix after change to php 7.4 --- Models/Calendar.php | 10 +++++----- Models/Event.php | 20 ++++++++++---------- Models/EventTemplate.php | 2 +- Models/Schedule.php | 24 ++++++++++++------------ 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Models/Calendar.php b/Models/Calendar.php index 06db5dd..16fd49c 100644 --- a/Models/Calendar.php +++ b/Models/Calendar.php @@ -33,7 +33,7 @@ class Calendar * @var int * @since 1.0.0 */ - private $id = 0; + private int $id = 0; /** * Name. @@ -41,7 +41,7 @@ class Calendar * @var string * @since 1.0.0 */ - private $name = ''; + private string $name = ''; /** * Description. @@ -49,7 +49,7 @@ class Calendar * @var string * @since 1.0.0 */ - private $description = ''; + private string $description = ''; /** * Created at. @@ -57,7 +57,7 @@ class Calendar * @var null|\DateTime * @since 1.0.0 */ - private $createdAt = null; + private ?\DateTime $createdAt = null; /** * Current date of the calendar. @@ -65,7 +65,7 @@ class Calendar * @var null|\DateTime * @since 1.0.0 */ - private $date = null; + private ?\DateTime $date = null; /** * Events. diff --git a/Models/Event.php b/Models/Event.php index 5771dba..b9d730a 100644 --- a/Models/Event.php +++ b/Models/Event.php @@ -35,7 +35,7 @@ class Event * @var int * @since 1.0.0 */ - private $id = 0; + private int $id = 0; /** * Name. @@ -43,7 +43,7 @@ class Event * @var string * @since 1.0.0 */ - private $name = ''; + private string $name = ''; /** * Description. @@ -51,7 +51,7 @@ class Event * @var string * @since 1.0.0 */ - private $description = ''; + private string $description = ''; /** * Created. @@ -59,7 +59,7 @@ class Event * @var null|\DateTime * @since 1.0.0 */ - private $createdAt = null; + private ?\DateTime $createdAt = null; /** * Creator. @@ -77,7 +77,7 @@ class Event * @var int * @since 1.0.0 */ - private $type = EventType::SINGLE; + private int $type = EventType::SINGLE; /** * Event status. @@ -87,12 +87,12 @@ class Event * @var int * @since 1.0.0 */ - private $status = EventStatus::ACTIVE; + private int $status = EventStatus::ACTIVE; /** * Schedule * - * @var Schedule + * @var null|int|Schedule * @since 1.0.0 */ private $schedule = null; @@ -103,7 +103,7 @@ class Event * @var Location * @since 1.0.0 */ - private $location = null; + private ?Location $location = null; /** * Calendar @@ -119,7 +119,7 @@ class Event * @var array * @since 1.0.0 */ - private $people = []; + private array $people = []; /** * Constructor. @@ -258,7 +258,7 @@ class Event } /** - * @param int $createdBy Creator + * @param $createdBy Creator * * @since 1.0.0 */ diff --git a/Models/EventTemplate.php b/Models/EventTemplate.php index da36a2f..4d8d380 100644 --- a/Models/EventTemplate.php +++ b/Models/EventTemplate.php @@ -30,5 +30,5 @@ class EventTemplate extends Event * @var int * @since 1.0.0 */ - private $type = EventType::TEMPLATE; + private int $type = EventType::TEMPLATE; } diff --git a/Models/Schedule.php b/Models/Schedule.php index 0e3095f..41c3182 100644 --- a/Models/Schedule.php +++ b/Models/Schedule.php @@ -32,7 +32,7 @@ class Schedule * @var int * @since 1.0.0 */ - private $id = 0; + private int $id = 0; /** * Calendar uid. @@ -40,7 +40,7 @@ class Schedule * @var string * @since 1.0.0 */ - private $uid = ''; + private string $uid = ''; /** * Schedule status. @@ -48,7 +48,7 @@ class Schedule * @var int * @since 1.0.0 */ - private $status = ScheduleStatus::ACTIVE; + private int $status = ScheduleStatus::ACTIVE; /** * Frequency type. @@ -56,7 +56,7 @@ class Schedule * @var int * @since 1.0.0 */ - private $freqType = FrequencyType::ONCE; + private int $freqType = FrequencyType::ONCE; /** * Frequency interval. @@ -64,7 +64,7 @@ class Schedule * @var int * @since 1.0.0 */ - private $freqInterval = FrequencyInterval::DAY; + private int $freqInterval = FrequencyInterval::DAY; /** * Frequency relative. @@ -72,7 +72,7 @@ class Schedule * @var int * @since 1.0.0 */ - private $relativeInternal = FrequencyRelative::FIRST; + private int $relativeInternal = FrequencyRelative::FIRST; /** * Interval type. @@ -80,7 +80,7 @@ class Schedule * @var int * @since 1.0.0 */ - private $intervalType = IntervalType::ABSOLUTE; + private int $intervalType = IntervalType::ABSOLUTE; /** * Recurrence factor. @@ -88,7 +88,7 @@ class Schedule * @var int * @since 1.0.0 */ - private $recurrenceFactor = 0; + private int $recurrenceFactor = 0; /** * Start. @@ -96,7 +96,7 @@ class Schedule * @var null|\DateTime * @since 1.0.0 */ - private $start = null; + private ?\DateTime $start = null; /** * Duration. @@ -104,7 +104,7 @@ class Schedule * @var int * @since 1.0.0 */ - private $duration = 3600; + private int $duration = 3600; /** * End. @@ -112,7 +112,7 @@ class Schedule * @var null|\DateTime * @since 1.0.0 */ - private $end = null; + private ?\DateTime $end = null; /** * Created at. @@ -120,7 +120,7 @@ class Schedule * @var null|\DateTime * @since 1.0.0 */ - private $createdAt = null; + private ?\DateTime $createdAt = null; /** * Created by.