Fix Remember me (#111)

Bumps [doctrine/persistence](https://github.com/doctrine/persistence) from 4.1.1 to 4.2.0.
- [Release notes](https://github.com/doctrine/persistence/releases)
- [Commits](https://github.com/doctrine/persistence/compare/4.1.1...4.2.0)

---
updated-dependencies:
- dependency-name: doctrine/persistence
  dependency-version: 4.2.0
  dependency-type: indirect
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.coderabbit.yaml

@@ -0,0 +1,6 @@
+# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
+language: "en-GB"
+reviews:
+  sequence_diagrams: false
+  path_filters:
+    - "!config/reference.php"

.editorconfig

@@ -54,7 +54,7 @@ indent_size = 4
 [{compose,docker-compose}.*.{yaml,yml}]
 indent_size = 2
 
-[*.*Dockerfile]
+[{*.*Dockerfile,Dockerfile}]
 indent_style = tab
 
 [{*.*Caddyfile,Caddyfile}]

.env

@@ -17,6 +17,7 @@
 ###> symfony/framework-bundle ###
 APP_ENV=dev
 APP_SECRET=
+APP_SHARE_DIR=var/share
 ###< symfony/framework-bundle ###
 
 ###> doctrine/doctrine-bundle ###
@@ -36,3 +37,10 @@ MAILER_DSN=null://null
 ###> sentry/sentry-symfony ###
 SENTRY_DSN=
 ###< sentry/sentry-symfony ###
+XDEBUG_MODE=coverage
+
+###> symfony/routing ###
+# Configure how to generate URLs in non-HTTP contexts, such as CLI commands.
+# See https://symfony.com/doc/current/routing.html#generating-urls-in-commands
+DEFAULT_URI=http://localhost
+###< symfony/routing ###

.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

.gitattributes

@@ -15,3 +15,4 @@ composer.lock text eol=lf merge=ours
 
 *.ico binary
 *.png binary
+config/reference.php linguist-generated

.github/dependabot.yml

@@ -7,5 +7,24 @@ version: 2
 updates:
   - package-ecosystem: "composer" # See documentation for possible values
     directory: "/" # Location of package manifests
+    allow:
+      # Allow both direct and indirect updates for all packages
+      - dependency-type: "all"
     schedule:
-      interval: "weekly"
+      interval: "daily"
+    ignore:
+      - dependency-name: "symfony/*"
+        update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
+    groups:
+      dev-dependencies:
+        dependency-type: "development"
+      symfony:
+        patterns:
+          - "symfony/*"
+      twig:
+        patterns:
+          - "twig/*"
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/ci.yml

@@ -57,6 +57,8 @@ 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

.github/workflows/dependabot-auto-merge.yml

@@ -0,0 +1,25 @@
+name: Dependabot auto-merge
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.user.login == 'dependabot[bot]'
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v2
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Enable auto-merge for Dependabot PRs
+        if: contains(steps.metadata.outputs.dependency-type, 'development')
+        run: |
+          gh pr review --approve "$PR_URL"
+          gh pr merge --auto --squash "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.gitignore

@@ -68,6 +68,19 @@ Icon
 # Thumbnails
 ._*
 
+# IDEs
+/.idea/
+/.vscode/
+
+# Junie
+!/.junie/
+/.junie/memory/
+/.junie/plans/
+
+# Windows
+Thumbs.db
+Desktop.ini
+
 # Files that might appear in the root of a volume
 .DocumentRevisions-V100
 .fseventsd

.idea/TijdVoorDeTest.iml

@@ -45,7 +45,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/react/socket" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/react/stream" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/rector/rector" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/runtime/frankenphp-symfony" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/cli-parser" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/comparator" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/complexity" />
@@ -127,7 +126,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/vincentlanglet/twig-cs-fixer" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/assert" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/egulias/email-validator" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/masterminds/html5" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/browser-kit" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/dom-crawler" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/mailer" />
@@ -153,7 +151,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/markbaker/complex" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/markbaker/matrix" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpoffice/phpspreadsheet" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/psr/http-client" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/psr/simple-cache" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/asset-mapper" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/http-client" />
@@ -165,6 +162,10 @@
       <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" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/git-state" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

.idea/dataSources.xml

@@ -6,6 +6,11 @@
       <synchronize>true</synchronize>
       <jdbc-driver>org.postgresql.Driver</jdbc-driver>
       <jdbc-url>jdbc:postgresql://localhost:5432/app</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.host.port" />
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+        <property name="com.intellij.clouds.kubernetes.db.container.port" />
+      </jdbc-additional-properties>
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
   </component>

.idea/laravel-idea.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="InertiaPackage">
+    <option name="directoryPaths">
+      <list />
+    </option>
+  </component>
+</project>

.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>

.idea/php.xml

@@ -7,6 +7,11 @@
       </laravel_pint_by_interpreter>
     </laravel_pint_settings>
   </component>
+  <component name="MessDetector">
+    <phpmd_settings>
+      <phpmd_by_interpreter asDefaultInterpreter="true" interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" timeout="30000" />
+    </phpmd_settings>
+  </component>
   <component name="MessDetectorOptionsConfiguration">
     <option name="transferred" value="true" />
   </component>
@@ -21,9 +26,9 @@
   </component>
   <component name="PhpCSFixer">
     <phpcsfixer_settings>
-      <phpcs_fixer_by_interpreter interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" standards="DoctrineAnnotation;PER;PER-CS;PER-CS1.0;PER-CS2.0;PHP54Migration;PHP56Migration;PHP70Migration;PHP71Migration;PHP73Migration;PHP74Migration;PHP80Migration;PHP81Migration;PHP82Migration;PHP83Migration;PHP84Migration;PHPUnit100Migration;PHPUnit30Migration;PHPUnit32Migration;PHPUnit35Migration;PHPUnit43Migration;PHPUnit48Migration;PHPUnit50Migration;PHPUnit52Migration;PHPUnit54Migration;PHPUnit55Migration;PHPUnit56Migration;PHPUnit57Migration;PHPUnit60Migration;PHPUnit75Migration;PHPUnit84Migration;PHPUnit91Migration;PSR1;PSR12;PSR2;PhpCsFixer;Symfony" tool_path="vendor/bin/php-cs-fixer" timeout="30000" />
+      <phpcs_fixer_by_interpreter interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" standards="DoctrineAnnotation;PER;PER-CS;PER-CS1.0;PER-CS1x0;PER-CS2.0;PER-CS2x0;PER-CS3.0;PER-CS3x0;PHP54Migration;PHP56Migration;PHP5x4Migration;PHP5x6Migration;PHP70Migration;PHP71Migration;PHP73Migration;PHP74Migration;PHP7x0Migration;PHP7x1Migration;PHP7x3Migration;PHP7x4Migration;PHP80Migration;PHP81Migration;PHP82Migration;PHP83Migration;PHP84Migration;PHP85Migration;PHP8x0Migration;PHP8x1Migration;PHP8x2Migration;PHP8x3Migration;PHP8x4Migration;PHP8x5Migration;PHPUnit100Migration;PHPUnit10x0Migration;PHPUnit11x0Migration;PHPUnit30Migration;PHPUnit32Migration;PHPUnit35Migration;PHPUnit3x0Migration;PHPUnit3x2Migration;PHPUnit3x5Migration;PHPUnit43Migration;PHPUnit48Migration;PHPUnit4x3Migration;PHPUnit4x8Migration;PHPUnit50Migration;PHPUnit52Migration;PHPUnit54Migration;PHPUnit55Migration;PHPUnit56Migration;PHPUnit57Migration;PHPUnit5x0Migration;PHPUnit5x2Migration;PHPUnit5x4Migration;PHPUnit5x5Migration;PHPUnit5x6Migration;PHPUnit5x7Migration;PHPUnit60Migration;PHPUnit6x0Migration;PHPUnit75Migration;PHPUnit7x5Migration;PHPUnit84Migration;PHPUnit8x4Migration;PHPUnit91Migration;PHPUnit9x1Migration;PSR1;PSR12;PSR2;PhpCsFixer;Symfony;auto;autoPHPMigration;autoPHPUnitMigration" tool_path="vendor/bin/php-cs-fixer" timeout="30000" />
       <PhpCSFixerConfiguration deletedFromTheList="true" standards="PSR1;PSR2;Symfony;DoctrineAnnotation;PHP70Migration;PHP71Migration" tool_path="$PROJECT_DIR$/vendor/bin/php-cs-fixer" />
-      <phpcs_fixer_by_interpreter asDefaultInterpreter="true" deletedFromTheList="true" interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" standards="DoctrineAnnotation;PER;PER-CS;PER-CS1.0;PER-CS2.0;PHP54Migration;PHP56Migration;PHP70Migration;PHP71Migration;PHP73Migration;PHP74Migration;PHP80Migration;PHP81Migration;PHP82Migration;PHP83Migration;PHP84Migration;PHPUnit100Migration;PHPUnit30Migration;PHPUnit32Migration;PHPUnit35Migration;PHPUnit43Migration;PHPUnit48Migration;PHPUnit50Migration;PHPUnit52Migration;PHPUnit54Migration;PHPUnit55Migration;PHPUnit56Migration;PHPUnit57Migration;PHPUnit60Migration;PHPUnit75Migration;PHPUnit84Migration;PHPUnit91Migration;PSR1;PSR12;PSR2;PhpCsFixer;Symfony" tool_path="vendor/bin/php-cs-fixer" timeout="30000" />
+      <phpcs_fixer_by_interpreter asDefaultInterpreter="true" deletedFromTheList="true" interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" standards="DoctrineAnnotation;PER;PER-CS;PER-CS1.0;PER-CS1x0;PER-CS2.0;PER-CS2x0;PER-CS3.0;PER-CS3x0;PHP54Migration;PHP56Migration;PHP5x4Migration;PHP5x6Migration;PHP70Migration;PHP71Migration;PHP73Migration;PHP74Migration;PHP7x0Migration;PHP7x1Migration;PHP7x3Migration;PHP7x4Migration;PHP80Migration;PHP81Migration;PHP82Migration;PHP83Migration;PHP84Migration;PHP85Migration;PHP8x0Migration;PHP8x1Migration;PHP8x2Migration;PHP8x3Migration;PHP8x4Migration;PHP8x5Migration;PHPUnit100Migration;PHPUnit10x0Migration;PHPUnit11x0Migration;PHPUnit30Migration;PHPUnit32Migration;PHPUnit35Migration;PHPUnit3x0Migration;PHPUnit3x2Migration;PHPUnit3x5Migration;PHPUnit43Migration;PHPUnit48Migration;PHPUnit4x3Migration;PHPUnit4x8Migration;PHPUnit50Migration;PHPUnit52Migration;PHPUnit54Migration;PHPUnit55Migration;PHPUnit56Migration;PHPUnit57Migration;PHPUnit5x0Migration;PHPUnit5x2Migration;PHPUnit5x4Migration;PHPUnit5x5Migration;PHPUnit5x6Migration;PHPUnit5x7Migration;PHPUnit60Migration;PHPUnit6x0Migration;PHPUnit75Migration;PHPUnit7x5Migration;PHPUnit84Migration;PHPUnit8x4Migration;PHPUnit91Migration;PHPUnit9x1Migration;PSR1;PSR12;PSR2;PhpCsFixer;Symfony;auto;autoPHPMigration;autoPHPUnitMigration" tool_path="vendor/bin/php-cs-fixer" timeout="30000" />
     </phpcsfixer_settings>
   </component>
   <component name="PhpCodeSniffer">
@@ -36,171 +41,173 @@
   </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/cache" />
-      <path value="$PROJECT_DIR$/vendor/symfony/serializer" />
+      <path value="$PROJECT_DIR$/vendor/symfony/validator" />
       <path value="$PROJECT_DIR$/vendor/symfony/dotenv" />
-      <path value="$PROJECT_DIR$/vendor/symfony/security-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/serializer" />
       <path value="$PROJECT_DIR$/vendor/symfony/intl" />
-      <path value="$PROJECT_DIR$/vendor/symfony/asset" />
+      <path value="$PROJECT_DIR$/vendor/symfony/security-bundle" />
       <path value="$PROJECT_DIR$/vendor/symfony/browser-kit" />
-      <path value="$PROJECT_DIR$/vendor/symfony/config" />
+      <path value="$PROJECT_DIR$/vendor/symfony/asset" />
-      <path value="$PROJECT_DIR$/vendor/symfony/security-http" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
-      <path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-invoker" />
-      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
-      <path value="$PROJECT_DIR$/vendor/symfony/runtime" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
-      <path value="$PROJECT_DIR$/vendor/symfony/uid" />
+      <path value="$PROJECT_DIR$/vendor/symfony/ux-turbo" />
-      <path value="$PROJECT_DIR$/vendor/symfony/asset-mapper" />
+      <path value="$PROJECT_DIR$/vendor/symfony/form" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-icu" />
+      <path value="$PROJECT_DIR$/vendor/symfony/framework-bundle" />
       <path value="$PROJECT_DIR$/vendor/symfony/mailer" />
-      <path value="$PROJECT_DIR$/vendor/symfony/filesystem" />
+      <path value="$PROJECT_DIR$/vendor/symfony/brevo-mailer" />
-      <path value="$PROJECT_DIR$/vendor/symfony/phpunit-bridge" />
       <path value="$PROJECT_DIR$/vendor/symfony/var-dumper" />
+      <path value="$PROJECT_DIR$/vendor/symfony/phpunit-bridge" />
       <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/options-resolver" />
-      <path value="$PROJECT_DIR$/vendor/symfony/css-selector" />
+      <path value="$PROJECT_DIR$/vendor/symfony/filesystem" />
-      <path value="$PROJECT_DIR$/vendor/symfony/twig-bridge" />
+      <path value="$PROJECT_DIR$/vendor/symfony/security-http" />
-      <path value="$PROJECT_DIR$/vendor/symfony/web-profiler-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/config" />
-      <path value="$PROJECT_DIR$/vendor/symfony/property-access" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/twig-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
-      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/runtime" />
-      <path value="$PROJECT_DIR$/vendor/symfony/dom-crawler" />
+      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
+      <path value="$PROJECT_DIR$/vendor/symfony/asset-mapper" />
+      <path value="$PROJECT_DIR$/vendor/symfony/uid" />
       <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/twig-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/property-access" />
       <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/psr-http-message-bridge" />
-      <path value="$PROJECT_DIR$/vendor/symfony/routing" />
+      <path value="$PROJECT_DIR$/vendor/symfony/stopwatch" />
-      <path value="$PROJECT_DIR$/vendor/symfony/string" />
+      <path value="$PROJECT_DIR$/vendor/symfony/web-profiler-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/security-core" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-uuid" />
-      <path value="$PROJECT_DIR$/vendor/symfony/property-info" />
+      <path value="$PROJECT_DIR$/vendor/symfony/twig-bridge" />
-      <path value="$PROJECT_DIR$/vendor/symfony/type-info" />
+      <path value="$PROJECT_DIR$/vendor/symfony/maker-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/service-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/dom-crawler" />
-      <path value="$PROJECT_DIR$/vendor/symfony/http-client-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/css-selector" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-normalizer" />
       <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/http-foundation" />
+      <path value="$PROJECT_DIR$/vendor/symfony/type-info" />
       <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/error-handler" />
-      <path value="$PROJECT_DIR$/vendor/symfony/password-hasher" />
+      <path value="$PROJECT_DIR$/vendor/symfony/flex" />
+      <path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/security-core" />
+      <path value="$PROJECT_DIR$/vendor/symfony/string" />
+      <path value="$PROJECT_DIR$/vendor/symfony/mime" />
+      <path value="$PROJECT_DIR$/vendor/symfony/property-info" />
+      <path value="$PROJECT_DIR$/vendor/symfony/http-client-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/service-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/routing" />
       <path value="$PROJECT_DIR$/vendor/symfony/process" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-grapheme" />
+      <path value="$PROJECT_DIR$/vendor/symfony/password-hasher" />
+      <path value="$PROJECT_DIR$/vendor/symfony/clock" />
+      <path value="$PROJECT_DIR$/vendor/symfony/stimulus-bundle" />
       <path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-migrations-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-grapheme" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/lexer" />
+      <path value="$PROJECT_DIR$/vendor/symfony/console" />
-      <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/doctrine-fixtures-bundle" />
       <path value="$PROJECT_DIR$/vendor/doctrine/persistence" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/collections" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
       <path value="$PROJECT_DIR$/vendor/doctrine/sql-formatter" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/orm" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/collections" />
       <path value="$PROJECT_DIR$/vendor/doctrine/event-manager" />
-      <path value="$PROJECT_DIR$/vendor/evenement/evenement" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/orm" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/deprecations" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-migrations-bundle" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/dbal" />
-      <path value="$PROJECT_DIR$/vendor/markbaker/matrix" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/lexer" />
-      <path value="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/data-fixtures" />
-      <path value="$PROJECT_DIR$/vendor/maennchen/zipstream-php" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/migrations" />
-      <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/object-enumerator" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/version" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/cli-parser" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
       <path value="$PROJECT_DIR$/vendor/sebastian/lines-of-code" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/type" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
-      <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/diff" />
-      <path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/complexity" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/environment" />
+      <path value="$PROJECT_DIR$/vendor/maennchen/zipstream-php" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
+      <path value="$PROJECT_DIR$/vendor/evenement/evenement" />
-      <path value="$PROJECT_DIR$/vendor/symfonycasts/verify-email-bundle" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfonycasts/sass-bundle" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/deprecations" />
-      <path value="$PROJECT_DIR$/vendor/masterminds/html5" />
+      <path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
-      <path value="$PROJECT_DIR$/vendor/friendsofphp/php-cs-fixer" />
+      <path value="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet" />
-      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
+      <path value="$PROJECT_DIR$/vendor/markbaker/matrix" />
-      <path value="$PROJECT_DIR$/vendor/vincentlanglet/twig-cs-fixer" />
+      <path value="$PROJECT_DIR$/vendor/markbaker/complex" />
-      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
       <path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
+      <path value="$PROJECT_DIR$/vendor/symfonycasts/sass-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfonycasts/verify-email-bundle" />
       <path value="$PROJECT_DIR$/vendor/thecodingmachine/safe" />
+      <path value="$PROJECT_DIR$/vendor/martin-georgiev/postgresql-for-doctrine" />
+      <path value="$PROJECT_DIR$/vendor/vincentlanglet/twig-cs-fixer" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/environment" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/cli-parser" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/version" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/type" />
+      <path value="$PROJECT_DIR$/vendor/friendsofphp/php-cs-fixer" />
+      <path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
+      <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
       <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/psr/http-client" />
       <path value="$PROJECT_DIR$/vendor/psr/log" />
-      <path value="$PROJECT_DIR$/vendor/twig/extra-bundle" />
+      <path value="$PROJECT_DIR$/vendor/psr/container" />
-      <path value="$PROJECT_DIR$/vendor/twig/intl-extra" />
+      <path value="$PROJECT_DIR$/vendor/psr/http-message" />
-      <path value="$PROJECT_DIR$/vendor/psr/http-factory" />
+      <path value="$PROJECT_DIR$/vendor/psr/event-dispatcher" />
       <path value="$PROJECT_DIR$/vendor/clue/ndjson-react" />
-      <path value="$PROJECT_DIR$/vendor/fidry/cpu-core-counter" />
+      <path value="$PROJECT_DIR$/vendor/psr/http-factory" />
+      <path value="$PROJECT_DIR$/vendor/psr/clock" />
+      <path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
+      <path value="$PROJECT_DIR$/vendor/psr/cache" />
+      <path value="$PROJECT_DIR$/vendor/react/promise" />
+      <path value="$PROJECT_DIR$/vendor/react/stream" />
+      <path value="$PROJECT_DIR$/vendor/react/cache" />
+      <path value="$PROJECT_DIR$/vendor/react/event-loop" />
+      <path value="$PROJECT_DIR$/vendor/jean85/pretty-package-versions" />
+      <path value="$PROJECT_DIR$/vendor/react/child-process" />
+      <path value="$PROJECT_DIR$/vendor/react/socket" />
+      <path value="$PROJECT_DIR$/vendor/react/dns" />
+      <path value="$PROJECT_DIR$/vendor/twig/intl-extra" />
+      <path value="$PROJECT_DIR$/vendor/twig/extra-bundle" />
+      <path value="$PROJECT_DIR$/vendor/stof/doctrine-extensions-bundle" />
+      <path value="$PROJECT_DIR$/vendor/dama/doctrine-test-bundle" />
       <path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
+      <path value="$PROJECT_DIR$/vendor/gedmo/doctrine-extensions" />
+      <path value="$PROJECT_DIR$/vendor/fidry/cpu-core-counter" />
       <path value="$PROJECT_DIR$/vendor/twig/twig" />
-      <path value="$PROJECT_DIR$/vendor/symfony/ux-turbo" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-phpunit" />
-      <path value="$PROJECT_DIR$/vendor/symfony/stimulus-bundle" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-symfony" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-uuid" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-doctrine" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpdoc-parser" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/extension-installer" />
+      <path value="$PROJECT_DIR$/vendor/staabm/side-effects-detector" />
+      <path value="$PROJECT_DIR$/vendor/sentry/sentry" />
+      <path value="$PROJECT_DIR$/vendor/sentry/sentry-symfony" />
+      <path value="$PROJECT_DIR$/vendor/rector/rector" />
+      <path value="$PROJECT_DIR$/vendor/phar-io/version" />
+      <path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
+      <path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
+      <path value="$PROJECT_DIR$/vendor/egulias/email-validator" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php84" />
-      <path value="$PROJECT_DIR$/vendor/symfony/brevo-mailer" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php85" />
-      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/git-state" />
-      <path value="$PROJECT_DIR$/vendor/symfony/validator" />
-      <path value="$PROJECT_DIR$/vendor/martin-georgiev/postgresql-for-doctrine" />
     </include_path>
   </component>
   <component name="PhpInterpreters">
     <interpreters>
-      <interpreter id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" name="Compose PHP 8.4" home="docker-compose://DATA" auto="false" debugger_id="php.debugger.XDebug">
+      <interpreter id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" name="Compose PHP" home="docker-compose://DATA" auto="false" debugger_id="php.debugger.XDebug">
         <remote_data INTERPRETER_PATH="php" HELPERS_PATH="/opt/.phpstorm_helpers" VALID="true" RUN_AS_ROOT_VIA_SUDO="false" DOCKER_ACCOUNT_NAME="Colima" DOCKER_COMPOSE_SERVICE_NAME="php" DOCKER_REMOTE_PROJECT_PATH="/opt/project">
           <type_data command="EXEC" />
           <dockerComposeConfigurationPaths>
@@ -214,15 +221,15 @@
   </component>
   <component name="PhpInterpretersPhpInfoCache">
     <phpInfoCache>
-      <interpreter name="Compose PHP 8.4">
+      <interpreter name="Compose PHP">
-        <phpinfo binary_type="PHP" php_cgi="/usr/local/bin/php-cgi" php_cli="/usr/local/bin/php" path_separator=":" version="8.4.8">
+        <phpinfo binary_type="PHP" php_cgi="/usr/local/bin/php-cgi" php_cli="/usr/local/bin/php" path_separator=":" version="8.5.2">
-          <additional_php_ini>/usr/local/etc/php/conf.d/docker-php-ext-apcu.ini, /usr/local/etc/php/conf.d/docker-php-ext-excimer.ini, /usr/local/etc/php/conf.d/docker-php-ext-gd.ini, /usr/local/etc/php/conf.d/docker-php-ext-intl.ini, /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini, /usr/local/etc/php/conf.d/docker-php-ext-pdo_pgsql.ini, /usr/local/etc/php/conf.d/docker-php-ext-sodium.ini, /usr/local/etc/php/conf.d/docker-php-ext-uuid.ini, /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini, /usr/local/etc/php/conf.d/docker-php-ext-zip.ini, /usr/local/etc/php/app.conf.d/10-app.ini, /usr/local/etc/php/app.conf.d/20-app.dev.ini</additional_php_ini>
+          <additional_php_ini>/usr/local/etc/php/conf.d/docker-php-ext-apcu.ini, /usr/local/etc/php/conf.d/docker-php-ext-excimer.ini, /usr/local/etc/php/conf.d/docker-php-ext-gd.ini, /usr/local/etc/php/conf.d/docker-php-ext-intl.ini, /usr/local/etc/php/conf.d/docker-php-ext-pdo_pgsql.ini, /usr/local/etc/php/conf.d/docker-php-ext-sodium.ini, /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini, /usr/local/etc/php/conf.d/docker-php-ext-zip.ini, /usr/local/etc/php/app.conf.d/10-app.ini, /usr/local/etc/php/app.conf.d/20-app.dev.ini</additional_php_ini>
           <configuration_file>/usr/local/etc/php/php.ini</configuration_file>
           <configuration_options>
             <configuration_option name="include_path" value=".:/usr/local/lib/php" />
           </configuration_options>
           <debuggers>
-            <debugger_info debugger="xdebug" debugger_version="3.4.3">
+            <debugger_info debugger="xdebug" debugger_version="3.5.0">
               <debug_extensions />
             </debugger_info>
           </debuggers>
@@ -247,6 +254,7 @@
             <extension name="iconv" />
             <extension name="intl" />
             <extension name="json" />
+            <extension name="lexbor" />
             <extension name="libxml" />
             <extension name="mbstring" />
             <extension name="mysqlnd" />
@@ -262,7 +270,7 @@
             <extension name="sqlite3" />
             <extension name="standard" />
             <extension name="tokenizer" />
-            <extension name="uuid" />
+            <extension name="uri" />
             <extension name="xdebug" />
             <extension name="xml" />
             <extension name="xmlreader" />
@@ -274,7 +282,109 @@
       </interpreter>
     </phpInfoCache>
   </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="8.4" />
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.5" />
+  <component name="PhpRuntimeConfiguration">
+    <extensions>
+      <extension name="Ev" enabled="false" />
+      <extension name="SQLite" enabled="false" />
+      <extension name="SplType" enabled="false" />
+      <extension name="ZendDebugger" enabled="false" />
+      <extension name="ZendUtils" enabled="false" />
+      <extension name="amqp" enabled="false" />
+      <extension name="apache" enabled="false" />
+      <extension name="bcmath" enabled="false" />
+      <extension name="brotli" enabled="false" />
+      <extension name="bz2" enabled="false" />
+      <extension name="calendar" enabled="false" />
+      <extension name="cassandra" enabled="false" />
+      <extension name="couchbase" enabled="false" />
+      <extension name="cubrid" enabled="false" />
+      <extension name="dba" enabled="false" />
+      <extension name="decimal" enabled="false" />
+      <extension name="dio" enabled="false" />
+      <extension name="elastic_apm" enabled="false" />
+      <extension name="enchant" enabled="false" />
+      <extension name="exif" enabled="false" />
+      <extension name="fann" enabled="false" />
+      <extension name="ffmpeg" enabled="false" />
+      <extension name="frankenphp" enabled="false" />
+      <extension name="ftp" enabled="false" />
+      <extension name="gearman" enabled="false" />
+      <extension name="geoip" enabled="false" />
+      <extension name="geos" enabled="false" />
+      <extension name="gettext" enabled="false" />
+      <extension name="gmagick" enabled="false" />
+      <extension name="gmp" enabled="false" />
+      <extension name="gnupg" enabled="false" />
+      <extension name="grpc" enabled="false" />
+      <extension name="http" enabled="false" />
+      <extension name="ibm_db2" enabled="false" />
+      <extension name="igbinary" enabled="false" />
+      <extension name="imagick" enabled="false" />
+      <extension name="imap" enabled="false" />
+      <extension name="inotify" enabled="false" />
+      <extension name="interbase" enabled="false" />
+      <extension name="jsonpath" enabled="false" />
+      <extension name="judy" enabled="false" />
+      <extension name="ldap" enabled="false" />
+      <extension name="libevent" enabled="false" />
+      <extension name="libsodium" enabled="false" />
+      <extension name="mailparse" enabled="false" />
+      <extension name="mcrypt" enabled="false" />
+      <extension name="memcache" enabled="false" />
+      <extension name="memcached" enabled="false" />
+      <extension name="ming" enabled="false" />
+      <extension name="mongo" enabled="false" />
+      <extension name="mongodb" enabled="false" />
+      <extension name="mosquitto-php" enabled="false" />
+      <extension name="mqseries" enabled="false" />
+      <extension name="mssql" enabled="false" />
+      <extension name="mysql" enabled="false" />
+      <extension name="mysql_xdevapi" enabled="false" />
+      <extension name="mysqli" enabled="false" />
+      <extension name="ncurses" enabled="false" />
+      <extension name="newrelic" enabled="false" />
+      <extension name="oauth" enabled="false" />
+      <extension name="oci8" enabled="false" />
+      <extension name="odbc" enabled="false" />
+      <extension name="opentelemetry" enabled="false" />
+      <extension name="pcntl" enabled="false" />
+      <extension name="pdflib" enabled="false" />
+      <extension name="pgsql" enabled="false" />
+      <extension name="pspell" enabled="false" />
+      <extension name="pthreads" enabled="false" />
+      <extension name="rar" enabled="false" />
+      <extension name="recode" enabled="false" />
+      <extension name="redis" enabled="false" />
+      <extension name="relay" enabled="false" />
+      <extension name="rrd" enabled="false" />
+      <extension name="shmop" enabled="false" />
+      <extension name="snappy" enabled="false" />
+      <extension name="snmp" enabled="false" />
+      <extension name="soap" enabled="false" />
+      <extension name="sockets" enabled="false" />
+      <extension name="sqlsrv" enabled="false" />
+      <extension name="ssh2" enabled="false" />
+      <extension name="suhosin" enabled="false" />
+      <extension name="svn" enabled="false" />
+      <extension name="sybase" enabled="false" />
+      <extension name="sysvmsg" enabled="false" />
+      <extension name="sysvsem" enabled="false" />
+      <extension name="sysvshm" enabled="false" />
+      <extension name="tidy" enabled="false" />
+      <extension name="v8js" enabled="false" />
+      <extension name="wddx" enabled="false" />
+      <extension name="win32service" enabled="false" />
+      <extension name="wincache" enabled="false" />
+      <extension name="xhprof" enabled="false" />
+      <extension name="xlswriter" enabled="false" />
+      <extension name="xmlrpc" enabled="false" />
+      <extension name="xsl" enabled="false" />
+      <extension name="yaml" enabled="false" />
+      <extension name="zend" enabled="false" />
+      <extension name="zmq" enabled="false" />
+    </extensions>
+  </component>
   <component name="PhpStan">
     <PhpStan_settings>
       <phpstan_by_interpreter interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" tool_path="vendor/bin/phpstan" timeout="60000" />
@@ -289,7 +399,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">

.idea/sqldialects.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="SqlDialectMappings">
-    <file url="PROJECT" dialect="PostgreSQL" />
-  </component>
-</project>

.junie/AGENTS.md

@@ -0,0 +1,82 @@
+# Agent Guide: Tijd Voor De Test (Tvdt)
+
+This document provides essential context and instructions for AI agents working on the **Tijd Voor De Test** project.
+
+## Project Overview
+A web application for managing "Wie is de Mol?" style tests, including seasons, quizzes, candidates, and eliminations.
+
+- **Namespace**: `Tvdt`
+- **PHP Version**: 8.5+
+- **Framework**: Symfony 8.0
+
+## Tech Stack
+- **Server**: FrankenPHP (Caddy-based PHP server)
+- **Database**: PostgreSQL
+- **Frontend**: Symfony Asset Mapper (no Node.js/Webpack), Stimulus, Turbo
+- **Styling**: Sass (via `symfonycasts/sass-bundle`)
+- **Persistence**: Doctrine ORM 3.x
+
+## Core Domain Entities
+- **Season**: Groups quizzes and candidates for a specific period.
+- **SeasonSettings**: Configuration for a season.
+- **Quiz**: A test within a season containing multiple questions.
+- **Question**: Questions belonging to a quiz.
+- **Answer**: Possible answers for a question.
+- **Candidate**: A participant in the season.
+- **QuizCandidate**: Represents a candidate's attempt at a specific quiz (tracking start/end time).
+- **GivenAnswer**: The specific answer a candidate selected during a quiz.
+- **Elimination**: Records of red/green screens and forced results.
+- **User**: Administrative accounts for managing the system.
+
+## Development Workflow
+The project uses `just` as the primary task runner. Always prefer `just` commands over manual docker calls.
+
+### Common Commands
+- `just up`: Start the environment.
+- `just down`: Stop the environment.
+- `just shell`: Enter the PHP container.
+- `just migrate`: Run database migrations.
+- `just fixtures`: Load development fixtures.
+- `just fix-cs`: Run `php-cs-fixer` and `twig-cs-fixer`.
+- `just phpstan`: Run static analysis.
+- `just rector`: Run Rector for automated refactorings.
+- `just reload-tests`: Reset the test database and load test fixtures.
+
+## Coding Standards
+- **PSR-12**: Follow standard PHP coding styles.
+- **Strict Typing**: Use strict types in all PHP files.
+- **Doctrine ORM 3**: Be aware of ORM 3 changes (e.g., lazy loading behavior, attribute-based mapping).
+- **Symfony 8**: Use modern Symfony features (Attributes, Type-hinting).
+- **Safe Functions**: Use `thecodingmachine/safe` for standard PHP functions that throw exceptions instead of returning false.
+
+## Testing
+- **Framework**: PHPUnit
+- **Bundle**: `dama/doctrine-test-bundle` is used to wrap tests in transactions.
+- **Location**: `tests/` directory mirroring `src/`.
+- **Execution**: Run via `bin/phpunit` inside the container or `just reload-tests` to prepare the environment.
+
+## Frontend Development
+- JavaScript is managed via **Import Maps**.
+- Stimulus controllers are located in `assets/controllers/`.
+- CSS/Sass is in `assets/styles/`.
+- Assets are compiled on-the-fly or mapped; do not look for a `node_modules` folder.
+
+## Key Components
+### Controllers
+- **Backoffice**: Located in `src/Controller/Backoffice`, handles season and quiz management.
+- **Quiz**: `src/Controller/QuizController` handles the candidate-facing side of quizzes.
+- **Elimination**: `src/Controller/EliminationController` handles elimination screens.
+
+### Services
+- **QuizSpreadsheetService**: Handles importing quizzes from XLSX files.
+
+### Base Classes & Enums
+- **AbstractController**: Base class for all controllers, containing common regexes and flash helpers.
+- **FlashType Enum**: Used for consistent flash messaging (`FlashType::Success`, `FlashType::Danger`, etc.).
+
+## Key Files
+- `composer.json`: Dependency management.
+- `importmap.php`: JavaScript module mapping.
+- `Justfile`: Automation shortcuts.
+- `config/`: Application configuration.
+- `templates/`: Twig templates.

.php-cs-fixer.dist.php

@@ -9,6 +9,7 @@ $finder = new Finder()
     ->in(__DIR__)
     ->exclude('var')
     ->exclude('bin')
+    ->notPath(['config/reference.php'])
 ;
 
 return new Config()
@@ -24,8 +25,15 @@ return new Config()
         'no_unreachable_default_argument_value' => true,
         'no_useless_else' => true,
         'no_useless_return' => true,
-        'php_unit_strict' => true,
+        'phpdoc_line_span' => [
-        'phpdoc_line_span' => ['const' => 'single', 'method' => 'single', 'property' => 'single'],
+            'case' => 'single',
+            'class' => 'single',
+            'const' => 'single',
+            'method' => 'single',
+            'other' => 'single',
+            'property' => 'single',
+            'trait_import' => 'single',
+        ],
         'phpdoc_order' => true,
         'single_line_empty_body' => true,
         'strict_comparison' => true,
@@ -36,4 +44,5 @@ return new Config()
     ])
     ->setRiskyAllowed(true)
     ->setFinder($finder)
+    ->setUnsupportedPhpVersionAllowed(true)
 ;

Dockerfile

@@ -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
@@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	file \
 	gettext \
 	git \
-    && rm -rf /var/lib/apt/lists/*
+	&& rm -rf /var/lib/apt/lists/*
 
 RUN set -eux; \
 	install-php-extensions \
@@ -62,8 +62,8 @@ ENV APP_ENV=dev XDEBUG_MODE=off
 
 # hadolint ignore=DL3008
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    bash-completion \
+	bash-completion \
-    && rm -rf /var/lib/apt/lists/*
+	&& 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
@@ -72,7 +72,7 @@ RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
 
 RUN set -eux; \
 	install-php-extensions \
-		xdebug \
+		xdebug/xdebug@3.5.0 \
 	;
 
 COPY --link frankenphp/conf.d/20-app.dev.ini $PHP_INI_DIR/app.conf.d/
@@ -87,12 +87,10 @@ FROM frankenphp_base AS frankenphp_prod
 RUN rm -rf /var/lib/apt/lists/*
 
 ENV APP_ENV=prod
-ENV FRANKENPHP_CONFIG="import worker.Caddyfile"
 
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 
 COPY --link frankenphp/conf.d/20-app.prod.ini $PHP_INI_DIR/app.conf.d/
-COPY --link frankenphp/worker.Caddyfile /etc/caddy/worker.Caddyfile
 
 # prevent the reinstallation of vendors at every changes in the source code
 COPY --link composer.* symfony.* ./
@@ -109,6 +107,6 @@ RUN set -eux; \
 	composer dump-env prod; \
 	composer run-script --no-dev post-install-cmd; \
 	chmod +x bin/console; \
-    bin/console sass:build; \
+	bin/console sass:build; \
-    bin/console asset-map:compile --no-debug --quiet --no-ansi; \
+	bin/console asset-map:compile --no-debug --quiet --no-ansi; \
-    sync;
+	sync;

Justfile

@@ -20,10 +20,10 @@ 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
+    docker compose exec php bin/console translation:extract --force --format=xliff --sort=asc nl
 
 fix-cs:
     docker compose exec php vendor/bin/php-cs-fixer fix
@@ -35,7 +35,22 @@ rector *args:
 phpstan *args:
     docker compose exec php vendor/bin/phpstan analyse {{ args }}
 
+test *args:
+    docker compose exec php vendor/bin/phpunit {{ args }}
+
 [confirm]
 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
+
+trust-cert:
+    sudo security add-trusted-cer -d \
+    -r trustRoot \
+    -k "$HOME/Library/Keychains/login.keychain" \
+    ./frankenphp/data/caddy/pki/authorities/local/root.crt

assets/backoffice.js

@@ -1,5 +1,4 @@
-import * as bootstrap from 'bootstrap'
+import 'bootstrap/dist/css/bootstrap.min.css';
-import './bootstrap.js';
-import 'bootstrap/dist/css/bootstrap.min.css'
-
 import './styles/backoffice.scss';
+import './stimulus.js';
+import './bootstrap.js';

assets/bootstrap.js

@@ -1,5 +1 @@
-import { startStimulusApp } from '@symfony/stimulus-bundle';
+import * as bootstrap from 'bootstrap'
-
-const app = startStimulusApp();
-// register any custom, 3rd party controllers here
-// app.register('some_controller_name', SomeImportedController);

assets/controllers/bo/quiz_controller.js

@@ -1,17 +1,28 @@
 import {Controller} from '@hotwired/stimulus';
-import * as bootstrap from 'bootstrap'
+import {Tooltip, Modal} from 'bootstrap';
 
 export default class extends Controller {
+  static targets = ['clearModal', 'deleteModal'];
+
   connect() {
-    const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]')
+    this.tooltips = [];
-    const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl))
+    const tooltipTriggerList = this.element.querySelectorAll('[data-bs-toggle="tooltip"]');
+    [...tooltipTriggerList].forEach(tooltipTriggerEl => {
+      this.tooltips.push(Tooltip.getOrCreateInstance(tooltipTriggerEl));
+    });
+  }
+
+  disconnect() {
+    this.tooltips.forEach(tooltip => tooltip.dispose());
   }
 
   clearQuiz() {
-    new bootstrap.Modal('#clearQuizModal').show();
+    const modal = Modal.getOrCreateInstance(this.clearModalTarget);
+    modal.show();
   }
 
   deleteQuiz() {
-    new bootstrap.Modal('#deleteQuizModal').show();
+    const modal = Modal.getOrCreateInstance(this.deleteModalTarget);
+    modal.show();
   }
 }

assets/controllers/csrf_protection_controller.js

@@ -1,7 +1,9 @@
 const nameCheck = /^[-_a-zA-Z0-9]{4,22}$/;
-const tokenCheck = /^[-_\/+a-zA-Z0-9]{24,}$/;
+const tokenCheck = /^[-_/+a-zA-Z0-9]{24,}$/;
 
 // Generate and double-submit a CSRF token in a form field and a cookie, as defined by Symfony's SameOriginCsrfTokenManager
+// Use `form.requestSubmit()` to ensure that the submit event is triggered. Using `form.submit()` will not trigger the event
+// and thus this event-listener will not be executed.
 document.addEventListener('submit', function (event) {
     generateCsrfToken(event.target);
 }, true);
@@ -33,8 +35,8 @@ export function generateCsrfToken (formElement) {
     if (!csrfCookie && nameCheck.test(csrfToken)) {
         csrfField.setAttribute('data-csrf-protection-cookie-value', csrfCookie = csrfToken);
         csrfField.defaultValue = csrfToken = btoa(String.fromCharCode.apply(null, (window.crypto || window.msCrypto).getRandomValues(new Uint8Array(18))));
-        csrfField.dispatchEvent(new Event('change', { bubbles: true }));
     }
+    csrfField.dispatchEvent(new Event('change', { bubbles: true }));
 
     if (csrfCookie && tokenCheck.test(csrfToken)) {
         const cookie = csrfCookie + '_' + csrfToken + '=' + csrfCookie + '; path=/; samesite=strict';

assets/controllers/elimination_controller.js

@@ -2,9 +2,13 @@ import {Controller} from '@hotwired/stimulus';
 
 export default class extends Controller {
   next() {
-    const currentUrl = window.location.href;
+    const currentUrl = new URL(window.location.href);
-    const urlParts = currentUrl.split('/');
+    const pathParts = currentUrl.pathname.split('/');
-    urlParts.pop();
+    // Remove the last segment
-    window.location.href = urlParts.join('/');
+    pathParts.pop();
+    // Update the pathname
+    currentUrl.pathname = pathParts.join('/');
+    // Navigate
+    window.location.href = currentUrl.href;
   }
 }

assets/quiz.js

@@ -1,6 +1,4 @@
+import 'bootstrap/dist/css/bootstrap.min.css';
+import './styles/quiz.scss';
+import './stimulus.js';
 import './bootstrap.js';
-import 'bootstrap/dist/css/bootstrap.min.css'
-import * as bootstrap from 'bootstrap'
-
-import './styles/app.scss'
-

assets/stimulus.js

@@ -0,0 +1,3 @@
+import { startStimulusApp } from '@symfony/stimulus-bundle';
+
+const app = startStimulusApp();

compose.build.yaml

@@ -1,3 +1,4 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/compose-spec/compose-go/master/schema/compose-spec.json
 services:
   php:
     build:

compose.override.yaml

@@ -1,3 +1,4 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/compose-spec/compose-go/master/schema/compose-spec.json
 # Development environment override
 services:
   php:

compose.prod.yaml

@@ -1,3 +1,4 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/compose-spec/compose-go/master/schema/compose-spec.json
 # Production environment override
 services:
   php:
@@ -9,6 +10,8 @@ services:
       MAILER_DSN: ${MAILER_DSN}
       MAILER_SENDER: ${MAILER_SENDER}
       SENTRY_DSN: ${SENTRY_DSN}
+      SENTRY_RELEASE: ${IMAGE_TAG}
+      SENTRY_ENVIRONMENT: ${SENTRY_ENVIRONMENT}
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.tvdt.rule=Host(`tijdvoordetest.nl`)"

compose.yaml

@@ -1,3 +1,4 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/compose-spec/compose-go/master/schema/compose-spec.json
 services:
   php:
     image: ${IMAGES_PREFIX:-}app-php

composer.json

@@ -6,66 +6,66 @@
     "minimum-stability": "stable",
     "prefer-stable": true,
     "require": {
-        "php": ">=8.4",
+        "php": ">=8.5",
         "ext-ctype": "*",
         "ext-iconv": "*",
-        "doctrine/dbal": "^4.3.3",
+        "doctrine/dbal": "^4.4.3",
-        "doctrine/doctrine-bundle": "^2.16.2",
+        "doctrine/doctrine-bundle": "^3.2.2",
-        "doctrine/doctrine-migrations-bundle": "^3.4.2",
+        "doctrine/doctrine-migrations-bundle": "^4.0",
-        "doctrine/orm": "^3.5.2",
+        "doctrine/orm": "^3.6.2",
-        "martin-georgiev/postgresql-for-doctrine": "^3.5",
+        "martin-georgiev/postgresql-for-doctrine": "^4.4",
-        "phpdocumentor/reflection-docblock": "^5.6.3",
+        "phpdocumentor/reflection-docblock": "^6.0.3",
-        "phpoffice/phpspreadsheet": "^5.1",
+        "phpoffice/phpspreadsheet": "^5.5",
-        "phpstan/phpdoc-parser": "^2.3",
+        "phpstan/phpdoc-parser": "^2.3.2",
-        "runtime/frankenphp-symfony": "^0.2.0",
+        "sentry/sentry-symfony": "^5.9.0",
-        "sentry/sentry-symfony": "^5.6",
+        "stof/doctrine-extensions-bundle": "^1.15.3",
-        "symfony/asset": "7.3.*",
+        "symfony/asset": "8.0.*",
-        "symfony/asset-mapper": "7.3.*",
+        "symfony/asset-mapper": "8.0.*",
-        "symfony/brevo-mailer": "7.3.*",
+        "symfony/brevo-mailer": "8.0.*",
-        "symfony/console": "7.3.*",
+        "symfony/console": "8.0.*",
-        "symfony/dotenv": "7.3.*",
+        "symfony/dotenv": "8.0.*",
-        "symfony/flex": "^2.8.2",
+        "symfony/flex": "^2.10.0",
-        "symfony/form": "7.3.*",
+        "symfony/form": "8.0.*",
-        "symfony/framework-bundle": "7.3.*",
+        "symfony/framework-bundle": "8.0.*",
-        "symfony/mailer": "7.3.*",
+        "symfony/mailer": "8.0.*",
-        "symfony/property-access": "7.3.*",
+        "symfony/property-access": "8.0.*",
-        "symfony/property-info": "7.3.*",
+        "symfony/property-info": "8.0.*",
-        "symfony/runtime": "7.3.*",
+        "symfony/runtime": "8.0.*",
-        "symfony/security-bundle": "7.3.*",
+        "symfony/security-bundle": "8.0.*",
-        "symfony/security-csrf": "7.3.*",
+        "symfony/security-csrf": "8.0.*",
-        "symfony/serializer": "7.3.*",
+        "symfony/serializer": "8.0.*",
-        "symfony/translation": "7.3.*",
+        "symfony/translation": "8.0.*",
-        "symfony/twig-bundle": "7.3.*",
+        "symfony/twig-bundle": "8.0.*",
-        "symfony/uid": "7.3.*",
+        "symfony/uid": "8.0.*",
-        "symfony/ux-turbo": "^2.30.0",
+        "symfony/ux-turbo": "^2.35.0",
-        "symfony/validator": "7.3.*",
+        "symfony/validator": "8.0.*",
-        "symfony/yaml": "7.3.*",
+        "symfony/yaml": "8.0.*",
-        "symfonycasts/sass-bundle": "^0.8.3",
+        "symfonycasts/sass-bundle": "^0.9",
-        "symfonycasts/verify-email-bundle": "^1.17.4",
+        "symfonycasts/verify-email-bundle": "^1.18.0",
-        "thecodingmachine/safe": "^3.3.0",
+        "thecodingmachine/safe": "^3.4.0",
-        "twig/extra-bundle": "^3.21",
+        "twig/extra-bundle": "^3.24.0",
-        "twig/intl-extra": "^3.21",
+        "twig/intl-extra": "^3.24.0",
-        "twig/twig": "^3.21.1"
+        "twig/twig": "^3.24.0"
     },
     "require-dev": {
-        "doctrine/doctrine-fixtures-bundle": "^4.1",
+        "dama/doctrine-test-bundle": "^8.6",
-        "friendsofphp/php-cs-fixer": "^3.88.2",
+        "doctrine/doctrine-fixtures-bundle": "^4.3.1",
+        "friendsofphp/php-cs-fixer": "^3.94.2",
         "phpstan/extension-installer": "^1.4.3",
-        "phpstan/phpstan": "^2.1.30",
+        "phpstan/phpstan": "^2.1.42",
-        "phpstan/phpstan-doctrine": "^2.0.6",
+        "phpstan/phpstan-doctrine": "^2.0.20",
-        "phpstan/phpstan-phpunit": "^2.0.7",
+        "phpstan/phpstan-phpunit": "^2.0.16",
-        "phpstan/phpstan-symfony": "^2.0.8",
+        "phpstan/phpstan-symfony": "^2.0.15",
-        "phpunit/phpunit": "^12.4.0",
+        "phpunit/phpunit": "^13.0.5",
-        "rector/rector": "^2.1.7",
+        "rector/rector": "^2.3.9",
-        "roave/security-advisories": "dev-latest",
+        "symfony/browser-kit": "8.0.*",
-        "symfony/browser-kit": "7.3.*",
+        "symfony/css-selector": "8.0.*",
-        "symfony/css-selector": "7.3.*",
+        "symfony/maker-bundle": "^1.67.0",
-        "symfony/maker-bundle": "^1.64.0",
+        "symfony/phpunit-bridge": "8.0.*",
-        "symfony/phpunit-bridge": "7.3.*",
+        "symfony/stopwatch": "8.0.*",
-        "symfony/stopwatch": "7.3.*",
+        "symfony/web-profiler-bundle": "8.0.*",
-        "symfony/web-profiler-bundle": "7.3.*",
+        "thecodingmachine/phpstan-safe-rule": "^1.4.3",
-        "thecodingmachine/phpstan-safe-rule": "^1.4.1",
+        "vincentlanglet/twig-cs-fixer": "^3.14.0"
-        "vincentlanglet/twig-cs-fixer": "^3.10.0"
     },
     "config": {
         "allow-plugins": {
@@ -98,7 +98,8 @@
         "symfony/polyfill-php81": "*",
         "symfony/polyfill-php82": "*",
         "symfony/polyfill-php83": "*",
-        "symfony/polyfill-php84": "*"
+        "symfony/polyfill-php84": "*",
+        "symfony/polyfill-php85": "*"
     },
     "scripts": {
         "auto-scripts": {
@@ -119,7 +120,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "7.3.*",
+            "require": "8.0.*",
             "docker": true
         }
     }

config/bundles.php

@@ -2,10 +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 Sentry\SentryBundle\SentryBundle;
+use Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\MakerBundle\MakerBundle;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
@@ -32,4 +34,6 @@ return [
     SymfonycastsSassBundle::class => ['all' => true],
     StimulusBundle::class => ['all' => true],
     TurboBundle::class => ['all' => true],
+    DAMADoctrineTestBundle::class => ['test' => true],
+    StofDoctrineExtensionsBundle::class => ['all' => true],
 ];

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

config/packages/doctrine.yaml

@@ -2,12 +2,7 @@ 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
@@ -22,9 +17,6 @@ doctrine:
     
     
     orm:
-        auto_generate_proxy_classes: true
-        enable_native_lazy_objects: true
-        report_fields_where_declared: true
         validate_xml_mapping: true
         naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
         identity_generation_preferences:
@@ -37,8 +29,6 @@ doctrine:
                 dir: '%kernel.project_dir%/src/Entity'
                 prefix: 'Tvdt\Entity'
                 alias: Tvdt
-        controller_resolver:
-            auto_mapping: false
 
 when@test:
     doctrine:
@@ -49,8 +39,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

config/packages/maker.yaml

@@ -0,0 +1,6 @@
+# yaml-language-server: $schema=../../vendor/symfony/dependency-injection/Loader/schema/services.schema.json
+when@dev:
+    maker:
+        root_namespace: 'Tvdt'
+        generate_final_classes: true
+        generate_final_entities: false

config/packages/routing.yaml

@@ -1,8 +1,8 @@
 framework:
     router:
-    # Configure how to generate URLs in non-HTTP contexts, such as CLI commands.
+        # Configure how to generate URLs in non-HTTP contexts, such as CLI commands.
-    # See https://symfony.com/doc/current/routing.html#generating-urls-in-commands
+        # See https://symfony.com/doc/current/routing.html#generating-urls-in-commands
-    #default_uri: http://localhost
+        default_uri: '%env(DEFAULT_URI)%'
 
 when@prod:
     framework:

config/packages/security.yaml

@@ -2,17 +2,17 @@ security:
     # https://symfony.com/doc/current/security.html#registering-the-user-hashing-passwords
     password_hashers:
         Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'auto'
+
     # https://symfony.com/doc/current/security.html#loading-the-user-the-user-provider
     providers:
-        # used to reload user from session & other features (e.g. switch_user)
         tvdt_user_provider:
             entity:
                 class: Tvdt\Entity\User
                 property: email
-        # used to reload user from session & other features (e.g. switch_user)
     firewalls:
         dev:
-            pattern: ^/(_(profiler|wdt)|css|images|js)/
+            # Ensure dev tools and static assets are always allowed
+            pattern: ^/(_profiler|_wdt|assets|build)/
             security: false
         main:
             lazy: true
@@ -24,17 +24,10 @@ security:
                 default_target_path: tvdt_backoffice_index
             logout:
                 path: tvdt_login_logout
-                # where to redirect after logout
+            remember_me:
-                # target: tvdt_any_route
+                secret: '%kernel.secret%'
+                lifetime: 604800 # 1 week in seconds
 
-            # activate different ways to authenticate
-            # https://symfony.com/doc/current/security.html#the-firewall
-            
-            # https://symfony.com/doc/current/security/impersonating_user.html
-            # switch_user: true
-    
-    # Easy way to control access for large sections of your site
-    # Note: Only the *first* access control that matches will be used
     access_control:
         - { path: ^/admin, roles: ROLE_ADMIN }
         - { path: ^/backoffice, roles: ROLE_USER }
@@ -42,10 +35,8 @@ security:
 when@test:
     security:
         password_hashers:
-            # By default, password hashers are resource intensive and take time. This is
+            # Password hashers are resource-intensive by design to ensure security.
-            # important to generate secure password hashes. In tests however, secure hashes
+            # In tests, it's safe to reduce their cost to improve performance.
-            # are not important, waste resources and increase test times. The following
-            # reduces the work factor to the lowest possible values.
             Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface:
                 algorithm: auto
                 cost: 4 # Lowest possible value for bcrypt

config/packages/sentry.yaml

@@ -1,31 +1,40 @@
 when@prod:
     sentry:
         dsn: '%env(SENTRY_DSN)%'
-        # 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
+            # Add request headers, cookies, IP address and the authenticated user
-            profiles_sample_rate: 1.0
+            # see https://docs.sentry.io/platforms/php/data-management/data-collected/ for more info
+            # send_default_pii: true
             ignore_exceptions:
                 - 'Symfony\Component\ErrorHandler\Error\FatalError'
                 - 'Symfony\Component\Debug\Exception\FatalErrorException'
-
+                - 'Symfony\Component\HttpKernel\Exception\NotFoundHttpException'
-#        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/integrations/monolog/
 #        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
+#                type: service
-#                level: !php/const Monolog\Logger::ERROR
+#                id: Sentry\Monolog\Handler
-#                hub_id: Sentry\State\HubInterface
+#
-
+#            # Use this for structured log integration
-#    Uncomment these lines to register a log message processor that resolves PSR-3 placeholders
+#            sentry_logs:
-#    https://docs.sentry.io/platforms/php/guides/symfony/#monolog-integration
+#                type: service
+#                id: Sentry\SentryBundle\Monolog\LogsHandler
+#
+#    # Enable one of the two services below, depending on your choice above
 #    services:
-#        Monolog\Processor\PsrLogMessageProcessor:
+#        Sentry\Monolog\Handler:
-#            tags: { name: monolog.processor, handler: sentry }
+#            arguments:
+#                $hub: '@Sentry\State\HubInterface'
+#                $level: !php/const Monolog\Logger::ERROR
+#                $fillExtraContext: true # Enables sending monolog context to Sentry
+#        Sentry\SentryBundle\Monolog\LogsHandler:
+#            arguments:
+#                - !php/const Monolog\Logger::INFO

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

config/packages/symfonycasts_sass.yaml

@@ -0,0 +1,4 @@
+symfonycasts_sass:
+    root_sass:
+        - './assets/styles/quiz.scss'
+        - './assets/styles/backoffice.scss'

config/preload.php

@@ -2,6 +2,6 @@
 
 declare(strict_types=1);
 
-if (file_exists(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/App_KernelProdContainer.preload.php';
+    require dirname(__DIR__).'/var/cache/prod/Tvdt_KernelProdContainer.preload.php';
 }

config/routes.yaml

@@ -1,5 +1,11 @@
+# yaml-language-server: $schema=../vendor/symfony/routing/Loader/schema/routing.schema.json
+
+# This file is the entry point to configure the routes of your app.
+# Methods with the #[Route] attribute are automatically imported.
+# See also https://symfony.com/doc/current/routing.html
+
+# To list all registered routes, run the following command:
+#   bin/console debug:router
+
 controllers:
-    resource:
+    resource: routing.controllers
-        path: ../src/Controller/
-        namespace: Tvdt\Controller
-    type: attribute

config/services.yaml

@@ -1,5 +1,8 @@
+# yaml-language-server: $schema=../vendor/symfony/dependency-injection/Loader/schema/services.schema.json
+
 # This file is the entry point to configure your own services.
 # Files in the packages/ subdirectory configure your dependencies.
+# See also https://symfony.com/doc/current/service_container/import.html
 
 # Put parameters here that don't need to change on each machine where the app is deployed
 # https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration

frankenphp/Caddyfile

@@ -22,20 +22,20 @@
 	root /app/public
 	encode zstd br gzip
 
-	mercure {
+#	mercure {
-		# Transport to use (default to Bolt)
+#		# Transport to use (default to Bolt)
-		transport_url {$MERCURE_TRANSPORT_URL:bolt:///data/mercure.db}
+##		transport_url {$MERCURE_TRANSPORT_URL:bolt:///data/mercure.db}
-		# Publisher JWT key
+#		 Publisher JWT key
-		publisher_jwt {env.MERCURE_PUBLISHER_JWT_KEY} {env.MERCURE_PUBLISHER_JWT_ALG}
+#		publisher_jwt {env.MERCURE_PUBLISHER_JWT_KEY} {env.MERCURE_PUBLISHER_JWT_ALG}
-		# Subscriber JWT key
+#		# Subscriber JWT key
-		subscriber_jwt {env.MERCURE_SUBSCRIBER_JWT_KEY} {env.MERCURE_SUBSCRIBER_JWT_ALG}
+#		subscriber_jwt {env.MERCURE_SUBSCRIBER_JWT_KEY} {env.MERCURE_SUBSCRIBER_JWT_ALG}
-		# Allow anonymous subscribers (double-check that it's what you want)
+#		# Allow anonymous subscribers (double-check that it's what you want)
-		anonymous
+#		anonymous
-		# Enable the subscription API (double-check that it's what you want)
+#		# Enable the subscription API (double-check that it's what you want)
-		subscriptions
+#		subscriptions
-		# Extra directives
+#		# Extra directives
-		{$MERCURE_EXTRA_DIRECTIVES}
+#		{$MERCURE_EXTRA_DIRECTIVES}
-	}
+#	}
 
 	vulcain
 

frankenphp/worker.Caddyfile

@@ -1,4 +0,0 @@
-worker {
-	file ./public/index.php
-	env APP_RUNTIME Runtime\FrankenPhpSymfony\Runtime
-}

importmap.php

@@ -22,23 +22,23 @@ return [
         'path' => './assets/backoffice.js',
         'entrypoint' => true,
     ],
+    '@symfony/stimulus-bundle' => [
+        'path' => './vendor/symfony/stimulus-bundle/assets/dist/loader.js',
+    ],
     'bootstrap' => [
-        'version' => '5.3.6',
+        'version' => '5.3.8',
     ],
     '@popperjs/core' => [
         'version' => '2.11.8',
     ],
     'bootstrap/dist/css/bootstrap.min.css' => [
-        'version' => '5.3.6',
+        'version' => '5.3.8',
         'type' => 'css',
     ],
     '@hotwired/stimulus' => [
         'version' => '3.2.2',
     ],
-    '@symfony/stimulus-bundle' => [
-        'path' => './vendor/symfony/stimulus-bundle/assets/dist/loader.js',
-    ],
     '@hotwired/turbo' => [
-        'version' => '7.3.0',
+        'version' => '8.0.23',
     ],
 ];

migrations/Version20260125191247.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/** Auto-generated Migration: Please modify to your needs! */
+final class Version20260125191247 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE quiz_candidate ADD penalty_seconds SMALLINT DEFAULT 0 NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE quiz_candidate DROP penalty_seconds');
+    }
+}

