Try with services.yaml

.coderabbit.yaml

@@ -1,6 +0,0 @@
-# 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,7 +17,6 @@
 ###> symfony/framework-bundle ###
 APP_ENV=dev
 APP_SECRET=
-APP_SHARE_DIR=var/share
 ###< symfony/framework-bundle ###
 
 ###> doctrine/doctrine-bundle ###
@@ -38,9 +37,3 @@ MAILER_DSN=null://null
 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 ###

.gitattributes

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

.github/dependabot.yml

@@ -7,24 +7,9 @@ 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: "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: "/"
+    directtory: "/"
     schedule:
       interval: "daily"

.github/workflows/ci.yml

@@ -15,15 +15,12 @@ concurrency:
 
 permissions:
   contents: read
+  packages: write
 
 jobs:
   tests:
     name: Tests
     runs-on: ubuntu-latest
-    permissions:
-      checks: write
-      pull-requests: write
-      contents: read
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -51,10 +48,6 @@ jobs:
         run: docker compose exec -T php vendor/bin/php-cs-fixer check --diff --show-progress=none
       - name: Twig Coding Style
         run: docker compose exec -T php vendor/bin/twig-cs-fixer check
-      - name: Static Analysis (PHPStan)
-        run: docker compose exec -T php vendor/bin/phpstan analyse --no-progress --no-ansi --error-format=github
-      - name: Rector
-        run: docker compose exec -T php vendor/bin/rector process --dry-run --no-progress-bar --output-format=github
       - name: Check HTTP reachability
         run: curl -v --fail-with-body http://localhost
       - name: Check Mercure reachability
@@ -67,21 +60,12 @@ jobs:
       - 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 --log-junit var/phpunit/junit.xml
+        run: docker compose exec -T php vendor/bin/phpunit
-      - name: Publish PHPUnit test results
-        if: always()
-        uses: mikepenz/action-junit-report@v5
-        with:
-          report_paths: var/phpunit/junit.xml
-          check_name: PHPUnit
       - name: Doctrine Schema Validator
         run: docker compose exec -T php bin/console -e test doctrine:schema:validate
   
   build-deploy:
     name: Build and deploy to ${{ startsWith(github.ref, 'refs/tags/') && 'production' || (github.ref == 'refs/heads/main' && 'acceptance' || '') }}
-    permissions:
-      contents: read
-      packages: write
     environment:
       name: ${{ startsWith(github.ref, 'refs/tags/') && 'production' || (github.ref == 'refs/heads/main' && 'acceptance' || '') }}
       url: ${{ vars.URL }}
@@ -132,16 +116,6 @@ jobs:
             *.cache-to=type=gha,scope=${{github.ref}},mode=max
             *.tags=${{ steps.meta.outputs.full_name }}
 
-      - name: Create Sentry release
-        uses: getsentry/action-release@v3
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
-          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
-        with:
-          release: ${{steps.meta.outputs.tag}}
-          environment: ${{ startsWith(github.ref, 'refs/tags/') && 'production' || (github.ref == 'refs/heads/main' && 'acceptance' || '') }}
-
       - name: Trigger Portainer Deployment
         shell: bash
         env:

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

@@ -1,25 +0,0 @@
-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,19 +68,6 @@ 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

@@ -4,7 +4,6 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="Tvdt\" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Tvdt\Tests\" />
-      <sourceFolder url="file://$MODULE_DIR$/vendor/maennchen/zipstream-php/test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/clue/ndjson-react" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/collections" />
@@ -46,6 +45,7 @@
       <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,6 +127,7 @@
       <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" />
@@ -152,6 +153,7 @@
       <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" />
@@ -166,9 +168,6 @@
       <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" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/ergebnis/agent-detector" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-deepclone" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

.idea/dataSources.xml

@@ -6,23 +6,6 @@
       <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>
-    <data-source source="LOCAL" name="Prod DB" uuid="2cfa902e-fb09-4e39-a09c-15bdbe41ec57">
-      <driver-ref>postgresql</driver-ref>
-      <synchronize>true</synchronize>
-      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
-      <jdbc-url>jdbc:postgresql://10.0.0.21:5430/postgres</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/inspectionProfiles/Project_Default.xml

@@ -73,7 +73,6 @@
     <inspection_tool class="PhpFullyQualifiedNameUsageInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
       <option name="IGNORE_GLOBAL_NAMESPACE" value="true" />
     </inspection_tool>
-    <inspection_tool class="PhpPublicPropertyModifierCanBeOmittedInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="PhpStanGlobal" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="SecurityAdvisoriesInspection" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="optionConfiguration">

.idea/laravel-idea.xml

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

.idea/php.xml

@@ -7,11 +7,6 @@
       </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>
@@ -26,9 +21,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-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" />
+      <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" />
       <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-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" />
+      <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" />
     </phpcsfixer_settings>
   </component>
   <component name="PhpCodeSniffer">
@@ -41,175 +36,174 @@
   </component>
   <component name="PhpIncludePathManager">
     <include_path>
-      <path value="$PROJECT_DIR$/vendor/symfony/cache" />
-      <path value="$PROJECT_DIR$/vendor/symfony/validator" />
-      <path value="$PROJECT_DIR$/vendor/symfony/dotenv" />
-      <path value="$PROJECT_DIR$/vendor/symfony/serializer" />
-      <path value="$PROJECT_DIR$/vendor/symfony/intl" />
-      <path value="$PROJECT_DIR$/vendor/symfony/security-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/browser-kit" />
-      <path value="$PROJECT_DIR$/vendor/symfony/asset" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-invoker" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
-      <path value="$PROJECT_DIR$/vendor/symfony/ux-turbo" />
-      <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/brevo-mailer" />
-      <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/security-csrf" />
-      <path value="$PROJECT_DIR$/vendor/symfony/options-resolver" />
-      <path value="$PROJECT_DIR$/vendor/symfony/filesystem" />
-      <path value="$PROJECT_DIR$/vendor/symfony/security-http" />
-      <path value="$PROJECT_DIR$/vendor/symfony/config" />
-      <path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
-      <path value="$PROJECT_DIR$/vendor/symfony/runtime" />
-      <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/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/http-kernel" />
-      <path value="$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge" />
-      <path value="$PROJECT_DIR$/vendor/symfony/stopwatch" />
-      <path value="$PROJECT_DIR$/vendor/symfony/web-profiler-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-uuid" />
-      <path value="$PROJECT_DIR$/vendor/symfony/twig-bridge" />
-      <path value="$PROJECT_DIR$/vendor/symfony/maker-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/dom-crawler" />
-      <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/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/cache-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/error-handler" />
-      <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/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/symfony/polyfill-intl-grapheme" />
-      <path value="$PROJECT_DIR$/vendor/symfony/console" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-fixtures-bundle" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/persistence" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/sql-formatter" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/collections" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/event-manager" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/orm" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-migrations-bundle" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/dbal" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/lexer" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/data-fixtures" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/migrations" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/lines-of-code" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/diff" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/complexity" />
-      <path value="$PROJECT_DIR$/vendor/maennchen/zipstream-php" />
-      <path value="$PROJECT_DIR$/vendor/evenement/evenement" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/deprecations" />
-      <path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
-      <path value="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet" />
-      <path value="$PROJECT_DIR$/vendor/markbaker/matrix" />
-      <path value="$PROJECT_DIR$/vendor/markbaker/complex" />
-      <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/log" />
+      <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
+      <path value="$PROJECT_DIR$/vendor/martin-georgiev/postgresql-for-doctrine" />
+      <path value="$PROJECT_DIR$/vendor/dama/doctrine-test-bundle" />
+      <path value="$PROJECT_DIR$/vendor/staabm/side-effects-detector" />
+      <path value="$PROJECT_DIR$/vendor/psr/http-client" />
       <path value="$PROJECT_DIR$/vendor/psr/container" />
+      <path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
+      <path value="$PROJECT_DIR$/vendor/psr/log" />
+      <path value="$PROJECT_DIR$/vendor/psr/cache" />
       <path value="$PROJECT_DIR$/vendor/psr/http-message" />
       <path value="$PROJECT_DIR$/vendor/psr/event-dispatcher" />
