Refactor Base64 encoding/decoding methods and enhance candidate not found flash message

.devcontainer/devcontainer.json

@@ -1,6 +0,0 @@
-{
-  "image": "mcr.microsoft.com/devcontainers/universal:2",
-  "features": {"ghcr.io/devcontainers/features/php:1": {
-    "version": "8.3"
-  }}
-}

.editorconfig

@@ -33,7 +33,6 @@ indent_size = 4
 
 [*.{yaml,yml}]
 trim_trailing_whitespace = false
-indent_size = 2
 
 [.github/workflows/*.yml]
 indent_size = 2
@@ -54,5 +53,5 @@ indent_size = 2
 [*.*Dockerfile]
 indent_style = tab
 
-[{*.*Caddyfile,Caddyfile}]
+[*.*Caddyfile]
 indent_style = tab

.env

@@ -28,11 +28,3 @@ APP_SECRET=
 # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
 DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=16&charset=utf8"
 ###< doctrine/doctrine-bundle ###
-
-###> symfony/mailer ###
-MAILER_DSN=null://null
-###< symfony/mailer ###
-
-###> sentry/sentry-symfony ###
-SENTRY_DSN=
-###< sentry/sentry-symfony ###

.env.dev

@@ -2,4 +2,3 @@
 ###> symfony/framework-bundle ###
 APP_SECRET=e26b9552d9e7f969b160373effaa7690
 ###< symfony/framework-bundle ###
-MAILER_SENDER=info@tijdvoordetest.nl

.env.test

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

.github/workflows/ci.yml

@@ -16,11 +16,14 @@ jobs:
     name: Tests
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      -
+        name: Checkout
         uses: actions/checkout@v4
-      - name: Set up Docker Buildx
+      -
+        name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Build Docker images
+      -
+        name: Build Docker images
         uses: docker/bake-action@v4
         with:
           pull: true
@@ -32,34 +35,42 @@ jobs:
             *.cache-from=type=gha,scope=${{github.ref}}
             *.cache-from=type=gha,scope=refs/heads/main
             *.cache-to=type=gha,scope=${{github.ref}},mode=max
-      - name: Start services
+      -
-        run: docker compose up php database --wait --no-build
+        name: Start services
-      - name: Lint Twig templates
+        run: docker compose up --wait --no-build
-        run: docker compose exec -T php bin/console lint:twig --format=github templates
+      -
-      - name: Coding Style
+        name: Check HTTP reachability
-        run: docker compose exec -T php vendor/bin/php-cs-fixer check --diff --show-progress=none
-      - name: Twig Coding Style
-        run: docker compose exec -T php vendor/bin/twig-cs-fixer check
-      - name: Check HTTP reachability
         run: curl -v --fail-with-body http://localhost
-      - name: Check Mercure reachability
+      -
-        if: false
+        name: Check HTTPS reachability
+        if: false # Remove this line when the homepage will be configured, or change the path to check
+        run: curl -vk --fail-with-body https://localhost
+      -
+        name: Check Mercure reachability
         run: curl -vkI --fail-with-body https://localhost/.well-known/mercure?topic=test
-      - name: Create test database
+      -
+        name: Create test database
+        if: false # Remove this line if Doctrine ORM is installed
         run: docker compose exec -T php bin/console -e test doctrine:database:create
-      - name: Run migrations
+      -
+        name: Run migrations
+        if: false # Remove this line if Doctrine Migrations is installed
         run: docker compose exec -T php bin/console -e test doctrine:migrations:migrate --no-interaction
-      - name: Run PHPUnit
+      -
-        if: false # Remove this line when the tests are ready
+        name: Run PHPUnit
-        run: docker compose exec -T php vendor/bin/phpunit
+        if: false # Remove this line if PHPUnit is installed
-      - name: Doctrine Schema Validator
+        run: docker compose exec -T php bin/phpunit
+      -
+        name: Doctrine Schema Validator
+        if: false # Remove this line if Doctrine ORM is installed
         run: docker compose exec -T php bin/console -e test doctrine:schema:validate
   lint:
     name: Docker Lint
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      -
+        name: Checkout
         uses: actions/checkout@v4
-      - name: Lint Dockerfile
+      -
+        name: Lint Dockerfile
         uses: hadolint/hadolint-action@v3.1.0
-    

.gitignore

@@ -1,5 +1,3 @@
-/frankenphp/data
-
 ### Generated by gibo (https://github.com/simonwhitaker/gibo)
 ### https://raw.github.com/github/gitignore/6eeebe6f49678aacd8311ce079842c971b3ebe96/Symfony.gitignore
 
@@ -34,6 +32,7 @@
 /bin/*
 !bin/console
 !bin/symfony_requirements
+/vendor/
 
 # Assets and user uploads
 /web/bundles/
@@ -41,6 +40,7 @@
 
 # PHPUnit
 /app/phpunit.xml
+/phpunit.xml
 
 # Build data
 /build/
@@ -103,19 +103,5 @@ phpstan.neon
 ###< friendsofphp/php-cs-fixer ###
 ###> phpunit/phpunit ###
 /phpunit.xml
-/.phpunit.cache/
-###< phpunit/phpunit ###
-
-###> vincentlanglet/twig-cs-fixer ###
-/.twig-cs-fixer.cache
-###< vincentlanglet/twig-cs-fixer ###
-
-###> symfony/phpunit-bridge ###
 .phpunit.result.cache
-/phpunit.xml
+###< phpunit/phpunit ###
-###< symfony/phpunit-bridge ###
-
-###> symfony/asset-mapper ###
-/public/assets/
-/assets/vendor/
-###< symfony/asset-mapper ###

.idea/TijdVoorDeTest.iml

@@ -6,6 +6,7 @@
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="App\Tests\" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/clue/ndjson-react" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/cache" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/collections" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/dbal" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/deprecations" />
@@ -47,6 +48,8 @@
       <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/code-unit" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/comparator" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/complexity" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/diff" />
@@ -81,6 +84,8 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/options-resolver" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-intl-grapheme" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-intl-normalizer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-mbstring" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php83" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/process" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/routing" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/runtime" />
@@ -101,6 +106,7 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/form" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/password-hasher" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-intl-icu" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-uuid" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/property-access" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/property-info" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/security-bundle" />
@@ -127,47 +133,9 @@
       <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" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php84" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfonycasts/verify-email-bundle" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/psr7" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/jean85/pretty-package-versions" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/psr/http-factory" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/psr/http-message" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/ralouphie/getallheaders" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sentry/sentry" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sentry/sentry-symfony" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/psr-http-message-bridge" />
-      <excludeFolder url="file://$MODULE_DIR$/.phpunit.cache" />
-      <excludeFolder url="file://$MODULE_DIR$/var" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/reflection-common" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/reflection-docblock" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/type-resolver" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpstan/phpdoc-parser" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/css-selector" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/phpunit-bridge" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/serializer" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/maennchen/zipstream-php" />
-      <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" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/http-client-contracts" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfonycasts/sass-bundle" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/twig/intl-extra" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="bootstrap" level="application" />
-    <orderEntry type="library" name="bootstrap-icons" level="application" />
   </component>
 </module>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,133 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="ForgottenDebugOutputInspection" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="configuration">
-        <list>
-          <option value="\Codeception\Util\Debug::debug" />
-          <option value="\Codeception\Util\Debug::pause" />
-          <option value="\Doctrine\Common\Util\Debug::dump" />
-          <option value="\Doctrine\Common\Util\Debug::export" />
-          <option value="\Illuminate\Support\Debug\Dumper::dump" />
-          <option value="\Symfony\Component\Debug\Debug::enable" />
-          <option value="\Symfony\Component\Debug\DebugClassLoader::enable" />
-          <option value="\Symfony\Component\Debug\ErrorHandler::register" />
-          <option value="\Symfony\Component\Debug\ExceptionHandler::register" />
-          <option value="\TYPO3\CMS\Core\Utility\DebugUtility::debug" />
-          <option value="\Zend\Debug\Debug::dump" />
-          <option value="\Zend\Di\Display\Console::export" />
-          <option value="dd" />
-          <option value="debug_print_backtrace" />
-          <option value="debug_zval_dump" />
-          <option value="dpm" />
-          <option value="dpq" />
-          <option value="dsm" />
-          <option value="dump" />
-          <option value="dvm" />
-          <option value="error_log" />
-          <option value="kpr" />
-          <option value="phpinfo" />
-          <option value="print_r" />
-          <option value="trap" />
-          <option value="var_dump" />
-          <option value="var_export" />
-          <option value="wp_die" />
-          <option value="xdebug_break" />
-          <option value="xdebug_call_class" />
-          <option value="xdebug_call_file" />
-          <option value="xdebug_call_function" />
-          <option value="xdebug_call_line" />
-          <option value="xdebug_code_coverage_started" />
-          <option value="xdebug_debug_zval" />
-          <option value="xdebug_debug_zval_stdout" />
-          <option value="xdebug_dump_superglobals" />
-          <option value="xdebug_enable" />
-          <option value="xdebug_get_code_coverage" />
-          <option value="xdebug_get_collected_errors" />
-          <option value="xdebug_get_declared_vars" />
-          <option value="xdebug_get_function_stack" />
-          <option value="xdebug_get_headers" />
-          <option value="xdebug_get_monitored_functions" />
-          <option value="xdebug_get_profiler_filename" />
-          <option value="xdebug_get_stack_depth" />
-          <option value="xdebug_get_tracefile_name" />
-          <option value="xdebug_is_enabled" />
-          <option value="xdebug_memory_usage" />
-          <option value="xdebug_peak_memory_usage" />
-          <option value="xdebug_print_function_stack" />
-          <option value="xdebug_start_code_coverage" />
-          <option value="xdebug_start_error_collection" />
-          <option value="xdebug_start_function_monitor" />
-          <option value="xdebug_start_trace" />
-          <option value="xdebug_stop_code_coverage" />
-          <option value="xdebug_stop_error_collection" />
-          <option value="xdebug_stop_function_monitor" />
-          <option value="xdebug_stop_trace" />
-          <option value="xdebug_time_index" />
-          <option value="xdebug_var_dump" />
-        </list>
-      </option>
-      <option name="migratedIntoUserSpace" value="true" />
-    </inspection_tool>
     <inspection_tool class="PhpCSFixerValidationInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpFullyQualifiedNameUsageInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="IGNORE_GLOBAL_NAMESPACE" value="true" />
-    </inspection_tool>
     <inspection_tool class="PhpStanGlobal" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="SecurityAdvisoriesInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="optionConfiguration">
-        <list>
-          <option value="barryvdh/laravel-debugbar" />
-          <option value="behat/behat" />
-          <option value="brianium/paratest" />
-          <option value="codeception/codeception" />
-          <option value="codedungeon/phpunit-result-printer" />
-          <option value="composer/composer" />
-          <option value="doctrine/coding-standard" />
-          <option value="filp/whoops" />
-          <option value="friendsofphp/php-cs-fixer" />
-          <option value="humbug/humbug" />
-          <option value="infection/infection" />
-          <option value="jakub-onderka/php-parallel-lint" />
-          <option value="johnkary/phpunit-speedtrap" />
-          <option value="kalessil/production-dependencies-guard" />
-          <option value="mikey179/vfsStream" />
-          <option value="mockery/mockery" />
-          <option value="mybuilder/phpunit-accelerator" />
-          <option value="orchestra/testbench" />
-          <option value="pdepend/pdepend" />
-          <option value="phan/phan" />
-          <option value="phing/phing" />
-          <option value="phpcompatibility/php-compatibility" />
-          <option value="phpmd/phpmd" />
-          <option value="phpro/grumphp" />
-          <option value="phpspec/phpspec" />
-          <option value="phpspec/prophecy" />
-          <option value="phpstan/phpstan" />
-          <option value="phpunit/phpunit" />
-          <option value="povils/phpmnd" />
-          <option value="roave/security-advisories" />
-          <option value="satooshi/php-coveralls" />
-          <option value="sebastian/phpcpd" />
-          <option value="slevomat/coding-standard" />
-          <option value="spatie/phpunit-watcher" />
-          <option value="squizlabs/php_codesniffer" />
-          <option value="sstalle/php7cc" />
-          <option value="symfony/debug" />
-          <option value="symfony/maker-bundle" />
-          <option value="symfony/phpunit-bridge" />
-          <option value="symfony/var-dumper" />
-          <option value="vimeo/psalm" />
-          <option value="wimg/php-compatibility" />
-          <option value="wp-coding-standards/wpcs" />
-          <option value="yiisoft/yii2-coding-standards" />
-          <option value="yiisoft/yii2-debug" />
-          <option value="yiisoft/yii2-gii" />
-          <option value="zendframework/zend-coding-standard" />
-          <option value="zendframework/zend-debug" />
-          <option value="zendframework/zend-test" />
-        </list>
-      </option>
-    </inspection_tool>
   </profile>
 </component>

.idea/jsLibraryMappings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="JavaScriptLibraryMappings">
-    <file url="PROJECT" libraries="{bootstrap, bootstrap-icons}" />
+    <file url="PROJECT" libraries="{bootstrap}" />
   </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-c1266788-d465-407a-ac5d-1f67a9cf3e8a" version="11.5.2" />
           </versions>
         </cache>
       </tool>

.idea/php.xml

@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="LaravelPint">
-    <laravel_pint_settings>
-      <laravel_pint_by_interpreter asDefaultInterpreter="true" interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8">
-        <option name="timeout" value="30000" />
-      </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_by_interpreter asDefaultInterpreter="true" interpreter_id="c1266788-d465-407a-ac5d-1f67a9cf3e8a" timeout="30000" />
     </phpmd_settings>
   </component>
   <component name="MessDetectorOptionsConfiguration">
@@ -17,7 +10,7 @@
   </component>
   <component name="PHPCSFixerOptionsConfiguration">
     <option name="codingStandard" value="Custom" />
-    <option name="rulesetPath" value=".php-cs-fixer.dist.php" />
+    <option name="rulesetPath" value="/app/.php-cs-fixer.dist.php" />
     <option name="transferred" value="true" />
   </component>
   <component name="PHPCodeSnifferOptionsConfiguration">
@@ -26,14 +19,14 @@
   </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="c1266788-d465-407a-ac5d-1f67a9cf3e8a" tool_path="/app/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="c1266788-d465-407a-ac5d-1f67a9cf3e8a" 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="/app/vendor/bin/php-cs-fixer" timeout="30000" />
-      <phpcs_fixer_by_interpreter asDefaultInterpreter="true" deletedFromTheList="true" interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" standards="DoctrineAnnotation;PER;PER-CS;PER-CS1.0;PER-CS2.0;PHP54Migration;PHP56Migration;PHP70Migration;PHP71Migration;PHP73Migration;PHP74Migration;PHP80Migration;PHP81Migration;PHP82Migration;PHP83Migration;PHP84Migration;PHPUnit100Migration;PHPUnit30Migration;PHPUnit32Migration;PHPUnit35Migration;PHPUnit43Migration;PHPUnit48Migration;PHPUnit50Migration;PHPUnit52Migration;PHPUnit54Migration;PHPUnit55Migration;PHPUnit56Migration;PHPUnit57Migration;PHPUnit60Migration;PHPUnit75Migration;PHPUnit84Migration;PHPUnit91Migration;PSR1;PSR12;PSR2;PhpCsFixer;Symfony" tool_path="vendor/bin/php-cs-fixer" timeout="30000" />
+      <PhpCSFixerConfiguration deletedFromTheList="true" tool_path="$PROJECT_DIR$/vendor/bin/php-cs-fixer" />
     </phpcsfixer_settings>
   </component>
   <component name="PhpCodeSniffer">
     <phpcs_settings>
-      <phpcs_by_interpreter asDefaultInterpreter="true" interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" timeout="30000" />
+      <phpcs_by_interpreter asDefaultInterpreter="true" interpreter_id="c1266788-d465-407a-ac5d-1f67a9cf3e8a" timeout="30000" />
     </phpcs_settings>
   </component>
   <component name="PhpExternalFormatter">
@@ -41,169 +34,140 @@
   </component>
   <component name="PhpIncludePathManager">
     <include_path>
-      <path value="$PROJECT_DIR$/vendor/react/stream" />
-      <path value="$PROJECT_DIR$/vendor/react/promise" />
-      <path value="$PROJECT_DIR$/vendor/react/event-loop" />
-      <path value="$PROJECT_DIR$/vendor/react/cache" />
-      <path value="$PROJECT_DIR$/vendor/react/child-process" />
-      <path value="$PROJECT_DIR$/vendor/jean85/pretty-package-versions" />
-      <path value="$PROJECT_DIR$/vendor/react/dns" />
-      <path value="$PROJECT_DIR$/vendor/react/socket" />
-      <path value="$PROJECT_DIR$/vendor/sentry/sentry" />
-      <path value="$PROJECT_DIR$/vendor/staabm/side-effects-detector" />
-      <path value="$PROJECT_DIR$/vendor/rector/rector" />
-      <path value="$PROJECT_DIR$/vendor/sentry/sentry-symfony" />
-      <path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
-      <path value="$PROJECT_DIR$/vendor/phar-io/version" />
-      <path value="$PROJECT_DIR$/vendor/egulias/email-validator" />
-      <path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
-      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-symfony" />
-      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-phpunit" />
-      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan" />
-      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-doctrine" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
-      <path value="$PROJECT_DIR$/vendor/phpstan/extension-installer" />
-      <path value="$PROJECT_DIR$/vendor/phpstan/phpdoc-parser" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-invoker" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-icu" />
-      <path value="$PROJECT_DIR$/vendor/symfony/form" />
-      <path value="$PROJECT_DIR$/vendor/runtime/frankenphp-symfony" />
-      <path value="$PROJECT_DIR$/vendor/symfony/framework-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/validator" />
-      <path value="$PROJECT_DIR$/vendor/symfony/cache" />
-      <path value="$PROJECT_DIR$/vendor/symfony/serializer" />
-      <path value="$PROJECT_DIR$/vendor/symfony/dotenv" />
-      <path value="$PROJECT_DIR$/vendor/symfony/security-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/intl" />
-      <path value="$PROJECT_DIR$/vendor/symfony/asset" />
-      <path value="$PROJECT_DIR$/vendor/symfony/browser-kit" />
-      <path value="$PROJECT_DIR$/vendor/symfony/config" />
-      <path value="$PROJECT_DIR$/vendor/symfony/security-http" />
-      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
-      <path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
-      <path value="$PROJECT_DIR$/vendor/symfony/runtime" />
-      <path value="$PROJECT_DIR$/vendor/symfony/uid" />
-      <path value="$PROJECT_DIR$/vendor/symfony/asset-mapper" />
-      <path value="$PROJECT_DIR$/vendor/symfony/mailer" />
-      <path value="$PROJECT_DIR$/vendor/symfony/filesystem" />
-      <path value="$PROJECT_DIR$/vendor/symfony/phpunit-bridge" />
-      <path value="$PROJECT_DIR$/vendor/symfony/var-dumper" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-idn" />
-      <path value="$PROJECT_DIR$/vendor/symfony/maker-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/options-resolver" />
-      <path value="$PROJECT_DIR$/vendor/symfony/security-csrf" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-normalizer" />
-      <path value="$PROJECT_DIR$/vendor/symfony/css-selector" />
-      <path value="$PROJECT_DIR$/vendor/symfony/twig-bridge" />
-      <path value="$PROJECT_DIR$/vendor/symfony/web-profiler-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/property-access" />
-      <path value="$PROJECT_DIR$/vendor/symfony/twig-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/dom-crawler" />
-      <path value="$PROJECT_DIR$/vendor/symfony/http-client" />
-      <path value="$PROJECT_DIR$/vendor/symfony/stopwatch" />
-      <path value="$PROJECT_DIR$/vendor/symfony/finder" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php84" />
-      <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/string" />
-      <path value="$PROJECT_DIR$/vendor/symfony/var-exporter" />
+      <path value="$PROJECT_DIR$/vendor/symfony/yaml" />
-      <path value="$PROJECT_DIR$/vendor/symfony/flex" />
+      <path value="$PROJECT_DIR$/vendor/symfony/dotenv" />
-      <path value="$PROJECT_DIR$/vendor/symfony/http-foundation" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
-      <path value="$PROJECT_DIR$/vendor/symfony/doctrine-bridge" />
+      <path value="$PROJECT_DIR$/vendor/runtime/frankenphp-symfony" />
-      <path value="$PROJECT_DIR$/vendor/symfony/dependency-injection" />
+      <path value="$PROJECT_DIR$/vendor/composer" />
-      <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/deprecation-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/ux-twig-component" />
+      <path value="$PROJECT_DIR$/vendor/symfony/finder" />
-      <path value="$PROJECT_DIR$/vendor/symfony/password-hasher" />
+      <path value="$PROJECT_DIR$/vendor/symfony/runtime" />
-      <path value="$PROJECT_DIR$/vendor/symfony/process" />
+      <path value="$PROJECT_DIR$/vendor/symfony/routing" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php83" />
+      <path value="$PROJECT_DIR$/vendor/psr/event-dispatcher" />
+      <path value="$PROJECT_DIR$/vendor/symfony/var-exporter" />
+      <path value="$PROJECT_DIR$/vendor/psr/cache" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-grapheme" />
-      <path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
+      <path value="$PROJECT_DIR$/vendor/psr/log" />
+      <path value="$PROJECT_DIR$/vendor/symfony/cache" />
+      <path value="$PROJECT_DIR$/vendor/psr/container" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-normalizer" />
+      <path value="$PROJECT_DIR$/vendor/symfony/dependency-injection" />
+      <path value="$PROJECT_DIR$/vendor/symfony/config" />
+      <path value="$PROJECT_DIR$/vendor/symfony/filesystem" />
+      <path value="$PROJECT_DIR$/vendor/symfony/error-handler" />
+      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/console" />
+      <path value="$PROJECT_DIR$/vendor/symfony/flex" />
+      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
+      <path value="$PROJECT_DIR$/vendor/symfony/var-dumper" />
+      <path value="$PROJECT_DIR$/vendor/symfony/http-foundation" />
+      <path value="$PROJECT_DIR$/vendor/symfony/framework-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/http-kernel" />
+      <path value="$PROJECT_DIR$/vendor/symfony/doctrine-bridge" />
+      <path value="$PROJECT_DIR$/vendor/symfony/stopwatch" />
       <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-migrations-bundle" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/migrations" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/cache" />
       <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/instantiator" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/sql-formatter" />
       <path value="$PROJECT_DIR$/vendor/doctrine/orm" />
       <path value="$PROJECT_DIR$/vendor/doctrine/event-manager" />
-      <path value="$PROJECT_DIR$/vendor/easycorp/easyadmin-bundle" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/collections" />
-      <path value="$PROJECT_DIR$/vendor/evenement/evenement" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/sql-formatter" />
       <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/symfony/process" />
-      <path value="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet" />
+      <path value="$PROJECT_DIR$/vendor/symfony/maker-bundle" />
-      <path value="$PROJECT_DIR$/vendor/maennchen/zipstream-php" />
+      <path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
-      <path value="$PROJECT_DIR$/vendor/markbaker/complex" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
-      <path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
       <path value="$PROJECT_DIR$/vendor/sebastian/diff" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
+      <path value="$PROJECT_DIR$/vendor/rector/rector" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
+      <path value="$PROJECT_DIR$/vendor/react/event-loop" />
+      <path value="$PROJECT_DIR$/vendor/react/cache" />
+      <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/react/dns" />
+      <path value="$PROJECT_DIR$/vendor/friendsofphp/php-cs-fixer" />
+      <path value="$PROJECT_DIR$/vendor/react/socket" />
+      <path value="$PROJECT_DIR$/vendor/react/child-process" />
+      <path value="$PROJECT_DIR$/vendor/evenement/evenement" />
+      <path value="$PROJECT_DIR$/vendor/symfony/options-resolver" />
+      <path value="$PROJECT_DIR$/vendor/fidry/cpu-core-counter" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
       <path value="$PROJECT_DIR$/vendor/sebastian/complexity" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/version" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
       <path value="$PROJECT_DIR$/vendor/sebastian/cli-parser" />
       <path value="$PROJECT_DIR$/vendor/sebastian/lines-of-code" />
       <path value="$PROJECT_DIR$/vendor/sebastian/type" />
-      <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/version" />
-      <path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
-      <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/environment" />
-      <path value="$PROJECT_DIR$/vendor/symfonycasts/sass-bundle" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/code-unit" />
-      <path value="$PROJECT_DIR$/vendor/masterminds/html5" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
-      <path value="$PROJECT_DIR$/vendor/friendsofphp/php-cs-fixer" />
+      <path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
-      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
+      <path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
-      <path value="$PROJECT_DIR$/vendor/vincentlanglet/twig-cs-fixer" />
+      <path value="$PROJECT_DIR$/vendor/phar-io/version" />
-      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
-      <path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
-      <path value="$PROJECT_DIR$/vendor/thecodingmachine/safe" />
+      <path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
-      <path value="$PROJECT_DIR$/vendor/thecodingmachine/phpstan-safe-rule" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
-      <path value="$PROJECT_DIR$/vendor/composer" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
-      <path value="$PROJECT_DIR$/vendor/psr/http-message" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-invoker" />
-      <path value="$PROJECT_DIR$/vendor/psr/container" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
-      <path value="$PROJECT_DIR$/vendor/psr/cache" />
+      <path value="$PROJECT_DIR$/vendor/staabm/side-effects-detector" />
-      <path value="$PROJECT_DIR$/vendor/psr/event-dispatcher" />
+      <path value="$PROJECT_DIR$/vendor/symfony/twig-bundle" />
-      <path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
+      <path value="$PROJECT_DIR$/vendor/symfony/twig-bridge" />
-      <path value="$PROJECT_DIR$/vendor/psr/clock" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
-      <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/uid" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-uuid" />
+      <path value="$PROJECT_DIR$/vendor/psr/clock" />
+      <path value="$PROJECT_DIR$/vendor/symfony/security-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/type-info" />
+      <path value="$PROJECT_DIR$/vendor/symfony/property-access" />
+      <path value="$PROJECT_DIR$/vendor/symfony/property-info" />
+      <path value="$PROJECT_DIR$/vendor/symfony/password-hasher" />
+      <path value="$PROJECT_DIR$/vendor/symfony/clock" />
+      <path value="$PROJECT_DIR$/vendor/symfony/security-csrf" />
+      <path value="$PROJECT_DIR$/vendor/symfony/security-core" />
+      <path value="$PROJECT_DIR$/vendor/symfony/security-http" />
+      <path value="$PROJECT_DIR$/vendor/symfony/web-profiler-bundle" />
+      <path value="$PROJECT_DIR$/vendor/thecodingmachine/safe" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/extension-installer" />
+      <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/symfony/asset" />
+      <path value="$PROJECT_DIR$/vendor/thecodingmachine/phpstan-safe-rule" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-icu" />
+      <path value="$PROJECT_DIR$/vendor/symfony/form" />
+      <path value="$PROJECT_DIR$/vendor/twig/html-extra" />
+      <path value="$PROJECT_DIR$/vendor/twig/extra-bundle" />
+      <path value="$PROJECT_DIR$/vendor/easycorp/easyadmin-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/mime" />
+      <path value="$PROJECT_DIR$/vendor/symfony/validator" />
+      <path value="$PROJECT_DIR$/vendor/symfony/ux-twig-component" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-idn" />
+      <path value="$PROJECT_DIR$/vendor/symfony/intl" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/data-fixtures" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-fixtures-bundle" />
     </include_path>
   </component>
   <component name="PhpInterpreters">
     <interpreters>
-      <interpreter id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" name="Compose PHP 8.3" home="docker-compose://DATA" auto="false" debugger_id="php.debugger.XDebug">
+      <interpreter id="c1266788-d465-407a-ac5d-1f67a9cf3e8a" name="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>
@@ -217,15 +181,15 @@
   </component>
   <component name="PhpInterpretersPhpInfoCache">
     <phpInfoCache>
-      <interpreter name="Compose PHP 8.3">
+      <interpreter name="php">
-        <phpinfo binary_type="PHP" php_cgi="/usr/local/bin/php-cgi" php_cli="/usr/local/bin/php" path_separator=":" version="8.3.19">
+        <phpinfo binary_type="PHP" php_cgi="/usr/local/bin/php-cgi" php_cli="/usr/local/bin/php" path_separator=":" version="8.3.15">
           <additional_php_ini>/usr/local/etc/php/conf.d/docker-php-ext-apcu.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-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.2">
+            <debugger_info debugger="xdebug" debugger_version="3.4.0">
               <debug_extensions />
             </debugger_info>
           </debuggers>
@@ -277,24 +241,25 @@
   <component name="PhpProjectSharedConfiguration" php_language_level="8.3" />
   <component name="PhpStan">
     <PhpStan_settings>
-      <phpstan_by_interpreter interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" tool_path="vendor/bin/phpstan" timeout="60000" />
+      <phpstan_by_interpreter interpreter_id="c1266788-d465-407a-ac5d-1f67a9cf3e8a" tool_path="/app/vendor/bin/phpstan" timeout="60000" />
+      <phpstan_by_interpreter asDefaultInterpreter="true" deletedFromTheList="true" interpreter_id="afbe50d9-a569-498c-8dcc-cf68a5d73813" timeout="60000" />
       <PhpStanConfiguration deletedFromTheList="true" tool_path="$PROJECT_DIR$/vendor/bin/phpstan" />
-      <phpstan_by_interpreter asDefaultInterpreter="true" deletedFromTheList="true" interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" tool_path="vendor/bin/phpstan" timeout="60000" />
     </PhpStan_settings>
   </component>
   <component name="PhpStanOptionsConfiguration">
-    <option name="config" value="phpstan.dist.neon" />
+    <option name="config" value="$PROJECT_DIR$/phpstan.dist.neon" />
-    <option name="fullProject" value="true" />
+    <option name="level" value="8" />
     <option name="transferred" value="true" />
   </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="c1266788-d465-407a-ac5d-1f67a9cf3e8a" custom_loader_path="/app/vendor/autoload.php" phpunit_phar_path="" />
+      <PhpUnitSettings custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" />
     </phpunit_settings>
   </component>
   <component name="Psalm">
     <Psalm_settings>
-      <psalm_fixer_by_interpreter asDefaultInterpreter="true" interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" timeout="60000" />
+      <psalm_fixer_by_interpreter asDefaultInterpreter="true" interpreter_id="afbe50d9-a569-498c-8dcc-cf68a5d73813" timeout="60000" />
     </Psalm_settings>
   </component>
   <component name="PsalmOptionsConfiguration">

.idea/remote-mappings.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteMappingsManager">
-    <list>
-      <list>
-        <remote-mappings server-id="php@96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8">
-          <settings>
-            <list>
-              <mapping local-root="$PROJECT_DIR$" remote-root="/app" />
-            </list>
-          </settings>
-        </remote-mappings>
-      </list>
-    </list>
-  </component>
-</project>

.idea/sonarlint.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="SonarLintProjectSettings">
-    <option name="bindingEnabled" value="true" />
-    <option name="projectKey" value="MarijnDoeve_TijdVoorDeTest" />
-    <option name="serverId" value="SonarQube" />
-  </component>
-</project>

.idea/sqldialects.xml

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

.php-cs-fixer.dist.php

@@ -1,23 +1,17 @@
 <?php
 
 declare(strict_types=1);
-use PhpCsFixer\Config;
-use PhpCsFixer\Finder;
-use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
 
-$finder = (new Finder())
+$finder = (new PhpCsFixer\Finder())
     ->in(__DIR__)
     ->exclude('var')
-    ->exclude('bin')
 ;
 
-return (new Config())
+return (new PhpCsFixer\Config())
-    ->setParallelConfig(ParallelConfigFactory::detect())
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'declare_strict_types' => true,
-        'fully_qualified_strict_types' => ['import_symbols' => true],
         'linebreak_after_opening_tag' => true,
         'mb_str_functions' => true,
         'no_php4_constructor' => true,
@@ -25,13 +19,11 @@ return (new Config())
         '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,
-        'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['arguments', 'array_destructuring', 'arrays', 'match', 'parameters']],
+        'blank_line_between_import_groups' => false,
-
+        'phpdoc_line_span' => ['const' => 'single', 'method' => 'single', 'property' => 'single'],
     ])
     ->setRiskyAllowed(true)
     ->setFinder($finder)

Dockerfile

@@ -31,9 +31,6 @@ RUN set -eux; \
 		intl \
 		opcache \
 		zip \
-		uuid \
-		gd \
-		excimer-1.2.3 \
 	;
 
 # https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
@@ -70,8 +67,6 @@ RUN set -eux; \
 
 COPY --link frankenphp/conf.d/20-app.dev.ini $PHP_INI_DIR/app.conf.d/
 
-RUN git config --global --add safe.directory /app
-
 CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile", "--watch" ]
 
 # Prod FrankenPHP image
@@ -99,7 +94,4 @@ RUN set -eux; \
 	composer dump-autoload --classmap-authoritative --no-dev; \
 	composer dump-env prod; \
 	composer run-script --no-dev post-install-cmd; \
-	chmod +x bin/console; \
+	chmod +x bin/console; sync;
-    bin/console sass:build; \
-    bin/console asset-map:compile --no-debug --quiet --no-ansi; \
-    sync;

Justfile

@@ -1,41 +0,0 @@
-up:
-    docker compose up -d
-
-down *args:
-    docker compose down {{ args }} --remove-orphans
-
-stop:
-    docker compose stop
-
-exec *args:
-    docker compose exec php {{ args }}
-
-[no-exit-message]
-shell:
-    @docker compose exec php bash
-
-bash: shell
-
-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
-
-translations:
-    docker compose exec php bin/console translation:extract --force --format=xliff --sort=asc --clean nl
-
-fix-cs:
-    docker compose exec php vendor/bin/php-cs-fixer fix
-    docker compose exec php vendor/bin/twig-cs-fixer fix
-
-rector *args:
-    docker compose exec php vendor/bin/rector {{ args }}
-
-phpstan *args:
-    docker compose exec php vendor/bin/phpstan analyse {{ args }}
-
-[confirm]
-clean:
-    docker compose down -v --remove-orphans
-    rm -rf vendor var assets/vendor public/assets public/bundles .php-cs-fixer.cache .twig-cs-fixer.cache

README.md

@@ -5,34 +5,40 @@
 ### Maken van de test
 
 - WIDM-tests met een variabel aantal vragen.
-- Vragen in een vaste volgorde zijn samen één test (een vraag kan niet bij
+- Vragen in een vaste volgorde zijn samen één test (een vraag kan niet bij 
-  meerdere tests horen).
+meerdere test horen).
-- Vragen hebben 2 of meer antwoordmogelijkheden. Slechts één antwoord is correct.
+- Vragen hebben 2 of meer antwoordmogelijkheden. Slechts één vraag is correct.
 - Meerdere test samen vormen een seizoen.
-- Een seizoen heeft één of geen actieve tests, als er een test actief is kan
+- Een seizoen heeft één of geen actieve tests, als er een test actief is kan 
-  uitsluitend die test gemaakt worden.
+Uitsluitend die test gemaakt worden.
-- Kandidaten kunnen een test maximaal 1 keer invullen.
+- Kandidaten kunnen een test maximaal 1 keer invullen. Indien ingeschakeld 
-- Vanaf het moment dat de kandidaat op start klikt na het intypen van hun naam
+kunnen alleen vooraf ingevoerde namen gebruikt worden in een test.
-  gaat de tijd lopen. Deze stopt na het aanklikken van een antwoord op de laatste
+- Vanaf het moment dat de kandidaat op start klikt na het intypen van hun naam 
-  vraag van de test.
+gaat de tijd lopen. Deze stopt na het aanklikken van een antwoord op de laatste 
+vraag van de test.
 - Achtergrondmuziek
 
+
 ### Schermen kijken
 
-- Nadat een speler een test heeft gemaakt (of vooraf als de namen vooraf
+- Nadat een speler een test heeft gemaakt (of vooraf als de namen vooraf 
-  ingevoerd zijn) kunnen jokers toegekend worden aan de test van kandidaat. Een
+ingevoerd zijn) kunnen jokers toegekend worden aan de test van kandidaat. Een 
-  positief getal om antwoorden goed te rekenen, een negatief getal om
+positief getal om antwoorden goed te rekenen, een negatief getal om 
-  antwoorden fout te rekenen.
+antwoorden fout te rekenen. Een vrijstelling kan gegeven worden door evenveel 
+of meer jokers toe te kennen als dat er vragen in een test zitten.
 - Vooraf kan gekozen worden hoe veel afvallers er zijn.
-- Bij het kijken naam rode en groene schermen wordt een naam ingevoerd. Er
+- Bij het kijken naam rode en groene schermen wordt een naam ingevoerd. Er 
-  wordt een rood of groen scherm getoond.
+wordt een rood of groen scherm getoond.
-- Spelers kunnen geforceerd op groen of rood gezet worden, deze worden dan niet
+- Spelers kunnen geforceerd op groen of rood gezet worden, deze worden dan niet 
-  meegenomen in de berekening van de slechtste speler.
+meegenomen in de berekening van de slechtste speler.
+
+
 
 ### Statistieken
 
 TBD
 
+
 ## Nice to haves
 
 - Optie voor antwoord geven in twee klikken (selecteren en volgende).

assets/backoffice.js

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

assets/quiz.js

@@ -1,24 +0,0 @@
-import 'bootstrap/dist/css/bootstrap.min.css'
-import * as bootstrap from 'bootstrap'
-
-import './styles/app.scss'
-
-document.addEventListener('DOMContentLoaded', function () {
-  // Check if we're on the elimination candidate screen
-  const eliminationScreen = document.querySelector('.elimination-screen');
-  if (eliminationScreen) {
-    // Add event listener for any keypress
-    document.addEventListener('keydown', function (event) {
-      // Get the current URL
-      const currentUrl = window.location.href;
-      // Extract the elimination ID from the URL
-      const urlParts = currentUrl.split('/');
-      // Remove the candidate hash (last part of the URL)
-      urlParts.pop();
-      // Construct the URL to the main elimination page
-      const redirectUrl = urlParts.join('/');
-      // Redirect to the main elimination page
-      window.location.href = redirectUrl;
-    });
-  }
-});

assets/styles/app.scss

@@ -1,26 +0,0 @@
-html, body {
-    height: 100%;
-    background-image: url("../img/background.png");
-    background-position: center center;
-    background-repeat: no-repeat;
-    background-color: black;
-    color: white;
-
-    display: grid;
-    align-items: center;
-    justify-self: center;
-}
-
-.elimination-screen {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100vh;
-    object-fit: contain;
-    background-color: white;
-    z-index: 1000;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}

bin/console

@@ -1,8 +1,6 @@
 #!/usr/bin/env php
 <?php
 
-declare(strict_types=1);
-
 use App\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 

compose.override.yaml

@@ -8,43 +8,17 @@ services:
       - ./:/app
       - ./frankenphp/Caddyfile:/etc/caddy/Caddyfile:ro
       - ./frankenphp/conf.d/20-app.dev.ini:/usr/local/etc/php/app.conf.d/20-app.dev.ini:ro
-      - ./frankenphp/data:/data
+      # If you develop on Mac or Windows you can remove the vendor/ directory
-      - sass:/app/var/sass
+      #  from the bind-mount for better performance by enabling the next line:
+      #- /app/vendor
     environment:
       MERCURE_EXTRA_DIRECTIVES: demo
       # See https://xdebug.org/docs/all_settings#mode
       XDEBUG_MODE: "${XDEBUG_MODE:-off}"
-      MAILER_DSN: "smtp://mailer:1025"
     extra_hosts:
       # Ensure that host.docker.internal is correctly defined on Linux
       - host.docker.internal:host-gateway
     tty: true
-    ports:
-      # HTTP
-      - target: 80
-        published: ${HTTP_PORT:-80}
-        protocol: tcp
-      # HTTPS
-      - target: 443
-        published: ${HTTPS_PORT:-443}
-        protocol: tcp
-      # HTTP/3
-      - target: 443
-        published: ${HTTP3_PORT:-443}
-        protocol: udp
-  sass:
-    image: ${IMAGES_PREFIX:-}app-php
-    volumes:
-      - ./:/app:ro
-      - sass:/app/var/sass
-    entrypoint: ''
-    depends_on:
-      - php
-    command:
-      - bin/console
-      - sass:build
-      - --watch
-      - -v
   
   ###> symfony/mercure-bundle ###
   ###< symfony/mercure-bundle ###
@@ -53,18 +27,4 @@ services:
   database:
     ports:
       - "5432:5432"
-  ###< doctrine/doctrine-bundle ###
+###< doctrine/doctrine-bundle ###
-  
-  ###> symfony/mailer ###
-  mailer:
-    image: axllent/mailpit
-    ports:
-      - "1025"
-      - "8025"
-    environment:
-      MP_SMTP_AUTH_ACCEPT_ANY: 1
-      MP_SMTP_AUTH_ALLOW_INSECURE: 1
-  ###< symfony/mailer ###
-
-volumes:
-  sass:

compose.prod.yaml

@@ -8,23 +8,3 @@ services:
       APP_SECRET: ${APP_SECRET}
       MERCURE_PUBLISHER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET}
       MERCURE_SUBSCRIBER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET}
-      MAILER_SENDER: ${MAILER_SENDER}
-      SENTRY_DSN: ${SENTRY_DSN}
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.tvdt.rule=Host(`tijdvoordetest.nl`)"
-      - "traefik.http.routers.tvdt.entrypoints=websecure"
-      - "traefik.http.routers.tvdt.tls.certresolver=marijndoeve"
-      - "traefik.http.routers.tvdt.service=tvdt"
-      - "traefik.http.services.tvdt.loadbalancer.server.port=80"
-    networks:
-      - web
-      - internal
-  database:
-    networks:
-      - internal
-networks:
-  web:
-    external: true
-  internal:
-    external: false  

compose.yaml

@@ -7,20 +7,36 @@ services:
       MERCURE_PUBLISHER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET:-!ChangeThisMercureHubJWTSecretKey!}
       MERCURE_SUBSCRIBER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET:-!ChangeThisMercureHubJWTSecretKey!}
       # Run "composer require symfony/orm-pack" to install and configure Doctrine ORM
-      DATABASE_URL: postgresql://${POSTGRES_USER:-app}:${POSTGRES_PASSWORD:-!ChangeMe!}@database:5432/${POSTGRES_DB:-app}?serverVersion=${POSTGRES_VERSION:-16}&charset=${POSTGRES_CHARSET:-utf8}
+      DATABASE_URL: postgresql://${POSTGRES_USER:-app}:${POSTGRES_PASSWORD:-!ChangeMe!}@database:5432/${POSTGRES_DB:-app}?serverVersion=${POSTGRES_VERSION:-15}&charset=${POSTGRES_CHARSET:-utf8}
       # Run "composer require symfony/mercure-bundle" to install and configure the Mercure integration
       MERCURE_URL: ${CADDY_MERCURE_URL:-http://php/.well-known/mercure}
       MERCURE_PUBLIC_URL: ${CADDY_MERCURE_PUBLIC_URL:-https://${SERVER_NAME:-localhost}/.well-known/mercure}
       MERCURE_JWT_SECRET: ${CADDY_MERCURE_JWT_SECRET:-!ChangeThisMercureHubJWTSecretKey!}
+      # The two next lines can be removed after initial installation
+      SYMFONY_VERSION: ${SYMFONY_VERSION:-}
+      STABILITY: ${STABILITY:-stable}
     volumes:
       - caddy_data:/data
       - caddy_config:/config
+    ports:
+      # HTTP
+      - target: 80
+        published: ${HTTP_PORT:-80}
+        protocol: tcp
+      # HTTPS
+      - target: 443
+        published: ${HTTPS_PORT:-443}
+        protocol: tcp
+      # HTTP/3
+      - target: 443
+        published: ${HTTP3_PORT:-443}
+        protocol: udp
 
-  # Mercure is installed as a Caddy module, prevent the Flex recipe from installing another service
+# Mercure is installed as a Caddy module, prevent the Flex recipe from installing another service
-  ###> symfony/mercure-bundle ###
+###> symfony/mercure-bundle ###
-  ###< symfony/mercure-bundle ###
+###< symfony/mercure-bundle ###
-  
+
-  ###> doctrine/doctrine-bundle ###
+###> doctrine/doctrine-bundle ###
   database:
     image: postgres:${POSTGRES_VERSION:-16}-alpine
     environment:
@@ -29,21 +45,22 @@ services:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-!ChangeMe!}
       POSTGRES_USER: ${POSTGRES_USER:-app}
     healthcheck:
-      test: [ "CMD", "pg_isready", "-d", "${POSTGRES_DB:-app}", "-U", "${POSTGRES_USER:-app}" ]
+      test: ["CMD", "pg_isready", "-d", "${POSTGRES_DB:-app}", "-U", "${POSTGRES_USER:-app}"]
       timeout: 5s
       retries: 5
       start_period: 60s
     volumes:
       - database_data:/var/lib/postgresql/data:rw
-    restart: always
+      # You may use a bind-mounted host directory instead, so that it is harder to accidentally remove the volume and lose all your data!
-  ###< doctrine/doctrine-bundle ###
+      # - ./docker/db/data:/var/lib/postgresql/data:rw
+###< doctrine/doctrine-bundle ###
 
 volumes:
   caddy_data:
   caddy_config:
-  ###> symfony/mercure-bundle ###
+###> symfony/mercure-bundle ###
-  ###< symfony/mercure-bundle ###
+###< symfony/mercure-bundle ###
-  
+
-  ###> doctrine/doctrine-bundle ###
+###> doctrine/doctrine-bundle ###
   database_data:
-  ###< doctrine/doctrine-bundle ###
+###< doctrine/doctrine-bundle ###

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "marijndoeve/tijdvoordetest",
+    "name": "symfony/skeleton",
     "type": "project",
     "license": "MIT",
     "description": "A minimal Symfony project recommended to create bare bones applications",
@@ -9,59 +9,39 @@
         "php": ">=8.3.15",
         "ext-ctype": "*",
         "ext-iconv": "*",
-        "doctrine/dbal": "^4.2.3",
+        "doctrine/dbal": "^3",
-        "doctrine/doctrine-bundle": "^2.14.0",
+        "doctrine/doctrine-bundle": "^2.13",
-        "doctrine/doctrine-migrations-bundle": "^3.4.2",
+        "doctrine/doctrine-migrations-bundle": "^3.3",
-        "doctrine/orm": "^3.3.3",
+        "doctrine/orm": "^3.3",
-        "easycorp/easyadmin-bundle": "^4.24.7",
+        "easycorp/easyadmin-bundle": "^4.23",
-        "phpdocumentor/reflection-docblock": "^5.6.2",
-        "phpoffice/phpspreadsheet": "^4.2.0",
-        "phpstan/phpdoc-parser": "^2.1",
         "runtime/frankenphp-symfony": "^0.2.0",
-        "sentry/sentry-symfony": "^5.2",
         "symfony/asset": "7.2.*",
-        "symfony/asset-mapper": "7.2.*",
         "symfony/console": "7.2.*",
         "symfony/dotenv": "7.2.*",
-        "symfony/flex": "^2.7.0",
+        "symfony/flex": "^2.4.7",
         "symfony/form": "7.2.*",
         "symfony/framework-bundle": "7.2.*",
-        "symfony/mailer": "7.2.*",
-        "symfony/property-access": "7.2.*",
-        "symfony/property-info": "7.2.*",
         "symfony/runtime": "7.2.*",
         "symfony/security-bundle": "7.2.*",
-        "symfony/security-csrf": "7.2.*",
-        "symfony/serializer": "7.2.*",
         "symfony/twig-bundle": "7.2.*",
         "symfony/uid": "7.2.*",
         "symfony/yaml": "7.2.*",
-        "symfonycasts/sass-bundle": "^0.8.2",
+        "thecodingmachine/safe": "^2.5"
-        "symfonycasts/verify-email-bundle": "^1.17.3",
-        "thecodingmachine/safe": "^3.3.0",
-        "twig/extra-bundle": "^3.21",
-        "twig/intl-extra": "^3.21",
-        "twig/twig": "^3.21.1"
     },
     "require-dev": {
-        "doctrine/doctrine-fixtures-bundle": "^4.1",
+        "doctrine/doctrine-fixtures-bundle": "^4.0",
-        "friendsofphp/php-cs-fixer": "^3.75.0",
+        "friendsofphp/php-cs-fixer": "^3.65",
-        "phpstan/extension-installer": "^1.4.3",
+        "phpstan/extension-installer": "^1.4",
-        "phpstan/phpstan": "^2.1.17",
+        "phpstan/phpstan": "^2.0",
-        "phpstan/phpstan-doctrine": "^2.0.3",
+        "phpstan/phpstan-doctrine": "^2.0",
-        "phpstan/phpstan-phpunit": "^2.0.6",
+        "phpstan/phpstan-phpunit": "^2.0",
-        "phpstan/phpstan-symfony": "^2.0.6",
+        "phpstan/phpstan-symfony": "^2.0",
-        "phpunit/phpunit": "^12.1.6",
+        "phpunit/phpunit": "^11",
-        "rector/rector": "^2.0.16",
+        "rector/rector": "^2.0",
-        "roave/security-advisories": "dev-latest",
+        "symfony/maker-bundle": "^1.62.1",
-        "symfony/browser-kit": "7.2.*",
-        "symfony/css-selector": "7.2.*",
-        "symfony/maker-bundle": "^1.63.0",
-        "symfony/phpunit-bridge": "7.2.*",
         "symfony/stopwatch": "7.2.*",
         "symfony/web-profiler-bundle": "7.2.*",
-        "thecodingmachine/phpstan-safe-rule": "^1.4.1",
+        "thecodingmachine/phpstan-safe-rule": "^1.3"
-        "vincentlanglet/twig-cs-fixer": "^3.7.1"
     },
     "config": {
         "allow-plugins": {
@@ -86,21 +66,17 @@
     "replace": {
         "symfony/polyfill-ctype": "*",
         "symfony/polyfill-iconv": "*",
-        "symfony/polyfill-mbstring": "*",
         "symfony/polyfill-php72": "*",
         "symfony/polyfill-php73": "*",
         "symfony/polyfill-php74": "*",
         "symfony/polyfill-php80": "*",
         "symfony/polyfill-php81": "*",
-        "symfony/polyfill-php82": "*",
+        "symfony/polyfill-php82": "*"
-        "symfony/polyfill-php83": "*",
-        "symfony/polyfill-uuid": "*"
     },
     "scripts": {
         "auto-scripts": {
             "cache:clear": "symfony-cmd",
-            "assets:install %PUBLIC_DIR%": "symfony-cmd",
+            "assets:install %PUBLIC_DIR%": "symfony-cmd"
-            "importmap:install": "symfony-cmd"
         },
         "post-install-cmd": [
             "@auto-scripts"

config/bundles.php

@@ -1,35 +1,15 @@
 <?php
 
-declare(strict_types=1);
-
-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 Symfony\Bundle\FrameworkBundle\FrameworkBundle;
-use Symfony\Bundle\MakerBundle\MakerBundle;
-use Symfony\Bundle\SecurityBundle\SecurityBundle;
-use Symfony\Bundle\TwigBundle\TwigBundle;
-use Symfony\Bundle\WebProfilerBundle\WebProfilerBundle;
-use Symfony\UX\TwigComponent\TwigComponentBundle;
-use SymfonyCasts\Bundle\VerifyEmail\SymfonyCastsVerifyEmailBundle;
-use Symfonycasts\SassBundle\SymfonycastsSassBundle;
-use Twig\Extra\TwigExtraBundle\TwigExtraBundle;
-
 return [
-    FrameworkBundle::class => ['all' => true],
+    Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
-    DoctrineBundle::class => ['all' => true],
+    Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
-    DoctrineMigrationsBundle::class => ['all' => true],
+    Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
-    MakerBundle::class => ['dev' => true],
+    Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
-    TwigBundle::class => ['all' => true],
+    Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
-    SecurityBundle::class => ['all' => true],
+    Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
-    WebProfilerBundle::class => ['dev' => true, 'test' => true],
+    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
-    TwigExtraBundle::class => ['all' => true],
+    Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true],
-    TwigComponentBundle::class => ['all' => true],
+    Symfony\UX\TwigComponent\TwigComponentBundle::class => ['all' => true],
-    EasyAdminBundle::class => ['all' => true],
+    EasyCorp\Bundle\EasyAdminBundle\EasyAdminBundle::class => ['all' => true],
-    DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
+    Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
-    SymfonyCastsVerifyEmailBundle::class => ['all' => true],
-    SentryBundle::class => ['prod' => true],
-    SymfonycastsSassBundle::class => ['all' => true],
 ];

config/packages/asset_mapper.yaml

@@ -1,15 +0,0 @@
-framework:
-  asset_mapper:
-    # The paths to make available to the asset mapper.
-    paths:
-      - assets/
-    excluded_patterns:
-      - '*/assets/styles/_*.scss'
-      - '*/assets/styles/**/_*.scss'
-    missing_import_mode: strict
-
-
-when@prod:
-  framework:
-    asset_mapper:
-      missing_import_mode: warn

config/packages/csrf.yaml

@@ -0,0 +1,11 @@
+# Enable stateless CSRF protection for forms and logins/logouts
+framework:
+    form:
+        csrf_protection:
+            token_id: submit
+
+    csrf_protection:
+        stateless_token_ids:
+            - submit
+            - authenticate
+            - logout

config/packages/doctrine.yaml

@@ -1,52 +1,52 @@
 doctrine:
-  dbal:
+    dbal:
-    url: '%env(resolve:DATABASE_URL)%'
+        url: '%env(resolve:DATABASE_URL)%'
-    
+
-    # IMPORTANT: You MUST configure your server version,
+        # IMPORTANT: You MUST configure your server version,
-    # either here or in the DATABASE_URL env var (see .env file)
+        # either here or in the DATABASE_URL env var (see .env file)
-    #server_version: '16'
+        #server_version: '16'
-    
+
-    profiling_collect_backtrace: '%kernel.debug%'
+        profiling_collect_backtrace: '%kernel.debug%'
-    use_savepoints: true
+        use_savepoints: true
-  orm:
+    orm:
-    auto_generate_proxy_classes: true
+        auto_generate_proxy_classes: true
-    enable_lazy_ghost_objects: true
+        enable_lazy_ghost_objects: true
-    report_fields_where_declared: true
+        report_fields_where_declared: true
-    validate_xml_mapping: true
+        validate_xml_mapping: true
-    naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
+        naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
-    identity_generation_preferences:
+        identity_generation_preferences:
-      Doctrine\DBAL\Platforms\PostgreSQLPlatform: identity
+            Doctrine\DBAL\Platforms\PostgreSQLPlatform: identity
-    auto_mapping: true
+        auto_mapping: true
-    mappings:
+        mappings:
-      App:
+            App:
-        type: attribute
+                type: attribute
-        is_bundle: false
+                is_bundle: false
-        dir: '%kernel.project_dir%/src/Entity'
+                dir: '%kernel.project_dir%/src/Entity'
-        prefix: 'App\Entity'
+                prefix: 'App\Entity'
-        alias: App
+                alias: App
 
 when@test:
-  doctrine:
+    doctrine:
-    dbal:
+        dbal:
-      # "TEST_TOKEN" is typically set by ParaTest
+            # "TEST_TOKEN" is typically set by ParaTest
-      dbname_suffix: '_test%env(default::TEST_TOKEN)%'
+            dbname_suffix: '_test%env(default::TEST_TOKEN)%'
 
 when@prod:
-  doctrine:
+    doctrine:
-    orm:
+        orm:
-      auto_generate_proxy_classes: false
+            auto_generate_proxy_classes: false
-      proxy_dir: '%kernel.build_dir%/doctrine/orm/Proxies'
+            proxy_dir: '%kernel.build_dir%/doctrine/orm/Proxies'
-      query_cache_driver:
+            query_cache_driver:
-        type: pool
+                type: pool
-        pool: doctrine.system_cache_pool
+                pool: doctrine.system_cache_pool
-      result_cache_driver:
+            result_cache_driver:
-        type: pool
+                type: pool
-        pool: doctrine.result_cache_pool
+                pool: doctrine.result_cache_pool
-  
+
-  framework:
+    framework:
-    cache:
+        cache:
-      pools:
+            pools:
-        doctrine.result_cache_pool:
+                doctrine.result_cache_pool:
-          adapter: cache.app
+                    adapter: cache.app
-        doctrine.system_cache_pool:
+                doctrine.system_cache_pool:
-          adapter: cache.system
+                    adapter: cache.system

config/packages/doctrine_migrations.yaml

@@ -1,6 +1,6 @@
 doctrine_migrations:
-  migrations_paths:
+    migrations_paths:
-    # namespace is arbitrary but should be different from App\Migrations
+        # namespace is arbitrary but should be different from App\Migrations
-    # as migrations classes should NOT be autoloaded
+        # as migrations classes should NOT be autoloaded
-    'DoctrineMigrations': '%kernel.project_dir%/migrations'
+        'DoctrineMigrations': '%kernel.project_dir%/migrations'
-  enable_profiler: false 
+    enable_profiler: false

config/packages/framework.yaml

@@ -1,23 +1,15 @@
 # see https://symfony.com/doc/current/reference/configuration/framework.html
 framework:
-  secret: '%env(APP_SECRET)%'
+    secret: '%env(APP_SECRET)%'
-  
+
-  # Note that the session will be started ONLY if you read or write from it.
+    # Note that the session will be started ONLY if you read or write from it.
-  session: true
+    session: true
-  form:
+
-    csrf_protection:
-      enabled: true
     #esi: true
     #fragments: true
-when@prod:
-  framework:
-    # shortcut for private IP address ranges of your proxy
-    trusted_proxies: 'private_ranges'
-    # or, if your proxy instead uses the "Forwarded" header
-    trusted_headers: [ 'forwarded' ]
 
 when@test:
-  framework:
+    framework:
-    test: true
+        test: true
-    session:
+        session:
-      storage_factory_id: session.storage.factory.mock_file
+            storage_factory_id: session.storage.factory.mock_file

config/packages/mailer.yaml

@@ -1,7 +0,0 @@
-framework:
-  mailer:
-    dsn: '%env(MAILER_DSN)%'
-    envelope:
-      sender: '%env(MAILER_SENDER)%'
-    headers:
-      From: 'Tijd voor de test <%env(MAILER_SENDER)%>'

config/packages/routing.yaml

@@ -1,10 +1,10 @@
 framework:
-  router:
+    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: http://localhost
 
 when@prod:
-  framework:
+    framework:
-    router:
+        router:
-      strict_requirements: null
+            strict_requirements: null

config/packages/security.yaml

@@ -1,53 +1,52 @@
 security:
-  # https://symfony.com/doc/current/security.html#registering-the-user-hashing-passwords
+    # https://symfony.com/doc/current/security.html#registering-the-user-hashing-passwords
-  password_hashers:
+    password_hashers:
-    Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'auto'
+        Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'auto'
-  # https://symfony.com/doc/current/security.html#loading-the-user-the-user-provider
+    # https://symfony.com/doc/current/security.html#loading-the-user-the-user-provider
-  providers:
+    providers:
-    # used to reload user from session & other features (e.g. switch_user)
+        # used to reload user from session & other features (e.g. switch_user)
-    app_user_provider:
+        app_user_provider:
-      entity:
+            entity:
-        class: App\Entity\User
+                class: App\Entity\User
-        property: email
+                property: email
-    # used to reload user from session & other features (e.g. switch_user)
+        # used to reload user from session & other features (e.g. switch_user)
-  firewalls:
+    firewalls:
-    dev:
+        dev:
-      pattern: ^/(_(profiler|wdt)|css|images|js)/
+            pattern: ^/(_(profiler|wdt)|css|images|js)/
-      security: false
+            security: false
-    main:
+        main:
-      lazy: true
+            lazy: true
-      provider: app_user_provider
+            provider: app_user_provider
-      form_login:
+            form_login:
-        login_path: app_login_login
+                login_path: app_login
-        check_path: app_login_login
+                check_path: app_login
-        enable_csrf: true
+                enable_csrf: true
-        default_target_path: app_backoffice_index
+            logout:
-      logout:
+                path: app_logout
-        path: app_login_logout
+                # where to redirect after logout
-        # where to redirect after logout
+                # target: app_any_route
-        # target: app_any_route
+
-      
+            # activate different ways to authenticate
-      # activate different ways to authenticate
+            # https://symfony.com/doc/current/security.html#the-firewall
-      # https://symfony.com/doc/current/security.html#the-firewall
+
-      
+            # https://symfony.com/doc/current/security/impersonating_user.html
-      # https://symfony.com/doc/current/security/impersonating_user.html
+            # switch_user: true
-      # switch_user: true
+
-  
+    # Easy way to control access for large sections of your site
-  # Easy way to control access for large sections of your site
+    # Note: Only the *first* access control that matches will be used
-  # Note: Only the *first* access control that matches will be used
+    access_control:
-  access_control:
+        # - { path: ^/admin, roles: ROLE_ADMIN }
-    - { path: ^/admin, roles: ROLE_ADMIN }
+        # - { path: ^/profile, roles: ROLE_USER }
-  # - { path: ^/profile, roles: ROLE_USER }
 
 when@test:
-  security:
+    security:
-    password_hashers:
+        password_hashers:
-      # By default, password hashers are resource intensive and take time. This is
+            # By default, password hashers are resource intensive and take time. This is
-      # important to generate secure password hashes. In tests however, secure hashes
+            # important to generate secure password hashes. In tests however, secure hashes
-      # are not important, waste resources and increase test times. The following
+            # are not important, waste resources and increase test times. The following
-      # reduces the work factor to the lowest possible values.
+            # reduces the work factor to the lowest possible values.
-      Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface:
+            Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface:
-        algorithm: auto
+                algorithm: auto
-        cost: 4 # Lowest possible value for bcrypt
+                cost: 4 # Lowest possible value for bcrypt
-        time_cost: 3 # Lowest possible value for argon
+                time_cost: 3 # Lowest possible value for argon
-        memory_cost: 10 # Lowest possible value for argon
+                memory_cost: 10 # Lowest possible value for argon

config/packages/sentry.yaml

@@ -1,31 +0,0 @@
-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
-      profiles_sample_rate: 1.0
-      ignore_exceptions:
-        - 'Symfony\Component\ErrorHandler\Error\FatalError'
-        - 'Symfony\Component\Debug\Exception\FatalErrorException'
-
-#        If you are using Monolog, you also need this additional configuration to log the errors correctly:
-#        https://docs.sentry.io/platforms/php/guides/symfony/#monolog-integration
-#        register_error_listener: false
-#        register_error_handler: false
-
-#    monolog:
-#        handlers:
-#            sentry:
-#                type: sentry
-#                level: !php/const Monolog\Logger::ERROR
-#                hub_id: Sentry\State\HubInterface
-
-#    Uncomment these lines to register a log message processor that resolves PSR-3 placeholders
-#    https://docs.sentry.io/platforms/php/guides/symfony/#monolog-integration
-#    services:
-#        Monolog\Processor\PsrLogMessageProcessor:
-#            tags: { name: monolog.processor, handler: sentry }

config/packages/translation.yaml

@@ -1,7 +1,7 @@
 framework:
-  default_locale: nl
+    default_locale: nl
-  translator:
+    translator:
-    default_path: '%kernel.project_dir%/translations'
+        default_path: '%kernel.project_dir%/translations'
-    fallbacks:
+        fallbacks:
-      - en
+            - en
-    providers:
+        providers:

config/packages/twig.yaml

@@ -1,7 +1,7 @@
 twig:
-  file_name_pattern: '*.twig'
+    file_name_pattern: '*.twig'
-  form_themes: [ 'bootstrap_5_layout.html.twig' ]
+    form_themes: [ 'bootstrap_5_layout.html.twig' ]
 
 when@test:
-  twig:
+    twig:
-    strict_variables: true
+        strict_variables: true

config/packages/twig_component.yaml

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

config/packages/uid.yaml

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

config/packages/validator.yaml

@@ -1,11 +1,11 @@
 framework:
-  validation:
+    validation:
-  # Enables validator auto-mapping support.
+        # Enables validator auto-mapping support.
-  # For instance, basic validation constraints will be inferred from Doctrine's metadata.
+        # For instance, basic validation constraints will be inferred from Doctrine's metadata.
-  #auto_mapping:
+        #auto_mapping:
-  #    App\Entity\: []
+        #    App\Entity\: []
 
 when@test:
-  framework:
+    framework:
-    validation:
+        validation:
-      not_compromised_password: false
+            not_compromised_password: false

config/packages/web_profiler.yaml

@@ -1,17 +1,17 @@
 when@dev:
-  web_profiler:
+    web_profiler:
-    toolbar: true
+        toolbar: true
-    intercept_redirects: false
+        intercept_redirects: false
-  
+
-  framework:
+    framework:
-    profiler:
+        profiler:
-      only_exceptions: false
+            only_exceptions: false
-      collect_serializer_data: true
+            collect_serializer_data: true
 
 when@test:
-  web_profiler:
+    web_profiler:
-    toolbar: false
+        toolbar: false
-    intercept_redirects: false
+        intercept_redirects: false
-  
+
-  framework:
+    framework:
-    profiler: { collect: false }
+        profiler: { collect: false }

config/routes.yaml

@@ -1,5 +1,5 @@
 controllers:
-  resource:
+    resource:
-    path: ../src/Controller/
+        path: ../src/Controller/
-    namespace: App\Controller
+        namespace: App\Controller
-  type: attribute
+    type: attribute

config/routes/attributes.yaml

@@ -1,9 +1,9 @@
 controllers:
-  resource:
+    resource:
-    path: ../../src/Controller/
+        path: ../../src/Controller/
-    namespace: App\Controller
+        namespace: App\Controller
-  type: attribute
+    type: attribute
 
 kernel:
-  resource: App\Kernel
+    resource: App\Kernel
-  type: attribute
+    type: attribute

config/routes/easyadmin.yaml

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

config/routes/framework.yaml

@@ -1,4 +1,4 @@
 when@dev:
-  _errors:
+    _errors:
-    resource: '@FrameworkBundle/Resources/config/routing/errors.xml'
+        resource: '@FrameworkBundle/Resources/config/routing/errors.xml'
-    prefix: /_error
+        prefix: /_error

config/routes/security.yaml

@@ -1,3 +1,3 @@
 _security_logout:
-  resource: security.route_loader.logout
+    resource: security.route_loader.logout
-  type: service
+    type: service

config/routes/web_profiler.yaml

@@ -1,8 +1,8 @@
 when@dev:
-  web_profiler_wdt:
+    web_profiler_wdt:
-    resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml'
+        resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml'
-    prefix: /_wdt
+        prefix: /_wdt
-  
+
-  web_profiler_profiler:
+    web_profiler_profiler:
-    resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml'
+        resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml'
-    prefix: /_profiler
+        prefix: /_profiler

config/services.yaml

@@ -6,19 +6,19 @@
 parameters:
 
 services:
-  # default configuration for services in *this* file
+    # default configuration for services in *this* file
-  _defaults:
+    _defaults:
-    autowire: true      # Automatically injects dependencies in your services.
+        autowire: true      # Automatically injects dependencies in your services.
-    autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.
+        autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.
-  
+
-  # makes classes in src/ available to be used as services
+    # makes classes in src/ available to be used as services
-  # this creates a service per class whose id is the fully-qualified class name
+    # this creates a service per class whose id is the fully-qualified class name
-  App\:
+    App\:
-    resource: '../src/'
+        resource: '../src/'
-    exclude:
+        exclude:
-      - '../src/DependencyInjection/'
+            - '../src/DependencyInjection/'
-      - '../src/Entity/'
+            - '../src/Entity/'
-      - '../src/Kernel.php'
+            - '../src/Kernel.php'
-  
+
-  # add more service definitions when explicit configuration is needed
+    # add more service definitions when explicit configuration is needed
-  # please note that last definitions always *replace* previous ones
+    # please note that last definitions always *replace* previous ones

frankenphp/Caddyfile

@@ -6,7 +6,7 @@
 	}
 }
 