migrations/Version20260309215703.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/** Auto-generated Migration: Please modify to your needs! */
+final class Version20260309215703 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE quiz_candidate ADD active BOOLEAN DEFAULT true NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE quiz_candidate DROP active');
+    }
+}

migrations/Version20260309220448.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/** Auto-generated Migration: Please modify to your needs! */
+final class Version20260309220448 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add started field to quiz_candidate and copy existing created values';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE quiz_candidate ADD started TIMESTAMP(0) WITH TIME ZONE DEFAULT NULL');
+
+        // Copy created to started for existing rows (these were created when quiz started)
+        $this->addSql('UPDATE quiz_candidate SET started = created WHERE started IS NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE quiz_candidate DROP started');
+    }
+}

phpstan.dist.neon

@@ -7,6 +7,8 @@ parameters:
         - public/
         - src/
         - tests/
+    excludePaths:
+        - config/reference.php
     treatPhpDocTypesAsCertain: false
     symfony:
         containerXmlPath: var/cache/dev/Tvdt_KernelDevDebugContainer.xml

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>

rector.php

@@ -13,6 +13,7 @@ return RectorConfig::configure()
         __DIR__.'/src',
         __DIR__.'/tests',
     ])
+    ->withSkip([__DIR__.'/config/reference.php'])
     ->withSymfonyContainerXml(__DIR__.'/var/cache/dev/Tvdt_KernelDevDebugContainer.xml')
     ->withSymfonyContainerPhp(__DIR__.'/tests/symfony-container.php')
     ->registerService(SymfonyRoutesProvider::class, SymfonyRoutesProviderInterface::class)
