Update to 7.4.2 (#68 )

Create Testcoverage and upgrade Symfomy and PHP
* Some tests * More tests! * Tests 3 * Move getScores from Candidate to Quiz * Add some suggestions for future refactoring * - **Add Gedmo doctrine-extensions and Stof bundle integration** - Added `stof/doctrine-extensions-bundle` and `gedmo/doctrine-extensions` dependencies. - Integrated `Timestampable` behavior for `Created` fields in entities. - Updated `bundles.php` to register StofDoctrineExtensionsBundle. - Added configuration for the Stof bundle. - Simplified `SeasonVoter` with `match` expression and added new tests. - Minor fixes and adjustments across various files. * WIP * All the tests * Base64 tests * Symfomny 7.4.0 * Update * Update recipe * PHP 8.5 * Rector changes * More 8.5 * Things
2026-03-06 04:44:19 +01:00 · 2025-12-11 16:48:16 +01:00 · 2025-11-28 22:56:09 +01:00 · 2025-10-29 15:59:49 +01:00 · 2025-10-29 15:59:39 +01:00 · 2025-10-29 15:59:23 +01:00
111 changed files with 5446 additions and 3190 deletions
--- a/.env
+++ b/.env
@@ -36,3 +36,4 @@ MAILER_DSN=null://null
 ###> sentry/sentry-symfony ###
 SENTRY_DSN=
 ###< sentry/sentry-symfony ###
+XDEBUG_MODE=coverage
--- a/.env.test
+++ b/.env.test
@@ -1,4 +1,3 @@
 # define your env variables for the test env here
 KERNEL_CLASS='Tvdt\Kernel'
 APP_SECRET='$ecretf0rt3st'
-SYMFONY_DEPRECATIONS_HELPER=999999
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,4 +8,8 @@ updates:
  - package-ecosystem: "composer" # See documentation for possible values
    directory: "/" # Location of package manifests
    schedule:
-      interval: "weekly"
+      interval: "daily"
+  - package-ecosystem: "docker"
+    directtory: "/"
+    schedule:
+      interval: "daily"
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,6 +13,10 @@ concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
  cancel-in-progress: true

+permissions:
+  contents: read
+  packages: write
+
 jobs:
  tests:
    name: Tests
@@ -53,21 +57,68 @@ jobs:
        run: docker compose exec -T php bin/console -e test doctrine:database:create
      - name: Run migrations
        run: docker compose exec -T php bin/console -e test doctrine:migrations:migrate --no-interaction
+      - name: Load fixtures
+        run: docker compose exec -T php bin/console -e test doctrine:fixtures:load --no-interaction --group=test
      - name: Run PHPUnit
        run: docker compose exec -T php vendor/bin/phpunit
      - name: Doctrine Schema Validator
        run: docker compose exec -T php bin/console -e test doctrine:schema:validate
-  deploy:
-    name: Deploy
+  
+  build-deploy:
+    name: Build and deploy to ${{ startsWith(github.ref, 'refs/tags/') && 'production' || (github.ref == 'refs/heads/main' && 'acceptance' || '') }}
    environment:
      name: ${{ startsWith(github.ref, 'refs/tags/') && 'production' || (github.ref == 'refs/heads/main' && 'acceptance' || '') }}
      url: ${{ vars.URL }}
    needs: tests
    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
+    if: (github.ref == 'refs/heads/main' && false) || startsWith(github.ref, 'refs/tags/')
    steps:
-      - shell: bash
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata
+        id: meta
+        run: |
+          REPO_LOWER=$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')
+          if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+            TAG="${GITHUB_REF#refs/tags/}"
+            {
+              echo "tag=$TAG"
+              echo "full_name=ghcr.io/${REPO_LOWER}:$TAG"
+            } >> "$GITHUB_OUTPUT"
+          else
+            SHORT_SHA=$(git rev-parse --short HEAD)
+            {
+              echo "tag=$SHORT_SHA"
+              echo "full_name=ghcr.io/${REPO_LOWER}:$SHORT_SHA"
+            } >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Build and Push Docker images
+        uses: docker/bake-action@v5
+        with:
+          pull: true
+          push: true
+          files: |
+            compose.yaml
+            compose.build.yaml
+          set: |
+            *.cache-from=type=gha,scope=${{github.ref}}
+            *.cache-from=type=gha,scope=refs/heads/main
+            *.cache-to=type=gha,scope=${{github.ref}},mode=max
+            *.tags=${{ steps.meta.outputs.full_name }}
+
+      - name: Trigger Portainer Deployment
+        shell: bash
        env:
          PORTAINER_WEBHOOK: ${{secrets.PORTAINER_WEBHOOK}}
        run: |
-          curl -v -X POST "$PORTAINER_WEBHOOK"
+          curl -v -X POST "$PORTAINER_WEBHOOK"?IMAGE_TAG=${{steps.meta.outputs.tag}} --fail-with-body
--- a/.idea/TijdVoorDeTest.iml
+++ b/.idea/TijdVoorDeTest.iml
@@ -116,15 +116,12 @@
      <excludeFolder url="file://$MODULE_DIR$/vendor/thecodingmachine/phpstan-safe-rule" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/thecodingmachine/safe" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/twig/twig" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/easycorp/easyadmin-bundle" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/intl" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/mime" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-intl-idn" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/translation" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/ux-twig-component" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/validator" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/twig/extra-bundle" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/twig/html-extra" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/data-fixtures" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/doctrine-fixtures-bundle" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/vincentlanglet/twig-cs-fixer" />
@@ -167,6 +164,10 @@
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/ux-turbo" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-uuid" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/brevo-mailer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/martin-georgiev/postgresql-for-doctrine" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/dama/doctrine-test-bundle" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/gedmo/doctrine-extensions" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/stof/doctrine-extensions-bundle" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/.idea/php-test-framework.xml
+++ b/.idea/php-test-framework.xml
@@ -5,7 +5,7 @@
      <tool tool_name="PHPUnit">
        <cache>
          <versions>
-            <info id="interpreter-96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" version="12.1.2" />
+            <info id="interpreter-96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" version="12.4.1" />
          </versions>
        </cache>
      </tool>
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -36,168 +36,169 @@
  </component>
  <component name="PhpIncludePathManager">
    <include_path>
-      <path value="$PROJECT_DIR$/vendor/react/stream" />
-      <path value="$PROJECT_DIR$/vendor/react/promise" />
-      <path value="$PROJECT_DIR$/vendor/react/event-loop" />
-      <path value="$PROJECT_DIR$/vendor/react/cache" />
-      <path value="$PROJECT_DIR$/vendor/react/child-process" />
-      <path value="$PROJECT_DIR$/vendor/jean85/pretty-package-versions" />
-      <path value="$PROJECT_DIR$/vendor/react/dns" />
-      <path value="$PROJECT_DIR$/vendor/react/socket" />
-      <path value="$PROJECT_DIR$/vendor/sentry/sentry" />
-      <path value="$PROJECT_DIR$/vendor/staabm/side-effects-detector" />
-      <path value="$PROJECT_DIR$/vendor/rector/rector" />
-      <path value="$PROJECT_DIR$/vendor/sentry/sentry-symfony" />
-      <path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
-      <path value="$PROJECT_DIR$/vendor/phar-io/version" />
-      <path value="$PROJECT_DIR$/vendor/egulias/email-validator" />
-      <path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
-      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-symfony" />
-      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-phpunit" />
-      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan" />
-      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-doctrine" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
-      <path value="$PROJECT_DIR$/vendor/phpstan/extension-installer" />
-      <path value="$PROJECT_DIR$/vendor/phpstan/phpdoc-parser" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-invoker" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-icu" />
-      <path value="$PROJECT_DIR$/vendor/symfony/form" />
-      <path value="$PROJECT_DIR$/vendor/runtime/frankenphp-symfony" />
-      <path value="$PROJECT_DIR$/vendor/symfony/framework-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/validator" />
-      <path value="$PROJECT_DIR$/vendor/symfony/cache" />
-      <path value="$PROJECT_DIR$/vendor/symfony/serializer" />
-      <path value="$PROJECT_DIR$/vendor/symfony/dotenv" />
-      <path value="$PROJECT_DIR$/vendor/symfony/security-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/intl" />
-      <path value="$PROJECT_DIR$/vendor/symfony/asset" />
-      <path value="$PROJECT_DIR$/vendor/symfony/browser-kit" />
-      <path value="$PROJECT_DIR$/vendor/symfony/config" />
-      <path value="$PROJECT_DIR$/vendor/symfony/security-http" />
-      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
-      <path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
-      <path value="$PROJECT_DIR$/vendor/symfony/runtime" />
-      <path value="$PROJECT_DIR$/vendor/symfony/uid" />
-      <path value="$PROJECT_DIR$/vendor/symfony/asset-mapper" />
-      <path value="$PROJECT_DIR$/vendor/symfony/mailer" />
-      <path value="$PROJECT_DIR$/vendor/symfony/filesystem" />
-      <path value="$PROJECT_DIR$/vendor/symfony/phpunit-bridge" />
-      <path value="$PROJECT_DIR$/vendor/symfony/var-dumper" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-idn" />
-      <path value="$PROJECT_DIR$/vendor/symfony/maker-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/options-resolver" />
-      <path value="$PROJECT_DIR$/vendor/symfony/security-csrf" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-normalizer" />
-      <path value="$PROJECT_DIR$/vendor/symfony/css-selector" />
-      <path value="$PROJECT_DIR$/vendor/symfony/twig-bridge" />
-      <path value="$PROJECT_DIR$/vendor/symfony/web-profiler-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/property-access" />
-      <path value="$PROJECT_DIR$/vendor/symfony/twig-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/dom-crawler" />
-      <path value="$PROJECT_DIR$/vendor/symfony/http-client" />
-      <path value="$PROJECT_DIR$/vendor/symfony/stopwatch" />
-      <path value="$PROJECT_DIR$/vendor/symfony/finder" />
-      <path value="$PROJECT_DIR$/vendor/symfony/yaml" />
-      <path value="$PROJECT_DIR$/vendor/symfony/mime" />
-      <path value="$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge" />
-      <path value="$PROJECT_DIR$/vendor/symfony/http-kernel" />
-      <path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/routing" />
-      <path value="$PROJECT_DIR$/vendor/symfony/string" />
-      <path value="$PROJECT_DIR$/vendor/symfony/security-core" />
-      <path value="$PROJECT_DIR$/vendor/symfony/property-info" />
-      <path value="$PROJECT_DIR$/vendor/symfony/type-info" />
-      <path value="$PROJECT_DIR$/vendor/symfony/service-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/http-client-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/var-exporter" />
-      <path value="$PROJECT_DIR$/vendor/symfony/flex" />
-      <path value="$PROJECT_DIR$/vendor/symfony/http-foundation" />
-      <path value="$PROJECT_DIR$/vendor/symfony/doctrine-bridge" />
-      <path value="$PROJECT_DIR$/vendor/symfony/dependency-injection" />
-      <path value="$PROJECT_DIR$/vendor/symfony/clock" />
-      <path value="$PROJECT_DIR$/vendor/symfony/error-handler" />
-      <path value="$PROJECT_DIR$/vendor/symfony/cache-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/console" />
-      <path value="$PROJECT_DIR$/vendor/symfony/ux-twig-component" />
-      <path value="$PROJECT_DIR$/vendor/symfony/password-hasher" />
-      <path value="$PROJECT_DIR$/vendor/symfony/process" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-grapheme" />
-      <path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-migrations-bundle" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/lexer" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/dbal" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/migrations" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/data-fixtures" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-fixtures-bundle" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/persistence" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/collections" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/sql-formatter" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/orm" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/event-manager" />
-      <path value="$PROJECT_DIR$/vendor/easycorp/easyadmin-bundle" />
-      <path value="$PROJECT_DIR$/vendor/evenement/evenement" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/deprecations" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle" />
-      <path value="$PROJECT_DIR$/vendor/markbaker/matrix" />
-      <path value="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet" />
-      <path value="$PROJECT_DIR$/vendor/maennchen/zipstream-php" />
-      <path value="$PROJECT_DIR$/vendor/markbaker/complex" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
-      <path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/diff" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/complexity" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/version" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/cli-parser" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/lines-of-code" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/type" />
-      <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
-      <path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/environment" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
-      <path value="$PROJECT_DIR$/vendor/symfonycasts/verify-email-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfonycasts/sass-bundle" />
-      <path value="$PROJECT_DIR$/vendor/masterminds/html5" />
-      <path value="$PROJECT_DIR$/vendor/friendsofphp/php-cs-fixer" />
-      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
-      <path value="$PROJECT_DIR$/vendor/vincentlanglet/twig-cs-fixer" />
-      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
-      <path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
-      <path value="$PROJECT_DIR$/vendor/thecodingmachine/safe" />
-      <path value="$PROJECT_DIR$/vendor/thecodingmachine/phpstan-safe-rule" />
      <path value="$PROJECT_DIR$/vendor/composer" />
-      <path value="$PROJECT_DIR$/vendor/psr/http-message" />
-      <path value="$PROJECT_DIR$/vendor/psr/container" />
-      <path value="$PROJECT_DIR$/vendor/psr/cache" />
-      <path value="$PROJECT_DIR$/vendor/psr/event-dispatcher" />
-      <path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
-      <path value="$PROJECT_DIR$/vendor/psr/clock" />
+      <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
+      <path value="$PROJECT_DIR$/vendor/martin-georgiev/postgresql-for-doctrine" />
+      <path value="$PROJECT_DIR$/vendor/dama/doctrine-test-bundle" />
+      <path value="$PROJECT_DIR$/vendor/staabm/side-effects-detector" />
      <path value="$PROJECT_DIR$/vendor/psr/http-client" />
+      <path value="$PROJECT_DIR$/vendor/psr/container" />
+      <path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
      <path value="$PROJECT_DIR$/vendor/psr/log" />
-      <path value="$PROJECT_DIR$/vendor/twig/extra-bundle" />
-      <path value="$PROJECT_DIR$/vendor/twig/intl-extra" />
-      <path value="$PROJECT_DIR$/vendor/psr/http-factory" />
-      <path value="$PROJECT_DIR$/vendor/clue/ndjson-react" />
+      <path value="$PROJECT_DIR$/vendor/psr/cache" />
+      <path value="$PROJECT_DIR$/vendor/psr/http-message" />
+      <path value="$PROJECT_DIR$/vendor/psr/event-dispatcher" />
+      <path value="$PROJECT_DIR$/vendor/symfony/cache" />
+      <path value="$PROJECT_DIR$/vendor/symfony/validator" />
+      <path value="$PROJECT_DIR$/vendor/symfony/asset" />
      <path value="$PROJECT_DIR$/vendor/fidry/cpu-core-counter" />
-      <path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
-      <path value="$PROJECT_DIR$/vendor/twig/html-extra" />
-      <path value="$PROJECT_DIR$/vendor/twig/twig" />
      <path value="$PROJECT_DIR$/vendor/symfony/ux-turbo" />
-      <path value="$PROJECT_DIR$/vendor/symfony/stimulus-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-uuid" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php84" />
+      <path value="$PROJECT_DIR$/vendor/symfony/form" />
+      <path value="$PROJECT_DIR$/vendor/vincentlanglet/twig-cs-fixer" />
+      <path value="$PROJECT_DIR$/vendor/symfony/dotenv" />
+      <path value="$PROJECT_DIR$/vendor/symfony/serializer" />
+      <path value="$PROJECT_DIR$/vendor/rector/rector" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpdoc-parser" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/extension-installer" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-icu" />
+      <path value="$PROJECT_DIR$/vendor/symfonycasts/sass-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/framework-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfonycasts/verify-email-bundle" />
+      <path value="$PROJECT_DIR$/vendor/psr/http-factory" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-doctrine" />
+      <path value="$PROJECT_DIR$/vendor/psr/clock" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan" />
+      <path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-phpunit" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-symfony" />
+      <path value="$PROJECT_DIR$/vendor/symfony/mailer" />
      <path value="$PROJECT_DIR$/vendor/symfony/brevo-mailer" />
+      <path value="$PROJECT_DIR$/vendor/symfony/options-resolver" />
+      <path value="$PROJECT_DIR$/vendor/symfony/filesystem" />
+      <path value="$PROJECT_DIR$/vendor/symfony/runtime" />
+      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
+      <path value="$PROJECT_DIR$/vendor/symfony/var-dumper" />
+      <path value="$PROJECT_DIR$/vendor/symfony/phpunit-bridge" />
+      <path value="$PROJECT_DIR$/vendor/symfony/security-http" />
+      <path value="$PROJECT_DIR$/vendor/symfony/config" />
+      <path value="$PROJECT_DIR$/vendor/symfony/asset-mapper" />
+      <path value="$PROJECT_DIR$/vendor/symfony/uid" />
+      <path value="$PROJECT_DIR$/vendor/symfony/intl" />
+      <path value="$PROJECT_DIR$/vendor/symfony/security-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
+      <path value="$PROJECT_DIR$/vendor/symfony/http-client" />
+      <path value="$PROJECT_DIR$/vendor/friendsofphp/php-cs-fixer" />
+      <path value="$PROJECT_DIR$/vendor/gedmo/doctrine-extensions" />
+      <path value="$PROJECT_DIR$/vendor/symfony/finder" />
+      <path value="$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge" />
+      <path value="$PROJECT_DIR$/vendor/symfony/stopwatch" />
+      <path value="$PROJECT_DIR$/vendor/masterminds/html5" />
+      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/twig-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/property-access" />
+      <path value="$PROJECT_DIR$/vendor/symfony/web-profiler-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-uuid" />
+      <path value="$PROJECT_DIR$/vendor/symfony/css-selector" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-normalizer" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-idn" />
+      <path value="$PROJECT_DIR$/vendor/symfony/security-csrf" />
+      <path value="$PROJECT_DIR$/vendor/symfony/twig-bridge" />
+      <path value="$PROJECT_DIR$/vendor/symfony/maker-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/var-exporter" />
+      <path value="$PROJECT_DIR$/vendor/symfony/doctrine-bridge" />
+      <path value="$PROJECT_DIR$/vendor/symfony/error-handler" />
+      <path value="$PROJECT_DIR$/vendor/symfony/flex" />
+      <path value="$PROJECT_DIR$/vendor/symfony/property-info" />
+      <path value="$PROJECT_DIR$/vendor/symfony/http-client-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/http-foundation" />
+      <path value="$PROJECT_DIR$/vendor/symfony/type-info" />
+      <path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
+      <path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/security-core" />
+      <path value="$PROJECT_DIR$/vendor/symfony/service-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/routing" />
+      <path value="$PROJECT_DIR$/vendor/symfony/yaml" />
+      <path value="$PROJECT_DIR$/vendor/symfony/http-kernel" />
+      <path value="$PROJECT_DIR$/vendor/symfony/string" />
+      <path value="$PROJECT_DIR$/vendor/symfony/mime" />
+      <path value="$PROJECT_DIR$/vendor/markbaker/matrix" />
+      <path value="$PROJECT_DIR$/vendor/markbaker/complex" />
+      <path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
+      <path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
+      <path value="$PROJECT_DIR$/vendor/symfony/process" />
+      <path value="$PROJECT_DIR$/vendor/symfony/password-hasher" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-grapheme" />
+      <path value="$PROJECT_DIR$/vendor/symfony/console" />
+      <path value="$PROJECT_DIR$/vendor/symfony/dependency-injection" />
+      <path value="$PROJECT_DIR$/vendor/symfony/cache-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/clock" />
+      <path value="$PROJECT_DIR$/vendor/symfony/stimulus-bundle" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-invoker" />
+      <path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
+      <path value="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
+      <path value="$PROJECT_DIR$/vendor/phar-io/version" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
+      <path value="$PROJECT_DIR$/vendor/clue/ndjson-react" />
+      <path value="$PROJECT_DIR$/vendor/react/socket" />
+      <path value="$PROJECT_DIR$/vendor/react/dns" />
+      <path value="$PROJECT_DIR$/vendor/react/child-process" />
+      <path value="$PROJECT_DIR$/vendor/react/cache" />
+      <path value="$PROJECT_DIR$/vendor/react/event-loop" />
+      <path value="$PROJECT_DIR$/vendor/react/promise" />
+      <path value="$PROJECT_DIR$/vendor/react/stream" />
+      <path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
+      <path value="$PROJECT_DIR$/vendor/runtime/frankenphp-symfony" />
+      <path value="$PROJECT_DIR$/vendor/twig/twig" />
+      <path value="$PROJECT_DIR$/vendor/twig/intl-extra" />
+      <path value="$PROJECT_DIR$/vendor/thecodingmachine/phpstan-safe-rule" />
+      <path value="$PROJECT_DIR$/vendor/thecodingmachine/safe" />
+      <path value="$PROJECT_DIR$/vendor/twig/extra-bundle" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
+      <path value="$PROJECT_DIR$/vendor/maennchen/zipstream-php" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/version" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/type" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/environment" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/cli-parser" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/diff" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/complexity" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/lines-of-code" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
+      <path value="$PROJECT_DIR$/vendor/sentry/sentry" />
+      <path value="$PROJECT_DIR$/vendor/sentry/sentry-symfony" />
+      <path value="$PROJECT_DIR$/vendor/egulias/email-validator" />
+      <path value="$PROJECT_DIR$/vendor/jean85/pretty-package-versions" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/sql-formatter" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/collections" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/deprecations" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-fixtures-bundle" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/event-manager" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/orm" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/dbal" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/lexer" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/persistence" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-migrations-bundle" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/data-fixtures" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/migrations" />
+      <path value="$PROJECT_DIR$/vendor/evenement/evenement" />
+      <path value="$PROJECT_DIR$/vendor/stof/doctrine-extensions-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php84" />
+      <path value="$PROJECT_DIR$/vendor/symfony/dom-crawler" />
+      <path value="$PROJECT_DIR$/vendor/symfony/browser-kit" />
    </include_path>
  </component>
  <component name="PhpInterpreters">
@@ -276,7 +277,7 @@
      </interpreter>
    </phpInfoCache>
  </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="8.4" />
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.5" />
  <component name="PhpStan">
    <PhpStan_settings>
      <phpstan_by_interpreter interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" tool_path="vendor/bin/phpstan" timeout="60000" />
@@ -291,7 +292,7 @@
  </component>
  <component name="PhpUnit">
    <phpunit_settings>
-      <phpunit_by_interpreter interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" configuration_file_path="phpunit.xml.dist" custom_loader_path="vendor/autoload.php" phpunit_phar_path="" use_configuration_file="true" />
+      <phpunit_by_interpreter interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" bootstrap_file_path="./tests/bootstrap.php" configuration_file_path="./phpunit.dist.xml" custom_loader_path="/app/vendor/autoload.php" phpunit_phar_path="" use_bootstrap_file="true" use_configuration_file="true" />
    </phpunit_settings>
  </component>
  <component name="Psalm">
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -5,13 +5,14 @@ use PhpCsFixer\Config;
 use PhpCsFixer\Finder;
 use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;

-$finder = (new Finder())
+$finder = new Finder()
    ->in(__DIR__)
    ->exclude('var')
    ->exclude('bin')
+    ->notPath(['config/reference.php'])
 ;

-return (new Config())
+return new Config()
    ->setParallelConfig(ParallelConfigFactory::detect())
    ->setRules([
        '@Symfony' => true,
@@ -24,15 +25,16 @@ return (new Config())
        'no_unreachable_default_argument_value' => true,
        'no_useless_else' => true,
        'no_useless_return' => true,
-        'php_unit_strict' => true,
        'phpdoc_line_span' => ['const' => 'single', 'method' => 'single', 'property' => 'single'],
        'phpdoc_order' => true,
        'single_line_empty_body' => true,
        'strict_comparison' => true,
        'strict_param' => true,
+        'ordered_attributes' => true,
+        'heredoc_indentation' => ['indentation' => 'start_plus_one'],
        'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['arguments', 'array_destructuring', 'arrays', 'match', 'parameters']],
-
    ])
    ->setRiskyAllowed(true)
    ->setFinder($finder)
+    ->setUnsupportedPhpVersionAllowed(true)
 ;
--- a/16
+++ b/16
@@ -1,7 +1,7 @@
 #syntax=docker/dockerfile:1

 # Versions
-FROM dunglas/frankenphp:1-php8.4 AS frankenphp_upstream
+FROM dunglas/frankenphp:1-php8.5 AS frankenphp_upstream

 # The different stages of this Dockerfile are meant to be built into separate images
 # https://docs.docker.com/develop/develop-images/multistage-build/#stop-at-a-specific-build-stage
@@ -32,7 +32,7 @@ RUN set -eux; \
 		opcache \
 		zip \
 		gd \
-		excimer-1.2.3 \
+		excimer \
 	;

 # https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
@@ -60,11 +60,19 @@ FROM frankenphp_base AS frankenphp_dev

 ENV APP_ENV=dev XDEBUG_MODE=off

+# hadolint ignore=DL3008
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    bash-completion \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY --link frankenphp/console-complete.bash /usr/share/bash-completion/completions/console
+COPY --link frankenphp/composer-complete.bash /usr/share/bash-completion/completions/composer
+
 RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"

 RUN set -eux; \
 	install-php-extensions \
-		xdebug \
+		xdebug/xdebug@3.5.0alpha3 \
 	;

 COPY --link frankenphp/conf.d/20-app.dev.ini $PHP_INI_DIR/app.conf.d/
@@ -76,6 +84,8 @@ CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile", "--watch" ]
 # Prod FrankenPHP image
 FROM frankenphp_base AS frankenphp_prod

+RUN rm -rf /var/lib/apt/lists/*
+
 ENV APP_ENV=prod
 ENV FRANKENPHP_CONFIG="import worker.Caddyfile"

--- a/14
+++ b/14
@@ -1,8 +1,8 @@
-up:
-    docker compose up -d
+up *args:
+    docker compose up -d {{ args }}

 down *args:
-    docker compose down {{ args }} --remove-orphans
+    docker compose down --remove-orphans {{ args }}

 stop:
    docker compose stop
@@ -20,7 +20,7 @@ migrate: up
    docker compose run --rm php bin/console doctrine:migrations:migrate --no-interaction

 fixtures:
-    docker compose exec php bin/console doctrine:fixtures:load --purge-with-truncate --no-interaction
+    docker compose exec php bin/console doctrine:fixtures:load --purge-with-truncate --no-interaction --group=dev

 translations:
    docker compose exec php bin/console translation:extract --force --format=xliff --sort=asc --clean nl
@@ -39,3 +39,9 @@ phpstan *args:
 clean:
    docker compose down -v --remove-orphans
    rm -rf vendor var assets/vendor public/assets public/bundles .php-cs-fixer.cache .twig-cs-fixer.cache
+
+reload-tests:
+    @docker compose exec php bin/console --env=test doctrine:database:drop --if-exists --force
+    @docker compose exec php bin/console --env=test doctrine:database:create
+    @docker compose exec php bin/console --env=test doctrine:migrations:migrate -n
+    @docker compose exec php bin/console --env=test doctrine:fixtures:load -n --group=test
--- a/compose.build.yaml
+++ b/compose.build.yaml
@@ -0,0 +1,5 @@
+services:
+  php:
+    build:
+      context: .
+      target: frankenphp_prod
--- a/compose.override.yaml
+++ b/compose.override.yaml
@@ -15,7 +15,6 @@ services:
      # See https://xdebug.org/docs/all_settings#mode
      XDEBUG_MODE: "${XDEBUG_MODE:-off}"
      MAILER_DSN: "smtp://mailer:1025"
-      PHP_CS_FIXER_IGNORE_ENV: 1
    extra_hosts:
      # Ensure that host.docker.internal is correctly defined on Linux
      - host.docker.internal:host-gateway
--- a/compose.prod.yaml
+++ b/compose.prod.yaml
@@ -1,9 +1,7 @@
 # Production environment override
 services:
  php:
-    build:
-      context: .
-      target: frankenphp_prod
+    image: ghcr.io/marijndoeve/tijdvoordetest:${IMAGE_TAG}
    environment:
      APP_SECRET: ${APP_SECRET}
      MERCURE_PUBLISHER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET}
--- a/composer.json
+++ b/composer.json
@@ -6,64 +6,68 @@
    "minimum-stability": "stable",
    "prefer-stable": true,
    "require": {
-        "php": ">=8.4",
+        "php": ">=8.5",
        "ext-ctype": "*",
        "ext-iconv": "*",
-        "doctrine/dbal": "^4.3.3",
-        "doctrine/doctrine-bundle": "^2.16.2",
-        "doctrine/doctrine-migrations-bundle": "^3.4.2",
-        "doctrine/orm": "^3.5.2",
-        "easycorp/easyadmin-bundle": "^4.25.1",
-        "phpdocumentor/reflection-docblock": "^5.6.3",
-        "phpoffice/phpspreadsheet": "^5.1",
+        "doctrine/dbal": "^4.3.4",
+        "doctrine/doctrine-bundle": "^3.0",
+        "doctrine/doctrine-migrations-bundle": "^3.7.0",
+        "doctrine/orm": "^3.5.7",
+        "martin-georgiev/postgresql-for-doctrine": "^3.6.2",
+        "phpdocumentor/reflection-docblock": "^5.6.4",
+        "phpoffice/phpspreadsheet": "^5.3",
        "phpstan/phpdoc-parser": "^2.3",
        "runtime/frankenphp-symfony": "^0.2.0",
        "sentry/sentry-symfony": "^5.6",
-        "symfony/asset": "7.3.*",
-        "symfony/asset-mapper": "7.3.*",
-        "symfony/brevo-mailer": "7.3.*",
-        "symfony/console": "7.3.*",
-        "symfony/dotenv": "7.3.*",
-        "symfony/flex": "^2.8.2",
-        "symfony/form": "7.3.*",
-        "symfony/framework-bundle": "7.3.*",
-        "symfony/mailer": "7.3.*",
-        "symfony/property-access": "7.3.*",
-        "symfony/property-info": "7.3.*",
-        "symfony/runtime": "7.3.*",
-        "symfony/security-bundle": "7.3.*",
-        "symfony/security-csrf": "7.3.*",
-        "symfony/serializer": "7.3.*",
-        "symfony/twig-bundle": "7.3.*",
-        "symfony/uid": "7.3.*",
-        "symfony/ux-turbo": "^2.30.0",
-        "symfony/yaml": "7.3.*",
+        "stof/doctrine-extensions-bundle": "^1.14",
+        "symfony/asset": "7.4.*",
+        "symfony/asset-mapper": "7.4.*",
+        "symfony/brevo-mailer": "7.4.*",
+        "symfony/console": "7.4.*",
+        "symfony/dotenv": "7.4.*",
+        "symfony/flex": "^2.10.0",
+        "symfony/form": "7.4.*",
+        "symfony/framework-bundle": "7.4.*",
+        "symfony/mailer": "7.4.*",
+        "symfony/property-access": "7.4.*",
+        "symfony/property-info": "7.4.*",
+        "symfony/runtime": "7.4.*",
+        "symfony/security-bundle": "7.4.*",
+        "symfony/security-csrf": "7.4.*",
+        "symfony/serializer": "7.4.*",
+        "symfony/translation": "7.4.*",
+        "symfony/twig-bundle": "7.4.*",
+        "symfony/uid": "7.4.*",
+        "symfony/ux-turbo": "^2.31.0",
+        "symfony/validator": "7.4.*",
+        "symfony/yaml": "7.4.*",
        "symfonycasts/sass-bundle": "^0.8.3",
        "symfonycasts/verify-email-bundle": "^1.17.4",
        "thecodingmachine/safe": "^3.3.0",
-        "twig/extra-bundle": "^3.21",
-        "twig/intl-extra": "^3.21",
-        "twig/twig": "^3.21.1"
+        "twig/extra-bundle": "^3.22.1",
+        "twig/intl-extra": "^3.22.1",
+        "twig/twig": "^3.22.0"
    },
    "require-dev": {
-        "doctrine/doctrine-fixtures-bundle": "^4.1",
-        "friendsofphp/php-cs-fixer": "^3.88.2",
+        "dama/doctrine-test-bundle": "^8.4",
+        "doctrine/doctrine-fixtures-bundle": "^4.3",
+        "friendsofphp/php-cs-fixer": "^3.90.0",
        "phpstan/extension-installer": "^1.4.3",
-        "phpstan/phpstan": "^2.1.29",
-        "phpstan/phpstan-doctrine": "^2.0.6",
-        "phpstan/phpstan-phpunit": "^2.0.7",
+        "phpstan/phpstan": "^2.1.32",
+        "phpstan/phpstan-doctrine": "^2.0.11",
+        "phpstan/phpstan-phpunit": "^2.0.8",
        "phpstan/phpstan-symfony": "^2.0.8",
-        "phpunit/phpunit": "^12.3.15",
-        "rector/rector": "^2.1.7",
+        "phpunit/phpunit": "^12.4.4",
+        "rector/rector": "^2.2.9",
        "roave/security-advisories": "dev-latest",
-        "symfony/browser-kit": "7.3.*",
-        "symfony/css-selector": "7.3.*",
-        "symfony/maker-bundle": "^1.64.0",
-        "symfony/phpunit-bridge": "7.3.*",
-        "symfony/stopwatch": "7.3.*",
-        "symfony/web-profiler-bundle": "7.3.*",
-        "thecodingmachine/phpstan-safe-rule": "^1.4.1",
-        "vincentlanglet/twig-cs-fixer": "^3.10.0"
+        "symfony/browser-kit": "7.4.*",
+        "symfony/css-selector": "7.4.*",
+        "symfony/maker-bundle": "^1.65.1",
+        "symfony/phpunit-bridge": "7.4.*",
+        "symfony/stopwatch": "7.4.*",
+        "symfony/web-profiler-bundle": "7.4.*",
+        "thecodingmachine/phpstan-safe-rule": "^1.4.3",
+        "vincentlanglet/twig-cs-fixer": "^3.11.0"
    },
    "config": {
        "allow-plugins": {
@@ -96,7 +100,8 @@
        "symfony/polyfill-php81": "*",
        "symfony/polyfill-php82": "*",
        "symfony/polyfill-php83": "*",
-        "symfony/polyfill-php84": "*"
+        "symfony/polyfill-php84": "*",
+        "symfony/polyfill-php85": "*"
    },
    "scripts": {
        "auto-scripts": {
@@ -117,7 +122,7 @@
    "extra": {
        "symfony": {
            "allow-contrib": false,
-            "require": "7.3.*",
+            "require": "7.4.*",
            "docker": true
        }
    }
--- a/composer.lock
+++ b/composer.lock
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -2,11 +2,12 @@

 declare(strict_types=1);

+use DAMA\DoctrineTestBundle\DAMADoctrineTestBundle;
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle;
 use Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle;
-use EasyCorp\Bundle\EasyAdminBundle\EasyAdminBundle;
 use Sentry\SentryBundle\SentryBundle;
+use Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\MakerBundle\MakerBundle;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
@@ -14,7 +15,6 @@ use Symfony\Bundle\TwigBundle\TwigBundle;
 use Symfony\Bundle\WebProfilerBundle\WebProfilerBundle;
 use Symfony\UX\StimulusBundle\StimulusBundle;
 use Symfony\UX\Turbo\TurboBundle;
-use Symfony\UX\TwigComponent\TwigComponentBundle;
 use SymfonyCasts\Bundle\VerifyEmail\SymfonyCastsVerifyEmailBundle;
 use Symfonycasts\SassBundle\SymfonycastsSassBundle;
 use Twig\Extra\TwigExtraBundle\TwigExtraBundle;
@@ -28,12 +28,12 @@ return [
    SecurityBundle::class => ['all' => true],
    WebProfilerBundle::class => ['dev' => true, 'test' => true],
    TwigExtraBundle::class => ['all' => true],
-    TwigComponentBundle::class => ['all' => true],
-    EasyAdminBundle::class => ['all' => true],
    DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
    SymfonyCastsVerifyEmailBundle::class => ['all' => true],
    SentryBundle::class => ['prod' => true],
    SymfonycastsSassBundle::class => ['all' => true],
    StimulusBundle::class => ['all' => true],
    TurboBundle::class => ['all' => true],
+    DAMADoctrineTestBundle::class => ['test' => true],
+    StofDoctrineExtensionsBundle::class => ['all' => true],
 ];
--- a/config/packages/dama_doctrine_test_bundle.yaml
+++ b/config/packages/dama_doctrine_test_bundle.yaml
@@ -0,0 +1,5 @@
+when@test:
+    dama_doctrine_test:
+        enable_static_connection: true
+        enable_static_meta_data_cache: true
+        enable_static_query_cache: true
--- a/config/packages/doctrine.yaml
+++ b/config/packages/doctrine.yaml
@@ -2,16 +2,22 @@ doctrine:
    dbal:
        url: '%env(resolve:DATABASE_URL)%'
        
-        # IMPORTANT: You MUST configure your server version,
-        # either here or in the DATABASE_URL env var (see .env file)
-        #server_version: '16'
-        
        profiling_collect_backtrace: '%kernel.debug%'
-        use_savepoints: true
+        types:
+            # JSON types
+            jsonb: MartinGeorgiev\Doctrine\DBAL\Types\Jsonb
+            'jsonb[]': MartinGeorgiev\Doctrine\DBAL\Types\JsonbArray
+            tsrange: MartinGeorgiev\Doctrine\DBAL\Types\TsRange
+        mapping_types:
+            # JSON type mappings
+            jsonb: jsonb
+            'jsonb[]': 'jsonb[]'
+            _jsonb: 'jsonb[]'
+            tsrange: tsrange
+    
+    
    orm:
-        auto_generate_proxy_classes: true
-        enable_lazy_ghost_objects: true
-        report_fields_where_declared: true
+        enable_native_lazy_objects: true
        validate_xml_mapping: true
        naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
        identity_generation_preferences:
@@ -36,8 +42,6 @@ when@test:
 when@prod:
    doctrine:
        orm:
-            auto_generate_proxy_classes: false
-            proxy_dir: '%kernel.build_dir%/doctrine/orm/Proxies'
            query_cache_driver:
                type: pool
                pool: doctrine.system_cache_pool
--- a/config/packages/sentry.yaml
+++ b/config/packages/sentry.yaml
@@ -1,31 +1,36 @@
 when@prod:
    sentry:
        dsn: '%env(SENTRY_DSN)%'
+        options:
            # Add request headers, cookies, IP address and the authenticated user
            # see https://docs.sentry.io/platforms/php/data-management/data-collected/ for more info
            # send_default_pii: true
-        
-        options:
-            traces_sample_rate: 1.0
-            profiles_sample_rate: 1.0
            ignore_exceptions:
                - 'Symfony\Component\ErrorHandler\Error\FatalError'
                - 'Symfony\Component\Debug\Exception\FatalErrorException'
-
-#        If you are using Monolog, you also need this additional configuration to log the errors correctly:
-#        https://docs.sentry.io/platforms/php/guides/symfony/#monolog-integration
+#
+#        # If you are using Monolog, you also need this additional configuration to log the errors correctly:
+#        # https://docs.sentry.io/platforms/php/guides/symfony/#monolog-integration
 #        register_error_listener: false
 #        register_error_handler: false
-
+#
 #    monolog:
 #        handlers:
+#            # Use this only if you don't want to use structured logging and instead receive
+#            # certain log levels as errors.  
 #            sentry:
 #                type: sentry
 #                level: !php/const Monolog\Logger::ERROR
 #                hub_id: Sentry\State\HubInterface
-
-#    Uncomment these lines to register a log message processor that resolves PSR-3 placeholders
-#    https://docs.sentry.io/platforms/php/guides/symfony/#monolog-integration
+#                fill_extra_context: true # Enables sending monolog context to Sentry
+#                process_psr_3_messages: false # Disables the resolution of PSR-3 placeholders
+#
+#            # Use this for structured log integration
+#            sentry_logs:
+#                type: service
+#                id: Sentry\SentryBundle\Monolog\LogsHandler
+#
 #    services:
-#        Monolog\Processor\PsrLogMessageProcessor:
-#            tags: { name: monolog.processor, handler: sentry }
+#        Sentry\SentryBundle\Monolog\LogsHandler:
+#            arguments:
+#                - !php/const Monolog\Logger::INFO
--- a/config/packages/stof_doctrine_extensions.yaml
+++ b/config/packages/stof_doctrine_extensions.yaml
@@ -0,0 +1,7 @@
+# Read the documentation: https://symfony.com/doc/current/bundles/StofDoctrineExtensionsBundle/index.html
+# See the official DoctrineExtensions documentation for more details: https://github.com/doctrine-extensions/DoctrineExtensions/tree/main/doc
+stof_doctrine_extensions:
+    default_locale: nl
+    orm:
+        default:
+            timestampable: true
--- a/config/packages/twig_component.yaml
+++ b/config/packages/twig_component.yaml
@@ -1,5 +0,0 @@
-twig_component:
-    anonymous_template_directory: 'components/'
-    defaults:
-        # Namespace & directory for components
-        Tvdt\Twig\Components\: 'components/'
--- a/config/packages/uid.yaml
+++ b/config/packages/uid.yaml
@@ -1,4 +0,0 @@
-framework:
-    uid:
-        default_uuid_version: 7
-        time_based_uuid_version: 7
--- a/config/preload.php
+++ b/config/preload.php
@@ -2,6 +2,6 @@

 declare(strict_types=1);

-if (file_exists(dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php')) {
-    require dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php';
+if (file_exists(dirname(__DIR__).'/var/cache/prod/Tvdt_KernelProdContainer.preload.php')) {
+    require dirname(__DIR__).'/var/cache/prod/Tvdt_KernelProdContainer.preload.php';
 }
--- a/config/reference.php
+++ b/config/reference.php
--- a/config/routes/easyadmin.yaml
+++ b/config/routes/easyadmin.yaml
@@ -1,3 +0,0 @@
-easyadmin:
-    resource: .
-    type: easyadmin.routes
--- a/frankenphp/composer-complete.bash
+++ b/frankenphp/composer-complete.bash
@@ -0,0 +1,84 @@
+# This file is part of the Symfony package.
+#
+# (c) Fabien Potencier <fabien@symfony.com>
+#
+# For the full copyright and license information, please view
+# https://symfony.com/doc/current/contributing/code/license.html
+
+_sf_composer() {
+    # Use newline as only separator to allow space in completion values
+    local IFS=$'\n'
+    local sf_cmd="${COMP_WORDS[0]}"
+
+    # for an alias, get the real script behind it
+    sf_cmd_type=$(type -t $sf_cmd)
+    if [[ $sf_cmd_type == "alias" ]]; then
+        sf_cmd=$(alias $sf_cmd | sed -E "s/alias $sf_cmd='(.*)'/\1/")
+    elif [[ $sf_cmd_type == "file" ]]; then
+        sf_cmd=$(type -p $sf_cmd)
+    fi
+
+    if [[ $sf_cmd_type != "function" && ! -x $sf_cmd ]]; then
+        return 1
+    fi
+
+    local cur prev words cword
+    _get_comp_words_by_ref -n := cur prev words cword
+
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.11")
+    for w in ${words[@]}; do
+        w=$(printf -- '%b' "$w")
+        # remove quotes from typed values
+        quote="${w:0:1}"
+        if [ "$quote" == \' ]; then
+            w="${w%\'}"
+            w="${w#\'}"
+        elif [ "$quote" == \" ]; then
+            w="${w%\"}"
+            w="${w#\"}"
+        fi
+        # empty values are ignored
+        if [ ! -z "$w" ]; then
+            completecmd+=("-i$w")
+        fi
+    done
+
+    local sfcomplete
+    if sfcomplete=$(${completecmd[@]} 2>&1); then
+        local quote suggestions
+        quote=${cur:0:1}
+
+        # Use single quotes by default if suggestions contains backslash (FQCN)
+        if [ "$quote" == '' ] && [[ "$sfcomplete" =~ \\ ]]; then
+            quote=\'
+        fi
+
+        if [ "$quote" == \' ]; then
+            # single quotes: no additional escaping (does not accept ' in values)
+            suggestions=$(for s in $sfcomplete; do printf $'%q%q%q\n' "$quote" "$s" "$quote"; done)
+        elif [ "$quote" == \" ]; then
+            # double quotes: double escaping for \ $ ` "
+            suggestions=$(for s in $sfcomplete; do
+                s=${s//\\/\\\\}
+                s=${s//\$/\\\$}
+                s=${s//\`/\\\`}
+                s=${s//\"/\\\"}
+                printf $'%q%q%q\n' "$quote" "$s" "$quote";
+            done)
+        else
+            # no quotes: double escaping
+            suggestions=$(for s in $sfcomplete; do printf $'%q\n' $(printf '%q' "$s"); done)
+        fi
+        COMPREPLY=($(IFS=$'\n' compgen -W "$suggestions" -- $(printf -- "%q" "$cur")))
+        __ltrim_colon_completions "$cur"
+    else
+        if [[ "$sfcomplete" != *"Command \"_complete\" is not defined."* ]]; then
+            >&2 echo
+            >&2 echo $sfcomplete
+        fi
+
+        return 1
+    fi
+}
+
+complete -F _sf_composer composer
--- a/frankenphp/console-complete.bash
+++ b/frankenphp/console-complete.bash
@@ -0,0 +1,94 @@
+# This file is part of the Symfony package.
+#
+# (c) Fabien Potencier <fabien@symfony.com>
+#
+# For the full copyright and license information, please view
+# https://symfony.com/doc/current/contributing/code/license.html
+
+_sf_console() {
+
+    # Use the default completion for shell redirect operators.
+    for w in '>' '>>' '&>' '<'; do
+        if [[ $w = "${COMP_WORDS[COMP_CWORD-1]}" ]]; then
+            compopt -o filenames
+            COMPREPLY=($(compgen -f -- "${COMP_WORDS[COMP_CWORD]}"))
+            return 0
+        fi
+    done
+
+    # Use newline as only separator to allow space in completion values
+    local IFS=$'\n'
+    local sf_cmd="${COMP_WORDS[0]}"
+
+    # for an alias, get the real script behind it
+    sf_cmd_type=$(type -t $sf_cmd)
+    if [[ $sf_cmd_type == "alias" ]]; then
+        sf_cmd=$(alias $sf_cmd | sed -E "s/alias $sf_cmd='(.*)'/\1/")
+    elif [[ $sf_cmd_type == "file" ]]; then
+        sf_cmd=$(type -p $sf_cmd)
+    fi
+
+    if [[ $sf_cmd_type != "function" && ! -x $sf_cmd ]]; then
+        return 1
+    fi
+
+    local cur prev words cword
+    _get_comp_words_by_ref -n := cur prev words cword
+
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-a1")
+    for w in ${words[@]}; do
+        w="${w//\\\\/\\}"
+        # remove quotes from typed values
+        quote="${w:0:1}"
+        if [ "$quote" == \' ]; then
+            w="${w%\'}"
+            w="${w#\'}"
+        elif [ "$quote" == \" ]; then
+            w="${w%\"}"
+            w="${w#\"}"
+        fi
+        # empty values are ignored
+        if [ ! -z "$w" ]; then
+            completecmd+=("-i$w")
+        fi
+    done
+
+    local sfcomplete
+    if sfcomplete=$(${completecmd[@]} 2>&1); then
+        local quote suggestions
+        quote=${cur:0:1}
+
+        # Use single quotes by default if suggestions contains backslash (FQCN)
+        if [ "$quote" == '' ] && [[ "$sfcomplete" =~ \\ ]]; then
+            quote=\'
+        fi
+
+        if [ "$quote" == \' ]; then
+            # single quotes: no additional escaping (does not accept ' in values)
+            suggestions=$(for s in $sfcomplete; do printf $'%q%q%q\n' "$quote" "$s" "$quote"; done)
+        elif [ "$quote" == \" ]; then
+            # double quotes: double escaping for \ $ ` "
+            suggestions=$(for s in $sfcomplete; do
+                s=${s//\\/\\\\}
+                s=${s//\$/\\\$}
+                s=${s//\`/\\\`}
+                s=${s//\"/\\\"}
+                printf $'%q%q%q\n' "$quote" "$s" "$quote";
+            done)
+        else
+            # no quotes: double escaping
+            suggestions=$(for s in $sfcomplete; do printf $'%q\n' $(printf '%q' "$s"); done)
+        fi
+        COMPREPLY=($(IFS=$'\n' compgen -W "$suggestions" -- $(printf -- "%q" "$cur")))
+        __ltrim_colon_completions "$cur"
+    else
+        if [[ "$sfcomplete" != *"Command \"_complete\" is not defined."* ]]; then
+            >&2 echo
+            >&2 echo $sfcomplete
+        fi
+
+        return 1
+    fi
+}
+
+complete -F _sf_console console
--- a/migrations/Version20241229195702.php
+++ b/migrations/Version20241229195702.php
@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;

-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20241229195702 extends AbstractMigration
 {
    public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20241229195702 extends AbstractMigration

    public function up(Schema $schema): void
    {
-        // this up() migration is auto-generated, please modify it to your needs
        $this->addSql('CREATE TABLE answer (id UUID NOT NULL, question_id UUID NOT NULL, text VARCHAR(255) NOT NULL, is_right_answer BOOLEAN NOT NULL, PRIMARY KEY(id))');
        $this->addSql('CREATE INDEX IDX_DADD4A251E27F6BF ON answer (question_id)');
        $this->addSql('COMMENT ON COLUMN answer.id IS \'(DC2Type:uuid)\'');
@@ -67,7 +63,6 @@ final class Version20241229195702 extends AbstractMigration

    public function down(Schema $schema): void
    {
-        // this down() migration is auto-generated, please modify it to your needs
        $this->addSql('CREATE SCHEMA public');
        $this->addSql('ALTER TABLE answer DROP CONSTRAINT FK_DADD4A251E27F6BF');
        $this->addSql('ALTER TABLE answer_candidate DROP CONSTRAINT FK_F54D5192AA334807');
--- a/migrations/Version20241229201314.php
+++ b/migrations/Version20241229201314.php
@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;

-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20241229201314 extends AbstractMigration
 {
    public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20241229201314 extends AbstractMigration

    public function up(Schema $schema): void
    {
-        // this up() migration is auto-generated, please modify it to your needs
        $this->addSql('CREATE TABLE season_user (season_id UUID NOT NULL, user_id UUID NOT NULL, PRIMARY KEY(season_id, user_id))');
        $this->addSql('CREATE INDEX IDX_BDA4AD74EC001D1 ON season_user (season_id)');
        $this->addSql('CREATE INDEX IDX_BDA4AD7A76ED395 ON season_user (user_id)');
@@ -31,7 +27,6 @@ final class Version20241229201314 extends AbstractMigration

    public function down(Schema $schema): void
    {
-        // this down() migration is auto-generated, please modify it to your needs
        $this->addSql('CREATE SCHEMA public');
        $this->addSql('ALTER TABLE season_user DROP CONSTRAINT FK_BDA4AD74EC001D1');
        $this->addSql('ALTER TABLE season_user DROP CONSTRAINT FK_BDA4AD7A76ED395');
--- a/migrations/Version20241229202103.php
+++ b/migrations/Version20241229202103.php
@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;

-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20241229202103 extends AbstractMigration
 {
    public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20241229202103 extends AbstractMigration

    public function up(Schema $schema): void
    {
-        // this up() migration is auto-generated, please modify it to your needs
        $this->addSql('CREATE TABLE correction (id UUID NOT NULL, candidate_id UUID NOT NULL, quiz_id UUID NOT NULL, amount DOUBLE PRECISION NOT NULL, PRIMARY KEY(id))');
        $this->addSql('CREATE INDEX IDX_A29DA1B891BD8781 ON correction (candidate_id)');
        $this->addSql('CREATE INDEX IDX_A29DA1B8853CD175 ON correction (quiz_id)');
@@ -32,7 +28,6 @@ final class Version20241229202103 extends AbstractMigration

    public function down(Schema $schema): void
    {
-        // this down() migration is auto-generated, please modify it to your needs
        $this->addSql('CREATE SCHEMA public');
        $this->addSql('ALTER TABLE correction DROP CONSTRAINT FK_A29DA1B891BD8781');
        $this->addSql('ALTER TABLE correction DROP CONSTRAINT FK_A29DA1B8853CD175');
--- a/migrations/Version20241229202155.php
+++ b/migrations/Version20241229202155.php
@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;

-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20241229202155 extends AbstractMigration
 {
    public function getDescription(): string
@@ -19,13 +16,11 @@ final class Version20241229202155 extends AbstractMigration

    public function up(Schema $schema): void
    {
-        // this up() migration is auto-generated, please modify it to your needs
        $this->addSql('CREATE UNIQUE INDEX UNIQ_A29DA1B891BD8781853CD175 ON correction (candidate_id, quiz_id)');
    }

    public function down(Schema $schema): void
    {
-        // this down() migration is auto-generated, please modify it to your needs
        $this->addSql('CREATE SCHEMA public');
        $this->addSql('DROP INDEX UNIQ_A29DA1B891BD8781853CD175');
    }
--- a/migrations/Version20241229204335.php
+++ b/migrations/Version20241229204335.php
@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;

-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20241229204335 extends AbstractMigration
 {
    public function getDescription(): string
@@ -19,14 +16,12 @@ final class Version20241229204335 extends AbstractMigration

    public function up(Schema $schema): void
    {
-        // this up() migration is auto-generated, please modify it to your needs
        $this->addSql('ALTER TABLE given_answer ALTER answer_id DROP NOT NULL');
        $this->addSql('ALTER TABLE given_answer ALTER created DROP NOT NULL');
    }

    public function down(Schema $schema): void
    {
-        // this down() migration is auto-generated, please modify it to your needs
        $this->addSql('CREATE SCHEMA public');
        $this->addSql('ALTER TABLE given_answer ALTER answer_id SET NOT NULL');
        $this->addSql('ALTER TABLE given_answer ALTER created SET NOT NULL');
--- a/migrations/Version20250303221227.php
+++ b/migrations/Version20250303221227.php
@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;

-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20250303221227 extends AbstractMigration
 {
    public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20250303221227 extends AbstractMigration

    public function up(Schema $schema): void
    {
-        // this up() migration is auto-generated, please modify it to your needs
        $this->addSql('ALTER TABLE given_answer ALTER created SET NOT NULL');
        $this->addSql('ALTER TABLE season ADD active_quiz_id UUID DEFAULT NULL');
        $this->addSql('COMMENT ON COLUMN season.active_quiz_id IS \'(DC2Type:uuid)\'');
@@ -29,7 +25,6 @@ final class Version20250303221227 extends AbstractMigration

    public function down(Schema $schema): void
    {
-        // this down() migration is auto-generated, please modify it to your needs
        $this->addSql('CREATE SCHEMA public');
        $this->addSql('ALTER TABLE season DROP CONSTRAINT FK_F0E45BA96706D6B');
        $this->addSql('DROP INDEX IDX_F0E45BA96706D6B');
--- a/migrations/Version20250311213417.php
+++ b/migrations/Version20250311213417.php
@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;

-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20250311213417 extends AbstractMigration
 {
    public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20250311213417 extends AbstractMigration

    public function up(Schema $schema): void
    {
-        // this up() migration is auto-generated, please modify it to your needs
        $this->addSql('ALTER TABLE answer ALTER id TYPE UUID');
        $this->addSql('ALTER TABLE answer ALTER question_id TYPE UUID');
        $this->addSql('COMMENT ON COLUMN answer.id IS \'\'');
@@ -69,7 +65,6 @@ final class Version20250311213417 extends AbstractMigration

    public function down(Schema $schema): void
    {
-        // this down() migration is auto-generated, please modify it to your needs
        $this->addSql('ALTER TABLE candidate ALTER id TYPE UUID');
        $this->addSql('ALTER TABLE candidate ALTER season_id TYPE UUID');
        $this->addSql('COMMENT ON COLUMN candidate.id IS \'(DC2Type:uuid)\'');
--- a/migrations/Version20250402185128.php
+++ b/migrations/Version20250402185128.php
@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;

-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20250402185128 extends AbstractMigration
 {
    public function getDescription(): string
@@ -19,13 +16,11 @@ final class Version20250402185128 extends AbstractMigration

    public function up(Schema $schema): void
    {
-        // this up() migration is auto-generated, please modify it to your needs
        $this->addSql('CREATE TABLE elimination (id UUID NOT NULL, data JSON NOT NULL, PRIMARY KEY(id))');
    }

    public function down(Schema $schema): void
    {
-        // this down() migration is auto-generated, please modify it to your needs
        $this->addSql('DROP TABLE elimination');
    }
 }
--- a/migrations/Version20250427174822.php
+++ b/migrations/Version20250427174822.php
@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;

-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20250427174822 extends AbstractMigration
 {
    public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20250427174822 extends AbstractMigration

    public function up(Schema $schema): void
    {
-        // this up() migration is auto-generated, please modify it to your needs
        $this->addSql(<<<'SQL'
            ALTER TABLE answer ADD ordering SMALLINT DEFAULT 0 NOT NULL
            SQL);
@@ -30,7 +26,6 @@ final class Version20250427174822 extends AbstractMigration

    public function down(Schema $schema): void
    {
-        // this down() migration is auto-generated, please modify it to your needs
        $this->addSql(<<<'SQL'
            ALTER TABLE answer DROP ordering
            SQL);
--- a/migrations/Version20250504101440.php
+++ b/migrations/Version20250504101440.php
@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;

-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20250504101440 extends AbstractMigration
 {
    public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20250504101440 extends AbstractMigration

    public function up(Schema $schema): void
    {
-        // this up() migration is auto-generated, please modify it to your needs
        $this->addSql(<<<'SQL'
            CREATE UNIQUE INDEX UNIQ_C8B28E445E237E064EC001D1 ON candidate (name, season_id)
            SQL);
@@ -30,7 +26,6 @@ final class Version20250504101440 extends AbstractMigration

    public function down(Schema $schema): void
    {
-        // this down() migration is auto-generated, please modify it to your needs
        $this->addSql(<<<'SQL'
            DROP INDEX UNIQ_A412FA925E237E064EC001D1
            SQL);
--- a/migrations/Version20250606195952.php
+++ b/migrations/Version20250606195952.php
@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;

-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20250606195952 extends AbstractMigration
 {
    public function getDescription(): string
--- a/migrations/Version20250607154730.php
+++ b/migrations/Version20250607154730.php
@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;

-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20250607154730 extends AbstractMigration
 {
    public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20250607154730 extends AbstractMigration

    public function up(Schema $schema): void
    {
-        // this up() migration is auto-generated, please modify it to your needs
        $this->addSql(<<<'SQL'
            ALTER TABLE season DROP CONSTRAINT FK_F0E45BA96706D6B
            SQL);
@@ -30,7 +26,6 @@ final class Version20250607154730 extends AbstractMigration

    public function down(Schema $schema): void
    {
-        // this down() migration is auto-generated, please modify it to your needs
        $this->addSql(<<<'SQL'
            ALTER TABLE season DROP CONSTRAINT fk_f0e45ba96706d6b
            SQL);
--- a/migrations/Version20250607184525.php
+++ b/migrations/Version20250607184525.php
@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;

-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20250607184525 extends AbstractMigration
 {
    public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20250607184525 extends AbstractMigration

    public function up(Schema $schema): void
    {
-        // this up() migration is auto-generated, please modify it to your needs
        $this->addSql(<<<'SQL'
            ALTER TABLE elimination DROP CONSTRAINT FK_5947284F853CD175
            SQL);
@@ -36,7 +32,6 @@ final class Version20250607184525 extends AbstractMigration

    public function down(Schema $schema): void
    {
-        // this down() migration is auto-generated, please modify it to your needs
        $this->addSql(<<<'SQL'
            ALTER TABLE given_answer DROP CONSTRAINT fk_9ac61a30853cd175
            SQL);
--- a/migrations/Version20251007194241.php
+++ b/migrations/Version20251007194241.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20251007194241 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Change elimination data type to jsonb';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE elimination ALTER data TYPE JSONB');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE elimination ALTER data TYPE JSON');
+    }
+}
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -8,3 +8,7 @@ parameters:
        - src/
        - tests/
    treatPhpDocTypesAsCertain: false
+    symfony:
+        containerXmlPath: var/cache/dev/Tvdt_KernelDevDebugContainer.xml
+    doctrine:
+        objectManagerLoader: tests/object-manager.php
--- a/phpunit.dist.xml
+++ b/phpunit.dist.xml
@@ -27,8 +27,12 @@
        <include>
            <directory>src</directory>
        </include>
+        <exclude>
+            <directory>src/DataFixtures</directory>
+        </exclude>
    </source>

    <extensions>
+        <bootstrap class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension" />
    </extensions>
 </phpunit>
--- a/rector.php
+++ b/rector.php
@@ -3,6 +3,8 @@
 declare(strict_types=1);

 use Rector\Config\RectorConfig;
+use Rector\Symfony\Bridge\Symfony\Routing\SymfonyRoutesProvider;
+use Rector\Symfony\Contract\Bridge\Symfony\Routing\SymfonyRoutesProviderInterface;

 return RectorConfig::configure()
    ->withPaths([
@@ -11,7 +13,10 @@ return RectorConfig::configure()
        __DIR__.'/src',
        __DIR__.'/tests',
    ])
-    ->withSymfonyContainerXml('var/cache/dev/App_KernelDevDebugContainer.xml')
+    ->withSkip([__DIR__.'/config/reference.php'])
+    ->withSymfonyContainerXml(__DIR__.'/var/cache/dev/Tvdt_KernelDevDebugContainer.xml')
+    ->withSymfonyContainerPhp(__DIR__.'/tests/symfony-container.php')
+    ->registerService(SymfonyRoutesProvider::class, SymfonyRoutesProviderInterface::class)
    ->withParallel()
    ->withPhpSets()
    ->withPreparedSets(
@@ -22,7 +27,6 @@ return RectorConfig::configure()
        privatization: true,
        instanceOf: true,
        earlyReturn: true,
-        strictBooleans: true,
        rectorPreset: true,
        phpunitCodeQuality: true,
        doctrineCodeQuality: true,
--- a/src/Command/AddSettingsCommand.php
+++ b/src/Command/AddSettingsCommand.php
@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Command;
-
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Console\Attribute\AsCommand;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Style\SymfonyStyle;
-use Tvdt\Entity\SeasonSettings;
-use Tvdt\Repository\SeasonRepository;
-
-#[AsCommand(
-    name: 'tvdt:add-settings',
-    description: 'Add a short description for your command',
-)]
-readonly class AddSettingsCommand
-{
-    public function __construct(private SeasonRepository $seasonRepository, private EntityManagerInterface $entityManager) {}
-
-    public function __invoke(InputInterface $input, OutputInterface $output): int
-    {
-        $io = new SymfonyStyle($input, $output);
-
-        foreach ($this->seasonRepository->findAll() as $season) {
-            if (null !== $season->getSettings()) {
-                continue;
-            }
-
-            $io->text('Adding settings to season : '.$season->getSeasonCode());
-            $season->setSettings(new SeasonSettings());
-        }
-
-        $this->entityManager->flush();
-
-        return Command::SUCCESS;
-    }
-}
--- a/src/Command/ClaimSeasonCommand.php
+++ b/src/Command/ClaimSeasonCommand.php
@@ -8,9 +8,8 @@ use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Console\Attribute\Argument;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use Tvdt\Entity\Season;
 use Tvdt\Repository\SeasonRepository;
 use Tvdt\Repository\UserRepository;

@@ -18,7 +17,7 @@ use Tvdt\Repository\UserRepository;
    name: 'tvdt:claim-season',
    description: 'Give a user owner rights on a season',
 )]
-readonly class ClaimSeasonCommand
+final readonly class ClaimSeasonCommand
 {
    public function __construct(private UserRepository $userRepository, private SeasonRepository $seasonRepository, private EntityManagerInterface $entityManager) {}

@@ -27,14 +26,11 @@ readonly class ClaimSeasonCommand
        string $seasonCode,
        #[Argument]
        string $email,
-        InputInterface $input,
-        OutputInterface $output,
+        SymfonyStyle $io,
    ): int {
-        $io = new SymfonyStyle($input, $output);
-
        try {
-            $season = $this->seasonRepository->findOneBy(['seasonCode' => $seasonCode]);
-            if (null === $season) {
+            $season = $this->seasonRepository->findOneBySeasonCode($seasonCode);
+            if (!$season instanceof Season) {
                throw new \InvalidArgumentException('Season not found');
            }

--- a/src/Command/MakeAdminCommand.php
+++ b/src/Command/MakeAdminCommand.php
@@ -7,8 +7,6 @@ namespace Tvdt\Command;
 use Symfony\Component\Console\Attribute\Argument;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Tvdt\Repository\UserRepository;

@@ -16,17 +14,15 @@ use Tvdt\Repository\UserRepository;
    name: 'tvdt:make-admin',
    description: 'Give a user the role admin',
 )]
-readonly class MakeAdminCommand
+final readonly class MakeAdminCommand
 {
    public function __construct(private UserRepository $userRepository) {}

    public function __invoke(
        #[Argument]
        string $email,
-        InputInterface $input,
-        OutputInterface $output,
+        SymfonyStyle $io,
    ): int {
-        $io = new SymfonyStyle($input, $output);
        try {
            $this->userRepository->makeAdmin($email);
        } catch (\InvalidArgumentException) {
--- a/src/Controller/Admin/AnswerCrudController.php
+++ b/src/Controller/Admin/AnswerCrudController.php
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Controller\Admin;
-
-use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
-use Tvdt\Entity\Answer;
-
-/** @extends AbstractCrudController<Answer> */
-class AnswerCrudController extends AbstractCrudController
-{
-    public static function getEntityFqcn(): string
-    {
-        return Answer::class;
-    }
-}
--- a/src/Controller/Admin/CandidateCrudController.php
+++ b/src/Controller/Admin/CandidateCrudController.php
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Controller\Admin;
-
-use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
-use Tvdt\Entity\Candidate;
-
-/** @extends AbstractCrudController<Candidate> */
-class CandidateCrudController extends AbstractCrudController
-{
-    public static function getEntityFqcn(): string
-    {
-        return Candidate::class;
-    }
-}
--- a/src/Controller/Admin/DashboardController.php
+++ b/src/Controller/Admin/DashboardController.php
@@ -1,67 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Controller\Admin;
-
-use EasyCorp\Bundle\EasyAdminBundle\Attribute\AdminDashboard;
-use EasyCorp\Bundle\EasyAdminBundle\Config\Dashboard;
-use EasyCorp\Bundle\EasyAdminBundle\Config\MenuItem;
-use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractDashboardController;
-use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGenerator;
-use Symfony\Component\HttpFoundation\Response;
-use Tvdt\Entity\Answer;
-use Tvdt\Entity\Candidate;
-use Tvdt\Entity\GivenAnswer;
-use Tvdt\Entity\Question;
-use Tvdt\Entity\Quiz;
-use Tvdt\Entity\QuizCandidate;
-use Tvdt\Entity\Season;
-use Tvdt\Entity\User;
-
-#[AdminDashboard(routePath: '/admin', routeName: 'admin')]
-class DashboardController extends AbstractDashboardController
-{
-    #[\Override]
-    public function index(): Response
-    {
-        // Option 1. You can make your dashboard redirect to some common page of your backend
-        //
-        $adminUrlGenerator = $this->container->get(AdminUrlGenerator::class);
-
-        return $this->redirect($adminUrlGenerator->setController(SeasonCrudController::class)->generateUrl());
-
-        // Option 2. You can make your dashboard redirect to different pages depending on the user
-        //
-        // if ('jane' === $this->getUser()->getUsername()) {
-        //     return $this->redirect('...');
-        // }
-
-        // Option 3. You can render some custom template to display a proper dashboard with widgets, etc.
-        // (tip: it's easier if your template extends from @EasyAdmin/page/content.html.twig)
-        //
-        // return $this->render('some/path/my-dashboard.html.twig');
-    }
-
-    #[\Override]
-    public function configureDashboard(): Dashboard
-    {
-        return Dashboard::new()
-            ->setTitle('TijdVoorDeTest');
-    }
-
-    #[\Override]
-    public function configureMenuItems(): iterable
-    {
-        yield MenuItem::linkToDashboard('Dashboard', 'fa fa-home');
-        yield MenuItem::linkToCrud('Season', 'fas fa-list', Season::class);
-        yield MenuItem::linkToCrud('Quiz', 'fas fa-list', Quiz::class);
-        yield MenuItem::linkToCrud('Question', 'fas fa-list', Question::class);
-        yield MenuItem::linkToCrud('Candidate', 'fas fa-list', Candidate::class);
-        yield MenuItem::linkToCrud('Correction', 'fas fa-list', QuizCandidate::class);
-        yield MenuItem::linkToCrud('User', 'fas fa-list', User::class);
-        yield MenuItem::linkToCrud('Given Answer', 'fas fa-list', GivenAnswer::class);
-        yield MenuItem::linkToCrud('Answer', 'fas fa-list', Answer::class);
-        yield MenuItem::linkToLogout('Logout', 'fas fa-sign-out');
-    }
-}
--- a/src/Controller/Admin/GivenAnswerCrudController.php
+++ b/src/Controller/Admin/GivenAnswerCrudController.php
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Controller\Admin;
-
-use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
-use Tvdt\Entity\GivenAnswer;
-
-/** @extends AbstractCrudController<GivenAnswer> */
-class GivenAnswerCrudController extends AbstractCrudController
-{
-    public static function getEntityFqcn(): string
-    {
-        return GivenAnswer::class;
-    }
-}
--- a/src/Controller/Admin/QuestionCrudController.php
+++ b/src/Controller/Admin/QuestionCrudController.php
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Controller\Admin;
-
-use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
-use Tvdt\Entity\Question;
-
-/** @extends AbstractCrudController<Question> */
-class QuestionCrudController extends AbstractCrudController
-{
-    public static function getEntityFqcn(): string
-    {
-        return Question::class;
-    }
-}
--- a/src/Controller/Admin/QuizCorrectionCrudController.php
+++ b/src/Controller/Admin/QuizCorrectionCrudController.php
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Controller\Admin;
-
-use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
-use Tvdt\Entity\QuizCandidate;
-
-/** @extends AbstractCrudController<QuizCandidate> */
-class QuizCorrectionCrudController extends AbstractCrudController
-{
-    public static function getEntityFqcn(): string
-    {
-        return QuizCandidate::class;
-    }
-}
--- a/src/Controller/Admin/QuizCrudController.php
+++ b/src/Controller/Admin/QuizCrudController.php
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Controller\Admin;
-
-use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
-use Tvdt\Entity\Quiz;
-
-/** @extends AbstractCrudController<Quiz> */
-class QuizCrudController extends AbstractCrudController
-{
-    public static function getEntityFqcn(): string
-    {
-        return Quiz::class;
-    }
-}
--- a/src/Controller/Admin/SeasonCrudController.php
+++ b/src/Controller/Admin/SeasonCrudController.php
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Controller\Admin;
-
-use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
-use Tvdt\Entity\Season;
-
-/** @extends AbstractCrudController<Season> */
-class SeasonCrudController extends AbstractCrudController
-{
-    public static function getEntityFqcn(): string
-    {
-        return Season::class;
-    }
-}
--- a/src/Controller/Admin/UserCrudController.php
+++ b/src/Controller/Admin/UserCrudController.php
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Controller\Admin;
-
-use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
-use Tvdt\Entity\User;
-
-/** @extends AbstractCrudController<User> */
-class UserCrudController extends AbstractCrudController
-{
-    public static function getEntityFqcn(): string
-    {
-        return User::class;
-    }
-}
--- a/src/Controller/Backoffice/BackofficeController.php
+++ b/src/Controller/Backoffice/BackofficeController.php
@@ -26,6 +26,7 @@ final class BackofficeController extends AbstractController
    public function __construct(
        private readonly SeasonRepository $seasonRepository,
        private readonly Security $security,
+        private readonly QuizSpreadsheetService $excel,
    ) {}

    #[Route('/backoffice/', name: 'tvdt_backoffice_index')]
@@ -61,16 +62,16 @@ final class BackofficeController extends AbstractController
            $em->persist($season);
            $em->flush();

-            return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->getSeasonCode()]);
+            return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->seasonCode]);
        }

        return $this->render('backoffice/season_add.html.twig', ['form' => $form]);
    }

    #[Route('/backoffice/template', name: 'tvdt_backoffice_template', priority: 10)]