-      <path value="$PROJECT_DIR$/vendor/clue/ndjson-react" />
+      <path value="$PROJECT_DIR$/vendor/symfony/cache" />
-      <path value="$PROJECT_DIR$/vendor/psr/http-factory" />
+      <path value="$PROJECT_DIR$/vendor/symfony/validator" />
-      <path value="$PROJECT_DIR$/vendor/psr/clock" />
+      <path value="$PROJECT_DIR$/vendor/symfony/asset" />
-      <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/form" />
-      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-symfony" />
+      <path value="$PROJECT_DIR$/vendor/vincentlanglet/twig-cs-fixer" />
-      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-doctrine" />
+      <path value="$PROJECT_DIR$/vendor/symfony/dotenv" />
-      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan" />
+      <path value="$PROJECT_DIR$/vendor/symfony/serializer" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
+      <path value="$PROJECT_DIR$/vendor/rector/rector" />
-      <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/symfony/polyfill-intl-icu" />
+      <path value="$PROJECT_DIR$/vendor/symfonycasts/sass-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/framework-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfonycasts/verify-email-bundle" />
+      <path value="$PROJECT_DIR$/vendor/psr/http-factory" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-doctrine" />
+      <path value="$PROJECT_DIR$/vendor/psr/clock" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan" />
+      <path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-phpunit" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-symfony" />
+      <path value="$PROJECT_DIR$/vendor/symfony/mailer" />
+      <path value="$PROJECT_DIR$/vendor/symfony/brevo-mailer" />
+      <path value="$PROJECT_DIR$/vendor/symfony/options-resolver" />
+      <path value="$PROJECT_DIR$/vendor/symfony/filesystem" />
+      <path value="$PROJECT_DIR$/vendor/symfony/runtime" />
+      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
+      <path value="$PROJECT_DIR$/vendor/symfony/var-dumper" />
+      <path value="$PROJECT_DIR$/vendor/symfony/phpunit-bridge" />
+      <path value="$PROJECT_DIR$/vendor/symfony/security-http" />
+      <path value="$PROJECT_DIR$/vendor/symfony/config" />
+      <path value="$PROJECT_DIR$/vendor/symfony/asset-mapper" />
+      <path value="$PROJECT_DIR$/vendor/symfony/uid" />
+      <path value="$PROJECT_DIR$/vendor/symfony/intl" />
+      <path value="$PROJECT_DIR$/vendor/symfony/security-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
+      <path value="$PROJECT_DIR$/vendor/symfony/http-client" />
+      <path value="$PROJECT_DIR$/vendor/friendsofphp/php-cs-fixer" />
+      <path value="$PROJECT_DIR$/vendor/gedmo/doctrine-extensions" />
+      <path value="$PROJECT_DIR$/vendor/symfony/finder" />
+      <path value="$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge" />
+      <path value="$PROJECT_DIR$/vendor/symfony/stopwatch" />
+      <path value="$PROJECT_DIR$/vendor/masterminds/html5" />
+      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/twig-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/property-access" />
+      <path value="$PROJECT_DIR$/vendor/symfony/web-profiler-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-uuid" />
+      <path value="$PROJECT_DIR$/vendor/symfony/css-selector" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-normalizer" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-idn" />
+      <path value="$PROJECT_DIR$/vendor/symfony/security-csrf" />
+      <path value="$PROJECT_DIR$/vendor/symfony/twig-bridge" />
+      <path value="$PROJECT_DIR$/vendor/symfony/maker-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/var-exporter" />
+      <path value="$PROJECT_DIR$/vendor/symfony/doctrine-bridge" />
+      <path value="$PROJECT_DIR$/vendor/symfony/error-handler" />
+      <path value="$PROJECT_DIR$/vendor/symfony/flex" />
+      <path value="$PROJECT_DIR$/vendor/symfony/property-info" />
+      <path value="$PROJECT_DIR$/vendor/symfony/http-client-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/http-foundation" />
+      <path value="$PROJECT_DIR$/vendor/symfony/type-info" />
+      <path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
+      <path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/security-core" />
+      <path value="$PROJECT_DIR$/vendor/symfony/service-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/routing" />
+      <path value="$PROJECT_DIR$/vendor/symfony/yaml" />
+      <path value="$PROJECT_DIR$/vendor/symfony/http-kernel" />
+      <path value="$PROJECT_DIR$/vendor/symfony/string" />
+      <path value="$PROJECT_DIR$/vendor/symfony/mime" />
+      <path value="$PROJECT_DIR$/vendor/markbaker/matrix" />
+      <path value="$PROJECT_DIR$/vendor/markbaker/complex" />
+      <path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
+      <path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
+      <path value="$PROJECT_DIR$/vendor/symfony/process" />
+      <path value="$PROJECT_DIR$/vendor/symfony/password-hasher" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-grapheme" />
+      <path value="$PROJECT_DIR$/vendor/symfony/console" />
+      <path value="$PROJECT_DIR$/vendor/symfony/dependency-injection" />
+      <path value="$PROJECT_DIR$/vendor/symfony/cache-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/clock" />
+      <path value="$PROJECT_DIR$/vendor/symfony/stimulus-bundle" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-invoker" />
+      <path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
+      <path value="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
+      <path value="$PROJECT_DIR$/vendor/phar-io/version" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
+      <path value="$PROJECT_DIR$/vendor/clue/ndjson-react" />
+      <path value="$PROJECT_DIR$/vendor/react/socket" />
+      <path value="$PROJECT_DIR$/vendor/react/dns" />
+      <path value="$PROJECT_DIR$/vendor/react/child-process" />
+      <path value="$PROJECT_DIR$/vendor/react/cache" />
+      <path value="$PROJECT_DIR$/vendor/react/event-loop" />
+      <path value="$PROJECT_DIR$/vendor/react/promise" />
+      <path value="$PROJECT_DIR$/vendor/react/stream" />
+      <path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
+      <path value="$PROJECT_DIR$/vendor/runtime/frankenphp-symfony" />
+      <path value="$PROJECT_DIR$/vendor/twig/twig" />
+      <path value="$PROJECT_DIR$/vendor/twig/intl-extra" />
+      <path value="$PROJECT_DIR$/vendor/thecodingmachine/phpstan-safe-rule" />
+      <path value="$PROJECT_DIR$/vendor/thecodingmachine/safe" />
+      <path value="$PROJECT_DIR$/vendor/twig/extra-bundle" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
+      <path value="$PROJECT_DIR$/vendor/maennchen/zipstream-php" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/version" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/type" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/environment" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/cli-parser" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/diff" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/complexity" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/lines-of-code" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
       <path value="$PROJECT_DIR$/vendor/sentry/sentry" />
       <path value="$PROJECT_DIR$/vendor/sentry/sentry-symfony" />
-      <path value="$PROJECT_DIR$/vendor/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/jean85/pretty-package-versions" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/sql-formatter" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/collections" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/deprecations" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-fixtures-bundle" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/event-manager" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/orm" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/dbal" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/lexer" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/persistence" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-migrations-bundle" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/data-fixtures" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/migrations" />
+      <path value="$PROJECT_DIR$/vendor/evenement/evenement" />
+      <path value="$PROJECT_DIR$/vendor/stof/doctrine-extensions-bundle" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php84" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php85" />
+      <path value="$PROJECT_DIR$/vendor/symfony/dom-crawler" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/git-state" />
+      <path value="$PROJECT_DIR$/vendor/symfony/browser-kit" />
-      <path value="$PROJECT_DIR$/vendor/ergebnis/agent-detector" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-deepclone" />
     </include_path>
   </component>
   <component name="PhpInterpreters">
     <interpreters>
-      <interpreter id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" name="Compose PHP" home="docker-compose://DATA" auto="false" debugger_id="php.debugger.XDebug">
+      <interpreter id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" name="Compose PHP 8.4" 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>
@@ -223,15 +217,15 @@
   </component>
   <component name="PhpInterpretersPhpInfoCache">
     <phpInfoCache>
-      <interpreter name="Compose PHP">
+      <interpreter name="Compose PHP 8.4">
-        <phpinfo binary_type="PHP" php_cgi="/usr/local/bin/php-cgi" php_cli="/usr/local/bin/php" path_separator=":" version="8.5.2">
+        <phpinfo binary_type="PHP" php_cgi="/usr/local/bin/php-cgi" php_cli="/usr/local/bin/php" path_separator=":" version="8.4.8">
-          <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>
+          <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>
           <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.5.0">
+            <debugger_info debugger="xdebug" debugger_version="3.4.3">
               <debug_extensions />
             </debugger_info>
           </debuggers>
@@ -256,7 +250,6 @@
             <extension name="iconv" />
             <extension name="intl" />
             <extension name="json" />
-            <extension name="lexbor" />
             <extension name="libxml" />
             <extension name="mbstring" />
             <extension name="mysqlnd" />
@@ -272,7 +265,7 @@
             <extension name="sqlite3" />
             <extension name="standard" />
             <extension name="tokenizer" />
-            <extension name="uri" />
+            <extension name="uuid" />
             <extension name="xdebug" />
             <extension name="xml" />
             <extension name="xmlreader" />
@@ -285,108 +278,6 @@
     </phpInfoCache>
   </component>
   <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" />

.idea/sqldialects.xml

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

.junie/AGENTS.md

@@ -1,82 +0,0 @@
-# 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

@@ -25,15 +25,7 @@ return new Config()
         'no_unreachable_default_argument_value' => true,
         'no_useless_else' => true,
         'no_useless_return' => 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,

Dockerfile

@@ -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@3.5.0 \
+		xdebug/xdebug@3.5.0alpha3 \
 	;
 
 COPY --link frankenphp/conf.d/20-app.dev.ini $PHP_INI_DIR/app.conf.d/
@@ -87,10 +87,12 @@ 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.* ./
@@ -107,6 +109,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

@@ -14,9 +14,7 @@ exec *args:
 shell:
     @docker compose exec php bash
 
-[no-exit-message]
+bash: shell
-shell-run:
-    @docker compose run --rm php bash
 
 migrate: up
     docker compose run --rm php bin/console doctrine:migrations:migrate --no-interaction
@@ -25,7 +23,7 @@ fixtures:
     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 nl
+    docker compose exec php bin/console translation:extract --force --format=xliff --sort=asc --clean nl
 
 fix-cs:
     docker compose exec php vendor/bin/php-cs-fixer fix
@@ -37,9 +35,6 @@ 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
@@ -50,9 +45,3 @@ reload-tests:
     @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

LICENSE

@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.

assets/backoffice.js

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

assets/bootstrap.js

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

assets/controllers.json

