Add unit tests for QuizSpreadsheetService

7 tests covering generateTemplate(), quizToXlsx(), and xlsxToQuiz():
- valid XLSX output and MIME type
- template without example reimports as empty
- template example data survives a reimport
- round-trip (export → reimport) preserves questions, answers, and correct flags
- empty quiz exports and reimports cleanly
- invalid MIME type throws InvalidArgumentException
- question with no answers throws SpreadsheetDataException with error list

.github/workflows/ci.yml

@@ -17,11 +17,12 @@ permissions:
   contents: read
 
 jobs:
-  quality:
+  tests:
-    name: Code Quality
+    name: Tests
     runs-on: ubuntu-latest
-    timeout-minutes: 20
     permissions:
+      checks: write
+      pull-requests: write
       contents: read
     steps:
       - name: Checkout
@@ -39,68 +40,26 @@ jobs:
             compose.yaml
             compose.override.yaml
           set: |
-            *.cache-from=type=gha,scope=${{github.ref}}-quality
+            *.cache-from=type=gha,scope=${{github.ref}}
             *.cache-from=type=gha,scope=refs/heads/main
-            *.cache-to=type=gha,scope=${{github.ref}}-quality,mode=${{ github.event_name == 'pull_request' && 'min' || 'max' }}
+            *.cache-to=type=gha,scope=${{github.ref}},mode=max
       - name: Start services
         run: docker compose up php database --wait --no-build
-      - name: Warm up dev cache
-        run: docker compose exec -T php bin/console cache:warmup --env=dev
       - name: Lint Twig templates
-        id: twig_lint
-        continue-on-error: true
         run: docker compose exec -T php bin/console lint:twig --format=github templates
       - name: Coding Style
-        id: cs
-        continue-on-error: true
         run: docker compose exec -T php vendor/bin/php-cs-fixer check --diff --show-progress=none
       - name: Twig Coding Style
-        id: twig_cs
-        continue-on-error: true
         run: docker compose exec -T php vendor/bin/twig-cs-fixer check
       - name: Static Analysis (PHPStan)
-        id: phpstan
-        continue-on-error: true
         run: docker compose exec -T php vendor/bin/phpstan analyse --no-progress --no-ansi --error-format=github
       - name: Rector
-        id: rector
-        continue-on-error: true
         run: docker compose exec -T php vendor/bin/rector process --dry-run --no-progress-bar --output-format=github
       - name: Check HTTP reachability
         run: curl -v --fail-with-body http://localhost
-      - name: Assert all checks passed
+      - name: Check Mercure reachability
-        if: always()
+        if: false
-        run: |
+        run: curl -vkI --fail-with-body https://localhost/.well-known/mercure?topic=test
-          outcomes="${{ steps.twig_lint.outcome }} ${{ steps.cs.outcome }} ${{ steps.twig_cs.outcome }} ${{ steps.phpstan.outcome }} ${{ steps.rector.outcome }}"
-          if echo "$outcomes" | grep -q "failure"; then exit 1; fi
-
-  tests:
-    name: Tests
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    permissions:
-      checks: write
-      pull-requests: write
-      contents: read
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Build Docker images
-        uses: docker/bake-action@v5
-        with:
-          pull: true
-          load: true
-          files: |
-            compose.yaml
-            compose.override.yaml
-          set: |
-            *.cache-from=type=gha,scope=${{github.ref}}-tests
-            *.cache-from=type=gha,scope=refs/heads/main
-            *.cache-to=type=gha,scope=${{github.ref}}-tests,mode=${{ github.event_name == 'pull_request' && 'min' || 'max' }}
-      - name: Start services
-        run: docker compose up php database --wait --no-build
       - name: Create test database
         run: docker compose exec -T php bin/console -e test doctrine:database:create
       - name: Run migrations
@@ -117,18 +76,17 @@ jobs:
           check_name: PHPUnit
       - name: Doctrine Schema Validator
         run: docker compose exec -T php bin/console -e test doctrine:schema:validate
-
+  
   build-deploy:
-    name: Build and Deploy
+    name: Build and deploy to ${{ startsWith(github.ref, 'refs/tags/') && 'production' || (github.ref == 'refs/heads/main' && 'acceptance' || '') }}
     permissions:
       contents: read
       packages: write
     environment:
-      name: ${{ startsWith(github.ref, 'refs/tags/') && 'production' || 'acceptance' }}
+      name: ${{ startsWith(github.ref, 'refs/tags/') && 'production' || (github.ref == 'refs/heads/main' && 'acceptance' || '') }}
       url: ${{ vars.URL }}
-    needs: [quality, tests]
+    needs: tests
     runs-on: ubuntu-latest
-    timeout-minutes: 15
     if: (github.ref == 'refs/heads/main' && false) || startsWith(github.ref, 'refs/tags/')
     steps:
       - name: Checkout