-    public function getTemplate(QuizSpreadsheetService $excel): Response
+    public function getTemplate(): StreamedResponse
    {
-        $response = new StreamedResponse($excel->generateTemplate());
+        $response = new StreamedResponse($this->excel->generateTemplate());
        $response->headers->set('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
        $response->headers->set('Content-Disposition', 'attachment; filename="template.xlsx"');

--- a/src/Controller/Backoffice/PrepareEliminationController.php
+++ b/src/Controller/Backoffice/PrepareEliminationController.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Tvdt\Controller\Backoffice;

 use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
@@ -17,16 +18,18 @@ use Tvdt\Factory\EliminationFactory;

 final class PrepareEliminationController extends AbstractController
 {
+    public function __construct(private readonly EliminationFactory $eliminationFactory) {}
+
    #[Route(
        '/backoffice/season/{seasonCode:season}/quiz/{quiz}/elimination/prepare',
        name: 'tvdt_prepare_elimination',
        requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID],
    )]
-    public function index(Season $season, Quiz $quiz, EliminationFactory $eliminationFactory): Response
+    public function index(Season $season, Quiz $quiz): RedirectResponse
    {
-        $elimination = $eliminationFactory->createEliminationFromQuiz($quiz);
+        $elimination = $this->eliminationFactory->createEliminationFromQuiz($quiz);

-        return $this->redirectToRoute('tvdt_prepare_elimination_view', ['elimination' => $elimination->getId()]);
+        return $this->redirectToRoute('tvdt_prepare_elimination_view', ['elimination' => $elimination->id]);
    }

    #[Route(