-{$CADDY_EXTRA_CONFIG} 
+{$CADDY_EXTRA_CONFIG}
 
 {$SERVER_NAME:localhost} {
 	log {
@@ -37,7 +37,7 @@
 		{$MERCURE_EXTRA_DIRECTIVES}
 	}
 
-	vulcain 
+	vulcain
 
 	{$CADDY_SERVER_EXTRA_DIRECTIVES}
 

frankenphp/conf.d/10-app.ini

@@ -11,6 +11,3 @@ opcache.interned_strings_buffer = 16
 opcache.max_accelerated_files = 20000
 opcache.memory_consumption = 256
 opcache.enable_file_override = 1
-
-; for Sentry
-zend.exception_ignore_args = Off

importmap.php

@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * Returns the importmap for this application.
- *
- * - "path" is a path inside the asset mapper system. Use the
- *     "debug:asset-map" command to see the full list of paths.
- *
- * - "entrypoint" (JavaScript only) set to true for any module that will
- *     be used as an "entrypoint" (and passed to the importmap() Twig function).
- *
- * The "importmap:require" command can be used to add new entries to this file.
- */
-return [
-    'quiz' => [
-        'path' => './assets/quiz.js',
-        'entrypoint' => true,
-    ],
-    'backoffice' => [
-        'path' => './assets/backoffice.js',
-        'entrypoint' => true,
-    ],
-    'bootstrap' => [
-        'version' => '5.3.6',
-    ],
-    '@popperjs/core' => [
-        'version' => '2.11.8',
-    ],
-    'bootstrap/dist/css/bootstrap.min.css' => [
-        'version' => '5.3.6',
-        'type' => 'css',
-    ],
-];

migrations/Version20250311213417.php

@@ -1,119 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20250311213417 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE answer ALTER id TYPE UUID');
-        $this->addSql('ALTER TABLE answer ALTER question_id TYPE UUID');
-        $this->addSql('COMMENT ON COLUMN answer.id IS \'\'');
-        $this->addSql('COMMENT ON COLUMN answer.question_id IS \'\'');
-        $this->addSql('ALTER TABLE answer_candidate ALTER answer_id TYPE UUID');
-        $this->addSql('ALTER TABLE answer_candidate ALTER candidate_id TYPE UUID');
-        $this->addSql('COMMENT ON COLUMN answer_candidate.answer_id IS \'\'');
-        $this->addSql('COMMENT ON COLUMN answer_candidate.candidate_id IS \'\'');
-        $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 \'\'');
-        $this->addSql('COMMENT ON COLUMN candidate.season_id IS \'\'');
-        $this->addSql('ALTER TABLE correction ALTER id TYPE UUID');
-        $this->addSql('ALTER TABLE correction ALTER candidate_id TYPE UUID');
-        $this->addSql('ALTER TABLE correction ALTER quiz_id TYPE UUID');
-        $this->addSql('COMMENT ON COLUMN correction.id IS \'\'');
-        $this->addSql('COMMENT ON COLUMN correction.candidate_id IS \'\'');
-        $this->addSql('COMMENT ON COLUMN correction.quiz_id IS \'\'');
-        $this->addSql('ALTER TABLE given_answer ALTER id TYPE UUID');
-        $this->addSql('ALTER TABLE given_answer ALTER candidate_id TYPE UUID');
-        $this->addSql('ALTER TABLE given_answer ALTER quiz_id TYPE UUID');
-        $this->addSql('ALTER TABLE given_answer ALTER answer_id TYPE UUID');
-        $this->addSql('COMMENT ON COLUMN given_answer.id IS \'\'');
-        $this->addSql('COMMENT ON COLUMN given_answer.candidate_id IS \'\'');
-        $this->addSql('COMMENT ON COLUMN given_answer.quiz_id IS \'\'');
-        $this->addSql('COMMENT ON COLUMN given_answer.answer_id IS \'\'');
-        $this->addSql('ALTER TABLE question ALTER id TYPE UUID');
-        $this->addSql('ALTER TABLE question ALTER quiz_id TYPE UUID');
-        $this->addSql('COMMENT ON COLUMN question.id IS \'\'');
-        $this->addSql('COMMENT ON COLUMN question.quiz_id IS \'\'');
-        $this->addSql('ALTER TABLE quiz ADD dropouts INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE quiz ALTER id TYPE UUID');
-        $this->addSql('ALTER TABLE quiz ALTER season_id TYPE UUID');
-        $this->addSql('COMMENT ON COLUMN quiz.id IS \'\'');
-        $this->addSql('COMMENT ON COLUMN quiz.season_id IS \'\'');
-        $this->addSql('ALTER TABLE season ALTER id TYPE UUID');
-        $this->addSql('ALTER TABLE season ALTER active_quiz_id TYPE UUID');
-        $this->addSql('COMMENT ON COLUMN season.id IS \'\'');
-        $this->addSql('COMMENT ON COLUMN season.active_quiz_id IS \'\'');
-        $this->addSql('ALTER TABLE season_user ALTER season_id TYPE UUID');
-        $this->addSql('ALTER TABLE season_user ALTER user_id TYPE UUID');
-        $this->addSql('COMMENT ON COLUMN season_user.season_id IS \'\'');
-        $this->addSql('COMMENT ON COLUMN season_user.user_id IS \'\'');
-        $this->addSql('ALTER TABLE "user" ALTER id TYPE UUID');
-        $this->addSql('COMMENT ON COLUMN "user".id IS \'\'');
-    }
-
-    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)\'');
-        $this->addSql('COMMENT ON COLUMN candidate.season_id IS \'(DC2Type:uuid)\'');
-        $this->addSql('ALTER TABLE correction ALTER id TYPE UUID');
-        $this->addSql('ALTER TABLE correction ALTER candidate_id TYPE UUID');
-        $this->addSql('ALTER TABLE correction ALTER quiz_id TYPE UUID');
-        $this->addSql('COMMENT ON COLUMN correction.id IS \'(DC2Type:uuid)\'');
-        $this->addSql('COMMENT ON COLUMN correction.candidate_id IS \'(DC2Type:uuid)\'');
-        $this->addSql('COMMENT ON COLUMN correction.quiz_id IS \'(DC2Type:uuid)\'');
-        $this->addSql('ALTER TABLE given_answer ALTER id TYPE UUID');
-        $this->addSql('ALTER TABLE given_answer ALTER candidate_id TYPE UUID');
-        $this->addSql('ALTER TABLE given_answer ALTER quiz_id TYPE UUID');
-        $this->addSql('ALTER TABLE given_answer ALTER answer_id TYPE UUID');
-        $this->addSql('COMMENT ON COLUMN given_answer.id IS \'(DC2Type:uuid)\'');
-        $this->addSql('COMMENT ON COLUMN given_answer.candidate_id IS \'(DC2Type:uuid)\'');
-        $this->addSql('COMMENT ON COLUMN given_answer.quiz_id IS \'(DC2Type:uuid)\'');
-        $this->addSql('COMMENT ON COLUMN given_answer.answer_id IS \'(DC2Type:uuid)\'');
-        $this->addSql('ALTER TABLE answer_candidate ALTER answer_id TYPE UUID');
-        $this->addSql('ALTER TABLE answer_candidate ALTER candidate_id TYPE UUID');
-        $this->addSql('COMMENT ON COLUMN answer_candidate.answer_id IS \'(DC2Type:uuid)\'');
-        $this->addSql('COMMENT ON COLUMN answer_candidate.candidate_id IS \'(DC2Type:uuid)\'');
-        $this->addSql('ALTER TABLE quiz DROP dropouts');
-        $this->addSql('ALTER TABLE quiz ALTER id TYPE UUID');
-        $this->addSql('ALTER TABLE quiz ALTER season_id TYPE UUID');
-        $this->addSql('COMMENT ON COLUMN quiz.id IS \'(DC2Type:uuid)\'');
-        $this->addSql('COMMENT ON COLUMN quiz.season_id IS \'(DC2Type:uuid)\'');
-        $this->addSql('ALTER TABLE season ALTER id TYPE UUID');
-        $this->addSql('ALTER TABLE season ALTER active_quiz_id TYPE UUID');
-        $this->addSql('COMMENT ON COLUMN season.id IS \'(DC2Type:uuid)\'');
-        $this->addSql('COMMENT ON COLUMN season.active_quiz_id IS \'(DC2Type:uuid)\'');
-        $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 \'(DC2Type:uuid)\'');
-        $this->addSql('COMMENT ON COLUMN answer.question_id IS \'(DC2Type:uuid)\'');
-        $this->addSql('ALTER TABLE season_user ALTER season_id TYPE UUID');
-        $this->addSql('ALTER TABLE season_user ALTER user_id TYPE UUID');
-        $this->addSql('COMMENT ON COLUMN season_user.season_id IS \'(DC2Type:uuid)\'');
-        $this->addSql('COMMENT ON COLUMN season_user.user_id IS \'(DC2Type:uuid)\'');
-        $this->addSql('ALTER TABLE question ALTER id TYPE UUID');
-        $this->addSql('ALTER TABLE question ALTER quiz_id TYPE UUID');
-        $this->addSql('COMMENT ON COLUMN question.id IS \'(DC2Type:uuid)\'');
-        $this->addSql('COMMENT ON COLUMN question.quiz_id IS \'(DC2Type:uuid)\'');
-        $this->addSql('ALTER TABLE "user" ALTER id TYPE UUID');
-        $this->addSql('COMMENT ON COLUMN "user".id IS \'(DC2Type:uuid)\'');
-    }
-}

