* more strict function definitions

3 files changed, 13 insertions, 13 deletions

diff --git a/app/frontend/facades/CalendarFacade.php b/app/frontend/facades/CalendarFacade.php
index 5a68f0a..3b4ec7e 100644
--- a/app/frontend/facades/CalendarFacade.php
+++ b/app/frontend/facades/CalendarFacade.php
@@ -15,7 +15,7 @@ class CalendarFacade extends Facade {
     private function _getCategoriesForCalendars(array $calendars) {
         return Category::finder()->findAllByPks(
             array_map(
-                function($calendar) {
+                function(Calendar $calendar) {
                     return $calendar->CategoryID;
                 },
                 $calendars
@@ -43,7 +43,7 @@ class CalendarFacade extends Facade {
         $calendars = $this->getCalendarPreference($user);
         if ($calendars) {
             $categories = array_map(
-                function($category) use($calendars) {
+                function(Category $category) use($calendars) {
                     $dto = new CalendarGroupDTO();
                     $dto->loadRecord($category, $calendars);
                     return $dto;
@@ -60,7 +60,7 @@ class CalendarFacade extends Facade {
         return in_array(
             $calendarID,
             array_map(
-                function($calendar) {
+                function(Calendar $calendar) {
                     return $calendar->UID;
                 },
                 $this->getCalendarPreference($user)
@@ -124,7 +124,7 @@ class CalendarFacade extends Facade {
                 $order
             );
             return array_map(
-                function($event) use($calendar) {
+                function(Entry $event) use($calendar) {
                     $dto = new EventDTO();
                     $dto->loadRecord($event, $calendar);
                     return $dto;
@@ -145,7 +145,7 @@ class CalendarFacade extends Facade {
 
     public function getCategories() {
         $categories = array_map(
-            function($record) {
+            function(Category $record) {
                 $dto = new CalendarGroupDTO();
                 $dto->loadRecord($record, []);
                 return $dto;
diff --git a/app/frontend/facades/EventFacade.php b/app/frontend/facades/EventFacade.php
index 79ca363..454f522 100644
--- a/app/frontend/facades/EventFacade.php
+++ b/app/frontend/facades/EventFacade.php
@@ -21,7 +21,7 @@ class EventFacade extends Facade {
                 implode(
                     ',',
                     array_map(
-                        function($calendar) {
+                        function(Calendar $calendar) {
                             return $this->quoteString($calendar->UID);
                         },
                         $calendars
@@ -44,7 +44,7 @@ class EventFacade extends Facade {
                                           TimezoneDTO $tz,
                                           string $class = 'Application.dto.EventDTO') {
         return array_map(
-            function($event) use($calendars, $class, $tz) {
+            function(Entry $event) use($calendars, $class, $tz) {
                 $dto = Prado::createComponent($class, $tz);
                 $dto->loadRecord($event, $calendars);
                 return $dto;
@@ -105,7 +105,7 @@ class EventFacade extends Facade {
         if ($events) {
             return Calendar::finder()->findAllByPks(
                 array_map(
-                    function($event) {
+                    function(Entry $event) {
                         return $event->CalendarID;
                     },
                     $events
diff --git a/app/frontend/facades/Facade.php b/app/frontend/facades/Facade.php
index 346024a..8317822 100644
--- a/app/frontend/facades/Facade.php
+++ b/app/frontend/facades/Facade.php
@@ -31,19 +31,19 @@ class Facade {
         return $this->_sqlMap;
     }
 
-    protected function quoteString($string) {
+    protected function quoteString(string $string) {
         return $this->getClient()->DbConnection->quoteString($string);
     }
 
-    protected function fetch($sqlMap, $params) {
+    protected function fetch(string $sqlMap, array $params) {
         return $this->getClient()->queryForObject($sqlMap, $params);
     }
 
-    protected function fetchList($sqlMap, $params) {
+    protected function fetchList(string $sqlMap, array $params) {
         return $this->getClient()->queryForList($sqlMap, $params);
     }
 
-    protected function fetchMap($sqlMap, $params, $key, $value=NULL) {
+    protected function fetchMap(string $sqlMap, array $params, string $key, $value=NULL) {
         return $this->getClient()->queryForMap($sqlMap, $params, $key, $value);
     }
 
@@ -51,7 +51,7 @@ class Facade {
         return $this->getClient()->DbConnection->beginTransaction();
     }
 
-    protected function raiseEvent($event, ...$params) {
+    protected function raiseEvent(string $event, ...$params) {
         return Prado::getApplication()->getModule('events')->raiseApplicationEvent(
             $event, ...$params
         );