diff --git a/public/main/inc/lib/ScheduledAnnouncement.php b/public/main/inc/lib/ScheduledAnnouncement.php
index 44b9d7ee95..985597f665 100644
--- a/public/main/inc/lib/ScheduledAnnouncement.php
+++ b/public/main/inc/lib/ScheduledAnnouncement.php
@@ -26,12 +26,7 @@ class ScheduledAnnouncement extends Model
         $this->table = 'scheduled_announcements';
     }
 
-    /**
-     * @param array $options
-     *
-     * @return array
-     */
-    public function get_all($options = [])
+    public function get_all(array $options = []): array
     {
         return Database::select(
             '*',
diff --git a/public/main/inc/lib/career.lib.php b/public/main/inc/lib/career.lib.php
index 2974f968f3..d67676e1d6 100644
--- a/public/main/inc/lib/career.lib.php
+++ b/public/main/inc/lib/career.lib.php
@@ -39,12 +39,7 @@ class Career extends Model
         return $row['count'];
     }
 
-    /**
-     * @param array $options
-     *
-     * @return array
-     */
-    public function get_all($options = [])
+    public function get_all(array $options = []): array
     {
         return Database::select(
             '*',
diff --git a/public/main/inc/lib/extra_field.lib.php b/public/main/inc/lib/extra_field.lib.php
index 3758aee55c..044346a612 100644
--- a/public/main/inc/lib/extra_field.lib.php
+++ b/public/main/inc/lib/extra_field.lib.php
@@ -882,14 +882,15 @@ class ExtraField extends Model
     /**
      * Get an array of all the values from the extra_field and extra_field_options tables
      * based on the current object's type.
-     *
-     * @param array $options
-     * @param null  $order_field_options_by
-     *
-     * @return array
      */
-    public function get_all($options = [], $order_field_options_by = null)
+    public function get_all(array $options = []): array
     {
+        $order_field_options_by = null;
+
+        if (func_num_args() > 1) {
+            $order_field_options_by = func_get_arg(1);
+        }
+
         $options = Database::parse_conditions(['where' => $options]);
 
         if (empty($options)) {
diff --git a/public/main/inc/lib/extra_field_option.lib.php b/public/main/inc/lib/extra_field_option.lib.php
index 6a155d5168..e764dac2ef 100644
--- a/public/main/inc/lib/extra_field_option.lib.php
+++ b/public/main/inc/lib/extra_field_option.lib.php
@@ -867,12 +867,7 @@ class ExtraFieldOption extends Model
         return $info;
     }
 
-    /**
-     * @param null $options
-     *
-     * @return array
-     */
-    public function get_all($options = null)
+    public function get_all(array $options = []): array
     {
         $result = parent::get_all($options);
 
diff --git a/public/main/inc/lib/grade_model.lib.php b/public/main/inc/lib/grade_model.lib.php
index af5e70ea04..dff90db09d 100644
--- a/public/main/inc/lib/grade_model.lib.php
+++ b/public/main/inc/lib/grade_model.lib.php
@@ -18,12 +18,7 @@ class GradeModel extends Model
         $this->table = Database::get_main_table(TABLE_GRADE_MODEL);
     }
 
-    /**
-     * @param array $options
-     *
-     * @return array
-     */
-    public function get_all($options = [])
+    public function get_all(array $options = []): array
     {
         return Database::select(
             '*',
diff --git a/public/main/inc/lib/gradebook.lib.php b/public/main/inc/lib/gradebook.lib.php
index 9a2d5f4a41..ca3bab2cca 100644
--- a/public/main/inc/lib/gradebook.lib.php
+++ b/public/main/inc/lib/gradebook.lib.php
@@ -71,12 +71,7 @@ class Gradebook extends Model
         return '1' == $item['visibility'];
     }
 
-    /**
-     * @param array $options
-     *
-     * @return array
-     */
-    public function get_all($options = [])
+    public function get_all(array $options = []): array
     {
         $gradebooks = parent::get_all($options);
         foreach ($gradebooks as &$gradebook) {
diff --git a/public/main/inc/lib/model.lib.php b/public/main/inc/lib/model.lib.php
index 4850396fd2..6568d16d50 100644
--- a/public/main/inc/lib/model.lib.php
+++ b/public/main/inc/lib/model.lib.php
@@ -100,12 +100,7 @@ class Model
         );
     }
 
-    /**
-     * @param array $options
-     *
-     * @return array
-     */
-    public function get_all($options = null)
+    public function get_all(array $options = []): array
     {
         return Database::select('*', $this->table, $options);
     }