@@ -26,7 +27,6 @@ return RectorConfig::configure()
         privatization: true,
         instanceOf: true,
         earlyReturn: true,
-        strictBooleans: true,
         rectorPreset: true,
         phpunitCodeQuality: true,
         doctrineCodeQuality: true,

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->settings) {
-                continue;
-            }
-
-            $io->text('Adding settings to season : '.$season->seasonCode);
-            $season->settings = new SeasonSettings();
-        }
-
-        $this->entityManager->flush();
-
-        return Command::SUCCESS;
-    }
-}

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,
+        SymfonyStyle $io,
-        OutputInterface $output,
     ): int {
-        $io = new SymfonyStyle($input, $output);
-
         try {
-            $season = $this->seasonRepository->findOneBy(['seasonCode' => $seasonCode]);
+            $season = $this->seasonRepository->findOneBySeasonCode($seasonCode);
-            if (null === $season) {
+            if (!$season instanceof Season) {
                 throw new \InvalidArgumentException('Season not found');
             }
 

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,
+        SymfonyStyle $io,
-        OutputInterface $output,
     ): int {
-        $io = new SymfonyStyle($input, $output);
         try {
             $this->userRepository->makeAdmin($email);
         } catch (\InvalidArgumentException) {

src/Controller/Backoffice/BackofficeController.php

@@ -26,6 +26,8 @@ final class BackofficeController extends AbstractController
     public function __construct(
         private readonly SeasonRepository $seasonRepository,
         private readonly Security $security,
+        private readonly QuizSpreadsheetService $excel,
+        private readonly EntityManagerInterface $em,
     ) {}
 
     #[Route('/backoffice/', name: 'tvdt_backoffice_index')]
@@ -44,7 +46,7 @@ final class BackofficeController extends AbstractController
     }
 
     #[Route('/backoffice/season/add', name: 'tvdt_backoffice_season_add', priority: 10)]
-    public function addSeason(Request $request, EntityManagerInterface $em): Response
+    public function addSeason(Request $request): Response
     {
         $season = new Season();
         $form = $this->createForm(CreateSeasonFormType::class, $season);
@@ -58,8 +60,8 @@ final class BackofficeController extends AbstractController
             $season->addOwner($user);
             $season->generateSeasonCode();
 
-            $em->persist($season);
+            $this->em->persist($season);
-            $em->flush();
+            $this->em->flush();
 
             return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->seasonCode]);
         }
@@ -68,9 +70,9 @@ final class BackofficeController extends AbstractController
     }
 
     #[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"');
 

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,14 +18,16 @@ use Tvdt\Factory\EliminationFactory;
 
 final class PrepareEliminationController extends AbstractController
 {
+    public function __construct(private readonly EliminationFactory $eliminationFactory, private readonly EntityManagerInterface $em) {}
+
     #[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->id]);
     }
