Fix phpstan errors.

Author: meisterT

webapp/src/Controller/API/JudgehostController.php

@@ -1049,7 +1049,7 @@ private function addSingleJudgingRun(
 
             $judging->setResult($result);
             if ($problem->isScoringProblem()) {
-               $judging->setScore($score);
+                $judging->setScore($score);
             }
 
             $hasNullResults = false;

webapp/src/Entity/TestcaseGroup.php

@@ -49,9 +49,15 @@ class TestcaseGroup
     #[ORM\JoinColumn(name: 'parent_id', referencedColumnName: 'testcase_group_id', nullable: true, onDelete: 'SET NULL')]
     private ?self $parent = null;
 
+    /**
+     * @var Collection<int, self>
+     */
     #[ORM\OneToMany(targetEntity: self::class, mappedBy: 'parent')]
     private Collection $children;
 
+    /**
+     * @var Collection<int, Testcase>
+     */
     #[ORM\OneToMany(targetEntity: Testcase::class, mappedBy: 'testcaseGroup')]
     private Collection $testcases;
 
@@ -143,11 +149,17 @@ public function setParent(?TestcaseGroup $parent): self
         return $this;
     }
 
+    /**
+     * @return Collection<int, self>
+     */
     public function getChildren(): Collection
     {
         return $this->children;
     }
 
+    /**
+     * @return Collection<int, Testcase>
+     */
     public function getTestcases(): Collection
     {
         return $this->testcases;

webapp/src/Service/SubmissionService.php

@@ -59,6 +59,12 @@ public function __construct(
         protected readonly PaginatorInterface $paginator,
     ) {}
 
+    /**
+     * Returns a two-element array:
+     *   - The score for the testcase group, or null if not all results are ready.
+     *   - The result for the testcase group, or null if not all results are ready.
+     * @return array{string|null, string|null}
+     */
     public static function maybeSetScoringResult(TestcaseGroup $testcaseGroup, Judging $judging): array
     {
         $allResultsReady = true;
@@ -139,43 +145,46 @@ public static function maybeSetScoringResult(TestcaseGroup $testcaseGroup, Judgi
         }
 
         $testcaseAggregationType = $testcaseGroup->getAggregationType();
-        if ($testcaseAggregationType === TestcaseAggregationType::SUM
-            || $testcaseAggregationType === TestcaseAggregationType::AVG) {
-            $score = "0";
-            foreach ($results as $result) {
-                if ($result === null) {
-                    $allResultsReady = false;
-                    break;
-                } else {
-                    $score = bcadd($score, $result, ScoreboardService::SCALE);
-                }
-            }
-            if ($testcaseAggregationType === TestcaseAggregationType::AVG && count($results) > 0) {
-                $score = bcdiv($score, (string)count($results), ScoreboardService::SCALE);
-            }
-        } elseif ($testcaseAggregationType === TestcaseAggregationType::MIN
-            || $testcaseAggregationType === TestcaseAggregationType::MAX) {
-            $score = null;
-            foreach ($results as $result) {
-                if ($result === null) {
-                    $allResultsReady = false;
-                    break;
-                } elseif ($score === null) {
-                    $score = $result;
-                } else {
-                    if ($testcaseAggregationType === TestcaseAggregationType::MIN
-                        && bccomp($result, $score, ScoreboardService::SCALE) < 0) {
-                        $score = $result;
+        switch ($testcaseAggregationType) {
+            case TestcaseAggregationType::SUM:
+            case TestcaseAggregationType::AVG:
+                $score = "0";
+                foreach ($results as $result) {
+                    if ($result === null) {
+                        $allResultsReady = false;
+                        break;
+                    } else {
+                        $score = bcadd($score, $result, ScoreboardService::SCALE);
                     }
-                    if ($testcaseAggregationType === TestcaseAggregationType::MAX
-                        && bccomp($result, $score, ScoreboardService::SCALE) > 0) {
+                }
+                if ($testcaseAggregationType === TestcaseAggregationType::AVG && count($results) > 0) {
+                    $score = bcdiv($score, (string)count($results), ScoreboardService::SCALE);
+                }
+                break;
+            case TestcaseAggregationType::MIN:
+            case TestcaseAggregationType::MAX:
+                $score = null;
+                foreach ($results as $result) {
+                    if ($result === null) {
+                        $allResultsReady = false;
+                        break;
+                    } elseif ($score === null) {
                         $score = $result;
+                    } else {
+                        if ($testcaseAggregationType === TestcaseAggregationType::MIN
+                            && bccomp($result, $score, ScoreboardService::SCALE) < 0) {
+                            $score = $result;
+                        }
+                        if ($testcaseAggregationType === TestcaseAggregationType::MAX
+                            && bccomp($result, $score, ScoreboardService::SCALE) > 0) {
+                            $score = $result;
+                        }
                     }
                 }
-            }
-        } else {
-            throw new InvalidArgumentException(sprintf("Unknown testcase aggregation type '%s'.",
-                $testcaseAggregationType->name));
+                break;
+            default:
+                throw new InvalidArgumentException(sprintf("Unknown testcase aggregation type '%s'.",
+                    $testcaseAggregationType->name));
         }
 
         if ($allResultsReady || (!$allCorrect && !$testcaseGroup->isOnRejectContinue())) {