migrations/Version20250402185128.php

@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20250402185128 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'add elimination table';
-    }
-
-    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

@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20250420111904 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add is_verified column to user table';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql(<<<'SQL'
-            ALTER TABLE "user" ADD is_verified BOOLEAN NOT NULL
-        SQL);
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql(<<<'SQL'
-            ALTER TABLE "user" DROP is_verified
-        SQL);
-    }
-}

migrations/Version20250420125040.php

@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20250420125040 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Drop preregister_candidates column from season table';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql(<<<'SQL'
-            ALTER TABLE season DROP preregister_candidates
-        SQL);
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql(<<<'SQL'
-            ALTER TABLE season ADD preregister_candidates BOOLEAN NOT NULL DEFAULT true
-        SQL);
-    }
-}

migrations/Version20250427174822.php

@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20250427174822 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add ordering to question and answer';
-    }
-
-    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);
-        $this->addSql(<<<'SQL'
-            ALTER TABLE question ADD ordering SMALLINT DEFAULT 0 NOT NULL
-        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);
-        $this->addSql(<<<'SQL'
-            ALTER TABLE question DROP ordering
-        SQL);
-    }
-}

migrations/Version20250504101440.php

@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20250504101440 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql(<<<'SQL'
-            CREATE UNIQUE INDEX UNIQ_C8B28E445E237E064EC001D1 ON candidate (name, season_id)
-        SQL);
-        $this->addSql(<<<'SQL'
-            CREATE UNIQUE INDEX UNIQ_A412FA925E237E064EC001D1 ON quiz (name, season_id)
-        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);
-        $this->addSql(<<<'SQL'
-            DROP INDEX UNIQ_C8B28E445E237E064EC001D1
-        SQL);
-    }
-}