@@ -34,11 +37,11 @@ final class PrepareEliminationController extends AbstractController
         name: 'tvdt_prepare_elimination_view',
         requirements: ['elimination' => Requirement::UUID],
     )]
-    public function viewElimination(Elimination $elimination, Request $request, EntityManagerInterface $em): Response
+    public function viewElimination(Elimination $elimination, Request $request): Response
     {
         if ('POST' === $request->getMethod()) {
             $elimination->updateFromInputBag($request->request);
-            $em->flush();
+            $this->em->flush();
 
             if ($request->request->getBoolean('start')) {
                 return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);

src/Controller/Backoffice/QuizController.php

@@ -9,17 +9,20 @@ use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Attribute\AsController;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Routing\Requirement\Requirement;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Tvdt\Controller\AbstractController;
+use Tvdt\Entity\Answer;
 use Tvdt\Entity\Candidate;
+use Tvdt\Entity\Question;
 use Tvdt\Entity\Quiz;
+use Tvdt\Entity\QuizCandidate;
 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,8 +32,10 @@ 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,
+        private readonly EntityManagerInterface $em,
     ) {}
 
     #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
@@ -41,10 +46,198 @@ class QuizController extends AbstractController
     )]
     public function index(Season $season, Quiz $quiz): Response
     {
+        return $this->redirectToRoute('tvdt_backoffice_quiz_overview', ['seasonCode' => $season->seasonCode, 'quiz' => $quiz->id]);
+    }
+
+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
+    #[Route(
+        '/backoffice/season/{seasonCode:season}/quiz/{quiz}/overview',
+        name: 'tvdt_backoffice_quiz_overview',
+        requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID],
+    )]
+    public function overview(Season $season, Quiz $quiz): Response
+    {
+        $fetchedQuiz = $this->quizRepository->fetchWithQuestionsAndCandidates($quiz->id);
+
+        // Create indexed lookup for quiz candidates by candidate ID
+        $quizCandidatesByCandidateId = [];
+        foreach ($fetchedQuiz->candidateData as $qc) {
+            $quizCandidatesByCandidateId[$qc->candidate->id->toString()] = $qc;
+        }
+
+        // Get given answers counts efficiently via database query
+        $givenAnswersCountByCandidateId = $this->quizRepository->getGivenAnswersCountPerCandidate($quiz);
+
+        // Pre-compute candidate data to avoid nested loops in template
+        $candidateData = [];
+        foreach ($season->candidates as $candidate) {
+            $candidateIdString = $candidate->id->toString();
+            $candidateData[] = [
+                'candidate' => $candidate,
+                'quizCandidate' => $quizCandidatesByCandidateId[$candidateIdString] ?? null,
+                'givenAnswersCount' => $givenAnswersCountByCandidateId[$candidateIdString] ?? 0,
+            ];
+        }
+
+        return $this->render('backoffice/quiz.html.twig', [
+            'season' => $season,
+            'quiz' => $fetchedQuiz,
+            'questionErrors' => $fetchedQuiz->getQuestionErrors(),
+            'candidateData' => $candidateData,
+            'activeTab' => 'overview',
+            'template' => 'backoffice/quiz/tab_overview.html.twig',
+        ]);
+    }
+
+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
+    #[Route(
+        '/backoffice/season/{seasonCode:season}/quiz/{quiz}/result',
+        name: 'tvdt_backoffice_quiz_result',
+        requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID],
+    )]
+    public function result(Season $season, Quiz $quiz): Response
+    {
+        $fetchedQuiz = $this->quizRepository->fetchWithQuestions($quiz->id);
+
+        return $this->render('backoffice/quiz.html.twig', [
+            'season' => $season,
+            'quiz' => $fetchedQuiz,
+            'result' => $this->quizRepository->getScores($quiz),
+            'activeTab' => 'result',
+            'template' => 'backoffice/quiz/tab_result.html.twig',
+        ]);
+    }
+
+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
+    #[Route(
+        '/backoffice/season/{seasonCode:season}/quiz/{quiz}/candidates-list',
+        name: 'tvdt_backoffice_quiz_candidates_tab',
+        requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID],
+    )]
+    public function candidatesTab(Season $season, Quiz $quiz): Response
+    {
+        // Create indexed lookup for quiz candidates by candidate ID
+        $quizCandidatesByCandidateId = [];
+        foreach ($quiz->candidateData as $qc) {
+            $quizCandidatesByCandidateId[$qc->candidate->id->toString()] = $qc;
+        }
+
+        // Get given answers counts efficiently via database query
+        $givenAnswersCountByCandidateId = $this->quizRepository->getGivenAnswersCountPerCandidate($quiz);
+
+        // Pre-compute candidate data to avoid nested loops in template
+        $candidateData = [];
+        foreach ($season->candidates as $candidate) {
+            $candidateIdString = $candidate->id->toString();
+            $candidateData[] = [
+                'candidate' => $candidate,
+                'quizCandidate' => $quizCandidatesByCandidateId[$candidateIdString] ?? null,
+                'givenAnswersCount' => $givenAnswersCountByCandidateId[$candidateIdString] ?? 0,
+            ];
+        }
+
         return $this->render('backoffice/quiz.html.twig', [
             'season' => $season,
             'quiz' => $quiz,
-            'result' => $this->candidateRepository->getScores($quiz),
+            'candidateData' => $candidateData,
+            'activeTab' => 'candidates',
+            'template' => 'backoffice/quiz/tab_candidates_list.html.twig',
+        ]);
+    }
+
+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
+    #[Route(
+        '/backoffice/season/{seasonCode:season}/quiz/{quiz}/answer-mapping',
+        name: 'tvdt_backoffice_quiz_candidates',
+        requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID],
+    )]
+    public function answerMapping(Season $season, Quiz $quiz): Response
+    {
+        $fetchedQuiz = $this->quizRepository->fetchWithQuestions($quiz->id);
+        \assert($fetchedQuiz->questions->count() > 0);
+        $firstQuestion = $fetchedQuiz->questions->first();
+        \assert($firstQuestion instanceof Question);
+
+        return $this->redirectToRoute('tvdt_backoffice_quiz_candidates_question', [
+            'seasonCode' => $season->seasonCode,
+            'quiz' => $quiz->id,
+            'question' => $firstQuestion->id,
+        ]);
+    }
+
+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
+    #[Route(
+        '/backoffice/season/{seasonCode:season}/quiz/{quiz}/candidates/{question}',
+        name: 'tvdt_backoffice_quiz_candidates_question',
+        requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID],
+        methods: ['GET'],
+    )]
+    public function candidates_question(Season $season, Quiz $quiz, Question $question): Response
+    {
+        return $this->render('backoffice/quiz.html.twig', [
+            'season' => $season,
+            'quiz' => $quiz,
+            'question' => $question,
+            'candidates' => $season->candidates,
+            'activeTab' => 'answers',
+            'template' => 'backoffice/quiz/tab_candidates.html.twig',
+        ]);
+    }
+
+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
+    #[Route(
+        '/backoffice/season/{seasonCode:season}/quiz/{quiz}/candidates/{question}',
+        name: 'tvdt_backoffice_quiz_candidates_question_save',
+        requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID],
+        methods: ['POST'],
+    )]
+    public function saveCandidateAnswers(Season $season, Quiz $quiz, Question $question, Request $request): RedirectResponse
+    {
+        if (false === $season->quizzes->contains($quiz)
+            || false === $quiz->questions->contains($question)) {
+            throw new BadRequestHttpException('Invalid quiz or question');
+        }
+
+        $candidateAnswers = $request->request->all('candidate_answer');
+
+        // Clear existing candidate-answer associations for this question
+        foreach ($question->answers as $answer) {
+            if (false === $quiz->questions->contains($answer->question)) {
+                throw new BadRequestHttpException('Invalid question');
+            }
+
+            $answer->candidates->clear();
+        }
+
+        // Add new associations
+        foreach ($candidateAnswers as $candidateId => $answerIds) {
+            $candidate = $this->em->getRepository(Candidate::class)->find($candidateId);
+
+            if (false === $season->candidates->contains($candidate)) {
+                throw new BadRequestHttpException('Invalid candidate');
+            }
+
+            foreach ((array) $answerIds as $answerId) {
+                $answer = $this->em->getRepository(Answer::class)->find($answerId);
+
+                if (false === $question->answers->contains($answer)) {
+                    throw new BadRequestHttpException('Invalid answer');
+                }
+
+                if ($answer && $candidate) {
+                    $answer->addCandidate($candidate);
+                }
+            }
+        }
+
+        $this->em->flush();
+
+        $this->addFlash('success', $this->translator->trans('Candidate answers saved'));
+
+        return $this->redirectToRoute('tvdt_backoffice_quiz_candidates_question', [
+            'seasonCode' => $season->seasonCode,
+            'quiz' => $quiz->id,
+            'question' => $question->id,
         ]);
     }
 
