CTP-3560 coursework tests review

Author: watson8

classes/allocation/table/builder.php

@@ -38,6 +38,7 @@
  * Represents the table that will show all students and all markers so that they can be matched up with one another for grading.
  * Various automatic strategies will be available for this, but the manual override happens here.
  */
+#[\AllowDynamicProperties]
 class builder {
 
     /**

classes/controllers/feedback_controller.php

@@ -74,16 +74,19 @@ protected function show_feedback() {
 
         $teacherfeedback = new feedback($this->params['feedbackid']);
 
-        $ability = new ability(user::find($USER), $this->coursework);
-        $ability->require_can('show', $teacherfeedback);
+        $user = user::find($USER);
+        if ($user) {
+            $ability = new ability($user, $this->coursework);
+            $ability->require_can('show', $teacherfeedback);
 
-        $renderer = $this->get_page_renderer();
-        $html = $renderer->show_feedback_page($teacherfeedback, $ajax);
+            $renderer = $this->get_page_renderer();
+            $html = $renderer->show_feedback_page($teacherfeedback, (bool)$ajax);
 
-        if (empty($ajax)) {
-            echo $html;
-        } else {
-            echo json_encode(['success' => true, 'formhtml' => $html]);
+            if (empty($ajax)) {
+                echo $html;
+            } else {
+                echo json_encode(['success' => true, 'formhtml' => $html]);
+            }
         }
     }
 

classes/export/csv/cells/feedbackcomments_cell.php

@@ -40,9 +40,10 @@ class feedbackcomments_cell extends cell_base {
      */
     public function get_cell($submission, $student, $stage_identifier) {
 
-        $stage_identifier = ($this->coursework->get_max_markers() == 1) ? "assessor_1" : $this->get_stage_identifier_for_assessor($submission, $student);
+        $stage_identifier = ($this->coursework->get_max_markers() == 1)
+            ? "assessor_1" : $this->get_stage_identifier_for_assessor($submission, $student);
         $grade = $submission->get_assessor_feedback_by_stage($stage_identifier);
-        return   (!$grade) ? '' : strip_tags($grade->feedbackcomment);
+        return (!$grade || !isset($grade->feedbackcomment)) ? '' : strip_tags($grade->feedbackcomment);
     }
 
     /**

classes/framework/table_base.php

@@ -20,7 +20,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace mod_coursework\framework;;
+namespace mod_coursework\framework;
 
 use moodle_database;
 use stdClass;

classes/grade_judge.php

@@ -65,10 +65,14 @@ public function get_grade_capped_by_submission_time($submission) {
     }
 
     /**
-     * @param $grade
+     * @param int|float $grade
      * @return float
      */
     private function round_grade_decimals($grade) {
+        if ($grade === '' || $grade === null) {
+            // Avoid PHPUnit exception passing null or empty string to round().
+            return null;
+        }
         return round($grade, 2);
     }
 
@@ -145,10 +149,10 @@ public function has_feedback_that_is_promoted_to_gradebook($submission) {
 
     /**
      * @param submission $submission
-     * @return int
+     * @return int|null
      */
     public function get_time_graded($submission) {
-        return $this->get_feedback_that_is_promoted_to_gradebook($submission)->timemodified;
+        return $this->get_feedback_that_is_promoted_to_gradebook($submission)->timemodified ?? null;
     }
 
     /**

classes/models/allocation.php

@@ -35,6 +35,7 @@
  * @property mixed allocatableid
  * @property mixed allocatabletype
  */
+#[\AllowDynamicProperties]
 class allocation extends table_base {
 
     /**

classes/models/assessment_set_membership.php

@@ -38,6 +38,7 @@
  * @package mod_coursework\models
  *
  */
+#[\AllowDynamicProperties]
 class assessment_set_membership extends table_base implements moderatable {
 
     /**

classes/models/coursework.php

@@ -84,6 +84,7 @@
  * @property mixed startdate
  * @author administrator
  */
+#[\AllowDynamicProperties]
 class coursework extends table_base {
 
     /**
@@ -882,13 +883,10 @@ public function early_finalisation_allowed() {
      * @return void
      */
     public function publish_grades() {
-
-        $submisisons = $this->get_submissions_to_publish();
-
-        foreach ($submisisons as $submisison) {
-            $submisison->publish();
+        $submissions = $this->get_submissions_to_publish();
+        foreach ($submissions as $submission) {
+            $submission->publish();
         }
-
     }
 
     /**

classes/models/deadline_extension.php

@@ -36,6 +36,7 @@
  * @property mixed allocatableid
  * @package mod_coursework\models
  */
+#[\AllowDynamicProperties]
 class deadline_extension extends table_base {
 
     /**

classes/models/feedback.php

@@ -38,6 +38,7 @@
  * @property mixed stage_identifier
  * @property int feedback_manager
  */
+#[\AllowDynamicProperties]
 class feedback extends table_base {
 
     /**
@@ -475,7 +476,8 @@ public function get_submission() {
 
         if (!isset($this->submission) && !empty($this->submissionid)) {
             global $DB;
-            $coursework_id = $this->courseworkid ?? $DB->get_field(submission::$table_name, 'courseworkid', ['id' => $this->submissionid], MUST_EXIST);
+            $coursework_id = $this->courseworkid
+                ?? $DB->get_field(submission::$table_name, 'courseworkid', ['id' => $this->submissionid], MUST_EXIST);
             if (!isset(submission::$pool[$coursework_id])) {
                 submission::fill_pool_coursework($coursework_id);
             }
@@ -591,7 +593,7 @@ public static function fill_pool_coursework($coursework_id) {
         if (isset(self::$pool[$coursework_id])) {
             return;
         }
-        if (submission::$pool[$coursework_id]) {
+        if (submission::$pool[$coursework_id] ?? null) {
             $submission_ids = submission::$pool[$coursework_id]['id'];
         } else {
             $submission_ids = $DB->get_records(submission::$table_name, ['courseworkid' => $coursework_id], '', 'id');
@@ -650,7 +652,7 @@ public static function fill_pool_submissions($coursework_id, $submission_ids) {
      * @param $coursework_id
      * @param $key
      * @param $params
-     * @return bool
+     * @return self|bool
      */
     public static function get_object($coursework_id, $key, $params) {
         if (!isset(self::$pool[$coursework_id])) {