Run rector to upgrade syntax to php 8.2+

Author: nickygerritsen

judge/judgedaemon.main.php

@@ -240,7 +240,7 @@ private function initialize(): void
         $domserver_languages = dj_json_decode($this->request('languages', 'GET'));
         foreach ($domserver_languages as $language) {
             $id = $language['id'];
-            if (key_exists($id, $this->langexts)) {
+            if (array_key_exists($id, $this->langexts)) {
                 $this->langexts[$id] = $language['extensions'];
             }
         }
@@ -551,7 +551,7 @@ private function handleTask(string $type, array $row, ?string &$lastWorkdir, str
         $this->endpoints[$this->endpointID]['retrying'] = false;
 
         logmsg(LOG_INFO,
-            "⇝ Received " . sizeof($row) . " '" . $type . "' judge tasks (endpoint $this->endpointID)");
+            "⇝ Received " . count($row) . " '" . $type . "' judge tasks (endpoint $this->endpointID)");
 
         if ($type == 'prefetch') {
             $this->handlePrefetchTask($row, $lastWorkdir, $workdirpath);
@@ -763,14 +763,14 @@ private function request(string $url, string $verb = 'GET', $data = '', bool $fa
                 }
             }
             if ($trial == BACKOFF_STEPS) {
-                $errstr = $errstr . " Retry limit reached.";
+                $errstr .= " Retry limit reached.";
             } else {
                 $retry_in_sec = $delay_in_sec + BACKOFF_JITTER_SEC * random_int(0, mt_getrandmax()) / mt_getrandmax();
                 $warnstr = $errstr . " This request will be retried after about " .
                     round($retry_in_sec, 2) . "sec... (" . $trial . "/" . BACKOFF_STEPS . ")";
                 warning($warnstr);
                 dj_sleep($retry_in_sec);
-                $delay_in_sec = $delay_in_sec * BACKOFF_FACTOR;
+                $delay_in_sec *= BACKOFF_FACTOR;
             }
         }
         if (!$succeeded) {
@@ -865,7 +865,7 @@ private function runCommandSafe(array $command_parts, &$retval = DONT_CARE, $log
             return false;
         }
 
-        $command = implode(' ', array_map('dj_escapeshellarg', $command_parts));
+        $command = implode(' ', array_map(dj_escapeshellarg(...), $command_parts));
 
         logmsg(LOG_DEBUG, "Executing command: $command");
         system($command, $retval_local);
@@ -917,7 +917,7 @@ private function fetchExecutableInternal(
         string $hash,
         bool   $combined_run_compare = false
     ): array {
-        $execdir = join('/', [
+        $execdir = implode('/', [
             $workdirpath,
             'executable',
             $type,
@@ -959,8 +959,8 @@ private function fetchExecutableInternal(
             unset($files);
             uasort($filesArray, fn(array $a, array $b) => strcmp($a['filename'], $b['filename']));
             $computedHash = md5(
-                join(
-                    array_map(
+                implode(
+                    '', array_map(
                         fn($file) => $file['hash'] . $file['filename'] . $file['is_executable'],
                         $filesArray
                     )
@@ -1767,10 +1767,10 @@ private function fetchTestcase(string $workdirpath, string $testcase_id, int $ju
 
     private function initsignals(): void
     {
-        pcntl_signal(SIGTERM, [self::class, 'signalHandler']);
-        pcntl_signal(SIGINT, [self::class, 'signalHandler']);
-        pcntl_signal(SIGHUP, [self::class, 'signalHandler']);
-        pcntl_signal(SIGUSR1, [self::class, 'signalHandler']);
+        pcntl_signal(SIGTERM, self::signalHandler(...));
+        pcntl_signal(SIGINT, self::signalHandler(...));
+        pcntl_signal(SIGHUP, self::signalHandler(...));
+        pcntl_signal(SIGUSR1, self::signalHandler(...));
     }
 }
 

webapp/composer.json

@@ -109,6 +109,7 @@
 		"phpstan/phpstan": "^2.0",
 		"phpstan/phpstan-doctrine": "^2.0",
 		"phpunit/phpunit": "^9.6",
+		"rector/rector": "^2.2",
 		"sebastian/diff": "*",
 		"squizlabs/php_codesniffer": "*",
 		"symfony/debug-bundle": "7.4.*",

webapp/composer.lock

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
+
+return RectorConfig::configure()
+    ->withPaths([
+        __DIR__ . '/config',
+        __DIR__ . '/public',
+        __DIR__ . '/resources',
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ])
+    // uncomment to reach your current PHP version
+    ->withPhpSets()
+    ->withComposerBased(twig: true, doctrine: true, phpunit: true, symfony: true)
+    ->withTypeCoverageLevel(0)
+    ->withDeadCodeLevel(0)
+    ->withCodeQualityLevel(0)
+    ->withSkip([NullToStrictStringFuncCallArgRector::class]);

webapp/rector.php

@@ -37,7 +37,7 @@ public function __invoke(
             $style->error('Can not find user with username ' . $username);
             return Command::FAILURE;
         }
-        $password = $password ?? Utils::generatePassword();
+        $password ??= Utils::generatePassword();
         $user->setPassword(
             $this->passwordHasher->hashPassword($user, $password)
         );

webapp/src/Command/ResetUserPasswordCommand.php

@@ -967,7 +967,7 @@ private function checkTimezones(FormInterface $form): ?Response
                         $fields = explode('+', $tmpValue);
                     } elseif (str_contains($tmpValue, '-')) {
                         $fields = explode('-', $tmpValue);
-                    } elseif (substr($tmpValue, -1) === 'Z') {
+                    } elseif (str_ends_with($tmpValue, 'Z')) {
                         $timeZones[] = 'UTC';
                         continue;
                     }

webapp/src/Controller/Jury/ContestController.php

@@ -74,7 +74,7 @@ public function indexAction(Request $request): Response
         foreach (['compare', 'run', 'full_debug'] as $config_script) {
             try {
                 $configScripts[] = (string)$this->config->get('default_' . $config_script);
-            } catch (PHPInvalidArgumentException $e) {
+            } catch (PHPInvalidArgumentException) {
                 // If not found this is an older database, as we only use this for visual changes ignore this error;
             }
         }
@@ -129,22 +129,13 @@ public function indexAction(Request $request): Response
             }
             $execdata['execid']['cssclass'] = 'execid';
             $type = $execdata['type']['value'];
-            switch ($type) {
-                case 'compare':
-                    $execdata['icon']['icon'] = 'code-compare';
-                    break;
-                case 'compile':
-                    $execdata['icon']['icon'] = 'language';
-                    break;
-                case 'debug':
-                    $execdata['icon']['icon'] = 'bug';
-                    break;
-                case 'run':
-                    $execdata['icon']['icon'] = 'person-running';
-                    break;
-                default:
-                    $execdata['icon']['icon'] = 'question';
-            }
+            $execdata['icon']['icon'] = match ($type) {
+                'compare' => 'code-compare',
+                'compile' => 'language',
+                'debug' => 'bug',
+                'run' => 'person-running',
+                default => 'question',
+            };
             $execdata['badges']['value'] = $badges;
 
             if ($this->isGranted('ROLE_ADMIN')) {

webapp/src/Controller/Jury/ExecutableController.php

@@ -206,9 +206,7 @@ public function indexAction(Request $request): Response
             ];
         }
 
-        usort($judgehosts_table, function (array $a, array $b) {
-            return strnatcasecmp($a['data']['hostname']['value'], $b['data']['hostname']['value']);
-        });
+        usort($judgehosts_table, fn(array $a, array $b) => strnatcasecmp($a['data']['hostname']['value'], $b['data']['hostname']['value']));
 
         $data = [
             'judgehosts' => $judgehosts_table,

webapp/src/Controller/Jury/JudgehostController.php

@@ -788,7 +788,7 @@ public function testcasesAction(Request $request, int $probId): Response
         if (!empty($lockedContests)) {
             $this->addFlash('warning',
                 'Problem belongs to locked contest ('
-                . implode($lockedContests)
+                . implode('', $lockedContests)
                 . ', disallowing editing.');
         }
         $data = [

webapp/src/Controller/Jury/ProblemController.php

@@ -383,7 +383,7 @@ public function viewAction(
 
         // Only load the statistics if desired. The query is quite long and can result in much data, so only have it run
         // when needed or when we don't have a lot of data to load.
-        $showStatistics = $showStatistics ?? $onlyAHandfulOfSubmissions;
+        $showStatistics ??= $onlyAHandfulOfSubmissions;
         if ($showStatistics && count($repetitions) > 0) {
             $stats = $this->getStats($rejudging);
         } else {