@@ -54,10 +247,10 @@ class QuizController extends AbstractController
         name: 'tvdt_backoffice_enable',
         requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID.'|null'],
     )]
-    public function enableQuiz(Season $season, ?Quiz $quiz, EntityManagerInterface $em): RedirectResponse
+    public function enableQuiz(Season $season, ?Quiz $quiz): RedirectResponse
     {
         $season->activeQuiz = $quiz;
-        $em->flush();
+        $this->em->flush();
 
         if ($quiz instanceof Quiz) {
             return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $season->seasonCode, 'quiz' => $quiz->id]);
@@ -72,10 +265,10 @@ class QuizController extends AbstractController
         name: 'tvdt_backoffice_quiz_clear',
         requirements: ['quiz' => Requirement::UUID],
     )]
-    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'));
@@ -90,9 +283,9 @@ class QuizController extends AbstractController
         name: 'tvdt_backoffice_quiz_delete',
         requirements: ['quiz' => Requirement::UUID],
     )]
-    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'));
 
@@ -105,7 +298,7 @@ class QuizController extends AbstractController
         name: 'tvdt_backoffice_modify_correction',
         requirements: ['quiz' => Requirement::UUID, 'candidate' => Requirement::UUID],
     )]
-    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 +306,57 @@ 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->season->seasonCode, 'quiz' => $quiz->id]);
     }
+
+    #[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
+    #[Route(
+        '/backoffice/quiz/{quiz}/candidate/{candidate}/modify_penalty',
+        name: 'tvdt_backoffice_modify_penalty',
+        requirements: ['quiz' => Requirement::UUID, 'candidate' => Requirement::UUID],
+    )]
+    public function modifyPenalty(Quiz $quiz, Candidate $candidate, Request $request): RedirectResponse
+    {
+        if (!$request->isMethod('POST')) {
+            throw new MethodNotAllowedHttpException(['POST']);
+        }
+
+        $penalty = (int) $request->request->get('penalty');
+
+        $this->quizCandidateRepository->setPenaltyForCandidate($quiz, $candidate, $penalty);
+
+        return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->season->seasonCode, 'quiz' => $quiz->id]);
+    }
+
+    #[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
+    #[Route(
+        '/backoffice/quiz/{quiz}/candidate/{candidate}/toggle',
+        name: 'tvdt_backoffice_toggle_candidate',
+        requirements: ['quiz' => Requirement::UUID, 'candidate' => Requirement::UUID],
+        methods: ['GET'],
+    )]
+    public function toggleCandidate(Quiz $quiz, Candidate $candidate): RedirectResponse
+    {
+        $quizCandidate = $this->quizCandidateRepository->findOneBy([
+            'quiz' => $quiz,
+            'candidate' => $candidate,
+        ]);
+
+        if (!$quizCandidate instanceof QuizCandidate) {
+            // Create new QuizCandidate if it doesn't exist (inactive by default when first toggling)
+            $quizCandidate = new QuizCandidate($quiz, $candidate);
+            $quizCandidate->active = false;
+            $this->em->persist($quizCandidate);
+        } else {
+            $quizCandidate->active = !$quizCandidate->active;
+        }
+
+        $this->em->flush();
+
+        $this->addFlash('success', $this->translator->trans('Candidate status updated'));
+
+        return $this->redirectToRoute('tvdt_backoffice_quiz_candidates_tab', ['seasonCode' => $quiz->season->seasonCode, 'quiz' => $quiz->id]);
+    }
 }

src/Controller/Backoffice/SeasonController.php

@@ -30,6 +30,7 @@ class SeasonController extends AbstractController
     public function __construct(
         private readonly TranslatorInterface $translator,
         private readonly EntityManagerInterface $em,
+        private readonly QuizSpreadsheetService $quizSpreadsheet,
     ) {}
 
     #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
@@ -87,7 +88,7 @@ class SeasonController extends AbstractController
         requirements: ['seasonCode' => self::SEASON_CODE_REGEX],
         priority: 10,
     )]
-    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,7 +99,7 @@ class SeasonController extends AbstractController
             /* @var UploadedFile $sheet */
             $sheet = $form->get('sheet')->getData();
 
-            $quizSpreadsheet->xlsxToQuiz($quiz, $sheet);
+            $this->quizSpreadsheet->xlsxToQuiz($quiz, $sheet);
 
             $quiz->season = $season;
             $this->em->persist($quiz);

src/Controller/EliminationController.php

@@ -26,7 +26,7 @@ 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) {}
 
     #[IsGranted(SeasonVoter::ELIMINATION, 'elimination')]
     #[Route('/elimination/{elimination}', name: 'tvdt_elimination', requirements: ['elimination' => Requirement::UUID])]
@@ -50,9 +50,9 @@ final class EliminationController extends AbstractController
 
     #[IsGranted(SeasonVoter::ELIMINATION, 'elimination')]
     #[Route('/elimination/{elimination}/{candidateHash}', name: 'tvdt_elimination_candidate', requirements: ['elimination' => Requirement::UUID, 'candidateHash' => self::CANDIDATE_HASH_REGEX])]
-    public function candidateScreen(Elimination $elimination, string $candidateHash, CandidateRepository $candidateRepository): Response
+    public function candidateScreen(Elimination $elimination, string $candidateHash): Response
     {
-        $candidate = $candidateRepository->getCandidateByHash($elimination->quiz->season, $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),

src/Controller/LoginController.php

@@ -15,17 +15,21 @@ 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
     {
+        if ($this->getUser() instanceof UserInterface) {
+            return $this->redirectToRoute('tvdt_backoffice_index');
+        }
+
         // 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', [

src/Controller/QuizController.php

@@ -4,10 +4,10 @@ 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;
-use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Tvdt\Entity\Answer;
@@ -22,7 +22,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 +29,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 +40,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');
@@ -80,13 +79,8 @@ 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'));
@@ -103,28 +97,51 @@ final class QuizController extends AbstractController
         }
 
         if ('POST' === $request->getMethod()) {
-            $answer = $answerRepository->findOneBy(['id' => $request->request->get('answer')]);
+            // TODO: Extract saving answer logic to a service
+            // Check if candidate is inactive for this quiz
+            $quizCandidate = $this->quizCandidateRepository->findOneBy(['quiz' => $quiz, 'candidate' => $candidate]);
+            if (null !== $quizCandidate && !$quizCandidate->active) {
+                $this->addFlash(FlashType::Danger, $this->translator->trans('You are not allowed to answer this quiz'));
+
+                return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->seasonCode]);
+            }
+
+            $answer = $this->answerRepository->findOneBy(['id' => $request->request->get('answer')]);
 
             if (!$answer instanceof Answer) {
-                throw new BadRequestHttpException('Invalid Answer ID');
+                $this->addFlash(FlashType::Danger, $this->translator->trans('Please select an answer'));
+
+                return $this->redirectToRoute('tvdt_quiz_quiz_page', ['seasonCode' => $season->seasonCode, 'nameHash' => $nameHash]);
             }
 
             $givenAnswer = new GivenAnswer($candidate, $answer->question->quiz, $answer);
-            $givenAnswerRepository->save($givenAnswer);
+            $this->entityManager->persist($givenAnswer);
+            $this->entityManager->flush();
 
+            // end of extracting 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->seasonCode]);
         }
 
-        $quizCandidateRepository->createIfNotExist($quiz, $candidate);
+        $result = $this->quizCandidateRepository->createIfNotExist($quiz, $candidate);
 
+        // Check if candidate is inactive
+        if (null === $result) {
+            $this->addFlash(FlashType::Danger, $this->translator->trans('You are not allowed to answer this quiz'));
+
+            return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->seasonCode]);
+        }
+
+        // end of extracting getting next question logic
         return $this->render('quiz/question.twig', ['candidate' => $candidate, 'question' => $question, 'season' => $season]);
     }
 }