migrations/Version20250521192752.php

@@ -1,54 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20250521192752 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql(<<<'SQL'
-            ALTER TABLE elimination ADD quiz_id UUID NOT NULL
-        SQL);
-        $this->addSql(<<<'SQL'
-            ALTER TABLE elimination ADD CONSTRAINT FK_5947284F853CD175 FOREIGN KEY (quiz_id) REFERENCES quiz (id) NOT DEFERRABLE INITIALLY IMMEDIATE
-        SQL);
-        $this->addSql(<<<'SQL'
-            CREATE INDEX IDX_5947284F853CD175 ON elimination (quiz_id)
-        SQL);
-        $this->addSql(<<<'SQL'
-            ALTER TABLE quiz ALTER dropouts SET DEFAULT 1
-        SQL);
-        $this->addSql(<<<'SQL'
-            ALTER TABLE quiz ALTER dropouts SET NOT NULL
-        SQL);
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql(<<<'SQL'
-            ALTER TABLE quiz ALTER dropouts DROP DEFAULT
-        SQL);
-        $this->addSql(<<<'SQL'
-            ALTER TABLE quiz ALTER dropouts DROP NOT NULL
-        SQL);
-        $this->addSql(<<<'SQL'
-            ALTER TABLE elimination DROP CONSTRAINT FK_5947284F853CD175
-        SQL);
-        $this->addSql(<<<'SQL'
-            DROP INDEX IDX_5947284F853CD175
-        SQL);
-        $this->addSql(<<<'SQL'
-            ALTER TABLE elimination DROP quiz_id
-        SQL);
-    }
-}

