Remove worker config (#70)

* Pre upgrade

* Symfony 8.0

* Update recipe for sentry

* symfony/framework-bundle
recipe

* symfony/phpunut
recipe

* symfony/routing
recipe

* symfony/security
recipe

* symfony/timulus-bundle
recipe

* doctine recipe

.editorconfig

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

.env

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

.env.test

@@ -1,4 +1,3 @@
 # define your env variables for the test env here
 KERNEL_CLASS='Tvdt\Kernel'
 APP_SECRET='$ecretf0rt3st'
-SYMFONY_DEPRECATIONS_HELPER=999999

.gitattributes

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

.github/dependabot.yml

@@ -8,4 +8,8 @@ updates:
   - package-ecosystem: "composer" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
-      interval: "weekly"
+      interval: "daily"
+  - package-ecosystem: "docker"
+    directtory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/ci.yml

@@ -13,6 +13,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+  packages: write
+
 jobs:
   tests:
     name: Tests
@@ -53,21 +57,68 @@ jobs:
         run: docker compose exec -T php bin/console -e test doctrine:database:create
       - name: Run migrations
         run: docker compose exec -T php bin/console -e test doctrine:migrations:migrate --no-interaction
+      - name: Load fixtures
+        run: docker compose exec -T php bin/console -e test doctrine:fixtures:load --no-interaction --group=test
       - name: Run PHPUnit
         run: docker compose exec -T php vendor/bin/phpunit
       - name: Doctrine Schema Validator
         run: docker compose exec -T php bin/console -e test doctrine:schema:validate
-  deploy:
+  
-    name: Deploy
+  build-deploy:
+    name: Build and deploy to ${{ startsWith(github.ref, 'refs/tags/') && 'production' || (github.ref == 'refs/heads/main' && 'acceptance' || '') }}
     environment:
       name: ${{ startsWith(github.ref, 'refs/tags/') && 'production' || (github.ref == 'refs/heads/main' && 'acceptance' || '') }}
       url: ${{ vars.URL }}
     needs: tests
     runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
+    if: (github.ref == 'refs/heads/main' && false) || startsWith(github.ref, 'refs/tags/')
     steps:
-      - shell: bash
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata
+        id: meta
+        run: |
+          REPO_LOWER=$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')
+          if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+            TAG="${GITHUB_REF#refs/tags/}"
+            {
+              echo "tag=$TAG"
+              echo "full_name=ghcr.io/${REPO_LOWER}:$TAG"
+            } >> "$GITHUB_OUTPUT"
+          else
+            SHORT_SHA=$(git rev-parse --short HEAD)
+            {
+              echo "tag=$SHORT_SHA"
+              echo "full_name=ghcr.io/${REPO_LOWER}:$SHORT_SHA"
+            } >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Build and Push Docker images
+        uses: docker/bake-action@v5
+        with:
+          pull: true
+          push: true
+          files: |
+            compose.yaml
+            compose.build.yaml
+          set: |
+            *.cache-from=type=gha,scope=${{github.ref}}
+            *.cache-from=type=gha,scope=refs/heads/main
+            *.cache-to=type=gha,scope=${{github.ref}},mode=max
+            *.tags=${{ steps.meta.outputs.full_name }}
+
+      - name: Trigger Portainer Deployment
+        shell: bash
         env:
           PORTAINER_WEBHOOK: ${{secrets.PORTAINER_WEBHOOK}}
         run: |
-          curl -v -X POST "$PORTAINER_WEBHOOK"
+          curl -v -X POST "$PORTAINER_WEBHOOK"?IMAGE_TAG=${{steps.meta.outputs.tag}} --fail-with-body

.idea/TijdVoorDeTest.iml

@@ -45,7 +45,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/react/socket" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/react/stream" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/rector/rector" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/runtime/frankenphp-symfony" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/cli-parser" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/comparator" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/complexity" />
@@ -116,21 +115,17 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/thecodingmachine/phpstan-safe-rule" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/thecodingmachine/safe" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/twig/twig" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/easycorp/easyadmin-bundle" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/intl" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/mime" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-intl-idn" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/translation" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/ux-twig-component" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/validator" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/twig/extra-bundle" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/twig/html-extra" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/data-fixtures" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/doctrine-fixtures-bundle" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/vincentlanglet/twig-cs-fixer" />
       <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" />
@@ -156,7 +151,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/markbaker/complex" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/markbaker/matrix" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpoffice/phpspreadsheet" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/psr/http-client" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/psr/simple-cache" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/asset-mapper" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/http-client" />
@@ -167,6 +161,10 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/ux-turbo" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-uuid" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/brevo-mailer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/martin-georgiev/postgresql-for-doctrine" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/dama/doctrine-test-bundle" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/gedmo/doctrine-extensions" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/stof/doctrine-extensions-bundle" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

.idea/laravel-idea.xml

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

.idea/php-test-framework.xml

@@ -5,7 +5,7 @@
       <tool tool_name="PHPUnit">
         <cache>
           <versions>
-            <info id="interpreter-96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" version="12.1.2" />
+            <info id="interpreter-96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" version="12.4.1" />
           </versions>
         </cache>
       </tool>

.idea/php.xml

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

.php-cs-fixer.dist.php

@@ -5,13 +5,14 @@ use PhpCsFixer\Config;
 use PhpCsFixer\Finder;
 use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
 
-$finder = (new Finder())
+$finder = new Finder()
     ->in(__DIR__)
     ->exclude('var')
     ->exclude('bin')
+    ->notPath(['config/reference.php'])
 ;
 
-return (new Config())
+return new Config()
     ->setParallelConfig(ParallelConfigFactory::detect())
     ->setRules([
         '@Symfony' => true,
@@ -24,15 +25,16 @@ return (new Config())
         'no_unreachable_default_argument_value' => true,
         'no_useless_else' => true,
         'no_useless_return' => true,
-        'php_unit_strict' => true,
         'phpdoc_line_span' => ['const' => 'single', 'method' => 'single', 'property' => 'single'],
         'phpdoc_order' => true,
         'single_line_empty_body' => true,
         'strict_comparison' => true,
         'strict_param' => true,
+        'ordered_attributes' => true,
+        'heredoc_indentation' => ['indentation' => 'start_plus_one'],
         'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['arguments', 'array_destructuring', 'arrays', 'match', 'parameters']],
-
     ])
     ->setRiskyAllowed(true)
     ->setFinder($finder)
+    ->setUnsupportedPhpVersionAllowed(true)
 ;

Dockerfile

@@ -1,7 +1,7 @@
 #syntax=docker/dockerfile:1
 
 # Versions
-FROM dunglas/frankenphp:1-php8.4 AS frankenphp_upstream
+FROM dunglas/frankenphp:1-php8.5 AS frankenphp_upstream
 
 # The different stages of this Dockerfile are meant to be built into separate images
 # https://docs.docker.com/develop/develop-images/multistage-build/#stop-at-a-specific-build-stage
@@ -32,7 +32,7 @@ RUN set -eux; \
 		opcache \
 		zip \
 		gd \
-		excimer-1.2.3 \
+		excimer \
 	;
 
 # https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
@@ -60,11 +60,19 @@ FROM frankenphp_base AS frankenphp_dev
 
 ENV APP_ENV=dev XDEBUG_MODE=off
 
+# hadolint ignore=DL3008
+RUN apt-get update && apt-get install -y --no-install-recommends \
+	bash-completion \
+	&& rm -rf /var/lib/apt/lists/*
+
+COPY --link frankenphp/console-complete.bash /usr/share/bash-completion/completions/console
+COPY --link frankenphp/composer-complete.bash /usr/share/bash-completion/completions/composer
+
 RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
 
 RUN set -eux; \
 	install-php-extensions \
-		xdebug \
+		xdebug/xdebug@3.5.0 \
 	;
 
 COPY --link frankenphp/conf.d/20-app.dev.ini $PHP_INI_DIR/app.conf.d/
@@ -76,8 +84,9 @@ CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile", "--watch" ]
 # Prod FrankenPHP image
 FROM frankenphp_base AS frankenphp_prod
 
+RUN rm -rf /var/lib/apt/lists/*
+
 ENV APP_ENV=prod
-ENV FRANKENPHP_CONFIG="import worker.Caddyfile"
 
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 
@@ -99,6 +108,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

@@ -1,8 +1,8 @@
-up:
+up *args:
-    docker compose up -d
+    docker compose up -d {{ args }}
 
 down *args:
-    docker compose down {{ args }} --remove-orphans
+    docker compose down --remove-orphans {{ args }}
 
 stop:
     docker compose stop
@@ -20,7 +20,7 @@ migrate: up
     docker compose run --rm php bin/console doctrine:migrations:migrate --no-interaction
 
 fixtures:
-    docker compose exec php bin/console doctrine:fixtures:load --purge-with-truncate --no-interaction
+    docker compose exec php bin/console doctrine:fixtures:load --purge-with-truncate --no-interaction --group=dev
 
 translations:
     docker compose exec php bin/console translation:extract --force --format=xliff --sort=asc --clean nl
@@ -39,3 +39,15 @@ phpstan *args:
 clean:
     docker compose down -v --remove-orphans
     rm -rf vendor var assets/vendor public/assets public/bundles .php-cs-fixer.cache .twig-cs-fixer.cache
+
+reload-tests:
+    @docker compose exec php bin/console --env=test doctrine:database:drop --if-exists --force
+    @docker compose exec php bin/console --env=test doctrine:database:create
+    @docker compose exec php bin/console --env=test doctrine:migrations:migrate -n
+    @docker compose exec php bin/console --env=test doctrine:fixtures:load -n --group=test
+
+trust-cert:
+    sudo security add-trusted-cer -d \
+    -r trustRoot \
+    -k "$HOME/Library/Keychains/login.keychain" \
+    ./frankenphp/data/caddy/pki/authorities/local/root.crt

assets/controllers/csrf_protection_controller.js

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

assets/stimulus_bootstrap.js

@@ -0,0 +1,2 @@
+// register any custom, 3rd party controllers here
+// app.register('some_controller_name', SomeImportedController);

compose.build.yaml

@@ -0,0 +1,5 @@
+services:
+  php:
+    build:
+      context: .
+      target: frankenphp_prod

compose.override.yaml

@@ -15,7 +15,6 @@ services:
       # See https://xdebug.org/docs/all_settings#mode
       XDEBUG_MODE: "${XDEBUG_MODE:-off}"
       MAILER_DSN: "smtp://mailer:1025"
-      PHP_CS_FIXER_IGNORE_ENV: 1
     extra_hosts:
       # Ensure that host.docker.internal is correctly defined on Linux
       - host.docker.internal:host-gateway

compose.prod.yaml

@@ -1,9 +1,7 @@
 # Production environment override
 services:
   php:
-    build:
+    image: ghcr.io/marijndoeve/tijdvoordetest:${IMAGE_TAG}
-      context: .
-      target: frankenphp_prod
     environment:
       APP_SECRET: ${APP_SECRET}
       MERCURE_PUBLISHER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET}

composer.json

@@ -6,64 +6,67 @@
     "minimum-stability": "stable",
     "prefer-stable": true,
     "require": {
-        "php": ">=8.4",
+        "php": ">=8.5",
         "ext-ctype": "*",
         "ext-iconv": "*",
-        "doctrine/dbal": "^4.3.3",
+        "doctrine/dbal": "^4.4.1",
-        "doctrine/doctrine-bundle": "^2.16.2",
+        "doctrine/doctrine-bundle": "^3.2.2",
-        "doctrine/doctrine-migrations-bundle": "^3.4.2",
+        "doctrine/doctrine-migrations-bundle": "^3.7.0",
-        "doctrine/orm": "^3.5.2",
+        "doctrine/orm": "^3.6.2",
-        "easycorp/easyadmin-bundle": "^4.25.1",
+        "martin-georgiev/postgresql-for-doctrine": "^3.7.0",
-        "phpdocumentor/reflection-docblock": "^5.6.3",
+        "phpdocumentor/reflection-docblock": "^5.6.6",
-        "phpoffice/phpspreadsheet": "^5.1",
+        "phpoffice/phpspreadsheet": "^5.4",
-        "phpstan/phpdoc-parser": "^2.3",
+        "phpstan/phpdoc-parser": "^2.3.2",
-        "runtime/frankenphp-symfony": "^0.2.0",
+        "sentry/sentry-symfony": "^5.8.3",
-        "sentry/sentry-symfony": "^5.6",
+        "stof/doctrine-extensions-bundle": "^1.15.3",
-        "symfony/asset": "7.3.*",
+        "symfony/asset": "8.0.*",
-        "symfony/asset-mapper": "7.3.*",
+        "symfony/asset-mapper": "8.0.*",
-        "symfony/brevo-mailer": "7.3.*",
+        "symfony/brevo-mailer": "8.0.*",
-        "symfony/console": "7.3.*",
+        "symfony/console": "8.0.*",
-        "symfony/dotenv": "7.3.*",
+        "symfony/dotenv": "8.0.*",
-        "symfony/flex": "^2.8.2",
+        "symfony/flex": "^2.10.0",
-        "symfony/form": "7.3.*",
+        "symfony/form": "8.0.*",
-        "symfony/framework-bundle": "7.3.*",
+        "symfony/framework-bundle": "8.0.*",
-        "symfony/mailer": "7.3.*",
+        "symfony/mailer": "8.0.*",
-        "symfony/property-access": "7.3.*",
+        "symfony/property-access": "8.0.*",
-        "symfony/property-info": "7.3.*",
+        "symfony/property-info": "8.0.*",
-        "symfony/runtime": "7.3.*",
+        "symfony/runtime": "8.0.*",
-        "symfony/security-bundle": "7.3.*",
+        "symfony/security-bundle": "8.0.*",
-        "symfony/security-csrf": "7.3.*",
+        "symfony/security-csrf": "8.0.*",
-        "symfony/serializer": "7.3.*",
+        "symfony/serializer": "8.0.*",
-        "symfony/twig-bundle": "7.3.*",
+        "symfony/translation": "8.0.*",
-        "symfony/uid": "7.3.*",
+        "symfony/twig-bundle": "8.0.*",
-        "symfony/ux-turbo": "^2.30.0",
+        "symfony/uid": "8.0.*",
-        "symfony/yaml": "7.3.*",
+        "symfony/ux-turbo": "^2.32.0",
+        "symfony/validator": "8.0.*",
+        "symfony/yaml": "8.0.*",
         "symfonycasts/sass-bundle": "^0.8.3",
-        "symfonycasts/verify-email-bundle": "^1.17.4",
+        "symfonycasts/verify-email-bundle": "^1.18.0",
         "thecodingmachine/safe": "^3.3.0",
-        "twig/extra-bundle": "^3.21",
+        "twig/extra-bundle": "^3.23.0",
-        "twig/intl-extra": "^3.21",
+        "twig/intl-extra": "^3.23.0",
-        "twig/twig": "^3.21.1"
+        "twig/twig": "^3.23.0"
     },
     "require-dev": {
-        "doctrine/doctrine-fixtures-bundle": "^4.1",
+        "dama/doctrine-test-bundle": "^8.6",
-        "friendsofphp/php-cs-fixer": "^3.88.2",
+        "doctrine/doctrine-fixtures-bundle": "^4.3.1",
+        "friendsofphp/php-cs-fixer": "^3.93.0",
         "phpstan/extension-installer": "^1.4.3",
-        "phpstan/phpstan": "^2.1.29",
+        "phpstan/phpstan": "^2.1.37",
-        "phpstan/phpstan-doctrine": "^2.0.6",
+        "phpstan/phpstan-doctrine": "^2.0.14",
-        "phpstan/phpstan-phpunit": "^2.0.7",
+        "phpstan/phpstan-phpunit": "^2.0.12",
-        "phpstan/phpstan-symfony": "^2.0.8",
+        "phpstan/phpstan-symfony": "^2.0.12",
-        "phpunit/phpunit": "^12.3.15",
+        "phpunit/phpunit": "^12.5.9",
-        "rector/rector": "^2.1.7",
+        "rector/rector": "^2.3.4",
         "roave/security-advisories": "dev-latest",
-        "symfony/browser-kit": "7.3.*",
+        "symfony/browser-kit": "8.0.*",
-        "symfony/css-selector": "7.3.*",
+        "symfony/css-selector": "8.0.*",
-        "symfony/maker-bundle": "^1.64.0",
+        "symfony/maker-bundle": "^1.65.1",
-        "symfony/phpunit-bridge": "7.3.*",
+        "symfony/phpunit-bridge": "8.0.*",
-        "symfony/stopwatch": "7.3.*",
+        "symfony/stopwatch": "8.0.*",
-        "symfony/web-profiler-bundle": "7.3.*",
+        "symfony/web-profiler-bundle": "8.0.*",
-        "thecodingmachine/phpstan-safe-rule": "^1.4.1",
+        "thecodingmachine/phpstan-safe-rule": "^1.4.3",
-        "vincentlanglet/twig-cs-fixer": "^3.10.0"
+        "vincentlanglet/twig-cs-fixer": "^3.13.0"
     },
     "config": {
         "allow-plugins": {
@@ -96,7 +99,8 @@
         "symfony/polyfill-php81": "*",
         "symfony/polyfill-php82": "*",
         "symfony/polyfill-php83": "*",
-        "symfony/polyfill-php84": "*"
+        "symfony/polyfill-php84": "*",
+        "symfony/polyfill-php85": "*"
     },
     "scripts": {
         "auto-scripts": {
@@ -117,7 +121,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "7.3.*",
+            "require": "8.0.*",
             "docker": true
         }
     }

config/bundles.php

@@ -2,11 +2,12 @@
 
 declare(strict_types=1);
 
+use DAMA\DoctrineTestBundle\DAMADoctrineTestBundle;
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle;
 use Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle;
-use EasyCorp\Bundle\EasyAdminBundle\EasyAdminBundle;
 use Sentry\SentryBundle\SentryBundle;
+use Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\MakerBundle\MakerBundle;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
@@ -14,7 +15,6 @@ use Symfony\Bundle\TwigBundle\TwigBundle;
 use Symfony\Bundle\WebProfilerBundle\WebProfilerBundle;
 use Symfony\UX\StimulusBundle\StimulusBundle;
 use Symfony\UX\Turbo\TurboBundle;
-use Symfony\UX\TwigComponent\TwigComponentBundle;
 use SymfonyCasts\Bundle\VerifyEmail\SymfonyCastsVerifyEmailBundle;
 use Symfonycasts\SassBundle\SymfonycastsSassBundle;
 use Twig\Extra\TwigExtraBundle\TwigExtraBundle;
@@ -28,12 +28,12 @@ return [
     SecurityBundle::class => ['all' => true],
     WebProfilerBundle::class => ['dev' => true, 'test' => true],
     TwigExtraBundle::class => ['all' => true],
-    TwigComponentBundle::class => ['all' => true],
-    EasyAdminBundle::class => ['all' => true],
     DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
     SymfonyCastsVerifyEmailBundle::class => ['all' => true],
     SentryBundle::class => ['prod' => true],
     SymfonycastsSassBundle::class => ['all' => true],
     StimulusBundle::class => ['all' => true],
     TurboBundle::class => ['all' => true],
+    DAMADoctrineTestBundle::class => ['test' => true],
+    StofDoctrineExtensionsBundle::class => ['all' => true],
 ];

config/packages/dama_doctrine_test_bundle.yaml

@@ -0,0 +1,5 @@
+when@test:
+    dama_doctrine_test:
+        enable_static_connection: true
+        enable_static_meta_data_cache: true
+        enable_static_query_cache: true

config/packages/doctrine.yaml

@@ -2,16 +2,21 @@ doctrine:
     dbal:
         url: '%env(resolve:DATABASE_URL)%'
         
-        # IMPORTANT: You MUST configure your server version,
-        # either here or in the DATABASE_URL env var (see .env file)
-        #server_version: '16'
-        
         profiling_collect_backtrace: '%kernel.debug%'
-        use_savepoints: true
+        types:
+            # JSON types
+            jsonb: MartinGeorgiev\Doctrine\DBAL\Types\Jsonb
+            'jsonb[]': MartinGeorgiev\Doctrine\DBAL\Types\JsonbArray
+            tsrange: MartinGeorgiev\Doctrine\DBAL\Types\TsRange
+        mapping_types:
+            # JSON type mappings
+            jsonb: jsonb
+            'jsonb[]': 'jsonb[]'
+            _jsonb: 'jsonb[]'
+            tsrange: tsrange
+    
+    
     orm:
-        auto_generate_proxy_classes: true
-        enable_lazy_ghost_objects: true
-        report_fields_where_declared: true
         validate_xml_mapping: true
         naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
         identity_generation_preferences:
@@ -24,8 +29,6 @@ doctrine:
                 dir: '%kernel.project_dir%/src/Entity'
                 prefix: 'Tvdt\Entity'
                 alias: Tvdt
-        controller_resolver:
-            auto_mapping: false
 
 when@test:
     doctrine:
@@ -36,8 +39,6 @@ when@test:
 when@prod:
     doctrine:
         orm:
-            auto_generate_proxy_classes: false
-            proxy_dir: '%kernel.build_dir%/doctrine/orm/Proxies'
             query_cache_driver:
                 type: pool
                 pool: doctrine.system_cache_pool

config/packages/routing.yaml

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

config/packages/security.yaml

@@ -2,6 +2,7 @@ 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)
@@ -12,7 +13,8 @@ security:
         # used to reload user from session & other features (e.g. switch_user)
     firewalls:
         dev:
-            pattern: ^/(_(profiler|wdt)|css|images|js)/
+            # Ensure dev tools and static assets are always allowed
+            pattern: ^/(_profiler|_wdt|assets|build)/
             security: false
         main:
             lazy: true
@@ -29,12 +31,10 @@ security:
             
             # activate different ways to authenticate
             # https://symfony.com/doc/current/security.html#the-firewall
-            
+
             # https://symfony.com/doc/current/security/impersonating_user.html
             # switch_user: true
     
-    # Easy way to control access for large sections of your site
-    # Note: Only the *first* access control that matches will be used
     access_control:
         - { path: ^/admin, roles: ROLE_ADMIN }
         - { path: ^/backoffice, roles: ROLE_USER }
@@ -42,10 +42,8 @@ security:
 when@test:
     security:
         password_hashers:
-            # By default, password hashers are resource intensive and take time. This is
+            # Password hashers are resource-intensive by design to ensure security.
-            # important to generate secure password hashes. In tests however, secure hashes
+            # In tests, it's safe to reduce their cost to improve performance.
-            # are not important, waste resources and increase test times. The following
-            # reduces the work factor to the lowest possible values.
             Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface:
                 algorithm: auto
                 cost: 4 # Lowest possible value for bcrypt

config/packages/sentry.yaml

@@ -1,31 +1,39 @@
 when@prod:
     sentry:
         dsn: '%env(SENTRY_DSN)%'
-        # Add request headers, cookies, IP address and the authenticated user
-        # see https://docs.sentry.io/platforms/php/data-management/data-collected/ for more info
-        # send_default_pii: true
-        
         options:
-            traces_sample_rate: 1.0
+            # Add request headers, cookies, IP address and the authenticated user
-            profiles_sample_rate: 1.0
+            # see https://docs.sentry.io/platforms/php/data-management/data-collected/ for more info
+            # send_default_pii: true
             ignore_exceptions:
                 - 'Symfony\Component\ErrorHandler\Error\FatalError'
                 - 'Symfony\Component\Debug\Exception\FatalErrorException'
-
+#
-#        If you are using Monolog, you also need this additional configuration to log the errors correctly:
+#        # If you are using Monolog, you also need this additional configuration to log the errors correctly:
-#        https://docs.sentry.io/platforms/php/guides/symfony/#monolog-integration
+#        # https://docs.sentry.io/platforms/php/guides/symfony/integrations/monolog/
 #        register_error_listener: false
 #        register_error_handler: false
-
+#
 #    monolog:
 #        handlers:
+#            # Use this only if you don't want to use structured logging and instead receive
+#            # certain log levels as errors.  
 #            sentry:
-#                type: sentry
+#                type: service
-#                level: !php/const Monolog\Logger::ERROR
+#                id: Sentry\Monolog\Handler
-#                hub_id: Sentry\State\HubInterface
+#
-
+#            # Use this for structured log integration
-#    Uncomment these lines to register a log message processor that resolves PSR-3 placeholders
+#            sentry_logs:
-#    https://docs.sentry.io/platforms/php/guides/symfony/#monolog-integration
+#                type: service
+#                id: Sentry\SentryBundle\Monolog\LogsHandler
+#
+#    # Enable one of the two services below, depending on your choice above
 #    services:
-#        Monolog\Processor\PsrLogMessageProcessor:
+#        Sentry\Monolog\Handler:
-#            tags: { name: monolog.processor, handler: sentry }
+#            arguments:
+#                $hub: '@Sentry\State\HubInterface'
+#                $level: !php/const Monolog\Logger::ERROR
+#                $fillExtraContext: true # Enables sending monolog context to Sentry
+#        Sentry\SentryBundle\Monolog\LogsHandler:
+#            arguments:
+#                - !php/const Monolog\Logger::INFO

config/packages/stof_doctrine_extensions.yaml

@@ -0,0 +1,7 @@
+# Read the documentation: https://symfony.com/doc/current/bundles/StofDoctrineExtensionsBundle/index.html
+# See the official DoctrineExtensions documentation for more details: https://github.com/doctrine-extensions/DoctrineExtensions/tree/main/doc
+stof_doctrine_extensions:
+    default_locale: nl
+    orm:
+        default:
+            timestampable: true

config/packages/twig_component.yaml

@@ -1,5 +0,0 @@
-twig_component:
-    anonymous_template_directory: 'components/'
-    defaults:
-        # Namespace & directory for components
-        Tvdt\Twig\Components\: 'components/'

config/packages/uid.yaml

@@ -1,4 +0,0 @@
-framework:
-    uid:
-        default_uuid_version: 7
-        time_based_uuid_version: 7

config/preload.php

@@ -2,6 +2,6 @@
 
 declare(strict_types=1);
 
-if (file_exists(dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php')) {
+if (file_exists(dirname(__DIR__).'/var/cache/prod/Tvdt_KernelProdContainer.preload.php')) {
-    require dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php';
+    require dirname(__DIR__).'/var/cache/prod/Tvdt_KernelProdContainer.preload.php';
 }

config/routes.yaml

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

config/routes/easyadmin.yaml

@@ -1,3 +0,0 @@
-easyadmin:
-    resource: .
-    type: easyadmin.routes

config/services.yaml

@@ -1,5 +1,8 @@
+# yaml-language-server: $schema=../vendor/symfony/dependency-injection/Loader/schema/services.schema.json
+
 # This file is the entry point to configure your own services.
 # Files in the packages/ subdirectory configure your dependencies.
+# See also https://symfony.com/doc/current/service_container/import.html
 
 # Put parameters here that don't need to change on each machine where the app is deployed
 # https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
@@ -10,7 +13,7 @@ services:
     _defaults:
         autowire: true      # Automatically injects dependencies in your services.
         autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.
-    
+
     # makes classes in src/ available to be used as services
     # this creates a service per class whose id is the fully-qualified class name
     Tvdt\:
@@ -19,6 +22,6 @@ services:
             - '../src/DependencyInjection/'
             - '../src/Entity/'
             - '../src/Kernel.php'
-    
+
     # add more service definitions when explicit configuration is needed
     # please note that last definitions always *replace* previous ones

frankenphp/composer-complete.bash

@@ -0,0 +1,84 @@
+# This file is part of the Symfony package.
+#
+# (c) Fabien Potencier <fabien@symfony.com>
+#
+# For the full copyright and license information, please view
+# https://symfony.com/doc/current/contributing/code/license.html
+
+_sf_composer() {
+    # Use newline as only separator to allow space in completion values
+    local IFS=$'\n'
+    local sf_cmd="${COMP_WORDS[0]}"
+
+    # for an alias, get the real script behind it
+    sf_cmd_type=$(type -t $sf_cmd)
+    if [[ $sf_cmd_type == "alias" ]]; then
+        sf_cmd=$(alias $sf_cmd | sed -E "s/alias $sf_cmd='(.*)'/\1/")
+    elif [[ $sf_cmd_type == "file" ]]; then
+        sf_cmd=$(type -p $sf_cmd)
+    fi
+
+    if [[ $sf_cmd_type != "function" && ! -x $sf_cmd ]]; then
+        return 1
+    fi
+
+    local cur prev words cword
+    _get_comp_words_by_ref -n := cur prev words cword
+
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.11")
+    for w in ${words[@]}; do
+        w=$(printf -- '%b' "$w")
+        # remove quotes from typed values
+        quote="${w:0:1}"
+        if [ "$quote" == \' ]; then
+            w="${w%\'}"
+            w="${w#\'}"
+        elif [ "$quote" == \" ]; then
+            w="${w%\"}"
+            w="${w#\"}"
+        fi
+        # empty values are ignored
+        if [ ! -z "$w" ]; then
+            completecmd+=("-i$w")
+        fi
+    done
+
+    local sfcomplete
+    if sfcomplete=$(${completecmd[@]} 2>&1); then
+        local quote suggestions
+        quote=${cur:0:1}
+
+        # Use single quotes by default if suggestions contains backslash (FQCN)
+        if [ "$quote" == '' ] && [[ "$sfcomplete" =~ \\ ]]; then
+            quote=\'
+        fi
+
+        if [ "$quote" == \' ]; then
+            # single quotes: no additional escaping (does not accept ' in values)
+            suggestions=$(for s in $sfcomplete; do printf $'%q%q%q\n' "$quote" "$s" "$quote"; done)
+        elif [ "$quote" == \" ]; then
+            # double quotes: double escaping for \ $ ` "
+            suggestions=$(for s in $sfcomplete; do
+                s=${s//\\/\\\\}
+                s=${s//\$/\\\$}
+                s=${s//\`/\\\`}
+                s=${s//\"/\\\"}
+                printf $'%q%q%q\n' "$quote" "$s" "$quote";
+            done)
+        else
+            # no quotes: double escaping
+            suggestions=$(for s in $sfcomplete; do printf $'%q\n' $(printf '%q' "$s"); done)
+        fi
+        COMPREPLY=($(IFS=$'\n' compgen -W "$suggestions" -- $(printf -- "%q" "$cur")))
+        __ltrim_colon_completions "$cur"
+    else
+        if [[ "$sfcomplete" != *"Command \"_complete\" is not defined."* ]]; then
+            >&2 echo
+            >&2 echo $sfcomplete
+        fi
+
+        return 1
+    fi
+}
+
+complete -F _sf_composer composer

frankenphp/console-complete.bash

@@ -0,0 +1,94 @@
+# This file is part of the Symfony package.
+#
+# (c) Fabien Potencier <fabien@symfony.com>
+#
+# For the full copyright and license information, please view
+# https://symfony.com/doc/current/contributing/code/license.html
+
+_sf_console() {
+
+    # Use the default completion for shell redirect operators.
+    for w in '>' '>>' '&>' '<'; do
+        if [[ $w = "${COMP_WORDS[COMP_CWORD-1]}" ]]; then
+            compopt -o filenames
+            COMPREPLY=($(compgen -f -- "${COMP_WORDS[COMP_CWORD]}"))
+            return 0
+        fi
+    done
+
+    # Use newline as only separator to allow space in completion values
+    local IFS=$'\n'
+    local sf_cmd="${COMP_WORDS[0]}"
+
+    # for an alias, get the real script behind it
+    sf_cmd_type=$(type -t $sf_cmd)
+    if [[ $sf_cmd_type == "alias" ]]; then
+        sf_cmd=$(alias $sf_cmd | sed -E "s/alias $sf_cmd='(.*)'/\1/")
+    elif [[ $sf_cmd_type == "file" ]]; then
+        sf_cmd=$(type -p $sf_cmd)
+    fi
+
+    if [[ $sf_cmd_type != "function" && ! -x $sf_cmd ]]; then
+        return 1
+    fi
+
+    local cur prev words cword
+    _get_comp_words_by_ref -n := cur prev words cword
+
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-a1")
+    for w in ${words[@]}; do
+        w="${w//\\\\/\\}"
+        # remove quotes from typed values
+        quote="${w:0:1}"
+        if [ "$quote" == \' ]; then
+            w="${w%\'}"
+            w="${w#\'}"
+        elif [ "$quote" == \" ]; then
+            w="${w%\"}"
+            w="${w#\"}"
+        fi
+        # empty values are ignored
+        if [ ! -z "$w" ]; then
+            completecmd+=("-i$w")
+        fi
+    done
+
+    local sfcomplete
+    if sfcomplete=$(${completecmd[@]} 2>&1); then
+        local quote suggestions
+        quote=${cur:0:1}
+
+        # Use single quotes by default if suggestions contains backslash (FQCN)
+        if [ "$quote" == '' ] && [[ "$sfcomplete" =~ \\ ]]; then
+            quote=\'
+        fi
+
+        if [ "$quote" == \' ]; then
+            # single quotes: no additional escaping (does not accept ' in values)
+            suggestions=$(for s in $sfcomplete; do printf $'%q%q%q\n' "$quote" "$s" "$quote"; done)
+        elif [ "$quote" == \" ]; then
+            # double quotes: double escaping for \ $ ` "
+            suggestions=$(for s in $sfcomplete; do
+                s=${s//\\/\\\\}
+                s=${s//\$/\\\$}
+                s=${s//\`/\\\`}
+                s=${s//\"/\\\"}
+                printf $'%q%q%q\n' "$quote" "$s" "$quote";
+            done)
+        else
+            # no quotes: double escaping
+            suggestions=$(for s in $sfcomplete; do printf $'%q\n' $(printf '%q' "$s"); done)
+        fi
+        COMPREPLY=($(IFS=$'\n' compgen -W "$suggestions" -- $(printf -- "%q" "$cur")))
+        __ltrim_colon_completions "$cur"
+    else
+        if [[ "$sfcomplete" != *"Command \"_complete\" is not defined."* ]]; then
+            >&2 echo
+            >&2 echo $sfcomplete
+        fi
+
+        return 1
+    fi
+}
+
+complete -F _sf_console console

frankenphp/worker.Caddyfile

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

migrations/Version20241229195702.php

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20241229195702 extends AbstractMigration
 {
     public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20241229195702 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        // this up() migration is auto-generated, please modify it to your needs
         $this->addSql('CREATE TABLE answer (id UUID NOT NULL, question_id UUID NOT NULL, text VARCHAR(255) NOT NULL, is_right_answer BOOLEAN NOT NULL, PRIMARY KEY(id))');
         $this->addSql('CREATE INDEX IDX_DADD4A251E27F6BF ON answer (question_id)');
         $this->addSql('COMMENT ON COLUMN answer.id IS \'(DC2Type:uuid)\'');
@@ -67,7 +63,6 @@ final class Version20241229195702 extends AbstractMigration
 
     public function down(Schema $schema): void
     {
-        // this down() migration is auto-generated, please modify it to your needs
         $this->addSql('CREATE SCHEMA public');
         $this->addSql('ALTER TABLE answer DROP CONSTRAINT FK_DADD4A251E27F6BF');
         $this->addSql('ALTER TABLE answer_candidate DROP CONSTRAINT FK_F54D5192AA334807');

migrations/Version20241229201314.php

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20241229201314 extends AbstractMigration
 {
     public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20241229201314 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        // this up() migration is auto-generated, please modify it to your needs
         $this->addSql('CREATE TABLE season_user (season_id UUID NOT NULL, user_id UUID NOT NULL, PRIMARY KEY(season_id, user_id))');
         $this->addSql('CREATE INDEX IDX_BDA4AD74EC001D1 ON season_user (season_id)');
         $this->addSql('CREATE INDEX IDX_BDA4AD7A76ED395 ON season_user (user_id)');
@@ -31,7 +27,6 @@ final class Version20241229201314 extends AbstractMigration
 
     public function down(Schema $schema): void
     {
-        // this down() migration is auto-generated, please modify it to your needs
         $this->addSql('CREATE SCHEMA public');
         $this->addSql('ALTER TABLE season_user DROP CONSTRAINT FK_BDA4AD74EC001D1');
         $this->addSql('ALTER TABLE season_user DROP CONSTRAINT FK_BDA4AD7A76ED395');

migrations/Version20241229202103.php

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20241229202103 extends AbstractMigration
 {
     public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20241229202103 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        // this up() migration is auto-generated, please modify it to your needs
         $this->addSql('CREATE TABLE correction (id UUID NOT NULL, candidate_id UUID NOT NULL, quiz_id UUID NOT NULL, amount DOUBLE PRECISION NOT NULL, PRIMARY KEY(id))');
         $this->addSql('CREATE INDEX IDX_A29DA1B891BD8781 ON correction (candidate_id)');
         $this->addSql('CREATE INDEX IDX_A29DA1B8853CD175 ON correction (quiz_id)');
@@ -32,7 +28,6 @@ final class Version20241229202103 extends AbstractMigration
 
     public function down(Schema $schema): void
     {
-        // this down() migration is auto-generated, please modify it to your needs
         $this->addSql('CREATE SCHEMA public');
         $this->addSql('ALTER TABLE correction DROP CONSTRAINT FK_A29DA1B891BD8781');
         $this->addSql('ALTER TABLE correction DROP CONSTRAINT FK_A29DA1B8853CD175');

migrations/Version20241229202155.php

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20241229202155 extends AbstractMigration
 {
     public function getDescription(): string
@@ -19,13 +16,11 @@ final class Version20241229202155 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        // this up() migration is auto-generated, please modify it to your needs
         $this->addSql('CREATE UNIQUE INDEX UNIQ_A29DA1B891BD8781853CD175 ON correction (candidate_id, quiz_id)');
     }
 
     public function down(Schema $schema): void
     {
-        // this down() migration is auto-generated, please modify it to your needs
         $this->addSql('CREATE SCHEMA public');
         $this->addSql('DROP INDEX UNIQ_A29DA1B891BD8781853CD175');
     }

migrations/Version20241229204335.php

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20241229204335 extends AbstractMigration
 {
     public function getDescription(): string
@@ -19,14 +16,12 @@ final class Version20241229204335 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        // this up() migration is auto-generated, please modify it to your needs
         $this->addSql('ALTER TABLE given_answer ALTER answer_id DROP NOT NULL');
         $this->addSql('ALTER TABLE given_answer ALTER created DROP NOT NULL');
     }
 
     public function down(Schema $schema): void
     {
-        // this down() migration is auto-generated, please modify it to your needs
         $this->addSql('CREATE SCHEMA public');
         $this->addSql('ALTER TABLE given_answer ALTER answer_id SET NOT NULL');
         $this->addSql('ALTER TABLE given_answer ALTER created SET NOT NULL');

migrations/Version20250303221227.php

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20250303221227 extends AbstractMigration
 {
     public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20250303221227 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        // this up() migration is auto-generated, please modify it to your needs
         $this->addSql('ALTER TABLE given_answer ALTER created SET NOT NULL');
         $this->addSql('ALTER TABLE season ADD active_quiz_id UUID DEFAULT NULL');
         $this->addSql('COMMENT ON COLUMN season.active_quiz_id IS \'(DC2Type:uuid)\'');
@@ -29,7 +25,6 @@ final class Version20250303221227 extends AbstractMigration
 
     public function down(Schema $schema): void
     {
-        // this down() migration is auto-generated, please modify it to your needs
         $this->addSql('CREATE SCHEMA public');
         $this->addSql('ALTER TABLE season DROP CONSTRAINT FK_F0E45BA96706D6B');
         $this->addSql('DROP INDEX IDX_F0E45BA96706D6B');

migrations/Version20250311213417.php

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20250311213417 extends AbstractMigration
 {
     public function getDescription(): string
@@ -19,7 +16,6 @@ final class Version20250311213417 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        // this up() migration is auto-generated, please modify it to your needs
         $this->addSql('ALTER TABLE answer ALTER id TYPE UUID');
         $this->addSql('ALTER TABLE answer ALTER question_id TYPE UUID');
         $this->addSql('COMMENT ON COLUMN answer.id IS \'\'');
@@ -69,7 +65,6 @@ final class Version20250311213417 extends AbstractMigration
 
     public function down(Schema $schema): void
     {
-        // this down() migration is auto-generated, please modify it to your needs
         $this->addSql('ALTER TABLE candidate ALTER id TYPE UUID');
         $this->addSql('ALTER TABLE candidate ALTER season_id TYPE UUID');
         $this->addSql('COMMENT ON COLUMN candidate.id IS \'(DC2Type:uuid)\'');

migrations/Version20250402185128.php

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20250402185128 extends AbstractMigration
 {
     public function getDescription(): string
@@ -19,13 +16,11 @@ final class Version20250402185128 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        // this up() migration is auto-generated, please modify it to your needs
         $this->addSql('CREATE TABLE elimination (id UUID NOT NULL, data JSON NOT NULL, PRIMARY KEY(id))');
     }
 
     public function down(Schema $schema): void
     {
-        // this down() migration is auto-generated, please modify it to your needs
         $this->addSql('DROP TABLE elimination');
     }
 }

migrations/Version20250420111904.php

@@ -18,13 +18,13 @@ final class Version20250420111904 extends AbstractMigration
     {
         $this->addSql(<<<'SQL'
             ALTER TABLE "user" ADD is_verified BOOLEAN NOT NULL
-        SQL);
+            SQL);
     }
 
     public function down(Schema $schema): void
     {
         $this->addSql(<<<'SQL'
             ALTER TABLE "user" DROP is_verified
-        SQL);
+            SQL);
     }
 }

migrations/Version20250420125040.php

@@ -18,13 +18,13 @@ final class Version20250420125040 extends AbstractMigration
     {
         $this->addSql(<<<'SQL'
             ALTER TABLE season DROP preregister_candidates
-        SQL);
+            SQL);
     }
 
     public function down(Schema $schema): void
     {
         $this->addSql(<<<'SQL'
             ALTER TABLE season ADD preregister_candidates BOOLEAN NOT NULL DEFAULT true
-        SQL);
+            SQL);
     }
 }

migrations/Version20250427174822.php

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20250427174822 extends AbstractMigration
 {
     public function getDescription(): string
@@ -19,23 +16,21 @@ final class Version20250427174822 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        // this up() migration is auto-generated, please modify it to your needs
         $this->addSql(<<<'SQL'
             ALTER TABLE answer ADD ordering SMALLINT DEFAULT 0 NOT NULL
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE question ADD ordering SMALLINT DEFAULT 0 NOT NULL
-        SQL);
+            SQL);
     }
 
     public function down(Schema $schema): void
     {
-        // this down() migration is auto-generated, please modify it to your needs
         $this->addSql(<<<'SQL'
             ALTER TABLE answer DROP ordering
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE question DROP ordering
-        SQL);
+            SQL);
     }
 }

migrations/Version20250504101440.php

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20250504101440 extends AbstractMigration
 {
     public function getDescription(): string
@@ -19,23 +16,21 @@ final class Version20250504101440 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        // this up() migration is auto-generated, please modify it to your needs
         $this->addSql(<<<'SQL'
             CREATE UNIQUE INDEX UNIQ_C8B28E445E237E064EC001D1 ON candidate (name, season_id)
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             CREATE UNIQUE INDEX UNIQ_A412FA925E237E064EC001D1 ON quiz (name, season_id)
-        SQL);
+            SQL);
     }
 
     public function down(Schema $schema): void
     {
-        // this down() migration is auto-generated, please modify it to your needs
         $this->addSql(<<<'SQL'
             DROP INDEX UNIQ_A412FA925E237E064EC001D1
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             DROP INDEX UNIQ_C8B28E445E237E064EC001D1
-        SQL);
+            SQL);
     }
 }

migrations/Version20250521192752.php

@@ -18,37 +18,37 @@ final class Version20250521192752 extends AbstractMigration
     {
         $this->addSql(<<<'SQL'
             ALTER TABLE elimination ADD quiz_id UUID NOT NULL
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE elimination ADD CONSTRAINT FK_5947284F853CD175 FOREIGN KEY (quiz_id) REFERENCES quiz (id) NOT DEFERRABLE INITIALLY IMMEDIATE
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             CREATE INDEX IDX_5947284F853CD175 ON elimination (quiz_id)
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE quiz ALTER dropouts SET DEFAULT 1
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE quiz ALTER dropouts SET NOT NULL
-        SQL);
+            SQL);
     }
 
     public function down(Schema $schema): void
     {
         $this->addSql(<<<'SQL'
             ALTER TABLE quiz ALTER dropouts DROP DEFAULT
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE quiz ALTER dropouts DROP NOT NULL
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE elimination DROP CONSTRAINT FK_5947284F853CD175
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             DROP INDEX IDX_5947284F853CD175
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE elimination DROP quiz_id
-        SQL);
+            SQL);
     }
 }

migrations/Version20250521194035.php

@@ -18,7 +18,7 @@ final class Version20250521194035 extends AbstractMigration
     {
         $this->addSql(<<<'SQL'
             ALTER TABLE elimination ADD created TIMESTAMP(0) WITHOUT TIME ZONE
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             UPDATE elimination SET created = NOW()
             SQL
@@ -33,6 +33,6 @@ final class Version20250521194035 extends AbstractMigration
     {
         $this->addSql(<<<'SQL'
             ALTER TABLE elimination DROP created
-        SQL);
+            SQL);
     }
 }

migrations/Version20250606192337.php

@@ -18,73 +18,73 @@ final class Version20250606192337 extends AbstractMigration
     {
         $this->addSql(<<<'SQL'
             CREATE TABLE quiz_candidate (id UUID NOT NULL, corrections DOUBLE PRECISION NOT NULL, created TIMESTAMP(0) WITH TIME ZONE NOT NULL, quiz_id UUID NOT NULL, candidate_id UUID NOT NULL, PRIMARY KEY(id))
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             CREATE INDEX IDX_CED2FFA2853CD175 ON quiz_candidate (quiz_id)
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             CREATE INDEX IDX_CED2FFA291BD8781 ON quiz_candidate (candidate_id)
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             CREATE UNIQUE INDEX UNIQ_CED2FFA291BD8781853CD175 ON quiz_candidate (candidate_id, quiz_id)
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE quiz_candidate ADD CONSTRAINT FK_CED2FFA2853CD175 FOREIGN KEY (quiz_id) REFERENCES quiz (id) NOT DEFERRABLE INITIALLY IMMEDIATE
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE quiz_candidate ADD CONSTRAINT FK_CED2FFA291BD8781 FOREIGN KEY (candidate_id) REFERENCES candidate (id) NOT DEFERRABLE INITIALLY IMMEDIATE
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE correction DROP CONSTRAINT fk_a29da1b891bd8781
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE correction DROP CONSTRAINT fk_a29da1b8853cd175
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             DROP TABLE correction
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE elimination ALTER created TYPE TIMESTAMP(0) WITH TIME ZONE
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE given_answer ALTER created TYPE TIMESTAMP(0) WITH TIME ZONE
-        SQL);
+            SQL);
     }
 
     public function down(Schema $schema): void
     {
         $this->addSql(<<<'SQL'
             CREATE TABLE correction (id UUID NOT NULL, candidate_id UUID NOT NULL, quiz_id UUID NOT NULL, amount DOUBLE PRECISION NOT NULL, PRIMARY KEY(id))
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             CREATE UNIQUE INDEX uniq_a29da1b891bd8781853cd175 ON correction (candidate_id, quiz_id)
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             CREATE INDEX idx_a29da1b8853cd175 ON correction (quiz_id)
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             CREATE INDEX idx_a29da1b891bd8781 ON correction (candidate_id)
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE correction ADD CONSTRAINT fk_a29da1b891bd8781 FOREIGN KEY (candidate_id) REFERENCES candidate (id) NOT DEFERRABLE INITIALLY IMMEDIATE
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE correction ADD CONSTRAINT fk_a29da1b8853cd175 FOREIGN KEY (quiz_id) REFERENCES quiz (id) NOT DEFERRABLE INITIALLY IMMEDIATE
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE quiz_candidate DROP CONSTRAINT FK_CED2FFA2853CD175
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE quiz_candidate DROP CONSTRAINT FK_CED2FFA291BD8781
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             DROP TABLE quiz_candidate
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE given_answer ALTER created TYPE TIMESTAMP(0) WITHOUT TIME ZONE
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE elimination ALTER created TYPE TIMESTAMP(0) WITHOUT TIME ZONE
-        SQL);
+            SQL);
     }
 }

migrations/Version20250606195952.php

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20250606195952 extends AbstractMigration
 {
     public function getDescription(): string
@@ -21,22 +18,22 @@ final class Version20250606195952 extends AbstractMigration
     {
         $this->addSql(<<<'SQL'
             delete from given_answer where answer_id is null
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE given_answer ALTER answer_id TYPE UUID
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE given_answer ALTER answer_id SET NOT NULL
-        SQL);
+            SQL);
     }
 
     public function down(Schema $schema): void
     {
         $this->addSql(<<<'SQL'
             ALTER TABLE given_answer ALTER answer_id TYPE UUID
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE given_answer ALTER answer_id DROP NOT NULL
-        SQL);
+            SQL);
     }
 }

migrations/Version20250607154730.php

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20250607154730 extends AbstractMigration
 {
     public function getDescription(): string
@@ -19,23 +16,21 @@ final class Version20250607154730 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        // this up() migration is auto-generated, please modify it to your needs
         $this->addSql(<<<'SQL'
             ALTER TABLE season DROP CONSTRAINT FK_F0E45BA96706D6B
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE season ADD CONSTRAINT FK_F0E45BA96706D6B FOREIGN KEY (active_quiz_id) REFERENCES quiz (id) ON DELETE SET NULL NOT DEFERRABLE INITIALLY IMMEDIATE
-        SQL);
+            SQL);
     }
 
     public function down(Schema $schema): void
     {
-        // this down() migration is auto-generated, please modify it to your needs
         $this->addSql(<<<'SQL'
             ALTER TABLE season DROP CONSTRAINT fk_f0e45ba96706d6b
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE season ADD CONSTRAINT fk_f0e45ba96706d6b FOREIGN KEY (active_quiz_id) REFERENCES quiz (id) NOT DEFERRABLE INITIALLY IMMEDIATE
-        SQL);
+            SQL);
     }
 }

migrations/Version20250607184525.php

@@ -7,9 +7,6 @@ namespace DoctrineMigrations;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20250607184525 extends AbstractMigration
 {
     public function getDescription(): string
@@ -19,35 +16,33 @@ final class Version20250607184525 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        // this up() migration is auto-generated, please modify it to your needs
         $this->addSql(<<<'SQL'
             ALTER TABLE elimination DROP CONSTRAINT FK_5947284F853CD175
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE elimination ADD CONSTRAINT FK_5947284F853CD175 FOREIGN KEY (quiz_id) REFERENCES quiz (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE given_answer DROP CONSTRAINT FK_9AC61A30853CD175
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE given_answer ADD CONSTRAINT FK_9AC61A30853CD175 FOREIGN KEY (quiz_id) REFERENCES quiz (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE
-        SQL);
+            SQL);
     }
 
     public function down(Schema $schema): void
     {
-        // this down() migration is auto-generated, please modify it to your needs
         $this->addSql(<<<'SQL'
             ALTER TABLE given_answer DROP CONSTRAINT fk_9ac61a30853cd175
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE given_answer ADD CONSTRAINT fk_9ac61a30853cd175 FOREIGN KEY (quiz_id) REFERENCES quiz (id) NOT DEFERRABLE INITIALLY IMMEDIATE
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE elimination DROP CONSTRAINT fk_5947284f853cd175
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE elimination ADD CONSTRAINT fk_5947284f853cd175 FOREIGN KEY (quiz_id) REFERENCES quiz (id) NOT DEFERRABLE INITIALLY IMMEDIATE
-        SQL);
+            SQL);
     }
 }

migrations/Version20250610210417.php

@@ -18,31 +18,31 @@ final class Version20250610210417 extends AbstractMigration
     {
         $this->addSql(<<<'SQL'
             CREATE TABLE season_settings (id UUID NOT NULL, show_numbers BOOLEAN DEFAULT false NOT NULL, confirm_answers BOOLEAN DEFAULT false NOT NULL, PRIMARY KEY(id))
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE season ADD settings_id UUID DEFAULT NULL
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE season ADD CONSTRAINT FK_F0E45BA959949888 FOREIGN KEY (settings_id) REFERENCES season_settings (id) NOT DEFERRABLE INITIALLY IMMEDIATE
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             CREATE UNIQUE INDEX UNIQ_F0E45BA959949888 ON season (settings_id)
-        SQL);
+            SQL);
     }
 
     public function down(Schema $schema): void
     {
         $this->addSql(<<<'SQL'
             DROP TABLE season_settings
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE season DROP CONSTRAINT FK_F0E45BA959949888
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             DROP INDEX UNIQ_F0E45BA959949888
-        SQL);
+            SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE season DROP settings_id
-        SQL);
+            SQL);
     }
 }

migrations/Version20251007194241.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20251007194241 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Change elimination data type to jsonb';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE elimination ALTER data TYPE JSONB');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE elimination ALTER data TYPE JSON');
+    }
+}

phpstan.dist.neon

@@ -8,3 +8,7 @@ parameters:
         - src/
         - tests/
     treatPhpDocTypesAsCertain: false
+    symfony:
+        containerXmlPath: var/cache/dev/Tvdt_KernelDevDebugContainer.xml
+    doctrine:
+        objectManagerLoader: tests/object-manager.php

phpunit.dist.xml

@@ -27,8 +27,12 @@
         <include>
             <directory>src</directory>
         </include>
+        <exclude>
+            <directory>src/DataFixtures</directory>
+        </exclude>
     </source>
 
     <extensions>
+        <bootstrap class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension" />
     </extensions>
 </phpunit>

rector.php

@@ -3,6 +3,8 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\Symfony\Bridge\Symfony\Routing\SymfonyRoutesProvider;
+use Rector\Symfony\Contract\Bridge\Symfony\Routing\SymfonyRoutesProviderInterface;
 
 return RectorConfig::configure()
     ->withPaths([
@@ -11,7 +13,10 @@ return RectorConfig::configure()
         __DIR__.'/src',
         __DIR__.'/tests',
     ])
-    ->withSymfonyContainerXml('var/cache/dev/App_KernelDevDebugContainer.xml')
+    ->withSkip([__DIR__.'/config/reference.php'])
+    ->withSymfonyContainerXml(__DIR__.'/var/cache/dev/Tvdt_KernelDevDebugContainer.xml')
+    ->withSymfonyContainerPhp(__DIR__.'/tests/symfony-container.php')
+    ->registerService(SymfonyRoutesProvider::class, SymfonyRoutesProviderInterface::class)
     ->withParallel()
     ->withPhpSets()
     ->withPreparedSets(
@@ -22,7 +27,6 @@ return RectorConfig::configure()
         privatization: true,
         instanceOf: true,
         earlyReturn: true,
-        strictBooleans: true,
         rectorPreset: true,
         phpunitCodeQuality: true,
         doctrineCodeQuality: true,

src/Command/AddSettingsCommand.php

@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Command;
-
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Console\Attribute\AsCommand;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Style\SymfonyStyle;
-use Tvdt\Entity\SeasonSettings;
-use Tvdt\Repository\SeasonRepository;
-
-#[AsCommand(
-    name: 'tvdt:add-settings',
-    description: 'Add a short description for your command',
-)]
-readonly class AddSettingsCommand
-{
-    public function __construct(private SeasonRepository $seasonRepository, private EntityManagerInterface $entityManager) {}
-
-    public function __invoke(InputInterface $input, OutputInterface $output): int
-    {
-        $io = new SymfonyStyle($input, $output);
-
-        foreach ($this->seasonRepository->findAll() as $season) {
-            if (null !== $season->getSettings()) {
-                continue;
-            }
-
-            $io->text('Adding settings to season : '.$season->getSeasonCode());
-            $season->setSettings(new SeasonSettings());
-        }
-
-        $this->entityManager->flush();
-
-        return Command::SUCCESS;
-    }
-}

src/Command/ClaimSeasonCommand.php

@@ -8,9 +8,8 @@ use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Console\Attribute\Argument;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use Tvdt\Entity\Season;
 use Tvdt\Repository\SeasonRepository;
 use Tvdt\Repository\UserRepository;
 
@@ -18,7 +17,7 @@ use Tvdt\Repository\UserRepository;
     name: 'tvdt:claim-season',
     description: 'Give a user owner rights on a season',
 )]
-readonly class ClaimSeasonCommand
+final readonly class ClaimSeasonCommand
 {
     public function __construct(private UserRepository $userRepository, private SeasonRepository $seasonRepository, private EntityManagerInterface $entityManager) {}
 
@@ -27,14 +26,11 @@ readonly class ClaimSeasonCommand
         string $seasonCode,
         #[Argument]
         string $email,
-        InputInterface $input,
+        SymfonyStyle $io,
-        OutputInterface $output,
     ): int {
-        $io = new SymfonyStyle($input, $output);
-
         try {
-            $season = $this->seasonRepository->findOneBy(['seasonCode' => $seasonCode]);
+            $season = $this->seasonRepository->findOneBySeasonCode($seasonCode);
-            if (null === $season) {
+            if (!$season instanceof Season) {
                 throw new \InvalidArgumentException('Season not found');
             }
 

src/Command/MakeAdminCommand.php

@@ -7,8 +7,6 @@ namespace Tvdt\Command;
 use Symfony\Component\Console\Attribute\Argument;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Tvdt\Repository\UserRepository;
 
@@ -16,17 +14,15 @@ use Tvdt\Repository\UserRepository;
     name: 'tvdt:make-admin',
     description: 'Give a user the role admin',
 )]
-readonly class MakeAdminCommand
+final readonly class MakeAdminCommand
 {
     public function __construct(private UserRepository $userRepository) {}
 
     public function __invoke(
         #[Argument]
         string $email,
-        InputInterface $input,
+        SymfonyStyle $io,
-        OutputInterface $output,
     ): int {
-        $io = new SymfonyStyle($input, $output);
         try {
             $this->userRepository->makeAdmin($email);
         } catch (\InvalidArgumentException) {

src/Controller/Admin/AnswerCrudController.php

@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Controller\Admin;
-
-use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
-use Tvdt\Entity\Answer;
-
-/** @extends AbstractCrudController<Answer> */
-class AnswerCrudController extends AbstractCrudController
-{
-    public static function getEntityFqcn(): string
-    {
-        return Answer::class;
-    }
-}

src/Controller/Admin/CandidateCrudController.php

@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Controller\Admin;
-
-use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
-use Tvdt\Entity\Candidate;
-
-/** @extends AbstractCrudController<Candidate> */
-class CandidateCrudController extends AbstractCrudController
-{
-    public static function getEntityFqcn(): string
-    {
-        return Candidate::class;
-    }
-}

src/Controller/Admin/DashboardController.php

@@ -1,67 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Controller\Admin;
-
-use EasyCorp\Bundle\EasyAdminBundle\Attribute\AdminDashboard;
-use EasyCorp\Bundle\EasyAdminBundle\Config\Dashboard;
-use EasyCorp\Bundle\EasyAdminBundle\Config\MenuItem;
-use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractDashboardController;
-use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGenerator;
-use Symfony\Component\HttpFoundation\Response;
-use Tvdt\Entity\Answer;
-use Tvdt\Entity\Candidate;
-use Tvdt\Entity\GivenAnswer;
-use Tvdt\Entity\Question;
-use Tvdt\Entity\Quiz;
-use Tvdt\Entity\QuizCandidate;
-use Tvdt\Entity\Season;
-use Tvdt\Entity\User;
-
-#[AdminDashboard(routePath: '/admin', routeName: 'admin')]
-class DashboardController extends AbstractDashboardController
-{
-    #[\Override]
-    public function index(): Response
-    {
-        // Option 1. You can make your dashboard redirect to some common page of your backend
-        //
-        $adminUrlGenerator = $this->container->get(AdminUrlGenerator::class);
-
-        return $this->redirect($adminUrlGenerator->setController(SeasonCrudController::class)->generateUrl());
-
-        // Option 2. You can make your dashboard redirect to different pages depending on the user
-        //
-        // if ('jane' === $this->getUser()->getUsername()) {
-        //     return $this->redirect('...');
-        // }
-
-        // Option 3. You can render some custom template to display a proper dashboard with widgets, etc.
-        // (tip: it's easier if your template extends from @EasyAdmin/page/content.html.twig)
-        //
-        // return $this->render('some/path/my-dashboard.html.twig');
-    }
-
-    #[\Override]
-    public function configureDashboard(): Dashboard
-    {
-        return Dashboard::new()
-            ->setTitle('TijdVoorDeTest');
-    }
-
-    #[\Override]
-    public function configureMenuItems(): iterable
-    {
-        yield MenuItem::linkToDashboard('Dashboard', 'fa fa-home');
-        yield MenuItem::linkToCrud('Season', 'fas fa-list', Season::class);
-        yield MenuItem::linkToCrud('Quiz', 'fas fa-list', Quiz::class);
-        yield MenuItem::linkToCrud('Question', 'fas fa-list', Question::class);
-        yield MenuItem::linkToCrud('Candidate', 'fas fa-list', Candidate::class);
-        yield MenuItem::linkToCrud('Correction', 'fas fa-list', QuizCandidate::class);
-        yield MenuItem::linkToCrud('User', 'fas fa-list', User::class);
-        yield MenuItem::linkToCrud('Given Answer', 'fas fa-list', GivenAnswer::class);
-        yield MenuItem::linkToCrud('Answer', 'fas fa-list', Answer::class);
-        yield MenuItem::linkToLogout('Logout', 'fas fa-sign-out');
-    }
-}

src/Controller/Admin/GivenAnswerCrudController.php

@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Controller\Admin;
-
-use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
-use Tvdt\Entity\GivenAnswer;
-
-/** @extends AbstractCrudController<GivenAnswer> */
-class GivenAnswerCrudController extends AbstractCrudController
-{
-    public static function getEntityFqcn(): string
-    {
-        return GivenAnswer::class;
-    }
-}

src/Controller/Admin/QuestionCrudController.php

@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Controller\Admin;
-
-use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
-use Tvdt\Entity\Question;
-
-/** @extends AbstractCrudController<Question> */
-class QuestionCrudController extends AbstractCrudController
-{
-    public static function getEntityFqcn(): string
-    {
-        return Question::class;
-    }
-}

src/Controller/Admin/QuizCorrectionCrudController.php

@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Controller\Admin;
-
-use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
-use Tvdt\Entity\QuizCandidate;
-
-/** @extends AbstractCrudController<QuizCandidate> */
-class QuizCorrectionCrudController extends AbstractCrudController
-{
-    public static function getEntityFqcn(): string
-    {
-        return QuizCandidate::class;
-    }
-}

src/Controller/Admin/QuizCrudController.php

@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Controller\Admin;
-
-use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
-use Tvdt\Entity\Quiz;
-
-/** @extends AbstractCrudController<Quiz> */
-class QuizCrudController extends AbstractCrudController
-{
-    public static function getEntityFqcn(): string
-    {
-        return Quiz::class;
-    }
-}

src/Controller/Admin/SeasonCrudController.php

@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Controller\Admin;
-
-use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
-use Tvdt\Entity\Season;
-
-/** @extends AbstractCrudController<Season> */
-class SeasonCrudController extends AbstractCrudController
-{
-    public static function getEntityFqcn(): string
-    {
-        return Season::class;
-    }
-}

src/Controller/Admin/UserCrudController.php

@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Controller\Admin;
-
-use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
-use Tvdt\Entity\User;
-
-/** @extends AbstractCrudController<User> */
-class UserCrudController extends AbstractCrudController
-{
-    public static function getEntityFqcn(): string
-    {
-        return User::class;
-    }
-}

src/Controller/Backoffice/BackofficeController.php

@@ -26,6 +26,7 @@ final class BackofficeController extends AbstractController
     public function __construct(
         private readonly SeasonRepository $seasonRepository,
         private readonly Security $security,
+        private readonly QuizSpreadsheetService $excel,
     ) {}
 
     #[Route('/backoffice/', name: 'tvdt_backoffice_index')]
@@ -61,16 +62,16 @@ final class BackofficeController extends AbstractController
             $em->persist($season);
             $em->flush();
 
-            return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->getSeasonCode()]);
+            return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->seasonCode]);
         }
 
         return $this->render('backoffice/season_add.html.twig', ['form' => $form]);
     }
 
     #[Route('/backoffice/template', name: 'tvdt_backoffice_template', priority: 10)]