src/Controller/RegistrationController.php

@@ -9,11 +9,13 @@ 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;
 use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
 use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use SymfonyCasts\Bundle\VerifyEmail\Exception\VerifyEmailExceptionInterface;
 use Tvdt\Entity\User;
@@ -23,16 +25,16 @@ 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, private readonly EntityManagerInterface $entityManager) {}
 
     #[Route('/register', name: 'tvdt_register')]
     public function register(
         Request $request,
-        UserPasswordHasherInterface $userPasswordHasher,
-        Security $security,
-        EntityManagerInterface $entityManager,
-        LoggerInterface $logger,
     ): Response {
+        if ($this->getUser() instanceof UserInterface) {
+            return $this->redirectToRoute('tvdt_backoffice_index');
+        }
+
         $user = new User();
         $form = $this->createForm(RegistrationFormType::class, $user);
         $form->handleRequest($request);
@@ -41,10 +43,10 @@ final class RegistrationController extends AbstractController
             /** @var string $plainPassword */
             $plainPassword = $form->get('plainPassword')->getData();
 
-            $user->password = $userPasswordHasher->hashPassword($user, $plainPassword);
+            $user->password = $this->userPasswordHasher->hashPassword($user, $plainPassword);
 
-            $entityManager->persist($user);
+            $this->entityManager->persist($user);
-            $entityManager->flush();
+            $this->entityManager->flush();
 
             try {
                 // generate a signed url and email it to the user
@@ -55,10 +57,10 @@ final class RegistrationController extends AbstractController
                         ->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 +72,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 +80,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 +90,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');
         }

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,8 +13,15 @@ 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();
@@ -41,6 +49,8 @@ class KrtekFixtures extends Fixture
         $season->addQuiz($this->createQuiz2($season));
 
         $manager->flush();
+
+        $this->addReference(self::KRTEK_SEASON, $season);
     }
 
     private function createQuiz1(Season $season): Quiz

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();
+    }
+}

src/Dto/Result.php

@@ -13,6 +13,7 @@ final readonly class Result
         public string $name,
         public int $correct,
         public float $corrections,
+        public int $penaltySeconds,
         public \DateInterval $time,
         public float $score,
     ) {}

src/Entity/Answer.php

@@ -13,7 +13,7 @@ use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\AnswerRepository;
 
 #[ORM\Entity(repositoryClass: AnswerRepository::class)]
-class Answer
+class Answer implements \Stringable
 {
     #[ORM\Column(type: UuidType::NAME)]
     #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
@@ -57,4 +57,9 @@ class Answer
     {
         $this->candidates->removeElement($candidate);
     }
+
+    public function __toString(): string
+    {
+        return $this->text;
+    }
 }

src/Entity/Elimination.php

@@ -6,7 +6,7 @@ namespace Tvdt\Entity;
 
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
-use Safe\DateTimeImmutable;
+use Gedmo\Mapping\Annotation as Gedmo;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\Uid\Uuid;
@@ -30,6 +30,7 @@ class Elimination
     #[ORM\Column(type: Types::JSONB)]
     public array $data = [];
 
+    #[Gedmo\Timestampable(on: 'create')]
     #[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE, nullable: false)]
     public private(set) \DateTimeImmutable $created;
 
@@ -54,12 +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();
-    }
 }

src/Entity/GivenAnswer.php

@@ -6,13 +6,12 @@ namespace Tvdt\Entity;
 
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
-use Safe\DateTimeImmutable;
+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\Column(type: UuidType::NAME, unique: true)]
@@ -21,6 +20,7 @@ class GivenAnswer
     #[ORM\Id]
     public private(set) Uuid $id;
 
+    #[Gedmo\Timestampable(on: 'create')]
     #[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE, nullable: false)]
     public private(set) \DateTimeImmutable $created;
 
@@ -37,10 +37,4 @@ class GivenAnswer
         #[ORM\ManyToOne(inversedBy: 'givenAnswers')]
         private(set) Answer $answer,
     ) {}
-
-    #[ORM\PrePersist]
-    public function setCreatedAtValue(): void
-    {
-        $this->created = new DateTimeImmutable();
-    }
 }

src/Entity/Question.php

@@ -13,7 +13,7 @@ use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\QuestionRepository;
 
 #[ORM\Entity(repositoryClass: QuestionRepository::class)]
-class Question
+class Question implements \Stringable
 {
     #[ORM\Column(type: UuidType::NAME)]
     #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
@@ -54,22 +54,8 @@ class Question
         return $this;
     }
 
-    public function getErrors(): ?string
+    public function __toString(): string
     {
-        if (0 === \count($this->answers)) {
+        return $this->question ?? '';
-            return 'This question has no answers';
-        }
-
-        $correctAnswers = $this->answers->filter(static fn (Answer $answer): bool => $answer->isRightAnswer)->count();
-
-        if (0 === $correctAnswers) {
-            return 'This question has no correct answers';
-        }
-
-        if ($correctAnswers > 1) {
-            return 'This question has multiple correct answers';
-        }
-
-        return null;
     }
 }

src/Entity/Quiz.php

@@ -68,4 +68,115 @@ class Quiz
 
         return $this;
     }
+
+    /**
+     * Get errors for all questions in the quiz.
+     * Returns an array where keys are question IDs and values are error messages.
+     *
+     * @return array<string, string>
+     */
+    public function getQuestionErrors(): array
+    {
+        $errors = [];
+
+        // Check if any answer in the entire quiz has candidate relations
+        $hasCandidateRelations = false;
+        foreach ($this->questions as $question) {
+            foreach ($question->answers as $answer) {
+                if ($answer->candidates->count() > 0) {
+                    $hasCandidateRelations = true;
+                    break 2;
+                }
+            }
+        }
+
+        // Pre-compute active candidates once for all questions
+        $activeCandidates = [];
+        if ($hasCandidateRelations) {
+            foreach ($this->candidateData as $quizCandidate) {
+                if ($quizCandidate->active) {
+                    $activeCandidates[] = $quizCandidate->candidate;
+                }
+            }
+        }
+
+        foreach ($this->questions as $question) {
+            $error = $this->getQuestionError($question, $hasCandidateRelations, $activeCandidates);
+            if (null !== $error) {
+                $errors[$question->id->toString()] = $error;
+            }
+        }
+
+        return $errors;
+    }
+
+    /** @param list<Candidate> $activeCandidates */
+    private function getQuestionError(Question $question, bool $hasCandidateRelations, array $activeCandidates): ?string
+    {
+        if (0 === \count($question->answers)) {
+            return 'This question has no answers';
+        }
+
+        $correctAnswers = $question->answers->filter(static fn (Answer $answer): bool => $answer->isRightAnswer)->count();
+
+        if (0 === $correctAnswers) {
+            return 'This question has no correct answers';
+        }
+
+        if ($correctAnswers > 1) {
+            return 'This question has multiple correct answers';
+        }
+
+        // Only validate candidate-answer relations if at least one exists in the quiz
+        if ($hasCandidateRelations) {
+            $candidateCounts = [];
+
+            // Count how many times each candidate appears in answers
+            foreach ($question->answers as $answer) {
+                foreach ($answer->candidates as $candidate) {
+                    $candidateId = $candidate->id->toString();
+                    if (!isset($candidateCounts[$candidateId])) {
+                        $candidateCounts[$candidateId] = ['name' => $candidate->name, 'count' => 0];
+                    }
+
+                    ++$candidateCounts[$candidateId]['count'];
+                }
+            }
+
+            // Check for missing and duplicate candidates (only active ones)
+            $missing = [];
+            $duplicates = [];
+
+            foreach ($activeCandidates as $candidate) {
+                $candidateId = $candidate->id->toString();
+                $count = $candidateCounts[$candidateId]['count'] ?? 0;
+
+                if (0 === $count) {
+                    $missing[] = $candidate->name;
+                } elseif ($count > 1) {
+                    $duplicates[] = $candidate->name;
+                }
+            }
+
+            if ([] !== $missing || [] !== $duplicates) {
+                $errors = [];
+                if ([] !== $missing) {
+                    // If all active candidates are missing, show a special message
+                    if (\count($missing) === \count($activeCandidates)) {
+                        $errors[] = 'No candidates assigned to this question';
+                    } else {
+                        $errors[] = 'Missing candidates: '.implode(', ', $missing);
+                    }
+                }
+
+                if ([] !== $duplicates) {
+                    $errors[] = 'Duplicate candidates: '.implode(', ', $duplicates);
+                }
+
+                return implode('. ', $errors);
+            }
+        }
+
+        return null;
+    }
 }

src/Entity/QuizCandidate.php

@@ -6,13 +6,12 @@ namespace Tvdt\Entity;
 
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
-use Safe\DateTimeImmutable;
+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\HasLifecycleCallbacks]
 #[ORM\UniqueConstraint(columns: ['candidate_id', 'quiz_id'])]
 class QuizCandidate
 {
@@ -25,6 +24,16 @@ class QuizCandidate
     #[ORM\Column]
     public float $corrections = 0;
 
+    #[ORM\Column(type: Types::SMALLINT, options: ['default' => 0])]
+    public int $penaltySeconds = 0;
+
+    #[ORM\Column(type: Types::BOOLEAN, options: ['default' => true])]
+    public bool $active = true;
+
+    #[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE, nullable: true)]
+    public ?\DateTimeImmutable $started = null;
+
+    #[Gedmo\Timestampable(on: 'create')]
     #[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE)]
     public private(set) \DateTimeImmutable $created;
 
@@ -37,10 +46,4 @@ class QuizCandidate
         #[ORM\ManyToOne(inversedBy: 'quizData')]
         public Candidate $candidate,
     ) {}
-
-    #[ORM\PrePersist]
-    public function setCreatedAtValue(): void
-    {
-        $this->created = new DateTimeImmutable();
-    }
 }

src/Entity/Season.php

@@ -30,6 +30,7 @@ class Season
 
     /** @var Collection<int, Quiz> */
     #[ORM\OneToMany(targetEntity: Quiz::class, mappedBy: 'season', cascade: ['persist'], orphanRemoval: true)]
+    #[ORM\OrderBy(['id' => 'ASC'])]
     public private(set) Collection $quizzes;
 
     /** @var Collection<int, Candidate> */
@@ -39,6 +40,7 @@ class Season
 
     /** @var Collection<int, User> */
     #[ORM\ManyToMany(targetEntity: User::class, inversedBy: 'seasons')]
+    #[ORM\OrderBy(['email' => 'ASC'])]
     public private(set) Collection $owners;
 
     #[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')]
@@ -98,7 +100,7 @@ class Season
         return $this->owners->contains($user);
     }
 
-    public function generateSeasonCode(): self
+    public function generateSeasonCode(): void
     {
         $code = '';
         $len = mb_strlen(self::SEASON_CODE_CHARACTERS) - 1;
@@ -108,7 +110,5 @@ class Season
         }
 
         $this->seasonCode = $code;
-
-        return $this;
     }
 }

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';
 }

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,7 +21,7 @@ final readonly class EliminationFactory
         $elimination = new Elimination($quiz);
         $this->em->persist($elimination);
 
-        $scores = $this->candidateRepository->getScores($quiz);
+        $scores = $this->quizRepository->getScores($quiz);
 
         $simpleScores = [];
 

src/Form/EliminationEnterNameType.php

@@ -22,7 +22,7 @@ class EliminationEnterNameType extends AbstractType
                     'required' => true,
                     'label' => $this->translator->trans('Enter name'),
                     'translation_domain' => false,
-                    'attr' => ['autofocus' => true],
+                    'attr' => ['autofocus' => true, 'autocomplete' => 'off'],
                 ],
             )
         ;

src/Form/EnterNameType.php

@@ -22,7 +22,7 @@ class EnterNameType extends AbstractType
                     'required' => true,
                     'label' => $this->translator->trans('Enter your name'),
                     'translation_domain' => false,
-                    'attr' => ['autofocus' => true],
+                    'attr' => ['autofocus' => true, 'autocomplete' => 'off'],
                 ],
             )
         ;

src/Form/RegistrationFormType.php

@@ -15,9 +15,7 @@ use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Tvdt\Entity\User;
 