migrations/Version20250521194035.php

@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20250521194035 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql(<<<'SQL'
-            ALTER TABLE elimination ADD created TIMESTAMP(0) WITHOUT TIME ZONE
-        SQL);
-        $this->addSql(<<<'SQL'
-            UPDATE elimination SET created = NOW()
-            SQL
-        );
-        $this->addSql(<<<'SQL'
-            ALTER TABLE elimination ALTER created SET NOT NULL
-            SQL
-        );
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql(<<<'SQL'
-            ALTER TABLE elimination DROP created
-        SQL);
-    }
-}

phpstan.dist.neon

@@ -1,5 +1,4 @@
 parameters:
-    editorUrl: 'phpstorm://open?file=%%file%%&line=%%line%%'
     level: 8
     paths:
         - bin/

phpunit.dist.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         failOnNotice="true"
-         failOnWarning="true"
-         bootstrap="tests/bootstrap.php"
-         cacheDirectory=".phpunit.cache"
->
-    <php>
-        <ini name="display_errors" value="1" />
-        <ini name="error_reporting" value="-1" />
-        <server name="APP_ENV" value="test" force="true" />
-        <server name="SHELL_VERBOSITY" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Project Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <source ignoreSuppressionOfDeprecations="true" restrictNotices="true" restrictWarnings="true">
-        <include>
-            <directory>src</directory>
-        </include>
-    </source>
-
-    <extensions>
-    </extensions>
-</phpunit>

public/index.php

@@ -7,8 +7,8 @@ use App\Kernel;
 require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
 
 return static function (array $context): Kernel {
-    $appEnv = empty($context['APP_ENV']) ? 'prod' : (string) $context['APP_ENV'];
+    $appEnv = !empty($context['APP_ENV']) ? (string) $context['APP_ENV'] : 'prod';
-    $appDebug = empty($context['APP_DEBUG']) ? 'prod' !== $appEnv : filter_var($context['APP_DEBUG'], \FILTER_VALIDATE_BOOL);
+    $appDebug = !empty($context['APP_DEBUG']) ? filter_var($context['APP_DEBUG'], \FILTER_VALIDATE_BOOL) : 'prod' !== $appEnv;
 
     return new Kernel($appEnv, $appDebug);
 };

rector.php

@@ -11,8 +11,6 @@ return RectorConfig::configure()
         __DIR__.'/src',
         __DIR__.'/tests',
     ])
-    ->withSymfonyContainerXml('var/cache/dev/App_KernelDevDebugContainer.xml')
-    ->withParallel()
     ->withPhpSets()
     ->withPreparedSets(
         deadCode: true,
@@ -28,6 +26,6 @@ return RectorConfig::configure()
         doctrineCodeQuality: true,
         symfonyCodeQuality: true,
     )
-    ->withAttributesSets(all: true)
+    ->withComposerBased(twig: true, doctrine: true, phpunit: true)
-    ->withComposerBased(twig: true, doctrine: true, phpunit: true, symfony: true)
+    ->withAttributesSets()
 ;

src/Command/ClaimSeasonCommand.php