@@ -3,10 +3,7 @@
         "@symfony/ux-turbo": {
             "turbo-core": {
                 "enabled": false,
-                "fetch": "eager",
+                "fetch": "eager"
-                "autoimport": {
-                    "@symfony/ux-turbo/dist/mercure_stream_source_element.js": true
-                }
             },
             "mercure-turbo-stream": {
                 "enabled": false,

assets/controllers/bo/quiz_controller.js

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

assets/controllers/csrf_protection_controller.js

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

assets/quiz.js

@@ -1,4 +1,6 @@
-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

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

compose.build.yaml

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

compose.override.yaml

@@ -1,4 +1,3 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/compose-spec/compose-go/master/schema/compose-spec.json
 # Development environment override
 services:
   php:
@@ -61,7 +60,7 @@ services:
     image: axllent/mailpit
     ports:
       - "1025"
-      - "8025:8025"
+      - "8025"
     environment:
       MP_SMTP_AUTH_ACCEPT_ANY: 1
       MP_SMTP_AUTH_ALLOW_INSECURE: 1

compose.prod.yaml

@@ -1,4 +1,3 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/compose-spec/compose-go/master/schema/compose-spec.json
 # Production environment override
 services:
   php:
@@ -10,8 +9,6 @@ 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,4 +1,3 @@
-# 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

@@ -9,63 +9,65 @@
         "php": ">=8.5",
         "ext-ctype": "*",
         "ext-iconv": "*",
-        "doctrine/dbal": "^4.4.3",
+        "doctrine/dbal": "^4.3.4",
-        "doctrine/doctrine-bundle": "^3.2.2",
+        "doctrine/doctrine-bundle": "^3.0",
-        "doctrine/doctrine-migrations-bundle": "^4.0",
+        "doctrine/doctrine-migrations-bundle": "^3.7.0",
-        "doctrine/orm": "^3.6.2",
+        "doctrine/orm": "^3.5.7",
-        "martin-georgiev/postgresql-for-doctrine": "^4.4",
+        "martin-georgiev/postgresql-for-doctrine": "^3.6.2",
-        "phpdocumentor/reflection-docblock": "^6.0.3",
+        "phpdocumentor/reflection-docblock": "^5.6.4",
-        "phpoffice/phpspreadsheet": "^5.5",
+        "phpoffice/phpspreadsheet": "^5.3",
-        "phpstan/phpdoc-parser": "^2.3.2",
+        "phpstan/phpdoc-parser": "^2.3",
-        "sentry/sentry-symfony": "^5.9.0",
+        "runtime/frankenphp-symfony": "^0.2.0",
-        "stof/doctrine-extensions-bundle": "^1.15.3",
+        "sentry/sentry-symfony": "^5.6",
-        "symfony/asset": "8.1.*",
+        "stof/doctrine-extensions-bundle": "^1.14",
-        "symfony/asset-mapper": "8.1.*",
+        "symfony/asset": "7.4.*",
-        "symfony/brevo-mailer": "8.1.*",
+        "symfony/asset-mapper": "7.4.*",
-        "symfony/console": "8.1.*",
+        "symfony/brevo-mailer": "7.4.*",
-        "symfony/dotenv": "8.1.*",
+        "symfony/console": "7.4.*",
-        "symfony/flex": "^2.11.0",
+        "symfony/dotenv": "7.4.*",
-        "symfony/form": "8.1.*",
+        "symfony/flex": "^2.10.0",
-        "symfony/framework-bundle": "8.1.*",
+        "symfony/form": "7.4.*",
-        "symfony/mailer": "8.1.*",
+        "symfony/framework-bundle": "7.4.*",
-        "symfony/property-access": "8.1.*",
+        "symfony/mailer": "7.4.*",
-        "symfony/property-info": "8.1.*",
+        "symfony/property-access": "7.4.*",
-        "symfony/runtime": "8.1.*",
+        "symfony/property-info": "7.4.*",
-        "symfony/security-bundle": "8.1.*",
+        "symfony/runtime": "7.4.*",
-        "symfony/security-csrf": "8.1.*",
+        "symfony/security-bundle": "7.4.*",
-        "symfony/serializer": "8.1.*",
+        "symfony/security-csrf": "7.4.*",
-        "symfony/translation": "8.1.*",
+        "symfony/serializer": "7.4.*",
-        "symfony/twig-bundle": "8.1.*",
+        "symfony/translation": "7.4.*",
-        "symfony/uid": "8.1.*",
+        "symfony/twig-bundle": "7.4.*",
-        "symfony/ux-turbo": "^3.1",
+        "symfony/uid": "7.4.*",
-        "symfony/validator": "8.1.*",
+        "symfony/ux-turbo": "^2.31.0",
-        "symfony/yaml": "8.1.*",
+        "symfony/validator": "7.4.*",
-        "symfonycasts/sass-bundle": "^0.10",
+        "symfony/yaml": "7.4.*",
-        "symfonycasts/verify-email-bundle": "^1.18.0",
+        "symfonycasts/sass-bundle": "^0.8.3",
-        "thecodingmachine/safe": "^3.4.0",
+        "symfonycasts/verify-email-bundle": "^1.17.4",
-        "twig/extra-bundle": "^3.24.0",
+        "thecodingmachine/safe": "^3.3.0",
-        "twig/intl-extra": "^3.24.0",
+        "twig/extra-bundle": "^3.22.1",
-        "twig/twig": "^3.27.1"
+        "twig/intl-extra": "^3.22.1",
+        "twig/twig": "^3.22.0"
     },
     "require-dev": {
-        "dama/doctrine-test-bundle": "^8.6",
+        "dama/doctrine-test-bundle": "^8.4",
-        "doctrine/doctrine-fixtures-bundle": "^4.3.1",
+        "doctrine/doctrine-fixtures-bundle": "^4.3",
-        "friendsofphp/php-cs-fixer": "^3.94.2",
+        "friendsofphp/php-cs-fixer": "^3.90.0",
         "phpstan/extension-installer": "^1.4.3",
-        "phpstan/phpstan": "^2.1.42",
+        "phpstan/phpstan": "^2.1.32",
-        "phpstan/phpstan-doctrine": "^2.0.20",
+        "phpstan/phpstan-doctrine": "^2.0.11",
-        "phpstan/phpstan-phpunit": "^2.0.16",
+        "phpstan/phpstan-phpunit": "^2.0.8",
-        "phpstan/phpstan-symfony": "^2.0.15",
+        "phpstan/phpstan-symfony": "^2.0.8",
-        "phpunit/phpunit": "^13.0.5",
+        "phpunit/phpunit": "^12.4.4",
-        "rector/rector": "^2.3.9",
+        "rector/rector": "^2.2.9",
-        "symfony/browser-kit": "8.1.*",
+        "roave/security-advisories": "dev-latest",
-        "symfony/css-selector": "8.1.*",
+        "symfony/browser-kit": "7.4.*",
-        "symfony/maker-bundle": "^1.67.0",
+        "symfony/css-selector": "7.4.*",
-        "symfony/phpunit-bridge": "8.1.*",
+        "symfony/maker-bundle": "^1.65.0",
-        "symfony/stopwatch": "8.1.*",
+        "symfony/phpunit-bridge": "7.4.*",
-        "symfony/web-profiler-bundle": "8.1.*",
+        "symfony/stopwatch": "7.4.*",
+        "symfony/web-profiler-bundle": "7.4.*",
         "thecodingmachine/phpstan-safe-rule": "^1.4.3",
-        "vincentlanglet/twig-cs-fixer": "^4.0.0"
+        "vincentlanglet/twig-cs-fixer": "^3.11.0"
     },
     "config": {
         "allow-plugins": {
@@ -120,7 +122,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "8.1.*",
+            "require": "7.4.*",
             "docker": true
         }
     }

config/packages/doctrine.yaml

@@ -17,15 +17,12 @@ doctrine:
     
     
     orm:
+        enable_native_lazy_objects: true
         validate_xml_mapping: true
         naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
         identity_generation_preferences:
             Doctrine\DBAL\Platforms\PostgreSQLPlatform: identity
         auto_mapping: true
-        filters:
-            softdeleteable:
-                class: Gedmo\SoftDeleteable\Filter\SoftDeleteableFilter
-                enabled: true
         mappings:
             Tvdt:
                 type: attribute
@@ -33,6 +30,8 @@ doctrine:
                 dir: '%kernel.project_dir%/src/Entity'
                 prefix: 'Tvdt\Entity'
                 alias: Tvdt
+        controller_resolver:
+            auto_mapping: false
 
 when@test:
     doctrine:

config/packages/maker.yaml

@@ -1,6 +0,0 @@
-# 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: '%env(DEFAULT_URI)%'
+    #default_uri: http://localhost
 
 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:
-            # Ensure dev tools and static assets are always allowed
+            pattern: ^/(_(profiler|wdt)|css|images|js)/
-            pattern: ^/(_profiler|_wdt|assets|build)/
             security: false
         main:
             lazy: true
@@ -24,10 +24,17 @@ security:
                 default_target_path: tvdt_backoffice_index
             logout:
                 path: tvdt_login_logout
-            remember_me:
+                # where to redirect after logout
-                secret: '%kernel.secret%'
+                # target: tvdt_any_route
-                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 }
@@ -35,8 +42,10 @@ security:
 when@test:
     security:
         password_hashers:
-            # Password hashers are resource-intensive by design to ensure security.
+            # By default, password hashers are resource intensive and take time. This is
-            # In tests, it's safe to reduce their cost to improve performance.
+            # important to generate secure password hashes. In tests however, secure hashes
+            # 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

@@ -8,10 +8,9 @@ when@prod:
             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/integrations/monolog/