@@ -148,17 +106,14 @@ jobs:
           REPO_LOWER=$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')
           if [[ "${{ github.ref }}" == refs/tags/* ]]; then
             TAG="${GITHUB_REF#refs/tags/}"
-            SENTRY_VERSION="${TAG#v}"
             {
               echo "tag=$TAG"
-              echo "sentry_version=$SENTRY_VERSION"
               echo "full_name=ghcr.io/${REPO_LOWER}:$TAG"
             } >> "$GITHUB_OUTPUT"
           else
             SHORT_SHA=$(git rev-parse --short HEAD)
             {
               echo "tag=$SHORT_SHA"
-              echo "sentry_version=$SHORT_SHA"
               echo "full_name=ghcr.io/${REPO_LOWER}:$SHORT_SHA"
             } >> "$GITHUB_OUTPUT"
           fi
@@ -184,12 +139,12 @@ jobs:
           SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
           SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
         with:
-          release: ${{steps.meta.outputs.sentry_version}}
+          release: ${{steps.meta.outputs.tag}}
-          environment: ${{ startsWith(github.ref, 'refs/tags/') && 'production' || 'acceptance' }}
+          environment: ${{ startsWith(github.ref, 'refs/tags/') && 'production' || (github.ref == 'refs/heads/main' && 'acceptance' || '') }}
 
       - name: Trigger Portainer Deployment
         shell: bash
         env:
           PORTAINER_WEBHOOK: ${{secrets.PORTAINER_WEBHOOK}}
         run: |
-          curl -v -X POST "${PORTAINER_WEBHOOK}?IMAGE_TAG=${{steps.meta.outputs.tag}}" --fail-with-body
+          curl -v -X POST "$PORTAINER_WEBHOOK"?IMAGE_TAG=${{steps.meta.outputs.tag}} --fail-with-body

.idea/TijdVoorDeTest.iml

@@ -169,7 +169,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/git-state" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/ergebnis/agent-detector" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-deepclone" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/file-filter" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

.idea/php.xml

@@ -41,169 +41,170 @@
   </component>
   <component name="PhpIncludePathManager">
     <include_path>
-      <path value="$PROJECT_DIR$/vendor/psr/cache" />
-      <path value="$PROJECT_DIR$/vendor/psr/container" />
-      <path value="$PROJECT_DIR$/vendor/psr/log" />
-      <path value="$PROJECT_DIR$/vendor/psr/event-dispatcher" />
-      <path value="$PROJECT_DIR$/vendor/psr/http-message" />
-      <path value="$PROJECT_DIR$/vendor/gedmo/doctrine-extensions" />
-      <path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
-      <path value="$PROJECT_DIR$/vendor/twig/twig" />
-      <path value="$PROJECT_DIR$/vendor/fidry/cpu-core-counter" />
-      <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/psr/http-factory" />
-      <path value="$PROJECT_DIR$/vendor/clue/ndjson-react" />
-      <path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
-      <path value="$PROJECT_DIR$/vendor/psr/clock" />
-      <path value="$PROJECT_DIR$/vendor/twig/extra-bundle" />
-      <path value="$PROJECT_DIR$/vendor/twig/intl-extra" />
-      <path value="$PROJECT_DIR$/vendor/dama/doctrine-test-bundle" />
-      <path value="$PROJECT_DIR$/vendor/stof/doctrine-extensions-bundle" />
-      <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/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/symfony/polyfill-intl-icu" />
-      <path value="$PROJECT_DIR$/vendor/symfony/form" />
-      <path value="$PROJECT_DIR$/vendor/symfony/framework-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-deepclone" />
-      <path value="$PROJECT_DIR$/vendor/symfony/dotenv" />
-      <path value="$PROJECT_DIR$/vendor/symfony/validator" />
-      <path value="$PROJECT_DIR$/vendor/symfony/ux-turbo" />
-      <path value="$PROJECT_DIR$/vendor/symfony/serializer" />
-      <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/asset-mapper" />
-      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
-      <path value="$PROJECT_DIR$/vendor/symfony/security-http" />
-      <path value="$PROJECT_DIR$/vendor/symfony/uid" />
-      <path value="$PROJECT_DIR$/vendor/symfony/var-dumper" />
-      <path value="$PROJECT_DIR$/vendor/symfony/brevo-mailer" />
-      <path value="$PROJECT_DIR$/vendor/symfony/runtime" />
-      <path value="$PROJECT_DIR$/vendor/symfony/phpunit-bridge" />
-      <path value="$PROJECT_DIR$/vendor/symfony/browser-kit" />
-      <path value="$PROJECT_DIR$/vendor/symfony/security-bundle" />
       <path value="$PROJECT_DIR$/vendor/symfony/cache" />
-      <path value="$PROJECT_DIR$/vendor/symfony/asset" />
+      <path value="$PROJECT_DIR$/vendor/symfony/validator" />
-      <path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/dotenv" />
-      <path value="$PROJECT_DIR$/vendor/symfony/config" />
+      <path value="$PROJECT_DIR$/vendor/symfony/serializer" />
       <path value="$PROJECT_DIR$/vendor/symfony/intl" />
-      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
+      <path value="$PROJECT_DIR$/vendor/symfony/security-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/css-selector" />
+      <path value="$PROJECT_DIR$/vendor/symfony/browser-kit" />
-      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/asset" />
-      <path value="$PROJECT_DIR$/vendor/symfony/web-profiler-bundle" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-normalizer" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-invoker" />
-      <path value="$PROJECT_DIR$/vendor/symfony/twig-bundle" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
-      <path value="$PROJECT_DIR$/vendor/symfony/finder" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
-      <path value="$PROJECT_DIR$/vendor/symfony/dom-crawler" />
+      <path value="$PROJECT_DIR$/vendor/symfony/ux-turbo" />
-      <path value="$PROJECT_DIR$/vendor/symfony/property-access" />
+      <path value="$PROJECT_DIR$/vendor/symfony/form" />
-      <path value="$PROJECT_DIR$/vendor/symfony/options-resolver" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-icu" />
-      <path value="$PROJECT_DIR$/vendor/symfony/security-csrf" />
+      <path value="$PROJECT_DIR$/vendor/symfony/framework-bundle" />
       <path value="$PROJECT_DIR$/vendor/symfony/mailer" />
-      <path value="$PROJECT_DIR$/vendor/symfony/filesystem" />
+      <path value="$PROJECT_DIR$/vendor/symfony/brevo-mailer" />
-      <path value="$PROJECT_DIR$/vendor/symfony/twig-bridge" />
+      <path value="$PROJECT_DIR$/vendor/symfony/var-dumper" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-uuid" />
+      <path value="$PROJECT_DIR$/vendor/symfony/phpunit-bridge" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-idn" />
-      <path value="$PROJECT_DIR$/vendor/symfony/maker-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/security-csrf" />
-      <path value="$PROJECT_DIR$/vendor/symfony/service-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/options-resolver" />
-      <path value="$PROJECT_DIR$/vendor/symfony/http-client-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/filesystem" />
-      <path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/security-http" />
-      <path value="$PROJECT_DIR$/vendor/symfony/routing" />
+      <path value="$PROJECT_DIR$/vendor/symfony/config" />
-      <path value="$PROJECT_DIR$/vendor/symfony/http-foundation" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/doctrine-bridge" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
-      <path value="$PROJECT_DIR$/vendor/symfony/property-info" />
+      <path value="$PROJECT_DIR$/vendor/symfony/runtime" />
-      <path value="$PROJECT_DIR$/vendor/symfony/type-info" />
+      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
-      <path value="$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge" />
+      <path value="$PROJECT_DIR$/vendor/symfony/asset-mapper" />
-      <path value="$PROJECT_DIR$/vendor/symfony/http-kernel" />
+      <path value="$PROJECT_DIR$/vendor/symfony/uid" />
       <path value="$PROJECT_DIR$/vendor/symfony/http-client" />
-      <path value="$PROJECT_DIR$/vendor/symfony/stopwatch" />
+      <path value="$PROJECT_DIR$/vendor/symfony/finder" />
-      <path value="$PROJECT_DIR$/vendor/symfony/string" />
+      <path value="$PROJECT_DIR$/vendor/symfony/twig-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/security-core" />
+      <path value="$PROJECT_DIR$/vendor/symfony/property-access" />
       <path value="$PROJECT_DIR$/vendor/symfony/yaml" />
-      <path value="$PROJECT_DIR$/vendor/symfony/mime" />
+      <path value="$PROJECT_DIR$/vendor/symfony/http-kernel" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-grapheme" />
+      <path value="$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge" />
-      <path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
+      <path value="$PROJECT_DIR$/vendor/symfony/stopwatch" />
-      <path value="$PROJECT_DIR$/vendor/symfony/process" />
+      <path value="$PROJECT_DIR$/vendor/symfony/web-profiler-bundle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/console" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-uuid" />
-      <path value="$PROJECT_DIR$/vendor/symfony/error-handler" />
+      <path value="$PROJECT_DIR$/vendor/symfony/twig-bridge" />
-      <path value="$PROJECT_DIR$/vendor/symfony/cache-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/maker-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/dom-crawler" />
+      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/css-selector" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-normalizer" />
       <path value="$PROJECT_DIR$/vendor/symfony/var-exporter" />
-      <path value="$PROJECT_DIR$/vendor/symfony/flex" />
+      <path value="$PROJECT_DIR$/vendor/symfony/doctrine-bridge" />
-      <path value="$PROJECT_DIR$/vendor/symfony/clock" />
+      <path value="$PROJECT_DIR$/vendor/symfony/http-foundation" />
-      <path value="$PROJECT_DIR$/vendor/symfony/password-hasher" />
+      <path value="$PROJECT_DIR$/vendor/symfony/type-info" />
       <path value="$PROJECT_DIR$/vendor/symfony/dependency-injection" />
+      <path value="$PROJECT_DIR$/vendor/symfony/cache-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/error-handler" />
+      <path value="$PROJECT_DIR$/vendor/symfony/flex" />
+      <path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/security-core" />
+      <path value="$PROJECT_DIR$/vendor/symfony/string" />
+      <path value="$PROJECT_DIR$/vendor/symfony/mime" />
+      <path value="$PROJECT_DIR$/vendor/symfony/property-info" />
+      <path value="$PROJECT_DIR$/vendor/symfony/http-client-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/service-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/routing" />
+      <path value="$PROJECT_DIR$/vendor/symfony/process" />
+      <path value="$PROJECT_DIR$/vendor/symfony/password-hasher" />
+      <path value="$PROJECT_DIR$/vendor/symfony/clock" />
       <path value="$PROJECT_DIR$/vendor/symfony/stimulus-bundle" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-migrations-bundle" />
+      <path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/lexer" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-grapheme" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/dbal" />
+      <path value="$PROJECT_DIR$/vendor/symfony/console" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/migrations" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/data-fixtures" />
-      <path value="$PROJECT_DIR$/vendor/ergebnis/agent-detector" />
-      <path value="$PROJECT_DIR$/vendor/evenement/evenement" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/deprecations" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle" />
-      <path value="$PROJECT_DIR$/vendor/markbaker/matrix" />
-      <path value="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet" />
-      <path value="$PROJECT_DIR$/vendor/maennchen/zipstream-php" />
-      <path value="$PROJECT_DIR$/vendor/markbaker/complex" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-fixtures-bundle" />
       <path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-fixtures-bundle" />
       <path value="$PROJECT_DIR$/vendor/doctrine/persistence" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/collections" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
       <path value="$PROJECT_DIR$/vendor/doctrine/sql-formatter" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/orm" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/collections" />
       <path value="$PROJECT_DIR$/vendor/doctrine/event-manager" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/type" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/orm" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/version" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-migrations-bundle" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/lines-of-code" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/dbal" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/file-filter" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/lexer" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/data-fixtures" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/git-state" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/migrations" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/cli-parser" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/environment" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
-      <path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/diff" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
       <path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/lines-of-code" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/diff" />
       <path value="$PROJECT_DIR$/vendor/sebastian/complexity" />
-      <path value="$PROJECT_DIR$/vendor/thecodingmachine/safe" />
+      <path value="$PROJECT_DIR$/vendor/maennchen/zipstream-php" />
-      <path value="$PROJECT_DIR$/vendor/thecodingmachine/phpstan-safe-rule" />
+      <path value="$PROJECT_DIR$/vendor/evenement/evenement" />
-      <path value="$PROJECT_DIR$/vendor/vincentlanglet/twig-cs-fixer" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle" />
-      <path value="$PROJECT_DIR$/vendor/martin-georgiev/postgresql-for-doctrine" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/deprecations" />
-      <path value="$PROJECT_DIR$/vendor/friendsofphp/php-cs-fixer" />
+      <path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
-      <path value="$PROJECT_DIR$/vendor/symfonycasts/verify-email-bundle" />
+      <path value="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet" />
-      <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
+      <path value="$PROJECT_DIR$/vendor/markbaker/matrix" />
-      <path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
+      <path value="$PROJECT_DIR$/vendor/markbaker/complex" />
       <path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
-      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
-      <path value="$PROJECT_DIR$/vendor/symfonycasts/sass-bundle" />
       <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
+      <path value="$PROJECT_DIR$/vendor/symfonycasts/sass-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfonycasts/verify-email-bundle" />
+      <path value="$PROJECT_DIR$/vendor/thecodingmachine/safe" />
+      <path value="$PROJECT_DIR$/vendor/martin-georgiev/postgresql-for-doctrine" />
+      <path value="$PROJECT_DIR$/vendor/vincentlanglet/twig-cs-fixer" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/environment" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/cli-parser" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/version" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/type" />
+      <path value="$PROJECT_DIR$/vendor/friendsofphp/php-cs-fixer" />
+      <path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
+      <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
+      <path value="$PROJECT_DIR$/vendor/thecodingmachine/phpstan-safe-rule" />
       <path value="$PROJECT_DIR$/vendor/composer" />
+      <path value="$PROJECT_DIR$/vendor/psr/log" />
+      <path value="$PROJECT_DIR$/vendor/psr/container" />
+      <path value="$PROJECT_DIR$/vendor/psr/http-message" />
+      <path value="$PROJECT_DIR$/vendor/psr/event-dispatcher" />
+      <path value="$PROJECT_DIR$/vendor/clue/ndjson-react" />
+      <path value="$PROJECT_DIR$/vendor/psr/http-factory" />
+      <path value="$PROJECT_DIR$/vendor/psr/clock" />
+      <path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
+      <path value="$PROJECT_DIR$/vendor/psr/cache" />
+      <path value="$PROJECT_DIR$/vendor/react/promise" />
+      <path value="$PROJECT_DIR$/vendor/react/stream" />
+      <path value="$PROJECT_DIR$/vendor/react/cache" />
+      <path value="$PROJECT_DIR$/vendor/react/event-loop" />
+      <path value="$PROJECT_DIR$/vendor/jean85/pretty-package-versions" />
+      <path value="$PROJECT_DIR$/vendor/react/child-process" />
+      <path value="$PROJECT_DIR$/vendor/react/socket" />
+      <path value="$PROJECT_DIR$/vendor/react/dns" />
+      <path value="$PROJECT_DIR$/vendor/twig/intl-extra" />
+      <path value="$PROJECT_DIR$/vendor/twig/extra-bundle" />
+      <path value="$PROJECT_DIR$/vendor/stof/doctrine-extensions-bundle" />
+      <path value="$PROJECT_DIR$/vendor/dama/doctrine-test-bundle" />
+      <path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
+      <path value="$PROJECT_DIR$/vendor/gedmo/doctrine-extensions" />
+      <path value="$PROJECT_DIR$/vendor/fidry/cpu-core-counter" />
+      <path value="$PROJECT_DIR$/vendor/twig/twig" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-phpunit" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-symfony" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-doctrine" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpdoc-parser" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/extension-installer" />
+      <path value="$PROJECT_DIR$/vendor/staabm/side-effects-detector" />
+      <path value="$PROJECT_DIR$/vendor/sentry/sentry" />
+      <path value="$PROJECT_DIR$/vendor/sentry/sentry-symfony" />
+      <path value="$PROJECT_DIR$/vendor/rector/rector" />
+      <path value="$PROJECT_DIR$/vendor/phar-io/version" />
+      <path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
+      <path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
+      <path value="$PROJECT_DIR$/vendor/egulias/email-validator" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php84" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php85" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/git-state" />
+      <path value="$PROJECT_DIR$/vendor/ergebnis/agent-detector" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-deepclone" />
     </include_path>
   </component>
   <component name="PhpInterpreters">

assets/styles/quiz.scss

@@ -1,97 +1,17 @@
 html {
     height: 100%;
-    background-image: url("../img/background.png");
-    background-position: center;
-    background-repeat: no-repeat;
-    background-color: black;
-    color: white;
-    display: grid;
-    align-items: center;
 }
 
 body {
-    height: 100%;
+    min-height: 100%;
     background-image: url("../img/background.png");
     background-position: center;
     background-repeat: no-repeat;
     background-color: black;
-    display: grid;
-    align-content: center;
-}
-
-.quiz-form-narrow {
-    max-width: 320px;
-    width: 100%;
-    margin: 0 auto;
-}
-
-.quiz-content {
-    width: fit-content;
-    max-width: min(760px, 100%);
-    margin: 0 auto;
-}
-
-.quiz-answers-grid {
-    display: grid;
-    grid-template-columns: repeat(2, auto);
-    column-gap: 2rem;
-
-    @media (max-width: 767px) {
-        grid-template-columns: 1fr;
-    }
-}
-
-.answer-btn {
-    display: flex;
-    align-items: center;
-    gap: 0.8rem;
-    background: transparent;
-    border: none;
     color: white;
-    font-size: 1.1rem;
-    padding: 0.4rem 0;
-    cursor: pointer;
-    text-align: left;
-    line-height: 1.3;
-
-    &::before {
-        content: '';
-        display: block;
-        flex-shrink: 0;
-        width: 2rem;
-        height: 2rem;
-        background: radial-gradient(ellipse at 35% 30%, #6abf4b, #2d7a1f);
-        border-radius: 4px;
-        box-shadow: inset 0 1px 2px rgba(255, 255, 255, 0.25), 0 2px 6px rgba(0, 0, 0, 0.6);
-    }
-
-    &:hover,
-    &:focus {
-        color: #7ed45a;
-        outline: none;
-
-        &::before {
-            background: radial-gradient(ellipse at 35% 30%, #86d45f, #3d9c2a);
-        }
-    }
-}
-
-input.btn-check:checked + label.answer-btn {
-    color: #7ed45a;
-
-    &::before {
-        background: radial-gradient(ellipse at 35% 30%, #86d45f, #3d9c2a);
-        box-shadow: 0 0 10px rgba(106, 191, 75, 0.7), inset 0 1px 2px rgba(255, 255, 255, 0.3);
-    }
-}
-
-.quiz-topbar {
-    position: fixed;
-    top: 1rem;
-    right: 1rem;
-    z-index: 1030;
     display: flex;
-    gap: 0.5rem;
+    flex-direction: column;
+    justify-content: center;
 }
 
 .elimination-screen {

compose.override.yaml

@@ -7,7 +7,6 @@ services:
       target: frankenphp_dev
     volumes:
       - ./:/app
-      - ~/.composer/cache:/root/.composer/cache
       - ./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
@@ -47,8 +46,6 @@ services:
       - sass:build
       - --watch
       - -v
-    healthcheck:
-      disable: true
   
   ###> symfony/mercure-bundle ###
   ###< symfony/mercure-bundle ###

config/packages/web_profiler.yaml

@@ -6,6 +6,7 @@ when@dev:
     framework:
         profiler:
             only_exceptions: false
+            collect_serializer_data: true
 
 when@test:
     web_profiler:

phpunit.dist.xml

@@ -8,7 +8,7 @@
          failOnNotice="true"
          failOnWarning="true"
          bootstrap="tests/bootstrap.php"
-         cacheDirectory="/tmp/phpunit.cache"
+         cacheDirectory=".phpunit.cache"
 >
     <php>
         <ini name="display_errors" value="1" />

src/Controller/Backoffice/BackofficeController.php

@@ -6,7 +6,6 @@ namespace Tvdt\Controller\Backoffice;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\SecurityBundle\Security;
-use Symfony\Component\HttpFoundation\HeaderUtils;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\StreamedResponse;
@@ -94,7 +93,7 @@ final class BackofficeController extends AbstractController
     {
         $response = new StreamedResponse($this->excel->quizToXlsx($quiz));
         $response->headers->set('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
-        $response->headers->set('Content-Disposition', HeaderUtils::makeDisposition(HeaderUtils::DISPOSITION_ATTACHMENT, $quiz->name.'.xlsx'));
+        $response->headers->set('Content-Disposition', 'attachment; filename="'.$quiz->name.'.xlsx"');
 
         return $response;
     }

src/Service/QuizSpreadsheetService.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Tvdt\Service;
 
-use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Reader;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer;
@@ -18,40 +17,39 @@ class QuizSpreadsheetService
 {
     public function generateTemplate(bool $fillExample = true): \Closure
     {
-        $quiz = new Quiz();
+        $spreadsheet = new Spreadsheet();
 
-        if ($fillExample) {
+        $sheet = $spreadsheet->getActiveSheet();
-            $geslacht = new Question();
-            $geslacht->question = 'Is de mol een man of een vrouw?';
-            $geslacht->ordering = 1;
-            $geslacht->addAnswer(new Answer('Man', true));
-            $geslacht->addAnswer(new Answer('Vrouw'));
-            $quiz->addQuestion($geslacht);
 
-            $identiteit = new Question();
+        $sheet->getStyle('1:1')->getFont()->setBold(true);
-            $identiteit->question = 'Wie is de mol?';
-            $identiteit->ordering = 2;
-            foreach ([
-                ['Emma', false],
-                ['Jan', false],
-                ['Sara', false],
-                ['Piet', false],
-                ['Lisa', true],
-                ['Kees', false],
-                ['Anna', false],
-                ['Henk', false],
-                ['Nina', false],
-                ['Joost', false],
-            ] as $i => [$name, $correct]) {
-                $answer = new Answer($name, $correct);
-                $answer->ordering = $i + 1;
-                $identiteit->addAnswer($answer);
-            }
 
-            $quiz->addQuestion($identiteit);
+        $sheet->setCellValue('A1', 'Question');
+        $sheet->getColumnDimension('A')->setWidth(30);
+        $sheet->getStyle('A:A')->getAlignment()->setWrapText(true);
+
+        $counter = 1;
+        foreach (range('B', 'L', 2) as $column) {
+            $sheet->setCellValue($column.'1', 'Answer '.$counter++);
+            $sheet->getColumnDimension($column)->setWidth(30);
+            $sheet->getStyle($column.':'.$column)->getAlignment()->setWrapText(true);
         }
 
-        return $this->quizToXlsx($quiz);
+        foreach (range('C', 'M', 2) as $column) {
+            $sheet->setCellValue($column.'1', 'Correct');
+            $sheet->getColumnDimension($column)->setAutoSize(true);
+        }
+
+        if ($fillExample) {
+            $sheet->setCellValue('B2', 'Man');
+            $sheet->setCellValue('C2', true);
+
+            $sheet->setCellValue('D2', 'Vrouw');
+            $sheet->setCellValue('E2', false);
+
+            $sheet->setCellValue('A2', 'Is de mol een man of een vrouw?');
+        }
+
+        return $this->toXlsx($spreadsheet);
     }
 
     /** @throws SpreadsheetDataException */
@@ -96,16 +94,24 @@ class QuizSpreadsheetService
             $answerCounter = 1;
             $arrCounter = 1;
 
-            while (\array_key_exists($arrCounter, $questionArr) && null !== $questionArr[$arrCounter]) {
+            while (true) {
+                try {
+                    if (null === $questionArr[$arrCounter]) {
+                        if (1 === $answerCounter) {
+                            $errors[] = \sprintf('Question %d has no answers', $answerCounter);
+                        }
+
+                        break;
+                    }
+                } catch (\ErrorException) {
+                    break;
+                }
+
                 $answer = new Answer((string) $questionArr[$arrCounter++], (bool) $questionArr[$arrCounter++]);
                 $answer->ordering = $answerCounter++;
                 $question->addAnswer($answer);
             }
 
-            if (1 === $answerCounter) {
-                $errors[] = \sprintf('Question %d has no answers', $question->ordering);
-            }
-
             $quiz->addQuestion($question);
         }
 
@@ -119,41 +125,41 @@ class QuizSpreadsheetService
         $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();
 
-        // Write data rows first so we know the maximum answer count.
+        $sheet->getStyle('1:1')->getFont()->setBold(true);
-        $maxAnswers = 0;
+
+        $sheet->setCellValue('A1', 'Question');
+        $sheet->getColumnDimension('A')->setWidth(30);
+        $sheet->getStyle('A:A')->getAlignment()->setWrapText(true);
+
+        $counter = 1;
+        foreach (range('B', 'L', 2) as $column) {
+            $sheet->setCellValue($column.'1', 'Answer '.$counter++);
+            $sheet->getColumnDimension($column)->setWidth(30);
+            $sheet->getStyle($column.':'.$column)->getAlignment()->setWrapText(true);
+        }
+
+        foreach (range('C', 'M', 2) as $column) {
+            $sheet->setCellValue($column.'1', 'Correct');
+            $sheet->getColumnDimension($column)->setAutoSize(true);
+        }
+
+        $answerColumns = range('B', 'L', 2);
+        $correctColumns = range('C', 'M', 2);
+
         $row = 2;
         foreach ($quiz->questions as $question) {
             $sheet->setCellValue('A'.$row, $question->question);
 
             $col = 0;
             foreach ($question->answers as $answer) {
-                $sheet->setCellValue(Coordinate::stringFromColumnIndex(2 + 2 * $col).$row, $answer->text);
+                $sheet->setCellValue($answerColumns[$col].$row, $answer->text);
-                $sheet->setCellValue(Coordinate::stringFromColumnIndex(3 + 2 * $col).$row, $answer->isRightAnswer);
+                $sheet->setCellValue($correctColumns[$col].$row, $answer->isRightAnswer);
                 ++$col;
             }
 
-            $maxAnswers = max($maxAnswers, $col);
             ++$row;
         }
 
-        // Write headers last, sized to the widest question.
-        $sheet->getStyle('1:1')->getFont()->setBold(true);
-        $sheet->setCellValue('A1', 'Question');
-        $sheet->getColumnDimension('A')->setWidth(30);
-        $sheet->getStyle('A:A')->getAlignment()->setWrapText(true);
-
-        for ($i = 0; $i < $maxAnswers; ++$i) {
-            $answerCol = Coordinate::stringFromColumnIndex(2 + 2 * $i);
-            $correctCol = Coordinate::stringFromColumnIndex(3 + 2 * $i);
-
-            $sheet->setCellValue($answerCol.'1', 'Answer '.($i + 1));
-            $sheet->getColumnDimension($answerCol)->setWidth(30);
-            $sheet->getStyle($answerCol.':'.$answerCol)->getAlignment()->setWrapText(true);
-
-            $sheet->setCellValue($correctCol.'1', 'Correct');
-            $sheet->getColumnDimension($correctCol)->setAutoSize(true);
-        }
-
         return $this->toXlsx($spreadsheet);
     }
 

templates/quiz/base.html.twig

@@ -1,3 +1,2 @@
 {% extends 'base.html.twig' %}
 {% block importmap %}{{ importmap('quiz') }}{% endblock %}
-{% block nav %}{{ include('quiz/nav.html.twig') }}{% endblock %}

templates/quiz/enter_name.twig

@@ -1,6 +1,4 @@
 {% extends 'quiz/base.html.twig' %}
 {% block body %}
-    <div class="quiz-form-narrow">
+    {{ form(form) }}
-        {{ form(form) }}
-    </div>
 {% endblock body %}

templates/quiz/nav.html.twig

@@ -1,16 +0,0 @@
-{% if is_granted('IS_AUTHENTICATED') or app.current_route() == 'tvdt_quiz_select_season' %}
-    <div class="quiz-topbar">
-        {% if is_granted('IS_AUTHENTICATED') %}
-            <a href="{{ path('tvdt_backoffice_index') }}" class="btn btn-outline-secondary btn-sm">
-                {{ 'Backoffice'|trans }}
-            </a>
-            <a href="{{ path('tvdt_login_logout') }}" class="btn btn-outline-secondary btn-sm">
-                {{ 'Logout'|trans }}
-            </a>
-        {% else %}
-            <a href="{{ path('tvdt_backoffice_index') }}" class="btn btn-outline-secondary btn-sm">
-                {{ 'Manage Quiz'|trans }}
-            </a>
-        {% endif %}
-    </div>
-{% endif %}

templates/quiz/question.twig

@@ -1,43 +1,36 @@
 {% extends 'quiz/base.html.twig' %}
 {% block body %}
-    <div class="quiz-content">
+    <h4>
-        <h4>
+        {% if season.settings.showNumbers %}
-            {% if season.settings.showNumbers %}
+            ({{ question.ordering }}/{{ question.quiz.questions.count }})
-                ({{ question.ordering }}/{{ question.quiz.questions.count }})
+        {% endif %}{{ question.question }}<br/>
-            {% endif %}{{ question.question }}<br/>
+    </h4>
-        </h4>
+    <form method="post">
-        <form method="post">
+        <input type="hidden" name="token" value="{{ csrf_token('question') }}">
-            <input type="hidden" name="token" value="{{ csrf_token('question') }}">
+        {% if season.settings.confirmAnswers == false %}
-            {% set twoCol = question.answers|length >= 6 %}
+            {% for answer in question.answers %}
-            {% if season.settings.confirmAnswers == false %}
-                <div class="{{ twoCol ? 'quiz-answers-grid' : '' }}">
-                    {% for answer in question.answers %}
-                        <div class="py-2">
-                            <button class="answer-btn"
-                                    type="submit"
-                                    name="answer"
-                                    value="{{ answer.id }}">{{ answer.text }}</button>
-                        </div>
-                    {% endfor %}
-                </div>
-            {% else %}
-                <div class="{{ twoCol ? 'quiz-answers-grid' : '' }}">
-                    {% for answer in question.answers %}
-                        <div class="py-1">
-                            <input required="required" type="radio" class="btn-check" name="answer"
-                                   id="answer-{{ loop.index0 }}" autocomplete="off"
-                                   value="{{ answer.id }}">
-                            <label class="answer-btn" for="answer-{{ loop.index0 }}">{{ answer.text }}</label>
-                        </div>
-                    {% endfor %}
-                </div>
                 <div class="py-2">
-                    <button class="btn btn-success"
+                    <button class="btn btn-outline-success"
                             type="submit"
-                    >{{ 'Next'|trans }}</button>
+                            name="answer"
+                            value="{{ answer.id }}">{{ answer.text }}</button>
                 </div>
+            {% endfor %}
+        {% else %}
+            {% for answer in question.answers %}
+                <div class="py-1">
+                    <input required="required" type="radio" class="btn-check" name="answer"
+                           id="answer-{{ loop.index0 }}" autocomplete="off"
+                           value="{{ answer.id }}">
+                    <label class="btn btn-outline-secondary" for="answer-{{ loop.index0 }}">{{ answer.text }}</label>
+                </div>
+            {% endfor %}
+            <div class="py-2">
+                <button class="btn btn-success"
+                        type="submit"
+                >{{ 'Next'|trans }}</button>
+            </div>
 
-            {% endif %}
+        {% endif %}
-        </form>
+    </form>
-    </div>
 {% endblock body %}

templates/quiz/select_season.html.twig

@@ -1,6 +1,5 @@
 {% extends 'quiz/base.html.twig' %}
 {% block body %}
-    <div class="quiz-form-narrow">
+    {{ form(form) }}
-        {{ form(form) }}
+    <a href="{{ path('tvdt_backoffice_index') }}" class="btn btn-outline-secondary">{{ 'Manage Quiz'|trans }}</a>
-    </div>
 {% endblock body %}

tests/Service/QuizSpreadsheetServiceTest.php

@@ -4,11 +4,7 @@ declare(strict_types=1);
 
 namespace Tvdt\Tests\Service;
 
-use PhpOffice\PhpSpreadsheet\Reader;
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Writer;
 use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\File\File;
 use Tvdt\Entity\Answer;
@@ -71,17 +67,12 @@ final class QuizSpreadsheetServiceTest extends TestCase
         $quiz = new Quiz();
         $this->subject->xlsxToQuiz($quiz, new File($path));
 
-        $this->assertCount(2, $quiz->questions);
+        $this->assertCount(1, $quiz->questions);
 
-        /** @var Question $first */
+        /** @var Question $question */
-        $first = $quiz->questions->first();
+        $question = $quiz->questions->first();
-        $this->assertSame('Is de mol een man of een vrouw?', $first->question);
+        $this->assertSame('Is de mol een man of een vrouw?', $question->question);
-        $this->assertCount(2, $first->answers);
+        $this->assertCount(2, $question->answers);
-
-        /** @var Question $second */
-        $second = $quiz->questions->last();
-        $this->assertSame('Wie is de mol?', $second->question);
-        $this->assertCount(10, $second->answers);
     }
 
     public function testQuizToXlsxEmptyQuizImportsWithNoQuestions(): void
