wip demonstrating return type changes

snake · Oct 31, 2023 · 27b341c · 27b341c
1 parent e6d4e76
commit 27b341c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
@@ -1200,9 +1200,9 @@ public function get_right_rows(bool $displayaverages) : array {
      * @param grade_item $gradeitem Grade item.
      * @param array|null $aggr Average value and meancount information.
      * @param bool|null $shownumberofgrades Whether to show number of grades.
-     * @return mixed Formatted average cell.
+     * @return html_table_cell Formatted average cell.
      */
-    protected function format_average_cell(grade_item $gradeitem, ?array $aggr = null, ?bool $shownumberofgrades = null): mixed {
+    protected function format_average_cell(grade_item $gradeitem, ?array $aggr = null, ?bool $shownumberofgrades = null): html_table_cell {
         global $OUTPUT;
 
         if ($gradeitem->needsupdate) {

diff --git a/grade/report/lib.php b/grade/report/lib.php
@@ -950,9 +950,10 @@ public function item_types(): array {
      * Returns a row of grade items averages
      *
      * @param array $ungradedcounts Ungraded grade items counts with report preferences.
-     * @return mixed Row with averages
+     * @return html_table_row Row with averages
      */
-    protected function format_averages(array $ungradedcounts): mixed {
+    protected function format_averages(array $ungradedcounts): html_table_row
+    {
 
         $avgrow = new html_table_row();
         $avgrow->attributes['class'] = 'avg';
@@ -1004,9 +1005,9 @@ protected function format_averages(array $ungradedcounts): mixed {
      * @param grade_item $gradeitem Grade item.
      * @param array|null $aggr Average value and meancount information.
      * @param bool|null $shownumberofgrades Whether to show number of grades.
-     * @return html_table_row HTML
+     * @return html_table_cell table cell.
      */
-    protected function format_average_cell(grade_item $gradeitem, ?array $aggr = null, ?bool $shownumberofgrades = null): mixed {
+    protected function format_average_cell(grade_item $gradeitem, ?array $aggr = null, ?bool $shownumberofgrades = null): html_table_cell {
         return true;
     }
 

diff --git a/grade/report/user/classes/report/user.php b/grade/report/user/classes/report/user.php
@@ -350,9 +350,9 @@ public function __construct(int $courseid, ?object $gpr, object $context, int $u
      * @param grade_item $gradeitem Grade item.
      * @param array|null $aggr Average value and meancount information.
      * @param bool|null $shownumberofgrades Whether to show number of grades.
-     * @return mixed Formatted average cell.
+     * @return \html_table_cell Formatted average cell.
      */
-    protected function format_average_cell(grade_item $gradeitem, ?array $aggr = null, ?bool $shownumberofgrades = null): mixed {
+    protected function format_average_cell(grade_item $gradeitem, ?array $aggr = null, ?bool $shownumberofgrades = null): \html_table_cell {
 
         if ($gradeitem->needsupdate) {
             $avg = '<td class="cell c' . $this->columncount++.'">' .
@@ -368,7 +368,7 @@ protected function format_average_cell(grade_item $gradeitem, ?array $aggr = nul
                 $avg = $aggr['average'] . $numberofgrades;
             }
         }
-        return $avg;
+        return new \html_table_cell($avg);
     }
 
     /**
@@ -852,8 +852,8 @@ private function fill_table_recursive(array &$element) {
                     $cache = \cache::make_from_params(\cache_store::MODE_REQUEST, 'gradereport_user', 'averages');
                     $avg = $cache->get(get_class($this));
 
-                    $data['average']['content'] = $avg[$eid];
-                    $gradeitemdata['averageformatted'] = $avg[$eid];
+                    $data['average']['content'] = $avg[$eid]->text;
+                    $gradeitemdata['averageformatted'] = $avg[$eid]->text;
                     $data['average']['headers'] = "$headercat $headerrow average$userid";
                 }