@@ -41,7 +44,7 @@ final class PrepareEliminationController extends AbstractController
            $em->flush();

            if ($request->request->getBoolean('start')) {
-                return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->getId()]);
+                return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);
            }

            $this->addFlash('success', 'Elimination updated');
--- a/src/Controller/Backoffice/QuizController.php
+++ b/src/Controller/Backoffice/QuizController.php
@@ -19,7 +19,6 @@ use Tvdt\Entity\Candidate;
 use Tvdt\Entity\Quiz;
 use Tvdt\Entity\Season;
 use Tvdt\Exception\ErrorClearingQuizException;
-use Tvdt\Repository\CandidateRepository;
 use Tvdt\Repository\QuizCandidateRepository;
 use Tvdt\Repository\QuizRepository;
 use Tvdt\Security\Voter\SeasonVoter;
@@ -29,83 +28,84 @@ use Tvdt\Security\Voter\SeasonVoter;
 class QuizController extends AbstractController
 {
    public function __construct(
-        private readonly CandidateRepository $candidateRepository,
+        private readonly QuizRepository $quizRepository,
        private readonly TranslatorInterface $translator,
+        private readonly QuizCandidateRepository $quizCandidateRepository,
    ) {}

+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
    #[Route(
        '/backoffice/season/{seasonCode:season}/quiz/{quiz}',
        name: 'tvdt_backoffice_quiz',
        requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID],
    )]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
    public function index(Season $season, Quiz $quiz): Response
    {
        return $this->render('backoffice/quiz.html.twig', [
            'season' => $season,
            'quiz' => $quiz,
-            'result' => $this->candidateRepository->getScores($quiz),
+            'result' => $this->quizRepository->getScores($quiz),
        ]);
    }

+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
    #[Route(
        '/backoffice/season/{seasonCode:season}/quiz/{quiz}/enable',
        name: 'tvdt_backoffice_enable',
        requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID.'|null'],
    )]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
    public function enableQuiz(Season $season, ?Quiz $quiz, EntityManagerInterface $em): RedirectResponse
    {
-        $season->setActiveQuiz($quiz);
+        $season->activeQuiz = $quiz;
        $em->flush();

        if ($quiz instanceof Quiz) {
-            return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $season->getSeasonCode(), 'quiz' => $quiz->getId()]);
+            return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $season->seasonCode, 'quiz' => $quiz->id]);
        }