-    public function getTemplate(QuizSpreadsheetService $excel): Response
+    public function getTemplate(): StreamedResponse
     {
-        $response = new StreamedResponse($excel->generateTemplate());
+        $response = new StreamedResponse($this->excel->generateTemplate());
         $response->headers->set('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
         $response->headers->set('Content-Disposition', 'attachment; filename="template.xlsx"');
 

src/Controller/Backoffice/PrepareEliminationController.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Tvdt\Controller\Backoffice;
 
 use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
@@ -17,16 +18,18 @@ use Tvdt\Factory\EliminationFactory;
 
 final class PrepareEliminationController extends AbstractController
 {
+    public function __construct(private readonly EliminationFactory $eliminationFactory) {}
+
     #[Route(
         '/backoffice/season/{seasonCode:season}/quiz/{quiz}/elimination/prepare',
         name: 'tvdt_prepare_elimination',
         requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID],
     )]
-    public function index(Season $season, Quiz $quiz, EliminationFactory $eliminationFactory): Response
+    public function index(Season $season, Quiz $quiz): RedirectResponse
     {
-        $elimination = $eliminationFactory->createEliminationFromQuiz($quiz);
+        $elimination = $this->eliminationFactory->createEliminationFromQuiz($quiz);
 
-        return $this->redirectToRoute('tvdt_prepare_elimination_view', ['elimination' => $elimination->getId()]);
+        return $this->redirectToRoute('tvdt_prepare_elimination_view', ['elimination' => $elimination->id]);
     }
 
     #[Route(
