* type hinting wherever it's possible

3 files changed, 16 insertions, 13 deletions

diff --git a/app/php/facades/CalendarFacade.php b/app/php/facades/CalendarFacade.php
index 5f24e28..48dda8e 100644
--- a/app/php/facades/CalendarFacade.php
+++ b/app/php/facades/CalendarFacade.php
@@ -96,7 +96,7 @@ class CalendarFacade extends Facade {
         $preference->save();
     }
 
-    public function setPreferredCalendars(User $user, $calendars) {
+    public function setPreferredCalendars(User $user, array $calendars) {
         //TODO: remove old preference, optionally
         $transaction = $this->beginTransaction();
         try {
@@ -113,7 +113,7 @@ class CalendarFacade extends Facade {
     public function getEventsForTimeframe(CalendarDTO $calendar,
                                           DateTime $dateFrom,
                                           DateTime $dateTo,
-                                          $order = 'ASC') {
+                                          string $order = 'ASC') {
         $calendar = Calendar::finder()->findAllByUID($calendar->ID);
         if ($calendar) {
             $events = EventFacade::getInstance()->getEventList(
@@ -164,7 +164,7 @@ class CalendarFacade extends Facade {
     }
 
     private $_urlCache = [];
-    private function _fillUrlCache($record) {
+    private function _fillUrlCache(Calendar $record = NULL) {
         if ($record && $record->CustomUrl
             && !isset($this->_urlCache[$record->CustomUrl])) {
             $dto = new CalendarDTO();
@@ -177,7 +177,7 @@ class CalendarFacade extends Facade {
         }
     }
 
-    public function resolveUrl($url) {
+    public function resolveUrl(string $url = NULL) {
         if ($url) {
             if (isset($this->_urlCache[$url])) {
                 return $this->_urlCache[$url];
diff --git a/app/php/facades/EventFacade.php b/app/php/facades/EventFacade.php
index 08133bc..6c51716 100644
--- a/app/php/facades/EventFacade.php
+++ b/app/php/facades/EventFacade.php
@@ -2,13 +2,16 @@
 
 Prado::using('Application.facades.Facade');
 Prado::using('Application.dto.EventDTO');
+Prado::using('Application.dto.GridEventDTO');
+Prado::using('Application.dto.CalendarGridDTO');
 Prado::using('Application.model.Calendar');
 Prado::using('Application.facades.CalendarFacade');
 Prado::using('Application.user.DbUser');
 
 class EventFacade extends Facade {
 
-    public function getEventList($dateFrom=NULL, $dateTo=NULL, $calendars=NULL, $order='ASC') {
+    public function getEventList(string $dateFrom=NULL, string $dateTo=NULL,
+                                 array $calendars=NULL, string $order='ASC') {
         $calendarClause = '1=1';
         if ($calendars) {
             $calendarClause = sprintf(
diff --git a/app/php/facades/UserFacade.php b/app/php/facades/UserFacade.php
index 69d634a..3fbd62d 100644
--- a/app/php/facades/UserFacade.php
+++ b/app/php/facades/UserFacade.php
@@ -7,15 +7,15 @@ Prado::using('Application.dto.TimezoneDTO');
 
 class UserFacade extends Facade {
 
-    public function findByLogin($login) {
+    public function findByLogin(string $login) {
         return User::finder()->findByLogin($login);
     }
 
-    public function checkForUsername($login) {
+    public function checkForUsername(string $login) {
         return !User::finder()->count('login = ?', $login);
     }
 
-    public function registerUser($login, $password, $admin) {
+    public function registerUser(string $login, string $password, bool $admin) {
         $transaction = $this->beginTransaction();
         try {
             $newUser = new User();
@@ -32,27 +32,27 @@ class UserFacade extends Facade {
         }
     }
 
-    public function changePassword(DbUser $user, $pass) {
+    public function changePassword(DbUser $user, string $pass) {
         if (!$user->IsGuest) {
             $user->DbRecord->Password = $this->generatePassword($pass);
             $user->DbRecord->save();
         }
     }
 
-    public function verifyUserPassword($password, DbUser $user) {
+    public function verifyUserPassword(string $password, DbUser $user) {
         $dbPassword = $user->IsGuest ? '' : $user->DbRecord->Password;
         return $this->verifyPassword($password, $dbPassword);
     }
 
-    public function generatePassword($password) {
+    public function generatePassword(string $password) {
         return password_hash($password, PASSWORD_DEFAULT);
     }
 
-    public function verifyPassword($password, $dbPassword) {
+    public function verifyPassword(string $password, string $dbPassword) {
         return password_verify($password, $dbPassword);
     }
 
-    public function setTimezonePreference(DbUser $user, $timezone) {
+    public function setTimezonePreference(DbUser $user, string $timezone) {
         if ($user->IsGuest) {
             throw new TInvalidDataException(
                 'Timezone preference change impossible for guest user'