Update all dependencies to latest supported versions

nickygerritsen · nickygerritsen · commit 56385402b83f · 2025-07-04T16:39:41.000+02:00
Note that we don't update Symfony to 7.x yet since there is no LTS yet.
diff --git a/webapp/composer.json b/webapp/composer.json
@@ -60,7 +60,7 @@
 		"datatables.net/datatables.net": "dev-master",
 		"datatables.net/datatables.net-bs5": "dev-master",
 		"doctrine/doctrine-bundle": "^2.8",
-		"doctrine/doctrine-fixtures-bundle": "^3.4",
+		"doctrine/doctrine-fixtures-bundle": "^4.0",
 		"doctrine/doctrine-migrations-bundle": "^3.2",
 		"doctrine/orm": "^2.14",
 		"eligrey/filesaver": "2.*",
@@ -72,11 +72,11 @@
 		"knplabs/knp-paginator-bundle": "^6.6",
 		"league/commonmark": "^2.3",
 		"mbostock/d3": "^3.5",
-		"nelmio/api-doc-bundle": "^4.11",
+		"nelmio/api-doc-bundle": "^5.0",
 		"nelmio/cors-bundle": "^2.4",
 		"novus/nvd3": "^1.8",
 		"phpdocumentor/reflection-docblock": "^5.3",
-		"phpstan/phpdoc-parser": "^1.25",
+		"phpstan/phpdoc-parser": "^2.0",
 		"promphp/prometheus_client_php": "^2.6",
 		"ramsey/uuid": "^4.2",
 		"riverline/multipart-parser": "^2.1",
