Add some return values to functions

davide-casiraghi · Mar 21, 2020 · c06313f · c06313f
1 parent b942eb2
commit c06313f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/Models/Continent.php b/src/Models/Continent.php
@@ -28,7 +28,7 @@ class Continent extends Model
      *
      * @return \DavideCasiraghi\LaravelEventsCalendar\Models\Continent
      */
-    public static function getContinents()
+    public static function getContinents(): iterable
     {
         $seconds = 86400; // One day
         $ret = Cache::remember('continents_list', $seconds, function () {

diff --git a/src/Models/Country.php b/src/Models/Country.php
@@ -28,7 +28,7 @@ class Country extends Model
      *
      * @return \DavideCasiraghi\LaravelEventsCalendar\Models\Country
      */
-    public static function getCountries()
+    public static function getCountries(): iterable
     {
         $seconds = 86400; // One day
         $ret = Cache::remember('countries_list', $seconds, function () {
@@ -45,7 +45,7 @@ public static function getCountries()
      *
      * @return \DavideCasiraghi\LaravelEventsCalendar\Models\Country
      */
-    public static function getActiveCountries()
+    public static function getActiveCountries(): ?iterable
     {
         $seconds = 900; // 15 minutes
 
@@ -76,7 +76,7 @@ public static function getActiveCountries()
      *
      * @return \DavideCasiraghi\LaravelEventsCalendar\Models\Country
      */
-    public static function getActiveCountriesByContinent($continent_id)
+    public static function getActiveCountriesByContinent($continent_id): ?iterable
     {
         $activeCountries = self::getActiveCountries()->unique('name')->sortBy('name');
         $ret = $activeCountries->where('continent_id', $continent_id);
@@ -91,7 +91,7 @@ public static function getActiveCountriesByContinent($continent_id)
      *
      * @return \Illuminate\Support\Collection
      */
-    public static function getCountriesWithTeachers()
+    public static function getCountriesWithTeachers(): ?iterable
     {
         $ret = self::join('teachers', 'countries.id', '=', 'teachers.country_id')
                       ->orderBy('countries.name')->pluck('countries.name', 'countries.id');
@@ -123,7 +123,7 @@ public static function getCountriesWithTeachers()
      * @param int $countryId
      * @return string
      */
-    public static function getCountryName($countryId)
+    public static function getCountryName($countryId): string
     {
         $country = self::select('name')->where('id', $countryId)->get();
         $ret = $country[0]['name'];

diff --git a/src/Models/EventCategory.php b/src/Models/EventCategory.php
@@ -31,7 +31,7 @@ class EventCategory extends Model
      * @param  int  $categoryId
      * @return string
      */
-    public static function getCategoryName($categoryId)
+    public static function getCategoryName($categoryId): string
     {
         $ret = self::find($categoryId)->name;
 

diff --git a/src/Models/EventVenue.php b/src/Models/EventVenue.php
@@ -41,7 +41,7 @@ public function user()
      * @param int $venueId
      * @return string
      */
-    public static function getVenueName($venueId)
+    public static function getVenueName($venueId): string
     {
         $ret = self::find($venueId)->name;
 
@@ -56,7 +56,7 @@ public static function getVenueName($venueId)
      * @param int $venueId
      * @return bool
      */
-    public static function venueContainsEvents($venueId)
+    public static function venueContainsEvents($venueId): bool
     {
         $events = Event::where('venue_id', '=', $venueId)->first();
         if ($events === null) {

diff --git a/src/Models/Region.php b/src/Models/Region.php
@@ -31,7 +31,7 @@ class Region extends Model
      * @param  int  $regionId
      * @return string
      */
-    public static function getRegionName($regionId)
+    public static function getRegionName($regionId): string
     {
         $ret = self::find($regionId)->name;