-        return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->getSeasonCode()]);
+        return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->seasonCode]);
    }

+    #[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
    #[Route(
        '/backoffice/quiz/{quiz}/clear',
        name: 'tvdt_backoffice_quiz_clear',
        requirements: ['quiz' => Requirement::UUID],
    )]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
-    public function clearQuiz(Quiz $quiz, QuizRepository $quizRepository): RedirectResponse
+    public function clearQuiz(Quiz $quiz): RedirectResponse
    {
        try {
-            $quizRepository->clearQuiz($quiz);
+            $this->quizRepository->clearQuiz($quiz);
            $this->addFlash('success', $this->translator->trans('Quiz cleared'));
        } catch (ErrorClearingQuizException) {
            $this->addFlash('error', $this->translator->trans('Error clearing quiz'));
        }

-        return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->getSeason()->getSeasonCode(), 'quiz' => $quiz->getId()]);
+        return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->season->seasonCode, 'quiz' => $quiz->id]);
    }

+    #[IsGranted(SeasonVoter::DELETE, subject: 'quiz')]
    #[Route(
        '/backoffice/quiz/{quiz}/delete',
        name: 'tvdt_backoffice_quiz_delete',
        requirements: ['quiz' => Requirement::UUID],
    )]
-    #[IsGranted(SeasonVoter::DELETE, subject: 'quiz')]
-    public function deleteQuiz(Quiz $quiz, QuizRepository $quizRepository): RedirectResponse
+    public function deleteQuiz(Quiz $quiz): RedirectResponse
    {
-        $quizRepository->deleteQuiz($quiz);
+        $this->quizRepository->deleteQuiz($quiz);

        $this->addFlash('success', $this->translator->trans('Quiz deleted'));

-        return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $quiz->getSeason()->getSeasonCode()]);
+        return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $quiz->season->seasonCode]);
    }

+    #[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
    #[Route(
        '/backoffice/quiz/{quiz}/candidate/{candidate}/modify_correction',
        name: 'tvdt_backoffice_modify_correction',
        requirements: ['quiz' => Requirement::UUID, 'candidate' => Requirement::UUID],
    )]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
-    public function modifyCorrection(Quiz $quiz, Candidate $candidate, QuizCandidateRepository $quizCandidateRepository, Request $request): RedirectResponse
+    public function modifyCorrection(Quiz $quiz, Candidate $candidate, Request $request): RedirectResponse
    {
        if (!$request->isMethod('POST')) {
            throw new MethodNotAllowedHttpException(['POST']);
@@ -113,8 +113,8 @@ class QuizController extends AbstractController

        $corrections = (float) $request->request->get('corrections');

-        $quizCandidateRepository->setCorrectionsForCandidate($quiz, $candidate, $corrections);
+        $this->quizCandidateRepository->setCorrectionsForCandidate($quiz, $candidate, $corrections);

-        return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->getSeason()->getSeasonCode(), 'quiz' => $quiz->getId()]);
+        return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->season->seasonCode, 'quiz' => $quiz->id]);
    }
 }
--- a/src/Controller/Backoffice/SeasonController.php
+++ b/src/Controller/Backoffice/SeasonController.php
@@ -30,17 +30,18 @@ class SeasonController extends AbstractController
    public function __construct(
        private readonly TranslatorInterface $translator,
        private readonly EntityManagerInterface $em,
+        private readonly QuizSpreadsheetService $quizSpreadsheet,
    ) {}

+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
    #[Route(
        '/backoffice/season/{seasonCode:season}',
        name: 'tvdt_backoffice_season',
        requirements: ['seasonCode' => self::SEASON_CODE_REGEX],
    )]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
    public function index(Season $season, Request $request): Response
    {
-        $form = $this->createForm(SettingsForm::class, $season->getSettings());
+        $form = $this->createForm(SettingsForm::class, $season->settings);

        $form->handleRequest($request);

@@ -54,13 +55,13 @@ class SeasonController extends AbstractController
        ]);
    }

+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
    #[Route(
        '/backoffice/season/{seasonCode:season}/add-candidate',
        name: 'tvdt_backoffice_add_candidates',
        requirements: ['seasonCode' => self::SEASON_CODE_REGEX],
        priority: 10,
    )]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
    public function addCandidates(Season $season, Request $request): Response
    {
        $form = $this->createForm(AddCandidatesFormType::class);
@@ -74,20 +75,20 @@ class SeasonController extends AbstractController

            $this->em->flush();

-            return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->getSeasonCode()]);
+            return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->seasonCode]);
        }

        return $this->render('backoffice/season_add_candidates.html.twig', ['form' => $form]);
    }

+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
    #[Route(
        '/backoffice/season/{seasonCode:season}/add-quiz',
        name: 'tvdt_backoffice_quiz_add',
        requirements: ['seasonCode' => self::SEASON_CODE_REGEX],
        priority: 10,
    )]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
-    public function addQuiz(Request $request, Season $season, QuizSpreadsheetService $quizSpreadsheet): Response
+    public function addQuiz(Request $request, Season $season): Response
    {
        $quiz = new Quiz();
        $form = $this->createForm(UploadQuizFormType::class, $quiz);
@@ -98,15 +99,15 @@ class SeasonController extends AbstractController
            /* @var UploadedFile $sheet */
            $sheet = $form->get('sheet')->getData();

-            $quizSpreadsheet->xlsxToQuiz($quiz, $sheet);
+            $this->quizSpreadsheet->xlsxToQuiz($quiz, $sheet);

-            $quiz->setSeason($season);
+            $quiz->season = $season;
            $this->em->persist($quiz);
            $this->em->flush();

            $this->addFlash(FlashType::Success, $this->translator->trans('Quiz Added!'));

-            return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->getSeasonCode()]);
+            return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->seasonCode]);
        }

        return $this->render('/backoffice/quiz_add.html.twig', ['form' => $form, 'season' => $season]);
--- a/src/Controller/EliminationController.php
+++ b/src/Controller/EliminationController.php
@@ -26,10 +26,10 @@ use function Symfony\Component\Translation\t;
 #[IsGranted('ROLE_USER')]
 final class EliminationController extends AbstractController
 {
-    public function __construct(private readonly TranslatorInterface $translator) {}
+    public function __construct(private readonly TranslatorInterface $translator, private readonly CandidateRepository $candidateRepository) {}

-    #[Route('/elimination/{elimination}', name: 'tvdt_elimination', requirements: ['elimination' => Requirement::UUID])]
    #[IsGranted(SeasonVoter::ELIMINATION, 'elimination')]
+    #[Route('/elimination/{elimination}', name: 'tvdt_elimination', requirements: ['elimination' => Requirement::UUID])]
    public function index(#[MapEntity] Elimination $elimination, Request $request): Response
    {
        $form = $this->createForm(EliminationEnterNameType::class);
@@ -39,7 +39,7 @@ final class EliminationController extends AbstractController
        if ($form->isSubmitted() && $form->isValid()) {
            $name = $form->get('name')->getData();

-            return $this->redirectToRoute('tvdt_elimination_candidate', ['elimination' => $elimination->getId(), 'candidateHash' => Base64::base64UrlEncode($name)]);
+            return $this->redirectToRoute('tvdt_elimination_candidate', ['elimination' => $elimination->id, 'candidateHash' => Base64::base64UrlEncode($name)]);
        }

        return $this->render('quiz/elimination/index.html.twig', [
@@ -48,25 +48,25 @@ final class EliminationController extends AbstractController
        ]);
    }

-    #[Route('/elimination/{elimination}/{candidateHash}', name: 'tvdt_elimination_candidate', requirements: ['elimination' => Requirement::UUID, 'candidateHash' => self::CANDIDATE_HASH_REGEX])]
    #[IsGranted(SeasonVoter::ELIMINATION, 'elimination')]
-    public function candidateScreen(Elimination $elimination, string $candidateHash, CandidateRepository $candidateRepository): Response
+    #[Route('/elimination/{elimination}/{candidateHash}', name: 'tvdt_elimination_candidate', requirements: ['elimination' => Requirement::UUID, 'candidateHash' => self::CANDIDATE_HASH_REGEX])]
+    public function candidateScreen(Elimination $elimination, string $candidateHash): Response
    {
-        $candidate = $candidateRepository->getCandidateByHash($elimination->getQuiz()->getSeason(), $candidateHash);
+        $candidate = $this->candidateRepository->getCandidateByHash($elimination->quiz->season, $candidateHash);
        if (!$candidate instanceof Candidate) {
            $this->addFlash(FlashType::Warning,
                t('Cound not find candidate with name %name%', ['%name%' => Base64::base64UrlDecode($candidateHash)])->trans($this->translator),
            );

-            return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->getId()]);
+            return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);
        }

-        $screenColour = $elimination->getScreenColour($candidate->getName());
+        $screenColour = $elimination->getScreenColour($candidate->name);

        if (null === $screenColour) {
-            $this->addFlash(FlashType::Warning, $this->translator->trans('Cound not find candidate with name %name% in elimination.', ['%name%' => $candidate->getName()]));
+            $this->addFlash(FlashType::Warning, $this->translator->trans('Cound not find candidate with name %name% in elimination.', ['%name%' => $candidate->name]));

-            return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->getId()]);
+            return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);
        }

        return $this->render('quiz/elimination/candidate.html.twig', [
--- a/src/Controller/LoginController.php
+++ b/src/Controller/LoginController.php
@@ -15,17 +15,17 @@ use Tvdt\Enum\FlashType;
 #[AsController]
 final class LoginController extends AbstractController
 {
+    public function __construct(private readonly AuthenticationUtils $authenticationUtils, private readonly TranslatorInterface $translator) {}
+
    #[Route(path: '/login', name: 'tvdt_login_login')]
-    public function login(AuthenticationUtils $authenticationUtils, TranslatorInterface $translator): Response
+    public function login(): Response
    {
        // get the login error if there is one
-        $error = $authenticationUtils->getLastAuthenticationError();
-
+        $error = $this->authenticationUtils->getLastAuthenticationError();
        // last username entered by the user
-        $lastUsername = $authenticationUtils->getLastUsername();
-
+        $lastUsername = $this->authenticationUtils->getLastUsername();
        if ($error instanceof AuthenticationException) {
-            $this->addFlash(FlashType::Danger, $translator->trans($error->getMessageKey(), $error->getMessageData(), 'security'));
+            $this->addFlash(FlashType::Danger, $this->translator->trans($error->getMessageKey(), $error->getMessageData(), 'security'));
        }

        return $this->render('backoffice/login/login.html.twig', [
--- a/src/Controller/QuizController.php
+++ b/src/Controller/QuizController.php
@@ -4,6 +4,7 @@ declare(strict_types=1);

 namespace Tvdt\Controller;

+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Attribute\AsController;
@@ -22,7 +23,6 @@ use Tvdt\Form\SelectSeasonType;
 use Tvdt\Helpers\Base64;
 use Tvdt\Repository\AnswerRepository;
 use Tvdt\Repository\CandidateRepository;
-use Tvdt\Repository\GivenAnswerRepository;
 use Tvdt\Repository\QuestionRepository;
 use Tvdt\Repository\QuizCandidateRepository;
 use Tvdt\Repository\SeasonRepository;
@@ -30,10 +30,10 @@ use Tvdt\Repository\SeasonRepository;
 #[AsController]
 final class QuizController extends AbstractController
 {
-    public function __construct(private readonly TranslatorInterface $translator) {}
+    public function __construct(private readonly TranslatorInterface $translator, private readonly EntityManagerInterface $entityManager, private readonly SeasonRepository $seasonRepository, private readonly CandidateRepository $candidateRepository, private readonly QuestionRepository $questionRepository, private readonly AnswerRepository $answerRepository, private readonly QuizCandidateRepository $quizCandidateRepository) {}

    #[Route(path: '/', name: 'tvdt_quiz_select_season', methods: ['GET', 'POST'])]
-    public function selectSeason(Request $request, SeasonRepository $seasonRepository): Response
+    public function selectSeason(Request $request): Response
    {
        $form = $this->createForm(SelectSeasonType::class);
        $form->handleRequest($request);
@@ -41,7 +41,7 @@ final class QuizController extends AbstractController
        if ($form->isSubmitted() && $form->isValid()) {
            $seasonCode = $form->get('season_code')->getData();

-            if ([] === $seasonRepository->findBy(['seasonCode' => $seasonCode])) {
+            if ([] === $this->seasonRepository->findBy(['seasonCode' => $seasonCode])) {
                $this->addFlash(FlashType::Warning, $this->translator->trans('Invalid season code'));

                return $this->redirectToRoute('tvdt_quiz_select_season');
@@ -65,7 +65,7 @@ final class QuizController extends AbstractController
        if ($form->isSubmitted() && $form->isValid()) {
            $name = $form->get('name')->getData();

-            return $this->redirectToRoute('tvdt_quiz_quiz_page', ['seasonCode' => $season->getSeasonCode(), 'nameHash' => Base64::base64UrlEncode($name)]);
+            return $this->redirectToRoute('tvdt_quiz_quiz_page', ['seasonCode' => $season->seasonCode, 'nameHash' => Base64::base64UrlEncode($name)]);
        }

        return $this->render('quiz/enter_name.twig', ['season' => $season, 'form' => $form]);
@@ -80,51 +80,52 @@ final class QuizController extends AbstractController
        Season $season,
        string $nameHash,
        Request $request,
-        CandidateRepository $candidateRepository,
-        QuestionRepository $questionRepository,
-        AnswerRepository $answerRepository,
-        GivenAnswerRepository $givenAnswerRepository,
-        QuizCandidateRepository $quizCandidateRepository,
    ): Response {
-        $candidate = $candidateRepository->getCandidateByHash($season, $nameHash);
+        $candidate = $this->candidateRepository->getCandidateByHash($season, $nameHash);

        if (!$candidate instanceof Candidate) {
            $this->addFlash(FlashType::Danger, $this->translator->trans('Candidate not found'));

-            return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->getSeasonCode()]);
+            return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->seasonCode]);
        }

-        $quiz = $season->getActiveQuiz();
+        $quiz = $season->activeQuiz;

        if (!$quiz instanceof Quiz) {
            $this->addFlash(FlashType::Warning, $this->translator->trans('There is no active quiz'));

-            return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->getSeasonCode()]);
+            return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->seasonCode]);
        }

        if ('POST' === $request->getMethod()) {
-            $answer = $answerRepository->findOneBy(['id' => $request->request->get('answer')]);
+            // TODO: Extract saving answer logic to a service
+            $answer = $this->answerRepository->findOneBy(['id' => $request->request->get('answer')]);

            if (!$answer instanceof Answer) {
                throw new BadRequestHttpException('Invalid Answer ID');
            }

-            $givenAnswer = new GivenAnswer($candidate, $answer->getQuestion()->getQuiz(), $answer);
-            $givenAnswerRepository->save($givenAnswer);
+            $givenAnswer = new GivenAnswer($candidate, $answer->question->quiz, $answer);
+            $this->entityManager->persist($givenAnswer);
+            $this->entityManager->flush();

-            return $this->redirectToRoute('tvdt_quiz_quiz_page', ['seasonCode' => $season->getSeasonCode(), 'nameHash' => $nameHash]);
+            // end of extarcting saving answer logic
+            return $this->redirectToRoute('tvdt_quiz_quiz_page', ['seasonCode' => $season->seasonCode, 'nameHash' => $nameHash]);
        }

-        $question = $questionRepository->findNextQuestionForCandidate($candidate);
+        // TODO: Extract getting next question logic to a service
+        $question = $this->questionRepository->findNextQuestionForCandidate($candidate);

+        // Keep creating flash here based on the return type of service call
        if (!$question instanceof Question) {
            $this->addFlash(FlashType::Success, $this->translator->trans('Quiz completed'));

-            return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->getSeasonCode()]);
+            return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->seasonCode]);
        }

-        $quizCandidateRepository->createIfNotExist($quiz, $candidate);
+        $this->quizCandidateRepository->createIfNotExist($quiz, $candidate);

+        // end of extracting getting next question logic
        return $this->render('quiz/question.twig', ['candidate' => $candidate, 'question' => $question, 'season' => $season]);
    }
 }
--- a/src/Controller/RegistrationController.php
+++ b/src/Controller/RegistrationController.php
@@ -9,6 +9,7 @@ use Psr\Log\LoggerInterface;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
@@ -23,15 +24,12 @@ use Tvdt\Security\EmailVerifier;

 final class RegistrationController extends AbstractController
 {
-    public function __construct(private readonly EmailVerifier $emailVerifier, private readonly TranslatorInterface $translator) {}
+    public function __construct(private readonly EmailVerifier $emailVerifier, private readonly TranslatorInterface $translator, private readonly UserPasswordHasherInterface $userPasswordHasher, private readonly Security $security, private readonly LoggerInterface $logger, private readonly UserRepository $userRepository) {}

    #[Route('/register', name: 'tvdt_register')]
    public function register(
        Request $request,
-        UserPasswordHasherInterface $userPasswordHasher,
-        Security $security,
        EntityManagerInterface $entityManager,
-        LoggerInterface $logger,
    ): Response {
        $user = new User();
        $form = $this->createForm(RegistrationFormType::class, $user);
@@ -41,7 +39,7 @@ final class RegistrationController extends AbstractController
            /** @var string $plainPassword */
            $plainPassword = $form->get('plainPassword')->getData();

-            $user->setPassword($userPasswordHasher->hashPassword($user, $plainPassword));
+            $user->password = $this->userPasswordHasher->hashPassword($user, $plainPassword);

            $entityManager->persist($user);
            $entityManager->flush();
@@ -50,15 +48,15 @@ final class RegistrationController extends AbstractController
                // generate a signed url and email it to the user
                $this->emailVerifier->sendEmailConfirmation('tvdt_verify_email', $user,
                    new TemplatedEmail()
-                        ->to((string) $user->getEmail())
+                        ->to($user->email)
                        ->subject($this->translator->trans('Please Confirm your Email'))
                        ->htmlTemplate('backoffice/registration/confirmation_email.html.twig'),
                );
            } catch (TransportExceptionInterface $e) {
-                $logger->error($e->getMessage());
+                $this->logger->error($e->getMessage());
            }

-            $response = $security->login($user, 'form_login', 'main');
+            $response = $this->security->login($user, 'form_login', 'main');
            \assert($response instanceof Response);

            return $response;
@@ -70,7 +68,7 @@ final class RegistrationController extends AbstractController
    }

    #[Route('/verify/email', name: 'tvdt_verify_email')]
-    public function verifyUserEmail(Request $request, TranslatorInterface $translator, UserRepository $userRepository): Response
+    public function verifyUserEmail(Request $request): RedirectResponse
    {
        $id = $request->query->get('id');

@@ -78,7 +76,7 @@ final class RegistrationController extends AbstractController
            return $this->redirectToRoute('tvdt_register');
        }

-        $user = $userRepository->find($id);
+        $user = $this->userRepository->find($id);

        if (null === $user) {
            return $this->redirectToRoute('tvdt_register');
@@ -88,7 +86,7 @@ final class RegistrationController extends AbstractController
        try {
            $this->emailVerifier->handleEmailConfirmation($request, $user);
        } catch (VerifyEmailExceptionInterface $verifyEmailException) {
-            $this->addFlash('verify_email_error', $translator->trans($verifyEmailException->getReason(), [], 'VerifyEmailBundle'));
+            $this->addFlash('verify_email_error', $this->translator->trans($verifyEmailException->getReason(), [], 'VerifyEmailBundle'));

            return $this->redirectToRoute('tvdt_register');
        }
--- a/src/DataFixtures/KrtekFixtures.php
+++ b/src/DataFixtures/KrtekFixtures.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Tvdt\DataFixtures;

 use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
 use Doctrine\Persistence\ObjectManager;
 use Tvdt\Entity\Answer;
 use Tvdt\Entity\Candidate;
@@ -12,15 +13,23 @@ use Tvdt\Entity\Question;
 use Tvdt\Entity\Quiz;
 use Tvdt\Entity\Season;

-class KrtekFixtures extends Fixture
+final class KrtekFixtures extends Fixture implements FixtureGroupInterface
 {
+    public const string KRTEK_SEASON = 'krtek-seaspm';
+
+    public static function getGroups(): array
+    {
+        return ['test', 'dev'];
+    }
+
    public function load(ObjectManager $manager): void
    {
        $season = new Season();
        $manager->persist($season);

-        $season->setName('Krtek Weekend')
-            ->setSeasonCode('krtek')
+        $season->name = 'Krtek Weekend';
+        $season->seasonCode = 'krtek';
+        $season
            ->addCandidate(new Candidate('Claudia'))
            ->addCandidate(new Candidate('Eelco'))
            ->addCandidate(new Candidate('Elise'))
@@ -35,53 +44,56 @@ class KrtekFixtures extends Fixture
            ->addCandidate(new Candidate('Robbert'))
            ->addCandidate(new Candidate('Tom'));
        $quiz1 = $this->createQuiz1($season);
-        $season->addQuiz($quiz1)
-            ->setActiveQuiz($quiz1)
-            ->addQuiz($this->createQuiz2($season));
+        $season->addQuiz($quiz1);
+        $season->activeQuiz = $quiz1;
+        $season->addQuiz($this->createQuiz2($season));

        $manager->flush();
+
+        $this->addReference(self::KRTEK_SEASON, $season);
    }

    private function createQuiz1(Season $season): Quiz
    {
-        return new Quiz()
-            ->setName('Quiz 1')
-            ->setSeason($season)
+        $quiz = new Quiz();
+        $quiz->name = 'Quiz 1';
+        $quiz->season = $season;

-            ->addQuestion(new Question()
-                ->setQuestion('Is de Krtek een man of een vrouw?')
-                ->addAnswer(new Answer('Vrouw', true))
-                ->addAnswer(new Answer('Man'))
-                ->setOrdering(1),
-            )
+        $q = new Question();
+        $q->question = 'Is de Krtek een man of een vrouw?';
+        $q->addAnswer(new Answer('Vrouw', true))
+          ->addAnswer(new Answer('Man'));
+        $q->ordering = 1;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Hoeveel broers heeft de Krtek?')
-                ->addAnswer(new Answer('Geen', true))
+        $q = new Question();
+        $q->question = 'Hoeveel broers heeft de Krtek?';
+        $q->addAnswer(new Answer('Geen', true))
          ->addAnswer(new Answer('1'))
-                ->addAnswer(new Answer('2'))
-                ->setOrdering(2),
-            )
+          ->addAnswer(new Answer('2'));
+        $q->ordering = 2;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Wat is de lievelingsfeestdag van de Krtek?')
-                ->addAnswer(new Answer('Geen'))
+        $q = new Question();
+        $q->question = 'Wat is de lievelingsfeestdag van de Krtek?';
+        $q->addAnswer(new Answer('Geen'))
          ->addAnswer(new Answer('Diens eigen verjaardag'))
          ->addAnswer(new Answer('Koningsdag'))
          ->addAnswer(new Answer('Kerst', true))
-                ->addAnswer(new Answer('Oud en Nieuw'))
-                ->setOrdering(3),
-            )
+          ->addAnswer(new Answer('Oud en Nieuw'));
+        $q->ordering = 3;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Hoe kwam de Krtek naar Kersteren vandaag?')
-                ->addAnswer(new Answer('Met het OV', true))
-                ->addAnswer(new Answer('Met de auto'))
-                ->setOrdering(4),
-            )
-            ->addQuestion(new Question()
-                ->setQuestion('Met wie keek de Krtek video bij binnenkomst?')
-                ->addAnswer(new Answer('Claudia'))
+        $q = new Question();
+        $q->question = 'Hoe kwam de Krtek naar Kersteren vandaag?';
+        $q->addAnswer(new Answer('Met het OV', true))
+          ->addAnswer(new Answer('Met de auto'));
+        $q->ordering = 4;
+        $quiz->addQuestion($q);
+
+        $q = new Question();
+        $q->question = 'Met wie keek de Krtek video bij binnenkomst?';
+        $q->addAnswer(new Answer('Claudia'))
          ->addAnswer(new Answer('Eelco'))
          ->addAnswer(new Answer('Elise'))
          ->addAnswer(new Answer('Gert-Jan'))
@@ -93,52 +105,52 @@ class KrtekFixtures extends Fixture
          ->addAnswer(new Answer('Philine'))
          ->addAnswer(new Answer('Remy'))
          ->addAnswer(new Answer('Robbert'))
-                ->addAnswer(new Answer('Tom', true))
-                ->setOrdering(5),
-            )
+          ->addAnswer(new Answer('Tom', true));
+        $q->ordering = 5;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Welk advies zou de Krtek zichzelf als kind geven?')
-                ->addAnswer(new Answer('Geef je vader een knuffel.'))
+        $q = new Question();
+        $q->question = 'Welk advies zou de Krtek zichzelf als kind geven?';
+        $q->addAnswer(new Answer('Geef je vader een knuffel.'))
          ->addAnswer(new Answer('Trek je wat minder aan van anderen.'))
          ->addAnswer(new Answer('Luister meer naar je eigen gevoel in plaats van naar wat anderen vinden.'))
          ->addAnswer(new Answer('Stel niet alles tot het laatste moment uit.'))
          ->addAnswer(new Answer('Altijd doorgaan.'))
          ->addAnswer(new Answer('Probeer ook eens buiten de lijntjes te kleuren', true))
          ->addAnswer(new Answer('Ga als je groot bent op groepsreis! '))