-/**
+/** @extends AbstractType<User> */
- * @extends AbstractType<User>
- */
 class RegistrationFormType extends AbstractType
 {
     public function __construct(private readonly TranslatorInterface $translator) {}

src/Form/SettingsForm.php

@@ -17,12 +17,16 @@ class SettingsForm extends AbstractType
     {
         $builder
             ->add('showNumbers', options: [
+                'label' => 'Show Numbers',
                 'label_attr' => ['class' => 'checkbox-switch'],
                 'attr' => ['role' => 'switch', 'switch' => null]])
             ->add('confirmAnswers', options: [
+                'label' => 'Confirm Answers',
                 'label_attr' => ['class' => 'checkbox-switch'],
                 'attr' => ['role' => 'switch', 'switch' => null]])
-            ->add('save', SubmitType::class)
+            ->add('save', SubmitType::class, [
+                'label' => 'Save',
+            ])
         ;
     }
 

src/Repository/AnswerRepository.php

@@ -8,9 +8,7 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Tvdt\Entity\Answer;
 
-/**
+/** @extends ServiceEntityRepository<Answer> */
- * @extends ServiceEntityRepository<Answer>
- */
 class AnswerRepository extends ServiceEntityRepository
 {
     public function __construct(ManagerRegistry $registry)

src/Repository/CandidateRepository.php

@@ -6,18 +6,12 @@ namespace Tvdt\Repository;
 
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
-use Safe\DateTimeImmutable;
-use Safe\Exceptions\DatetimeException;
 use Safe\Exceptions\UrlException;
-use Tvdt\Dto\Result;
 use Tvdt\Entity\Candidate;
-use Tvdt\Entity\Quiz;
 use Tvdt\Entity\Season;
 use Tvdt\Helpers\Base64;
 
-/**
+/** @extends ServiceEntityRepository<Candidate> */
- * @extends ServiceEntityRepository<Candidate>
- */
 class CandidateRepository extends ServiceEntityRepository
 {
     public function __construct(ManagerRegistry $registry)
@@ -42,49 +36,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();
-        }
-    }
-
-    /**
-     * @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,
-                qc.corrections,
-                max(ga.created) as end_time,
-                qc.created as start_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, max(ga.created) - qc.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: new DateTimeImmutable($row['end_time'])->diff($row['start_time']),
-            score: $row['score'],
-        ), $result);
-    }
 }

src/Repository/EliminationRepository.php

@@ -8,9 +8,7 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Tvdt\Entity\Elimination;
 
-/**
+/** @extends ServiceEntityRepository<Elimination> */
- * @extends ServiceEntityRepository<Elimination>
- */
 class EliminationRepository extends ServiceEntityRepository
 {
     public function __construct(ManagerRegistry $registry)

src/Repository/GivenAnswerRepository.php

@@ -8,22 +8,11 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Tvdt\Entity\GivenAnswer;
 
-/**
+/** @extends ServiceEntityRepository<GivenAnswer> */
- * @extends ServiceEntityRepository<GivenAnswer>
- */
 class GivenAnswerRepository extends ServiceEntityRepository
 {
     public function __construct(ManagerRegistry $registry)
     {
         parent::__construct($registry, GivenAnswer::class);
     }
-
-    public function save(GivenAnswer $givenAnswer, bool $flush = true): void
-    {
-        $this->getEntityManager()->persist($givenAnswer);
-
-        if ($flush) {
-            $this->getEntityManager()->flush();
-        }
-    }
 }

src/Repository/QuestionRepository.php

@@ -9,9 +9,7 @@ use Doctrine\Persistence\ManagerRegistry;
 use Tvdt\Entity\Candidate;
 use Tvdt\Entity\Question;
 
-/**
+/** @extends ServiceEntityRepository<Question> */
- * @extends ServiceEntityRepository<Question>
- */
 class QuestionRepository extends ServiceEntityRepository
 {
     public function __construct(ManagerRegistry $registry)
@@ -32,6 +30,7 @@ class QuestionRepository extends ServiceEntityRepository
                 and q1.quiz = :quiz
             )
             and qz = :quiz
+            order by q.ordering
             DQL)
             ->setMaxResults(1)
             ->setParameter('candidate', $candidate)

src/Repository/QuizCandidateRepository.php

@@ -6,13 +6,12 @@ namespace Tvdt\Repository;
 
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
+use Safe\DateTimeImmutable;
 use Tvdt\Entity\Candidate;
 use Tvdt\Entity\Quiz;
 use Tvdt\Entity\QuizCandidate;
 
-/**
+/** @extends ServiceEntityRepository<QuizCandidate> */
- * @extends ServiceEntityRepository<QuizCandidate>
- */
 class QuizCandidateRepository extends ServiceEntityRepository
 {
     public function __construct(ManagerRegistry $registry)
@@ -20,14 +19,28 @@ class QuizCandidateRepository extends ServiceEntityRepository
         parent::__construct($registry, QuizCandidate::class);
     }
 
-    /** @return bool true if a new entry was created */
+    /** @return bool|null true if a new entry was created, false if it already exists, null if candidate is inactive */
-    public function createIfNotExist(Quiz $quiz, Candidate $candidate): bool
+    public function createIfNotExist(Quiz $quiz, Candidate $candidate): ?bool
     {
-        if (0 !== $this->count(['candidate' => $candidate, 'quiz' => $quiz])) {
+        $quizCandidate = $this->findOneBy(['candidate' => $candidate, 'quiz' => $quiz]);
+
+        if (null !== $quizCandidate) {
+            // Check if candidate is inactive
+            if (!$quizCandidate->active) {
+                return null;
+            }
+
+            // If QuizCandidate exists but hasn't started yet, set the started timestamp
+            if (null === $quizCandidate->started) {
+                $quizCandidate->started = new DateTimeImmutable();
+                $this->getEntityManager()->flush();
+            }
+
             return false;
         }
 
         $quizCandidate = new QuizCandidate($quiz, $candidate);
+        $quizCandidate->started = new DateTimeImmutable();
         $this->getEntityManager()->persist($quizCandidate);
         $this->getEntityManager()->flush();
 
@@ -44,4 +57,15 @@ class QuizCandidateRepository extends ServiceEntityRepository
         $quizCandidate->corrections = $corrections;
         $this->getEntityManager()->flush();
     }
+
+    public function setPenaltyForCandidate(Quiz $quiz, Candidate $candidate, int $penalty): void
+    {
+        $quizCandidate = $this->findOneBy(['candidate' => $candidate, 'quiz' => $quiz]);
+        if (!$quizCandidate instanceof QuizCandidate) {
+            throw new \InvalidArgumentException('Quiz candidate not found');
+        }
+
+        $quizCandidate->penaltySeconds = $penalty;
+        $this->getEntityManager()->flush();
+    }
 }

src/Repository/QuizRepository.php

@@ -7,15 +7,14 @@ namespace Tvdt\Repository;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Psr\Log\LoggerInterface;
-use Tvdt\Entity\Elimination;
+use Safe\DateTimeImmutable;
-use Tvdt\Entity\GivenAnswer;
+use Safe\Exceptions\DatetimeException;
+use Symfony\Component\Uid\Uuid;
+use Tvdt\Dto\Result;
 use Tvdt\Entity\Quiz;
-use Tvdt\Entity\QuizCandidate;
 use Tvdt\Exception\ErrorClearingQuizException;
 
-/**
+/** @extends ServiceEntityRepository<Quiz> */
- * @extends ServiceEntityRepository<Quiz>
- */
 class QuizRepository extends ServiceEntityRepository
 {
     public function __construct(ManagerRegistry $registry, private readonly LoggerInterface $logger)
@@ -29,28 +28,36 @@ class QuizRepository extends ServiceEntityRepository
         $em = $this->getEntityManager();
         $em->beginTransaction();
         try {
-            $em->createQueryBuilder()
+            $em->createQuery(<<<DQL
-                ->delete()->from(QuizCandidate::class, 'qc')
+                delete from Tvdt\Entity\QuizCandidate qc
-                ->where('qc.quiz = :quiz')
+                where qc.quiz = :quiz
+                DQL)
                 ->setParameter('quiz', $quiz)
-                ->getQuery()->execute();
+                ->execute();
 
-            $em->createQueryBuilder()
+            $em->createQuery(<<<DQL
-                ->delete()->from(GivenAnswer::class, 'ga')
+                delete from Tvdt\Entity\GivenAnswer ga
-                ->where('ga.quiz = :quiz')
+                where ga.quiz = :quiz
+                DQL)
                 ->setParameter('quiz', $quiz)
-                ->getQuery()->execute();
+                ->execute();
-            $em->createQueryBuilder()
+
-                ->delete()->from(Elimination::class, 'e')
+            $em->createQuery(<<<DQL
-                ->where('e.quiz = :quiz')
+                delete from Tvdt\Entity\Elimination e
+                where e.quiz = :quiz
+                DQL)
                 ->setParameter('quiz', $quiz)
-                ->getQuery()->execute();
+                ->execute();
-        } catch (\Throwable $throwable) {
+        }
+        // @codeCoverageIgnoreStart
+        catch (\Throwable $throwable) {
             $this->logger->error($throwable->getMessage());
             $em->rollback();
-            throw new ErrorClearingQuizException(previous: $throwable);
+            throw new ErrorClearingQuizException(message: $throwable->getMessage(), code: $throwable->getCode(), previous: $throwable);
         }
 
+        // @codeCoverageIgnoreEnd
+
         $em->commit();
     }
 
@@ -59,4 +66,100 @@ 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,
+                qd.penaltySeconds,
+                max(ga.created) as end_time,
+                qd.started 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 and qd.started is not null
+            group by ga.quiz, c.id, qd.id
+            order by score desc, max(ga.created) - qd.started asc
+            DQL
+        )->setParameter('quiz', $quiz)->getResult();
+
+        return array_map(static function (array $row): Result {
+            \assert($row['start_time'] instanceof \DateTimeImmutable);
+
+            return new Result(
+                id: $row['id'],
+                name: $row['name'],
+                correct: (int) $row['correct'],
+                corrections: $row['corrections'],
+                penaltySeconds: $row['penaltySeconds'],
+                time: $row['start_time']->diff(new DateTimeImmutable($row['end_time'])),
+                score: $row['score'],
+            );
+        }, $result);
+    }
+
+    public function fetchWithQuestions(Uuid $id): Quiz
+    {
+        return $this->getEntityManager()->createQuery(<<<dql
+            select q, qz, a from Tvdt\Entity\Quiz q
+            join q.questions qz
+            join qz.answers a
+            where q.id = :id
+            dql)->setParameter('id', $id)->getSingleResult();
+    }
+
+    /**
+     * Fetch quiz with all relations needed for error checking.
+     * This includes: questions, answers, answer candidates, and season candidates.
+     */
+    public function fetchWithQuestionsAndCandidates(Uuid $id): Quiz
+    {
+        return $this->getEntityManager()->createQuery(<<<dql
+            select q, qz, a, ac, s, sc, qc from Tvdt\Entity\Quiz q
+            join q.questions qz
+            join qz.answers a
+            left join a.candidates ac
+            join q.season s
+            left join s.candidates sc
+            left join q.candidateData qc
+            where q.id = :id
+            dql)->setParameter('id', $id)->getSingleResult();
+    }
+
+    /**
+     * Get given answers count per candidate for a quiz.
+     *
+     * @return array<string, int> Array with candidate ID as key and count as value
+     */
+    public function getGivenAnswersCountPerCandidate(Quiz $quiz): array
+    {
+        $results = $this->getEntityManager()->createQuery(<<<DQL
+            select c.id as candidateId, count(ga.id) as answerCount
+            from Tvdt\Entity\Candidate c
+            left join c.givenAnswers ga with ga.quiz = :quiz
+            where c.season = :season
+            group by c.id
+            DQL
+        )->setParameter('quiz', $quiz)
+         ->setParameter('season', $quiz->season)
+         ->getResult();
+
+        $counts = [];
+        foreach ($results as $row) {
+            $counts[$row['candidateId']->toString()] = (int) $row['answerCount'];
+        }
+
+        return $counts;
+    }
 }

src/Repository/SeasonRepository.php

@@ -9,9 +9,7 @@ use Doctrine\Persistence\ManagerRegistry;
 use Tvdt\Entity\Season;
 use Tvdt\Entity\User;
 
-/**
+/** @extends ServiceEntityRepository<Season> */
- * @extends ServiceEntityRepository<Season>
- */
 class SeasonRepository extends ServiceEntityRepository
 {
     public function __construct(ManagerRegistry $registry)
@@ -19,6 +17,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
     {

src/Repository/SeasonSettingsRepository.php

@@ -8,9 +8,7 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Tvdt\Entity\SeasonSettings;
 
-/**
+/** @extends ServiceEntityRepository<SeasonSettings> */
- * @extends ServiceEntityRepository<SeasonSettings>
- */
 class SeasonSettingsRepository extends ServiceEntityRepository
 {
     public function __construct(ManagerRegistry $registry)

src/Security/Voter/SeasonVoter.php

@@ -48,24 +48,14 @@ final class SeasonVoter extends Voter
             return true;
         }
 
-        switch (true) {
+        $season = match (true) {
-            case $subject instanceof Answer:
+            $subject instanceof Answer => $subject->question->quiz->season,
-                $season = $subject->question->quiz->season;
+            $subject instanceof Elimination,
-                break;
+            $subject instanceof Question => $subject->quiz->season,
-            case $subject instanceof Elimination:
+            $subject instanceof Candidate,
-            case $subject instanceof Question:
+            $subject instanceof Quiz => $subject->season,
-                $season = $subject->quiz->season;
+            $subject instanceof Season => $subject,
-                break;
+        };
-            case $subject instanceof Candidate:
-            case $subject instanceof Quiz:
-                $season = $subject->season;
-                break;
-            case $subject instanceof Season:
-                $season = $subject;
-                break;
-            default:
-                return false;
-        }
 
         return match ($attribute) {
             self::EDIT, self::DELETE, self::ELIMINATION => $season->isOwner($user),

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());
 
@@ -91,11 +95,15 @@ class QuizSpreadsheetService
             $arrCounter = 1;
 
             while (true) {
-                if (null === $questionArr[$arrCounter]) {
+                try {
-                    if (1 === $answerCounter) {
+                    if (null === $questionArr[$arrCounter]) {
-                        $errors[] = \sprintf('Question %d has no answers', $answerCounter);
+                        if (1 === $answerCounter) {
-                    }
+                            $errors[] = \sprintf('Question %d has no answers', $answerCounter);
+                        }
 
+                        break;
+                    }
+                } catch (\ErrorException) {
                     break;
                 }
 
@@ -112,7 +120,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 +131,9 @@ class QuizSpreadsheetService
 
         return static fn () => $writer->save('php://output');
     }
+
+    private function isSpreadsheetFile(File $file): bool
+    {
+        return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' === $file->getMimeType();
+    }
 }

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": {
@@ -72,31 +84,44 @@
         ]
     },
     "phpunit/phpunit": {
-        "version": "12.1",
+        "version": "12.4",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "10.0",
+            "version": "11.1",
-            "ref": "bb22cf8d8c554a623b427d5f3416b538f5525233"
+            "ref": "1117deb12541f35793eec9fff7494d7aa12283fc"
         },
         "files": [
             ".env.test",
+            "bin/phpunit",
             "phpunit.dist.xml",
             "tests/bootstrap.php"
         ]
     },
     "sentry/sentry-symfony": {
-        "version": "5.2",
+        "version": "5.8",
         "recipe": {
             "repo": "github.com/symfony/recipes-contrib",
             "branch": "main",
             "version": "5.0",
-            "ref": "c3decefe8a11a5da43adaf827a6cd66695586113"
+            "ref": "12f504985eb24e3b20a9e41e0ec7e398798d18f0"
         },
         "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": {
@@ -159,14 +184,15 @@
         ]
     },
     "symfony/framework-bundle": {
-        "version": "7.2",
+        "version": "8.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "7.2",
+            "version": "7.4",
-            "ref": "87bcf6f7c55201f345d8895deda46d2adbdbaa89"
+            "ref": "09f6e081c763a206802674ce0cb34a022f0ffc6d"
         },
         "files": [
+            ".editorconfig",
             "config/packages/cache.yaml",
             "config/packages/framework.yaml",
             "config/preload.php",
@@ -199,19 +225,14 @@
         }
     },
     "symfony/phpunit-bridge": {
-        "version": "7.2",
+        "version": "8.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "6.3",
+            "version": "7.3",
-            "ref": "a411a0480041243d97382cac7984f7dce7813c08"
+            "ref": "dc13fec96bd527bd399c3c01f0aab915c67fd544"
         },
