Doctype fixes for new PHPstan

No functional changes intended.

Author: nickygerritsen

webapp/src/Controller/API/ProblemController.php

@@ -58,7 +58,7 @@ public function __construct(
     /**
      * Add one or more problems.
      *
-     * @return int[]
+     * @return string[]
      * @throws BadRequestHttpException
      * @throws NonUniqueResultException
      */
@@ -105,7 +105,7 @@ public function addProblemsAction(Request $request): array
         $data = Yaml::parseFile($file->getRealPath(), Yaml::PARSE_DATETIME);
         $messages = [];
         if ($this->importExportService->importProblemsData($contest, $data, $ids, $messages)) {
-            return $ids;
+            return $ids ?? [];
         }
         $message = "Error while adding problems";
         if (!empty($messages)) {

webapp/src/Controller/Jury/RejudgingController.php

@@ -788,20 +788,8 @@ public function createAction(Request $request): Response
                 } else {
                     $redirect = $this->generateUrl('jury_index');
                 }
-            } elseif ($res instanceof Rejudging) {
-                $redirect = $this->generateUrl('jury_rejudging', ['rejudgingId' => $res->getRejudgingid()]);
             } else {
-                $redirect = match ($table) {
-                    'contest' => $this->generateUrl('jury_contest', ['contestId' => $id]),
-                    'judgehost' => $this->generateUrl('jury_judgehost', ['judgehostid' => $id]),
-                    'language' => $this->generateUrl('jury_language', ['langId' => $id]),
-                    'problem' => $this->generateUrl('jury_problem', ['probId' => $id]),
-                    'submission' => $this->generateUrl('jury_submission', ['submitId' => $id]),
-                    'team' => $this->generateUrl('jury_team', ['teamId' => $id]),
-                    // This case never happens, since we already check above.
-                    // Add it here to silence linter warnings.
-                    default => throw new BadRequestHttpException(sprintf('unknown table %s in rejudging', $table)),
-                };
+                $redirect = $this->generateUrl('jury_rejudging', ['rejudgingId' => $res->getRejudgingid()]);
             }
 
             $progressReporter(100, '', $redirect);

webapp/src/Controller/Team/SubmissionController.php

@@ -78,7 +78,7 @@ public function createAction(Request $request, ?Problem $problem = null): Respon
                 $problem = $form->get('problem')->getData();
                 /** @var Language $language */
                 $language = $form->get('language')->getData();
-                /** @var UploadedFile[] $files */
+                /** @var UploadedFile[]|UploadedFile $files */
                 $files      = $form->get('code')->getData();
                 if (!is_array($files)) {
                     $files = [$files];

webapp/src/DataFixtures/DefaultData/UserFixture.php

@@ -89,7 +89,7 @@ protected function getRestapiPassword(): string
             if ($credential === '' || $credential[0] === '#') {
                 continue;
             }
-            /** @var string[] $items */
+            /** @var list<string> $items */
             $items = preg_split("/\s+/", $credential);
             if (count($items) !== 4) {
                 throw new Exception("Error parsing REST API credentials. Invalid format in line $lineno.");

webapp/src/DataFixtures/Test/RejudgingStatesFixture.php

@@ -45,7 +45,7 @@ public function load(ObjectManager $manager): void
             $manager->flush();
             // One rejudging can consist of submissions of multiple contests
             foreach ($rejudgingStage[4] as $contestName) {
-                /** @var Contest $contest */
+                /** @var Contest|null $contest */
                 $contest = $manager->getRepository(Contest::class)->findOneBy(['shortname' => $contestName]);
                 /** @var Team $team */
                 $team = $manager->getRepository(Team::class)->findOneBy(['name' => 'Example teamname']);

webapp/src/Doctrine/DBAL/Types/JsonType.php

@@ -29,10 +29,13 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st
     }
 
     /**
-     * @return string|false|null
-     * @throws ConversionException
+     * @template T
+     * @param T $value
+     *
+     * @return (T is null ? null : string)
+     * @throws \JsonException
      */
-    public function convertToDatabaseValue($value, AbstractPlatform $platform)
+    public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
     {
         if ($value === null) {
             return null;

webapp/src/Entity/Testcase.php

@@ -94,7 +94,7 @@ class Testcase
     private Collection $judging_runs;
 
     /**
-     * @var Collection<int, ExternalRun>>
+     * @var Collection<int, ExternalRun>
      */
     #[ORM\OneToMany(mappedBy: 'testcase', targetEntity: ExternalRun::class)]
     #[Serializer\Exclude]

webapp/src/Form/Type/ExecutableType.php

@@ -39,7 +39,7 @@ public static function getSubscribingMethods(): array
     }
 
     /**
-     * @param array{params: string[]} $type
+     * @param array{name: string, params: string[]} $type
      *
      * @return array{code: int, message: string}
      */
@@ -49,8 +49,7 @@ public function serializeToJson(
         array $type,
         Context $context
     ): array {
-        return $visitor->visitArray($this->convertToArray($exception, $context),
-            $type);
+        return $visitor->visitArray($this->convertToArray($exception, $context), $type);
     }
 
     /**

webapp/src/FosRestBundle/FlattenExceptionHandler.php

@@ -122,8 +122,7 @@ public function onAuthenticationSuccess(Request $request, TokenInterface $token,
             && $request->isMethod('POST')
             && $request->request->get('loginmethod') === 'ipaddress') {
             // Use target URL from session if set.
-            if ($firewallName !== null &&
-                $targetUrl = $this->getTargetPath($request->getSession(), $firewallName)) {
+            if ($targetUrl = $this->getTargetPath($request->getSession(), $firewallName)) {
                 $this->removeTargetPath($request->getSession(), $firewallName);
                 return new RedirectResponse($targetUrl);
             }