@@ -1,67 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Command;
-
-use App\Repository\SeasonRepository;
-use App\Repository\UserRepository;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Console\Attribute\AsCommand;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Style\SymfonyStyle;
-
-#[AsCommand(
-    name: 'app:claim-season',
-    description: 'Give a user owner rights on a season',
-)]
-class ClaimSeasonCommand extends Command
-{
-    public function __construct(
-        private readonly UserRepository $userRepository,
-        private readonly SeasonRepository $seasonRepository,
-        private readonly EntityManagerInterface $entityManager)
-    {
-        parent::__construct();
-    }
-
-    protected function configure(): void
-    {
-        $this
-            ->addArgument('email', InputArgument::REQUIRED, 'The email of the user thats claims the season')
-            ->addArgument('season', InputArgument::REQUIRED, 'The season to claim')
-        ;
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output): int
-    {
-        $io = new SymfonyStyle($input, $output);
-        $email = $input->getArgument('email');
-        $seasonCode = $input->getArgument('season');
-
-        try {
-            $season = $this->seasonRepository->findOneBy(['seasonCode' => $seasonCode]);
-            if (null === $season) {
-                throw new \InvalidArgumentException('Season not found');
-            }
-
-            $user = $this->userRepository->findOneBy(['email' => $email]);
-            if (null === $user) {
-                throw new \InvalidArgumentException('User not found');
-            }
-
-            $season->addOwner($user);
-
-            $this->entityManager->flush();
-        } catch (\InvalidArgumentException $invalidArgumentException) {
-            $io->error($invalidArgumentException->getMessage());
-
-            return Command::FAILURE;
-        }
-
-        return Command::SUCCESS;
-    }
-}

src/Command/MakeAdminCommand.php

@@ -1,48 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Command;
-
-use App\Repository\UserRepository;
-use Symfony\Component\Console\Attribute\AsCommand;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Style\SymfonyStyle;
-
-#[AsCommand(
-    name: 'app:make-admin',
-    description: 'Give a user the role admin',
-)]
-class MakeAdminCommand extends Command
-{
-    public function __construct(private readonly UserRepository $userRepository)
-    {
-        parent::__construct();
-    }
-
-    protected function configure(): void
-    {
-        $this
-            ->addArgument('email', InputArgument::REQUIRED, 'The email of the user to make admin')
-        ;
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output): int
-    {
-        $io = new SymfonyStyle($input, $output);
-        $email = $input->getArgument('email');
-
-        try {
-            $this->userRepository->makeAdmin($email);
-        } catch (\InvalidArgumentException) {
-            $io->error('User not found');
-
-            return Command::FAILURE;
-        }
-
-        return Command::SUCCESS;
-    }
-}

src/Controller/AbstractController.php

@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Controller;
-
-use App\Enum\FlashType;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController as AbstractBaseController;
-
-abstract class AbstractController extends AbstractBaseController
-{
-    #[\Override]
-    protected function addFlash(FlashType|string $type, mixed $message): void
-    {
-        if ($type instanceof FlashType) {
-            $type = $type->value;
-        }
-
-        parent::addFlash($type, $message);
-    }
-}

src/Controller/Admin/AnswerCrudController.php

@@ -1,11 +1,12 @@
 <?php
 
-declare(strict_types=1);
-
 namespace App\Controller\Admin;
 
 use App\Entity\Answer;
 use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
+use EasyCorp\Bundle\EasyAdminBundle\Field\IdField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextEditorField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
 
 class AnswerCrudController extends AbstractCrudController
 {
@@ -13,4 +14,15 @@ class AnswerCrudController extends AbstractCrudController
     {
         return Answer::class;
     }
+
+    /*
+    public function configureFields(string $pageName): iterable
+    {
+        return [
+            IdField::new('id'),
+            TextField::new('title'),
+            TextEditorField::new('description'),
+        ];
+    }
+    */
 }

src/Controller/Admin/CandidateCrudController.php

@@ -1,11 +1,12 @@
 <?php
 
-declare(strict_types=1);
-
 namespace App\Controller\Admin;
 
 use App\Entity\Candidate;
 use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
+use EasyCorp\Bundle\EasyAdminBundle\Field\IdField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextEditorField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
 
 class CandidateCrudController extends AbstractCrudController
 {
@@ -13,4 +14,15 @@ class CandidateCrudController extends AbstractCrudController
     {
         return Candidate::class;
     }
+
+    /*
+    public function configureFields(string $pageName): iterable
+    {
+        return [
+            IdField::new('id'),
+            TextField::new('title'),
+            TextEditorField::new('description'),
+        ];
+    }
+    */
 }

src/Controller/Admin/CorrectionCrudController.php

@@ -1,11 +1,12 @@
 <?php
 
-declare(strict_types=1);
-
 namespace App\Controller\Admin;
 
 use App\Entity\Correction;
 use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
+use EasyCorp\Bundle\EasyAdminBundle\Field\IdField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextEditorField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
 
 class CorrectionCrudController extends AbstractCrudController
 {
@@ -13,4 +14,15 @@ class CorrectionCrudController extends AbstractCrudController
     {
         return Correction::class;
     }
+
+    /*
+    public function configureFields(string $pageName): iterable
+    {
+        return [
+            IdField::new('id'),
+            TextField::new('title'),
+            TextEditorField::new('description'),
+        ];
+    }
+    */
 }

src/Controller/Admin/DashboardController.php

@@ -12,19 +12,20 @@ use App\Entity\Question;
 use App\Entity\Quiz;
 use App\Entity\Season;
 use App\Entity\User;
-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 Symfony\Component\Routing\Attribute\Route;
 
-#[AdminDashboard(routePath: '/admin', routeName: 'admin')]
 class DashboardController extends AbstractDashboardController
 {
-    #[\Override]
+    #[Route('/admin', name: 'admin')]
     public function index(): Response
     {
+        //        return parent::index();
+
         // Option 1. You can make your dashboard redirect to some common page of your backend
         //
         $adminUrlGenerator = $this->container->get(AdminUrlGenerator::class);
@@ -43,14 +44,12 @@ class DashboardController extends AbstractDashboardController
         // 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');
@@ -62,6 +61,6 @@ class DashboardController extends AbstractDashboardController
         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');
+        yield MenuItem::linkToLogout('Logout', 'fa fa-exit');
     }
 }

src/Controller/Admin/GivenAnswerCrudController.php

@@ -1,11 +1,12 @@
 <?php
 
-declare(strict_types=1);
-
 namespace App\Controller\Admin;
 
 use App\Entity\GivenAnswer;
 use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
+use EasyCorp\Bundle\EasyAdminBundle\Field\IdField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextEditorField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
 
 class GivenAnswerCrudController extends AbstractCrudController
 {
@@ -13,4 +14,15 @@ class GivenAnswerCrudController extends AbstractCrudController
     {
         return GivenAnswer::class;
     }
+
+    /*
+    public function configureFields(string $pageName): iterable
+    {
+        return [
+            IdField::new('id'),
+            TextField::new('title'),
+            TextEditorField::new('description'),
+        ];
+    }
+    */
 }

src/Controller/Admin/QuestionCrudController.php

@@ -1,11 +1,12 @@
 <?php
 
-declare(strict_types=1);
-
 namespace App\Controller\Admin;
 
 use App\Entity\Question;
 use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
+use EasyCorp\Bundle\EasyAdminBundle\Field\IdField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextEditorField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
 
 class QuestionCrudController extends AbstractCrudController
 {
@@ -13,4 +14,15 @@ class QuestionCrudController extends AbstractCrudController
     {
         return Question::class;
     }
+
+    /*
+    public function configureFields(string $pageName): iterable
+    {
+        return [
+            IdField::new('id'),
+            TextField::new('title'),
+            TextEditorField::new('description'),
+        ];
+    }
+    */
 }

src/Controller/Admin/QuizCrudController.php

@@ -1,11 +1,12 @@
 <?php
 
-declare(strict_types=1);
-
 namespace App\Controller\Admin;
 
 use App\Entity\Quiz;
 use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
+use EasyCorp\Bundle\EasyAdminBundle\Field\IdField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextEditorField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
 
 class QuizCrudController extends AbstractCrudController
 {
@@ -13,4 +14,15 @@ class QuizCrudController extends AbstractCrudController
     {
         return Quiz::class;
     }
+
+    /*
+    public function configureFields(string $pageName): iterable
+    {
+        return [
+            IdField::new('id'),
+            TextField::new('title'),
+            TextEditorField::new('description'),
+        ];
+    }
+    */
 }

src/Controller/Admin/SeasonCrudController.php

@@ -1,11 +1,12 @@
 <?php
 
-declare(strict_types=1);
-
 namespace App\Controller\Admin;
 
 use App\Entity\Season;
 use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
+use EasyCorp\Bundle\EasyAdminBundle\Field\IdField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextEditorField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
 
 class SeasonCrudController extends AbstractCrudController
 {
@@ -13,4 +14,15 @@ class SeasonCrudController extends AbstractCrudController
     {
         return Season::class;
     }
+
+    /*
+    public function configureFields(string $pageName): iterable
+    {
+        return [
+            IdField::new('id'),
+            TextField::new('title'),
+            TextEditorField::new('description'),
+        ];
+    }
+    */
 }

src/Controller/Admin/UserCrudController.php

@@ -1,11 +1,12 @@
 <?php
 
-declare(strict_types=1);
-
 namespace App\Controller\Admin;
 
 use App\Entity\User;
 use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
+use EasyCorp\Bundle\EasyAdminBundle\Field\IdField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextEditorField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
 
 class UserCrudController extends AbstractCrudController
 {
@@ -13,4 +14,15 @@ class UserCrudController extends AbstractCrudController
     {
         return User::class;
     }
+
+    /*
+    public function configureFields(string $pageName): iterable
+    {
+        return [
+            IdField::new('id'),
+            TextField::new('title'),
+            TextEditorField::new('description'),
+        ];
+    }
+    */
 }

src/Controller/Backoffice/BackofficeController.php

@@ -1,79 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Controller\Backoffice;
-
-use App\Controller\AbstractController;
-use App\Entity\Season;
-use App\Entity\User;
-use App\Form\CreateSeasonFormType;
-use App\Repository\SeasonRepository;
-use App\Service\QuizSpreadsheetService;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Bundle\SecurityBundle\Security;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\StreamedResponse;
-use Symfony\Component\HttpKernel\Attribute\AsController;
-use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Component\Security\Http\Attribute\IsGranted;
-
-#[AsController]
-#[IsGranted('ROLE_USER')]
-final class BackofficeController extends AbstractController
-{
-    public function __construct(
-        private readonly SeasonRepository $seasonRepository,
-        private readonly Security $security,
-    ) {}
-
-    #[Route('/backoffice/', name: 'app_backoffice_index')]
-    public function index(): Response
-    {
-        $user = $this->getUser();
-        \assert($user instanceof User);
-
-        $seasons = $this->security->isGranted('ROLE_ADMIN')
-            ? $this->seasonRepository->findAll()
-            : $this->seasonRepository->getSeasonsForUser($user);
-
-        return $this->render('backoffice/index.html.twig', [
-            'seasons' => $seasons,
-        ]);
-    }
-
-    #[Route('/backoffice/add', name: 'app_backoffice_season_add', priority: 10)]
-    public function addSeason(Request $request, EntityManagerInterface $em): Response
-    {
-        $season = new Season();
-        $form = $this->createForm(CreateSeasonFormType::class, $season);
-
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $user = $this->getUser();
-            \assert($user instanceof User);
-
-            $season->addOwner($user);
-            $season->generateSeasonCode();
-
-            $em->persist($season);
-            $em->flush();
-
-            return $this->redirectToRoute('app_backoffice_season', ['seasonCode' => $season->getSeasonCode()]);
-        }
-
-        return $this->render('backoffice/season_add.html.twig', ['form' => $form]);
-    }
-
-    #[Route('/backoffice/template', name: 'app_backoffice_template', priority: 10)]
-    public function getTemplate(QuizSpreadsheetService $excel): Response
-    {
-        $response = new StreamedResponse($excel->generateTemplate());
-        $response->headers->set('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
-        $response->headers->set('Content-Disposition', 'attachment; filename="template.xlsx"');
-
-        return $response;
-    }
-}

src/Controller/Backoffice/PrepareEliminationController.php

@@ -1,45 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Controller\Backoffice;
-
-use App\Entity\Elimination;
-use App\Entity\Quiz;
-use App\Entity\Season;
-use App\Factory\EliminationFactory;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Attribute\Route;
-
-final class PrepareEliminationController extends AbstractController
-{
-    #[Route('/backoffice/elimination/{seasonCode}/{quiz}/prepare', name: 'app_prepare_elimination')]
-    public function index(Season $season, Quiz $quiz, EliminationFactory $eliminationFactory): Response
-    {
-        $elimination = $eliminationFactory->createEliminationFromQuiz($quiz);
-
-        return $this->redirectToRoute('app_prepare_elimination_view', ['elimination' => $elimination->getId()]);
-    }
-
-    #[Route('/backoffice/elimination/{elimination}', name: 'app_prepare_elimination_view')]
-    public function viewElimination(Elimination $elimination, Request $request, EntityManagerInterface $em): Response
-    {
-        if ('POST' === $request->getMethod()) {
-            $elimination->updateFromInputBag($request->request);
-            $em->flush();
-
-            if (true === $request->request->getBoolean('start')) {
-                return $this->redirectToRoute('app_elimination', ['elimination' => $elimination->getId()]);
-            }
-            $this->addFlash('success', 'Elimination updated');
-        }
-
-        return $this->render('backoffice/prepare_elimination/index.html.twig', [
-            'controller_name' => 'PrepareEliminationController',
-            'elimination' => $elimination,
-        ]);
-    }
-}

src/Controller/Backoffice/QuizController.php

@@ -1,50 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Controller\Backoffice;
-
-use App\Controller\AbstractController;
-use App\Entity\Quiz;
-use App\Entity\Season;
-use App\Repository\CandidateRepository;
-use App\Security\Voter\SeasonVoter;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Attribute\AsController;
-use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Component\Security\Http\Attribute\IsGranted;
-
-#[AsController]
-#[IsGranted('ROLE_USER')]
-class QuizController extends AbstractController
-{
-    public function __construct(
-        private readonly CandidateRepository $candidateRepository,
-    ) {}
-
-    #[Route('/backoffice/season/{seasonCode}/quiz/{quiz}', name: 'app_backoffice_quiz')]
-    #[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),
-        ]);
-    }
-
-    #[Route('/backoffice/season/{seasonCode}/quiz/{quiz}/enable', name: 'app_backoffice_enable')]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
-    public function enableQuiz(Season $season, ?Quiz $quiz, EntityManagerInterface $em): Response
-    {
-        $season->setActiveQuiz($quiz);
-        $em->flush();
-
-        if ($quiz instanceof Quiz) {
-            return $this->redirectToRoute('app_backoffice_quiz', ['seasonCode' => $season->getSeasonCode(), 'quiz' => $quiz->getId()]);
-        }
-
-        return $this->redirectToRoute('app_backoffice_season', ['seasonCode' => $season->getSeasonCode()]);
-    }
-}

src/Controller/Backoffice/SeasonController.php

@@ -1,88 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Controller\Backoffice;
-
-use App\Controller\AbstractController;
-use App\Entity\Candidate;
-use App\Entity\Quiz;
-use App\Entity\Season;
-use App\Enum\FlashType;
-use App\Form\AddCandidatesFormType;
-use App\Form\UploadQuizFormType;
-use App\Security\Voter\SeasonVoter;
-use App\Service\QuizSpreadsheetService;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Attribute\AsController;
-use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Component\Security\Http\Attribute\IsGranted;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-#[AsController]
-#[IsGranted('ROLE_USER')]
-class SeasonController extends AbstractController
-{
-    public function __construct(private readonly TranslatorInterface $translator, private EntityManagerInterface $em,
-    ) {}
-
-    #[Route('/backoffice/season/{seasonCode}', name: 'app_backoffice_season')]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
-    public function index(Season $season): Response
-    {
-        return $this->render('backoffice/season.html.twig', [
-            'season' => $season,
-        ]);
-    }
-
-    #[Route('/backoffice/season/{seasonCode}/add_candidate', name: 'app_backoffice_add_candidates', priority: 10)]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
-    public function addCandidates(Season $season, Request $request): Response
-    {
-        $form = $this->createForm(AddCandidatesFormType::class);
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $candidates = $form->get('candidates')->getData();
-            foreach (explode("\r\n", (string) $candidates) as $candidate) {
-                $season->addCandidate(new Candidate($candidate));
-            }
-
-            $this->em->flush();
-
-            return $this->redirectToRoute('app_backoffice_season', ['seasonCode' => $season->getSeasonCode()]);
-        }
-
-        return $this->render('backoffice/season_add_candidates.html.twig', ['form' => $form]);
-    }
-
-    #[Route('/backoffice/season/{seasonCode}/add', name: 'app_backoffice_quiz_add', priority: 10)]
-    #[IsGranted(SeasonVoter::EDIT, subject: 'season')]
-    public function addQuiz(Request $request, Season $season, QuizSpreadsheetService $quizSpreadsheet): Response
-    {
-        $quiz = new Quiz();
-        $form = $this->createForm(UploadQuizFormType::class, $quiz);
-
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            /* @var UploadedFile $sheet */
-            $sheet = $form->get('sheet')->getData();
-
-            $quizSpreadsheet->xlsxToQuiz($quiz, $sheet);
-
-            $quiz->setSeason($season);
-            $this->em->persist($quiz);
-            $this->em->flush();
-
-            $this->addFlash(FlashType::Success, $this->translator->trans('Quiz Added!'));
-
-            return $this->redirectToRoute('app_backoffice_season', ['seasonCode' => $season->getSeasonCode()]);
-        }
-
-        return $this->render('/backoffice/quiz_add.html.twig', ['form' => $form, 'season' => $season]);
-    }
-}