-        "files": [
+        "files": []
-            ".env.test",
-            "bin/phpunit",
-            "phpunit.xml.dist",
-            "tests/bootstrap.php"
-        ]
     },
     "symfony/property-info": {
         "version": "7.3",
@@ -226,12 +247,12 @@
         ]
     },
     "symfony/routing": {
-        "version": "7.2",
+        "version": "8.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "7.0",
+            "version": "7.4",
-            "ref": "21b72649d5622d8f7da329ffb5afb232a023619d"
+            "ref": "bc94c4fd86f393f3ab3947c18b830ea343e51ded"
         },
         "files": [
             "config/packages/routing.yaml",
@@ -239,12 +260,12 @@
         ]
     },
     "symfony/security-bundle": {
-        "version": "7.2",
+        "version": "8.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "6.4",
+            "version": "7.4",
-            "ref": "2ae08430db28c8eb4476605894296c82a642028f"
+            "ref": "c42fee7802181cdd50f61b8622715829f5d2335c"
         },
         "files": [
             "config/packages/security.yaml",
@@ -252,18 +273,18 @@
         ]
     },
     "symfony/stimulus-bundle": {
-        "version": "2.26",
+        "version": "2.32",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "2.20",
+            "version": "2.24",
-            "ref": "3acc494b566816514a6873a89023a35440b6386d"
+            "ref": "3357f2fa6627b93658d8e13baa416b2a94a50c5f"
         },
         "files": [
-            "assets/bootstrap.js",
             "assets/controllers.json",
             "assets/controllers/csrf_protection_controller.js",
-            "assets/controllers/hello_controller.js"
+            "assets/controllers/hello_controller.js",
+            "assets/stimulus_bootstrap.js"
         ]
     },
     "symfony/translation": {

templates/backoffice/base.html.twig

@@ -2,3 +2,16 @@
 {% block importmap %}{{ importmap('backoffice') }}{% endblock %}
 {% block title %}Tijd voor de test | {% endblock %}
 {% block nav %}{{ include('backoffice/nav.html.twig') }}{% endblock %}
+
+{% block main %}
+    <div class="container">
+        <div class="mt-3">
+            {% block breadcrumbs %}{% endblock %}
+        </div>
+        {{ include('flashes.html.twig') }}
+        <div class="mb-5">
+            {% block body %}
+            {% endblock body %}
+        </div>
+    </div>
+{% endblock %}

templates/backoffice/index.html.twig

@@ -2,9 +2,17 @@
 
 {% block title %}{{ parent() }}Backoffice{% endblock %}
 
+{% block breadcrumbs %}
+    <nav aria-label="breadcrumb" class="mb-3">
+        <ol class="breadcrumb">
+            <li class="breadcrumb-item active" aria-current="page">{{ 'Home'|trans }}</li>
+        </ol>
+    </nav>
+{% endblock %}
+
 {% block body %}
-    <div class="d-flex flex-row align-items-center">
+    <div class="d-flex flex-row align-items-center mb-3">
-        <h2 class="py-2 pe-2">
+        <h2 class="mb-0 pe-2">
             {{ is_granted('ROLE_ADMIN') ? 'All Seasons'|trans : 'Your Seasons'|trans }}
         </h2>
         <a class="link" href="{{ path('tvdt_backoffice_season_add') }}">
@@ -12,7 +20,7 @@
         </a>
     </div>
     {% if seasons %}
-        <table class="table table-hover">
+        <table class="table table-hover mb-3">
             <thead>
             <tr>
                 {% if is_granted('ROLE_ADMIN') %}

templates/backoffice/login/login.html.twig

@@ -3,39 +3,33 @@
 {% block title %}Log in{% endblock %}
 
 {% block body %}
-    {% if app.user %}
+    <form method="post">
+        <h1 class="py-2 h3 mb-3 font-weight-normal">{{ 'Please sign in'|trans }}</h1>
         <div class="mb-3">
-            You are logged in as {{ app.user.userIdentifier }}, <a href="{{ path('tvdt_login_logout') }}">Logout</a>
+            <label for="username" class="form-label">{{ 'Email'|trans }}</label>
+            <input type="email" value="{{ last_username }}" name="_username" id="username" class="form-control"
+                   autocomplete="email" required autofocus>
         </div>
-    {% else %}
-        <form method="post">
-            <h1 class="py-2 h3 mb-3 font-weight-normal">{{ 'Please sign in'|trans }}</h1>
-            <div class="mb-3">
-                <label for="username" class="form-label">{{ 'Email'|trans }}</label>
-                <input type="email" value="{{ last_username }}" name="_username" id="username" class="form-control"
-                       autocomplete="email" required autofocus>
-            </div>
 
-            <div class="mb-3">
+        <div class="mb-3">
-                <label for="password" class="form-label">{{ 'Password'|trans }}</label>
+            <label for="password" class="form-label">{{ 'Password'|trans }}</label>
-                <input type="password" name="_password" id="password" class="form-control"
+            <input type="password" name="_password" id="password" class="form-control"
-                       autocomplete="current-password"
+                   autocomplete="current-password"
-                       required>
+                   required>
-            </div>
+        </div>
 
-            <input type="hidden" name="_csrf_token" data-controller="csrf-protection"
+        <input type="hidden" name="_csrf_token" data-controller="csrf-protection"
-                   value="{{ csrf_token('authenticate') }}">
+               value="{{ csrf_token('authenticate') }}">
 
-            <div class="mb-3 form-check">
+        <div class="mb-3 form-check">
-                <input type="checkbox" name="_remember_me" id="_remember_me" class="form-check-input">
+            <input type="checkbox" name="_remember_me" id="_remember_me" class="form-check-input" checked>
-                <label for="_remember_me" class="form-check-label">{{ 'Remember me'|trans }}</label>
+            <label for="_remember_me" class="form-check-label">{{ 'Remember me'|trans }}</label>
-            </div>
+        </div>
 
-            <button class="btn btn-lg btn-primary" type="submit">
+        <button class="btn btn-lg btn-primary" type="submit">
-                {{ 'Sign in'|trans }}
+            {{ 'Sign in'|trans }}
-            </button>
+        </button>
-            <a href="{{ path('tvdt_register') }}"
+        <a href="{{ path('tvdt_register') }}"
-               class="btn btn-link">{{ 'Create an account'|trans }}</a>
+           class="btn btn-link">{{ 'Create an account'|trans }}</a>
-        </form>
+    </form>
-    {% endif %}
 {% endblock %}

templates/backoffice/prepare_elimination/index.html.twig

@@ -1,20 +1,17 @@
 {% extends 'backoffice/base.html.twig' %}
-{% block body %}
-    <div class="row">
-        <nav aria-label="breadcrumb">
-            <ol class="breadcrumb">
-                <li class="breadcrumb-item"><a href="{{ path('tvdt_backoffice_index') }}">Home</a></li>
-                <li class="breadcrumb-item"><a
-                        href="{{ path('tvdt_backoffice_season', {seasonCode: elimination.quiz.season.seasonCode}) }}">{{ elimination.quiz.season.name }}</a>
-                </li>
-                <li class="breadcrumb-item"><a
-                        href="{{ path('tvdt_backoffice_quiz', {seasonCode: elimination.quiz.season.seasonCode, quiz: elimination.quiz.id}) }}">{{ elimination.quiz.name }}</a>
-                </li>
 
-                <li class="breadcrumb-item active" aria-current="page">Prepare Elimination</li>
+{% block breadcrumbs %}
-            </ol>
+    <nav aria-label="breadcrumb" class="mb-3">
-        </nav>
+        <ol class="breadcrumb">
-    </div>
+            <li class="breadcrumb-item"><a href="{{ path('tvdt_backoffice_index') }}">{{ 'Home'|trans }}</a></li>
+            <li class="breadcrumb-item"><a href="{{ path('tvdt_backoffice_season', {seasonCode: elimination.quiz.season.seasonCode}) }}">{{ elimination.quiz.season.name }}</a></li>
+            <li class="breadcrumb-item"><a href="{{ path('tvdt_backoffice_quiz', {seasonCode: elimination.quiz.season.seasonCode, quiz: elimination.quiz.id}) }}">{{ elimination.quiz.name }}</a></li>
+            <li class="breadcrumb-item active" aria-current="page">{{ 'Prepare Elimination'|trans }}</li>
+        </ol>
+    </nav>
+{% endblock %}
+
+{% block body %}
     <div class="row">
         <div class="col-12 col-md-6">
             <form method="post">
@@ -32,7 +29,7 @@
                         </div>
                     </div>
                 {% endfor %}
-                <div class="btn-group py-2">
+                <div class="btn-group mb-3">
                     <button type="submit" class="btn btn-primary" name="start" value="0">{{ 'Save'|trans }}</button>
                     <button type="submit" class="btn btn-success" name="start"
                             value="1">{{ 'Save and start elimination'|trans }}</button>
@@ -42,7 +39,7 @@
             </form>
         </div>
         <div class="col-12 col-md-6">
-            <p>Hier kan dus weer wat uitleg komen</p>
+            <p class="mb-3">{{ 'Help text for preparing elimination'|trans }}</p>
         </div>
     </div>
 {% endblock %}

templates/backoffice/quiz.html.twig

@@ -1,166 +1,36 @@
 {% extends 'backoffice/base.html.twig' %}
 
-{% block title %}{{ parent() }}{{ quiz.season.name }}{% endblock %}
+{% block title %}{{ parent() }}{{ season.name }}{% endblock %}
+
+{% block breadcrumbs %}
+    <nav aria-label="breadcrumb" class="mb-3">
+        <ol class="breadcrumb">
+            <li class="breadcrumb-item"><a href="{{ path('tvdt_backoffice_index') }}">{{ 'Home'|trans }}</a></li>
+            <li class="breadcrumb-item"><a href="{{ path('tvdt_backoffice_season', {seasonCode: season.seasonCode}) }}">{{ season.name }}</a></li>
+            <li class="breadcrumb-item active" aria-current="page">{{ quiz.name }}</li>
+        </ol>
+    </nav>
+{% endblock %}
 
 {% block body %}
-    <h2 class="py-2">{{ 'Quiz'|trans }}: {{ quiz.season.name }} - {{ quiz.name }}</h2>
+    {% set tabs = [
-    <div class="py-2 btn-group" data-controller="bo--quiz">
+        {id: 'overview', label: 'Overview'|trans, route: 'tvdt_backoffice_quiz_overview'},
-        <a class="btn btn-primary {% if quiz is same as(season.activeQuiz) %}disabled{% endif %}"
+        {id: 'candidates', label: 'Candidates'|trans, route: 'tvdt_backoffice_quiz_candidates_tab'},
-           href="{{ path('tvdt_backoffice_enable', {seasonCode: season.seasonCode, quiz: quiz.id}) }}">{{ 'Make active'|trans }}</a>
+        {id: 'result', label: 'Results & Elimination'|trans, route: 'tvdt_backoffice_quiz_result'},
-        {% if quiz is same as (season.activeQuiz) %}
+        {id: 'answers', label: 'Answer Mapping'|trans, route: 'tvdt_backoffice_quiz_candidates'},
-            <a class="btn btn-secondary"
+    ] %}
-               href="{{ path('tvdt_backoffice_enable', {seasonCode: season.seasonCode, quiz: 'null'}) }}">{{ 'Deactivate Quiz'|trans }}</a>
-        {% endif %}
-        <button class="btn btn-danger" data-action="click->bo--quiz#clearQuiz">
-            {{ 'Clear quiz...'|trans }}
-        </button>
-        <button class="btn btn-danger" data-action="click->bo--quiz#deleteQuiz">
-            {{ 'Delete Quiz...'|trans }}
-        </button>
-    </div>
 
-    <div id="questions">
+    <h2 class="mb-3">{{ 'Quiz'|trans }}: {{ season.name }} - {{ quiz.name }}</h2>
-        <h4 class="py-2">{{ 'Questions'|trans }}</h4>
+    <ul class="nav nav-tabs mb-3">
-        <div class="accordion">
+        {% for tab in tabs %}
-            {%~ for question in quiz.questions ~%}
+            <li class="nav-item">
-                <div class="accordion-item">
+                <a class="nav-link{{ activeTab == tab.id ? ' active' }}" href="{{ path(tab.route, {seasonCode: season.seasonCode, quiz: quiz.id}) }}">
-                    <h2 class="accordion-header">
+                    {{ tab.label }}
-                        <button class="accordion-button collapsed"
+                </a>
-                                type="button"
+            </li>
-                                data-bs-toggle="collapse"
+        {% endfor %}
-                                data-bs-target="#question-{{ loop.index0 }}"
+    </ul>
-                                aria-controls="question-{{ loop.index0 }}">
+    <div class="pt-3">
-                            {% set questionErrors = question.getErrors %}
+        {{ include(template) }}
-                            {%~ if questionErrors -%}
-                                <span data-bs-toggle="tooltip"
-                                      title="{{ questionErrors }}"
-                                      class="badge text-bg-danger rounded-pill me-2">!</span>
-                            {% endif %}
-                            {{~ loop.index -}}. {{ question.question -}}
-                        </button>
-                    </h2>
-                    <div id="question-{{ loop.index0 }}"
-                         class="accordion-collapse collapse">
-                        <div class="accordion-body">
-                            <ul>
-                                {%~ for answer in question.answers %}
-                                    <li{% if answer.isRightAnswer %} class="text-decoration-underline"{% endif %}>{{ answer.text -}}</li>
-                                {%~ else %}
-                                    {{ 'There are no answers for this question'|trans -}}
-                                {%~ endfor %}
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            {% else %}
-                {{ 'EMPTY'|trans }}
-            {% endfor %}
-        </div>
-    </div>
-    <div class="scores">
-        <h4 class="py-2">{{ 'Score'|trans }}</h4>
-        <div class="btn-toolbar" role="toolbar">
-            <div class="btn-group btn-group-lg me-2">
-                {# <a class="btn btn-primary">{{ 'Start Elimination'|trans }}</a> #}
-                <a href="{{ path('tvdt_prepare_elimination', {seasonCode: season.seasonCode, quiz: quiz.id}) }}"
-                   class="btn btn-secondary">{{ 'Prepare Custom Elimination'|trans }}</a>
-                {%~ if not quiz.eliminations.empty %}
-                    <button class="btn btn-secondary dropdown-toggle"
-                            data-bs-toggle="dropdown">{{ 'Load Prepared Elimination'|trans }}</button>
-                    <ul class="dropdown-menu">
-                        {%~ for elimination in quiz.eliminations %}
-                            <li><a class="dropdown-item"
-                                   href="{{ path('tvdt_prepare_elimination_view', {elimination: elimination.id}) }}">{{ elimination.created|format_datetime() }}</a>
-                            </li>
-                        {%~ endfor %}
-                    </ul>
-                {% endif %}
-            </div>
-        </div>
-        <p>{{ 'Number of dropouts:'|trans }}  {{ quiz.dropouts }} </p>
-        <table class="table table-hover">
-            <thead>
-            <tr>
-                <th scope="col">{{ 'Candidate'|trans }}</th>
-                <th style="width: 15%" scope="col">{{ 'Correct Answers'|trans }}</th>
-                <th style="width: 20%" scope="col">{{ 'Corrections'|trans }}</th>
-                <th style="width: 10%" scope="col">{{ 'Score'|trans }}</th>
-                <th style="width: 20%" scope="col">{{ 'Time'|trans }}</th>
-            </tr>
-            </thead>
-            <tbody>
-            {%~ for candidate in result ~%}
-                <tr class="table-{% if loop.revindex > quiz.dropouts %}success{% else %}danger{% endif %}">
-                    <td>{{ candidate.name }}</td>
-                    <td>{{ candidate.correct|default('0') }}</td>
-                    <td>
-                        <form method="post"
-                              action="{{ path('tvdt_backoffice_modify_correction', {quiz: quiz.id, candidate: candidate.id}) }}">
-                            <div class="row">
-                                <div class="col-8">
-                                    <input class="form-control form-control-sm" type="number"
-                                           value="{{ candidate.corrections }}" step="0.5"
-                                           name="corrections">
-                                </div>
-                                <div class="col-2">
-                                    <button class="btn btn-sm btn-primary" type="submit">{{ 'Save'|trans }}</button>
-                                </div>
-                            </div>
-                        </form>
-                    </td>
-                    <td>{{ candidate.score|default('x') }}</td>
-                    <td>{{ candidate.time.format('%i:%S') }}</td>
-                </tr>
-            {% else %}
-                <tr>
-                    <td colspan="5">{{ 'No results'|trans }}</td>
-                </tr>
-            {% endfor %}
-            </tbody>
-        </table>
-    </div>
-
-    {# Modal Clear #}
-    <div class="modal fade" id="clearQuizModal" data-bs-backdrop="static"
-         tabindex="-1"
-         aria-labelledby="staticBackdropLabel" aria-hidden="true">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h1 class="modal-title fs-5" id="staticBackdropLabel">{{ 'Please Confirm'|trans }}</h1>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body">
-                    {{ 'Are you sure you want to clear all the results? This will also delete al the eliminations.'|trans }}
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ 'No'|trans }}</button>
-                    <a href="{{ path('tvdt_backoffice_quiz_clear', {quiz: quiz.id}) }}"
-                       class="btn btn-danger">{{ 'Yes'|trans }}</a>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    {# Modal Delete #}
-    <div class="modal fade" id="deleteQuizModal" data-bs-backdrop="static"
-         tabindex="-1"
-         aria-labelledby="staticBackdropLabel" aria-hidden="true">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h1 class="modal-title fs-5" id="staticBackdropLabel">{{ 'Please Confirm'|trans }}</h1>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body">
-                    {{ 'Are you sure you want to delete this quiz?'|trans }}
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ 'No'|trans }}</button>
-                    <a href="{{ path('tvdt_backoffice_quiz_delete', {quiz: quiz.id}) }}"
-                       class="btn btn-danger">{{ 'Yes'|trans }}</a>
-                </div>
-            </div>
-        </div>
     </div>
 {% endblock %}

templates/backoffice/quiz/tab_candidates.html.twig

@@ -0,0 +1,66 @@
+<div class="d-flex justify-content-between align-items-center mb-3">
+    <div>
+        {% set questions = quiz.questions %}
+        {% set currentIndex = null %}
+        {% for index, q in questions %}
+            {% if q.id.toString == question.id.toString %}
+                {% set currentIndex = index %}
+            {% endif %}
+        {% endfor %}
+
+        {% if currentIndex > 0 %}
+            {% set prevQuestion = questions[currentIndex - 1] %}
+            <a href="{{ path('tvdt_backoffice_quiz_candidates_question', {seasonCode: season.seasonCode, quiz: quiz.id, question: prevQuestion.id}) }}"
+               class="btn btn-secondary">
+                {{ 'Previous'|trans }}
+            </a>
+        {% endif %}
+    </div>
+
+    <h4 class="mb-0">{{ currentIndex + 1 }}. {{ question }}</h4>
+
+    <div>
+        {% if currentIndex is not null and currentIndex < (questions|length - 1) %}
+            {% set nextQuestion = questions[currentIndex + 1] %}
+            <a href="{{ path('tvdt_backoffice_quiz_candidates_question', {seasonCode: season.seasonCode, quiz: quiz.id, question: nextQuestion.id}) }}"
+               class="btn btn-secondary">
+                {{ 'Next'|trans }}
+            </a>
+        {% endif %}
+    </div>
+</div>
+
+<form method="post">
+    <input type="hidden" name="_token" value="{{ csrf_token('candidate_answer') }}">
+    <table class="table table-hover table-striped mb-3">
+        <thead>
+            <tr>
+                <th scope="col">{{ 'Candidate'|trans }}</th>
+                {% for answer in question.answers %}
+                    <th scope="col">{{ answer }}</th>
+                {% endfor %}
+            </tr>
+        </thead>
+        <tbody>
+            {% for candidate in candidates %}
+                <tr>
+                    <th scope="row">{{ candidate.name }}</th>
+                    {% for answer in question.answers %}
+                        <td>
+                            <input type="checkbox"
+                                   id="candidate_{{ candidate.id }}_answer_{{ answer.id }}"
+                                   name="candidate_answer[{{ candidate.id }}][]"
+                                   value="{{ answer.id }}"
+                                   class="form-check-input"
+                                   {{ answer.candidates.contains(candidate) ? 'checked' : '' }}>
+                            <label for="candidate_{{ candidate.id }}_answer_{{ answer.id }}" class="visually-hidden">
+                                {{ candidate.name }} - {{ answer }}
+                            </label>
+                        </td>
+                    {% endfor %}
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+    <button type="submit" class="btn btn-primary">{{ 'Save'|trans }}</button>
+</form>