@@ -41,7 +44,7 @@ final class PrepareEliminationController extends AbstractController
             $em->flush();
 
             if ($request->request->getBoolean('start')) {
-                return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->getId()]);
+                return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);
             }
 
             $this->addFlash('success', 'Elimination updated');

src/Controller/Backoffice/QuizController.php

@@ -19,7 +19,6 @@ use Tvdt\Entity\Candidate;
 use Tvdt\Entity\Quiz;
 use Tvdt\Entity\Season;
 use Tvdt\Exception\ErrorClearingQuizException;
-use Tvdt\Repository\CandidateRepository;
 use Tvdt\Repository\QuizCandidateRepository;
 use Tvdt\Repository\QuizRepository;
 use Tvdt\Security\Voter\SeasonVoter;
@@ -29,83 +28,84 @@ use Tvdt\Security\Voter\SeasonVoter;
 class QuizController extends AbstractController
 {
     public function __construct(
-        private readonly CandidateRepository $candidateRepository,
+        private readonly QuizRepository $quizRepository,
         private readonly TranslatorInterface $translator,
+        private readonly QuizCandidateRepository $quizCandidateRepository,
     ) {}
 
+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
     #[Route(
         '/backoffice/season/{seasonCode:season}/quiz/{quiz}',
         name: 'tvdt_backoffice_quiz',
         requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID],
     )]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
     public function index(Season $season, Quiz $quiz): Response
     {
         return $this->render('backoffice/quiz.html.twig', [
             'season' => $season,
             'quiz' => $quiz,
-            'result' => $this->candidateRepository->getScores($quiz),
+            'result' => $this->quizRepository->getScores($quiz),
         ]);
     }
 