src/Controller/EliminationController.php

@@ -1,76 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Controller;
-
-use App\Entity\Candidate;
-use App\Entity\Elimination;
-use App\Enum\FlashType;
-use App\Form\EliminationEnterNameType;
-use App\Helpers\Base64;
-use App\Repository\CandidateRepository;
-use App\Security\Voter\SeasonVoter;
-use Symfony\Bridge\Doctrine\Attribute\MapEntity;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Attribute\AsController;
-use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Component\Security\Http\Attribute\IsGranted;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-use function Symfony\Component\Translation\t;
-
-#[AsController]
-#[IsGranted('ROLE_USER')]
-final class EliminationController extends AbstractController
-{
-    public function __construct(private readonly TranslatorInterface $translator) {}
-
-    #[Route('/elimination/{elimination}', name: 'app_elimination')]
-    #[IsGranted(SeasonVoter::ELIMINATION, 'elimination')]
-    public function index(#[MapEntity] Elimination $elimination, Request $request): Response
-    {
-        $form = $this->createForm(EliminationEnterNameType::class);
-
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $name = $form->get('name')->getData();
-
-            return $this->redirectToRoute('app_elimination_candidate', ['elimination' => $elimination->getId(), 'candidateHash' => Base64::base64UrlEncode($name)]);
-        }
-
-        return $this->render('quiz/elimination/index.html.twig', [
-            'form' => $form,
-            'controller_name' => 'EliminationController',
-        ]);
-    }
-
-    #[Route('/elimination/{elimination}/{candidateHash}', name: 'app_elimination_candidate')]
-    #[IsGranted(SeasonVoter::ELIMINATION, 'elimination')]
-    public function candidateScreen(Elimination $elimination, string $candidateHash, CandidateRepository $candidateRepository): Response
-    {
-        $candidate = $candidateRepository->getCandidateByHash($elimination->getQuiz()->getSeason(), $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('app_elimination', ['elimination' => $elimination->getId()]);
-        }
-
-        $screenColour = $elimination->getScreenColour($candidate->getName());
-
-        if (null === $screenColour) {
-            $this->addFlash(FlashType::Warning, $this->translator->trans('Cound not find candidate with name %name% in elimination.', ['%name%' => $candidate->getName()]));
-
-            return $this->redirectToRoute('app_elimination', ['elimination' => $elimination->getId()]);
-        }
-
-        return $this->render('quiz/elimination/candidate.html.twig', [
-            'candidate' => $candidate,
-            'colour' => $screenColour,
-        ]);
-    }
-}

src/Controller/LoginController.php

@@ -4,19 +4,15 @@ declare(strict_types=1);
 
 namespace App\Controller;
 
-use App\Enum\FlashType;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Attribute\AsController;
 use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
-#[AsController]
+class LoginController extends AbstractController
-final class LoginController extends AbstractController
 {
-    #[Route(path: '/login', name: 'app_login_login')]
+    #[Route(path: '/login', name: 'app_login')]
-    public function login(AuthenticationUtils $authenticationUtils, TranslatorInterface $translator): Response
+    public function login(AuthenticationUtils $authenticationUtils): Response
     {
         // get the login error if there is one
         $error = $authenticationUtils->getLastAuthenticationError();
@@ -24,18 +20,14 @@ final class LoginController extends AbstractController
         // last username entered by the user
         $lastUsername = $authenticationUtils->getLastUsername();
 
-        if ($error instanceof AuthenticationException) {
+        return $this->render('login/login.html.twig', [
-            $this->addFlash(FlashType::Danger, $translator->trans($error->getMessageKey(), $error->getMessageData(), 'security'));
-        }
-
-        return $this->render('backoffice/login/login.html.twig', [
             'last_username' => $lastUsername,
             'error' => $error,
         ]);
     }
 
-    #[Route(path: '/logout', name: 'app_login_logout')]
+    #[Route(path: '/logout', name: 'app_logout')]
-    public function logout(): never
+    public function logout(): void
     {
         throw new \LogicException('This method can be blank - it will be intercepted by the logout key on your firewall.');
     }

src/Controller/QuizController.php

@@ -4,62 +4,44 @@ declare(strict_types=1);
 
 namespace App\Controller;
 
-use App\Entity\Answer;
 use App\Entity\Candidate;
-use App\Entity\GivenAnswer;
-use App\Entity\Question;
 use App\Entity\Season;
 use App\Enum\FlashType;
 use App\Form\EnterNameType;
 use App\Form\SelectSeasonType;
 use App\Helpers\Base64;
-use App\Repository\AnswerRepository;
 use App\Repository\CandidateRepository;
-use App\Repository\GivenAnswerRepository;
 use App\Repository\QuestionRepository;
-use App\Repository\SeasonRepository;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Bridge\Doctrine\Attribute\MapEntity;
-use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Attribute\AsController;
 use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 #[AsController]
-final class QuizController extends AbstractController
+class QuizController extends AbstractController
 {
     public const string SEASON_CODE_REGEX = '[A-Za-z\d]{5}';
-
     private const string CANDIDATE_HASH_REGEX = '[\w\-=]+';
 
-    public function __construct(private readonly TranslatorInterface $translator) {}
+    #[Route(path: '/', name: 'select_season', methods: ['GET', 'POST'])]
-
+    public function selectSeason(Request $request): Response
-    #[Route(path: '/', name: 'app_quiz_selectseason', methods: ['GET', 'POST'])]
-    public function selectSeason(Request $request, SeasonRepository $seasonRepository): Response
     {
         $form = $this->createForm(SelectSeasonType::class);
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            $seasonCode = $form->get('season_code')->getData();
+            $data = $form->getData();
 
-            if ([] === $seasonRepository->findBy(['seasonCode' => $seasonCode])) {
+            return $this->redirectToRoute('enter_name', ['seasonCode' => $data['season_code']]);
-                $this->addFlash(FlashType::Warning, $this->translator->trans('Invalid season code'));
-
-                return $this->redirectToRoute('app_quiz_selectseason');
-            }
-
-            return $this->redirectToRoute('app_quiz_entername', ['seasonCode' => $seasonCode]);
         }
 
         return $this->render('quiz/select_season.html.twig', ['form' => $form]);
     }
 
-    #[Route(path: '/{seasonCode}', name: 'app_quiz_entername', requirements: ['seasonCode' => self::SEASON_CODE_REGEX])]
+    #[Route(path: '/{seasonCode}', name: 'enter_name', requirements: ['seasonCode' => self::SEASON_CODE_REGEX])]
     public function enterName(
         Request $request,
-        #[MapEntity(mapping: ['seasonCode' => 'seasonCode'])]
         Season $season,
     ): Response {
         $form = $this->createForm(EnterNameType::class);
@@ -67,9 +49,10 @@ final class QuizController extends AbstractController
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            $name = $form->get('name')->getData();
+            $data = $form->getData();
+            $name = $data['name'];
 
-            return $this->redirectToRoute('app_quiz_quizpage', ['seasonCode' => $season->getSeasonCode(), 'nameHash' => Base64::base64UrlEncode($name)]);
+            return $this->redirectToRoute('quiz_page', ['seasonCode' => $season->getSeasonCode(), 'nameHash' => Base64::base64_url_encode($name)]);
         }
 
         return $this->render('quiz/enter_name.twig', ['season' => $season, 'form' => $form]);
@@ -77,50 +60,29 @@ final class QuizController extends AbstractController
 
     #[Route(
         path: '/{seasonCode}/{nameHash}',
-        name: 'app_quiz_quizpage',
+        name: 'quiz_page',
         requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'nameHash' => self::CANDIDATE_HASH_REGEX],
     )]
     public function quizPage(
-        #[MapEntity(mapping: ['seasonCode' => 'seasonCode'])]
         Season $season,
         string $nameHash,
         CandidateRepository $candidateRepository,
         QuestionRepository $questionRepository,
-        AnswerRepository $answerRepository,
-        GivenAnswerRepository $givenAnswerRepository,
-        Request $request,
     ): Response {
         $candidate = $candidateRepository->getCandidateByHash($season, $nameHash);
 
         if (!$candidate instanceof Candidate) {
-            $this->addFlash(FlashType::Danger, $this->translator->trans('Candidate not found'));
+            if ($season->isPreregisterCandidates() === false) {
-
+                // create candidate
-            return $this->redirectToRoute('app_quiz_entername', ['seasonCode' => $season->getSeasonCode()]);
-        }
-
-        if ('POST' === $request->getMethod()) {
-            $answer = $answerRepository->findOneBy(['id' => $request->request->get('answer')]);
-
-            if (!$answer instanceof Answer) {
-                throw new BadRequestException('Invalid Answer ID');
             }
 
-            $givenAnswer = (new GivenAnswer())
+            $this->addFlash(FlashType::Danger->value, "Candidate {${Base64::base64_url_decode($nameHash)}} not found");
-                ->setCandidate($candidate)
+
-                ->setAnswer($answer)
+            return $this->redirectToRoute('enter_name', ['seasonCode' => $season->getSeasonCode()]);
-            ->setQuiz($answer->getQuestion()->getQuiz());
-            $givenAnswerRepository->save($givenAnswer);
         }
 
         $question = $questionRepository->findNextQuestionForCandidate($candidate);
 
-        if (!$question instanceof Question) {
-            $this->addFlash(FlashType::Success, $this->translator->trans('Quiz completed'));
-
-            return $this->redirectToRoute('app_quiz_entername', ['seasonCode' => $season->getSeasonCode()]);
-        }
-
-        // TODO One first question record time
         return $this->render('quiz/question.twig', ['candidate' => $candidate, 'question' => $question]);
     }
 }

src/Controller/RegistrationController.php

@@ -1,93 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Controller;
-
-use App\Entity\User;
-use App\Form\RegistrationFormType;
-use App\Repository\UserRepository;
-use App\Security\EmailVerifier;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Bridge\Twig\Mime\TemplatedEmail;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Bundle\SecurityBundle\Security;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
-use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Contracts\Translation\TranslatorInterface;
-use SymfonyCasts\Bundle\VerifyEmail\Exception\VerifyEmailExceptionInterface;
-
-final class RegistrationController extends AbstractController
-{
-    public function __construct(private readonly EmailVerifier $emailVerifier, private readonly TranslatorInterface $translator) {}
-
-    #[Route('/register', name: 'app_register')]
-    public function register(
-        Request $request,
-        UserPasswordHasherInterface $userPasswordHasher,
-        Security $security,
-        EntityManagerInterface $entityManager,
-    ): Response {
-        $user = new User();
-        $form = $this->createForm(RegistrationFormType::class, $user);
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            /** @var string $plainPassword */
-            $plainPassword = $form->get('plainPassword')->getData();
-
-            $user->setPassword($userPasswordHasher->hashPassword($user, $plainPassword));
-
-            $entityManager->persist($user);
-            $entityManager->flush();
-
-            // generate a signed url and email it to the user
-            $this->emailVerifier->sendEmailConfirmation('app_verify_email', $user,
-                (new TemplatedEmail())
-                    ->to((string) $user->getEmail())
-                    ->subject($this->translator->trans('Please Confirm your Email'))
-                    ->htmlTemplate('backoffice/registration/confirmation_email.html.twig')
-            );
-
-            $response = $security->login($user, 'form_login', 'main');
-            \assert($response instanceof Response);
-
-            return $response;
-        }
-
-        return $this->render('backoffice/registration/register.html.twig', [
-            'registrationForm' => $form,
-        ]);
-    }
-
-    #[Route('/verify/email', name: 'app_verify_email')]
-    public function verifyUserEmail(Request $request, TranslatorInterface $translator, UserRepository $userRepository): Response
-    {
-        $id = $request->query->get('id');
-
-        if (null === $id) {
-            return $this->redirectToRoute('app_register');
-        }
-
-        $user = $userRepository->find($id);
-
-        if (null === $user) {
-            return $this->redirectToRoute('app_register');
-        }
-
-        // validate email confirmation link, sets User::isVerified=true and persists
-        try {
-            $this->emailVerifier->handleEmailConfirmation($request, $user);
-        } catch (VerifyEmailExceptionInterface $verifyEmailException) {
-            $this->addFlash('verify_email_error', $translator->trans($verifyEmailException->getReason(), [], 'VerifyEmailBundle'));
-
-            return $this->redirectToRoute('app_register');
-        }
-
-        $this->addFlash('success', $this->translator->trans('Your email address has been verified.'));
-
-        return $this->redirectToRoute('app_backoffice_index');
-    }
-}

src/DataFixtures/KrtekFixtures.php

@@ -20,7 +20,8 @@ class KrtekFixtures extends Fixture
         $manager->persist($season);
 
         $season->setName('Krtek Weekend')
-            ->setSeasonCode('krtek')
+            ->setSeasonCode('12345')
+            ->setPreregisterCandidates(true)
             ->addCandidate(new Candidate('Claudia'))
             ->addCandidate(new Candidate('Eelco'))
             ->addCandidate(new Candidate('Elise'))
@@ -52,7 +53,6 @@ class KrtekFixtures extends Fixture
                 ->setQuestion('Is de Krtek een man of een vrouw?')
                 ->addAnswer(new Answer('Vrouw', true))
                 ->addAnswer(new Answer('Man'))
-                ->setOrdering(1)
             )
 
             ->addQuestion((new Question())
@@ -60,7 +60,6 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('Geen', true))
                 ->addAnswer(new Answer('1'))
                 ->addAnswer(new Answer('2'))
-                ->setOrdering(2)
             )
 
             ->addQuestion((new Question())
@@ -70,17 +69,15 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('Koningsdag'))
                 ->addAnswer(new Answer('Kerst', true))
                 ->addAnswer(new Answer('Oud en Nieuw'))
-                ->setOrdering(3)
             )
 
             ->addQuestion((new Question())
                 ->setQuestion('Hoe kwam de Krtek naar Kersteren vandaag?')
                 ->addAnswer(new Answer('Met het OV', true))
                 ->addAnswer(new Answer('Met de auto'))
-                ->setOrdering(4)
             )
             ->addQuestion((new Question())
-                ->setQuestion('Met wie keek de Krtek video bij binnenkomst?')
+                ->setQuestion('Met wie keek de Kretek video bij binnenkomst?')
                 ->addAnswer(new Answer('Claudia'))
                 ->addAnswer(new Answer('Eelco'))
                 ->addAnswer(new Answer('Elise'))
@@ -94,7 +91,6 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('Remy'))
                 ->addAnswer(new Answer('Robbert'))
                 ->addAnswer(new Answer('Tom', true))
-                ->setOrdering(5)
             )
 
             ->addQuestion((new Question())
@@ -107,7 +103,6 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('Probeer ook eens buiten de lijntjes te kleuren', true))
                 ->addAnswer(new Answer('Ga als je groot bent op groepsreis! '))
                 ->addAnswer(new Answer('Trek minder aan van de mening van anderen, het is oké om anders te zijn.'))
-                ->setOrdering(6)
             )
 
             ->addQuestion((new Question())
@@ -118,7 +113,6 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('Pantoffels'))
                 ->addAnswer(new Answer('Hakken'))
                 ->addAnswer(new Answer('Geen schoenen, alleen sokken'))
-                ->setOrdering(7)
             )
 
             ->addQuestion((new Question())
@@ -126,14 +120,12 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('Fiets', true))
                 ->addAnswer(new Answer('Auto'))
                 ->addAnswer(new Answer('Trein'))
-                ->setOrdering(8)
             )
 
             ->addQuestion((new Question())
                 ->setQuestion('Heeft de Krtek een eigen auto?')
                 ->addAnswer(new Answer('Ja'))
                 ->addAnswer(new Answer('Nee', true))
-                ->setOrdering(9)
             )
 
             ->addQuestion((new Question())
@@ -153,14 +145,12 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('Pieter'))
                 ->addAnswer(new Answer('Renée Fokker'))
                 ->addAnswer(new Answer('Sam, Davy', true))