+#        # https://docs.sentry.io/platforms/php/guides/symfony/#monolog-integration
 #        register_error_listener: false
 #        register_error_handler: false
 #
@@ -20,21 +19,18 @@ when@prod:
 #            # Use this only if you don't want to use structured logging and instead receive
 #            # certain log levels as errors.  
 #            sentry:
-#                type: service
+#                type: sentry
-#                id: Sentry\Monolog\Handler
+#                level: !php/const Monolog\Logger::ERROR
+#                hub_id: Sentry\State\HubInterface
+#                fill_extra_context: true # Enables sending monolog context to Sentry
+#                process_psr_3_messages: false # Disables the resolution of PSR-3 placeholders
 #
 #            # Use this for structured log integration
 #            sentry_logs:
 #                type: service
 #                id: Sentry\SentryBundle\Monolog\LogsHandler
 #
-#    # Enable one of the two services below, depending on your choice above
 #    services:
-#        Sentry\Monolog\Handler:
-#            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

@@ -5,4 +5,3 @@ stof_doctrine_extensions:
     orm:
         default:
             timestampable: true
-            softdeleteable: true

config/packages/symfonycasts_sass.yaml

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

config/packages/verify_email.yaml

@@ -1,2 +0,0 @@
-symfonycasts_verify_email:
-    lifetime: 604800 # 1 week in seconds

config/routes.yaml

@@ -1,11 +1,5 @@
-# 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: routing.controllers
+    resource:
+        path: ../src/Controller/
+        namespace: Tvdt\Controller
+    type: attribute

config/services.yaml

@@ -1,8 +1,5 @@
-# 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
@@ -25,3 +22,13 @@ services:
     
     # add more service definitions when explicit configuration is needed
     # please note that last definitions always *replace* previous ones
+
+when@prod:
+    services:
+        Tvdt\:
+            resource: '../src/'
+            exclude:
+                - '../src/DependencyInjection/'
+                - '../src/Entity/'
+                - '../src/Kernel.php'
+                - '../src/DataFixtures'

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

@@ -0,0 +1,4 @@
+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.8',
+        'version' => '5.3.6',
     ],
     '@popperjs/core' => [
         'version' => '2.11.8',
     ],
     'bootstrap/dist/css/bootstrap.min.css' => [
-        'version' => '5.3.8',
+        'version' => '5.3.6',
         'type' => 'css',
     ],
     '@hotwired/stimulus' => [
         'version' => '3.2.2',
     ],
+    '@symfony/stimulus-bundle' => [
+        'path' => './vendor/symfony/stimulus-bundle/assets/dist/loader.js',
+    ],
     '@hotwired/turbo' => [
-        'version' => '8.0.23',
+        'version' => '7.3.0',
     ],
 ];

migrations/Version20260125191247.php

@@ -1,29 +0,0 @@
-<?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

@@ -1,29 +0,0 @@
-<?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

@@ -1,32 +0,0 @@
-<?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');
-    }
-}

migrations/Version20260523095205.php

@@ -1,34 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20260523095205 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add soft-delete support (deleted_at columns) and rename elimination.created to created_at';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE elimination ADD deleted_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
-        $this->addSql('ALTER TABLE elimination RENAME COLUMN created TO created_at');
-        $this->addSql('ALTER TABLE given_answer ADD deleted_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
-        $this->addSql('ALTER TABLE quiz_candidate ADD deleted_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE elimination DROP deleted_at');
-        $this->addSql('ALTER TABLE elimination RENAME COLUMN created_at TO created');
-        $this->addSql('ALTER TABLE given_answer DROP deleted_at');
-        $this->addSql('ALTER TABLE quiz_candidate DROP deleted_at');
-    }
-}

migrations/Version20260523095302.php

@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20260523095302 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add updated_at column to elimination table and set it to created_at';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE elimination ADD updated_at TIMESTAMP(0) WITHOUT TIME ZONE');
-        $this->addSql('ALTER TABLE elimination ALTER created_at TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        $this->addSql('UPDATE elimination SET updated_at = created_at');
-        $this->addSql('ALTER TABLE elimination ALTER updated_at SET NOT NULL');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE elimination DROP updated_at');
-        $this->addSql('ALTER TABLE elimination ALTER created_at TYPE TIMESTAMP(0) WITH TIME ZONE');
-    }
-}

migrations/Version20260524135246.php

@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20260524135246 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add unique constraint for quiz_candidate with deleted_at filter';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('DROP INDEX uniq_ced2ffa291bd8781853cd175');
-        $this->addSql('CREATE UNIQUE INDEX UNIQ_CED2FFA291BD8781853CD175 ON quiz_candidate (candidate_id, quiz_id) WHERE (deleted_at IS NULL)');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('DROP INDEX UNIQ_CED2FFA291BD8781853CD175');
-        $this->addSql('CREATE UNIQUE INDEX uniq_ced2ffa291bd8781853cd175 ON quiz_candidate (candidate_id, quiz_id)');
-    }
-}

phpstan.dist.neon

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

src/Controller/Backoffice/BackofficeController.php

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

src/Controller/Backoffice/PrepareEliminationController.php

@@ -10,7 +10,6 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Routing\Requirement\Requirement;
-use Symfony\Component\Security\Http\Attribute\IsCsrfTokenValid;
 use Tvdt\Controller\AbstractController;
 use Tvdt\Entity\Elimination;
 use Tvdt\Entity\Quiz;
@@ -19,14 +18,12 @@ use Tvdt\Factory\EliminationFactory;
 
 final class PrepareEliminationController extends AbstractController
 {
-    public function __construct(private readonly EliminationFactory $eliminationFactory, private readonly EntityManagerInterface $em) {}
+    public function __construct(private readonly EliminationFactory $eliminationFactory) {}
 
-    #[IsCsrfTokenValid('prepare_elimination')]
     #[Route(
         '/backoffice/season/{seasonCode:season}/quiz/{quiz}/elimination/prepare',
         name: 'tvdt_prepare_elimination',
         requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID],
-        methods: ['POST'],
     )]
     public function index(Season $season, Quiz $quiz): RedirectResponse
     {
@@ -35,26 +32,22 @@ final class PrepareEliminationController extends AbstractController
         return $this->redirectToRoute('tvdt_prepare_elimination_view', ['elimination' => $elimination->id]);
     }
 
-    #[IsCsrfTokenValid('prepare_elimination', methods: ['POST'])]
     #[Route(
         '/backoffice/elimination/{elimination}',
         name: 'tvdt_prepare_elimination_view',
         requirements: ['elimination' => Requirement::UUID],
-        methods: ['GET', 'POST'],
     )]
-    public function viewElimination(Elimination $elimination, Request $request): Response
+    public function viewElimination(Elimination $elimination, Request $request, EntityManagerInterface $em): Response
     {
-        if ($request->isMethod('POST')) {
+        if ('POST' === $request->getMethod()) {
             $elimination->updateFromInputBag($request->request);
-            $this->em->flush();
+            $em->flush();
 
             if ($request->request->getBoolean('start')) {
                 return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);
             }
 
             $this->addFlash('success', 'Elimination updated');
-
-            return $this->redirectToRoute('tvdt_prepare_elimination_view', ['elimination' => $elimination->id]);
         }
 
         return $this->render('backoffice/prepare_elimination/index.html.twig', [

src/Controller/Backoffice/QuizController.php

@@ -9,18 +9,14 @@ 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\IsCsrfTokenValid;
 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\QuizCandidateRepository;
@@ -35,7 +31,6 @@ class QuizController extends AbstractController
         private readonly QuizRepository $quizRepository,
         private readonly TranslatorInterface $translator,
         private readonly QuizCandidateRepository $quizCandidateRepository,
-        private readonly EntityManagerInterface $em,
     ) {}
 
     #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
@@ -46,214 +41,23 @@ 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,
+            'quiz' => $quiz,
-            '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,
-            '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',
-        ]);
-    }
-
-    #[IsCsrfTokenValid('candidate_answer')]
-    #[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,
-        ]);
-    }
-
-    #[IsCsrfTokenValid('enable_quiz')]
     #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
     #[Route(
         '/backoffice/season/{seasonCode:season}/quiz/{quiz}/enable',
         name: 'tvdt_backoffice_enable',
         requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID.'|null'],
-        methods: ['POST'],
     )]
-    public function enableQuiz(Season $season, ?Quiz $quiz): RedirectResponse
+    public function enableQuiz(Season $season, ?Quiz $quiz, EntityManagerInterface $em): RedirectResponse
     {
         $season->activeQuiz = $quiz;
-        $this->em->flush();
+        $em->flush();
 
         if ($quiz instanceof Quiz) {
             return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $season->seasonCode, 'quiz' => $quiz->id]);
@@ -262,13 +66,11 @@ class QuizController extends AbstractController
         return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->seasonCode]);
     }
 
-    #[IsCsrfTokenValid('clear_quiz')]
     #[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
     #[Route(
         '/backoffice/quiz/{quiz}/clear',
         name: 'tvdt_backoffice_quiz_clear',
         requirements: ['quiz' => Requirement::UUID],
-        methods: ['POST'],
     )]
     public function clearQuiz(Quiz $quiz): RedirectResponse
     {
@@ -282,13 +84,11 @@ class QuizController extends AbstractController
         return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->season->seasonCode, 'quiz' => $quiz->id]);
     }
 
-    #[IsCsrfTokenValid('delete_quiz')]
     #[IsGranted(SeasonVoter::DELETE, subject: 'quiz')]
     #[Route(
         '/backoffice/quiz/{quiz}/delete',
         name: 'tvdt_backoffice_quiz_delete',
         requirements: ['quiz' => Requirement::UUID],