@@ -136,7 +127,6 @@ final class QuizSpreadsheetServiceTest extends TestCase
         $question = new Question();
         $question->question = 'Unanswered question';
         $question->ordering = 1;
-
         $quiz->addQuestion($question);
 
         $path = $this->captureXlsx($this->subject->quizToXlsx($quiz));
@@ -144,97 +134,11 @@ final class QuizSpreadsheetServiceTest extends TestCase
         try {
             $this->subject->xlsxToQuiz(new Quiz(), new File($path));
             $this->fail('Expected SpreadsheetDataException to be thrown');
-        } catch (SpreadsheetDataException $spreadsheetDataException) {
+        } catch (SpreadsheetDataException $e) {
-            $this->assertNotEmpty($spreadsheetDataException->errors);
+            $this->assertNotEmpty($e->errors);
         }
     }
 
-    public function testXlsxToQuizStopsAtBlankRow(): void
-    {
-        $spreadsheet = new Spreadsheet();
-        $sheet = $spreadsheet->getActiveSheet();
-        $sheet->setCellValue('A1', 'Question');
-        $sheet->setCellValue('B1', 'Answer 1');
-        $sheet->setCellValue('C1', 'Correct');
-        $sheet->setCellValue('A2', 'First question');
-        $sheet->setCellValue('B2', 'Yes');
-        $sheet->setCellValue('C2', true);
-        // Row 3 intentionally blank — should halt parsing
-        $sheet->setCellValue('A4', 'Second question');
-        $sheet->setCellValue('B4', 'No');
-        $sheet->setCellValue('C4', false);
-
-        $path = $this->createTempPath('.xlsx');
-        ob_start();
-        new Writer\Xlsx($spreadsheet)->save('php://output');
-        file_put_contents($path, ob_get_clean());
-
-        $quiz = new Quiz();
-        $this->subject->xlsxToQuiz($quiz, new File($path));
-
-        $this->assertCount(1, $quiz->questions);
-        /** @var Question $first */
-        $first = $quiz->questions->first();
-        $this->assertSame('First question', $first->question);
-    }
-
-    /** @return \Iterator<string, array{int, string, int, string, int, int}> */
-    public static function answerCountHeaderProvider(): \Iterator
-    {
-        // Columns (0-based): Question=0, Answer1=1, Correct=2, Answer2=3, Correct=4, …
-        // Answer N is at index 1+2*(N-1) = 2N-1, Correct N at 2+2*(N-1) = 2N.
-        yield '2 answers → 2 header pairs' => [2,  'Answer 2',  3,  'Correct', 4,  5];
-        yield '6 answers → 6 header pairs' => [6,  'Answer 6',  11, 'Correct', 12, 13];
-        yield '7 answers → 7 header pairs' => [7,  'Answer 7',  13, 'Correct', 14, 15];
-        yield '10 answers → 10 header pairs' => [10, 'Answer 10', 19, 'Correct', 20, 21];
-    }
-
-    #[DataProvider('answerCountHeaderProvider')]
-    public function testQuizToXlsxHeaderCountMatchesAnswerCount(
-        int $answerCount,
-        string $lastAnswerHeader,
-        int $lastAnswerIndex,
-        string $lastCorrectHeader,
-        int $lastCorrectIndex,
-        int $absentIndex,
-    ): void {
-        $path = $this->captureXlsx($this->subject->quizToXlsx($this->makeQuizWithAnswerCounts($answerCount)));
-        $headers = $this->readFirstRow($path);
-
-        $this->assertSame($lastAnswerHeader, $headers[$lastAnswerIndex]);
-        $this->assertSame($lastCorrectHeader, $headers[$lastCorrectIndex]);
-        $this->assertArrayNotHasKey($absentIndex, $headers);
-    }
-
-    public function testQuizToXlsxHeadersMatchMaxAnswersAcrossQuestions(): void
-    {
-        $quiz = new Quiz();
-        $quiz->addQuestion($this->makeQuestion('Short', 3));
-        $quiz->addQuestion($this->makeQuestion('Long', 7));
-        $quiz->addQuestion($this->makeQuestion('Medium', 5));
-
-        $path = $this->captureXlsx($this->subject->quizToXlsx($quiz));
-        $headers = $this->readFirstRow($path);
-
-        $this->assertSame('Answer 7', $headers[13]);
-        $this->assertSame('Correct', $headers[14]);
-        $this->assertArrayNotHasKey(15, $headers);
-    }
-
-    public function testQuizToXlsxRoundTripWithSevenAnswers(): void
-    {
-        $original = $this->makeQuizWithAnswerCounts(7);
-        $path = $this->captureXlsx($this->subject->quizToXlsx($original));
-
-        $imported = new Quiz();
-        $this->subject->xlsxToQuiz($imported, new File($path));
-
-        $this->assertCount(1, $imported->questions);
-        /** @var Question $question */
-        $question = $imported->questions->first();
-        $this->assertCount(7, $question->answers);
-    }
-
     private function makeQuiz(): Quiz
     {
         $quiz = new Quiz();
@@ -258,36 +162,6 @@ final class QuizSpreadsheetServiceTest extends TestCase
         return $quiz;
     }
 
