Fix PHPStan issues

DOMjudge · vmcj · Oct 13, 2024 · Oct 13, 2024 · Oct 13, 2024 · Oct 13, 2024
commit f3b96e1be401230f6811e8369090d004c516a69c
diff --git a/webapp/src/Controller/Jury/SubmissionController.php b/webapp/src/Controller/Jury/SubmissionController.php
@@ -1,4 +1,4 @@
 <?php declare(strict_types=1);

 namespace App\Controller\Jury;

@@ -57,11 +57,11 @@

 #[IsGranted('ROLE_JURY')]
 #[Route(path: '/jury/submissions')]
 class SubmissionController extends BaseController
 {
    use JudgeRemainingTrait;

    public function __construct(
        EntityManagerInterface $em,
        protected readonly EventLogService $eventLogService,
        DOMJudgeService $dj,
@@ -71,10 +71,10 @@
        KernelInterface $kernel,
    ) {
        parent::__construct($em, $eventLogService, $dj, $kernel);
    }

    #[Route(path: '', name: 'jury_submissions')]
    public function indexAction(
        Request $request,
        #[MapQueryParameter(name: 'view')]
        ?string $viewFromRequest = null,
@@ -175,13 +175,13 @@
        $data["form"] = $form->createView();

        return $this->render('jury/submissions.html.twig', $data, $response);
    }

    /**
     * @throws NonUniqueResultException
     */
    #[Route(path: '/{submitId<\d+>}', name: 'jury_submission')]
    public function viewAction(
        Request $request,
        int $submitId,
        #[MapQueryParameter(name: 'jid')]
@@ -600,20 +600,20 @@
        }

        return $this->render('jury/submission.html.twig', $twigData);
    }

    #[Route(path: '/request-full-debug/{jid}', name: 'request_full_debug')]
    public function requestFullDebug(Request $request, Judging $jid): RedirectResponse
    {
        $submission = $jid->getSubmission();
        $defaultFullDebugExecutable = $this->em
            ->getRepository(Executable::class)
            ->findOneBy(['execid' => $this->config->get('default_full_debug')]);
        if ($defaultFullDebugExecutable === null) {
            $this->addFlash('error', 'No default full_debug executable specified, please configure one.');
        } else {
            $executable = $defaultFullDebugExecutable->getImmutableExecutable();
            foreach ($jid->getJudgehosts() as $hostname) {
                $judgehost = $this->em
                    ->getRepository(Judgehost::class)
                    ->findOneBy(['hostname' => $hostname]);
@@ -1315,9 +1315,9 @@
             $judgingId = $judging->getJudgingid();
             if ($judging->getResult() === null) {
                 $inProgress[] = $judgingId;
-            } elseif (false and $judging->getVisualization()) {
+            /*} elseif ($judging->getVisualization()) {
                 $alreadyRequested[] = $judgingId;
-            } elseif (!$judging->getValid()) {
+            }*/ elseif (!$judging->getValid()) {
                 $invalidJudgings[] = $judgingId;
             } else {
                 $outs = $judging->getRuns()->toArray();
@@ -1344,14 +1344,14 @@
             if ($inProgress !== []) {
                 $this->addFlash('warning', 'Please be patient, this visualization is still in progress.');
             }
-            if ($alreadyRequested !== []) {
+            if ($alreadyRequested != []) {
                 $this->addFlash('warning', 'This visualization was already requested to be judged completely.');
             }
         } else {
             if ($inProgress !== []) {
                 $this->addFlash('warning', sprintf('Please be patient, these visualizations are still in progress: %s', implode(', ', $inProgress)));
             }
-            if ($alreadyRequested !== []) {
+            if ($alreadyRequested != []) {
                 $this->addFlash('warning', sprintf('These judgings were already requested to be judged completely: %s', implode(', ', $alreadyRequested)));
             }
             if ($invalidJudgings !== []) {

diff --git a/webapp/src/Service/ImportProblemService.php b/webapp/src/Service/ImportProblemService.php
@@ -1049,6 +1049,7 @@ private function helperSearchAndAddProgram(ZipArchive $zip, ?array &$messages, s
                     ->setImmutableExecutable($this->dj->createImmutableExecutable($zipArchive))
                     ->setDescription(sprintf('%s for %s', $programStrings['type'], $problem->getName()));
 
+                $combinedRunCompare = false;
                 if ($programStrings['type'] === 'output validator') {
                     $combinedRunCompare = $programMode == 'custom interactive';
                     $executable->setType($combinedRunCompare ? 'run' : 'compare');