+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
     #[Route(
         '/backoffice/season/{seasonCode:season}/quiz/{quiz}/enable',
         name: 'tvdt_backoffice_enable',
         requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID.'|null'],
     )]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
     public function enableQuiz(Season $season, ?Quiz $quiz, EntityManagerInterface $em): RedirectResponse
     {
-        $season->setActiveQuiz($quiz);
+        $season->activeQuiz = $quiz;
         $em->flush();
 
         if ($quiz instanceof Quiz) {
-            return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $season->getSeasonCode(), 'quiz' => $quiz->getId()]);
+            return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $season->seasonCode, 'quiz' => $quiz->id]);
         }
 
-        return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->getSeasonCode()]);
+        return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->seasonCode]);
     }
 
+    #[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
     #[Route(
         '/backoffice/quiz/{quiz}/clear',
         name: 'tvdt_backoffice_quiz_clear',
         requirements: ['quiz' => Requirement::UUID],
     )]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
+    public function clearQuiz(Quiz $quiz): RedirectResponse
-    public function clearQuiz(Quiz $quiz, QuizRepository $quizRepository): RedirectResponse
     {
         try {
-            $quizRepository->clearQuiz($quiz);
+            $this->quizRepository->clearQuiz($quiz);
             $this->addFlash('success', $this->translator->trans('Quiz cleared'));
         } catch (ErrorClearingQuizException) {
             $this->addFlash('error', $this->translator->trans('Error clearing quiz'));
         }
 
-        return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->getSeason()->getSeasonCode(), 'quiz' => $quiz->getId()]);
+        return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->season->seasonCode, 'quiz' => $quiz->id]);
     }
 
+    #[IsGranted(SeasonVoter::DELETE, subject: 'quiz')]
     #[Route(
         '/backoffice/quiz/{quiz}/delete',
         name: 'tvdt_backoffice_quiz_delete',
         requirements: ['quiz' => Requirement::UUID],
     )]
-    #[IsGranted(SeasonVoter::DELETE, subject: 'quiz')]
+    public function deleteQuiz(Quiz $quiz): RedirectResponse
-    public function deleteQuiz(Quiz $quiz, QuizRepository $quizRepository): RedirectResponse
     {
-        $quizRepository->deleteQuiz($quiz);
+        $this->quizRepository->deleteQuiz($quiz);
 
         $this->addFlash('success', $this->translator->trans('Quiz deleted'));
 
-        return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $quiz->getSeason()->getSeasonCode()]);
+        return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $quiz->season->seasonCode]);
     }
 
+    #[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
     #[Route(
         '/backoffice/quiz/{quiz}/candidate/{candidate}/modify_correction',
         name: 'tvdt_backoffice_modify_correction',
         requirements: ['quiz' => Requirement::UUID, 'candidate' => Requirement::UUID],
     )]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
+    public function modifyCorrection(Quiz $quiz, Candidate $candidate, Request $request): RedirectResponse
-    public function modifyCorrection(Quiz $quiz, Candidate $candidate, QuizCandidateRepository $quizCandidateRepository, Request $request): RedirectResponse
     {
         if (!$request->isMethod('POST')) {
             throw new MethodNotAllowedHttpException(['POST']);
@@ -113,8 +113,8 @@ class QuizController extends AbstractController
 
         $corrections = (float) $request->request->get('corrections');
 
-        $quizCandidateRepository->setCorrectionsForCandidate($quiz, $candidate, $corrections);
+        $this->quizCandidateRepository->setCorrectionsForCandidate($quiz, $candidate, $corrections);
 
-        return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->getSeason()->getSeasonCode(), 'quiz' => $quiz->getId()]);
+        return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->season->seasonCode, 'quiz' => $quiz->id]);
     }
 }

src/Controller/Backoffice/SeasonController.php

@@ -30,17 +30,18 @@ class SeasonController extends AbstractController
     public function __construct(
         private readonly TranslatorInterface $translator,
         private readonly EntityManagerInterface $em,
+        private readonly QuizSpreadsheetService $quizSpreadsheet,
     ) {}
 
+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
     #[Route(
         '/backoffice/season/{seasonCode:season}',
         name: 'tvdt_backoffice_season',
         requirements: ['seasonCode' => self::SEASON_CODE_REGEX],
     )]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
     public function index(Season $season, Request $request): Response
     {
-        $form = $this->createForm(SettingsForm::class, $season->getSettings());
+        $form = $this->createForm(SettingsForm::class, $season->settings);
 
         $form->handleRequest($request);
 
@@ -54,13 +55,13 @@ class SeasonController extends AbstractController
         ]);
     }
 
+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
     #[Route(
         '/backoffice/season/{seasonCode:season}/add-candidate',
         name: 'tvdt_backoffice_add_candidates',
         requirements: ['seasonCode' => self::SEASON_CODE_REGEX],
         priority: 10,
     )]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
     public function addCandidates(Season $season, Request $request): Response
     {
         $form = $this->createForm(AddCandidatesFormType::class);
@@ -74,20 +75,20 @@ class SeasonController extends AbstractController
 
             $this->em->flush();
 
-            return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->getSeasonCode()]);
+            return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->seasonCode]);
         }
 
         return $this->render('backoffice/season_add_candidates.html.twig', ['form' => $form]);
     }
 
+    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
     #[Route(
         '/backoffice/season/{seasonCode:season}/add-quiz',
         name: 'tvdt_backoffice_quiz_add',
         requirements: ['seasonCode' => self::SEASON_CODE_REGEX],
         priority: 10,
     )]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
+    public function addQuiz(Request $request, Season $season): Response
-    public function addQuiz(Request $request, Season $season, QuizSpreadsheetService $quizSpreadsheet): Response
     {
         $quiz = new Quiz();
         $form = $this->createForm(UploadQuizFormType::class, $quiz);
@@ -98,15 +99,15 @@ class SeasonController extends AbstractController
             /* @var UploadedFile $sheet */
             $sheet = $form->get('sheet')->getData();
 
-            $quizSpreadsheet->xlsxToQuiz($quiz, $sheet);
+            $this->quizSpreadsheet->xlsxToQuiz($quiz, $sheet);
 
-            $quiz->setSeason($season);
+            $quiz->season = $season;
             $this->em->persist($quiz);
             $this->em->flush();
 
             $this->addFlash(FlashType::Success, $this->translator->trans('Quiz Added!'));
 
-            return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->getSeasonCode()]);
+            return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->seasonCode]);
         }
 
         return $this->render('/backoffice/quiz_add.html.twig', ['form' => $form, 'season' => $season]);

src/Controller/EliminationController.php

@@ -26,10 +26,10 @@ use function Symfony\Component\Translation\t;
 #[IsGranted('ROLE_USER')]
 final class EliminationController extends AbstractController
 {
-    public function __construct(private readonly TranslatorInterface $translator) {}
+    public function __construct(private readonly TranslatorInterface $translator, private readonly CandidateRepository $candidateRepository) {}
 
-    #[Route('/elimination/{elimination}', name: 'tvdt_elimination', requirements: ['elimination' => Requirement::UUID])]
     #[IsGranted(SeasonVoter::ELIMINATION, 'elimination')]
+    #[Route('/elimination/{elimination}', name: 'tvdt_elimination', requirements: ['elimination' => Requirement::UUID])]
     public function index(#[MapEntity] Elimination $elimination, Request $request): Response
     {
         $form = $this->createForm(EliminationEnterNameType::class);
@@ -39,7 +39,7 @@ final class EliminationController extends AbstractController
         if ($form->isSubmitted() && $form->isValid()) {
             $name = $form->get('name')->getData();
 
-            return $this->redirectToRoute('tvdt_elimination_candidate', ['elimination' => $elimination->getId(), 'candidateHash' => Base64::base64UrlEncode($name)]);
+            return $this->redirectToRoute('tvdt_elimination_candidate', ['elimination' => $elimination->id, 'candidateHash' => Base64::base64UrlEncode($name)]);
         }
 
         return $this->render('quiz/elimination/index.html.twig', [
@@ -48,25 +48,25 @@ final class EliminationController extends AbstractController
         ]);
     }
 
-    #[Route('/elimination/{elimination}/{candidateHash}', name: 'tvdt_elimination_candidate', requirements: ['elimination' => Requirement::UUID, 'candidateHash' => self::CANDIDATE_HASH_REGEX])]
     #[IsGranted(SeasonVoter::ELIMINATION, 'elimination')]
-    public function candidateScreen(Elimination $elimination, string $candidateHash, CandidateRepository $candidateRepository): Response
+    #[Route('/elimination/{elimination}/{candidateHash}', name: 'tvdt_elimination_candidate', requirements: ['elimination' => Requirement::UUID, 'candidateHash' => self::CANDIDATE_HASH_REGEX])]
+    public function candidateScreen(Elimination $elimination, string $candidateHash): Response
     {
-        $candidate = $candidateRepository->getCandidateByHash($elimination->getQuiz()->getSeason(), $candidateHash);
+        $candidate = $this->candidateRepository->getCandidateByHash($elimination->quiz->season, $candidateHash);
         if (!$candidate instanceof Candidate) {
             $this->addFlash(FlashType::Warning,
                 t('Cound not find candidate with name %name%', ['%name%' => Base64::base64UrlDecode($candidateHash)])->trans($this->translator),
             );
 
-            return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->getId()]);
+            return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);
         }
 