-    private function makeQuizWithAnswerCounts(int ...$counts): Quiz
-    {
-        $quiz = new Quiz();
-        foreach ($counts as $i => $count) {
-            $quiz->addQuestion($this->makeQuestion('Question '.$i, $count));
-        }
-
-        return $quiz;
-    }
-
-    private function makeQuestion(string $text, int $answerCount): Question
-    {
-        $question = new Question();
-        $question->question = $text;
-        $question->ordering = 1;
-        for ($i = 1; $i <= $answerCount; ++$i) {
-            $question->addAnswer(new Answer('Answer '.$i, isRightAnswer: false));
-        }
-
-        return $question;
-    }
-
-    /** @return array<int, string|null> */
-    private function readFirstRow(string $path): array
-    {
-        $rows = new Reader\Xlsx()->setReadDataOnly(true)->load($path)->getActiveSheet()->toArray(formatData: false);
-
-        return $rows[0] ?? [];
-    }
-
     private function captureXlsx(\Closure $closure): string
     {
         $path = $this->createTempPath('.xlsx');

tests/Twig/TemplateReferencesTest.php

@@ -1,63 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tvdt\Tests\Twig;
-
-use PHPUnit\Framework\Assert;
-use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\TestCase;
-
-use function Safe\file_get_contents;
-use function Safe\preg_match_all;
-
-final class TemplateReferencesTest extends TestCase
-{
-    private static string $templatesDir;
-
-    public static function setUpBeforeClass(): void
-    {
-        self::$templatesDir = \dirname(__DIR__, 2).'/templates';
-    }
-
-    /** @return iterable<string, array{string, string}> */
-    public static function templateReferenceProvider(): iterable
-    {
-        $templatesDir = \dirname(__DIR__, 2).'/templates';
-        $iterator = new \RecursiveIteratorIterator(
-            new \RecursiveDirectoryIterator($templatesDir, \RecursiveDirectoryIterator::SKIP_DOTS),
-        );
-
-        foreach ($iterator as $file) {
-            Assert::assertInstanceOf(\SplFileInfo::class, $file);
-            if ('twig' !== $file->getExtension()) {
-                continue;
-            }
-
-            $content = file_get_contents($file->getPathname());
-            $sourceFile = str_replace($templatesDir.'/', '', $file->getPathname());
-
-            // Match extends, include(), and embed tags — capture the quoted template name
-            preg_match_all(
-                '/(?:extends|include|embed)\s*\(?[\'"]([^\'"]+)[\'"]\)?/',
-                $content,
-                $matches,
-            );
-
-            foreach ($matches[1] as $referencedTemplate) {
-                yield \sprintf('%s → %s', $sourceFile, $referencedTemplate) => [$sourceFile, $referencedTemplate];
-            }
-        }
-    }
-
-    #[DataProvider('templateReferenceProvider')]
-    public function testReferencedTemplateExists(string $sourceFile, string $referencedTemplate): void
-    {
-        $absolutePath = self::$templatesDir.'/'.$referencedTemplate;
-
-        $this->assertFileExists(
-            $absolutePath,
-            \sprintf("Template '%s' references '%s' which does not exist at '%s'.", $sourceFile, $referencedTemplate, $absolutePath),
-        );
-    }
-}