-                ->addAnswer(new Answer('Trek minder aan van de mening van anderen, het is oké om anders te zijn.'))
-                ->setOrdering(6),
-            )
+          ->addAnswer(new Answer('Trek minder aan van de mening van anderen, het is oké om anders te zijn.'));
+        $q->ordering = 6;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Wat voor soort schoenen droeg de Krtek bij het diner?')
-                ->addAnswer(new Answer('Sneakers'))
+        $q = new Question();
+        $q->question = 'Wat voor soort schoenen droeg de Krtek bij het diner?';
+        $q->addAnswer(new Answer('Sneakers'))
          ->addAnswer(new Answer('Wandel-/bergschoenen', true))
          ->addAnswer(new Answer('Lederen schoenen'))
          ->addAnswer(new Answer('Pantoffels'))
          ->addAnswer(new Answer('Hakken'))
-                ->addAnswer(new Answer('Geen schoenen, alleen sokken'))
-                ->setOrdering(7),
-            )
+          ->addAnswer(new Answer('Geen schoenen, alleen sokken'));
+        $q->ordering = 7;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Met welk vervoersmiddel reist de Krtek het liefste?')
-                ->addAnswer(new Answer('Fiets', true))
+        $q = new Question();
+        $q->question = 'Met welk vervoersmiddel reist de Krtek het liefste?';
+        $q->addAnswer(new Answer('Fiets', true))
          ->addAnswer(new Answer('Auto'))
-                ->addAnswer(new Answer('Trein'))
-                ->setOrdering(8),
-            )
+          ->addAnswer(new Answer('Trein'));
+        $q->ordering = 8;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Heeft de Krtek een eigen auto?')
-                ->addAnswer(new Answer('Ja'))
-                ->addAnswer(new Answer('Nee', true))
-                ->setOrdering(9),
-            )
+        $q = new Question();
+        $q->question = 'Heeft de Krtek een eigen auto?';
+        $q->addAnswer(new Answer('Ja'))
+          ->addAnswer(new Answer('Nee', true));
+        $q->ordering = 9;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Van wie is de quote die de Krtek gepakt heeft')
-                ->addAnswer(new Answer('Karen'))
+        $q = new Question();
+        $q->question = 'Van wie is de quote die de Krtek gepakt heeft';
+        $q->addAnswer(new Answer('Karen'))
          ->addAnswer(new Answer('Gilles de Coster'))
          ->addAnswer(new Answer('Kees Tol'))
          ->addAnswer(new Answer('Harry en John'))
@@ -152,44 +164,44 @@ class KrtekFixtures extends Fixture
          ->addAnswer(new Answer('Karin de Groot'))
          ->addAnswer(new Answer('Pieter'))
          ->addAnswer(new Answer('Renée Fokker'))
-                ->addAnswer(new Answer('Sam, Davy', true))
-                ->setOrdering(10),
-            )
+          ->addAnswer(new Answer('Sam, Davy', true));
+        $q->ordering = 10;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Zou de Krtek molboekjes, jokers, vrijstellingen of topito’s uit iemands rugzak stelen om te kunnen winnen?')
-                ->addAnswer(new Answer('Ja'))
-                ->addAnswer(new Answer('Nee', true))
-                ->setOrdering(11),
-            )
+        $q = new Question();
+        $q->question = 'Zou de Krtek molboekjes, jokers, vrijstellingen of topito’s uit iemands rugzak stelen om te kunnen winnen?';
+        $q->addAnswer(new Answer('Ja'))
+          ->addAnswer(new Answer('Nee', true));
+        $q->ordering = 11;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('In wat voor bed slaapt de Krtek dit weekend?')
-                ->addAnswer(new Answer('Éénpersoons, losstaand bed'))
+        $q = new Question();
+        $q->question = 'In wat voor bed slaapt de Krtek dit weekend?';
+        $q->addAnswer(new Answer('Éénpersoons, losstaand bed'))
          ->addAnswer(new Answer('Éénpersoonsbed, tegen een ander bed aan', true))
-                ->addAnswer(new Answer('Tweepersoons bed'))
-                ->setOrdering(12),
-            )
+          ->addAnswer(new Answer('Tweepersoons bed'));
+        $q->ordering = 12;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Hoeveel jaar heeft de Krtek gedaan over de middelbare school?')
-                ->addAnswer(new Answer('5'))
+        $q = new Question();
+        $q->question = 'Hoeveel jaar heeft de Krtek gedaan over de middelbare school?';
+        $q->addAnswer(new Answer('5'))
          ->addAnswer(new Answer('6', true))
          ->addAnswer(new Answer('7'))
-                ->addAnswer(new Answer('8'))
-                ->setOrdering(13),
-            )
+          ->addAnswer(new Answer('8'));
+        $q->ordering = 13;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Waar zat de Krtek aan tafel bij het diner?')
-                ->addAnswer(new Answer('Met de rug naar de accommodatie'))
-                ->addAnswer(new Answer('Met de rug naar de buitenmuur', true))
-                ->setOrdering(14),
-            )
+        $q = new Question();
+        $q->question = 'Waar zat de Krtek aan tafel bij het diner?';
+        $q->addAnswer(new Answer('Met de rug naar de accommodatie'))
+          ->addAnswer(new Answer('Met de rug naar de buitenmuur', true));
+        $q->ordering = 14;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Wie is de Krtek?')
-                ->addAnswer(new Answer('Claudia', true))
+        $q = new Question();
+        $q->question = 'Wie is de Krtek?';
+        $q->addAnswer(new Answer('Claudia', true))
          ->addAnswer(new Answer('Eelco'))
          ->addAnswer(new Answer('Elise'))
          ->addAnswer(new Answer('Gert-Jan'))
@@ -201,158 +213,159 @@ class KrtekFixtures extends Fixture
          ->addAnswer(new Answer('Philine'))
          ->addAnswer(new Answer('Remy'))
          ->addAnswer(new Answer('Robbert'))
-                ->addAnswer(new Answer('Tom'))
-                ->setOrdering(15),
-            )
-        ;
+          ->addAnswer(new Answer('Tom'));
+        $q->ordering = 15;
+        $quiz->addQuestion($q);
+
+        return $quiz;
    }

    private function createQuiz2(Season $season): Quiz
    {
-        return new Quiz()
-            ->setName('Quiz 2')
-            ->setSeason($season)
+        $quiz = new Quiz();
+        $quiz->name = 'Quiz 2';
+        $quiz->season = $season;

-            ->addQuestion(new Question()
-                ->setQuestion('Is de Krtek een man of een vrouw?')
-                ->addAnswer(new Answer('Man'))
-                ->addAnswer(new Answer('Vrouw', true))
-                ->setOrdering(1),
-            )
+        $q = new Question();
+        $q->question = 'Is de Krtek een man of een vrouw?';
+        $q->addAnswer(new Answer('Man'))
+          ->addAnswer(new Answer('Vrouw', true));
+        $q->ordering = 1;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Heeft de Krtek dieetwensen of allergieën?')
-                ->addAnswer(new Answer('nee'))
+        $q = new Question();
+        $q->question = 'Heeft de Krtek dieetwensen of allergieën?';
+        $q->addAnswer(new Answer('nee'))
          ->addAnswer(new Answer('De Krtek is vegetariër', true))
          ->addAnswer(new Answer('De Krtek is flexitariër'))
          ->addAnswer(new Answer('De Krtek heeft een allergie'))
          ->addAnswer(new Answer('De Krtek heeft een intolerantie'))
          ->addAnswer(new Answer('De Krtek eet geen rundvlees'))
-                ->addAnswer(new Answer('De Krtek eet geen waterdieren'))
-                ->setOrdering(2),
-            )
+          ->addAnswer(new Answer('De Krtek eet geen waterdieren'));
+        $q->ordering = 2;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Hoe heet het huisdier/de huisdieren van de Krtek?')
-                ->addAnswer(new Answer('Amy, Karel en Floyd'))
+        $q = new Question();
+        $q->question = 'Hoe heet het huisdier/de huisdieren van de Krtek?';
+        $q->addAnswer(new Answer('Amy, Karel en Floyd'))
          ->addAnswer(new Answer('Flip en Majoor'))
          ->addAnswer(new Answer('Benji'))
          ->addAnswer(new Answer('Sini'))
          ->addAnswer(new Answer('Tom'))
          ->addAnswer(new Answer('De huisdieren van de Krtek hebben geen naam'))
-                ->addAnswer(new Answer('De Krtek heeft geen huisdieren', true))
-                ->setOrdering(3),
-            )
+          ->addAnswer(new Answer('De Krtek heeft geen huisdieren', true));
+        $q->ordering = 3;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Wat dronk de Krtek deze ochtend bij het ontbijt?')
-                ->addAnswer(new Answer('Koffie'))
+        $q = new Question();
+        $q->question = 'Wat dronk de Krtek deze ochtend bij het ontbijt?';
+        $q->addAnswer(new Answer('Koffie'))
          ->addAnswer(new Answer('Thee'))
          ->addAnswer(new Answer('Water', true))
          ->addAnswer(new Answer('Melk'))
          ->addAnswer(new Answer('Sap'))
-                ->addAnswer(new Answer('Niks'))
-                ->setOrdering(4),
-            )
+          ->addAnswer(new Answer('Niks'));
+        $q->ordering = 4;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Waar ging de eerste vakantie die de Krtek zich nog herinnert heen?')
-                ->addAnswer(new Answer('Denemarken'))
+        $q = new Question();
+        $q->question = 'Waar ging de eerste vakantie die de Krtek zich nog herinnert heen?';
+        $q->addAnswer(new Answer('Denemarken'))
          ->addAnswer(new Answer('Drenthe'))
          ->addAnswer(new Answer('Mallorca'))
          ->addAnswer(new Answer('Marokko'))
          ->addAnswer(new Answer('Oostenrijk'))
          ->addAnswer(new Answer('Turkije'))
-                ->addAnswer(new Answer('Zweden', true))
-                ->setOrdering(5),
-            )
+          ->addAnswer(new Answer('Zweden', true));
+        $q->ordering = 5;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Met welk groepje ging de Krtek als eerste het Douanespel in?')
-                ->addAnswer(new Answer('Het eerste groepje', true))
+        $q = new Question();
+        $q->question = 'Met welk groepje ging de Krtek als eerste het Douanespel in?';
+        $q->addAnswer(new Answer('Het eerste groepje', true))
          ->addAnswer(new Answer('Het tweede groepje'))
          ->addAnswer(new Answer('Het derde groepje'))
          ->addAnswer(new Answer('Het vierde groepje'))
-                ->addAnswer(new Answer('Het vijfde groepje'))
-                ->setOrdering(6),
-            )
+          ->addAnswer(new Answer('Het vijfde groepje'));
+        $q->ordering = 6;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Gelooft de Krtek ergens in?')
-                ->addAnswer(new Answer('Nee'))
+        $q = new Question();
+        $q->question = 'Gelooft de Krtek ergens in?';
+        $q->addAnswer(new Answer('Nee'))
          ->addAnswer(new Answer('Het universum', true))
          ->addAnswer(new Answer('Toeval'))
-                ->addAnswer(new Answer('De Krtek is hindoeïstisch'))
-                ->setOrdering(7),
-            )
+          ->addAnswer(new Answer('De Krtek is hindoeïstisch'));
+        $q->ordering = 7;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('At de Krtek op vrijdagavond heksenkaas tijdens het diner?')
-                ->addAnswer(new Answer('Ja', true))
-                ->addAnswer(new Answer('Nee'))
-                ->setOrdering(8),
-            )
+        $q = new Question();
+        $q->question = 'At de Krtek op vrijdagavond heksenkaas tijdens het diner?';
+        $q->addAnswer(new Answer('Ja', true))
+          ->addAnswer(new Answer('Nee'));
+        $q->ordering = 8;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Hoe laat ging de Krtek gisteravond naar bed?')
-                ->addAnswer(new Answer('Tussen 0:00 en 0:59 uur'))
+        $q = new Question();
+        $q->question = 'Hoe laat ging de Krtek gisteravond naar bed?';
+        $q->addAnswer(new Answer('Tussen 0:00 en 0:59 uur'))
          ->addAnswer(new Answer('Tussen 1:00 en 1:59 uur', true))
          ->addAnswer(new Answer('Tussen 2:00 en 2:59 uur'))
-                ->addAnswer(new Answer('Na 3:00'))
-                ->setOrdering(9),
-            )
+          ->addAnswer(new Answer('Na 3:00'));
+        $q->ordering = 9;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Hoeveel batterijen heeft de Krtek naar het bord gebracht bij het douanespel?')
-                ->addAnswer(new Answer('1'))
+        $q = new Question();
+        $q->question = 'Hoeveel batterijen heeft de Krtek naar het bord gebracht bij het douanespel?';
+        $q->addAnswer(new Answer('1'))
          ->addAnswer(new Answer('2'))
          ->addAnswer(new Answer('3'))
-                ->addAnswer(new Answer('geen', true))
-                ->setOrdering(10),
-            )
+          ->addAnswer(new Answer('geen', true));
+        $q->ordering = 10;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Wat keek de Krtek als kind graag op TV?')
-                ->addAnswer(new Answer('Digimon', true))
+        $q = new Question();
+        $q->question = 'Wat keek de Krtek als kind graag op TV?';
+        $q->addAnswer(new Answer('Digimon', true))
          ->addAnswer(new Answer('Floris'))
          ->addAnswer(new Answer('Het huis Anubis'))
          ->addAnswer(new Answer('Sesamstraat'))
          ->addAnswer(new Answer('Spongebob Squarepants'))
-                ->addAnswer(new Answer('Teletubbies'))
-                ->setOrdering(11),
-            )
+          ->addAnswer(new Answer('Teletubbies'));
+        $q->ordering = 11;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Waarin zat op de heenreis de bagage van de Krtek (voornamelijk)?')
-                ->addAnswer(new Answer('In koffer(s)', true))
+        $q = new Question();
+        $q->question = 'Waarin zat op de heenreis de bagage van de Krtek (voornamelijk)?';
+        $q->addAnswer(new Answer('In koffer(s)', true))
          ->addAnswer(new Answer('In losse tas(sen)'))
-                ->addAnswer(new Answer('In een rugzak'))
-                ->setOrdering(12),
-            )
+          ->addAnswer(new Answer('In een rugzak'));
+        $q->ordering = 12;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Van welk geluid gaan de haren van de Krtek overeind staan?')
-                ->addAnswer(new Answer('Een vork die door een metalen pan krast '))
+        $q = new Question();
+        $q->question = 'Van welk geluid gaan de haren van de Krtek overeind staan?';
+        $q->addAnswer(new Answer('Een vork die door een metalen pan krast '))
          ->addAnswer(new Answer('Smakkende mensen'))
          ->addAnswer(new Answer('Een vork die over een bord schraapt'))
          ->addAnswer(new Answer('Schuren met schuurpapier'))
          ->addAnswer(new Answer('Nagels op een krijtbord'))
          ->addAnswer(new Answer('Servies dat tegen elkaar klettert'))
          ->addAnswer(new Answer('Het geroekoe van een duif', true))
-                ->addAnswer(new Answer('Piepschuim'))
-                ->setOrdering(13),
-            )
+          ->addAnswer(new Answer('Piepschuim'));
+        $q->ordering = 13;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Wilde de Krtek penningmeester worden?')
-                ->addAnswer(new Answer('Ja'))
-                ->addAnswer(new Answer('Nee', true))
-                ->setOrdering(14),
-            )
+        $q = new Question();
+        $q->question = 'Wilde de Krtek penningmeester worden?';
+        $q->addAnswer(new Answer('Ja'))
+          ->addAnswer(new Answer('Nee', true));
+        $q->ordering = 14;
+        $quiz->addQuestion($q);

-            ->addQuestion(new Question()
-                ->setQuestion('Wie is de Krtek?')
-                ->addAnswer(new Answer('Claudia', true))
+        $q = new Question();
+        $q->question = 'Wie is de Krtek?';
+        $q->addAnswer(new Answer('Claudia', true))
          ->addAnswer(new Answer('Eelco'))
          ->addAnswer(new Answer('Elise'))
          ->addAnswer(new Answer('Gert-Jan'))
@@ -364,9 +377,10 @@ class KrtekFixtures extends Fixture
          ->addAnswer(new Answer('Philine'))
          ->addAnswer(new Answer('Remy'))
          ->addAnswer(new Answer('Robbert'))
-                ->addAnswer(new Answer('Tom'))
-                ->setOrdering(15),
-            )
-        ;
+          ->addAnswer(new Answer('Tom'));
+        $q->ordering = 15;
+        $quiz->addQuestion($q);
+
+        return $quiz;
    }
 }
--- a/src/DataFixtures/TestFixtures.php
+++ b/src/DataFixtures/TestFixtures.php
@@ -0,0 +1,75 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tvdt\DataFixtures;
+
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
+use Doctrine\Common\DataFixtures\DependentFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
+use Tvdt\Entity\Season;
+use Tvdt\Entity\User;
+
+final class TestFixtures extends Fixture implements FixtureGroupInterface, DependentFixtureInterface
+{
+    public const string PASSWORD = 'test1234';
+
+    public function __construct(
+        private readonly UserPasswordHasherInterface $passwordHasher,
+    ) {}
+
+    public static function getGroups(): array
+    {
+        return ['test'];
+    }
+
+    public function getDependencies(): array
+    {
+        return [KrtekFixtures::class];
+    }
+
+    public function load(ObjectManager $manager): void
+    {
+        $user = new User();
+        $user->email = 'test@example.org';
+        $user->password = $this->passwordHasher->hashPassword($user, self::PASSWORD);
+
+        $manager->persist($user);
+
+        $user = new User();
+        $user->email = 'krtek-admin@example.org';
+        $user->password = $this->passwordHasher->hashPassword($user, self::PASSWORD);
+
+        $manager->persist($user);
+
+        $krtek = $this->getReference(KrtekFixtures::KRTEK_SEASON, Season::class);
+        $krtek->addOwner($user);
+
+        $anotherSeason = new Season();
+        $anotherSeason->name = 'Another Season';
+        $anotherSeason->seasonCode = 'bbbbb';
+
+        $manager->persist($anotherSeason);
+        $this->addReference('another-season', $anotherSeason);
+
+        $user = new User();
+        $user->email = 'user1@example.org';
+        $user->password = $this->passwordHasher->hashPassword($user, self::PASSWORD);
+
+        $manager->persist($user);
+        $user->addSeason($anotherSeason);
+
+        $user = new User();
+        $user->email = 'user2@example.org';
+        $user->password = $this->passwordHasher->hashPassword($user, self::PASSWORD);
+
+        $manager->persist($user);
+
+        $krtek->addOwner($user);
+        $anotherSeason->addOwner($user);
+
+        $manager->flush();
+    }
+}
--- a/src/Dto/Result.php
+++ b/src/Dto/Result.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tvdt\Dto;
+
+use Symfony\Component\Uid\Uuid;
+
+final readonly class Result
+{
+    public function __construct(
+        public Uuid $id,
+        public string $name,
+        public int $correct,
+        public float $corrections,
+        public \DateInterval $time,
+        public float $score,
+    ) {}
+}
--- a/src/Entity/Answer.php
+++ b/src/Entity/Answer.php
@@ -8,7 +8,6 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\AnswerRepository;
@@ -16,115 +15,46 @@ use Tvdt\Repository\AnswerRepository;
 #[ORM\Entity(repositoryClass: AnswerRepository::class)]
 class Answer
 {
-    #[ORM\Id]
    #[ORM\Column(type: UuidType::NAME)]
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
-    private Uuid $id;
+    #[ORM\Id]
+    public private(set) Uuid $id;

    #[ORM\Column(type: Types::SMALLINT, options: ['default' => 0])]
-    private int $ordering = 0;
+    public int $ordering = 0;

-    #[ORM\ManyToOne(inversedBy: 'answers')]
    #[ORM\JoinColumn(nullable: false)]
-    private Question $question;
+    #[ORM\ManyToOne(inversedBy: 'answers')]
+    public Question $question;

    /** @var Collection<int, Candidate> */
    #[ORM\ManyToMany(targetEntity: Candidate::class, inversedBy: 'answersOnCandidate')]
-    private Collection $candidates;
+    public private(set) Collection $candidates;

    /** @var Collection<int, GivenAnswer> */
    #[ORM\OneToMany(targetEntity: GivenAnswer::class, mappedBy: 'answer', orphanRemoval: true)]
-    private Collection $givenAnswers;
+    public private(set) Collection $givenAnswers;

    public function __construct(
        #[ORM\Column(length: 255)]
-        private string $text,
+        public string $text,
        #[ORM\Column]
-        private bool $isRightAnswer = false,
+        public bool $isRightAnswer = false,
    ) {
        $this->candidates = new ArrayCollection();
        $this->givenAnswers = new ArrayCollection();
    }

-    public function getId(): Uuid
-    {
-        return $this->id;
-    }
-
-    public function getText(): string
-    {
-        return $this->text;
-    }
-
-    public function setText(string $text): static
-    {
-        $this->text = $text;
-
-        return $this;
-    }
-
-    public function getQuestion(): Question
-    {
-        return $this->question;
-    }
-
-    public function setQuestion(Question $question): static
-    {
-        $this->question = $question;
-
-        return $this;
-    }
-
-    public function isRightAnswer(): bool
-    {
-        return $this->isRightAnswer;
-    }
-
-    public function setRightAnswer(bool $isRightAnswer): static
-    {
-        $this->isRightAnswer = $isRightAnswer;
-
-        return $this;
-    }
-
-    /** @return Collection<int, Candidate> */
-    public function getCandidates(): Collection
-    {
-        return $this->candidates;
-    }
-
-    public function addCandidate(Candidate $candidate): static
+    public function addCandidate(Candidate $candidate): void
    {
        if (!$this->candidates->contains($candidate)) {
            $this->candidates->add($candidate);
        }
-
-        return $this;
    }

-    public function removeCandidate(Candidate $candidate): static
+    public function removeCandidate(Candidate $candidate): void
    {
        $this->candidates->removeElement($candidate);
-
-        return $this;
-    }
-
-    /** @return Collection<int, GivenAnswer> */
-    public function getGivenAnswers(): Collection
-    {
-        return $this->givenAnswers;
-    }
-
-    public function getOrdering(): int
-    {
-        return $this->ordering;
-    }
-
-    public function setOrdering(int $ordering): self
-    {
-        $this->ordering = $ordering;
-
-        return $this;
    }
 }
--- a/src/Entity/Candidate.php
+++ b/src/Entity/Candidate.php
@@ -7,7 +7,6 @@ namespace Tvdt\Entity;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Helpers\Base64;
@@ -17,105 +16,53 @@ use Tvdt\Repository\CandidateRepository;
 #[ORM\UniqueConstraint(fields: ['name', 'season'])]
 class Candidate
 {
-    #[ORM\Id]
    #[ORM\Column(type: UuidType::NAME, unique: true)]
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
-    private Uuid $id;
+    #[ORM\Id]
+    public private(set) Uuid $id;

-    #[ORM\ManyToOne(inversedBy: 'candidates')]
    #[ORM\JoinColumn(nullable: false)]
-    private Season $season;
+    #[ORM\ManyToOne(inversedBy: 'candidates')]
+    public Season $season;

    /** @var Collection<int, Answer> */
    #[ORM\ManyToMany(targetEntity: Answer::class, mappedBy: 'candidates')]
-    private Collection $answersOnCandidate;
+    public private(set) Collection $answersOnCandidate;

    /** @var Collection<int, GivenAnswer> */
    #[ORM\OneToMany(targetEntity: GivenAnswer::class, mappedBy: 'candidate', orphanRemoval: true)]
-    private Collection $givenAnswers;
+    public private(set) Collection $givenAnswers;

    /** @var Collection<int, QuizCandidate> */
    #[ORM\OneToMany(targetEntity: QuizCandidate::class, mappedBy: 'candidate', orphanRemoval: true)]
-    private Collection $quizData;
+    public private(set) Collection $quizData;
+
+    public string $nameHash {
+        get => Base64::base64UrlEncode($this->name);
+    }

    public function __construct(
        #[ORM\Column(length: 16)]
-        private string $name,
+        public string $name,
    ) {
        $this->answersOnCandidate = new ArrayCollection();
        $this->givenAnswers = new ArrayCollection();
        $this->quizData = new ArrayCollection();
    }

-    public function getId(): Uuid
-    {
-        return $this->id;
-    }
-
-    public function getSeason(): Season
-    {
-        return $this->season;
-    }
-
-    public function setSeason(Season $season): static
-    {
-        $this->season = $season;
-
-        return $this;
-    }
-
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    public function setName(string $name): static
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    /** @return Collection<int, Answer> */
-    public function getAnswersOnCandidate(): Collection
-    {
-        return $this->answersOnCandidate;
-    }
-
-    public function addAnswersOnCandidate(Answer $answersOnCandidate): static
+    public function addAnswersOnCandidate(Answer $answersOnCandidate): void
    {
        if (!$this->answersOnCandidate->contains($answersOnCandidate)) {
            $this->answersOnCandidate->add($answersOnCandidate);
            $answersOnCandidate->addCandidate($this);
        }
-
-        return $this;
    }

-    public function removeAnswersOnCandidate(Answer $answersOnCandidate): static
+    public function removeAnswersOnCandidate(Answer $answersOnCandidate): void
    {
        if ($this->answersOnCandidate->removeElement($answersOnCandidate)) {
            $answersOnCandidate->removeCandidate($this);
        }
-
-        return $this;
-    }
-
-    /** @return Collection<int, GivenAnswer> */
-    public function getGivenAnswers(): Collection
-    {
-        return $this->givenAnswers;
-    }
-
-    /** @return Collection<int, QuizCandidate> */
-    public function getQuizData(): Collection
-    {
-        return $this->quizData;
-    }
-
-    public function getNameHash(): string
-    {
-        return Base64::base64UrlEncode($this->name);
    }
 }