-        $screenColour = $elimination->getScreenColour($candidate->getName());
+        $screenColour = $elimination->getScreenColour($candidate->name);
 
         if (null === $screenColour) {
-            $this->addFlash(FlashType::Warning, $this->translator->trans('Cound not find candidate with name %name% in elimination.', ['%name%' => $candidate->getName()]));
+            $this->addFlash(FlashType::Warning, $this->translator->trans('Cound not find candidate with name %name% in elimination.', ['%name%' => $candidate->name]));
 
-            return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->getId()]);
+            return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);
         }
 
         return $this->render('quiz/elimination/candidate.html.twig', [

src/Controller/LoginController.php

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

src/Controller/QuizController.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Tvdt\Controller;
 
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Attribute\AsController;
@@ -22,7 +23,6 @@ use Tvdt\Form\SelectSeasonType;
 use Tvdt\Helpers\Base64;
 use Tvdt\Repository\AnswerRepository;
 use Tvdt\Repository\CandidateRepository;
-use Tvdt\Repository\GivenAnswerRepository;
 use Tvdt\Repository\QuestionRepository;
 use Tvdt\Repository\QuizCandidateRepository;
 use Tvdt\Repository\SeasonRepository;
@@ -30,10 +30,10 @@ use Tvdt\Repository\SeasonRepository;
 #[AsController]
 final class QuizController extends AbstractController
 {
-    public function __construct(private readonly TranslatorInterface $translator) {}
+    public function __construct(private readonly TranslatorInterface $translator, private readonly EntityManagerInterface $entityManager, private readonly SeasonRepository $seasonRepository, private readonly CandidateRepository $candidateRepository, private readonly QuestionRepository $questionRepository, private readonly AnswerRepository $answerRepository, private readonly QuizCandidateRepository $quizCandidateRepository) {}
 
     #[Route(path: '/', name: 'tvdt_quiz_select_season', methods: ['GET', 'POST'])]
-    public function selectSeason(Request $request, SeasonRepository $seasonRepository): Response
+    public function selectSeason(Request $request): Response
     {
         $form = $this->createForm(SelectSeasonType::class);
         $form->handleRequest($request);
@@ -41,7 +41,7 @@ final class QuizController extends AbstractController
         if ($form->isSubmitted() && $form->isValid()) {
             $seasonCode = $form->get('season_code')->getData();
 
-            if ([] === $seasonRepository->findBy(['seasonCode' => $seasonCode])) {
+            if ([] === $this->seasonRepository->findBy(['seasonCode' => $seasonCode])) {
                 $this->addFlash(FlashType::Warning, $this->translator->trans('Invalid season code'));
 
                 return $this->redirectToRoute('tvdt_quiz_select_season');
@@ -65,7 +65,7 @@ final class QuizController extends AbstractController
         if ($form->isSubmitted() && $form->isValid()) {
             $name = $form->get('name')->getData();
 
-            return $this->redirectToRoute('tvdt_quiz_quiz_page', ['seasonCode' => $season->getSeasonCode(), 'nameHash' => Base64::base64UrlEncode($name)]);
+            return $this->redirectToRoute('tvdt_quiz_quiz_page', ['seasonCode' => $season->seasonCode, 'nameHash' => Base64::base64UrlEncode($name)]);
         }
 
         return $this->render('quiz/enter_name.twig', ['season' => $season, 'form' => $form]);
@@ -80,51 +80,52 @@ final class QuizController extends AbstractController
         Season $season,
         string $nameHash,
         Request $request,
-        CandidateRepository $candidateRepository,
-        QuestionRepository $questionRepository,
-        AnswerRepository $answerRepository,
-        GivenAnswerRepository $givenAnswerRepository,
-        QuizCandidateRepository $quizCandidateRepository,
     ): Response {
-        $candidate = $candidateRepository->getCandidateByHash($season, $nameHash);
+        $candidate = $this->candidateRepository->getCandidateByHash($season, $nameHash);
 
         if (!$candidate instanceof Candidate) {
             $this->addFlash(FlashType::Danger, $this->translator->trans('Candidate not found'));
 
-            return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->getSeasonCode()]);
+            return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->seasonCode]);
         }
 
-        $quiz = $season->getActiveQuiz();
+        $quiz = $season->activeQuiz;
 
         if (!$quiz instanceof Quiz) {
             $this->addFlash(FlashType::Warning, $this->translator->trans('There is no active quiz'));
 
-            return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->getSeasonCode()]);
+            return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->seasonCode]);
         }
 
         if ('POST' === $request->getMethod()) {
-            $answer = $answerRepository->findOneBy(['id' => $request->request->get('answer')]);
+            // TODO: Extract saving answer logic to a service
+            $answer = $this->answerRepository->findOneBy(['id' => $request->request->get('answer')]);
 
             if (!$answer instanceof Answer) {
                 throw new BadRequestHttpException('Invalid Answer ID');
             }
 
-            $givenAnswer = new GivenAnswer($candidate, $answer->getQuestion()->getQuiz(), $answer);
+            $givenAnswer = new GivenAnswer($candidate, $answer->question->quiz, $answer);
-            $givenAnswerRepository->save($givenAnswer);
+            $this->entityManager->persist($givenAnswer);
+            $this->entityManager->flush();
 
-            return $this->redirectToRoute('tvdt_quiz_quiz_page', ['seasonCode' => $season->getSeasonCode(), 'nameHash' => $nameHash]);
+            // end of extarcting saving answer logic
+            return $this->redirectToRoute('tvdt_quiz_quiz_page', ['seasonCode' => $season->seasonCode, 'nameHash' => $nameHash]);
         }
 
-        $question = $questionRepository->findNextQuestionForCandidate($candidate);
+        // TODO: Extract getting next question logic to a service
+        $question = $this->questionRepository->findNextQuestionForCandidate($candidate);
 
+        // Keep creating flash here based on the return type of service call
         if (!$question instanceof Question) {
             $this->addFlash(FlashType::Success, $this->translator->trans('Quiz completed'));
 
-            return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->getSeasonCode()]);
+            return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->seasonCode]);
         }
 
-        $quizCandidateRepository->createIfNotExist($quiz, $candidate);
+        $this->quizCandidateRepository->createIfNotExist($quiz, $candidate);
 
+        // end of extracting getting next question logic
         return $this->render('quiz/question.twig', ['candidate' => $candidate, 'question' => $question, 'season' => $season]);
     }
 }

src/Controller/RegistrationController.php

@@ -9,6 +9,7 @@ use Psr\Log\LoggerInterface;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
@@ -23,15 +24,12 @@ use Tvdt\Security\EmailVerifier;
 
 final class RegistrationController extends AbstractController
 {
-    public function __construct(private readonly EmailVerifier $emailVerifier, private readonly TranslatorInterface $translator) {}
+    public function __construct(private readonly EmailVerifier $emailVerifier, private readonly TranslatorInterface $translator, private readonly UserPasswordHasherInterface $userPasswordHasher, private readonly Security $security, private readonly LoggerInterface $logger, private readonly UserRepository $userRepository) {}
 
     #[Route('/register', name: 'tvdt_register')]
     public function register(
         Request $request,
-        UserPasswordHasherInterface $userPasswordHasher,
-        Security $security,
         EntityManagerInterface $entityManager,
-        LoggerInterface $logger,
     ): Response {
         $user = new User();
         $form = $this->createForm(RegistrationFormType::class, $user);
@@ -41,7 +39,7 @@ final class RegistrationController extends AbstractController
             /** @var string $plainPassword */
             $plainPassword = $form->get('plainPassword')->getData();
 
-            $user->setPassword($userPasswordHasher->hashPassword($user, $plainPassword));
+            $user->password = $this->userPasswordHasher->hashPassword($user, $plainPassword);
 
             $entityManager->persist($user);
             $entityManager->flush();
@@ -50,15 +48,15 @@ final class RegistrationController extends AbstractController
                 // generate a signed url and email it to the user
                 $this->emailVerifier->sendEmailConfirmation('tvdt_verify_email', $user,
                     new TemplatedEmail()
-                        ->to((string) $user->getEmail())
+                        ->to($user->email)
                         ->subject($this->translator->trans('Please Confirm your Email'))
                         ->htmlTemplate('backoffice/registration/confirmation_email.html.twig'),
                 );
             } catch (TransportExceptionInterface $e) {
-                $logger->error($e->getMessage());
+                $this->logger->error($e->getMessage());
             }
 
-            $response = $security->login($user, 'form_login', 'main');
+            $response = $this->security->login($user, 'form_login', 'main');
             \assert($response instanceof Response);
 
             return $response;
@@ -70,7 +68,7 @@ final class RegistrationController extends AbstractController
     }
 
     #[Route('/verify/email', name: 'tvdt_verify_email')]
-    public function verifyUserEmail(Request $request, TranslatorInterface $translator, UserRepository $userRepository): Response
+    public function verifyUserEmail(Request $request): RedirectResponse
     {
         $id = $request->query->get('id');
 
@@ -78,7 +76,7 @@ final class RegistrationController extends AbstractController
             return $this->redirectToRoute('tvdt_register');
         }
 