-        methods: ['POST'],
     )]
     public function deleteQuiz(Quiz $quiz): RedirectResponse
     {
@@ -299,68 +99,22 @@ class QuizController extends AbstractController
         return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $quiz->season->seasonCode]);
     }
 
-    #[IsCsrfTokenValid('candidate_correction')]
     #[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
     #[Route(
         '/backoffice/quiz/{quiz}/candidate/{candidate}/modify_correction',
         name: 'tvdt_backoffice_modify_correction',
         requirements: ['quiz' => Requirement::UUID, 'candidate' => Requirement::UUID],
-        methods: ['POST'],
     )]
     public function modifyCorrection(Quiz $quiz, Candidate $candidate, Request $request): RedirectResponse
     {
+        if (!$request->isMethod('POST')) {
+            throw new MethodNotAllowedHttpException(['POST']);
+        }
+
         $corrections = (float) $request->request->get('corrections');
 
         $this->quizCandidateRepository->setCorrectionsForCandidate($quiz, $candidate, $corrections);
 
         return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->season->seasonCode, 'quiz' => $quiz->id]);
     }
-
-    #[IsCsrfTokenValid('candidate_penalty')]
-    #[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],
-        methods: ['POST'],
-    )]
-    public function modifyPenalty(Quiz $quiz, Candidate $candidate, Request $request): RedirectResponse
-    {
-        $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]);
-    }
-
-    #[IsCsrfTokenValid('toggle_candidate')]
-    #[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: ['POST'],
-    )]
-    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/EliminationController.php

@@ -55,7 +55,7 @@ final class EliminationController extends AbstractController
         $candidate = $this->candidateRepository->getCandidateByHash($elimination->quiz->season, $candidateHash);
         if (!$candidate instanceof Candidate) {
             $this->addFlash(FlashType::Warning,
-                t('Could not find candidate with name {name}', ['name' => Base64::base64UrlDecode($candidateHash)])->trans($this->translator),
+                t('Cound not find candidate with name %name%', ['%name%' => Base64::base64UrlDecode($candidateHash)])->trans($this->translator),
             );
 
             return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);
@@ -64,7 +64,7 @@ final class EliminationController extends AbstractController
         $screenColour = $elimination->getScreenColour($candidate->name);
 
         if (null === $screenColour) {
-            $this->addFlash(FlashType::Warning, $this->translator->trans('Could not find candidate with name {name} in elimination.', ['name' => $candidate->name]));
+            $this->addFlash(FlashType::Warning, $this->translator->trans('Cound not find candidate with name %name% in elimination.', ['%name%' => $candidate->name]));
 
             return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);
         }

src/Controller/LoginController.php

@@ -8,7 +8,6 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Attribute\AsController;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Tvdt\Enum\FlashType;
@@ -21,10 +20,6 @@ final class LoginController extends AbstractController
     #[Route(path: '/login', name: 'tvdt_login_login')]
     public function login(): Response
     {
-        if ($this->getUser() instanceof UserInterface) {
-            return $this->redirectToRoute('tvdt_backoffice_index');
-        }
-
         // get the login error if there is one
         $error = $this->authenticationUtils->getLastAuthenticationError();
         // last username entered by the user

src/Controller/QuizController.php

@@ -8,8 +8,8 @@ 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\Component\Security\Http\Attribute\IsCsrfTokenValid;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Tvdt\Entity\Answer;
 use Tvdt\Entity\Candidate;
@@ -71,12 +71,10 @@ final class QuizController extends AbstractController
         return $this->render('quiz/enter_name.twig', ['season' => $season, 'form' => $form]);
     }
 
-    #[IsCsrfTokenValid('question', tokenKey: 'token', methods: ['POST'])]
     #[Route(
         path: '/{seasonCode:season}/{nameHash}',
         name: 'tvdt_quiz_quiz_page',
         requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'nameHash' => self::CANDIDATE_HASH_REGEX],
-        methods: ['GET', 'POST'],
     )]
     public function quizPage(
         Season $season,
@@ -99,35 +97,19 @@ final class QuizController extends AbstractController
             return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->seasonCode]);
         }
 
-        if ($request->isMethod('POST')) {
+        if ('POST' === $request->getMethod()) {
             // 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) {
-                $this->addFlash(FlashType::Danger, $this->translator->trans('Please select an answer'));
+                throw new BadRequestHttpException('Invalid Answer ID');
-
-                return $this->redirectToRoute('tvdt_quiz_quiz_page', ['seasonCode' => $season->seasonCode, 'nameHash' => $nameHash]);
-            }
-
-            if ($answer->question !== $this->questionRepository->findNextQuestionForCandidate($candidate)) {
-                $this->addFlash(FlashType::Danger, $this->translator->trans('You cannot answer this question'));
-
-                return $this->redirectToRoute('tvdt_quiz_quiz_page', ['seasonCode' => $season->seasonCode, 'nameHash' => $nameHash]);
             }
 
             $givenAnswer = new GivenAnswer($candidate, $answer->question->quiz, $answer);
             $this->entityManager->persist($givenAnswer);
             $this->entityManager->flush();
 
-            // end of extracting saving answer logic
+            // end of extarcting saving answer logic
             return $this->redirectToRoute('tvdt_quiz_quiz_page', ['seasonCode' => $season->seasonCode, 'nameHash' => $nameHash]);
         }
 
@@ -141,14 +123,7 @@ final class QuizController extends AbstractController
             return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->seasonCode]);
         }
 
-        $result = $this->quizCandidateRepository->createIfNotExist($quiz, $candidate);
+        $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