--- a/src/Entity/Elimination.php
+++ b/src/Entity/Elimination.php
@@ -6,8 +6,7 @@ namespace Tvdt\Entity;

 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
-use Safe\DateTimeImmutable;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
+use Gedmo\Mapping\Annotation as Gedmo;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\Uid\Uuid;
@@ -21,49 +20,26 @@ class Elimination

    public const string SCREEN_RED = 'red';

-    #[ORM\Id]
    #[ORM\Column(type: UuidType::NAME, unique: true)]
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
-    private Uuid $id;
+    #[ORM\Id]
+    public private(set) Uuid $id;

    /** @var array<string, mixed> */
-    #[ORM\Column(type: Types::JSON)]
-    private array $data = [];
+    #[ORM\Column(type: Types::JSONB)]
+    public array $data = [];

+    #[Gedmo\Timestampable(on: 'create')]
    #[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE, nullable: false)]
-    private \DateTimeImmutable $created;
+    public private(set) \DateTimeImmutable $created;

    public function __construct(
-        #[ORM\ManyToOne(inversedBy: 'eliminations')]
        #[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
-        private Quiz $quiz,
+        #[ORM\ManyToOne(inversedBy: 'eliminations')]
+        public Quiz $quiz,
    ) {}

-    public function getId(): Uuid
-    {
-        return $this->id;
-    }
-
-    /** @return array<string, mixed> */
-    public function getData(): array
-    {
-        return $this->data;
-    }
-
-    /** @param array<string, mixed> $data */
-    public function setData(array $data): self
-    {
-        $this->data = $data;
-
-        return $this;
-    }
-
-    public function getQuiz(): Quiz
-    {
-        return $this->quiz;
-    }
-
    /** @param InputBag<bool|float|int|string> $inputBag */
    public function updateFromInputBag(InputBag $inputBag): self
    {
@@ -79,17 +55,10 @@ class Elimination

    public function getScreenColour(?string $name): ?string
    {
+        if (null === $name) {
+            return null;
+        }
+
        return $this->data[$name] ?? null;
    }
-
-    #[ORM\PrePersist]
-    public function setCreatedAtValue(): void
-    {
-        $this->created = new DateTimeImmutable();
-    }
-
-    public function getCreated(): \DateTimeInterface
-    {
-        return $this->created;
-    }
 }
--- a/src/Entity/GivenAnswer.php
+++ b/src/Entity/GivenAnswer.php
@@ -6,67 +6,35 @@ namespace Tvdt\Entity;

 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
-use Safe\DateTimeImmutable;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
+use Gedmo\Mapping\Annotation as Gedmo;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\GivenAnswerRepository;

 #[ORM\Entity(repositoryClass: GivenAnswerRepository::class)]
-#[ORM\HasLifecycleCallbacks]
 class GivenAnswer
 {
-    #[ORM\Id]
    #[ORM\Column(type: UuidType::NAME, unique: true)]
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
-    private Uuid $id;
+    #[ORM\Id]
+    public private(set) Uuid $id;

+    #[Gedmo\Timestampable(on: 'create')]
    #[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE, nullable: false)]
-    private \DateTimeImmutable $created;
+    public private(set) \DateTimeImmutable $created;

    public function __construct(
-        #[ORM\ManyToOne(inversedBy: 'givenAnswers')]
        #[ORM\JoinColumn(nullable: false)]
-        private Candidate $candidate,
+        #[ORM\ManyToOne(inversedBy: 'givenAnswers')]
+        private(set) Candidate $candidate,

-        #[ORM\ManyToOne]
        #[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
-        private Quiz $quiz,
+        #[ORM\ManyToOne]
+        private(set) Quiz $quiz,

-        #[ORM\ManyToOne(inversedBy: 'givenAnswers')]
        #[ORM\JoinColumn(nullable: false)]
-        private Answer $answer,
+        #[ORM\ManyToOne(inversedBy: 'givenAnswers')]
+        private(set) Answer $answer,
    ) {}
-
-    public function getId(): Uuid
-    {
-        return $this->id;
-    }
-
-    public function getCandidate(): Candidate
-    {
-        return $this->candidate;
-    }
-
-    public function getQuiz(): Quiz
-    {
-        return $this->quiz;
-    }
-
-    public function getAnswer(): Answer
-    {
-        return $this->answer;
-    }
-
-    public function getCreated(): \DateTimeImmutable
-    {
-        return $this->created;
-    }
-
-    #[ORM\PrePersist]
-    public function setCreatedAtValue(): void
-    {
-        $this->created = new DateTimeImmutable();
-    }
 }
--- a/src/Entity/Question.php
+++ b/src/Entity/Question.php
@@ -8,7 +8,6 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\QuestionRepository;
@@ -16,87 +15,40 @@ use Tvdt\Repository\QuestionRepository;
 #[ORM\Entity(repositoryClass: QuestionRepository::class)]
 class Question
 {
-    #[ORM\Id]
    #[ORM\Column(type: UuidType::NAME)]
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
-    private Uuid $id;
+    #[ORM\Id]
+    public private(set) Uuid $id;

    #[ORM\Column(type: Types::SMALLINT, options: ['default' => 0])]
-    private int $ordering;
+    public int $ordering;

    #[ORM\Column(type: Types::STRING, length: 255)]
-    private string $question;
+    public string $question;

-    #[ORM\ManyToOne(inversedBy: 'questions')]
    #[ORM\JoinColumn(nullable: false)]
-    private Quiz $quiz;
+    #[ORM\ManyToOne(inversedBy: 'questions')]
+    public Quiz $quiz;

    #[ORM\Column]
-    private bool $enabled = true;
+    public bool $enabled = true;

    /** @var Collection<int, Answer> */
    #[ORM\OneToMany(targetEntity: Answer::class, mappedBy: 'question', cascade: ['persist'], orphanRemoval: true)]
    #[ORM\OrderBy(['ordering' => 'ASC'])]
-    private Collection $answers;
+    public private(set) Collection $answers;

    public function __construct()
    {
        $this->answers = new ArrayCollection();
    }

-    public function getId(): Uuid
-    {
-        return $this->id;
-    }
-
-    public function getQuestion(): string
-    {
-        return $this->question;
-    }
-
-    public function setQuestion(string $question): static
-    {
-        $this->question = $question;
-
-        return $this;
-    }
-
-    public function getQuiz(): Quiz
-    {
-        return $this->quiz;
-    }
-
-    public function setQuiz(Quiz $quiz): static
-    {
-        $this->quiz = $quiz;
-
-        return $this;
-    }
-
-    public function isEnabled(): ?bool
-    {
-        return $this->enabled;
-    }
-
-    public function setEnabled(bool $enabled): static
-    {
-        $this->enabled = $enabled;
-
-        return $this;
-    }
-
-    /** @return Collection<int, Answer> */
-    public function getAnswers(): Collection
-    {
-        return $this->answers;
-    }
-
    public function addAnswer(Answer $answer): static
    {
        if (!$this->answers->contains($answer)) {
            $this->answers->add($answer);
-            $answer->setQuestion($this);
+            $answer->question = $this;
        }

        return $this;
@@ -108,7 +60,7 @@ class Question
            return 'This question has no answers';
        }

-        $correctAnswers = $this->answers->filter(static fn (Answer $answer): bool => $answer->isRightAnswer())->count();
+        $correctAnswers = $this->answers->filter(static fn (Answer $answer): bool => $answer->isRightAnswer)->count();

        if (0 === $correctAnswers) {
            return 'This question has no correct answers';
@@ -120,16 +72,4 @@ class Question

        return null;
    }
-
-    public function getOrdering(): int
-    {
-        return $this->ordering;
-    }
-
-    public function setOrdering(int $ordering): static
-    {
-        $this->ordering = $ordering;
-
-        return $this;
-    }
 }
--- a/src/Entity/Quiz.php
+++ b/src/Entity/Quiz.php
@@ -7,7 +7,6 @@ namespace Tvdt\Entity;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\QuizRepository;
@@ -16,35 +15,35 @@ use Tvdt\Repository\QuizRepository;
 #[ORM\UniqueConstraint(fields: ['name', 'season'])]
 class Quiz
 {
-    #[ORM\Id]
    #[ORM\Column(type: UuidType::NAME)]
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
-    private Uuid $id;
+    #[ORM\Id]
+    public private(set) Uuid $id;

    #[ORM\Column(length: 64)]
-    private string $name;
+    public string $name;

-    #[ORM\ManyToOne(inversedBy: 'quizzes')]
    #[ORM\JoinColumn(nullable: false)]
-    private Season $season;
+    #[ORM\ManyToOne(inversedBy: 'quizzes')]
+    public Season $season;

    /** @var Collection<int, Question> */
    #[ORM\OneToMany(targetEntity: Question::class, mappedBy: 'quiz', cascade: ['persist'], orphanRemoval: true)]
    #[ORM\OrderBy(['ordering' => 'ASC'])]
-    private Collection $questions;
+    public private(set) Collection $questions;

    /** @var Collection<int, QuizCandidate> */
    #[ORM\OneToMany(targetEntity: QuizCandidate::class, mappedBy: 'quiz', orphanRemoval: true)]
-    private Collection $candidateData;
+    public private(set) Collection $candidateData;

    #[ORM\Column(nullable: false, options: ['default' => 1])]
-    private int $dropouts = 1;
+    public int $dropouts = 1;

    /** @var Collection<int, Elimination> */
    #[ORM\OneToMany(targetEntity: Elimination::class, mappedBy: 'quiz', cascade: ['persist'], orphanRemoval: true)]
    #[ORM\OrderBy(['created' => 'DESC'])]
-    private Collection $eliminations;
+    public private(set) Collection $eliminations;

    public function __construct()
    {
@@ -53,75 +52,16 @@ class Quiz
        $this->eliminations = new ArrayCollection();
    }

-    public function getId(): Uuid
-    {
-        return $this->id;
-    }
-
-    public function getName(): ?string
-    {
-        return $this->name;
-    }
-
-    public function setName(string $name): static
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    public function getSeason(): Season
-    {
-        return $this->season;
-    }
-
-    public function setSeason(Season $season): static
-    {
-        $this->season = $season;
-
-        return $this;
-    }
-
-    /** @return Collection<int, Question> */
-    public function getQuestions(): Collection
-    {
-        return $this->questions;
-    }
-
    public function addQuestion(Question $question): static
    {
        if (!$this->questions->contains($question)) {
            $this->questions->add($question);
-            $question->setQuiz($this);
+            $question->quiz = $this;
        }

        return $this;
    }

-    /** @return Collection<int, QuizCandidate> */
-    public function getCandidateData(): Collection
-    {
-        return $this->candidateData;
-    }
-
-    public function getDropouts(): int
-    {
-        return $this->dropouts;
-    }
-
-    public function setDropouts(int $dropouts): static
-    {
-        $this->dropouts = $dropouts;
-
-        return $this;
-    }
-
-    /** @return Collection<int, Elimination> */
-    public function getEliminations(): Collection
-    {
-        return $this->eliminations;
-    }
-
    public function addElimination(Elimination $elimination): self
    {
        $this->eliminations->add($elimination);
--- a/src/Entity/QuizCandidate.php
+++ b/src/Entity/QuizCandidate.php
@@ -6,74 +6,35 @@ namespace Tvdt\Entity;

 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
-use Safe\DateTimeImmutable;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
+use Gedmo\Mapping\Annotation as Gedmo;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\QuizCandidateRepository;

 #[ORM\Entity(repositoryClass: QuizCandidateRepository::class)]
 #[ORM\UniqueConstraint(columns: ['candidate_id', 'quiz_id'])]
-#[ORM\HasLifecycleCallbacks]
 class QuizCandidate
 {
-    #[ORM\Id]
    #[ORM\Column(type: UuidType::NAME, unique: true)]
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
-    private Uuid $id;
+    #[ORM\Id]
+    public private(set) Uuid $id;

    #[ORM\Column]
-    private float $corrections = 0;
+    public float $corrections = 0;

+    #[Gedmo\Timestampable(on: 'create')]
    #[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE)]
-    private \DateTimeImmutable $created;
+    public private(set) \DateTimeImmutable $created;

    public function __construct(
+        #[ORM\JoinColumn(nullable: false)]
        #[ORM\ManyToOne(inversedBy: 'candidateData')]
-        #[ORM\JoinColumn(nullable: false)]
-        private Quiz $quiz,
+        public Quiz $quiz,

+        #[ORM\JoinColumn(nullable: false)]
        #[ORM\ManyToOne(inversedBy: 'quizData')]
-        #[ORM\JoinColumn(nullable: false)]
-        private Candidate $candidate,
+        public Candidate $candidate,
    ) {}
-
-    public function getId(): Uuid
-    {
-        return $this->id;
-    }
-
-    public function getCandidate(): Candidate
-    {
-        return $this->candidate;
-    }
-
-    public function getQuiz(): Quiz
-    {
-        return $this->quiz;
-    }
-
-    public function getCorrections(): ?float
-    {
-        return $this->corrections;
-    }
-
-    public function setCorrections(float $corrections): static
-    {
-        $this->corrections = $corrections;
-
-        return $this;
-    }
-
-    public function getCreated(): \DateTimeImmutable
-    {
-        return $this->created;
-    }
-
-    #[ORM\PrePersist]
-    public function setCreatedAtValue(): void
-    {
-        $this->created = new DateTimeImmutable();
-    }
 }
--- a/src/Entity/Season.php
+++ b/src/Entity/Season.php
@@ -7,7 +7,6 @@ namespace Tvdt\Entity;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\SeasonRepository;
@@ -17,38 +16,38 @@ class Season
 {
    private const string SEASON_CODE_CHARACTERS = 'bcdfghjklmnpqrstvwxz';

-    #[ORM\Id]
    #[ORM\Column(type: UuidType::NAME)]
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
-    private Uuid $id;
+    #[ORM\Id]
+    public private(set) Uuid $id;

    #[ORM\Column(length: 64)]
-    private string $name;
+    public string $name;

    #[ORM\Column(length: 5)]
-    private string $seasonCode;
+    public string $seasonCode;

    /** @var Collection<int, Quiz> */
    #[ORM\OneToMany(targetEntity: Quiz::class, mappedBy: 'season', cascade: ['persist'], orphanRemoval: true)]
-    private Collection $quizzes;
+    public private(set) Collection $quizzes;

    /** @var Collection<int, Candidate> */
    #[ORM\OneToMany(targetEntity: Candidate::class, mappedBy: 'season', cascade: ['persist'], orphanRemoval: true)]
    #[ORM\OrderBy(['name' => 'ASC'])]
-    private Collection $candidates;
+    public private(set) Collection $candidates;

    /** @var Collection<int, User> */
    #[ORM\ManyToMany(targetEntity: User::class, inversedBy: 'seasons')]
-    private Collection $owners;
+    public private(set) Collection $owners;

-    #[ORM\ManyToOne]
    #[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')]
-    private ?Quiz $ActiveQuiz = null;
+    #[ORM\ManyToOne]
+    public ?Quiz $activeQuiz = null;

-    #[ORM\OneToOne(cascade: ['persist', 'remove'])]
    #[ORM\JoinColumn(nullable: true)]
-    private ?SeasonSettings $settings = null;
+    #[ORM\OneToOne(cascade: ['persist', 'remove'])]
+    public ?SeasonSettings $settings = null;

    public function __construct()
    {
@@ -58,73 +57,26 @@ class Season
        $this->owners = new ArrayCollection();
    }

-    public function getId(): Uuid
-    {
-        return $this->id;
-    }
-
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    public function setName(string $name): static
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    public function getSeasonCode(): ?string
-    {
-        return $this->seasonCode;
-    }
-
-    public function setSeasonCode(string $seasonCode): static
-    {
-        $this->seasonCode = $seasonCode;
-
-        return $this;
-    }
-
-    /** @return Collection<int, Quiz> */
-    public function getQuizzes(): Collection
-    {
-        return $this->quizzes;
-    }
-
    public function addQuiz(Quiz $quiz): static
    {
        if (!$this->quizzes->contains($quiz)) {
            $this->quizzes->add($quiz);
-            $quiz->setSeason($this);
+            $quiz->season = $this;
        }

        return $this;
    }

-    /** @return Collection<int, Candidate> */
-    public function getCandidates(): Collection
-    {
-        return $this->candidates;
-    }
-
    public function addCandidate(Candidate $candidate): static
    {
        if (!$this->candidates->contains($candidate)) {
            $this->candidates->add($candidate);
-            $candidate->setSeason($this);
+            $candidate->season = $this;
        }

        return $this;
    }

-    /** @return Collection<int, User> */
-    public function getOwners(): Collection
-    {
-        return $this->owners;
-    }
-
    public function addOwner(User $owner): static
    {
        if (!$this->owners->contains($owner)) {
@@ -141,24 +93,12 @@ class Season
        return $this;
    }

-    public function getActiveQuiz(): ?Quiz
-    {
-        return $this->ActiveQuiz;
-    }
-
-    public function setActiveQuiz(?Quiz $ActiveQuiz): static
-    {
-        $this->ActiveQuiz = $ActiveQuiz;
-
-        return $this;
-    }
-
    public function isOwner(User $user): bool
    {
        return $this->owners->contains($user);
    }

-    public function generateSeasonCode(): self
+    public function generateSeasonCode(): void
    {
        $code = '';
        $len = mb_strlen(self::SEASON_CODE_CHARACTERS) - 1;
@@ -168,19 +108,5 @@ class Season
        }

        $this->seasonCode = $code;
-
-        return $this;
-    }
-
-    public function getSettings(): ?SeasonSettings
-    {
-        return $this->settings;
-    }
-
-    public function setSettings(SeasonSettings $settings): static
-    {
-        $this->settings = $settings;
-
-        return $this;
    }
 }
--- a/src/Entity/SeasonSettings.php
+++ b/src/Entity/SeasonSettings.php
@@ -6,7 +6,6 @@ namespace Tvdt\Entity;

 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\SeasonSettingsRepository;
@@ -14,44 +13,15 @@ use Tvdt\Repository\SeasonSettingsRepository;
 #[ORM\Entity(repositoryClass: SeasonSettingsRepository::class)]
 class SeasonSettings
 {
-    #[ORM\Id]
-    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
    #[ORM\Column(type: UuidType::NAME)]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
-    private Uuid $id;
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
+    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
+    #[ORM\Id]
+    public private(set) Uuid $id;

    #[ORM\Column(type: Types::BOOLEAN, options: ['default' => false])]
-    private bool $showNumbers = false;
+    public bool $showNumbers = false;

    #[ORM\Column(type: Types::BOOLEAN, options: ['default' => false])]
-    private bool $confirmAnswers = false;
-
-    public function getId(): Uuid
-    {
-        return $this->id;
-    }
-
-    public function isShowNumbers(): bool
-    {
-        return $this->showNumbers;
-    }
-
-    public function setShowNumbers(bool $showNumbers): self
-    {
-        $this->showNumbers = $showNumbers;
-
-        return $this;
-    }
-
-    public function isConfirmAnswers(): bool
-    {
-        return $this->confirmAnswers;
-    }
-
-    public function setConfirmAnswers(bool $confirmAnswers): self
-    {
-        $this->confirmAnswers = $confirmAnswers;
-
-        return $this;
-    }
+    public bool $confirmAnswers = false;
 }
--- a/src/Entity/User.php
+++ b/src/Entity/User.php
@@ -8,7 +8,6 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
@@ -22,52 +21,39 @@ use Tvdt\Repository\UserRepository;
 #[UniqueEntity(fields: ['email'], message: 'There is already an account with this email')]
 class User implements UserInterface, PasswordAuthenticatedUserInterface
 {
-    #[ORM\Id]
    #[ORM\Column(type: UuidType::NAME, unique: true)]
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
-    private Uuid $id;
+    #[ORM\Id]
+    public private(set) Uuid $id;

    #[ORM\Column(length: 180)]
-    private string $email;
+    public string $email;

    /** @var list<string> The user roles */
    #[ORM\Column(type: Types::JSON)]
-    private array $roles = [];
+    public array $roles = [];

    /** @var string The hashed password */
    #[ORM\Column]
-    private string $password;
+    public string $password;

    /** @var Collection<int, Season> */
    #[ORM\ManyToMany(targetEntity: Season::class, mappedBy: 'owners')]
-    private Collection $seasons;
+    public private(set) Collection $seasons;

    #[ORM\Column]
-    private bool $isVerified = false;
+    public bool $isVerified = false;
+
+    public bool $isAdmin {
+        get => \in_array('ROLE_ADMIN', $this->getRoles(), true);
+    }

    public function __construct()
    {
        $this->seasons = new ArrayCollection();
    }

-    public function getId(): Uuid
-    {
-        return $this->id;
-    }
-
-    public function getEmail(): ?string
-    {
-        return $this->email;
-    }
-
-    public function setEmail(string $email): static
-    {
-        $this->email = $email;
-
-        return $this;
-    }
-
    /**
     * A visual identifier that represents this user.
     *
@@ -97,27 +83,12 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
        return array_unique($roles);
    }

-    /** @param list<string> $roles */
-    public function setRoles(array $roles): static
-    {
-        $this->roles = $roles;
-
-        return $this;
-    }
-
    /** @see PasswordAuthenticatedUserInterface */
    public function getPassword(): ?string
    {
        return $this->password;
    }

-    public function setPassword(string $password): static
-    {
-        $this->password = $password;
-
-        return $this;
-    }
-
    /** @see UserInterface */
    public function eraseCredentials(): void
    {
@@ -125,12 +96,6 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
        // $this->plainPassword = null;
    }

-    /** @return Collection<int, Season> */
-    public function getSeasons(): Collection
-    {
-        return $this->seasons;
-    }
-
    public function addSeason(Season $season): static
    {
        if (!$this->seasons->contains($season)) {
@@ -149,21 +114,4 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface

        return $this;
    }
-
-    public function isVerified(): bool
-    {
-        return $this->isVerified;
-    }
-
-    public function setIsVerified(bool $isVerified): static
-    {
-        $this->isVerified = $isVerified;
-
-        return $this;
-    }
-
-    public function isAdmin(): bool
-    {
-        return \in_array('ROLE_ADMIN', $this->getRoles(), true);
-    }
 }
--- a/src/Enum/FlashType.php
+++ b/src/Enum/FlashType.php
@@ -7,11 +7,18 @@ namespace Tvdt\Enum;
 enum FlashType: string
 {
    case Primary = 'primary';
+
    case Secondary = 'secondary';
+
    case Success = 'success';
+
    case Danger = 'danger';
+
    case Warning = 'warning';
+
    case Info = 'info';
+
    case Light = 'light';
+
    case Dark = 'dark';
 }
--- a/src/Factory/EliminationFactory.php
+++ b/src/Factory/EliminationFactory.php
@@ -7,12 +7,12 @@ namespace Tvdt\Factory;
 use Doctrine\ORM\EntityManagerInterface;
 use Tvdt\Entity\Elimination;
 use Tvdt\Entity\Quiz;
-use Tvdt\Repository\CandidateRepository;
+use Tvdt\Repository\QuizRepository;

 final readonly class EliminationFactory
 {
    public function __construct(
-        private CandidateRepository $candidateRepository,
+        private QuizRepository $quizRepository,
        private EntityManagerInterface $em,
    ) {}

@@ -21,15 +21,15 @@ final readonly class EliminationFactory
        $elimination = new Elimination($quiz);
        $this->em->persist($elimination);

-        $scores = $this->candidateRepository->getScores($quiz);
+        $scores = $this->quizRepository->getScores($quiz);

        $simpleScores = [];

        foreach (array_reverse($scores) as $i => $score) {
-            $simpleScores[$score['name']] = $i < $quiz->getDropouts() ? Elimination::SCREEN_RED : Elimination::SCREEN_GREEN;
+            $simpleScores[$score->name] = $i < $quiz->dropouts ? Elimination::SCREEN_RED : Elimination::SCREEN_GREEN;
        }

-        $elimination->setData($simpleScores);
+        $elimination->data = $simpleScores;

        $this->em->flush();

--- a/src/Repository/CandidateRepository.php
+++ b/src/Repository/CandidateRepository.php
@@ -7,17 +7,12 @@ namespace Tvdt\Repository;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Safe\Exceptions\UrlException;
-use Symfony\Component\Uid\Uuid;
 use Tvdt\Entity\Candidate;
-use Tvdt\Entity\Quiz;
 use Tvdt\Entity\Season;
 use Tvdt\Helpers\Base64;

 /**
 * @extends ServiceEntityRepository<Candidate>
- *
- * @phpstan-type Result array{id: Uuid, name: string, correct: int, time: \DateInterval, corrections: float, score: float}
- * @phpstan-type ResultList list<Result>
 */
 class CandidateRepository extends ServiceEntityRepository
 {
@@ -43,35 +38,4 @@ class CandidateRepository extends ServiceEntityRepository
            ->setParameter('name', $name)
            ->getOneOrNullResult();
    }
-
-    public function save(Candidate $candidate, bool $flush = true): void
-    {
-        $this->getEntityManager()->persist($candidate);
-
-        if ($flush) {
-            $this->getEntityManager()->flush();
-        }
-    }
-
-    /** @return ResultList */
-    public function getScores(Quiz $quiz): array
-    {
-        return $this->getEntityManager()->createQuery(<<<DQL
-        select
-            c.id,
-            c.name,
-            sum(case when a.isRightAnswer = true then 1 else 0 end) as correct,
-            qc.corrections,
-            max(ga.created) - qc.created                           as  time,
-            (sum(case when a.isRightAnswer = true then 1 else 0 end) + qc.corrections) as score
-        from Tvdt\Entity\Candidate c
-        join c.givenAnswers ga
-        join ga.answer a
-        join c.quizData qc
-        where qc.quiz = :quiz and ga.quiz = :quiz
-        group by ga.quiz, c.id, qc.id
-        order by score desc, time asc
-        DQL
-        )->setParameter('quiz', $quiz)->getResult();
-    }
 }
--- a/src/Repository/GivenAnswerRepository.php
+++ b/src/Repository/GivenAnswerRepository.php
@@ -17,13 +17,4 @@ class GivenAnswerRepository extends ServiceEntityRepository
    {
        parent::__construct($registry, GivenAnswer::class);
    }
-
-    public function save(GivenAnswer $givenAnswer, bool $flush = true): void
-    {
-        $this->getEntityManager()->persist($givenAnswer);
-
-        if ($flush) {
-            $this->getEntityManager()->flush();
-        }
-    }
 }
--- a/src/Repository/QuestionRepository.php
+++ b/src/Repository/QuestionRepository.php
@@ -35,7 +35,7 @@ class QuestionRepository extends ServiceEntityRepository
            DQL)
            ->setMaxResults(1)
            ->setParameter('candidate', $candidate)
-            ->setParameter('quiz', $candidate->getSeason()->getActiveQuiz())
+            ->setParameter('quiz', $candidate->season->activeQuiz)
            ->getOneOrNullResult();
    }
 }