-        $user = $userRepository->find($id);
+        $user = $this->userRepository->find($id);
 
         if (null === $user) {
             return $this->redirectToRoute('tvdt_register');
@@ -88,7 +86,7 @@ final class RegistrationController extends AbstractController
         try {
             $this->emailVerifier->handleEmailConfirmation($request, $user);
         } catch (VerifyEmailExceptionInterface $verifyEmailException) {
-            $this->addFlash('verify_email_error', $translator->trans($verifyEmailException->getReason(), [], 'VerifyEmailBundle'));
+            $this->addFlash('verify_email_error', $this->translator->trans($verifyEmailException->getReason(), [], 'VerifyEmailBundle'));
 
             return $this->redirectToRoute('tvdt_register');
         }

src/DataFixtures/KrtekFixtures.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Tvdt\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
 use Doctrine\Persistence\ObjectManager;
 use Tvdt\Entity\Answer;
 use Tvdt\Entity\Candidate;
@@ -12,15 +13,23 @@ use Tvdt\Entity\Question;
 use Tvdt\Entity\Quiz;
 use Tvdt\Entity\Season;
 
-class KrtekFixtures extends Fixture
+final class KrtekFixtures extends Fixture implements FixtureGroupInterface
 {
+    public const string KRTEK_SEASON = 'krtek-seaspm';
+
+    public static function getGroups(): array
+    {
+        return ['test', 'dev'];
+    }
+
     public function load(ObjectManager $manager): void
     {
         $season = new Season();
         $manager->persist($season);
 
-        $season->setName('Krtek Weekend')
+        $season->name = 'Krtek Weekend';
-            ->setSeasonCode('krtek')
+        $season->seasonCode = 'krtek';
+        $season
             ->addCandidate(new Candidate('Claudia'))
             ->addCandidate(new Candidate('Eelco'))
             ->addCandidate(new Candidate('Elise'))
@@ -35,338 +44,343 @@ class KrtekFixtures extends Fixture
             ->addCandidate(new Candidate('Robbert'))
             ->addCandidate(new Candidate('Tom'));
         $quiz1 = $this->createQuiz1($season);
-        $season->addQuiz($quiz1)
+        $season->addQuiz($quiz1);
-            ->setActiveQuiz($quiz1)
+        $season->activeQuiz = $quiz1;
-            ->addQuiz($this->createQuiz2($season));
+        $season->addQuiz($this->createQuiz2($season));
 
         $manager->flush();
+
+        $this->addReference(self::KRTEK_SEASON, $season);
     }
 
     private function createQuiz1(Season $season): Quiz
     {
-        return new Quiz()
+        $quiz = new Quiz();
-            ->setName('Quiz 1')
+        $quiz->name = 'Quiz 1';
-            ->setSeason($season)
+        $quiz->season = $season;
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Is de Krtek een man of een vrouw?')
+        $q->question = 'Is de Krtek een man of een vrouw?';
-                ->addAnswer(new Answer('Vrouw', true))
+        $q->addAnswer(new Answer('Vrouw', true))
-                ->addAnswer(new Answer('Man'))
+          ->addAnswer(new Answer('Man'));
-                ->setOrdering(1),
+        $q->ordering = 1;
-            )
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Hoeveel broers heeft de Krtek?')
+        $q->question = 'Hoeveel broers heeft de Krtek?';
-                ->addAnswer(new Answer('Geen', true))
+        $q->addAnswer(new Answer('Geen', true))
-                ->addAnswer(new Answer('1'))
+          ->addAnswer(new Answer('1'))
-                ->addAnswer(new Answer('2'))
+          ->addAnswer(new Answer('2'));
-                ->setOrdering(2),
+        $q->ordering = 2;
-            )
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Wat is de lievelingsfeestdag van de Krtek?')
+        $q->question = 'Wat is de lievelingsfeestdag van de Krtek?';
-                ->addAnswer(new Answer('Geen'))
+        $q->addAnswer(new Answer('Geen'))
-                ->addAnswer(new Answer('Diens eigen verjaardag'))
+          ->addAnswer(new Answer('Diens eigen verjaardag'))
-                ->addAnswer(new Answer('Koningsdag'))
+          ->addAnswer(new Answer('Koningsdag'))
-                ->addAnswer(new Answer('Kerst', true))
+          ->addAnswer(new Answer('Kerst', true))
-                ->addAnswer(new Answer('Oud en Nieuw'))
+          ->addAnswer(new Answer('Oud en Nieuw'));
-                ->setOrdering(3),
+        $q->ordering = 3;
-            )
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Hoe kwam de Krtek naar Kersteren vandaag?')
+        $q->question = 'Hoe kwam de Krtek naar Kersteren vandaag?';
-                ->addAnswer(new Answer('Met het OV', true))
+        $q->addAnswer(new Answer('Met het OV', true))
-                ->addAnswer(new Answer('Met de auto'))
+          ->addAnswer(new Answer('Met de auto'));
-                ->setOrdering(4),
+        $q->ordering = 4;
-            )
+        $quiz->addQuestion($q);
-            ->addQuestion(new Question()
-                ->setQuestion('Met wie keek de Krtek video bij binnenkomst?')
-                ->addAnswer(new Answer('Claudia'))
-                ->addAnswer(new Answer('Eelco'))
-                ->addAnswer(new Answer('Elise'))
-                ->addAnswer(new Answer('Gert-Jan'))
-                ->addAnswer(new Answer('Iris'))
-                ->addAnswer(new Answer('Jari'))
-                ->addAnswer(new Answer('Lara'))
-                ->addAnswer(new Answer('Lotte'))
-                ->addAnswer(new Answer('Myrthe'))
-                ->addAnswer(new Answer('Philine'))
-                ->addAnswer(new Answer('Remy'))
-                ->addAnswer(new Answer('Robbert'))
-                ->addAnswer(new Answer('Tom', true))
-                ->setOrdering(5),
-            )
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Welk advies zou de Krtek zichzelf als kind geven?')
+        $q->question = 'Met wie keek de Krtek video bij binnenkomst?';
-                ->addAnswer(new Answer('Geef je vader een knuffel.'))
+        $q->addAnswer(new Answer('Claudia'))
-                ->addAnswer(new Answer('Trek je wat minder aan van anderen.'))
+          ->addAnswer(new Answer('Eelco'))
-                ->addAnswer(new Answer('Luister meer naar je eigen gevoel in plaats van naar wat anderen vinden.'))
+          ->addAnswer(new Answer('Elise'))
-                ->addAnswer(new Answer('Stel niet alles tot het laatste moment uit.'))
+          ->addAnswer(new Answer('Gert-Jan'))
-                ->addAnswer(new Answer('Altijd doorgaan.'))
+          ->addAnswer(new Answer('Iris'))
-                ->addAnswer(new Answer('Probeer ook eens buiten de lijntjes te kleuren', true))
+          ->addAnswer(new Answer('Jari'))
-                ->addAnswer(new Answer('Ga als je groot bent op groepsreis! '))
+          ->addAnswer(new Answer('Lara'))
-                ->addAnswer(new Answer('Trek minder aan van de mening van anderen, het is oké om anders te zijn.'))
+          ->addAnswer(new Answer('Lotte'))
-                ->setOrdering(6),
+          ->addAnswer(new Answer('Myrthe'))
-            )
+          ->addAnswer(new Answer('Philine'))
+          ->addAnswer(new Answer('Remy'))
+          ->addAnswer(new Answer('Robbert'))
+          ->addAnswer(new Answer('Tom', true));
+        $q->ordering = 5;
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Wat voor soort schoenen droeg de Krtek bij het diner?')
+        $q->question = 'Welk advies zou de Krtek zichzelf als kind geven?';
-                ->addAnswer(new Answer('Sneakers'))
+        $q->addAnswer(new Answer('Geef je vader een knuffel.'))
-                ->addAnswer(new Answer('Wandel-/bergschoenen', true))
+          ->addAnswer(new Answer('Trek je wat minder aan van anderen.'))
-                ->addAnswer(new Answer('Lederen schoenen'))
+          ->addAnswer(new Answer('Luister meer naar je eigen gevoel in plaats van naar wat anderen vinden.'))
-                ->addAnswer(new Answer('Pantoffels'))
+          ->addAnswer(new Answer('Stel niet alles tot het laatste moment uit.'))
-                ->addAnswer(new Answer('Hakken'))
+          ->addAnswer(new Answer('Altijd doorgaan.'))
-                ->addAnswer(new Answer('Geen schoenen, alleen sokken'))
+          ->addAnswer(new Answer('Probeer ook eens buiten de lijntjes te kleuren', true))
-                ->setOrdering(7),
+          ->addAnswer(new Answer('Ga als je groot bent op groepsreis! '))
-            )
+          ->addAnswer(new Answer('Trek minder aan van de mening van anderen, het is oké om anders te zijn.'));
+        $q->ordering = 6;
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Met welk vervoersmiddel reist de Krtek het liefste?')
+        $q->question = 'Wat voor soort schoenen droeg de Krtek bij het diner?';
-                ->addAnswer(new Answer('Fiets', true))
+        $q->addAnswer(new Answer('Sneakers'))
-                ->addAnswer(new Answer('Auto'))
+          ->addAnswer(new Answer('Wandel-/bergschoenen', true))
-                ->addAnswer(new Answer('Trein'))
+          ->addAnswer(new Answer('Lederen schoenen'))
-                ->setOrdering(8),
+          ->addAnswer(new Answer('Pantoffels'))
-            )
+          ->addAnswer(new Answer('Hakken'))
+          ->addAnswer(new Answer('Geen schoenen, alleen sokken'));
+        $q->ordering = 7;
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Heeft de Krtek een eigen auto?')
+        $q->question = 'Met welk vervoersmiddel reist de Krtek het liefste?';
-                ->addAnswer(new Answer('Ja'))
+        $q->addAnswer(new Answer('Fiets', true))
-                ->addAnswer(new Answer('Nee', true))
+          ->addAnswer(new Answer('Auto'))
-                ->setOrdering(9),
+          ->addAnswer(new Answer('Trein'));
-            )
+        $q->ordering = 8;
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Van wie is de quote die de Krtek gepakt heeft')
+        $q->question = 'Heeft de Krtek een eigen auto?';
-                ->addAnswer(new Answer('Karen'))
+        $q->addAnswer(new Answer('Ja'))
-                ->addAnswer(new Answer('Gilles de Coster'))
+          ->addAnswer(new Answer('Nee', true));
-                ->addAnswer(new Answer('Kees Tol'))
+        $q->ordering = 9;
-                ->addAnswer(new Answer('Harry en John'))
+        $quiz->addQuestion($q);
-                ->addAnswer(new Answer('Georgina Verbaan'))
-                ->addAnswer(new Answer('Marc-Marie Huijbregts'))
-                ->addAnswer(new Answer('Fresia Cousiño Arias, Rik van de Westelaken'))
-                ->addAnswer(new Answer('Ellie Lust'))
-                ->addAnswer(new Answer('Bouba'))
-                ->addAnswer(new Answer('Jan Versteegh'))
-                ->addAnswer(new Answer('Dick Jol'))
-                ->addAnswer(new Answer('Karin de Groot'))
-                ->addAnswer(new Answer('Pieter'))
-                ->addAnswer(new Answer('Renée Fokker'))
-                ->addAnswer(new Answer('Sam, Davy', true))
-                ->setOrdering(10),
-            )
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Zou de Krtek molboekjes, jokers, vrijstellingen of topito’s uit iemands rugzak stelen om te kunnen winnen?')
+        $q->question = 'Van wie is de quote die de Krtek gepakt heeft';
-                ->addAnswer(new Answer('Ja'))
+        $q->addAnswer(new Answer('Karen'))
-                ->addAnswer(new Answer('Nee', true))
+          ->addAnswer(new Answer('Gilles de Coster'))
-                ->setOrdering(11),
+          ->addAnswer(new Answer('Kees Tol'))
-            )
+          ->addAnswer(new Answer('Harry en John'))
+          ->addAnswer(new Answer('Georgina Verbaan'))
+          ->addAnswer(new Answer('Marc-Marie Huijbregts'))
+          ->addAnswer(new Answer('Fresia Cousiño Arias, Rik van de Westelaken'))
+          ->addAnswer(new Answer('Ellie Lust'))
+          ->addAnswer(new Answer('Bouba'))
+          ->addAnswer(new Answer('Jan Versteegh'))
+          ->addAnswer(new Answer('Dick Jol'))
+          ->addAnswer(new Answer('Karin de Groot'))
+          ->addAnswer(new Answer('Pieter'))
+          ->addAnswer(new Answer('Renée Fokker'))
+          ->addAnswer(new Answer('Sam, Davy', true));
+        $q->ordering = 10;
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('In wat voor bed slaapt de Krtek dit weekend?')
+        $q->question = 'Zou de Krtek molboekjes, jokers, vrijstellingen of topito’s uit iemands rugzak stelen om te kunnen winnen?';
-                ->addAnswer(new Answer('Éénpersoons, losstaand bed'))
+        $q->addAnswer(new Answer('Ja'))
-                ->addAnswer(new Answer('Éénpersoonsbed, tegen een ander bed aan', true))
+          ->addAnswer(new Answer('Nee', true));
-                ->addAnswer(new Answer('Tweepersoons bed'))
+        $q->ordering = 11;
-                ->setOrdering(12),
+        $quiz->addQuestion($q);
-            )
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Hoeveel jaar heeft de Krtek gedaan over de middelbare school?')
+        $q->question = 'In wat voor bed slaapt de Krtek dit weekend?';
-                ->addAnswer(new Answer('5'))
+        $q->addAnswer(new Answer('Éénpersoons, losstaand bed'))
-                ->addAnswer(new Answer('6', true))
+          ->addAnswer(new Answer('Éénpersoonsbed, tegen een ander bed aan', true))
-                ->addAnswer(new Answer('7'))
+          ->addAnswer(new Answer('Tweepersoons bed'));
-                ->addAnswer(new Answer('8'))
+        $q->ordering = 12;
-                ->setOrdering(13),
+        $quiz->addQuestion($q);
-            )
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Waar zat de Krtek aan tafel bij het diner?')
+        $q->question = 'Hoeveel jaar heeft de Krtek gedaan over de middelbare school?';
-                ->addAnswer(new Answer('Met de rug naar de accommodatie'))
+        $q->addAnswer(new Answer('5'))
-                ->addAnswer(new Answer('Met de rug naar de buitenmuur', true))
+          ->addAnswer(new Answer('6', true))
-                ->setOrdering(14),
+          ->addAnswer(new Answer('7'))
-            )
+          ->addAnswer(new Answer('8'));
+        $q->ordering = 13;
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Wie is de Krtek?')
+        $q->question = 'Waar zat de Krtek aan tafel bij het diner?';
-                ->addAnswer(new Answer('Claudia', true))
+        $q->addAnswer(new Answer('Met de rug naar de accommodatie'))
-                ->addAnswer(new Answer('Eelco'))
+          ->addAnswer(new Answer('Met de rug naar de buitenmuur', true));
-                ->addAnswer(new Answer('Elise'))
+        $q->ordering = 14;
-                ->addAnswer(new Answer('Gert-Jan'))
+        $quiz->addQuestion($q);
-                ->addAnswer(new Answer('Iris'))
+
-                ->addAnswer(new Answer('Jari'))
+        $q = new Question();
-                ->addAnswer(new Answer('Lara'))
+        $q->question = 'Wie is de Krtek?';
-                ->addAnswer(new Answer('Lotte'))
+        $q->addAnswer(new Answer('Claudia', true))
-                ->addAnswer(new Answer('Myrthe'))
+          ->addAnswer(new Answer('Eelco'))
-                ->addAnswer(new Answer('Philine'))
+          ->addAnswer(new Answer('Elise'))
-                ->addAnswer(new Answer('Remy'))
+          ->addAnswer(new Answer('Gert-Jan'))
-                ->addAnswer(new Answer('Robbert'))
+          ->addAnswer(new Answer('Iris'))
-                ->addAnswer(new Answer('Tom'))
+          ->addAnswer(new Answer('Jari'))
-                ->setOrdering(15),
+          ->addAnswer(new Answer('Lara'))
-            )
+          ->addAnswer(new Answer('Lotte'))
-        ;
+          ->addAnswer(new Answer('Myrthe'))
+          ->addAnswer(new Answer('Philine'))
+          ->addAnswer(new Answer('Remy'))
+          ->addAnswer(new Answer('Robbert'))
+          ->addAnswer(new Answer('Tom'));
+        $q->ordering = 15;
+        $quiz->addQuestion($q);
+
+        return $quiz;
     }
 
     private function createQuiz2(Season $season): Quiz
     {
-        return new Quiz()
+        $quiz = new Quiz();
-            ->setName('Quiz 2')
+        $quiz->name = 'Quiz 2';
-            ->setSeason($season)
+        $quiz->season = $season;
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Is de Krtek een man of een vrouw?')
+        $q->question = 'Is de Krtek een man of een vrouw?';
-                ->addAnswer(new Answer('Man'))
+        $q->addAnswer(new Answer('Man'))
-                ->addAnswer(new Answer('Vrouw', true))
+          ->addAnswer(new Answer('Vrouw', true));
-                ->setOrdering(1),
+        $q->ordering = 1;
-            )
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Heeft de Krtek dieetwensen of allergieën?')
+        $q->question = 'Heeft de Krtek dieetwensen of allergieën?';
-                ->addAnswer(new Answer('nee'))
+        $q->addAnswer(new Answer('nee'))
-                ->addAnswer(new Answer('De Krtek is vegetariër', true))
+          ->addAnswer(new Answer('De Krtek is vegetariër', true))
-                ->addAnswer(new Answer('De Krtek is flexitariër'))
+          ->addAnswer(new Answer('De Krtek is flexitariër'))
-                ->addAnswer(new Answer('De Krtek heeft een allergie'))
+          ->addAnswer(new Answer('De Krtek heeft een allergie'))
-                ->addAnswer(new Answer('De Krtek heeft een intolerantie'))
+          ->addAnswer(new Answer('De Krtek heeft een intolerantie'))
-                ->addAnswer(new Answer('De Krtek eet geen rundvlees'))
+          ->addAnswer(new Answer('De Krtek eet geen rundvlees'))
-                ->addAnswer(new Answer('De Krtek eet geen waterdieren'))
+          ->addAnswer(new Answer('De Krtek eet geen waterdieren'));
-                ->setOrdering(2),
+        $q->ordering = 2;
-            )
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Hoe heet het huisdier/de huisdieren van de Krtek?')
+        $q->question = 'Hoe heet het huisdier/de huisdieren van de Krtek?';
-                ->addAnswer(new Answer('Amy, Karel en Floyd'))
+        $q->addAnswer(new Answer('Amy, Karel en Floyd'))
-                ->addAnswer(new Answer('Flip en Majoor'))
+          ->addAnswer(new Answer('Flip en Majoor'))
-                ->addAnswer(new Answer('Benji'))
+          ->addAnswer(new Answer('Benji'))
-                ->addAnswer(new Answer('Sini'))
+          ->addAnswer(new Answer('Sini'))
-                ->addAnswer(new Answer('Tom'))
+          ->addAnswer(new Answer('Tom'))
-                ->addAnswer(new Answer('De huisdieren van de Krtek hebben geen naam'))
+          ->addAnswer(new Answer('De huisdieren van de Krtek hebben geen naam'))
-                ->addAnswer(new Answer('De Krtek heeft geen huisdieren', true))
+          ->addAnswer(new Answer('De Krtek heeft geen huisdieren', true));
-                ->setOrdering(3),
+        $q->ordering = 3;
-            )
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Wat dronk de Krtek deze ochtend bij het ontbijt?')
+        $q->question = 'Wat dronk de Krtek deze ochtend bij het ontbijt?';
-                ->addAnswer(new Answer('Koffie'))
+        $q->addAnswer(new Answer('Koffie'))
-                ->addAnswer(new Answer('Thee'))
+          ->addAnswer(new Answer('Thee'))
-                ->addAnswer(new Answer('Water', true))
+          ->addAnswer(new Answer('Water', true))
-                ->addAnswer(new Answer('Melk'))
+          ->addAnswer(new Answer('Melk'))
-                ->addAnswer(new Answer('Sap'))
+          ->addAnswer(new Answer('Sap'))
-                ->addAnswer(new Answer('Niks'))
+          ->addAnswer(new Answer('Niks'));
-                ->setOrdering(4),
+        $q->ordering = 4;
-            )
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Waar ging de eerste vakantie die de Krtek zich nog herinnert heen?')
+        $q->question = 'Waar ging de eerste vakantie die de Krtek zich nog herinnert heen?';
-                ->addAnswer(new Answer('Denemarken'))
+        $q->addAnswer(new Answer('Denemarken'))
-                ->addAnswer(new Answer('Drenthe'))
+          ->addAnswer(new Answer('Drenthe'))
-                ->addAnswer(new Answer('Mallorca'))
+          ->addAnswer(new Answer('Mallorca'))
-                ->addAnswer(new Answer('Marokko'))
+          ->addAnswer(new Answer('Marokko'))
-                ->addAnswer(new Answer('Oostenrijk'))
+          ->addAnswer(new Answer('Oostenrijk'))
-                ->addAnswer(new Answer('Turkije'))
+          ->addAnswer(new Answer('Turkije'))
-                ->addAnswer(new Answer('Zweden', true))
+          ->addAnswer(new Answer('Zweden', true));
-                ->setOrdering(5),
+        $q->ordering = 5;
-            )
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Met welk groepje ging de Krtek als eerste het Douanespel in?')
+        $q->question = 'Met welk groepje ging de Krtek als eerste het Douanespel in?';
-                ->addAnswer(new Answer('Het eerste groepje', true))
+        $q->addAnswer(new Answer('Het eerste groepje', true))
-                ->addAnswer(new Answer('Het tweede groepje'))
+          ->addAnswer(new Answer('Het tweede groepje'))
-                ->addAnswer(new Answer('Het derde groepje'))
+          ->addAnswer(new Answer('Het derde groepje'))
-                ->addAnswer(new Answer('Het vierde groepje'))
+          ->addAnswer(new Answer('Het vierde groepje'))
-                ->addAnswer(new Answer('Het vijfde groepje'))
+          ->addAnswer(new Answer('Het vijfde groepje'));
-                ->setOrdering(6),
+        $q->ordering = 6;
-            )
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Gelooft de Krtek ergens in?')
+        $q->question = 'Gelooft de Krtek ergens in?';
-                ->addAnswer(new Answer('Nee'))
+        $q->addAnswer(new Answer('Nee'))
-                ->addAnswer(new Answer('Het universum', true))
+          ->addAnswer(new Answer('Het universum', true))
-                ->addAnswer(new Answer('Toeval'))
+          ->addAnswer(new Answer('Toeval'))
-                ->addAnswer(new Answer('De Krtek is hindoeïstisch'))
+          ->addAnswer(new Answer('De Krtek is hindoeïstisch'));
-                ->setOrdering(7),
+        $q->ordering = 7;
-            )
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('At de Krtek op vrijdagavond heksenkaas tijdens het diner?')
+        $q->question = 'At de Krtek op vrijdagavond heksenkaas tijdens het diner?';
-                ->addAnswer(new Answer('Ja', true))
+        $q->addAnswer(new Answer('Ja', true))
-                ->addAnswer(new Answer('Nee'))
+          ->addAnswer(new Answer('Nee'));
-                ->setOrdering(8),
+        $q->ordering = 8;
-            )
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Hoe laat ging de Krtek gisteravond naar bed?')
+        $q->question = 'Hoe laat ging de Krtek gisteravond naar bed?';
-                ->addAnswer(new Answer('Tussen 0:00 en 0:59 uur'))
+        $q->addAnswer(new Answer('Tussen 0:00 en 0:59 uur'))
-                ->addAnswer(new Answer('Tussen 1:00 en 1:59 uur', true))
+          ->addAnswer(new Answer('Tussen 1:00 en 1:59 uur', true))
-                ->addAnswer(new Answer('Tussen 2:00 en 2:59 uur'))
+          ->addAnswer(new Answer('Tussen 2:00 en 2:59 uur'))
-                ->addAnswer(new Answer('Na 3:00'))
+          ->addAnswer(new Answer('Na 3:00'));
-                ->setOrdering(9),
+        $q->ordering = 9;
-            )
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Hoeveel batterijen heeft de Krtek naar het bord gebracht bij het douanespel?')
+        $q->question = 'Hoeveel batterijen heeft de Krtek naar het bord gebracht bij het douanespel?';
-                ->addAnswer(new Answer('1'))
+        $q->addAnswer(new Answer('1'))
-                ->addAnswer(new Answer('2'))
+          ->addAnswer(new Answer('2'))
-                ->addAnswer(new Answer('3'))
+          ->addAnswer(new Answer('3'))
-                ->addAnswer(new Answer('geen', true))
+          ->addAnswer(new Answer('geen', true));
-                ->setOrdering(10),
+        $q->ordering = 10;
-            )
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Wat keek de Krtek als kind graag op TV?')
+        $q->question = 'Wat keek de Krtek als kind graag op TV?';
-                ->addAnswer(new Answer('Digimon', true))
+        $q->addAnswer(new Answer('Digimon', true))
-                ->addAnswer(new Answer('Floris'))
+          ->addAnswer(new Answer('Floris'))
-                ->addAnswer(new Answer('Het huis Anubis'))
+          ->addAnswer(new Answer('Het huis Anubis'))
-                ->addAnswer(new Answer('Sesamstraat'))
+          ->addAnswer(new Answer('Sesamstraat'))
-                ->addAnswer(new Answer('Spongebob Squarepants'))
+          ->addAnswer(new Answer('Spongebob Squarepants'))
-                ->addAnswer(new Answer('Teletubbies'))
+          ->addAnswer(new Answer('Teletubbies'));
-                ->setOrdering(11),
+        $q->ordering = 11;
-            )
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Waarin zat op de heenreis de bagage van de Krtek (voornamelijk)?')
+        $q->question = 'Waarin zat op de heenreis de bagage van de Krtek (voornamelijk)?';
-                ->addAnswer(new Answer('In koffer(s)', true))
+        $q->addAnswer(new Answer('In koffer(s)', true))
-                ->addAnswer(new Answer('In losse tas(sen)'))
+          ->addAnswer(new Answer('In losse tas(sen)'))
-                ->addAnswer(new Answer('In een rugzak'))
+          ->addAnswer(new Answer('In een rugzak'));
-                ->setOrdering(12),
+        $q->ordering = 12;
-            )
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Van welk geluid gaan de haren van de Krtek overeind staan?')
+        $q->question = 'Van welk geluid gaan de haren van de Krtek overeind staan?';
-                ->addAnswer(new Answer('Een vork die door een metalen pan krast '))
+        $q->addAnswer(new Answer('Een vork die door een metalen pan krast '))
-                ->addAnswer(new Answer('Smakkende mensen'))
+          ->addAnswer(new Answer('Smakkende mensen'))
-                ->addAnswer(new Answer('Een vork die over een bord schraapt'))
+          ->addAnswer(new Answer('Een vork die over een bord schraapt'))
-                ->addAnswer(new Answer('Schuren met schuurpapier'))
+          ->addAnswer(new Answer('Schuren met schuurpapier'))
-                ->addAnswer(new Answer('Nagels op een krijtbord'))
+          ->addAnswer(new Answer('Nagels op een krijtbord'))
-                ->addAnswer(new Answer('Servies dat tegen elkaar klettert'))
+          ->addAnswer(new Answer('Servies dat tegen elkaar klettert'))
-                ->addAnswer(new Answer('Het geroekoe van een duif', true))
+          ->addAnswer(new Answer('Het geroekoe van een duif', true))
-                ->addAnswer(new Answer('Piepschuim'))
+          ->addAnswer(new Answer('Piepschuim'));
-                ->setOrdering(13),
+        $q->ordering = 13;
-            )
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Wilde de Krtek penningmeester worden?')
+        $q->question = 'Wilde de Krtek penningmeester worden?';
-                ->addAnswer(new Answer('Ja'))
+        $q->addAnswer(new Answer('Ja'))
-                ->addAnswer(new Answer('Nee', true))
+          ->addAnswer(new Answer('Nee', true));
-                ->setOrdering(14),
+        $q->ordering = 14;
-            )
+        $quiz->addQuestion($q);
 
-            ->addQuestion(new Question()
+        $q = new Question();
-                ->setQuestion('Wie is de Krtek?')
+        $q->question = 'Wie is de Krtek?';
-                ->addAnswer(new Answer('Claudia', true))
+        $q->addAnswer(new Answer('Claudia', true))
-                ->addAnswer(new Answer('Eelco'))
+          ->addAnswer(new Answer('Eelco'))
-                ->addAnswer(new Answer('Elise'))
+          ->addAnswer(new Answer('Elise'))
-                ->addAnswer(new Answer('Gert-Jan'))
+          ->addAnswer(new Answer('Gert-Jan'))
-                ->addAnswer(new Answer('Iris'))
+          ->addAnswer(new Answer('Iris'))
-                ->addAnswer(new Answer('Jari'))
+          ->addAnswer(new Answer('Jari'))
-                ->addAnswer(new Answer('Lara'))
+          ->addAnswer(new Answer('Lara'))
-                ->addAnswer(new Answer('Lotte'))
+          ->addAnswer(new Answer('Lotte'))
-                ->addAnswer(new Answer('Myrthe'))
+          ->addAnswer(new Answer('Myrthe'))
-                ->addAnswer(new Answer('Philine'))
+          ->addAnswer(new Answer('Philine'))
-                ->addAnswer(new Answer('Remy'))
+          ->addAnswer(new Answer('Remy'))
-                ->addAnswer(new Answer('Robbert'))
+          ->addAnswer(new Answer('Robbert'))
-                ->addAnswer(new Answer('Tom'))
+          ->addAnswer(new Answer('Tom'));
-                ->setOrdering(15),
+        $q->ordering = 15;
-            )
+        $quiz->addQuestion($q);
-        ;
+
+        return $quiz;
     }
 }

src/DataFixtures/TestFixtures.php

@@ -0,0 +1,75 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tvdt\DataFixtures;
+
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
+use Doctrine\Common\DataFixtures\DependentFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
+use Tvdt\Entity\Season;
+use Tvdt\Entity\User;
+
+final class TestFixtures extends Fixture implements FixtureGroupInterface, DependentFixtureInterface
+{
+    public const string PASSWORD = 'test1234';
+
+    public function __construct(
+        private readonly UserPasswordHasherInterface $passwordHasher,
+    ) {}
+
+    public static function getGroups(): array
+    {
+        return ['test'];
+    }
+
+    public function getDependencies(): array
+    {
+        return [KrtekFixtures::class];
+    }
+
+    public function load(ObjectManager $manager): void
+    {
+        $user = new User();
+        $user->email = 'test@example.org';
+        $user->password = $this->passwordHasher->hashPassword($user, self::PASSWORD);
+
+        $manager->persist($user);
+
+        $user = new User();
+        $user->email = 'krtek-admin@example.org';
+        $user->password = $this->passwordHasher->hashPassword($user, self::PASSWORD);
+
+        $manager->persist($user);
+
+        $krtek = $this->getReference(KrtekFixtures::KRTEK_SEASON, Season::class);
+        $krtek->addOwner($user);
+
+        $anotherSeason = new Season();
+        $anotherSeason->name = 'Another Season';
+        $anotherSeason->seasonCode = 'bbbbb';
+
+        $manager->persist($anotherSeason);
+        $this->addReference('another-season', $anotherSeason);
+
+        $user = new User();
+        $user->email = 'user1@example.org';
+        $user->password = $this->passwordHasher->hashPassword($user, self::PASSWORD);
+
+        $manager->persist($user);
+        $user->addSeason($anotherSeason);
+
+        $user = new User();
+        $user->email = 'user2@example.org';
+        $user->password = $this->passwordHasher->hashPassword($user, self::PASSWORD);
+
+        $manager->persist($user);
+
+        $krtek->addOwner($user);
+        $anotherSeason->addOwner($user);
+
+        $manager->flush();
+    }
+}