-                ->setOrdering(10)
             )
 
             ->addQuestion((new Question())
                 ->setQuestion('Zou de Krtek molboekjes, jokers, vrijstellingen of topito’s uit iemands rugzak stelen om te kunnen winnen?')
                 ->addAnswer(new Answer('Ja'))
                 ->addAnswer(new Answer('Nee', true))
-                ->setOrdering(11)
             )
 
             ->addQuestion((new Question())
@@ -168,7 +158,6 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('Éénpersoons, losstaand bed'))
                 ->addAnswer(new Answer('Éénpersoonsbed, tegen een ander bed aan', true))
                 ->addAnswer(new Answer('Tweepersoons bed'))
-                ->setOrdering(12)
             )
 
             ->addQuestion((new Question())
@@ -177,14 +166,12 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('6', true))
                 ->addAnswer(new Answer('7'))
                 ->addAnswer(new Answer('8'))
-                ->setOrdering(13)
             )
 
             ->addQuestion((new Question())
                 ->setQuestion('Waar zat de Krtek aan tafel bij het diner?')
                 ->addAnswer(new Answer('Met de rug naar de accommodatie'))
                 ->addAnswer(new Answer('Met de rug naar de buitenmuur', true))
-                ->setOrdering(14)
             )
 
             ->addQuestion((new Question())
@@ -202,7 +189,6 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('Remy'))
                 ->addAnswer(new Answer('Robbert'))
                 ->addAnswer(new Answer('Tom'))
-                ->setOrdering(15)
             )
         ;
     }
@@ -217,7 +203,6 @@ class KrtekFixtures extends Fixture
                 ->setQuestion('Is de Krtek een man of een vrouw?')
                 ->addAnswer(new Answer('Man'))
                 ->addAnswer(new Answer('Vrouw', true))
-                ->setOrdering(1)
             )
 
             ->addQuestion((new Question())
@@ -229,7 +214,6 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('De Krtek heeft een intolerantie'))
                 ->addAnswer(new Answer('De Krtek eet geen rundvlees'))
                 ->addAnswer(new Answer('De Krtek eet geen waterdieren'))
-                ->setOrdering(2)
             )
 
             ->addQuestion((new Question())
@@ -241,7 +225,6 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('Tom'))
                 ->addAnswer(new Answer('De huisdieren van de Krtek hebben geen naam'))
                 ->addAnswer(new Answer('De Krtek heeft geen huisdieren', true))
-                ->setOrdering(3)
             )
 
             ->addQuestion((new Question())
@@ -252,7 +235,6 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('Melk'))
                 ->addAnswer(new Answer('Sap'))
                 ->addAnswer(new Answer('Niks'))
-                ->setOrdering(4)
             )
 
             ->addQuestion((new Question())
@@ -264,7 +246,6 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('Oostenrijk'))
                 ->addAnswer(new Answer('Turkije'))
                 ->addAnswer(new Answer('Zweden', true))
-                ->setOrdering(5)
             )
 
             ->addQuestion((new Question())
@@ -274,7 +255,6 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('Het derde groepje'))
                 ->addAnswer(new Answer('Het vierde groepje'))
                 ->addAnswer(new Answer('Het vijfde groepje'))
-                ->setOrdering(6)
             )
 
             ->addQuestion((new Question())
@@ -283,14 +263,12 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('Het universum', true))
                 ->addAnswer(new Answer('Toeval'))
                 ->addAnswer(new Answer('De Krtek is hindoeïstisch'))
-                ->setOrdering(7)
             )
 
             ->addQuestion((new Question())
                 ->setQuestion('At de Krtek op vrijdagavond heksenkaas tijdens het diner?')
                 ->addAnswer(new Answer('Ja', true))
                 ->addAnswer(new Answer('Nee'))
-                ->setOrdering(8)
             )
 
             ->addQuestion((new Question())
@@ -299,7 +277,6 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('Tussen 1:00 en 1:59 uur', true))
                 ->addAnswer(new Answer('Tussen 2:00 en 2:59 uur'))
                 ->addAnswer(new Answer('Na 3:00'))
-                ->setOrdering(9)
             )
 
             ->addQuestion((new Question())
@@ -308,7 +285,6 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('2'))
                 ->addAnswer(new Answer('3'))
                 ->addAnswer(new Answer('geen', true))
-                ->setOrdering(10)
             )
 
             ->addQuestion((new Question())
@@ -319,7 +295,6 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('Sesamstraat'))
                 ->addAnswer(new Answer('Spongebob Squarepants'))
                 ->addAnswer(new Answer('Teletubbies'))
-                ->setOrdering(11)
             )
 
             ->addQuestion((new Question())
@@ -327,7 +302,6 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('In koffer(s)', true))
                 ->addAnswer(new Answer('In losse tas(sen)'))
                 ->addAnswer(new Answer('In een rugzak'))
-                ->setOrdering(12)
             )
 
             ->addQuestion((new Question())
@@ -340,14 +314,12 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('Servies dat tegen elkaar klettert'))
                 ->addAnswer(new Answer('Het geroekoe van een duif', true))
                 ->addAnswer(new Answer('Piepschuim'))
-                ->setOrdering(13)
             )
 
             ->addQuestion((new Question())
                 ->setQuestion('Wilde de Krtek penningmeester worden?')
                 ->addAnswer(new Answer('Ja'))
                 ->addAnswer(new Answer('Nee', true))
-                ->setOrdering(14)
             )
 
             ->addQuestion((new Question())
@@ -365,7 +337,6 @@ class KrtekFixtures extends Fixture
                 ->addAnswer(new Answer('Remy'))
                 ->addAnswer(new Answer('Robbert'))
                 ->addAnswer(new Answer('Tom'))
-                ->setOrdering(15)
             )
         ;
     }

src/Entity/Answer.php

@@ -7,7 +7,6 @@ namespace App\Entity;
 use App\Repository\AnswerRepository;
 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;
@@ -22,9 +21,6 @@ class Answer
     #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
     private Uuid $id;
 
-    #[ORM\Column(type: Types::SMALLINT, options: ['default' => 0])]
-    private int $ordering = 0;
-
     #[ORM\ManyToOne(inversedBy: 'answers')]
     #[ORM\JoinColumn(nullable: false)]
     private Question $question;
@@ -76,7 +72,7 @@ class Answer
         return $this;
     }
 
-    public function isRightAnswer(): bool
+    public function isRightAnswer(): ?bool
     {
         return $this->isRightAnswer;
     }
@@ -125,16 +121,4 @@ class Answer
 
         return $this;
     }
-
-    public function getOrdering(): int
-    {
-        return $this->ordering;
-    }
-
-    public function setOrdering(int $ordering): self
-    {
-        $this->ordering = $ordering;
-
-        return $this;
-    }
 }

src/Entity/Candidate.php

@@ -14,7 +14,6 @@ use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 
 #[ORM\Entity(repositoryClass: CandidateRepository::class)]
-#[ORM\UniqueConstraint(fields: ['name', 'season'])]
 class Candidate
 {
     #[ORM\Id]
@@ -136,6 +135,6 @@ class Candidate
 
     public function getNameHash(): string
     {
-        return Base64::base64UrlEncode($this->name);
+        return Base64::base64_url_encode($this->name);
     }
 }

src/Entity/Elimination.php

@@ -1,94 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Entity;
-
-use App\Repository\EliminationRepository;
-use Doctrine\DBAL\Types\Types;
-use Doctrine\ORM\Mapping as ORM;
-use Safe\DateTimeImmutable;
-use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
-use Symfony\Bridge\Doctrine\Types\UuidType;
-use Symfony\Component\HttpFoundation\InputBag;
-use Symfony\Component\Uid\Uuid;
-
-#[ORM\Entity(repositoryClass: EliminationRepository::class)]
-#[ORM\HasLifecycleCallbacks]
-class Elimination
-{
-    public const string SCREEN_GREEN = 'green';
-    public const string SCREEN_RED = 'red';
-
-    #[ORM\Id]
-    #[ORM\Column(type: UuidType::NAME, unique: true)]
-    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
-    #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
-    private Uuid $id;
-
-    /** @var array<string, mixed> */
-    #[ORM\Column(type: Types::JSON)]
-    private array $data = [];
-
-    #[ORM\Column(type: Types::DATETIME_IMMUTABLE, nullable: false)]
-    private \DateTimeImmutable $created;
-
-    public function __construct(
-        #[ORM\ManyToOne(inversedBy: 'eliminations')]
-        #[ORM\JoinColumn(nullable: false)]
-        private 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
-    {
-        foreach ($this->data as $name => $screenColour) {
-            $newColour = $inputBag->get('colour-'.mb_strtolower($name));
-            if (\is_string($newColour)) {
-                $this->data[$name] = $inputBag->get('colour-'.mb_strtolower($name));
-            }
-        }
-
-        return $this;
-    }
-
-    public function getScreenColour(?string $name): ?string
-    {
-        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

@@ -20,7 +20,7 @@ class GivenAnswer
     #[ORM\Column(type: UuidType::NAME, unique: true)]
     #[ORM\GeneratedValue(strategy: 'CUSTOM')]
     #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
-    private Uuid $id;
+    private ?Uuid $id = null;
 
     #[ORM\ManyToOne(inversedBy: 'givenAnswers')]
     #[ORM\JoinColumn(nullable: false)]
@@ -34,8 +34,8 @@ class GivenAnswer
     #[ORM\JoinColumn(nullable: true)]
     private ?Answer $answer = null;
 
-    #[ORM\Column(type: Types::DATETIME_IMMUTABLE, nullable: false)]
+    #[ORM\Column(type: Types::DATETIME_MUTABLE, nullable: false)]
-    private \DateTimeImmutable $created;
+    private \DateTimeInterface $created;
 
     public function getId(): ?Uuid
     {
@@ -78,7 +78,7 @@ class GivenAnswer
         return $this;
     }
 
-    public function getCreated(): \DateTimeImmutable
+    public function getCreated(): ?\DateTimeInterface
     {
         return $this->created;
     }

src/Entity/Question.php

@@ -7,7 +7,6 @@ namespace App\Entity;
 use App\Repository\QuestionRepository;
 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;
@@ -22,10 +21,7 @@ class Question
     #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
     private ?Uuid $id = null;
 
-    #[ORM\Column(type: Types::SMALLINT, options: ['default' => 0])]
+    #[ORM\Column(length: 255, nullable: false)]
-    private int $ordering;
-
-    #[ORM\Column(type: Types::STRING, length: 255)]
     private string $question;
 
     #[ORM\ManyToOne(inversedBy: 'questions')]
@@ -37,7 +33,6 @@ class Question
 
     /** @var Collection<int, Answer> */
     #[ORM\OneToMany(targetEntity: Answer::class, mappedBy: 'question', cascade: ['persist'], orphanRemoval: true)]
-    #[ORM\OrderBy(['ordering' => 'ASC'])]
     private Collection $answers;
 
     public function __construct()
@@ -101,35 +96,4 @@ class Question
 
         return $this;
     }
-
-    public function getErrors(): ?string
-    {
-        if (0 === \count($this->answers)) {
-            return 'This question has no answers';
-        }
-
-        $correctAnswers = $this->answers->filter(static fn (Answer $answer): bool => $answer->isRightAnswer())->count();
-
-        if (0 === $correctAnswers) {
-            return 'This question has no correct answers';
-        }
-
-        if ($correctAnswers > 1) {
-            return 'This question has multiple correct answers';
-        }
-
-        return null;
-    }
-
-    public function getOrdering(): int
-    {
-        return $this->ordering;
-    }
-
-    public function setOrdering(int $ordering): static
-    {
-        $this->ordering = $ordering;
-
-        return $this;
-    }
 }

src/Entity/Quiz.php

@@ -13,7 +13,6 @@ use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 
 #[ORM\Entity(repositoryClass: QuizRepository::class)]
-#[ORM\UniqueConstraint(fields: ['name', 'season'])]
 class Quiz
 {
     #[ORM\Id]
@@ -31,26 +30,16 @@ class Quiz
 
     /** @var Collection<int, Question> */
     #[ORM\OneToMany(targetEntity: Question::class, mappedBy: 'quiz', cascade: ['persist'], orphanRemoval: true)]
-    #[ORM\OrderBy(['ordering' => 'ASC'])]
     private Collection $questions;
 
     /** @var Collection<int, Correction> */
     #[ORM\OneToMany(targetEntity: Correction::class, mappedBy: 'quiz', orphanRemoval: true)]
     private Collection $corrections;
 
-    #[ORM\Column(nullable: false, options: ['default' => 1])]
-    private 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 function __construct()
     {
         $this->questions = new ArrayCollection();
         $this->corrections = new ArrayCollection();
-        $this->eliminations = new ArrayCollection();
     }
 
     public function getId(): ?Uuid
@@ -113,29 +102,4 @@ class Quiz
 
         return $this;
     }
-
-    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);
-
-        return $this;
-    }
 }

src/Entity/Season.php

@@ -15,8 +15,6 @@ use Symfony\Component\Uid\Uuid;
 #[ORM\Entity(repositoryClass: SeasonRepository::class)]
 class Season
 {
-    private const string SEASON_CODE_CHARACTERS = 'bcdfghjklmnpqrstvwxz';
-
     #[ORM\Id]
     #[ORM\Column(type: UuidType::NAME)]
     #[ORM\GeneratedValue(strategy: 'CUSTOM')]
@@ -29,13 +27,15 @@ class Season
     #[ORM\Column(length: 5)]
     private string $seasonCode;
 
+    #[ORM\Column]
+    private bool $preregisterCandidates;
+
     /** @var Collection<int, Quiz> */
     #[ORM\OneToMany(targetEntity: Quiz::class, mappedBy: 'season', cascade: ['persist'], orphanRemoval: true)]
     private Collection $quizzes;
 
     /** @var Collection<int, Candidate> */
     #[ORM\OneToMany(targetEntity: Candidate::class, mappedBy: 'season', cascade: ['persist'], orphanRemoval: true)]
-    #[ORM\OrderBy(['name' => 'ASC'])]
     private Collection $candidates;
 
     /** @var Collection<int, User> */
@@ -81,6 +81,18 @@ class Season
         return $this;
     }
 
+    public function isPreregisterCandidates(): bool
+    {
+        return $this->preregisterCandidates;
+    }
+
+    public function setPreregisterCandidates(bool $preregisterCandidates): static
+    {
+        $this->preregisterCandidates = $preregisterCandidates;
+
+        return $this;
+    }
+
     /** @return Collection<int, Quiz> */
     public function getQuizzes(): Collection
     {
@@ -146,23 +158,4 @@ class Season
 
         return $this;
     }
-
-    public function isOwner(User $user): bool
-    {
-        return $this->owners->contains($user);
-    }
-
-    public function generateSeasonCode(): self
-    {
-        $code = '';
-        $len = mb_strlen(self::SEASON_CODE_CHARACTERS) - 1;
-
-        for ($i = 0; $i < 5; ++$i) {
-            $code .= self::SEASON_CODE_CHARACTERS[random_int(0, $len)];
-        }
-
-        $this->seasonCode = $code;
-
-        return $this;
-    }
 }

src/Entity/User.php

@@ -7,11 +7,9 @@ namespace App\Entity;
 use App\Repository\UserRepository;
 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;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Uid\Uuid;
@@ -19,7 +17,6 @@ use Symfony\Component\Uid\Uuid;
 #[ORM\Entity(repositoryClass: UserRepository::class)]
 #[ORM\Table(name: '`user`')]
 #[ORM\UniqueConstraint(name: 'UNIQ_IDENTIFIER_EMAIL', fields: ['email'])]
-#[UniqueEntity(fields: ['email'], message: 'There is already an account with this email')]
 class User implements UserInterface, PasswordAuthenticatedUserInterface
 {
     #[ORM\Id]
@@ -32,7 +29,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
     private string $email;
 
     /** @var list<string> The user roles */
-    #[ORM\Column(type: Types::JSON)]
+    #[ORM\Column]
     private array $roles = [];
 
     /** @var string The hashed password */
@@ -43,9 +40,6 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
     #[ORM\ManyToMany(targetEntity: Season::class, mappedBy: 'owners')]
     private Collection $seasons;
 
-    #[ORM\Column]
-    private bool $isVerified = false;
-
     public function __construct()
     {
         $this->seasons = new ArrayCollection();
@@ -77,16 +71,13 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
      */
     public function getUserIdentifier(): string
     {
-        /** @var non-empty-string $identifier */
+        return $this->email;
-        $identifier = $this->email;
-
-        return $identifier;
     }
 
     /**
      * @see UserInterface
      *
-     * @return non-empty-array<int<0, max>, string>
+     * @return non-empty-list<string>
      */
     public function getRoles(): array
     {
@@ -149,21 +140,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

@@ -12,6 +12,6 @@ enum FlashType: string
     case Danger = 'danger';
     case Warning = 'warning';
     case Info = 'info';
-    case Light = 'light';
+    case Ligt = 'light';
     case Dark = 'dark';
 }