--- a/src/Repository/QuizCandidateRepository.php
+++ b/src/Repository/QuizCandidateRepository.php
@@ -41,7 +41,7 @@ class QuizCandidateRepository extends ServiceEntityRepository
            throw new \InvalidArgumentException('Quiz candidate not found');
        }

-        $quizCandidate->setCorrections($corrections);
+        $quizCandidate->corrections = $corrections;
        $this->getEntityManager()->flush();
    }
 }
--- a/src/Repository/QuizRepository.php
+++ b/src/Repository/QuizRepository.php
@@ -7,10 +7,10 @@ namespace Tvdt\Repository;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Psr\Log\LoggerInterface;
-use Tvdt\Entity\Elimination;
-use Tvdt\Entity\GivenAnswer;
+use Safe\DateTimeImmutable;
+use Safe\Exceptions\DatetimeException;
+use Tvdt\Dto\Result;
 use Tvdt\Entity\Quiz;
-use Tvdt\Entity\QuizCandidate;
 use Tvdt\Exception\ErrorClearingQuizException;

 /**
@@ -29,28 +29,36 @@ class QuizRepository extends ServiceEntityRepository
        $em = $this->getEntityManager();
        $em->beginTransaction();
        try {
-            $em->createQueryBuilder()
-                ->delete()->from(QuizCandidate::class, 'qc')
-                ->where('qc.quiz = :quiz')
+            $em->createQuery(<<<DQL
+                delete from Tvdt\Entity\QuizCandidate qc
+                where qc.quiz = :quiz
+                DQL)
                ->setParameter('quiz', $quiz)
-                ->getQuery()->execute();
+                ->execute();

-            $em->createQueryBuilder()
-                ->delete()->from(GivenAnswer::class, 'ga')
-                ->where('ga.quiz = :quiz')
+            $em->createQuery(<<<DQL
+                delete from Tvdt\Entity\GivenAnswer ga
+                where ga.quiz = :quiz
+                DQL)
                ->setParameter('quiz', $quiz)
-                ->getQuery()->execute();
-            $em->createQueryBuilder()
-                ->delete()->from(Elimination::class, 'e')
-                ->where('e.quiz = :quiz')
+                ->execute();
+
+            $em->createQuery(<<<DQL
+                delete from Tvdt\Entity\Elimination e
+                where e.quiz = :quiz
+                DQL)
                ->setParameter('quiz', $quiz)
-                ->getQuery()->execute();
-        } catch (\Throwable $throwable) {
+                ->execute();
+        }
+        // @codeCoverageIgnoreStart
+        catch (\Throwable $throwable) {
            $this->logger->error($throwable->getMessage());
            $em->rollback();
            throw new ErrorClearingQuizException(previous: $throwable);
        }

+        // @codeCoverageIgnoreEnd
+
        $em->commit();
    }

@@ -59,4 +67,40 @@ class QuizRepository extends ServiceEntityRepository
        $this->getEntityManager()->remove($quiz);
        $this->getEntityManager()->flush();
    }
+
+    /**
+     * @throws DatetimeException
+     *
+     * @return list<Result>
+     */
+    public function getScores(Quiz $quiz): array
+    {
+        $result = $this->getEntityManager()->createQuery(<<<DQL
+            select
+                c.id,
+                c.name,
+                sum(case when a.isRightAnswer = true then 1 else 0 end) as correct,
+                qd.corrections,
+                max(ga.created) as end_time,
+                qd.created as start_time,
+                (sum(case when a.isRightAnswer = true then 1 else 0 end) + qd.corrections) as score
+            from Tvdt\Entity\Candidate c
+            join c.givenAnswers ga
+            join ga.answer a
+            join c.quizData qd
+            where qd.quiz = :quiz and ga.quiz = :quiz
+            group by ga.quiz, c.id, qd.id
+            order by score desc, max(ga.created) - qd.created asc
+            DQL
+        )->setParameter('quiz', $quiz)->getResult();
+
+        return array_map(static fn (array $row): Result => new Result(
+            id: $row['id'],
+            name: $row['name'],
+            correct: (int) $row['correct'],
+            corrections: $row['corrections'],
+            time: $row['start_time']->diff(new DateTimeImmutable($row['end_time'])),
+            score: $row['score'],
+        ), $result);
+    }
 }
--- a/src/Repository/SeasonRepository.php
+++ b/src/Repository/SeasonRepository.php
@@ -19,6 +19,17 @@ class SeasonRepository extends ServiceEntityRepository
        parent::__construct($registry, Season::class);
    }

+    public function findOneBySeasonCode(string $seasonCode): ?Season
+    {
+        return $this->getEntityManager()->createQuery(<<<DQL
+            select s from Tvdt\Entity\Season s
+            where s.seasonCode = :seasonCode
+            DQL)
+            ->setParameter('seasonCode', $seasonCode)
+            ->setMaxResults(1)
+            ->getOneOrNullResult();
+    }
+
    /** @return list<Season> Returns an array of Season objects */
    public function getSeasonsForUser(User $user): array
    {
--- a/src/Repository/UserRepository.php
+++ b/src/Repository/UserRepository.php
@@ -23,7 +23,7 @@ class UserRepository extends ServiceEntityRepository implements PasswordUpgrader
     * */
    public function upgradePassword(PasswordAuthenticatedUserInterface $user, string $newHashedPassword): void
    {
-        $user->setPassword($newHashedPassword);
+        $user->password = $newHashedPassword;
        $this->getEntityManager()->persist($user);
        $this->getEntityManager()->flush();
    }
@@ -35,7 +35,7 @@ class UserRepository extends ServiceEntityRepository implements PasswordUpgrader
            throw new \InvalidArgumentException('User not found');
        }

-        $user->setRoles(['ROLE_ADMIN']);
+        $user->roles = ['ROLE_ADMIN'];
        $this->getEntityManager()->flush();
    }
 }
--- a/src/Security/EmailVerifier.php
+++ b/src/Security/EmailVerifier.php
@@ -25,9 +25,9 @@ readonly class EmailVerifier
    {
        $signatureComponents = $this->verifyEmailHelper->generateSignature(
            $verifyEmailRouteName,
-            (string) $user->getId(),
-            (string) $user->getEmail(),
-            ['id' => $user->getId()],
+            $user->id->toRfc4122(),
+            $user->email,
+            ['id' => $user->id],
        );

        $context = $email->getContext();
@@ -42,9 +42,9 @@ readonly class EmailVerifier

    public function handleEmailConfirmation(Request $request, User $user): void
    {
-        $this->verifyEmailHelper->validateEmailConfirmationFromRequest($request, (string) $user->getId(), (string) $user->getEmail());
+        $this->verifyEmailHelper->validateEmailConfirmationFromRequest($request, $user->id->toRfc4122(), $user->email);

-        $user->setIsVerified(true);
+        $user->isVerified = true;

        $this->entityManager->persist($user);
        $this->entityManager->flush();
--- a/src/Security/Voter/SeasonVoter.php
+++ b/src/Security/Voter/SeasonVoter.php
@@ -15,7 +15,7 @@ use Tvdt\Entity\Quiz;
 use Tvdt\Entity\Season;
 use Tvdt\Entity\User;

-/** @extends Voter<string, Season> */
+/** @extends Voter<string, Season|Elimination|Quiz|Candidate|Answer|Question> */
 final class SeasonVoter extends Voter
 {
    public const string EDIT = 'SEASON_EDIT';
@@ -28,16 +28,15 @@ final class SeasonVoter extends Voter
    {
        return \in_array($attribute, [self::EDIT, self::DELETE, self::ELIMINATION], true)
                && (
-                    $subject instanceof Season
-                    || $subject instanceof Elimination
-                    || $subject instanceof Quiz
+                    $subject instanceof Answer
                    || $subject instanceof Candidate
-                    || $subject instanceof Answer
+                    || $subject instanceof Elimination
+                    || $subject instanceof Season
                    || $subject instanceof Question
+                    || $subject instanceof Quiz
                );
    }

-    /** @param Season|Elimination|Quiz|Candidate|Answer|Question $subject */
    protected function voteOnAttribute(string $attribute, mixed $subject, TokenInterface $token, ?Vote $vote = null): bool
    {
        $user = $token->getUser();
@@ -45,28 +44,18 @@ final class SeasonVoter extends Voter
            return false;
        }

-        if ($user->isAdmin()) {
+        if ($user->isAdmin) {
            return true;
        }

-        switch (true) {
-            case $subject instanceof Answer:
-                $season = $subject->getQuestion()->getQuiz()->getSeason();
-                break;
-            case $subject instanceof Elimination:
-            case $subject instanceof Question:
-                $season = $subject->getQuiz()->getSeason();
-                break;
-            case $subject instanceof Candidate:
-            case $subject instanceof Quiz:
-                $season = $subject->getSeason();
-                break;
-            case $subject instanceof Season:
-                $season = $subject;
-                break;
-            default:
-                return false;
-        }
+        $season = match (true) {
+            $subject instanceof Answer => $subject->question->quiz->season,
+            $subject instanceof Elimination,
+            $subject instanceof Question => $subject->quiz->season,
+            $subject instanceof Candidate,
+            $subject instanceof Quiz => $subject->season,
+            $subject instanceof Season => $subject,
+        };

        return match ($attribute) {
            self::EDIT, self::DELETE, self::ELIMINATION => $season->isOwner($user),
--- a/src/Service/EliminationService.php
+++ b/src/Service/EliminationService.php
@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Service;
-
-use Tvdt\Repository\CandidateRepository;
-
-/**
- * @phpstan-import-type ResultList from CandidateRepository
- */
-class EliminationService
-{
-    /** @phpstan-param ResultList $result */
-    public function createEliminationFromResult(array $result): void {}
-}
--- a/src/Service/QuizSpreadsheetService.php
+++ b/src/Service/QuizSpreadsheetService.php
@@ -55,6 +55,10 @@ class QuizSpreadsheetService
    /** @throws SpreadsheetDataException */
    public function xlsxToQuiz(Quiz $quiz, File $file): void
    {
+        if (!$this->isSpreadsheetFile($file)) {
+            throw new \InvalidArgumentException('File must be a valid XLSX spreadsheet');
+        }
+
        $spreadsheet = $this->readSheet($file);
        $sheet = $spreadsheet->getSheet($spreadsheet->getFirstSheetIndex());

@@ -84,8 +88,8 @@ class QuizSpreadsheetService
            }

            $question = new Question();
-            $question->setQuestion((string) $questionArr[0]);
-            $question->setOrdering($questionCounter++);
+            $question->question = (string) $questionArr[0];
+            $question->ordering = $questionCounter++;

            $answerCounter = 1;
            $arrCounter = 1;
@@ -100,7 +104,7 @@ class QuizSpreadsheetService
                }

                $answer = new Answer((string) $questionArr[$arrCounter++], (bool) $questionArr[$arrCounter++]);
-                $answer->setOrdering($answerCounter++);
+                $answer->ordering = $answerCounter++;
                $question->addAnswer($answer);
            }

@@ -112,7 +116,10 @@ class QuizSpreadsheetService
        }
    }

-    public function quizToXlsx(Quiz $quiz): void {}
+    public function quizToXlsx(Quiz $quiz): void
+    {
+        throw new \Exception('Not implemented');
+    }

    private function toXlsx(Spreadsheet $spreadsheet): \Closure
    {
@@ -120,4 +127,9 @@ class QuizSpreadsheetService

        return static fn () => $writer->save('php://output');
    }
+
+    private function isSpreadsheetFile(File $file): bool
+    {
+        return 'xlsx' === $file->getExtension();
+    }
 }
--- a/symfony.lock
+++ b/symfony.lock
@@ -1,4 +1,16 @@
 {
+    "dama/doctrine-test-bundle": {
+        "version": "8.4",
+        "recipe": {
+            "repo": "github.com/symfony/recipes-contrib",
+            "branch": "main",
+            "version": "8.3",
+            "ref": "dfc51177476fb39d014ed89944cde53dc3326d23"
+        },
+        "files": [
+            "config/packages/dama_doctrine_test_bundle.yaml"
+        ]
+    },
    "doctrine/deprecations": {
        "version": "1.1",
        "recipe": {
@@ -47,15 +59,6 @@
            "migrations/.gitignore"
        ]
    },
-    "easycorp/easyadmin-bundle": {
-        "version": "4.23",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "main",
-            "version": "3.0",
-            "ref": "b131e6cbfe1b898a508987851963fff485986285"
-        }
-    },
    "friendsofphp/php-cs-fixer": {
        "version": "3.65",
        "recipe": {
@@ -81,31 +84,44 @@
        ]
    },
    "phpunit/phpunit": {
-        "version": "12.1",
+        "version": "12.4",
        "recipe": {
            "repo": "github.com/symfony/recipes",
            "branch": "main",
-            "version": "10.0",
-            "ref": "bb22cf8d8c554a623b427d5f3416b538f5525233"
+            "version": "11.1",
+            "ref": "1117deb12541f35793eec9fff7494d7aa12283fc"
        },
        "files": [
            ".env.test",
+            "bin/phpunit",
            "phpunit.dist.xml",
            "tests/bootstrap.php"
        ]
    },
    "sentry/sentry-symfony": {
-        "version": "5.2",
+        "version": "5.6",
        "recipe": {
            "repo": "github.com/symfony/recipes-contrib",
            "branch": "main",
            "version": "5.0",
-            "ref": "c3decefe8a11a5da43adaf827a6cd66695586113"
+            "ref": "b6cb4b34429dadecd7187852123be19d628fa37a"
        },
        "files": [
            "config/packages/sentry.yaml"
        ]
    },
+    "stof/doctrine-extensions-bundle": {
+        "version": "1.14",
+        "recipe": {
+            "repo": "github.com/symfony/recipes-contrib",
+            "branch": "main",
+            "version": "1.2",
+            "ref": "e805aba9eff5372e2d149a9ff56566769e22819d"
+        },
+        "files": [
+            "config/packages/stof_doctrine_extensions.yaml"
+        ]
+    },
    "symfony/asset-mapper": {
        "version": "7.2",
        "recipe": {
@@ -276,12 +292,12 @@
        ]
    },
    "symfony/translation": {
-        "version": "7.2",
+        "version": "7.3",
        "recipe": {
            "repo": "github.com/symfony/recipes",
            "branch": "main",
            "version": "6.3",
-            "ref": "e28e27f53663cc34f0be2837aba18e3a1bef8e7b"
+            "ref": "620a1b84865ceb2ba304c8f8bf2a185fbf32a843"
        },
        "files": [
            "config/packages/translation.yaml",
@@ -319,20 +335,8 @@
            "ref": "c85ff94da66841d7ff087c19cbcd97a2df744ef9"
        }
    },
