Resolve errors with PHP 8.4, resolves#538.

Author: lucaboesch

classes/local/studentquiz_progress.php

@@ -53,16 +53,16 @@ class studentquiz_progress {
      * @param int $userid
      * @param int $studentquizid
      * @param int $sqqid
-     * @param int $lastanswercorrect
-     * @param int $attempts
-     * @param int $correctattempts
-     * @param int $lastreadprivatecomment
-     * @param int $lastreadpubliccomment
+     * @param int|null $lastanswercorrect
+     * @param int|null $attempts
+     * @param int|null $correctattempts
+     * @param int|null $lastreadprivatecomment
+     * @param int|null $lastreadpubliccomment
      * @param int|null $id
      */
-    public function __construct(int $questionid, int $userid, int $studentquizid, int $sqqid, int $lastanswercorrect = 0,
-        int $attempts = 0, int $correctattempts = 0, int $lastreadprivatecomment = 0, int $lastreadpubliccomment = 0,
-        int $id = null) {
+    public function __construct(int $questionid, int $userid, int $studentquizid, int $sqqid, ?int $lastanswercorrect = 0,
+        ?int $attempts = 0, ?int $correctattempts = 0, ?int $lastreadprivatecomment = 0, ?int $lastreadpubliccomment = 0,
+        ?int $id = null) {
         $this->questionid = $questionid;
         $this->userid = $userid;
         $this->studentquizid = $studentquizid;

classes/local/studentquiz_question.php

@@ -58,8 +58,8 @@ class studentquiz_question {
      * @param mixed|null $cm
      * @param mixed|null $context
      */
-    public function __construct(int $studentquizquestionid, question_definition $question = null,
-        stdClass $studentquiz = null, $cm = null, $context = null) {
+    public function __construct(int $studentquizquestionid, ?question_definition $question = null,
+        ?stdClass $studentquiz = null, $cm = null, $context = null) {
         $this->id = $studentquizquestionid;
         $this->load_studentquiz_question();
         $this->question = $question;
@@ -167,8 +167,8 @@ public function is_hidden(): bool {
      * @param mixed $context
      * @return studentquiz_question StudentQuiz question object.
      */
-    public static function get_studentquiz_question_from_question(question_definition $question, stdClass $studentquiz = null,
-        $cm = null, $context = null): studentquiz_question {
+    public static function get_studentquiz_question_from_question(question_definition $question, ?stdClass $studentquiz = null,
+        mixed $cm = null, mixed $context = null): studentquiz_question {
         global $DB;
         $params = [
             'questionid1' => $question->id,
@@ -314,11 +314,11 @@ public function change_pin_status(int $pin): void {
      * Saving the action change state.
      *
      * @param int $state The state of the question in the StudentQuiz.
-     * @param int $userid
-     * @param int $timecreated The time do action.
+     * @param int|null $userid
+     * @param int|null $timecreated The time do action.
      * @return bool|int True or new id
      */
-    public function save_action(int $state, ?int $userid, int $timecreated = null) {
+    public function save_action(int $state, ?int $userid, ?int $timecreated = null) {
         global $DB;
 
         $data = new \stdClass();

classes/utils.php

@@ -580,11 +580,11 @@ public static function get_user_profile_url(int $userid, int $courseid): moodle_
      * @param int $studentquizquestionid Id of studentquizquestion.
      * @param int|null $userid
      * @param int $state The state of the question in the StudentQuiz.
-     * @param int $timecreated The time do action.
+     * @param int|null $timecreated The time do action.
      * @return bool|int True or new id
      */
     public static function question_save_action(int $studentquizquestionid, ?int $userid, int $state,
-            int $timecreated = null) {
+            ?int $timecreated = null) {
         global $DB;
 
         $data = new \stdClass();
@@ -778,7 +778,7 @@ public static function ensure_question_version_status_is_correct(int $questionid
      * @return void
      */
     public static function require_access_to_a_relevant_group(object $cm, \context $context, string $title = '',
-            studentquiz_question $studentquizquestion = null): void {
+            ?studentquiz_question $studentquizquestion = null): void {
         global $COURSE, $PAGE, $USER;
         $groupmode = (int) groups_get_activity_groupmode($cm, $COURSE);
         $currentgroup = groups_get_activity_group($cm, true);

lib.php

@@ -93,10 +93,10 @@ function studentquiz_after_require_login() {
  * of the new instance.
  *
  * @param stdClass $studentquiz Submitted data from the form in mod_form.php
- * @param mod_studentquiz_mod_form $mform The form instance itself (if needed)
+ * @param mod_studentquiz_mod_form|null $mform The form instance itself (if needed)
  * @return int The id of the newly inserted studentquiz record
  */
-function studentquiz_add_instance(stdClass $studentquiz, mod_studentquiz_mod_form $mform = null) {
+function studentquiz_add_instance(stdClass $studentquiz, ?mod_studentquiz_mod_form $mform = null) {
     global $DB;
 
     $studentquiz->timecreated = time();
@@ -164,10 +164,10 @@ function studentquiz_add_instance(stdClass $studentquiz, mod_studentquiz_mod_for
  * will update an existing instance with new data.
  *
  * @param stdClass $studentquiz An object from the form in mod_form.php
- * @param mod_studentquiz_mod_form $mform The form instance itself (if needed)
+ * @param mod_studentquiz_mod_form|null $mform The form instance itself (if needed)
  * @return boolean Success/Fail
  */
-function studentquiz_update_instance(stdClass $studentquiz, mod_studentquiz_mod_form $mform = null) {
+function studentquiz_update_instance(stdClass $studentquiz, ?mod_studentquiz_mod_form $mform = null) {
     global $DB;
 
     // For checkboxes, when deselected, $1 still contains the data from the database, because browser doesn't

tests/generator/lib.php

@@ -53,10 +53,10 @@ public function reset() {
     /**
      * Create StudentQuiz instance
      * @param stdClass $record
-     * @param array $options
+     * @param array|null $options
      * @return stdClass
      */
-    public function create_instance($record = null, array $options = null) {
+    public function create_instance($record = null, ?array $options = null) {
         $record = (object)(array)$record;
 
         // TODO for behats I think this is the reason for studentquiz 0!