@@ -15,7 +15,6 @@ 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;
@@ -25,16 +24,13 @@ use Tvdt\Security\EmailVerifier;
 
 final class RegistrationController extends AbstractController
 {
-    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) {}
+    public function __construct(private readonly EmailVerifier $emailVerifier, private readonly TranslatorInterface $translator, private readonly UserPasswordHasherInterface $userPasswordHasher, private readonly Security $security, private readonly LoggerInterface $logger, private readonly UserRepository $userRepository) {}
 
     #[Route('/register', name: 'tvdt_register')]
     public function register(
         Request $request,
+        EntityManagerInterface $entityManager,
     ): Response {
-        if ($this->getUser() instanceof UserInterface) {
-            return $this->redirectToRoute('tvdt_backoffice_index');
-        }
-
         $user = new User();
         $form = $this->createForm(RegistrationFormType::class, $user);
         $form->handleRequest($request);
@@ -45,8 +41,8 @@ final class RegistrationController extends AbstractController
 
             $user->password = $this->userPasswordHasher->hashPassword($user, $plainPassword);
 
-            $this->entityManager->persist($user);
+            $entityManager->persist($user);
-            $this->entityManager->flush();
+            $entityManager->flush();
 
             try {
                 // generate a signed url and email it to the user

src/DataFixtures/KrtekFixtures.php

@@ -12,7 +12,6 @@ use Tvdt\Entity\Candidate;
 use Tvdt\Entity\Question;
 use Tvdt\Entity\Quiz;
 use Tvdt\Entity\Season;
-use Tvdt\Entity\SeasonSettings;
 
 final class KrtekFixtures extends Fixture implements FixtureGroupInterface
 {
@@ -49,11 +48,6 @@ final class KrtekFixtures extends Fixture implements FixtureGroupInterface
         $season->activeQuiz = $quiz1;
         $season->addQuiz($this->createQuiz2($season));
 
-        \assert($season->settings instanceof SeasonSettings);
-
-        $season->settings->confirmAnswers = true;
-        $season->settings->showNumbers = true;
-
         $manager->flush();
 
         $this->addReference(self::KRTEK_SEASON, $season);

src/DataFixtures/TestFixtures.php

@@ -9,6 +9,7 @@ use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
+use Tvdt\DataFixtures\KrtekFixtures;
 use Tvdt\Entity\Season;
 use Tvdt\Entity\User;
 

src/Dto/Result.php

@@ -13,7 +13,6 @@ 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 implements \Stringable
+class Answer
 {
     #[ORM\Column(type: UuidType::NAME)]
     #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
@@ -57,9 +57,4 @@ class Answer implements \Stringable
     {
         $this->candidates->removeElement($candidate);
     }
-
-    public function __toString(): string
-    {
-        return $this->text;
-    }
 }

src/Entity/Elimination.php

@@ -7,20 +7,15 @@ namespace Tvdt\Entity;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
-use Gedmo\SoftDeleteable\Traits\SoftDeleteableEntity;
-use Gedmo\Timestampable\Traits\TimestampableEntity;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\EliminationRepository;
 
-#[Gedmo\SoftDeleteable]
 #[ORM\Entity(repositoryClass: EliminationRepository::class)]
+#[ORM\HasLifecycleCallbacks]
 class Elimination
 {
-    use SoftDeleteableEntity;
-    use TimestampableEntity;
-
     public const string SCREEN_GREEN = 'green';
 
     public const string SCREEN_RED = 'red';
@@ -35,6 +30,10 @@ 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;
+
     public function __construct(
         #[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
         #[ORM\ManyToOne(inversedBy: 'eliminations')]

src/Entity/GivenAnswer.php

@@ -7,17 +7,13 @@ namespace Tvdt\Entity;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
-use Gedmo\SoftDeleteable\Traits\SoftDeleteableEntity;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\GivenAnswerRepository;
 
-#[Gedmo\SoftDeleteable]
 #[ORM\Entity(repositoryClass: GivenAnswerRepository::class)]
 class GivenAnswer
 {
-    use SoftDeleteableEntity;
-
     #[ORM\Column(type: UuidType::NAME, unique: true)]
     #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
     #[ORM\GeneratedValue(strategy: 'CUSTOM')]

src/Entity/Question.php

@@ -13,7 +13,7 @@ use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\QuestionRepository;
 
 #[ORM\Entity(repositoryClass: QuestionRepository::class)]
-class Question implements \Stringable
+class Question
 {
     #[ORM\Column(type: UuidType::NAME)]
     #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
@@ -54,8 +54,22 @@ class Question implements \Stringable
         return $this;
     }
 
-    public function __toString(): string
+    public function getErrors(): ?string
     {
-        return $this->question ?? '';
+        if (0 === \count($this->answers)) {
+            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

@@ -42,7 +42,7 @@ class Quiz
 
     /** @var Collection<int, Elimination> */
     #[ORM\OneToMany(targetEntity: Elimination::class, mappedBy: 'quiz', cascade: ['persist'], orphanRemoval: true)]
-    #[ORM\OrderBy(['createdAt' => 'DESC'])]
+    #[ORM\OrderBy(['created' => 'DESC'])]
     public private(set) Collection $eliminations;
 
     public function __construct()
@@ -68,115 +68,4 @@ 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

@@ -7,18 +7,14 @@ namespace Tvdt\Entity;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
-use Gedmo\SoftDeleteable\Traits\SoftDeleteableEntity;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\QuizCandidateRepository;
 
-#[Gedmo\SoftDeleteable]
 #[ORM\Entity(repositoryClass: QuizCandidateRepository::class)]
-#[ORM\UniqueConstraint(columns: ['candidate_id', 'quiz_id'], options: ['where' => '(deleted_at IS NULL)'])]
+#[ORM\UniqueConstraint(columns: ['candidate_id', 'quiz_id'])]
 class QuizCandidate
 {
-    use SoftDeleteableEntity;
-
     #[ORM\Column(type: UuidType::NAME, unique: true)]
     #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
     #[ORM\GeneratedValue(strategy: 'CUSTOM')]
@@ -28,15 +24,6 @@ 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;

src/Entity/Season.php

@@ -30,7 +30,6 @@ 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> */
@@ -40,7 +39,6 @@ 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')]

src/Entity/User.php

@@ -89,6 +89,13 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
         return $this->password;
     }
 
+    /** @see UserInterface */
+    public function eraseCredentials(): void
+    {
+        // If you store any temporary, sensitive data on the user, clear it here
+        // $this->plainPassword = null;
+    }
+
     public function addSeason(Season $season): static
     {
         if (!$this->seasons->contains($season)) {

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, 'autocomplete' => 'off'],
+                    'attr' => ['autofocus' => true],
                 ],
             )
         ;

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, 'autocomplete' => 'off'],
+                    'attr' => ['autofocus' => true],
                 ],
             )
         ;

src/Form/RegistrationFormType.php

@@ -15,7 +15,9 @@ 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,16 +17,12 @@ 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,7 +8,9 @@ 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

@@ -11,7 +11,9 @@ use Tvdt\Entity\Candidate;
 use Tvdt\Entity\Season;
 use Tvdt\Helpers\Base64;
 
-/** @extends ServiceEntityRepository<Candidate> */
+/**
+ * @extends ServiceEntityRepository<Candidate>
+ */
 class CandidateRepository extends ServiceEntityRepository
 {
     public function __construct(ManagerRegistry $registry)

src/Repository/EliminationRepository.php

@@ -8,7 +8,9 @@ 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,7 +8,9 @@ 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)

src/Repository/QuestionRepository.php

@@ -9,7 +9,9 @@ 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)
@@ -30,7 +32,6 @@ 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,12 +6,13 @@ 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)
@@ -19,28 +20,14 @@ class QuizCandidateRepository extends ServiceEntityRepository
         parent::__construct($registry, QuizCandidate::class);
     }
 
-    /** @return bool|null true if a new entry was created, false if it already exists, null if candidate is inactive */
+    /** @return bool true if a new entry was created */
-    public function createIfNotExist(Quiz $quiz, Candidate $candidate): ?bool
+    public function createIfNotExist(Quiz $quiz, Candidate $candidate): bool
     {
-        $quizCandidate = $this->findOneBy(['candidate' => $candidate, 'quiz' => $quiz]);
+        if (0 !== $this->count(['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();
 
@@ -57,15 +44,4 @@ 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

@@ -9,12 +9,13 @@ use Doctrine\Persistence\ManagerRegistry;
 use Psr\Log\LoggerInterface;
 use Safe\DateTimeImmutable;
 use Safe\Exceptions\DatetimeException;
-use Symfony\Component\Uid\Uuid;
 use Tvdt\Dto\Result;
 use Tvdt\Entity\Quiz;
 use Tvdt\Exception\ErrorClearingQuizException;
 
-/** @extends ServiceEntityRepository<Quiz> */
+/**
+ * @extends ServiceEntityRepository<Quiz>
+ */
 class QuizRepository extends ServiceEntityRepository
 {
     public function __construct(ManagerRegistry $registry, private readonly LoggerInterface $logger)
@@ -53,7 +54,7 @@ class QuizRepository extends ServiceEntityRepository
         catch (\Throwable $throwable) {
             $this->logger->error($throwable->getMessage());
             $em->rollback();
-            throw new ErrorClearingQuizException(message: $throwable->getMessage(), code: $throwable->getCode(), previous: $throwable);
+            throw new ErrorClearingQuizException(previous: $throwable);
         }
 
         // @codeCoverageIgnoreEnd
@@ -80,86 +81,26 @@ class QuizRepository extends ServiceEntityRepository
                 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,
+                qd.created as start_time,
                 (sum(case when a.isRightAnswer = true then 1 else 0 end) + qd.corrections) as score
             from Tvdt\Entity\Candidate c
             join c.givenAnswers ga
             join ga.answer a
             join c.quizData qd
-            where qd.quiz = :quiz and ga.quiz = :quiz and qd.started is not null
+            where qd.quiz = :quiz and ga.quiz = :quiz
             group by ga.quiz, c.id, qd.id
-            order by score desc, max(ga.created) - qd.started asc
+            order by score desc, max(ga.created) - qd.created asc
             DQL
         )->setParameter('quiz', $quiz)->getResult();
 
-        return array_map(static function (array $row): Result {
+        return array_map(static fn (array $row): Result => new Result(
-            \assert($row['start_time'] instanceof \DateTimeImmutable);
+            id: $row['id'],
-
+            name: $row['name'],
-            return new Result(
+            correct: (int) $row['correct'],
-                id: $row['id'],
+            corrections: $row['corrections'],
-                name: $row['name'],
+            time: $row['start_time']->diff(new DateTimeImmutable($row['end_time'])),
-                correct: (int) $row['correct'],
+            score: $row['score'],
-                corrections: $row['corrections'],
+        ), $result);
-                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,7 +9,9 @@ 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)

src/Repository/SeasonSettingsRepository.php

@@ -8,7 +8,9 @@ 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/Service/QuizSpreadsheetService.php

@@ -95,15 +95,11 @@ class QuizSpreadsheetService
             $arrCounter = 1;
 
             while (true) {
-                try {
+                if (null === $questionArr[$arrCounter]) {
-                    if (null === $questionArr[$arrCounter]) {
+                    if (1 === $answerCounter) {
-                        if (1 === $answerCounter) {
+                        $errors[] = \sprintf('Question %d has no answers', $answerCounter);
-                            $errors[] = \sprintf('Question %d has no answers', $answerCounter);
-                        }
-
-                        break;
                     }
-                } catch (\ErrorException) {
+
                     break;
                 }
 
@@ -134,6 +130,6 @@ class QuizSpreadsheetService
 
     private function isSpreadsheetFile(File $file): bool
     {
-        return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' === $file->getMimeType();
+        return 'xlsx' === $file->getExtension();
     }
 }

symfony.lock

@@ -99,12 +99,12 @@
         ]
     },
     "sentry/sentry-symfony": {
-        "version": "5.8",
+        "version": "5.6",
         "recipe": {
             "repo": "github.com/symfony/recipes-contrib",
             "branch": "main",
             "version": "5.0",
-            "ref": "12f504985eb24e3b20a9e41e0ec7e398798d18f0"
+            "ref": "b6cb4b34429dadecd7187852123be19d628fa37a"
         },
         "files": [
             "config/packages/sentry.yaml"
@@ -184,15 +184,14 @@
         ]
     },
     "symfony/framework-bundle": {
-        "version": "8.0",
+        "version": "7.2",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "7.4",
+            "version": "7.2",
-            "ref": "09f6e081c763a206802674ce0cb34a022f0ffc6d"
+            "ref": "87bcf6f7c55201f345d8895deda46d2adbdbaa89"
         },
         "files": [
-            ".editorconfig",
             "config/packages/cache.yaml",
             "config/packages/framework.yaml",
             "config/preload.php",
@@ -225,14 +224,19 @@
         }
     },
     "symfony/phpunit-bridge": {
-        "version": "8.0",
+        "version": "7.2",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "7.3",
+            "version": "6.3",
-            "ref": "dc13fec96bd527bd399c3c01f0aab915c67fd544"
+            "ref": "a411a0480041243d97382cac7984f7dce7813c08"
         },
-        "files": []
+        "files": [
+            ".env.test",
+            "bin/phpunit",
+            "phpunit.xml.dist",
+            "tests/bootstrap.php"
+        ]
     },
     "symfony/property-info": {
         "version": "7.3",
@@ -247,12 +251,12 @@
         ]
     },
     "symfony/routing": {
-        "version": "8.0",
+        "version": "7.2",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "7.4",
+            "version": "7.0",
-            "ref": "bc94c4fd86f393f3ab3947c18b830ea343e51ded"
+            "ref": "21b72649d5622d8f7da329ffb5afb232a023619d"
         },
         "files": [
             "config/packages/routing.yaml",
@@ -260,12 +264,12 @@
         ]
     },
     "symfony/security-bundle": {
-        "version": "8.0",
+        "version": "7.2",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "7.4",
+            "version": "6.4",
-            "ref": "c42fee7802181cdd50f61b8622715829f5d2335c"
+            "ref": "2ae08430db28c8eb4476605894296c82a642028f"
         },
         "files": [
             "config/packages/security.yaml",
@@ -273,18 +277,18 @@
         ]
     },
     "symfony/stimulus-bundle": {
-        "version": "2.32",
+        "version": "2.26",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "2.24",
+            "version": "2.20",
-            "ref": "3357f2fa6627b93658d8e13baa416b2a94a50c5f"
+            "ref": "3acc494b566816514a6873a89023a35440b6386d"
         },
         "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,16 +2,3 @@
 {% 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,17 +2,9 @@
 
 {% 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 mb-3">
+    <div class="d-flex flex-row align-items-center">
-        <h2 class="mb-0 pe-2">
+        <h2 class="py-2 pe-2">
             {{ is_granted('ROLE_ADMIN') ? 'All Seasons'|trans : 'Your Seasons'|trans }}
         </h2>
         <a class="link" href="{{ path('tvdt_backoffice_season_add') }}">
@@ -20,7 +12,7 @@
         </a>
     </div>
     {% if seasons %}
-        <table class="table table-hover mb-3">
+        <table class="table table-hover">
             <thead>
             <tr>
                 {% if is_granted('ROLE_ADMIN') %}

templates/backoffice/login/login.html.twig

@@ -3,33 +3,39 @@
 {% block title %}Log in{% endblock %}
 
 {% block body %}
-    <form method="post">
+    {% if app.user %}
-        <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>
+            You are logged in as {{ app.user.userIdentifier }}, <a href="{{ path('tvdt_login_logout') }}">Logout</a>
-            <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" checked>
+                <input type="checkbox" name="_remember_me" id="_remember_me" class="form-check-input">
-            <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,21 +1,23 @@
 {% extends 'backoffice/base.html.twig' %}
-
-{% 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: 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">
+        <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>
+            </ol>
+        </nav>
+    </div>
     <div class="row">
         <div class="col-12 col-md-6">
             <form method="post">
-                <input type="hidden" name="_token" value="{{ csrf_token('prepare_elimination') }}">
                 {%~ for candidate, colour in elimination.data %}
                     <div class="row mb-3">
                         <label for="colour-{{ candidate|lower }}" class="col-4 col-form-label">{{ candidate }}</label>
@@ -30,7 +32,7 @@
                         </div>
                     </div>
                 {% endfor %}
-                <div class="btn-group mb-3">
+                <div class="btn-group py-2">
                     <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>
@@ -40,7 +42,7 @@
             </form>
         </div>
         <div class="col-12 col-md-6">
-            <p class="mb-3">{{ 'Help text for preparing elimination'|trans }}</p>
+            <p>Hier kan dus weer wat uitleg komen</p>
         </div>
     </div>
 {% endblock %}

templates/backoffice/quiz.html.twig

@@ -1,36 +1,166 @@
 {% extends 'backoffice/base.html.twig' %}
 
-{% block title %}{{ parent() }}{{ season.name }}{% endblock %}
+{% block title %}{{ parent() }}{{ quiz.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 %}
-    {% set tabs = [
+    <h2 class="py-2">{{ 'Quiz'|trans }}: {{ quiz.season.name }} - {{ quiz.name }}</h2>
-        {id: 'overview', label: 'Overview'|trans, route: 'tvdt_backoffice_quiz_overview'},
+    <div class="py-2 btn-group" data-controller="bo--quiz">
-        {id: 'candidates', label: 'Candidates'|trans, route: 'tvdt_backoffice_quiz_candidates_tab'},
+        <a class="btn btn-primary {% if quiz is same as(season.activeQuiz) %}disabled{% endif %}"
-        {id: 'result', label: 'Results & Elimination'|trans, route: 'tvdt_backoffice_quiz_result'},
+           href="{{ path('tvdt_backoffice_enable', {seasonCode: season.seasonCode, quiz: quiz.id}) }}">{{ 'Make active'|trans }}</a>
-        {id: 'answers', label: 'Answer Mapping'|trans, route: 'tvdt_backoffice_quiz_candidates'},
+        {% if quiz is same as (season.activeQuiz) %}
-    ] %}
+            <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>
 
-    <h2 class="mb-3">{{ 'Quiz'|trans }}: {{ season.name }} - {{ quiz.name }}</h2>
+    <div id="questions">
-    <ul class="nav nav-tabs mb-3">
+        <h4 class="py-2">{{ 'Questions'|trans }}</h4>
-        {% for tab in tabs %}
+        <div class="accordion">
-            <li class="nav-item">
+            {%~ for question in quiz.questions ~%}
-                <a class="nav-link{{ activeTab == tab.id ? ' active' }}" href="{{ path(tab.route, {seasonCode: season.seasonCode, quiz: quiz.id}) }}">
+                <div class="accordion-item">
-                    {{ tab.label }}
+                    <h2 class="accordion-header">
-                </a>
+                        <button class="accordion-button collapsed"
-            </li>
+                                type="button"
-        {% endfor %}
+                                data-bs-toggle="collapse"
-    </ul>
+                                data-bs-target="#question-{{ loop.index0 }}"
-    <div class="pt-3">
+                                aria-controls="question-{{ loop.index0 }}">
-        {{ include(template) }}
+                            {% set questionErrors = question.getErrors %}
+                            {%~ 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

@@ -1,66 +0,0 @@
-<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>

templates/backoffice/quiz/tab_candidates_list.html.twig

@@ -1,52 +0,0 @@
-<h4 class="mb-3">{{ 'Candidates'|trans }}</h4>
-<table class="table table-hover mb-3">
-    <thead>
-        <tr>
-            <th scope="col">{{ 'Name'|trans }}</th>
-            <th scope="col">{{ 'Quiz Status'|trans }}</th>
-            <th scope="col">{{ 'Candidate Status'|trans }}</th>
-            <th scope="col">{{ 'Actions'|trans }}</th>
-        </tr>
-    </thead>
-    <tbody>
-        {% for data in candidateData %}
-            {% set candidate = data.candidate %}
-            {% set quizCandidate = data.quizCandidate %}
-            {% set givenAnswersCount = data.givenAnswersCount %}
-
-            <tr>
-                <td>{{ candidate.name }}</td>
-                <td>
-                    {% if quizCandidate and quizCandidate.started %}
-                        {% if givenAnswersCount >= quiz.questions|length %}
-                            <span class="badge text-bg-success">{{ 'Completed'|trans }}</span>
-                        {% else %}
-                            <span class="badge text-bg-warning">{{ 'In Progress'|trans }} ({{ givenAnswersCount }}/{{ quiz.questions|length }})</span>
-                        {% endif %}
-                    {% else %}
-                        <span class="badge text-bg-secondary">{{ 'Not Started'|trans }}</span>
-                    {% endif %}
-                </td>
-                <td>
-                    {% if quizCandidate == null or quizCandidate.active %}
-                        <span class="badge text-bg-success">{{ 'Active'|trans }}</span>
-                    {% else %}
-                        <span class="badge text-bg-secondary">{{ 'Inactive'|trans }}</span>
-                    {% endif %}
-                </td>
-                <td>
-                    <form action="{{ path('tvdt_backoffice_toggle_candidate', {quiz: quiz.id, candidate: candidate.id}) }}" method="POST">
-                        <input type="hidden" name="_token" value="{{ csrf_token('toggle_candidate') }}">
-                        <button type="submit" class="btn btn-sm btn-outline-secondary">
-                            {% if quizCandidate == null or quizCandidate.active %}
-                                {{ 'Deactivate'|trans }}
-                            {% else %}
-                                {{ 'Activate'|trans }}
-                            {% endif %}
-                        </button>
-                    </form>
-                </td>
-            </tr>
-        {% endfor %}
-    </tbody>
-</table>

templates/backoffice/quiz/tab_overview.html.twig

@@ -1,118 +0,0 @@
-<div data-controller="bo--quiz">
-    <h4 class="mb-3">{{ 'Quick actions'|trans }}</h4>
-    <div class="mb-3 btn-group">
-
-        {% if quiz is same as (season.activeQuiz) %}
-            <form action="{{ path('tvdt_backoffice_enable', {seasonCode: season.seasonCode, quiz: 'null'}) }}" method="POST">
-                <input type="hidden" name="_token" value="{{ csrf_token('enable_quiz') }}">
-                <button type="submit" class="btn btn-secondary rounded-0 rounded-start">
-                    {{ 'Deactivate Quiz'|trans }}
-                </button>
-            </form>
-        {% else %}
-            <form action="{{ path('tvdt_backoffice_enable', {seasonCode: season.seasonCode, quiz: quiz.id}) }}" method="POST">
-                <input type="hidden" name="_token" value="{{ csrf_token('enable_quiz') }}">
-                <button type="submit" class="btn btn-primary rounded-0 rounded-start">
-                    {{ 'Make active'|trans }}
-                </button>
-            </form>
-        {% endif %}
-        <button class="btn btn-danger" data-action="click->bo--quiz#clearQuiz">
-            {{ 'Clear Quiz...'|trans }}
-        </button>
-        <button class="btn btn-danger rounded-0 rounded-end" data-action="click->bo--quiz#deleteQuiz">
-            {{ 'Delete Quiz...'|trans }}
-        </button>
-    </div>
-
-    <h4 class="mb-3">{{ 'Questions'|trans }}</h4>
-    <div class="accordion">
-        {%~ for question in quiz.questions ~%}
-            <div class="accordion-item">
-                <h2 class="accordion-header">
-                    <button class="accordion-button collapsed"
-                            type="button"
-                            data-bs-toggle="collapse"
-                            data-bs-target="#question-{{ loop.index0 }}"
-                            aria-controls="question-{{ loop.index0 }}">
-                        {% set questionError = questionErrors[question.id.toString] ?? null %}
-                        <span
-                            class="badge rounded-pill me-2{% if questionError %} text-bg-danger{% else %} invisible{% endif %}"{% if questionError %} data-bs-toggle="tooltip" title="{{ questionError }}"{% endif %}>!</span>
-                        {{~ 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 }}
-                                    {% if answer.candidates|length > 0 %}
-                                        <small class="text-muted">
-                                            ({{ answer.candidates|map(c => c.name)|join(', ') }})
-                                        </small>
-                                    {% endif %}
-                                </li>
-                            {%~ else %}
-                                {{ 'There are no answers for this question'|trans -}}
-                            {%~ endfor %}
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        {% else %}
-            {{ 'EMPTY'|trans }}
-        {% endfor %}
-    </div>
-
-    {# Modal Clear #}
-    <div class="modal fade" id="clearQuizModal" data-bs-backdrop="static"
-         tabindex="-1"
-         data-bo--quiz-target="clearModal"
-         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 all the eliminations.'|trans }}
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ 'No'|trans }}</button>
-                    <form action="{{ path('tvdt_backoffice_quiz_clear', {quiz: quiz.id}) }}" method="POST">
-                        <input type="hidden" name="_token" value="{{ csrf_token('clear_quiz') }}">
-                        <button type="submit" class="btn btn-danger">{{ 'Yes'|trans }}</button>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    {# Modal Delete #}
-    <div class="modal fade" id="deleteQuizModal" data-bs-backdrop="static"
-         tabindex="-1"
-         data-bo--quiz-target="deleteModal"
-         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>
-                    <form action="{{ path('tvdt_backoffice_quiz_delete', {quiz: quiz.id}) }}" method="POST">
-                        <input type="hidden" name="_token" value="{{ csrf_token('delete_quiz') }}">
-                        <button type="submit" class="btn btn-danger">{{ 'Yes'|trans }}</button>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

templates/backoffice/quiz/tab_result.html.twig

@@ -1,80 +0,0 @@
-<h4 class="mb-3">{{ 'Score'|trans }}</h4>
-<div class="btn-toolbar mb-3" role="toolbar">
-    <div class="btn-group me-2">
-        {# <a class="btn btn-primary">{{ 'Start Elimination'|trans }}</a> #}
-        <form action="{{ path('tvdt_prepare_elimination', {seasonCode: season.seasonCode, quiz: quiz.id}) }}" method="POST">
-            <input type="hidden" name="_token" value="{{ csrf_token('prepare_elimination') }}">
-            <button type="submit" class="btn btn-secondary rounded-0 rounded-start">{{ 'Prepare Custom Elimination'|trans }}</button>
-        </form>
-        {%~ 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.createdAt|format_datetime() }}</a>
-                    </li>
-                {%~ endfor %}
-            </ul>
-        {% endif %}
-    </div>
-</div>
-<p class="mb-3">{{ 'Number of dropouts:'|trans }}  {{ quiz.dropouts }} </p>
-<table class="table table-hover mb-3">
-    <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: 20%" scope="col">{{ 'Penalty'|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}) }}">
-                    <input type="hidden" name="_token" value="{{ csrf_token('candidate_correction') }}">
-                    <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>
-                <form method="post"
-                      action="{{ path('tvdt_backoffice_modify_penalty', {quiz: quiz.id, candidate: candidate.id}) }}">
-                    <input type="hidden" name="_token" value="{{ csrf_token('candidate_penalty') }}">
-                    <div class="row">
-                        <div class="col-8">
-                            <input class="form-control form-control-sm" type="number"
-                                   value="{{ candidate.penaltySeconds }}" step="1"
-                                   name="penalty">
-                        </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="6">{{ 'No results'|trans }}</td>
-        </tr>
-    {% endfor %}
-    </tbody>
-</table>

templates/backoffice/quiz_add.html.twig

@@ -1,19 +1,9 @@
 {% extends 'backoffice/base.html.twig' %}
 
-{% 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">{{ 'Add Quiz'|trans }}</li>
-        </ol>
-    </nav>
-{% endblock %}
-
 {% block body %}
     <div class="row">
         <div class="col-md-6 col-12">
-            <h2 class="mb-3">{{ t('Add a quiz to {name}', {name: season.name})|trans }} </h2>
+            <h2 class="py-2">{{ t('Add a quiz to %name%', {'%name%': season.name})|trans }} </h2>
             {{ form_start(form) }}
             {{ form_row(form.name) }}
             {{ form_row(form.sheet) }}
@@ -21,11 +11,13 @@
             {{ form_end(form) }}
         </div>
         <div class="col-md-6 col-12">
-            <p class="mb-3">
+            <p class="pt-5">
-                {{ 'Help text for adding a quiz'|trans }}
+                Hier kan nog tekst komen met wat uitleg
             </p>
+
         </div>
     </div>
+
 {% endblock %}
 
 {% block title %}

templates/backoffice/season.html.twig

@@ -1,47 +1,37 @@
 {% extends 'backoffice/base.html.twig' %}
 {% 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 active" aria-current="page">{{ season.name }}</li>
-        </ol>
-    </nav>
-{% endblock %}
-
 {% block body %}
-    <h2 class="mb-3">{{ 'Season'|trans }}: {{ season.name }}</h2>
+    <h2 class="py-2">{{ 'Season'|trans }}: {{ season.name }}</h2>
     <div class="row">
         <div class="col-md-6 col-12">
-            <div class="d-flex flex-row align-items-center mb-3">
+            <div class="d-flex flex-row align-items-center">
-                <h4 class="mb-0 pe-2">{{ 'Quizzes'|trans }}</h4>
+                <h4 class="py-2 pe-2">{{ 'Quizzes'|trans }}</h4>
                 <a class="link"
                    href="{{ path('tvdt_backoffice_quiz_add', {seasonCode: season.seasonCode}) }}">{{ 'Add'|trans }}</a>
             </div>
-            <div class="list-group mb-3">
+            <div class="list-group">
                 {% for quiz in season.quizzes %}
                     <a class="list-group-item list-group-item-action{% if season.activeQuiz == quiz %} active{% endif %}"
                        href="{{ path('tvdt_backoffice_quiz', {seasonCode: season.seasonCode, quiz: quiz.id}) }}">{{ quiz.name }}</a>
                 {% else %}
-                    {{ 'No quizzes'|trans }}
+                    No quizzes
                 {% endfor %}
             </div>
         </div>
         <div class="col-md-3 col-12">
-            <div class="d-flex flex-row align-items-center mb-3">
+            <div class="d-flex flex-row align-items-center">
-                <h4 class="mb-0 pe-2">{{ 'Candidates'|trans }}</h4>
+                <h4 class="py-2 pe-2">{{ 'Candidates'|trans }}</h4>
                 <a class="link"
                    href="{{ path('tvdt_backoffice_add_candidates', {seasonCode: season.seasonCode}) }}">{{ 'Add Candidate'|trans }}
                 </a>
             </div>
-            <ul class="mb-3">
+            <ul>
                 {% for candidate in season.candidates %}
                     <li>{{ candidate.name }}</li>{% endfor %}
             </ul>
 
-            <div class="d-flex flex-row align-items-center mb-3">
+            <div class="d-flex flex-row align-items-center">
-                <h4 class="mb-0 pe-2">{{ 'Settings'|trans }}</h4>
+                <h4 class="py-2 pe-2">{{ 'Settings'|trans }}</h4>
             </div>
             {{ form(form) }}
         </div>

templates/backoffice/season_add.html.twig

@@ -1,26 +1,17 @@
 {% extends 'backoffice/base.html.twig' %}
 
-{% 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 active" aria-current="page">{{ 'Create a season'|trans }}</li>
-        </ol>
-    </nav>
-{% endblock %}
-
 {% block body %}
     <div class="row">
         <div class="col-md-6 col-12">
-            <h2 class="mb-3">{{ 'Create a season'|trans }}</h2>
+            <h2 class="py-2">{{ 'Create a season'|trans }}</h2>
             {{ form_start(form) }}
             {{ form_row(form.name) }}
             <button type="submit" class="btn btn-primary">{{ 'Submit'|trans }}</button>
             {{ form_end(form) }}
         </div>
         <div class="col-md-6 col-12">
-            <p class="mb-3">
+            <p class="pt-5">
-                {{ 'Help text for creating a season'|trans }}
+                Hier kan nog tekst komen met wat uitleg
             </p>
         </div>
     </div>