src/Dto/Result.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tvdt\Dto;
+
+use Symfony\Component\Uid\Uuid;
+
+final readonly class Result
+{
+    public function __construct(
+        public Uuid $id,
+        public string $name,
+        public int $correct,
+        public float $corrections,
+        public \DateInterval $time,
+        public float $score,
+    ) {}
+}

src/Entity/Answer.php

@@ -8,7 +8,6 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\AnswerRepository;
@@ -16,115 +15,46 @@ use Tvdt\Repository\AnswerRepository;
 #[ORM\Entity(repositoryClass: AnswerRepository::class)]
 class Answer
 {
-    #[ORM\Id]
     #[ORM\Column(type: UuidType::NAME)]
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
     #[ORM\GeneratedValue(strategy: 'CUSTOM')]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
+    #[ORM\Id]
-    private Uuid $id;
+    public private(set) Uuid $id;
 
     #[ORM\Column(type: Types::SMALLINT, options: ['default' => 0])]
-    private int $ordering = 0;
+    public int $ordering = 0;
 
-    #[ORM\ManyToOne(inversedBy: 'answers')]
     #[ORM\JoinColumn(nullable: false)]
-    private Question $question;
+    #[ORM\ManyToOne(inversedBy: 'answers')]
+    public Question $question;
 
     /** @var Collection<int, Candidate> */
     #[ORM\ManyToMany(targetEntity: Candidate::class, inversedBy: 'answersOnCandidate')]
-    private Collection $candidates;
+    public private(set) Collection $candidates;
 
     /** @var Collection<int, GivenAnswer> */
     #[ORM\OneToMany(targetEntity: GivenAnswer::class, mappedBy: 'answer', orphanRemoval: true)]
-    private Collection $givenAnswers;
+    public private(set) Collection $givenAnswers;
 
     public function __construct(
         #[ORM\Column(length: 255)]
-        private string $text,
+        public string $text,
         #[ORM\Column]
-        private bool $isRightAnswer = false,
+        public bool $isRightAnswer = false,
     ) {
         $this->candidates = new ArrayCollection();
         $this->givenAnswers = new ArrayCollection();
     }
 
-    public function getId(): Uuid
+    public function addCandidate(Candidate $candidate): void
-    {
-        return $this->id;
-    }
-
-    public function getText(): string
-    {
-        return $this->text;
-    }
-
-    public function setText(string $text): static
-    {
-        $this->text = $text;
-
-        return $this;
-    }
-
-    public function getQuestion(): Question
-    {
-        return $this->question;
-    }
-
-    public function setQuestion(Question $question): static
-    {
-        $this->question = $question;
-
-        return $this;
-    }
-
-    public function isRightAnswer(): bool
-    {
-        return $this->isRightAnswer;
-    }
-
-    public function setRightAnswer(bool $isRightAnswer): static
-    {
-        $this->isRightAnswer = $isRightAnswer;
-
-        return $this;
-    }
-
-    /** @return Collection<int, Candidate> */
-    public function getCandidates(): Collection
-    {
-        return $this->candidates;
-    }
-
-    public function addCandidate(Candidate $candidate): static
     {
         if (!$this->candidates->contains($candidate)) {
             $this->candidates->add($candidate);
         }
-
-        return $this;
     }
 
-    public function removeCandidate(Candidate $candidate): static
+    public function removeCandidate(Candidate $candidate): void
     {
         $this->candidates->removeElement($candidate);
-
-        return $this;
-    }
-
-    /** @return Collection<int, GivenAnswer> */
-    public function getGivenAnswers(): Collection
-    {
-        return $this->givenAnswers;
-    }
-
-    public function getOrdering(): int
-    {
-        return $this->ordering;
-    }
-
-    public function setOrdering(int $ordering): self
-    {
-        $this->ordering = $ordering;
-
-        return $this;
     }
 }

src/Entity/Candidate.php

@@ -7,7 +7,6 @@ namespace Tvdt\Entity;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Helpers\Base64;
@@ -17,105 +16,53 @@ use Tvdt\Repository\CandidateRepository;
 #[ORM\UniqueConstraint(fields: ['name', 'season'])]
 class Candidate
 {
-    #[ORM\Id]
     #[ORM\Column(type: UuidType::NAME, unique: true)]
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
     #[ORM\GeneratedValue(strategy: 'CUSTOM')]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
+    #[ORM\Id]
-    private Uuid $id;
+    public private(set) Uuid $id;
 
-    #[ORM\ManyToOne(inversedBy: 'candidates')]
     #[ORM\JoinColumn(nullable: false)]
-    private Season $season;
+    #[ORM\ManyToOne(inversedBy: 'candidates')]
+    public Season $season;
 
     /** @var Collection<int, Answer> */
     #[ORM\ManyToMany(targetEntity: Answer::class, mappedBy: 'candidates')]
-    private Collection $answersOnCandidate;
+    public private(set) Collection $answersOnCandidate;
 
     /** @var Collection<int, GivenAnswer> */
     #[ORM\OneToMany(targetEntity: GivenAnswer::class, mappedBy: 'candidate', orphanRemoval: true)]
-    private Collection $givenAnswers;
+    public private(set) Collection $givenAnswers;
 
     /** @var Collection<int, QuizCandidate> */
     #[ORM\OneToMany(targetEntity: QuizCandidate::class, mappedBy: 'candidate', orphanRemoval: true)]
-    private Collection $quizData;
+    public private(set) Collection $quizData;
+
+    public string $nameHash {
+        get => Base64::base64UrlEncode($this->name);
+    }
 
     public function __construct(
         #[ORM\Column(length: 16)]
-        private string $name,
+        public string $name,
     ) {
         $this->answersOnCandidate = new ArrayCollection();
         $this->givenAnswers = new ArrayCollection();
         $this->quizData = new ArrayCollection();
     }
 
-    public function getId(): Uuid
+    public function addAnswersOnCandidate(Answer $answersOnCandidate): void
-    {
-        return $this->id;
-    }
-
-    public function getSeason(): Season
-    {
-        return $this->season;
-    }
-
-    public function setSeason(Season $season): static
-    {
-        $this->season = $season;
-
-        return $this;
-    }
-
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    public function setName(string $name): static
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    /** @return Collection<int, Answer> */
-    public function getAnswersOnCandidate(): Collection
-    {
-        return $this->answersOnCandidate;
-    }
-
-    public function addAnswersOnCandidate(Answer $answersOnCandidate): static
     {
         if (!$this->answersOnCandidate->contains($answersOnCandidate)) {
             $this->answersOnCandidate->add($answersOnCandidate);
             $answersOnCandidate->addCandidate($this);
         }
-
-        return $this;
     }
 
-    public function removeAnswersOnCandidate(Answer $answersOnCandidate): static
+    public function removeAnswersOnCandidate(Answer $answersOnCandidate): void
     {
         if ($this->answersOnCandidate->removeElement($answersOnCandidate)) {
             $answersOnCandidate->removeCandidate($this);
         }
-
-        return $this;
-    }
-
-    /** @return Collection<int, GivenAnswer> */
-    public function getGivenAnswers(): Collection
-    {
-        return $this->givenAnswers;
-    }
-
-    /** @return Collection<int, QuizCandidate> */
-    public function getQuizData(): Collection
-    {
-        return $this->quizData;
-    }
-
-    public function getNameHash(): string
-    {
-        return Base64::base64UrlEncode($this->name);
     }
 }

src/Entity/Elimination.php

@@ -6,8 +6,7 @@ namespace Tvdt\Entity;
 
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
-use Safe\DateTimeImmutable;
+use Gedmo\Mapping\Annotation as Gedmo;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\Uid\Uuid;
@@ -21,49 +20,26 @@ class Elimination
 
     public const string SCREEN_RED = 'red';
 
-    #[ORM\Id]
     #[ORM\Column(type: UuidType::NAME, unique: true)]
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
     #[ORM\GeneratedValue(strategy: 'CUSTOM')]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
+    #[ORM\Id]
-    private Uuid $id;
+    public private(set) Uuid $id;
 
     /** @var array<string, mixed> */
-    #[ORM\Column(type: Types::JSON)]
+    #[ORM\Column(type: Types::JSONB)]
-    private array $data = [];
+    public array $data = [];
 
+    #[Gedmo\Timestampable(on: 'create')]
     #[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE, nullable: false)]
-    private \DateTimeImmutable $created;
+    public private(set) \DateTimeImmutable $created;
 
     public function __construct(
-        #[ORM\ManyToOne(inversedBy: 'eliminations')]
         #[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
-        private Quiz $quiz,
+        #[ORM\ManyToOne(inversedBy: 'eliminations')]
+        public Quiz $quiz,
     ) {}
 
-    public function getId(): Uuid
-    {
-        return $this->id;
-    }
-
-    /** @return array<string, mixed> */
-    public function getData(): array
-    {
-        return $this->data;
-    }
-
-    /** @param array<string, mixed> $data */
-    public function setData(array $data): self
-    {
-        $this->data = $data;
-
-        return $this;
-    }
-
-    public function getQuiz(): Quiz
-    {
-        return $this->quiz;
-    }
-
     /** @param InputBag<bool|float|int|string> $inputBag */
     public function updateFromInputBag(InputBag $inputBag): self
     {
@@ -79,17 +55,10 @@ class Elimination
 
     public function getScreenColour(?string $name): ?string
     {
+        if (null === $name) {
+            return null;
+        }
+
         return $this->data[$name] ?? null;
     }
-
-    #[ORM\PrePersist]
-    public function setCreatedAtValue(): void
-    {
-        $this->created = new DateTimeImmutable();
-    }
-
-    public function getCreated(): \DateTimeInterface
-    {
-        return $this->created;
-    }
 }

src/Entity/GivenAnswer.php

@@ -6,67 +6,35 @@ namespace Tvdt\Entity;
 
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
-use Safe\DateTimeImmutable;
+use Gedmo\Mapping\Annotation as Gedmo;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\GivenAnswerRepository;
 
 #[ORM\Entity(repositoryClass: GivenAnswerRepository::class)]
-#[ORM\HasLifecycleCallbacks]
 class GivenAnswer
 {
-    #[ORM\Id]
     #[ORM\Column(type: UuidType::NAME, unique: true)]
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
     #[ORM\GeneratedValue(strategy: 'CUSTOM')]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
+    #[ORM\Id]
-    private Uuid $id;
+    public private(set) Uuid $id;
 
+    #[Gedmo\Timestampable(on: 'create')]
     #[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE, nullable: false)]
-    private \DateTimeImmutable $created;
+    public private(set) \DateTimeImmutable $created;
 
     public function __construct(
-        #[ORM\ManyToOne(inversedBy: 'givenAnswers')]
         #[ORM\JoinColumn(nullable: false)]
-        private Candidate $candidate,
+        #[ORM\ManyToOne(inversedBy: 'givenAnswers')]
+        private(set) Candidate $candidate,
 
-        #[ORM\ManyToOne]
         #[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
-        private Quiz $quiz,
+        #[ORM\ManyToOne]
+        private(set) Quiz $quiz,
 
-        #[ORM\ManyToOne(inversedBy: 'givenAnswers')]
         #[ORM\JoinColumn(nullable: false)]
-        private Answer $answer,
+        #[ORM\ManyToOne(inversedBy: 'givenAnswers')]
+        private(set) Answer $answer,
     ) {}
-
-    public function getId(): Uuid
-    {
-        return $this->id;
-    }
-
-    public function getCandidate(): Candidate
-    {
-        return $this->candidate;
-    }
-
-    public function getQuiz(): Quiz
-    {
-        return $this->quiz;
-    }
-
-    public function getAnswer(): Answer
-    {
-        return $this->answer;
-    }
-
-    public function getCreated(): \DateTimeImmutable
-    {
-        return $this->created;
-    }
-
-    #[ORM\PrePersist]
-    public function setCreatedAtValue(): void
-    {
-        $this->created = new DateTimeImmutable();
-    }
 }

src/Entity/Question.php

@@ -8,7 +8,6 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\QuestionRepository;
@@ -16,87 +15,40 @@ use Tvdt\Repository\QuestionRepository;
 #[ORM\Entity(repositoryClass: QuestionRepository::class)]
 class Question
 {
-    #[ORM\Id]
     #[ORM\Column(type: UuidType::NAME)]
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
     #[ORM\GeneratedValue(strategy: 'CUSTOM')]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
+    #[ORM\Id]
-    private Uuid $id;
+    public private(set) Uuid $id;
 
     #[ORM\Column(type: Types::SMALLINT, options: ['default' => 0])]
-    private int $ordering;
+    public int $ordering;
 
     #[ORM\Column(type: Types::STRING, length: 255)]
-    private string $question;
+    public string $question;
 
-    #[ORM\ManyToOne(inversedBy: 'questions')]
     #[ORM\JoinColumn(nullable: false)]
-    private Quiz $quiz;
+    #[ORM\ManyToOne(inversedBy: 'questions')]
+    public Quiz $quiz;
 
     #[ORM\Column]
-    private bool $enabled = true;
+    public bool $enabled = true;
 
     /** @var Collection<int, Answer> */
     #[ORM\OneToMany(targetEntity: Answer::class, mappedBy: 'question', cascade: ['persist'], orphanRemoval: true)]
     #[ORM\OrderBy(['ordering' => 'ASC'])]
-    private Collection $answers;
+    public private(set) Collection $answers;
 
     public function __construct()
     {
         $this->answers = new ArrayCollection();
     }
 
-    public function getId(): Uuid
-    {
-        return $this->id;
-    }
-
-    public function getQuestion(): string
-    {
-        return $this->question;
-    }
-
-    public function setQuestion(string $question): static
-    {
-        $this->question = $question;
-
-        return $this;
-    }
-
-    public function getQuiz(): Quiz
-    {
-        return $this->quiz;
-    }
-
-    public function setQuiz(Quiz $quiz): static
-    {
-        $this->quiz = $quiz;
-
-        return $this;
-    }
-
-    public function isEnabled(): ?bool
-    {
-        return $this->enabled;
-    }
-
-    public function setEnabled(bool $enabled): static
-    {
-        $this->enabled = $enabled;
-
-        return $this;
-    }
-
-    /** @return Collection<int, Answer> */
-    public function getAnswers(): Collection
-    {
-        return $this->answers;
-    }
-
     public function addAnswer(Answer $answer): static
     {
         if (!$this->answers->contains($answer)) {
             $this->answers->add($answer);
-            $answer->setQuestion($this);
+            $answer->question = $this;
         }
 
         return $this;
@@ -108,7 +60,7 @@ class Question
             return 'This question has no answers';
         }
 
-        $correctAnswers = $this->answers->filter(static fn (Answer $answer): bool => $answer->isRightAnswer())->count();
+        $correctAnswers = $this->answers->filter(static fn (Answer $answer): bool => $answer->isRightAnswer)->count();
 
         if (0 === $correctAnswers) {
             return 'This question has no correct answers';
@@ -120,16 +72,4 @@ class Question
 
         return null;
     }
-
-    public function getOrdering(): int
-    {
-        return $this->ordering;
-    }
-
-    public function setOrdering(int $ordering): static
-    {
-        $this->ordering = $ordering;
-
-        return $this;
-    }
 }

src/Entity/Quiz.php