@@ -116,8 +116,8 @@
 	"require-dev": {
 		"ext-dom": "*",
 		"dama/doctrine-test-bundle": "^8.0",
-		"phpstan/phpstan": "^1.10",
-		"phpstan/phpstan-doctrine": "^1.3",
+		"phpstan/phpstan": "^2.0",
+		"phpstan/phpstan-doctrine": "^2.0",
 		"phpunit/phpunit": "^9.6",
 		"sebastian/diff": "*",
 		"squizlabs/php_codesniffer": "*",
diff --git a/webapp/composer.lock b/webapp/composer.lock
diff --git a/webapp/config/packages/doctrine.yaml b/webapp/config/packages/doctrine.yaml
@@ -30,6 +30,7 @@ doctrine:
         auto_mapping: true
         controller_resolver:
             auto_mapping: false
+        enable_lazy_ghost_objects: true
         mappings:
             App:
                 type: attribute
diff --git a/webapp/src/Controller/API/AccessController.php b/webapp/src/Controller/API/AccessController.php
@@ -7,7 +7,7 @@
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\NoResultException;
 use FOS\RestBundle\Controller\Annotations as Rest;
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
diff --git a/webapp/src/Controller/API/AccountController.php b/webapp/src/Controller/API/AccountController.php
@@ -6,7 +6,7 @@
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\QueryBuilder;
 use FOS\RestBundle\Controller\Annotations as Rest;
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Symfony\Component\ExpressionLanguage\Expression;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/webapp/src/Controller/API/AwardsController.php b/webapp/src/Controller/API/AwardsController.php
@@ -13,7 +13,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Exception;
 use FOS\RestBundle\Controller\Annotations as Rest;
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
diff --git a/webapp/src/Controller/API/BalloonController.php b/webapp/src/Controller/API/BalloonController.php
@@ -8,7 +8,7 @@
 use App\Service\BalloonService;
 use Doctrine\ORM\NonUniqueResultException;
 use FOS\RestBundle\Controller\Annotations as Rest;
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Symfony\Component\ExpressionLanguage\Expression;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/webapp/src/Controller/API/ClarificationController.php b/webapp/src/Controller/API/ClarificationController.php
@@ -12,7 +12,7 @@
 use Doctrine\ORM\QueryBuilder;
 use Exception;
 use FOS\RestBundle\Controller\Annotations as Rest;
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Symfony\Component\ExpressionLanguage\Expression;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/webapp/src/Controller/API/ContestController.php b/webapp/src/Controller/API/ContestController.php
@@ -24,7 +24,7 @@
 use FOS\RestBundle\Controller\Annotations as Rest;
 use JMS\Serializer\Metadata\PropertyMetadata;
 use Metadata\MetadataFactoryInterface;
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
@@ -418,7 +418,7 @@ public function changeStartTimeAction(
         if (!$request->request->has('start_time') && !$request->request->has('scoreboard_thaw_time')) {
             throw new BadRequestHttpException('Missing "start_time" or "scoreboard_thaw_time" in request.');
         }
-        if ($request->request->get('id') != $contest->getExternalid()) {
+        if ($request->request->get('id') !== $contest->getExternalid()) {
             throw new BadRequestHttpException('Invalid "id" in request.');
         }
         if ($request->request->has('start_time') && $request->request->has('scoreboard_thaw_time')) {
diff --git a/webapp/src/Controller/API/GeneralInfoController.php b/webapp/src/Controller/API/GeneralInfoController.php
@@ -20,7 +20,7 @@
 use FOS\RestBundle\Controller\Annotations as Rest;
 use InvalidArgumentException;
 use JMS\Serializer\SerializerInterface;
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
diff --git a/webapp/src/Controller/API/GroupController.php b/webapp/src/Controller/API/GroupController.php
@@ -9,7 +9,7 @@
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\QueryBuilder;
 use FOS\RestBundle\Controller\Annotations as Rest;
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/webapp/src/Controller/API/JudgehostController.php b/webapp/src/Controller/API/JudgehostController.php
@@ -42,7 +42,7 @@
 use Doctrine\ORM\Query\Expr\Join;
 use FOS\RestBundle\Controller\AbstractFOSRestController;
 use FOS\RestBundle\Controller\Annotations as Rest;
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\ExpressionLanguage\Expression;
diff --git a/webapp/src/Controller/API/JudgementController.php b/webapp/src/Controller/API/JudgementController.php
@@ -11,7 +11,7 @@
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\QueryBuilder;
 use FOS\RestBundle\Controller\Annotations as Rest;
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Symfony\Component\ExpressionLanguage\Expression;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/webapp/src/Controller/API/JudgementTypeController.php b/webapp/src/Controller/API/JudgementTypeController.php
@@ -5,7 +5,7 @@
 use App\DataTransferObject\JudgementType;
 use Doctrine\ORM\NonUniqueResultException;
 use FOS\RestBundle\Controller\Annotations as Rest;
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
diff --git a/webapp/src/Controller/API/LanguageController.php b/webapp/src/Controller/API/LanguageController.php
@@ -9,7 +9,7 @@
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\QueryBuilder;
 use FOS\RestBundle\Controller\Annotations as Rest;
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/webapp/src/Controller/API/OrganizationController.php b/webapp/src/Controller/API/OrganizationController.php
@@ -13,7 +13,7 @@
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\QueryBuilder;
 use FOS\RestBundle\Controller\Annotations as Rest;
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\JsonResponse;
diff --git a/webapp/src/Controller/API/PrintController.php b/webapp/src/Controller/API/PrintController.php
@@ -8,7 +8,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use FOS\RestBundle\Controller\AbstractFOSRestController;
 use FOS\RestBundle\Controller\Annotations as Rest;
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
diff --git a/webapp/src/Controller/API/ProblemController.php b/webapp/src/Controller/API/ProblemController.php
@@ -18,7 +18,7 @@
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\QueryBuilder;
 use FOS\RestBundle\Controller\Annotations as Rest;
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/webapp/src/Controller/API/RunController.php b/webapp/src/Controller/API/RunController.php
@@ -11,7 +11,7 @@
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\QueryBuilder;
 use FOS\RestBundle\Controller\Annotations as Rest;
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Symfony\Component\ExpressionLanguage\Expression;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/webapp/src/Controller/API/ScoreboardController.php b/webapp/src/Controller/API/ScoreboardController.php
@@ -18,7 +18,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NonUniqueResultException;
 use FOS\RestBundle\Controller\Annotations as Rest;
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Attribute\MapQueryParameter;
diff --git a/webapp/src/Controller/API/SubmissionController.php b/webapp/src/Controller/API/SubmissionController.php
@@ -22,7 +22,7 @@
 use Doctrine\ORM\QueryBuilder;
 use Exception;
 use FOS\RestBundle\Controller\Annotations as Rest;
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Symfony\Component\ExpressionLanguage\Expression;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
@@ -159,7 +159,7 @@ public function addSubmissionAction(
             if ($this->isGranted('ROLE_API_WRITER')) {
                 // Load the user.
                 /** @var User|null $user */
-                $user = $this->em->getRepository(User::class)->find($userId);
+                $user = $this->em->getRepository(User::class)->findOneBy(['externalid' => $userId]);
 
                 if (!$user) {
                     throw new BadRequestHttpException("User not found.");
diff --git a/webapp/src/Controller/API/TeamController.php b/webapp/src/Controller/API/TeamController.php
@@ -14,7 +14,7 @@
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\QueryBuilder;
 use FOS\RestBundle\Controller\Annotations as Rest;
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\JsonResponse;
diff --git a/webapp/src/Controller/API/UserController.php b/webapp/src/Controller/API/UserController.php
@@ -15,7 +15,7 @@
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\QueryBuilder;
 use FOS\RestBundle\Controller\Annotations as Rest;
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Symfony\Component\ExpressionLanguage\Expression;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
diff --git a/webapp/src/DataTransferObject/AddSubmission.php b/webapp/src/DataTransferObject/AddSubmission.php
@@ -2,7 +2,7 @@
 
 namespace App\DataTransferObject;
 
-use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Attribute\Model;
 use OpenApi\Attributes as OA;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
diff --git a/webapp/templates/jury/partials/rejudge_form.html.twig b/webapp/templates/jury/partials/rejudge_form.html.twig
@@ -1,46 +1,44 @@
 {# Output a rejudge form #}
 
-{% apply spaceless %}
-    {% set buttonText = 'Rejudge all for ' ~ table ~ ' ' ~ id %}
-    {% set questionText = 'Rejudge all submissions for this ' ~ table ~ '?' %}
-    {% set buttonDisabled = false %}
-    {% set isRestart = false %}
-    {% if is_granted('ROLE_ADMIN') %}
-        {% set includeAllButton = true %}
-    {% else %}
-        {% set includeAllButton = false %}
-    {% endif %}
-    {% if buttonClass is not defined %}
-        {% set buttonClass = 'btn-outline-primary btn-sm' %}
-    {% endif %}
+{% set buttonText = 'Rejudge all for ' ~ table ~ ' ' ~ id %}
+{% set questionText = 'Rejudge all submissions for this ' ~ table ~ '?' %}
+{% set buttonDisabled = false %}
+{% set isRestart = false %}
+{% if is_granted('ROLE_ADMIN') %}
+    {% set includeAllButton = true %}
+{% else %}
+    {% set includeAllButton = false %}
+{% endif %}
+{% if buttonClass is not defined %}
+    {% set buttonClass = 'btn-outline-primary btn-sm' %}
+{% endif %}
 
-    {% if table == 'submission' and submission is defined and judgings is defined %}
-        {% set buttonText = 'Rejudge this submission' %}
-        {% set questionText = 'Rejudge submission s' ~ id ~ '?' %}
-        {% set includeAllButton = false %}
-        {# Check if we have a valid result #}
-        {% set validResult = false %}
-        {% for judging in judgings %}
-            {% if judging.valid %}
-                {% set validResult = judging.result %}
-            {% endif %}
-        {% endfor %}
+{% if table == 'submission' and submission is defined and judgings is defined %}
+    {% set buttonText = 'Rejudge this submission' %}
+    {% set questionText = 'Rejudge submission s' ~ id ~ '?' %}
+    {% set includeAllButton = false %}
+    {# Check if we have a valid result #}
+    {% set validResult = false %}
+    {% for judging in judgings %}
+        {% if judging.valid %}
+            {% set validResult = judging.result %}
+        {% endif %}
+    {% endfor %}
 
-        {% if is_granted('ROLE_ADMIN') %}
-            {% if not validResult %}
-                {% set questionText = 'Restart judging of PENDING submission s' ~ id ~ ', are you sure?' %}
-                {% set buttonText = 'Restart judging' %}
-                {% set isRestart = true %}
-            {% elseif validResult == 'correct' %}
-                {% set questionText = 'Rejudge CORRECT submission s' ~ id ~ ', are you sure?' %}
-            {% endif %}
-        {% else %}
-            {% if not validResult or validResult == 'correct' %}
-                {% set buttonDisabled = true %}
-            {% endif %}
+    {% if is_granted('ROLE_ADMIN') %}
+        {% if not validResult %}
+            {% set questionText = 'Restart judging of PENDING submission s' ~ id ~ ', are you sure?' %}
+            {% set buttonText = 'Restart judging' %}
+            {% set isRestart = true %}
+        {% elseif validResult == 'correct' %}
+            {% set questionText = 'Rejudge CORRECT submission s' ~ id ~ ', are you sure?' %}
+        {% endif %}
+    {% else %}
+        {% if not validResult or validResult == 'correct' %}
+            {% set buttonDisabled = true %}
         {% endif %}
     {% endif %}
-{% endapply %}
+{% endif %}
 
 <button type="button" class="btn {{ buttonClass }}" data-bs-toggle="modal" data-bs-target="#rejudge-modal">
     <i class="fas fa-sync"></i> Rejudge
diff --git a/webapp/templates/partials/scoreboard_summary.html.twig b/webapp/templates/partials/scoreboard_summary.html.twig
@@ -41,7 +41,7 @@
 
                         <i class="fas fa-thumbs-down fa-fw"></i>
                         <span class="submreject" style="font-size:90%;" title="number of rejected submissions">
-                                {{ summary.numSubmissions[sortOrder] ?? 0 - summary.numSubmissionsCorrect[sortOrder] ?? 0 }}
+                                {{ (summary.numSubmissions[sortOrder] ?? 0) - (summary.numSubmissionsCorrect[sortOrder] ?? 0) }}
                             </span>
                         <br/>
 
diff --git a/webapp/tests/Unit/BaseTestCase.php b/webapp/tests/Unit/BaseTestCase.php
@@ -87,11 +87,14 @@ protected function loadFixture(string $fixture): void
     /**
      * Resolve any references in the given ID.
      */
-    protected function resolveReference(int|string $id, ?string $class = null): int|string
+    protected function resolveReference(int|string $id, ?string $class = null, bool $preferExternalId = false): int|string
     {
         // If the object ID contains a :, it is a reference to a fixture item, so get it.
         if (is_string($id) && str_contains($id, ':')) {
             $referenceObject = $this->fixtureExecutor->getReferenceRepository()->getReference($id, $class ?? $this->entityClass);
+            if ($preferExternalId && method_exists($referenceObject, 'getExternalid')) {
+                return $referenceObject->getExternalid();
+            }
             $metadata = static::getContainer()->get(EntityManagerInterface::class)->getClassMetadata($referenceObject::class);
             $propertyAccessor = PropertyAccess::createPropertyAccessor();
             return $propertyAccessor->getValue($referenceObject, $metadata->getSingleIdentifierColumnName());
diff --git a/webapp/tests/Unit/Controller/API/ContestControllerAdminTest.php b/webapp/tests/Unit/Controller/API/ContestControllerAdminTest.php
diff --git a/webapp/tests/Unit/Controller/API/SubmissionControllerTest.php b/webapp/tests/Unit/Controller/API/SubmissionControllerTest.php