-    "symfony/ux-twig-component": {
-        "version": "2.22",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "main",
-            "version": "2.13",
-            "ref": "67814b5f9794798b885cec9d3f48631424449a01"
-        },
-        "files": [
-            "config/packages/twig_component.yaml"
-        ]
-    },
    "symfony/validator": {
-        "version": "7.2",
+        "version": "7.3",
        "recipe": {
            "repo": "github.com/symfony/recipes",
            "branch": "main",
--- a/templates/backoffice/quiz.html.twig
+++ b/templates/backoffice/quiz.html.twig
@@ -109,7 +109,7 @@
                        </form>
                    </td>
                    <td>{{ candidate.score|default('x') }}</td>
-                    <td>{{ candidate.time }}</td>
+                    <td>{{ candidate.time.format('%i:%S') }}</td>
                </tr>
            {% else %}
                <tr>
--- a/tests/Command/ClaimSeasonCommandTest.php
+++ b/tests/Command/ClaimSeasonCommandTest.php
@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tvdt\Tests\Command;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\HttpKernel\KernelInterface;
+use Tvdt\Command\ClaimSeasonCommand;
+use Tvdt\Entity\Season;
+use Tvdt\Repository\SeasonRepository;
+
+#[CoversClass(ClaimSeasonCommand::class)]
+final class ClaimSeasonCommandTest extends KernelTestCase
+{
+    private SeasonRepository $seasonRepository;
+
+    private CommandTester $commandTester;
+
+    protected function setUp(): void
+    {
+        $container = self::getContainer();
+
+        $this->assertInstanceOf(KernelInterface::class, self::$kernel);
+
+        $this->seasonRepository = $container->get(SeasonRepository::class);
+        $application = new Application(self::$kernel);
+        $command = $application->find('tvdt:claim-season');
+        $this->commandTester = new CommandTester($command);
+    }
+
+    public function testSeasonClaim(): void
+    {
+        $this->commandTester->execute([
+            'season-code' => 'krtek',
+            'email' => 'test@example.org',
+        ]);
+
+        $season = $this->seasonRepository->findOneBySeasonCode('krtek');
+
+        $this->assertInstanceOf(Season::class, $season);
+
+        $this->assertSame(Command::SUCCESS, $this->commandTester->getStatusCode());
+        $this->assertCount(3, $season->owners);
+    }
+
+    public function testInvalidEmailFails(): void
+    {
+        $this->commandTester->execute([
+            'season-code' => 'krtek',
+            'email' => 'nonexisting@example.org',
+        ]);
+
+        $this->assertSame(Command::FAILURE, $this->commandTester->getStatusCode());
+    }
+
+    public function testInvalidSeasonCodeFails(): void
+    {
+        $this->commandTester->execute([
+            'season-code' => 'dhadk',
+            'email' => 'test@example.org',
+        ]);
+
+        $this->assertSame(Command::FAILURE, $this->commandTester->getStatusCode());
+    }
+}
--- a/tests/Command/MakeAdminCommandTest.php
+++ b/tests/Command/MakeAdminCommandTest.php
@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tvdt\Tests\Command;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\HttpKernel\KernelInterface;
+use Tvdt\Command\MakeAdminCommand;
+use Tvdt\Entity\User;
+use Tvdt\Repository\UserRepository;
+
+#[CoversClass(MakeAdminCommand::class)]
+final class MakeAdminCommandTest extends KernelTestCase
+{
+    private UserRepository $userRepository;
+
+    private CommandTester $commandTester;
+
+    protected function setUp(): void
+    {
+        $container = self::getContainer();
+
+        $this->assertInstanceOf(KernelInterface::class, self::$kernel);
+
+        $this->userRepository = $container->get(UserRepository::class);
+        $application = new Application(self::$kernel);
+        $command = $application->find('tvdt:make-admin');
+        $this->commandTester = new CommandTester($command);
+    }
+
+    public function testMakeAdmin(): void
+    {
+        $this->commandTester->execute([
+            'email' => 'test@example.org',
+        ]);
+
+        $user = $this->userRepository->findOneBy(['email' => 'test@example.org']);
+        $this->assertInstanceOf(User::class, $user);
+
+        $this->assertSame(Command::SUCCESS, $this->commandTester->getStatusCode());
+        $this->assertContains('ROLE_ADMIN', $user->roles);
+    }
+
+    public function testInvalidEmailFails(): void
+    {
+        $this->commandTester->execute([
+            'email' => 'nonexisting@example.org',
+        ]);
+
+        $this->assertSame(Command::FAILURE, $this->commandTester->getStatusCode());
+    }
+}
--- a/tests/Helpers/Base64Test.php
+++ b/tests/Helpers/Base64Test.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tvdt\Tests\Helpers;
+
+use PHPUnit\Framework\TestCase;
+use Safe\Exceptions\UrlException;
+use Tvdt\Helpers\Base64;
+
+final class Base64Test extends TestCase
+{
+    public function testBase64UrlEncode(): void
+    {
+        $this->assertSame('TWFyaWpu', Base64::base64UrlEncode('Marijn'));
+        $this->assertSame('UGhpbGluZQ', Base64::base64UrlEncode('Philine'));
+
+        $this->assertSame('_g', Base64::base64UrlEncode(\chr(254)));
+        $this->assertSame('-g', Base64::base64UrlEncode(\chr(250)));
+    }
+
+    public function testBase64UrlDecode(): void
+    {
+        $this->assertSame('Marijn', Base64::base64UrlDecode('TWFyaWpu'));
+        $this->assertSame('Philine', Base64::base64UrlDecode('UGhpbGluZQ'));
+
+        $this->assertSame(\chr(254), Base64::base64UrlDecode('_g'));
+        $this->assertSame(\chr(250), Base64::base64UrlDecode('-g'));
+    }
+
+    public function testBase64UrlDecodeCanHandlePadding(): void
+    {
+        $this->assertSame('Philine', Base64::base64UrlDecode('UGhpbGluZQ=='));
+    }
+
+    public function testBase64UrlDecodeThrowsExceptionOnInvalidInput(): void
+    {
+        $this->expectException(UrlException::class);
+        Base64::base64UrlDecode('Philine==');
+    }
+}
--- a/tests/Repository/CandidateRepositoryTest.php
+++ b/tests/Repository/CandidateRepositoryTest.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tvdt\Tests\Repository;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Tvdt\Entity\Candidate;
+use Tvdt\Repository\CandidateRepository;
+
+#[CoversClass(CandidateRepository::class)]
+final class CandidateRepositoryTest extends DatabaseTestCase
+{
+    /** @return iterable<string, array{0: string}> */
+    public static function candidateHashDataProvider(): iterable
+    {
+        yield 'Normal' => ['Q2xhdWRpYQ'];
+        yield 'lowercase' => ['Y2xhdWRpYQ'];
+        yield 'UPPERCASE' => ['Q0xBVURJQQ'];
+    }
+
+    #[DataProvider('candidateHashDataProvider')]
+    public function testGetCandidateByHash(string $hash): void
+    {
+        $krtekSeason = $this->getSeasonByCode('krtek');
+        $candidate = $this->candidateRepository->getCandidateByHash(
+            $krtekSeason,
+            $hash,
+        );
+
+        $this->assertInstanceOf(Candidate::class, $candidate);
+
+        $this->assertSame('Claudia', $candidate->name);
+    }
+
+    public function testGetCandidateByHashUnknownHashReturnsNull(): void
+    {
+        $krtekSeason = $this->getSeasonByCode('krtek');
+        $result = $this->candidateRepository->getCandidateByHash(
+            $krtekSeason,
+            'TWFyaWpu',
+        );
+        $this->assertNotInstanceOf(Candidate::class, $result);
+    }
+
+    public function testGetCandidateByHashInvalidBase64HashReturnsNull(): void
+    {
+        $krtekSeason = $this->getSeasonByCode('krtek');
+        $result = $this->candidateRepository->getCandidateByHash(
+            $krtekSeason,
+            'TWFyaWpu*',
+        );
+        $this->assertNotInstanceOf(Candidate::class, $result);
+    }
+}
--- a/tests/Repository/DatabaseTestCase.php
+++ b/tests/Repository/DatabaseTestCase.php
@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tvdt\Tests\Repository;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Tvdt\Entity\Candidate;
+use Tvdt\Entity\Season;
+use Tvdt\Entity\User;
+use Tvdt\Repository\CandidateRepository;
+use Tvdt\Repository\QuestionRepository;
+use Tvdt\Repository\QuizCandidateRepository;
+use Tvdt\Repository\QuizRepository;
+use Tvdt\Repository\SeasonRepository;
+use Tvdt\Repository\UserRepository;
+
+abstract class DatabaseTestCase extends KernelTestCase
+{
+    protected private(set) EntityManagerInterface $entityManager;
+
+    protected private(set) CandidateRepository $candidateRepository;
+
+    protected private(set) QuestionRepository $questionRepository;
+
+    protected private(set) QuizCandidateRepository $quizCandidateRepository;
+
+    protected private(set) QuizRepository $quizRepository;
+
+    protected private(set) SeasonRepository $seasonRepository;
+
+    protected private(set) UserRepository $userRepository;
+
+    protected function setUp(): void
+    {
+        $this->entityManager = self::getContainer()->get(EntityManagerInterface::class);
+
+        $this->candidateRepository = self::getContainer()->get(CandidateRepository::class);
+        $this->questionRepository = self::getContainer()->get(QuestionRepository::class);
+        $this->quizCandidateRepository = self::getContainer()->get(QuizCandidateRepository::class);
+        $this->quizRepository = self::getContainer()->get(QuizRepository::class);
+        $this->seasonRepository = self::getContainer()->get(SeasonRepository::class);
+        $this->userRepository = self::getContainer()->get(UserRepository::class);
+    }
+
+    protected function getUserByEmail(string $email): User
+    {
+        $user = $this->userRepository->findOneBy(['email' => $email]);
+        $this->assertInstanceOf(User::class, $user);
+
+        return $user;
+    }
+
+    protected function getSeasonByCode(string $code): Season
+    {
+        $season = $this->seasonRepository->findOneBySeasonCode($code);
+        $this->assertInstanceOf(Season::class, $season);
+
+        return $season;
+    }
+
+    protected function getCandidateBySeasonAndName(Season $season, string $name): Candidate
+    {
+        $candidate = $this->candidateRepository->findOneBy(['season' => $season, 'name' => $name]);
+        $this->assertInstanceOf(Candidate::class, $candidate);
+
+        return $candidate;
+    }
+}
--- a/tests/Repository/QuestionRepositoryTest.php
+++ b/tests/Repository/QuestionRepositoryTest.php
@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tvdt\Tests\Repository;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use Tvdt\Entity\Answer;
+use Tvdt\Entity\Candidate;
+use Tvdt\Entity\GivenAnswer;
+use Tvdt\Entity\Question;
+use Tvdt\Entity\Quiz;
+use Tvdt\Repository\QuestionRepository;
+
+#[CoversClass(QuestionRepository::class)]
+final class QuestionRepositoryTest extends DatabaseTestCase
+{
+    public function testFindNextQuestionReturnsRightQuestion(): void
+    {
+        $krtekSeason = $this->getSeasonByCode('krtek');
+        $candidate = $this->getCandidateBySeasonAndName($krtekSeason, 'Tom');
+
+        $question = $this->questionRepository->findNextQuestionForCandidate($candidate);
+        $this->assertInstanceOf(Question::class, $question);
+        $this->assertSame('Is de Krtek een man of een vrouw?', $question->question, 'Wrong first question');
+
+        $this->answerQuestion($question, $candidate);
+
+        $question = $this->questionRepository->findNextQuestionForCandidate($candidate);
+        $this->assertInstanceOf(Question::class, $question);
+        $this->assertSame('Hoeveel broers heeft de Krtek?', $question->question, 'Wrong second question');
+
+        $question = $this->questionRepository->findNextQuestionForCandidate($candidate);
+        $this->assertInstanceOf(Question::class, $question);
+        $this->assertSame('Hoeveel broers heeft de Krtek?', $question->question, 'Getting question a second time fails');
+
+        $quiz = $krtekSeason->quizzes->last();
+        $this->assertInstanceOf(Quiz::class, $quiz);
+        $krtekSeason->activeQuiz = $quiz;
+        $this->entityManager->flush();
+
+        $question = $this->questionRepository->findNextQuestionForCandidate($candidate);
+        $this->assertInstanceOf(Question::class, $question);
+        $this->assertSame('Is de Krtek een man of een vrouw?', $question->question, 'Wrong question after switching season.');
+    }
+
+    public function testFindNextQuestionGivesNullWhenAllQuestionsAnswered(): void
+    {
+        $krtekSeason = $this->getSeasonByCode('krtek');
+        $candidate = $this->getCandidateBySeasonAndName($krtekSeason, 'Tom');
+
+        for ($i = 0; $i < 15; ++$i) {
+            $question = $this->questionRepository->findNextQuestionForCandidate($candidate);
+            $this->assertInstanceOf(Question::class, $question);
+            $this->answerQuestion($question, $candidate);
+        }
+
+        $question = $this->questionRepository->findNextQuestionForCandidate($candidate);
+
+        $this->assertNotInstanceOf(Question::class, $question);
+    }
+
+    public function testFindNextQuestionWithNoActiveQuizReturnsNull(): void
+    {
+        $krtekSeason = $this->getSeasonByCode('krtek');
+        $candidate = $this->getCandidateBySeasonAndName($krtekSeason, 'Tom');
+
+        $krtekSeason->activeQuiz = null;
+        $this->entityManager->flush();
+
+        $question = $this->questionRepository->findNextQuestionForCandidate($candidate);
+
+        $this->assertNotInstanceOf(Question::class, $question);
+    }
+
+    private function answerQuestion(Question $question, Candidate $candidate): void
+    {
+        $answer = $question->answers->first();
+        $this->assertInstanceOf(Answer::class, $answer);
+        $this->entityManager->persist(new GivenAnswer(
+            $candidate,
+            $question->quiz,
+            $answer,
+        ));
+        $this->entityManager->flush();
+    }
+}
--- a/tests/Repository/QuizCandidateRepositoryTest.php
+++ b/tests/Repository/QuizCandidateRepositoryTest.php
@@ -0,0 +1,72 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tvdt\Tests\Repository;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use Tvdt\Entity\Quiz;
+use Tvdt\Entity\QuizCandidate;
+use Tvdt\Repository\QuizCandidateRepository;
+
+#[CoversClass(QuizCandidateRepository::class)]
+final class QuizCandidateRepositoryTest extends DatabaseTestCase
+{
+    public function testCreateIfNotExists(): void
+    {
+        $krtekSeason = $this->getSeasonByCode('krtek');
+        $candidate = $this->getCandidateBySeasonAndName($krtekSeason, 'Myrthe');
+        $quiz = $krtekSeason->activeQuiz;
+        $this->assertInstanceOf(Quiz::class, $quiz);
+
+        $result = $this->quizCandidateRepository->createIfNotExist($quiz, $candidate);
+        $this->assertTrue($result);
+
+        $quizCandidate = $this->quizCandidateRepository->findOneBy([
+            'candidate' => $candidate,
+            'quiz' => $quiz,
+        ]);
+
+        $this->assertInstanceOf(QuizCandidate::class, $quizCandidate);
+
+        $result = $this->quizCandidateRepository->createIfNotExist($quiz, $candidate);
+        $this->assertFalse($result);
+    }
+
+    public function testSetCorrectionsForCandidateUpdatesCandidateCorrectly(): void
+    {
+        $krtekSeason = $this->getSeasonByCode('krtek');
+        $candidate = $this->getCandidateBySeasonAndName($krtekSeason, 'Myrthe');
+        $quiz = $krtekSeason->activeQuiz;
+        $this->assertInstanceOf(Quiz::class, $quiz);
+
+        $this->quizCandidateRepository->createIfNotExist($quiz, $candidate);
+
+        $this->quizCandidateRepository->setCorrectionsForCandidate(
+            $quiz, $candidate, 3.5,
+        );
+
+        $quizCandidate = $this->quizCandidateRepository->findOneBy([
+            'candidate' => $candidate,
+            'quiz' => $quiz,
+        ]);
+
+        $this->assertInstanceOf(QuizCandidate::class, $quizCandidate);
+
+        $this->assertEqualsWithDelta(3.5, $quizCandidate->corrections, 0.1);
+    }
+
+    public function testCannotGiveCorrectionsToCandidateWithoutResult(): void
+    {
+        $krtekSeason = $this->getSeasonByCode('krtek');
+        $candidate = $this->getCandidateBySeasonAndName($krtekSeason, 'Myrthe');
+        $quiz = $krtekSeason->activeQuiz;
+        $this->assertInstanceOf(Quiz::class, $quiz);
+
+        $this->expectException(\InvalidArgumentException::class);
+
+        $this->quizCandidateRepository->setCorrectionsForCandidate(
+            $quiz, $candidate, 3.5,
+        );
+    }
+}
--- a/tests/Repository/QuizRepositoryTest.php
+++ b/tests/Repository/QuizRepositoryTest.php
@@ -0,0 +1,214 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tvdt\Tests\Repository;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use Psr\Clock\ClockInterface;
+use Symfony\Component\Clock\MockClock;
+use Tvdt\Entity\Answer;
+use Tvdt\Entity\GivenAnswer;
+use Tvdt\Entity\Question;
+use Tvdt\Entity\Quiz;
+use Tvdt\Entity\QuizCandidate;
+use Tvdt\Repository\GivenAnswerRepository;
+use Tvdt\Repository\QuizRepository;
+
+#[CoversClass(QuizRepository::class)]
+final class QuizRepositoryTest extends DatabaseTestCase
+{
+    public function testClearQuiz(): void
+    {
+        $krtekSeason = $this->getSeasonByCode('krtek');
+        $quiz = $krtekSeason->activeQuiz;
+        $this->assertInstanceOf(Quiz::class, $quiz);
+
+        $this->quizRepository->clearQuiz($quiz);
+
+        $this->entityManager->refresh($krtekSeason);
+
+        $this->assertEmpty($quiz->candidateData);
+        $this->assertEmpty($quiz->eliminations);
+
+        /** @var GivenAnswerRepository $givenAnswerRepository */
+        $givenAnswerRepository = self::getContainer()->get(GivenAnswerRepository::class);
+        $this->assertEmpty($givenAnswerRepository->findBy(['quiz' => $quiz]));
+    }
+
+    public function testDeleteQuiz(): void
+    {
+        $krtekSeason = $this->getSeasonByCode('krtek');
+        $quiz = $krtekSeason->quizzes->last();
+        $this->assertInstanceOf(Quiz::class, $quiz);
+
+        $this->quizRepository->deleteQuiz($quiz);
+
+        $this->entityManager->refresh($krtekSeason);
+
+        $this->assertCount(1, $krtekSeason->quizzes);
+    }
+
+    public function testTimeForCandidate(): void
+    {
+        $clock = new MockClock('2025-11-01 16:00:00');
+        self::getContainer()->set(ClockInterface::class, $clock);
+        $krtekSeason = $this->getSeasonByCode('krtek');
+        $candidate = $this->getCandidateBySeasonAndName($krtekSeason, 'Iris');
+
+        $quiz = $krtekSeason->activeQuiz;
+        $this->assertInstanceOf(Quiz::class, $quiz);
+
+        // Start Quiz
+        $qc = new QuizCandidate($quiz, $candidate);
+        $this->entityManager->persist($qc);
+        $this->entityManager->flush();
+
+        for ($i = 0; $i < 15; ++$i) {
+            $question = $this->questionRepository->findNextQuestionForCandidate($candidate);
+            $this->assertInstanceOf(Question::class, $question);
+
+            $answer = $question->answers->first();
+            $this->assertInstanceOf(Answer::class, $answer);
+
+            $clock->sleep(10 + $i);
+            $qa = new GivenAnswer($candidate, $quiz, $answer);
+            $this->entityManager->persist($qa);
+            $this->entityManager->flush();
+        }
+
+        $result = $this->quizRepository->getScores($quiz);
+
+        $this->assertSame('Iris', $result[0]->name);
+        $this->assertSame(5, $result[0]->correct);
+        $this->assertEqualsWithDelta(5.0, $result[0]->score, \PHP_FLOAT_EPSILON);
+
+        $this->assertSame(4, $result[0]->time->i);
+        $this->assertSame(15, $result[0]->time->s);
+    }
+
+    public function testScoresAreCalculatedCorrectly(): void
+    {
+        $clock = new MockClock('2025-11-01 16:00:00');
+        self::getContainer()->set(ClockInterface::class, $clock);
+        $krtekSeason = $this->getSeasonByCode('krtek');
+        $candidate1 = $this->getCandidateBySeasonAndName($krtekSeason, 'Iris');
+        $candidate2 = $this->getCandidateBySeasonAndName($krtekSeason, 'Philine');
+
+        $quiz = $krtekSeason->activeQuiz;
+        $this->assertInstanceOf(Quiz::class, $quiz);
+
+        $qc1 = new QuizCandidate($quiz, $candidate1);
+        $qc2 = new QuizCandidate($quiz, $candidate2);
+        $this->entityManager->persist($qc1);
+        $this->entityManager->persist($qc2);
+        $this->entityManager->flush();
+
+        for ($i = 0; $i < 15; ++$i) {
+            $question = $this->questionRepository->findNextQuestionForCandidate($candidate1);
+            $this->assertInstanceOf(Question::class, $question);
+
+            $answer1 = $question->answers->first();
+            $answer2 = $question->answers[intdiv(\count($question->answers), 2)];
+            $this->assertInstanceOf(Answer::class, $answer1);
+            $this->assertInstanceOf(Answer::class, $answer2);
+
+            $clock->sleep(10);
+
+            $qa = new GivenAnswer($candidate1, $quiz, $answer1);
+            $this->entityManager->persist($qa);
+            $qa = new GivenAnswer($candidate2, $quiz, $answer2);
+            $this->entityManager->persist($qa);
+
+            $this->entityManager->flush();
+        }
+
+        $scores = $this->quizRepository->getScores($quiz);
+        $this->assertCount(2, $scores);
+        $this->assertSame('Iris', $scores[0]->name);
+        $this->assertSame('Philine', $scores[1]->name);
+        $this->assertEqualsWithDelta(5.0, $scores[0]->score, \PHP_FLOAT_EPSILON);
+        $this->assertEqualsWithDelta(4.0, $scores[1]->score, \PHP_FLOAT_EPSILON);
+    }
+
+    public function testCorrectionsCalculatedCorrectly(): void
+    {
+        $clock = new MockClock('2025-11-01 16:00:00');
+        self::getContainer()->set(ClockInterface::class, $clock);
+        $krtekSeason = $this->getSeasonByCode('krtek');
+        $candidate = $this->getCandidateBySeasonAndName($krtekSeason, 'Iris');
+
+        $quiz = $krtekSeason->activeQuiz;
+        $this->assertInstanceOf(Quiz::class, $quiz);
+
+        $qc = new QuizCandidate($quiz, $candidate);
+        $this->entityManager->persist($qc);
+        $this->entityManager->flush();
+
+        for ($i = 0; $i < 15; ++$i) {
+            $question = $this->questionRepository->findNextQuestionForCandidate($candidate);
+            $this->assertInstanceOf(Question::class, $question);
+
+            $answer = $question->answers->first();
+            $this->assertInstanceOf(Answer::class, $answer);
+
+            $clock->sleep(10);
+            $qa = new GivenAnswer($candidate, $quiz, $answer);
+            $this->entityManager->persist($qa);
+            $this->entityManager->flush();
+        }
+
+        $qc->corrections = 2;
+        $this->entityManager->flush();
+
+        $result = $this->quizRepository->getScores($quiz);
+
+        $this->assertEqualsWithDelta(7.0, $result[0]->score, \PHP_FLOAT_EPSILON);
+    }
+
+    public function testCandidatesWithSameScoreAreSortedCorrectlyByTime(): void
+    {
+        $clock = new MockClock('2025-11-01 16:00:00');
+        self::getContainer()->set(ClockInterface::class, $clock);
+        $krtekSeason = $this->getSeasonByCode('krtek');
+        $candidate1 = $this->getCandidateBySeasonAndName($krtekSeason, 'Iris');
+        $candidate2 = $this->getCandidateBySeasonAndName($krtekSeason, 'Philine');
+
+        $quiz = $krtekSeason->activeQuiz;
+        $this->assertInstanceOf(Quiz::class, $quiz);
+
+        $qc1 = new QuizCandidate($quiz, $candidate1);
+        $this->entityManager->persist($qc1);
+        $clock->sleep(10);
+        $qc2 = new QuizCandidate($quiz, $candidate2);
+        $this->entityManager->persist($qc2);
+        $this->entityManager->flush();
+
+        for ($i = 0; $i < 15; ++$i) {
+            $question = $this->questionRepository->findNextQuestionForCandidate($candidate1);
+            $this->assertInstanceOf(Question::class, $question);
+
+            $answer1 = $question->answers->first();
+            $answer2 = $question->answers->last();
+            $this->assertInstanceOf(Answer::class, $answer1);
+            $this->assertInstanceOf(Answer::class, $answer2);
+
+            $clock->sleep(10);
+
+            $qa = new GivenAnswer($candidate1, $quiz, $answer1);
+            $this->entityManager->persist($qa);
+
+            $qa = new GivenAnswer($candidate2, $quiz, $answer2);
+            $this->entityManager->persist($qa);
+
+            $this->entityManager->flush();
+        }
+
+        $result = $this->quizRepository->getScores($quiz);
+
+        $this->assertEqualsWithDelta(5.0, $result[0]->score, \PHP_FLOAT_EPSILON);
+        $this->assertEqualsWithDelta(5.0, $result[1]->score, \PHP_FLOAT_EPSILON);
+        $this->assertSame('Philine', $result[0]->name);
+        $this->assertSame('Iris', $result[1]->name);
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Marijn Doeve	b57faaf431	Update to 7.4.2 (#68 ) Some checks failed CI / Tests (push) Failing after 39s Details CI / Build and deploy to ${{ startsWith(github.ref, 'refs/tags/') && 'production' \|\| (github.ref == 'refs/heads/main' && 'acceptance' \|\| '') }} (push) Has been skipped Details	2025-12-11 16:48:16 +01:00
Marijn Doeve	bcd6a157a8	Create Testcoverage and upgrade Symfomy and PHP Some checks failed CI / Tests (push) Failing after 1m8s Details CI / Build and deploy to ${{ startsWith(github.ref, 'refs/tags/') && 'production' \|\| (github.ref == 'refs/heads/main' && 'acceptance' \|\| '') }} (push) Has been skipped Details * Some tests * More tests! * Tests 3 * Move getScores from Candidate to Quiz * Add some suggestions for future refactoring * - Add Gedmo doctrine-extensions and Stof bundle integration - Added `stof/doctrine-extensions-bundle` and `gedmo/doctrine-extensions` dependencies. - Integrated `Timestampable` behavior for `Created` fields in entities. - Updated `bundles.php` to register StofDoctrineExtensionsBundle. - Added configuration for the Stof bundle. - Simplified `SeasonVoter` with `match` expression and added new tests. - Minor fixes and adjustments across various files. * WIP * All the tests * Base64 tests * Symfomny 7.4.0 * Update * Update recipe * PHP 8.5 * Rector changes * More 8.5 * Things	2025-11-28 22:56:09 +01:00
dependabot[bot]	fc273638ad	Bump rector/rector from 2.2.3 to 2.2.6 Some checks failed CI / Tests (push) Failing after 31s Details CI / Build and deploy to ${{ startsWith(github.ref, 'refs/tags/') && 'production' \|\| (github.ref == 'refs/heads/main' && 'acceptance' \|\| '') }} (push) Has been skipped Details Bumps [rector/rector](https://github.com/rectorphp/rector) from 2.2.3 to 2.2.6. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/2.2.3...2.2.6) --- updated-dependencies: - dependency-name: rector/rector dependency-version: 2.2.6 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-29 15:59:49 +01:00
dependabot[bot]	1ed1d43c54	Bump symfony/ux-turbo from 2.30.0 to 2.31.0 Bumps [symfony/ux-turbo](https://github.com/symfony/ux-turbo) from 2.30.0 to 2.31.0. - [Changelog](https://github.com/symfony/ux-turbo/blob/2.x/CHANGELOG.md) - [Commits](https://github.com/symfony/ux-turbo/compare/v2.30.0...v2.31.0) --- updated-dependencies: - dependency-name: symfony/ux-turbo dependency-version: 2.31.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-29 15:59:39 +01:00
dependabot[bot]	216fabcd4e	Bump doctrine/orm from 3.5.2 to 3.5.3 Bumps [doctrine/orm](https://github.com/doctrine/orm) from 3.5.2 to 3.5.3. - [Release notes](https://github.com/doctrine/orm/releases) - [Commits](https://github.com/doctrine/orm/compare/3.5.2...3.5.3) --- updated-dependencies: - dependency-name: doctrine/orm dependency-version: 3.5.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-29 15:59:23 +01:00
dependabot[bot]	a227fb0890	Bump friendsofphp/php-cs-fixer from 3.89.0 to 3.89.1 Bumps [friendsofphp/php-cs-fixer](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer) from 3.89.0 to 3.89.1. - [Release notes](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases) - [Changelog](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/CHANGELOG.md) - [Commits](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.89.0...v3.89.1) --- updated-dependencies: - dependency-name: friendsofphp/php-cs-fixer dependency-version: 3.89.1 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-29 15:59:13 +01:00
dependabot[bot]	354f0140cd	Bump phpoffice/phpspreadsheet from 5.1.0 to 5.2.0 Bumps [phpoffice/phpspreadsheet](https://github.com/PHPOffice/PhpSpreadsheet) from 5.1.0 to 5.2.0. - [Release notes](https://github.com/PHPOffice/PhpSpreadsheet/releases) - [Changelog](https://github.com/PHPOffice/PhpSpreadsheet/blob/master/CHANGELOG.md) - [Commits](https://github.com/PHPOffice/PhpSpreadsheet/compare/5.1.0...5.2.0) --- updated-dependencies: - dependency-name: phpoffice/phpspreadsheet dependency-version: 5.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-29 15:58:58 +01:00
Marijn Doeve	d58d3d7a03	Fix doctrine config Some checks failed CI / Tests (push) Failing after 32s Details CI / Build and deploy to ${{ startsWith(github.ref, 'refs/tags/') && 'production' \|\| (github.ref == 'refs/heads/main' && 'acceptance' \|\| '') }} (push) Has been skipped Details	2025-10-22 08:36:05 +02:00
Marijn Doeve	5749f85337	Upgrade dependencies Some checks failed CI / Tests (push) Failing after 38s Details CI / Build and deploy to ${{ startsWith(github.ref, 'refs/tags/') && 'production' \|\| (github.ref == 'refs/heads/main' && 'acceptance' \|\| '') }} (push) Has been skipped Details	2025-10-21 22:02:17 +02:00
Marijn Doeve	311fbf607c	Change Dependabot schedule to daily and add Docker	2025-10-21 20:51:11 +02:00
dependabot[bot]	9f08209d39	Bump rector/rector from 2.1.7 to 2.2.3 Some checks failed CI / Tests (push) Failing after 41s Details CI / Build and deploy to ${{ startsWith(github.ref, 'refs/tags/') && 'production' \|\| (github.ref == 'refs/heads/main' && 'acceptance' \|\| '') }} (push) Has been skipped Details Bumps [rector/rector](https://github.com/rectorphp/rector) from 2.1.7 to 2.2.3. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/2.1.7...2.2.3) --- updated-dependencies: - dependency-name: rector/rector dependency-version: 2.2.3 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-21 08:06:11 +02:00
dependabot[bot]	a1fc86a6a0	Bump doctrine/doctrine-fixtures-bundle from 4.1.0 to 4.3.0 Bumps [doctrine/doctrine-fixtures-bundle](https://github.com/doctrine/DoctrineFixturesBundle) from 4.1.0 to 4.3.0. - [Release notes](https://github.com/doctrine/DoctrineFixturesBundle/releases) - [Commits](https://github.com/doctrine/DoctrineFixturesBundle/compare/4.1.0...4.3.0) --- updated-dependencies: - dependency-name: doctrine/doctrine-fixtures-bundle dependency-version: 4.3.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-21 08:05:35 +02:00
dependabot[bot]	961c7434ac	Bump phpstan/phpstan-doctrine from 2.0.6 to 2.0.10 Bumps [phpstan/phpstan-doctrine](https://github.com/phpstan/phpstan-doctrine) from 2.0.6 to 2.0.10. - [Release notes](https://github.com/phpstan/phpstan-doctrine/releases) - [Commits](https://github.com/phpstan/phpstan-doctrine/compare/2.0.6...2.0.10) --- updated-dependencies: - dependency-name: phpstan/phpstan-doctrine dependency-version: 2.0.10 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-21 08:04:57 +02:00
Marijn Doeve	ee1a15ee78	New pipeline Some checks failed CI / Tests (push) Failing after 36s Details CI / Build and deploy to ${{ startsWith(github.ref, 'refs/tags/') && 'production' \|\| (github.ref == 'refs/heads/main' && 'acceptance' \|\| '') }} (push) Has been skipped Details	2025-10-21 00:06:23 +02:00
Marijn Doeve	253729abc0	Add completions	2025-10-20 21:41:46 +02:00
Marijn Doeve	b66d2f9e86	Refactor entities and codebase for native property usage Some checks failed CI / Tests (push) Failing after 35s Details CI / Deploy (push) Has been skipped Details - Replaced getters/setters with direct property access across entities and repositories. - Added and configured `martin-georgiev/postgresql-for-doctrine` for PostgreSQL enhancements. - Updated Doctrine configuration with types, mappings, and JSONB query functions. - Removed unused `EliminationService` and related YAML configurations.	2025-10-08 20:50:33 +02:00
Marijn Doeve	ab187a28b9	Add Symfony container support for Rector configuration - Introduced `tests/symfony-container.php` for bootstrapping Symfony. - Updated `rector.php` with new container PHP path and kernel modifications. - Registered Symfony routes provider service in Rector.	2025-10-08 20:50:33 +02:00
Marijn Doeve	ca460cca7f	- Refactor ORM annotations across entities for consistency. - Adjusted migrations to align with refactored ORM annotations. - Added new PHPStan and PHP-CS-Fixer configurations, including stricter rules. - Introduced `tests/object-manager.php` to improve test environment setup.	2025-10-04 12:40:45 +02:00
Marijn Doeve	3e39550c90	Remove EasyAdmin integration - Removed EasyAdmin controllers and configurations. - Uninstalled `easycorp/easyadmin-bundle` and related dependencies. - Cleaned up all associated routes, bundles, and vendor references.	2025-10-03 22:37:45 +02:00