@@ -7,7 +7,6 @@ namespace Tvdt\Entity;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\QuizRepository;
@@ -16,35 +15,35 @@ use Tvdt\Repository\QuizRepository;
 #[ORM\UniqueConstraint(fields: ['name', 'season'])]
 class Quiz
 {
-    #[ORM\Id]
     #[ORM\Column(type: UuidType::NAME)]
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
     #[ORM\GeneratedValue(strategy: 'CUSTOM')]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
+    #[ORM\Id]
-    private Uuid $id;
+    public private(set) Uuid $id;
 
     #[ORM\Column(length: 64)]
-    private string $name;
+    public string $name;
 
-    #[ORM\ManyToOne(inversedBy: 'quizzes')]
     #[ORM\JoinColumn(nullable: false)]
-    private Season $season;
+    #[ORM\ManyToOne(inversedBy: 'quizzes')]
+    public Season $season;
 
     /** @var Collection<int, Question> */
     #[ORM\OneToMany(targetEntity: Question::class, mappedBy: 'quiz', cascade: ['persist'], orphanRemoval: true)]
     #[ORM\OrderBy(['ordering' => 'ASC'])]
-    private Collection $questions;
+    public private(set) Collection $questions;
 
     /** @var Collection<int, QuizCandidate> */
     #[ORM\OneToMany(targetEntity: QuizCandidate::class, mappedBy: 'quiz', orphanRemoval: true)]
-    private Collection $candidateData;
+    public private(set) Collection $candidateData;
 
     #[ORM\Column(nullable: false, options: ['default' => 1])]
-    private int $dropouts = 1;
+    public int $dropouts = 1;
 
     /** @var Collection<int, Elimination> */
     #[ORM\OneToMany(targetEntity: Elimination::class, mappedBy: 'quiz', cascade: ['persist'], orphanRemoval: true)]
     #[ORM\OrderBy(['created' => 'DESC'])]
-    private Collection $eliminations;
+    public private(set) Collection $eliminations;
 
     public function __construct()
     {
@@ -53,75 +52,16 @@ class Quiz
         $this->eliminations = new ArrayCollection();
     }
 
-    public function getId(): Uuid
-    {
-        return $this->id;
-    }
-
-    public function getName(): ?string
-    {
-        return $this->name;
-    }
-
-    public function setName(string $name): static
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    public function getSeason(): Season
-    {
-        return $this->season;
-    }
-
-    public function setSeason(Season $season): static
-    {
-        $this->season = $season;
-
-        return $this;
-    }
-
-    /** @return Collection<int, Question> */
-    public function getQuestions(): Collection
-    {
-        return $this->questions;
-    }
-
     public function addQuestion(Question $question): static
     {
         if (!$this->questions->contains($question)) {
             $this->questions->add($question);
-            $question->setQuiz($this);
+            $question->quiz = $this;
         }
 
         return $this;
     }
 
-    /** @return Collection<int, QuizCandidate> */
-    public function getCandidateData(): Collection
-    {
-        return $this->candidateData;
-    }
-
-    public function getDropouts(): int
-    {
-        return $this->dropouts;
-    }
-
-    public function setDropouts(int $dropouts): static
-    {
-        $this->dropouts = $dropouts;
-
-        return $this;
-    }
-
-    /** @return Collection<int, Elimination> */
-    public function getEliminations(): Collection
-    {
-        return $this->eliminations;
-    }
-
     public function addElimination(Elimination $elimination): self
     {
         $this->eliminations->add($elimination);

src/Entity/QuizCandidate.php

@@ -6,74 +6,35 @@ namespace Tvdt\Entity;
 
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
-use Safe\DateTimeImmutable;
+use Gedmo\Mapping\Annotation as Gedmo;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\QuizCandidateRepository;
 
 #[ORM\Entity(repositoryClass: QuizCandidateRepository::class)]
 #[ORM\UniqueConstraint(columns: ['candidate_id', 'quiz_id'])]
-#[ORM\HasLifecycleCallbacks]
 class QuizCandidate
 {
-    #[ORM\Id]
     #[ORM\Column(type: UuidType::NAME, unique: true)]
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
     #[ORM\GeneratedValue(strategy: 'CUSTOM')]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
+    #[ORM\Id]
-    private Uuid $id;
+    public private(set) Uuid $id;
 
     #[ORM\Column]
-    private float $corrections = 0;
+    public float $corrections = 0;
 
+    #[Gedmo\Timestampable(on: 'create')]
     #[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE)]
-    private \DateTimeImmutable $created;
+    public private(set) \DateTimeImmutable $created;
 
     public function __construct(
+        #[ORM\JoinColumn(nullable: false)]
         #[ORM\ManyToOne(inversedBy: 'candidateData')]
-        #[ORM\JoinColumn(nullable: false)]
+        public Quiz $quiz,
-        private Quiz $quiz,
 
+        #[ORM\JoinColumn(nullable: false)]
         #[ORM\ManyToOne(inversedBy: 'quizData')]
-        #[ORM\JoinColumn(nullable: false)]
+        public Candidate $candidate,
-        private Candidate $candidate,
     ) {}
-
-    public function getId(): Uuid
-    {
-        return $this->id;
-    }
-
-    public function getCandidate(): Candidate
-    {
-        return $this->candidate;
-    }
-
-    public function getQuiz(): Quiz
-    {
-        return $this->quiz;
-    }
-
-    public function getCorrections(): ?float
-    {
-        return $this->corrections;
-    }
-
-    public function setCorrections(float $corrections): static
-    {
-        $this->corrections = $corrections;
-
-        return $this;
-    }
-
-    public function getCreated(): \DateTimeImmutable
-    {
-        return $this->created;
-    }
-
-    #[ORM\PrePersist]
-    public function setCreatedAtValue(): void
-    {
-        $this->created = new DateTimeImmutable();
-    }
 }

src/Entity/Season.php

@@ -7,7 +7,6 @@ namespace Tvdt\Entity;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\SeasonRepository;
@@ -17,38 +16,38 @@ class Season
 {
     private const string SEASON_CODE_CHARACTERS = 'bcdfghjklmnpqrstvwxz';
 
-    #[ORM\Id]
     #[ORM\Column(type: UuidType::NAME)]
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
     #[ORM\GeneratedValue(strategy: 'CUSTOM')]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
+    #[ORM\Id]
-    private Uuid $id;
+    public private(set) Uuid $id;
 
     #[ORM\Column(length: 64)]
-    private string $name;
+    public string $name;
 
     #[ORM\Column(length: 5)]
-    private string $seasonCode;
+    public string $seasonCode;
 
     /** @var Collection<int, Quiz> */
     #[ORM\OneToMany(targetEntity: Quiz::class, mappedBy: 'season', cascade: ['persist'], orphanRemoval: true)]
-    private Collection $quizzes;
+    public private(set) Collection $quizzes;
 
     /** @var Collection<int, Candidate> */
     #[ORM\OneToMany(targetEntity: Candidate::class, mappedBy: 'season', cascade: ['persist'], orphanRemoval: true)]
     #[ORM\OrderBy(['name' => 'ASC'])]
-    private Collection $candidates;
+    public private(set) Collection $candidates;
 
     /** @var Collection<int, User> */
     #[ORM\ManyToMany(targetEntity: User::class, inversedBy: 'seasons')]
-    private Collection $owners;
+    public private(set) Collection $owners;
 
-    #[ORM\ManyToOne]
     #[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')]
-    private ?Quiz $ActiveQuiz = null;
+    #[ORM\ManyToOne]
+    public ?Quiz $activeQuiz = null;
 
-    #[ORM\OneToOne(cascade: ['persist', 'remove'])]
     #[ORM\JoinColumn(nullable: true)]
-    private ?SeasonSettings $settings = null;
+    #[ORM\OneToOne(cascade: ['persist', 'remove'])]
+    public ?SeasonSettings $settings = null;
 
     public function __construct()
     {
@@ -58,73 +57,26 @@ class Season
         $this->owners = new ArrayCollection();
     }
 
-    public function getId(): Uuid
-    {
-        return $this->id;
-    }
-
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    public function setName(string $name): static
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    public function getSeasonCode(): ?string
-    {
-        return $this->seasonCode;
-    }
-
-    public function setSeasonCode(string $seasonCode): static
-    {
-        $this->seasonCode = $seasonCode;
-
-        return $this;
-    }
-
-    /** @return Collection<int, Quiz> */
-    public function getQuizzes(): Collection
-    {
-        return $this->quizzes;
-    }
-
     public function addQuiz(Quiz $quiz): static
     {
         if (!$this->quizzes->contains($quiz)) {
             $this->quizzes->add($quiz);
-            $quiz->setSeason($this);
+            $quiz->season = $this;
         }
 
         return $this;
     }
 
-    /** @return Collection<int, Candidate> */
-    public function getCandidates(): Collection
-    {
-        return $this->candidates;
-    }
-
     public function addCandidate(Candidate $candidate): static
     {
         if (!$this->candidates->contains($candidate)) {
             $this->candidates->add($candidate);
-            $candidate->setSeason($this);
+            $candidate->season = $this;
         }
 
         return $this;
     }
 
-    /** @return Collection<int, User> */
-    public function getOwners(): Collection
-    {
-        return $this->owners;
-    }
-
     public function addOwner(User $owner): static
     {
         if (!$this->owners->contains($owner)) {
@@ -141,24 +93,12 @@ class Season
         return $this;
     }
 
-    public function getActiveQuiz(): ?Quiz
-    {
-        return $this->ActiveQuiz;
-    }
-
-    public function setActiveQuiz(?Quiz $ActiveQuiz): static
-    {
-        $this->ActiveQuiz = $ActiveQuiz;
-
-        return $this;
-    }
-
     public function isOwner(User $user): bool
     {
         return $this->owners->contains($user);
     }
 
-    public function generateSeasonCode(): self
+    public function generateSeasonCode(): void
     {
         $code = '';
         $len = mb_strlen(self::SEASON_CODE_CHARACTERS) - 1;
@@ -168,19 +108,5 @@ class Season
         }
 
         $this->seasonCode = $code;
-
-        return $this;
-    }
-
-    public function getSettings(): ?SeasonSettings
-    {
-        return $this->settings;
-    }
-
-    public function setSettings(SeasonSettings $settings): static
-    {
-        $this->settings = $settings;
-
-        return $this;
     }
 }

src/Entity/SeasonSettings.php

@@ -6,7 +6,6 @@ namespace Tvdt\Entity;
 
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\SeasonSettingsRepository;
@@ -14,44 +13,15 @@ use Tvdt\Repository\SeasonSettingsRepository;
 #[ORM\Entity(repositoryClass: SeasonSettingsRepository::class)]
 class SeasonSettings
 {
-    #[ORM\Id]
-    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
     #[ORM\Column(type: UuidType::NAME)]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
-    private Uuid $id;
+    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
+    #[ORM\Id]
+    public private(set) Uuid $id;
 
     #[ORM\Column(type: Types::BOOLEAN, options: ['default' => false])]
-    private bool $showNumbers = false;
+    public bool $showNumbers = false;
 
     #[ORM\Column(type: Types::BOOLEAN, options: ['default' => false])]
-    private bool $confirmAnswers = false;
+    public bool $confirmAnswers = false;
-
-    public function getId(): Uuid
-    {
-        return $this->id;
-    }
-
-    public function isShowNumbers(): bool
-    {
-        return $this->showNumbers;
-    }
-
-    public function setShowNumbers(bool $showNumbers): self
-    {
-        $this->showNumbers = $showNumbers;
-
-        return $this;
-    }
-
-    public function isConfirmAnswers(): bool
-    {
-        return $this->confirmAnswers;
-    }
-
-    public function setConfirmAnswers(bool $confirmAnswers): self
-    {
-        $this->confirmAnswers = $confirmAnswers;
-
-        return $this;
-    }
 }

src/Entity/User.php

@@ -8,7 +8,6 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
@@ -22,52 +21,39 @@ use Tvdt\Repository\UserRepository;
 #[UniqueEntity(fields: ['email'], message: 'There is already an account with this email')]
 class User implements UserInterface, PasswordAuthenticatedUserInterface
 {
-    #[ORM\Id]
     #[ORM\Column(type: UuidType::NAME, unique: true)]
+    #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
     #[ORM\GeneratedValue(strategy: 'CUSTOM')]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
+    #[ORM\Id]
-    private Uuid $id;
+    public private(set) Uuid $id;
 
     #[ORM\Column(length: 180)]
-    private string $email;
+    public string $email;
 
     /** @var list<string> The user roles */
     #[ORM\Column(type: Types::JSON)]
-    private array $roles = [];
+    public array $roles = [];
 
     /** @var string The hashed password */
     #[ORM\Column]
-    private string $password;
+    public string $password;
 
     /** @var Collection<int, Season> */
     #[ORM\ManyToMany(targetEntity: Season::class, mappedBy: 'owners')]
-    private Collection $seasons;
+    public private(set) Collection $seasons;
 
     #[ORM\Column]
-    private bool $isVerified = false;
+    public bool $isVerified = false;
+
+    public bool $isAdmin {
+        get => \in_array('ROLE_ADMIN', $this->getRoles(), true);
+    }
 
     public function __construct()
     {
         $this->seasons = new ArrayCollection();
     }
 
-    public function getId(): Uuid
-    {
-        return $this->id;
-    }
-
-    public function getEmail(): ?string
-    {
-        return $this->email;
-    }
-
-    public function setEmail(string $email): static
-    {
-        $this->email = $email;
-
-        return $this;
-    }
-
     /**
      * A visual identifier that represents this user.
      *
@@ -97,27 +83,12 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
         return array_unique($roles);
     }
 
-    /** @param list<string> $roles */
-    public function setRoles(array $roles): static
-    {
-        $this->roles = $roles;
-
-        return $this;
-    }
-
     /** @see PasswordAuthenticatedUserInterface */
     public function getPassword(): ?string
     {
         return $this->password;
     }
 
-    public function setPassword(string $password): static
-    {
-        $this->password = $password;
-
-        return $this;
-    }
-
     /** @see UserInterface */
     public function eraseCredentials(): void
     {
@@ -125,12 +96,6 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
         // $this->plainPassword = null;
     }
 
-    /** @return Collection<int, Season> */
-    public function getSeasons(): Collection
-    {
-        return $this->seasons;
-    }
-
     public function addSeason(Season $season): static
     {
         if (!$this->seasons->contains($season)) {
@@ -149,21 +114,4 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
 
         return $this;
     }
-
-    public function isVerified(): bool
-    {
-        return $this->isVerified;
-    }
-
-    public function setIsVerified(bool $isVerified): static
-    {
-        $this->isVerified = $isVerified;
-
-        return $this;
-    }
-
-    public function isAdmin(): bool
-    {
-        return \in_array('ROLE_ADMIN', $this->getRoles(), true);
-    }
 }

src/Enum/FlashType.php

@@ -7,11 +7,18 @@ namespace Tvdt\Enum;
 enum FlashType: string
 {
     case Primary = 'primary';
+
     case Secondary = 'secondary';
+
     case Success = 'success';
+
     case Danger = 'danger';
+
     case Warning = 'warning';
+
     case Info = 'info';
+
     case Light = 'light';
+
     case Dark = 'dark';
 }

src/Factory/EliminationFactory.php

@@ -7,12 +7,12 @@ namespace Tvdt\Factory;
 use Doctrine\ORM\EntityManagerInterface;
 use Tvdt\Entity\Elimination;
 use Tvdt\Entity\Quiz;
-use Tvdt\Repository\CandidateRepository;
+use Tvdt\Repository\QuizRepository;
 
 final readonly class EliminationFactory
 {
     public function __construct(
-        private CandidateRepository $candidateRepository,
+        private QuizRepository $quizRepository,
         private EntityManagerInterface $em,
     ) {}
 
@@ -21,15 +21,15 @@ final readonly class EliminationFactory
         $elimination = new Elimination($quiz);
         $this->em->persist($elimination);
 
-        $scores = $this->candidateRepository->getScores($quiz);
+        $scores = $this->quizRepository->getScores($quiz);
 
         $simpleScores = [];
 
         foreach (array_reverse($scores) as $i => $score) {
-            $simpleScores[$score['name']] = $i < $quiz->getDropouts() ? Elimination::SCREEN_RED : Elimination::SCREEN_GREEN;
+            $simpleScores[$score->name] = $i < $quiz->dropouts ? Elimination::SCREEN_RED : Elimination::SCREEN_GREEN;
         }
 
-        $elimination->setData($simpleScores);
+        $elimination->data = $simpleScores;
 
         $this->em->flush();
 

src/Repository/CandidateRepository.php

@@ -7,17 +7,12 @@ namespace Tvdt\Repository;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Safe\Exceptions\UrlException;
-use Symfony\Component\Uid\Uuid;
 use Tvdt\Entity\Candidate;
-use Tvdt\Entity\Quiz;
 use Tvdt\Entity\Season;
 use Tvdt\Helpers\Base64;
 
 /**
  * @extends ServiceEntityRepository<Candidate>
- *
- * @phpstan-type Result array{id: Uuid, name: string, correct: int, time: \DateInterval, corrections: float, score: float}
- * @phpstan-type ResultList list<Result>
  */
 class CandidateRepository extends ServiceEntityRepository
 {
@@ -38,40 +33,9 @@ class CandidateRepository extends ServiceEntityRepository
             select c from Tvdt\Entity\Candidate c
                 where c.season = :season
                 and lower(c.name) = lower(:name)
-        DQL
+            DQL
         )->setParameter('season', $season)
             ->setParameter('name', $name)
             ->getOneOrNullResult();
     }
-
-    public function save(Candidate $candidate, bool $flush = true): void
-    {
-        $this->getEntityManager()->persist($candidate);
-
-        if ($flush) {
-            $this->getEntityManager()->flush();
-        }
-    }
-
-    /** @return ResultList */
-    public function getScores(Quiz $quiz): array
-    {
-        return $this->getEntityManager()->createQuery(<<<DQL
-        select
-            c.id,
-            c.name,
-            sum(case when a.isRightAnswer = true then 1 else 0 end) as correct,
-            qc.corrections,
-            max(ga.created) - qc.created                           as  time,
-            (sum(case when a.isRightAnswer = true then 1 else 0 end) + qc.corrections) as score
-        from Tvdt\Entity\Candidate c
-        join c.givenAnswers ga
-        join ga.answer a
-        join c.quizData qc
-        where qc.quiz = :quiz and ga.quiz = :quiz
-        group by ga.quiz, c.id, qc.id
-        order by score desc, time asc
-        DQL
-        )->setParameter('quiz', $quiz)->getResult();
-    }
 }

src/Repository/GivenAnswerRepository.php

@@ -17,13 +17,4 @@ class GivenAnswerRepository extends ServiceEntityRepository
     {
         parent::__construct($registry, GivenAnswer::class);
     }
-
-    public function save(GivenAnswer $givenAnswer, bool $flush = true): void
-    {
-        $this->getEntityManager()->persist($givenAnswer);
-
-        if ($flush) {
-            $this->getEntityManager()->flush();
-        }
-    }
 }

src/Repository/QuestionRepository.php

@@ -32,10 +32,10 @@ class QuestionRepository extends ServiceEntityRepository
                 and q1.quiz = :quiz
             )
             and qz = :quiz
-        DQL)
+            DQL)
             ->setMaxResults(1)
             ->setParameter('candidate', $candidate)
-            ->setParameter('quiz', $candidate->getSeason()->getActiveQuiz())
+            ->setParameter('quiz', $candidate->season->activeQuiz)
             ->getOneOrNullResult();
     }
 }

src/Repository/QuizCandidateRepository.php

@@ -41,7 +41,7 @@ class QuizCandidateRepository extends ServiceEntityRepository
             throw new \InvalidArgumentException('Quiz candidate not found');
         }
 
-        $quizCandidate->setCorrections($corrections);
+        $quizCandidate->corrections = $corrections;
         $this->getEntityManager()->flush();
     }
 }

src/Repository/QuizRepository.php

@@ -7,10 +7,10 @@ namespace Tvdt\Repository;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Psr\Log\LoggerInterface;
-use Tvdt\Entity\Elimination;
+use Safe\DateTimeImmutable;
-use Tvdt\Entity\GivenAnswer;
+use Safe\Exceptions\DatetimeException;
+use Tvdt\Dto\Result;
 use Tvdt\Entity\Quiz;
-use Tvdt\Entity\QuizCandidate;
 use Tvdt\Exception\ErrorClearingQuizException;
 
 /**
@@ -29,28 +29,36 @@ class QuizRepository extends ServiceEntityRepository
         $em = $this->getEntityManager();
         $em->beginTransaction();
         try {
-            $em->createQueryBuilder()
+            $em->createQuery(<<<DQL
-                ->delete()->from(QuizCandidate::class, 'qc')
+                delete from Tvdt\Entity\QuizCandidate qc
-                ->where('qc.quiz = :quiz')
+                where qc.quiz = :quiz
+                DQL)
                 ->setParameter('quiz', $quiz)
-                ->getQuery()->execute();
+                ->execute();
 
-            $em->createQueryBuilder()
+            $em->createQuery(<<<DQL
-                ->delete()->from(GivenAnswer::class, 'ga')
+                delete from Tvdt\Entity\GivenAnswer ga
-                ->where('ga.quiz = :quiz')
+                where ga.quiz = :quiz
+                DQL)
                 ->setParameter('quiz', $quiz)
-                ->getQuery()->execute();
+                ->execute();
-            $em->createQueryBuilder()
+
-                ->delete()->from(Elimination::class, 'e')
+            $em->createQuery(<<<DQL
-                ->where('e.quiz = :quiz')
+                delete from Tvdt\Entity\Elimination e
+                where e.quiz = :quiz
+                DQL)
                 ->setParameter('quiz', $quiz)
-                ->getQuery()->execute();
+                ->execute();
-        } catch (\Throwable $throwable) {
+        }
+        // @codeCoverageIgnoreStart
+        catch (\Throwable $throwable) {
             $this->logger->error($throwable->getMessage());
             $em->rollback();
             throw new ErrorClearingQuizException(previous: $throwable);
         }
 
+        // @codeCoverageIgnoreEnd
+
         $em->commit();
     }
 
@@ -59,4 +67,40 @@ class QuizRepository extends ServiceEntityRepository
         $this->getEntityManager()->remove($quiz);
         $this->getEntityManager()->flush();
     }
+
+    /**
+     * @throws DatetimeException
+     *
+     * @return list<Result>
+     */
+    public function getScores(Quiz $quiz): array
+    {
+        $result = $this->getEntityManager()->createQuery(<<<DQL
+            select
+                c.id,
+                c.name,
+                sum(case when a.isRightAnswer = true then 1 else 0 end) as correct,
+                qd.corrections,
+                max(ga.created) as end_time,
+                qd.created as start_time,
+                (sum(case when a.isRightAnswer = true then 1 else 0 end) + qd.corrections) as score
+            from Tvdt\Entity\Candidate c
+            join c.givenAnswers ga
+            join ga.answer a
+            join c.quizData qd
+            where qd.quiz = :quiz and ga.quiz = :quiz
+            group by ga.quiz, c.id, qd.id
+            order by score desc, max(ga.created) - qd.created asc
+            DQL
+        )->setParameter('quiz', $quiz)->getResult();
+
+        return array_map(static fn (array $row): Result => new Result(
+            id: $row['id'],
+            name: $row['name'],
+            correct: (int) $row['correct'],
+            corrections: $row['corrections'],
+            time: $row['start_time']->diff(new DateTimeImmutable($row['end_time'])),
+            score: $row['score'],
+        ), $result);
+    }
 }