More phpstan fixes

Author: meisterT

webapp/src/Controller/Jury/ImportExportController.php

@@ -157,6 +157,7 @@ public function indexAction(Request $request): Response
             try {
                 $zip = $this->dj->openZipFile($archive->getRealPath());
                 $clientName = $archive->getClientOriginalName();
+                /** @var array<string, string[]> $messages */
                 $messages = [];
                 if ($contestId === null) {
                     $contest = null;

webapp/src/Controller/Jury/ProblemController.php

@@ -956,6 +956,7 @@ public function editAction(Request $request, int $probId): Response
             $data = $uploadForm->getData();
             /** @var UploadedFile $archive */
             $archive  = $data['archive'];
+            /** @var array<string, string[]> $messages */
             $messages = [];
 
             /** @var Contest|null $contest */

webapp/src/Service/ImportProblemService.php

@@ -60,9 +60,9 @@ public function __construct(
     public function importZippedProblem(
         ZipArchive $zip,
         string $clientName,
-        ?Problem $problem = null,
-        ?Contest $contest = null,
-        ?array &$messages = []
+        ?Problem $problem,
+        ?Contest $contest,
+        array &$messages
     ): ?Problem {
         // This might take a while.
         Utils::extendMaxExecutionTime(300);
@@ -923,6 +923,7 @@ public function importProblemFromRequest(Request $request, ?int $contestId = nul
         try {
             $zip         = $this->dj->openZipFile($file->getRealPath());
             $clientName  = $file->getClientOriginalName();
+            /** @var array<string, string[]> $messages */
             $messages    = [];
             $newProblem  = $this->importZippedProblem(
                 $zip, $clientName, $problem, $contest, $messages
@@ -949,7 +950,7 @@ public function importProblemFromRequest(Request $request, ?int $contestId = nul
     }
 
     /**
-     * @param array{danger?: string[], info?: string[]} $messages
+     * @param array<string, string[]> $messages
      */
     private function searchAndAddValidator(ZipArchive $zip, ?array &$messages, string $externalId, string $validationMode, ?Problem $problem): bool
     {
@@ -1055,6 +1056,9 @@ private function searchAndAddValidator(ZipArchive $zip, ?array &$messages, strin
         return true;
     }
 
+    /**
+     * @param array<string, string[]> $messages
+     */
     public function parseTestCaseGroupMeta(string $fileContent, string $name, array &$messages): ?TestcaseGroup
     {
         $yamlData = Yaml::parse($fileContent);