mirror of
https://github.com/MarijnDoeve/TijdVoorDeTest.git
synced 2026-07-06 15:40:14 +02:00
Compare commits
96 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 88cff7f480 | |||
| 135e4f0ae5 | |||
| 696537cf35 | |||
| c2dbb9f309 | |||
| d1d1eb3a24 | |||
| 5ea7a636b8 | |||
| d37136be93 | |||
| 212401a97f | |||
| 7c74574d3c | |||
| b1f84d441f | |||
| 8c72b1b217 | |||
| 806cff8c0f | |||
| 815e7b17be | |||
| 764f59e6a7 | |||
| 404c0dcc26 | |||
| 685544ffff | |||
| 6b616465b2 | |||
| 381c2119e7 | |||
| 228a36be95 | |||
| 05ad1ebf2e | |||
| 102b894134 | |||
| 8609fc3552 | |||
| 8cec9faec0 | |||
| bf36b1a6ac | |||
| 0b5c535ed9 | |||
| dcb1f40b7e | |||
| 368790c073 | |||
| 078f838700 | |||
| 841bd5b00d | |||
| 2aea98a839 | |||
| 54668521f0 | |||
| 56d89e42d6 | |||
| 2997323f0e | |||
| 15e2a57943 | |||
| 7fdfe59224 | |||
| dc592ab54a | |||
| bd387828ba | |||
| 3ab85b47ca | |||
| 89455997de | |||
| d127e16ada | |||
| dba70cd75b | |||
| 6a085ae656 | |||
| b689b81d61 | |||
| 88fafe85f7 | |||
| 63d7c749ed | |||
| 3ce1cada11 | |||
| 6b37ef3ee7 | |||
| aa538c1bae | |||
| ea29f6ede7 | |||
| eb520a91d9 | |||
| 02758bfa8f | |||
| 281462fab8 | |||
| c033965652 | |||
| 01a034d83e | |||
| 122f84fe3c | |||
| e1b607ed2d | |||
| 622a0e1571 | |||
| 03425024fe | |||
| 182353e2eb | |||
| 9badb1d875 | |||
| df37faa5a3 | |||
| 7ec052b0a1 | |||
| f90fb00547 | |||
| aa39db3f5e | |||
| 55bbe962c1 | |||
| d3bb8d7c57 | |||
| b799dfd5e5 | |||
| 86e7d07078 | |||
| c68e865a78 | |||
| ce799b62ae | |||
| 4f02e63265 | |||
| 826c8b2517 | |||
| 40d1e4076f | |||
| 8c28025e7c | |||
| 3775cb2f5c | |||
| 40a436c829 | |||
| 194143602b | |||
| 1c1ce5e071 | |||
| 18a6090366 | |||
| d0896ceec7 | |||
| 700faad5be | |||
| 29e093575e | |||
| ac46f380cb | |||
| b281a199d3 | |||
| e97cb4b034 | |||
|
785d5d1165
|
|||
| b57faaf431 | |||
| bcd6a157a8 | |||
| fc273638ad | |||
| 1ed1d43c54 | |||
| 216fabcd4e | |||
| a227fb0890 | |||
| 354f0140cd | |||
|
d58d3d7a03
|
|||
|
5749f85337
|
|||
| 311fbf607c |
@@ -0,0 +1,6 @@
|
|||||||
|
# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
|
||||||
|
language: "en-GB"
|
||||||
|
reviews:
|
||||||
|
sequence_diagrams: false
|
||||||
|
path_filters:
|
||||||
|
- "!config/reference.php"
|
||||||
+1
-1
@@ -54,7 +54,7 @@ indent_size = 4
|
|||||||
[{compose,docker-compose}.*.{yaml,yml}]
|
[{compose,docker-compose}.*.{yaml,yml}]
|
||||||
indent_size = 2
|
indent_size = 2
|
||||||
|
|
||||||
[*.*Dockerfile]
|
[{*.*Dockerfile,Dockerfile}]
|
||||||
indent_style = tab
|
indent_style = tab
|
||||||
|
|
||||||
[{*.*Caddyfile,Caddyfile}]
|
[{*.*Caddyfile,Caddyfile}]
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
###> symfony/framework-bundle ###
|
###> symfony/framework-bundle ###
|
||||||
APP_ENV=dev
|
APP_ENV=dev
|
||||||
APP_SECRET=
|
APP_SECRET=
|
||||||
|
APP_SHARE_DIR=var/share
|
||||||
###< symfony/framework-bundle ###
|
###< symfony/framework-bundle ###
|
||||||
|
|
||||||
###> doctrine/doctrine-bundle ###
|
###> doctrine/doctrine-bundle ###
|
||||||
@@ -36,3 +37,10 @@ MAILER_DSN=null://null
|
|||||||
###> sentry/sentry-symfony ###
|
###> sentry/sentry-symfony ###
|
||||||
SENTRY_DSN=
|
SENTRY_DSN=
|
||||||
###< sentry/sentry-symfony ###
|
###< sentry/sentry-symfony ###
|
||||||
|
XDEBUG_MODE=coverage
|
||||||
|
|
||||||
|
###> symfony/routing ###
|
||||||
|
# Configure how to generate URLs in non-HTTP contexts, such as CLI commands.
|
||||||
|
# See https://symfony.com/doc/current/routing.html#generating-urls-in-commands
|
||||||
|
DEFAULT_URI=http://localhost
|
||||||
|
###< symfony/routing ###
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
# define your env variables for the test env here
|
# define your env variables for the test env here
|
||||||
KERNEL_CLASS='Tvdt\Kernel'
|
KERNEL_CLASS='Tvdt\Kernel'
|
||||||
APP_SECRET='$ecretf0rt3st'
|
APP_SECRET='$ecretf0rt3st'
|
||||||
SYMFONY_DEPRECATIONS_HELPER=999999
|
|
||||||
|
|||||||
@@ -15,3 +15,4 @@ composer.lock text eol=lf merge=ours
|
|||||||
|
|
||||||
*.ico binary
|
*.ico binary
|
||||||
*.png binary
|
*.png binary
|
||||||
|
config/reference.php linguist-generated
|
||||||
|
|||||||
Executable
+48
@@ -0,0 +1,48 @@
|
|||||||
|
#!/usr/bin/env zsh
|
||||||
|
setopt ERR_EXIT PIPE_FAIL NOUNSET
|
||||||
|
|
||||||
|
# Collect staged PHP and Twig files
|
||||||
|
STAGED_PHP=()
|
||||||
|
while IFS= read -r file; do
|
||||||
|
[[ -n "$file" ]] && STAGED_PHP+=("$file")
|
||||||
|
done < <(git diff --cached --name-only --diff-filter=ACMR | grep -E '\.php$' || true)
|
||||||
|
|
||||||
|
STAGED_TWIG=()
|
||||||
|
while IFS= read -r file; do
|
||||||
|
[[ -n "$file" ]] && STAGED_TWIG+=("$file")
|
||||||
|
done < <(git diff --cached --name-only --diff-filter=ACMR | grep -E '\.twig$' || true)
|
||||||
|
|
||||||
|
if [[ ${#STAGED_PHP[@]} -eq 0 && ${#STAGED_TWIG[@]} -eq 0 ]]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Use exec if the service is up, otherwise spin up a one-off container
|
||||||
|
if docker compose exec -T php true 2>/dev/null; then
|
||||||
|
DOCKER_CMD=(docker compose exec -T php)
|
||||||
|
else
|
||||||
|
echo "PHP service not running — using docker compose run..."
|
||||||
|
DOCKER_CMD=(docker compose run --rm php)
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ${#STAGED_PHP[@]} -gt 0 ]]; then
|
||||||
|
echo "PHP (${#STAGED_PHP[@]} file(s)): Rector → CS-Fixer → PHPStan"
|
||||||
|
|
||||||
|
echo " → Rector"
|
||||||
|
"${DOCKER_CMD[@]}" vendor/bin/rector process "${STAGED_PHP[@]}"
|
||||||
|
git add "${STAGED_PHP[@]}"
|
||||||
|
|
||||||
|
echo " → PHP-CS-Fixer"
|
||||||
|
"${DOCKER_CMD[@]}" vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php "${STAGED_PHP[@]}"
|
||||||
|
git add "${STAGED_PHP[@]}"
|
||||||
|
|
||||||
|
echo " → PHPStan"
|
||||||
|
"${DOCKER_CMD[@]}" vendor/bin/phpstan analyse "${STAGED_PHP[@]}" --no-progress
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ${#STAGED_TWIG[@]} -gt 0 ]]; then
|
||||||
|
echo "Twig (${#STAGED_TWIG[@]} file(s)): Twig-CS-Fixer"
|
||||||
|
|
||||||
|
echo " → Twig-CS-Fixer"
|
||||||
|
"${DOCKER_CMD[@]}" vendor/bin/twig-cs-fixer fix "${STAGED_TWIG[@]}"
|
||||||
|
git add "${STAGED_TWIG[@]}"
|
||||||
|
fi
|
||||||
@@ -7,5 +7,28 @@ version: 2
|
|||||||
updates:
|
updates:
|
||||||
- package-ecosystem: "composer" # See documentation for possible values
|
- package-ecosystem: "composer" # See documentation for possible values
|
||||||
directory: "/" # Location of package manifests
|
directory: "/" # Location of package manifests
|
||||||
|
allow:
|
||||||
|
# Allow both direct and indirect updates for all packages
|
||||||
|
- dependency-type: "all"
|
||||||
|
schedule:
|
||||||
|
interval: "daily"
|
||||||
|
ignore:
|
||||||
|
- dependency-name: "symfony/*"
|
||||||
|
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
|
||||||
|
groups:
|
||||||
|
dev-dependencies:
|
||||||
|
dependency-type: "development"
|
||||||
|
symfony:
|
||||||
|
patterns:
|
||||||
|
- "symfony/*"
|
||||||
|
twig:
|
||||||
|
patterns:
|
||||||
|
- "twig/*"
|
||||||
|
- package-ecosystem: "docker"
|
||||||
|
directory: "/"
|
||||||
|
schedule:
|
||||||
|
interval: "daily"
|
||||||
|
- package-ecosystem: "github-actions"
|
||||||
|
directory: "/"
|
||||||
schedule:
|
schedule:
|
||||||
interval: "weekly"
|
interval: "weekly"
|
||||||
|
|||||||
+189
-26
@@ -15,68 +15,216 @@ concurrency:
|
|||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
packages: write
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
tests:
|
build:
|
||||||
name: Tests
|
name: Build Dev Image
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 15
|
||||||
|
if: "!startsWith(github.ref, 'refs/tags/')"
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||||
|
with:
|
||||||
|
persist-credentials: false
|
||||||
- name: Lint Dockerfile
|
- name: Lint Dockerfile
|
||||||
uses: hadolint/hadolint-action@v3.1.0
|
uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
|
||||||
- name: Build Docker images
|
- name: Build Docker images
|
||||||
uses: docker/bake-action@v5
|
uses: docker/bake-action@d3418bd7d0e9324001bca92fa8ba175ea7e6dc9b # v7
|
||||||
with:
|
with:
|
||||||
pull: true
|
pull: true
|
||||||
|
files: |
|
||||||
|
compose.yaml
|
||||||
|
compose.override.yaml
|
||||||
|
set: |
|
||||||
|
*.cache-from=type=gha,scope=${{github.ref}}-devbuild
|
||||||
|
*.cache-from=type=gha,scope=refs/heads/main-devbuild
|
||||||
|
*.cache-to=type=gha,scope=${{github.ref}}-devbuild,mode=${{ github.event_name == 'pull_request' && 'min' || 'max' }}
|
||||||
|
|
||||||
|
quality:
|
||||||
|
name: Code Quality
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 20
|
||||||
|
needs: build
|
||||||
|
if: "!startsWith(github.ref, 'refs/tags/')"
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||||
|
with:
|
||||||
|
persist-credentials: false
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
|
||||||
|
- name: Load Docker images
|
||||||
|
uses: docker/bake-action@d3418bd7d0e9324001bca92fa8ba175ea7e6dc9b # v7
|
||||||
|
with:
|
||||||
load: true
|
load: true
|
||||||
files: |
|
files: |
|
||||||
compose.yaml
|
compose.yaml
|
||||||
compose.override.yaml
|
compose.override.yaml
|
||||||
set: |
|
set: |
|
||||||
*.cache-from=type=gha,scope=${{github.ref}}
|
*.cache-from=type=gha,scope=${{github.ref}}-devbuild
|
||||||
*.cache-from=type=gha,scope=refs/heads/main
|
|
||||||
*.cache-to=type=gha,scope=${{github.ref}},mode=max
|
|
||||||
- name: Start services
|
- name: Start services
|
||||||
run: docker compose up php database --wait --no-build
|
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
|
- name: Lint Twig templates
|
||||||
|
id: twig_lint
|
||||||
|
continue-on-error: true
|
||||||
run: docker compose exec -T php bin/console lint:twig --format=github templates
|
run: docker compose exec -T php bin/console lint:twig --format=github templates
|
||||||
- name: Coding Style
|
- 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
|
run: docker compose exec -T php vendor/bin/php-cs-fixer check --diff --show-progress=none
|
||||||
- name: Twig Coding Style
|
- name: Twig Coding Style
|
||||||
|
id: twig_cs
|
||||||
|
continue-on-error: true
|
||||||
run: docker compose exec -T php vendor/bin/twig-cs-fixer check
|
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
|
- name: Check HTTP reachability
|
||||||
run: curl -v --fail-with-body http://localhost
|
run: curl -v --fail-with-body http://localhost
|
||||||
- name: Check Mercure reachability
|
- name: Assert all checks passed
|
||||||
if: false
|
if: always()
|
||||||
run: curl -vkI --fail-with-body https://localhost/.well-known/mercure?topic=test
|
run: |
|
||||||
|
failed=0
|
||||||
|
check() {
|
||||||
|
local name="$1" outcome="$2"
|
||||||
|
if [[ "$outcome" == "failure" ]]; then
|
||||||
|
echo "::error::$name failed"
|
||||||
|
failed=1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
check "Twig Lint" "${{ steps.twig_lint.outcome }}"
|
||||||
|
check "Coding Style" "${{ steps.cs.outcome }}"
|
||||||
|
check "Twig Coding Style" "${{ steps.twig_cs.outcome }}"
|
||||||
|
check "PHPStan" "${{ steps.phpstan.outcome }}"
|
||||||
|
check "Rector" "${{ steps.rector.outcome }}"
|
||||||
|
exit $failed
|
||||||
|
|
||||||
|
tests:
|
||||||
|
name: Tests
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 20
|
||||||
|
needs: build
|
||||||
|
if: "!startsWith(github.ref, 'refs/tags/')"
|
||||||
|
permissions:
|
||||||
|
checks: write
|
||||||
|
pull-requests: write
|
||||||
|
contents: read
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||||
|
with:
|
||||||
|
persist-credentials: false
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
|
||||||
|
- name: Load Docker images
|
||||||
|
uses: docker/bake-action@d3418bd7d0e9324001bca92fa8ba175ea7e6dc9b # v7
|
||||||
|
with:
|
||||||
|
load: true
|
||||||
|
files: |
|
||||||
|
compose.yaml
|
||||||
|
compose.override.yaml
|
||||||
|
set: |
|
||||||
|
*.cache-from=type=gha,scope=${{github.ref}}-devbuild
|
||||||
|
- name: Start services
|
||||||
|
run: docker compose up php database --wait --no-build
|
||||||
|
- name: Build SCSS
|
||||||
|
run: docker compose exec -T php bin/console sass:build
|
||||||
- name: Create test database
|
- name: Create test database
|
||||||
run: docker compose exec -T php bin/console -e test doctrine:database:create
|
run: docker compose exec -T php bin/console -e test doctrine:database:create
|
||||||
- name: Run migrations
|
- name: Run migrations
|
||||||
run: docker compose exec -T php bin/console -e test doctrine:migrations:migrate --no-interaction
|
run: docker compose exec -T php bin/console -e test doctrine:migrations:migrate --no-interaction
|
||||||
|
- name: Load fixtures
|
||||||
|
run: docker compose exec -T php bin/console -e test doctrine:fixtures:load --no-interaction --group=test
|
||||||
- name: Run PHPUnit
|
- name: Run PHPUnit
|
||||||
run: docker compose exec -T php vendor/bin/phpunit
|
run: docker compose exec -T php vendor/bin/phpunit --log-junit var/phpunit/junit.xml
|
||||||
|
- name: Publish PHPUnit test results
|
||||||
|
if: always()
|
||||||
|
uses: mikepenz/action-junit-report@d9f48fc87bc235f7e214acf696ca5abc0a986f16 # v6
|
||||||
|
with:
|
||||||
|
report_paths: var/phpunit/junit.xml
|
||||||
|
check_name: PHPUnit
|
||||||
- name: Doctrine Schema Validator
|
- name: Doctrine Schema Validator
|
||||||
run: docker compose exec -T php bin/console -e test doctrine:schema:validate
|
run: docker compose exec -T php bin/console -e test doctrine:schema:validate
|
||||||
|
|
||||||
build-deploy:
|
verify-prior-run:
|
||||||
name: Build and deploy to ${{ startsWith(github.ref, 'refs/tags/') && 'production' || (github.ref == 'refs/heads/main' && 'acceptance' || '') }}
|
name: Verify Prior CI Run
|
||||||
environment:
|
|
||||||
name: ${{ startsWith(github.ref, 'refs/tags/') && 'production' || (github.ref == 'refs/heads/main' && 'acceptance' || '') }}
|
|
||||||
url: ${{ vars.URL }}
|
|
||||||
needs: tests
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: (github.ref == 'refs/heads/main' && false) || startsWith(github.ref, 'refs/tags/')
|
timeout-minutes: 20
|
||||||
|
if: startsWith(github.ref, 'refs/tags/')
|
||||||
|
permissions:
|
||||||
|
actions: read
|
||||||
|
steps:
|
||||||
|
- name: Wait for and verify successful CI run on this commit
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ github.token }}
|
||||||
|
run: |
|
||||||
|
max_attempts=30
|
||||||
|
attempt=0
|
||||||
|
while [[ $attempt -lt $max_attempts ]]; do
|
||||||
|
attempt=$((attempt + 1))
|
||||||
|
|
||||||
|
success_count=$(gh api \
|
||||||
|
"repos/${{ github.repository }}/actions/workflows/ci.yml/runs?head_sha=${{ github.sha }}&status=success&per_page=5" \
|
||||||
|
--jq "[.workflow_runs[] | select(.id != ${{ github.run_id }})] | length")
|
||||||
|
|
||||||
|
if [[ "$success_count" -gt 0 ]]; then
|
||||||
|
echo "Found $success_count prior successful CI run(s) for ${{ github.sha }}."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
in_progress_count=$(gh api \
|
||||||
|
"repos/${{ github.repository }}/actions/workflows/ci.yml/runs?head_sha=${{ github.sha }}&per_page=10" \
|
||||||
|
--jq "[.workflow_runs[] | select(.id != ${{ github.run_id }}) | select(.status == \"in_progress\" or .status == \"queued\" or .status == \"waiting\" or .status == \"requested\" or .status == \"pending\")] | length")
|
||||||
|
|
||||||
|
if [[ "$in_progress_count" -gt 0 ]]; then
|
||||||
|
echo "CI still in progress (attempt $attempt/$max_attempts), waiting 30s..."
|
||||||
|
sleep 30
|
||||||
|
else
|
||||||
|
echo "::error::No prior successful CI run found for ${{ github.sha }}. Only tag commits that have passed CI on main."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "::error::Timed out waiting for CI run to complete for ${{ github.sha }}."
|
||||||
|
exit 1
|
||||||
|
|
||||||
|
build-deploy:
|
||||||
|
name: Build and Deploy
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
packages: write
|
||||||
|
environment:
|
||||||
|
name: ${{ startsWith(github.ref, 'refs/tags/') && 'production' || 'acceptance' }}
|
||||||
|
url: ${{ vars.URL }}
|
||||||
|
needs: [quality, tests, verify-prior-run]
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 15
|
||||||
|
if: >-
|
||||||
|
always() && !cancelled() && !failure() &&
|
||||||
|
((github.ref == 'refs/heads/main' && false) || startsWith(github.ref, 'refs/tags/'))
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||||
|
with:
|
||||||
|
persist-credentials: false
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
|
||||||
- name: Log in to GitHub Container Registry
|
- name: Log in to GitHub Container Registry
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.actor }}
|
username: ${{ github.actor }}
|
||||||
@@ -88,20 +236,23 @@ jobs:
|
|||||||
REPO_LOWER=$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')
|
REPO_LOWER=$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')
|
||||||
if [[ "${{ github.ref }}" == refs/tags/* ]]; then
|
if [[ "${{ github.ref }}" == refs/tags/* ]]; then
|
||||||
TAG="${GITHUB_REF#refs/tags/}"
|
TAG="${GITHUB_REF#refs/tags/}"
|
||||||
|
SENTRY_VERSION="${TAG#v}"
|
||||||
{
|
{
|
||||||
echo "tag=$TAG"
|
echo "tag=$TAG"
|
||||||
|
echo "sentry_version=$SENTRY_VERSION"
|
||||||
echo "full_name=ghcr.io/${REPO_LOWER}:$TAG"
|
echo "full_name=ghcr.io/${REPO_LOWER}:$TAG"
|
||||||
} >> "$GITHUB_OUTPUT"
|
} >> "$GITHUB_OUTPUT"
|
||||||
else
|
else
|
||||||
SHORT_SHA=$(git rev-parse --short HEAD)
|
SHORT_SHA=$(git rev-parse --short HEAD)
|
||||||
{
|
{
|
||||||
echo "tag=$SHORT_SHA"
|
echo "tag=$SHORT_SHA"
|
||||||
|
echo "sentry_version=$SHORT_SHA"
|
||||||
echo "full_name=ghcr.io/${REPO_LOWER}:$SHORT_SHA"
|
echo "full_name=ghcr.io/${REPO_LOWER}:$SHORT_SHA"
|
||||||
} >> "$GITHUB_OUTPUT"
|
} >> "$GITHUB_OUTPUT"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Build and Push Docker images
|
- name: Build and Push Docker images
|
||||||
uses: docker/bake-action@v5
|
uses: docker/bake-action@d3418bd7d0e9324001bca92fa8ba175ea7e6dc9b # v7
|
||||||
with:
|
with:
|
||||||
pull: true
|
pull: true
|
||||||
push: true
|
push: true
|
||||||
@@ -114,9 +265,21 @@ jobs:
|
|||||||
*.cache-to=type=gha,scope=${{github.ref}},mode=max
|
*.cache-to=type=gha,scope=${{github.ref}},mode=max
|
||||||
*.tags=${{ steps.meta.outputs.full_name }}
|
*.tags=${{ steps.meta.outputs.full_name }}
|
||||||
|
|
||||||
|
- name: Create Sentry release
|
||||||
|
uses: getsentry/action-release@ff07929a6537bac57790c3451cf4d364aca38528 # v3
|
||||||
|
env:
|
||||||
|
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
|
||||||
|
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
|
||||||
|
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
|
||||||
|
with:
|
||||||
|
release: ${{steps.meta.outputs.sentry_version}}
|
||||||
|
environment: ${{ startsWith(github.ref, 'refs/tags/') && 'production' || 'acceptance' }}
|
||||||
|
|
||||||
- name: Trigger Portainer Deployment
|
- name: Trigger Portainer Deployment
|
||||||
shell: bash
|
shell: bash
|
||||||
env:
|
env:
|
||||||
PORTAINER_WEBHOOK: ${{secrets.PORTAINER_WEBHOOK}}
|
PORTAINER_WEBHOOK: ${{secrets.PORTAINER_WEBHOOK}}
|
||||||
|
IMAGE_TAG: ${{steps.meta.outputs.tag}}
|
||||||
|
SENTRY_RELEASE: ${{steps.meta.outputs.sentry_version}}
|
||||||
run: |
|
run: |
|
||||||
curl -v -X POST "$PORTAINER_WEBHOOK"?IMAGE_TAG=${{steps.meta.outputs.tag}} --fail-with-body
|
curl -v -X POST "${PORTAINER_WEBHOOK}?IMAGE_TAG=${IMAGE_TAG}&SENTRY_RELEASE=${SENTRY_RELEASE}" --fail-with-body
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
name: Dependabot auto-merge
|
||||||
|
on: pull_request
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
pull-requests: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
dependabot:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: github.event.pull_request.user.login == 'dependabot[bot]'
|
||||||
|
steps:
|
||||||
|
- name: Dependabot metadata
|
||||||
|
id: metadata
|
||||||
|
uses: dependabot/fetch-metadata@v3
|
||||||
|
with:
|
||||||
|
github-token: "${{ secrets.GITHUB_TOKEN }}"
|
||||||
|
- name: Enable auto-merge for Dependabot PRs
|
||||||
|
if: contains(steps.metadata.outputs.dependency-type, 'development')
|
||||||
|
run: |
|
||||||
|
gh pr review --approve "$PR_URL"
|
||||||
|
gh pr merge --auto --squash "$PR_URL"
|
||||||
|
env:
|
||||||
|
PR_URL: ${{github.event.pull_request.html_url}}
|
||||||
|
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
|
||||||
+11
@@ -68,6 +68,17 @@ Icon
|
|||||||
# Thumbnails
|
# Thumbnails
|
||||||
._*
|
._*
|
||||||
|
|
||||||
|
# IDEs
|
||||||
|
/.idea/
|
||||||
|
/.vscode/
|
||||||
|
|
||||||
|
# Claude Code
|
||||||
|
/.claude/settings.local.json
|
||||||
|
|
||||||
|
# Windows
|
||||||
|
Thumbs.db
|
||||||
|
Desktop.ini
|
||||||
|
|
||||||
# Files that might appear in the root of a volume
|
# Files that might appear in the root of a volume
|
||||||
.DocumentRevisions-V100
|
.DocumentRevisions-V100
|
||||||
.fseventsd
|
.fseventsd
|
||||||
|
|||||||
Generated
+9
-3
@@ -4,6 +4,7 @@
|
|||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="Tvdt\" />
|
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="Tvdt\" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Tvdt\Tests\" />
|
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Tvdt\Tests\" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/vendor/maennchen/zipstream-php/test" isTestSource="true" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/clue/ndjson-react" />
|
<excludeFolder url="file://$MODULE_DIR$/vendor/clue/ndjson-react" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
|
<excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/collections" />
|
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/collections" />
|
||||||
@@ -45,7 +46,6 @@
|
|||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/react/socket" />
|
<excludeFolder url="file://$MODULE_DIR$/vendor/react/socket" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/react/stream" />
|
<excludeFolder url="file://$MODULE_DIR$/vendor/react/stream" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/rector/rector" />
|
<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/cli-parser" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/comparator" />
|
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/comparator" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/complexity" />
|
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/complexity" />
|
||||||
@@ -127,7 +127,6 @@
|
|||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/vincentlanglet/twig-cs-fixer" />
|
<excludeFolder url="file://$MODULE_DIR$/vendor/vincentlanglet/twig-cs-fixer" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/assert" />
|
<excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/assert" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/egulias/email-validator" />
|
<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/browser-kit" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/dom-crawler" />
|
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/dom-crawler" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/mailer" />
|
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/mailer" />
|
||||||
@@ -153,7 +152,6 @@
|
|||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/markbaker/complex" />
|
<excludeFolder url="file://$MODULE_DIR$/vendor/markbaker/complex" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/markbaker/matrix" />
|
<excludeFolder url="file://$MODULE_DIR$/vendor/markbaker/matrix" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/phpoffice/phpspreadsheet" />
|
<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/psr/simple-cache" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/asset-mapper" />
|
<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" />
|
||||||
@@ -165,6 +163,14 @@
|
|||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-uuid" />
|
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-uuid" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/brevo-mailer" />
|
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/brevo-mailer" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/martin-georgiev/postgresql-for-doctrine" />
|
<excludeFolder url="file://$MODULE_DIR$/vendor/martin-georgiev/postgresql-for-doctrine" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/vendor/dama/doctrine-test-bundle" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/vendor/gedmo/doctrine-extensions" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/vendor/stof/doctrine-extensions-bundle" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/git-state" />
|
||||||
|
<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" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/object-mapper" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="inheritedJdk" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
|||||||
Generated
+17
@@ -6,6 +6,23 @@
|
|||||||
<synchronize>true</synchronize>
|
<synchronize>true</synchronize>
|
||||||
<jdbc-driver>org.postgresql.Driver</jdbc-driver>
|
<jdbc-driver>org.postgresql.Driver</jdbc-driver>
|
||||||
<jdbc-url>jdbc:postgresql://localhost:5432/app</jdbc-url>
|
<jdbc-url>jdbc:postgresql://localhost:5432/app</jdbc-url>
|
||||||
|
<jdbc-additional-properties>
|
||||||
|
<property name="com.intellij.clouds.kubernetes.db.host.port" />
|
||||||
|
<property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
|
||||||
|
<property name="com.intellij.clouds.kubernetes.db.container.port" />
|
||||||
|
</jdbc-additional-properties>
|
||||||
|
<working-dir>$ProjectFileDir$</working-dir>
|
||||||
|
</data-source>
|
||||||
|
<data-source source="LOCAL" name="Prod DB" uuid="2cfa902e-fb09-4e39-a09c-15bdbe41ec57">
|
||||||
|
<driver-ref>postgresql</driver-ref>
|
||||||
|
<synchronize>true</synchronize>
|
||||||
|
<jdbc-driver>org.postgresql.Driver</jdbc-driver>
|
||||||
|
<jdbc-url>jdbc:postgresql://10.0.0.21:5430/postgres</jdbc-url>
|
||||||
|
<jdbc-additional-properties>
|
||||||
|
<property name="com.intellij.clouds.kubernetes.db.host.port" />
|
||||||
|
<property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
|
||||||
|
<property name="com.intellij.clouds.kubernetes.db.container.port" />
|
||||||
|
</jdbc-additional-properties>
|
||||||
<working-dir>$ProjectFileDir$</working-dir>
|
<working-dir>$ProjectFileDir$</working-dir>
|
||||||
</data-source>
|
</data-source>
|
||||||
</component>
|
</component>
|
||||||
|
|||||||
+1
@@ -73,6 +73,7 @@
|
|||||||
<inspection_tool class="PhpFullyQualifiedNameUsageInspection" 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" />
|
<option name="IGNORE_GLOBAL_NAMESPACE" value="true" />
|
||||||
</inspection_tool>
|
</inspection_tool>
|
||||||
|
<inspection_tool class="PhpPublicPropertyModifierCanBeOmittedInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
|
||||||
<inspection_tool class="PhpStanGlobal" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
|
<inspection_tool class="PhpStanGlobal" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
|
||||||
<inspection_tool class="SecurityAdvisoriesInspection" enabled="true" level="WARNING" enabled_by_default="true">
|
<inspection_tool class="SecurityAdvisoriesInspection" enabled="true" level="WARNING" enabled_by_default="true">
|
||||||
<option name="optionConfiguration">
|
<option name="optionConfiguration">
|
||||||
|
|||||||
Generated
+8
@@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="InertiaPackage">
|
||||||
|
<option name="directoryPaths">
|
||||||
|
<list />
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
Generated
+1
-1
@@ -5,7 +5,7 @@
|
|||||||
<tool tool_name="PHPUnit">
|
<tool tool_name="PHPUnit">
|
||||||
<cache>
|
<cache>
|
||||||
<versions>
|
<versions>
|
||||||
<info id="interpreter-96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" version="12.1.2" />
|
<info id="interpreter-96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" version="12.4.1" />
|
||||||
</versions>
|
</versions>
|
||||||
</cache>
|
</cache>
|
||||||
</tool>
|
</tool>
|
||||||
|
|||||||
Generated
+276
-164
@@ -7,6 +7,11 @@
|
|||||||
</laravel_pint_by_interpreter>
|
</laravel_pint_by_interpreter>
|
||||||
</laravel_pint_settings>
|
</laravel_pint_settings>
|
||||||
</component>
|
</component>
|
||||||
|
<component name="MessDetector">
|
||||||
|
<phpmd_settings>
|
||||||
|
<phpmd_by_interpreter asDefaultInterpreter="true" interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" timeout="30000" />
|
||||||
|
</phpmd_settings>
|
||||||
|
</component>
|
||||||
<component name="MessDetectorOptionsConfiguration">
|
<component name="MessDetectorOptionsConfiguration">
|
||||||
<option name="transferred" value="true" />
|
<option name="transferred" value="true" />
|
||||||
</component>
|
</component>
|
||||||
@@ -21,9 +26,9 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="PhpCSFixer">
|
<component name="PhpCSFixer">
|
||||||
<phpcsfixer_settings>
|
<phpcsfixer_settings>
|
||||||
<phpcs_fixer_by_interpreter interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" standards="DoctrineAnnotation;PER;PER-CS;PER-CS1.0;PER-CS2.0;PHP54Migration;PHP56Migration;PHP70Migration;PHP71Migration;PHP73Migration;PHP74Migration;PHP80Migration;PHP81Migration;PHP82Migration;PHP83Migration;PHP84Migration;PHPUnit100Migration;PHPUnit30Migration;PHPUnit32Migration;PHPUnit35Migration;PHPUnit43Migration;PHPUnit48Migration;PHPUnit50Migration;PHPUnit52Migration;PHPUnit54Migration;PHPUnit55Migration;PHPUnit56Migration;PHPUnit57Migration;PHPUnit60Migration;PHPUnit75Migration;PHPUnit84Migration;PHPUnit91Migration;PSR1;PSR12;PSR2;PhpCsFixer;Symfony" tool_path="vendor/bin/php-cs-fixer" timeout="30000" />
|
<phpcs_fixer_by_interpreter interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" standards="DoctrineAnnotation;PER;PER-CS;PER-CS1.0;PER-CS1x0;PER-CS2.0;PER-CS2x0;PER-CS3.0;PER-CS3x0;PHP54Migration;PHP56Migration;PHP5x4Migration;PHP5x6Migration;PHP70Migration;PHP71Migration;PHP73Migration;PHP74Migration;PHP7x0Migration;PHP7x1Migration;PHP7x3Migration;PHP7x4Migration;PHP80Migration;PHP81Migration;PHP82Migration;PHP83Migration;PHP84Migration;PHP85Migration;PHP8x0Migration;PHP8x1Migration;PHP8x2Migration;PHP8x3Migration;PHP8x4Migration;PHP8x5Migration;PHPUnit100Migration;PHPUnit10x0Migration;PHPUnit11x0Migration;PHPUnit30Migration;PHPUnit32Migration;PHPUnit35Migration;PHPUnit3x0Migration;PHPUnit3x2Migration;PHPUnit3x5Migration;PHPUnit43Migration;PHPUnit48Migration;PHPUnit4x3Migration;PHPUnit4x8Migration;PHPUnit50Migration;PHPUnit52Migration;PHPUnit54Migration;PHPUnit55Migration;PHPUnit56Migration;PHPUnit57Migration;PHPUnit5x0Migration;PHPUnit5x2Migration;PHPUnit5x4Migration;PHPUnit5x5Migration;PHPUnit5x6Migration;PHPUnit5x7Migration;PHPUnit60Migration;PHPUnit6x0Migration;PHPUnit75Migration;PHPUnit7x5Migration;PHPUnit84Migration;PHPUnit8x4Migration;PHPUnit91Migration;PHPUnit9x1Migration;PSR1;PSR12;PSR2;PhpCsFixer;Symfony;auto;autoPHPMigration;autoPHPUnitMigration" tool_path="vendor/bin/php-cs-fixer" timeout="30000" />
|
||||||
<PhpCSFixerConfiguration deletedFromTheList="true" standards="PSR1;PSR2;Symfony;DoctrineAnnotation;PHP70Migration;PHP71Migration" tool_path="$PROJECT_DIR$/vendor/bin/php-cs-fixer" />
|
<PhpCSFixerConfiguration deletedFromTheList="true" standards="PSR1;PSR2;Symfony;DoctrineAnnotation;PHP70Migration;PHP71Migration" tool_path="$PROJECT_DIR$/vendor/bin/php-cs-fixer" />
|
||||||
<phpcs_fixer_by_interpreter asDefaultInterpreter="true" deletedFromTheList="true" interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" standards="DoctrineAnnotation;PER;PER-CS;PER-CS1.0;PER-CS2.0;PHP54Migration;PHP56Migration;PHP70Migration;PHP71Migration;PHP73Migration;PHP74Migration;PHP80Migration;PHP81Migration;PHP82Migration;PHP83Migration;PHP84Migration;PHPUnit100Migration;PHPUnit30Migration;PHPUnit32Migration;PHPUnit35Migration;PHPUnit43Migration;PHPUnit48Migration;PHPUnit50Migration;PHPUnit52Migration;PHPUnit54Migration;PHPUnit55Migration;PHPUnit56Migration;PHPUnit57Migration;PHPUnit60Migration;PHPUnit75Migration;PHPUnit84Migration;PHPUnit91Migration;PSR1;PSR12;PSR2;PhpCsFixer;Symfony" tool_path="vendor/bin/php-cs-fixer" timeout="30000" />
|
<phpcs_fixer_by_interpreter asDefaultInterpreter="true" deletedFromTheList="true" interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" standards="DoctrineAnnotation;PER;PER-CS;PER-CS1.0;PER-CS1x0;PER-CS2.0;PER-CS2x0;PER-CS3.0;PER-CS3x0;PHP54Migration;PHP56Migration;PHP5x4Migration;PHP5x6Migration;PHP70Migration;PHP71Migration;PHP73Migration;PHP74Migration;PHP7x0Migration;PHP7x1Migration;PHP7x3Migration;PHP7x4Migration;PHP80Migration;PHP81Migration;PHP82Migration;PHP83Migration;PHP84Migration;PHP85Migration;PHP8x0Migration;PHP8x1Migration;PHP8x2Migration;PHP8x3Migration;PHP8x4Migration;PHP8x5Migration;PHPUnit100Migration;PHPUnit10x0Migration;PHPUnit11x0Migration;PHPUnit30Migration;PHPUnit32Migration;PHPUnit35Migration;PHPUnit3x0Migration;PHPUnit3x2Migration;PHPUnit3x5Migration;PHPUnit43Migration;PHPUnit48Migration;PHPUnit4x3Migration;PHPUnit4x8Migration;PHPUnit50Migration;PHPUnit52Migration;PHPUnit54Migration;PHPUnit55Migration;PHPUnit56Migration;PHPUnit57Migration;PHPUnit5x0Migration;PHPUnit5x2Migration;PHPUnit5x4Migration;PHPUnit5x5Migration;PHPUnit5x6Migration;PHPUnit5x7Migration;PHPUnit60Migration;PHPUnit6x0Migration;PHPUnit75Migration;PHPUnit7x5Migration;PHPUnit84Migration;PHPUnit8x4Migration;PHPUnit91Migration;PHPUnit9x1Migration;PSR1;PSR12;PSR2;PhpCsFixer;Symfony;auto;autoPHPMigration;autoPHPUnitMigration" tool_path="vendor/bin/php-cs-fixer" timeout="30000" />
|
||||||
</phpcsfixer_settings>
|
</phpcsfixer_settings>
|
||||||
</component>
|
</component>
|
||||||
<component name="PhpCodeSniffer">
|
<component name="PhpCodeSniffer">
|
||||||
@@ -36,171 +41,175 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="PhpIncludePathManager">
|
<component name="PhpIncludePathManager">
|
||||||
<include_path>
|
<include_path>
|
||||||
<path value="$PROJECT_DIR$/vendor/react/stream" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/react/promise" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/react/event-loop" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/react/cache" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/react/child-process" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/jean85/pretty-package-versions" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/react/dns" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/react/socket" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/sentry/sentry" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/staabm/side-effects-detector" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/rector/rector" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/sentry/sentry-symfony" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/phar-io/version" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/egulias/email-validator" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/phpstan/phpstan-symfony" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/phpstan/phpstan-phpunit" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/phpstan/phpstan" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/phpstan/phpstan-doctrine" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/phpstan/extension-installer" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/phpstan/phpdoc-parser" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/phpunit/php-invoker" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-icu" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/form" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/runtime/frankenphp-symfony" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/framework-bundle" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/cache" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/serializer" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/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-contracts" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/runtime" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/uid" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/asset-mapper" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/mailer" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/filesystem" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/phpunit-bridge" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/var-dumper" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-idn" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/maker-bundle" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/options-resolver" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/security-csrf" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-normalizer" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/css-selector" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/twig-bridge" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/web-profiler-bundle" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/property-access" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/twig-bundle" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/dom-crawler" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/http-client" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/stopwatch" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/finder" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/yaml" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/mime" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/http-kernel" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/routing" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/string" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/security-core" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/property-info" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/type-info" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/service-contracts" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/http-client-contracts" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/var-exporter" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/flex" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/http-foundation" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/doctrine-bridge" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/dependency-injection" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/clock" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/error-handler" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/cache-contracts" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/console" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/password-hasher" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/process" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-grapheme" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/doctrine/doctrine-migrations-bundle" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/doctrine/lexer" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/doctrine/dbal" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/doctrine/migrations" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/doctrine/data-fixtures" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/doctrine/doctrine-fixtures-bundle" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/doctrine/persistence" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/doctrine/collections" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/doctrine/sql-formatter" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/doctrine/orm" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/doctrine/event-manager" />
|
|
||||||
<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/sebastian/global-state" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/sebastian/diff" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/sebastian/complexity" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/sebastian/version" />
|
|
||||||
<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/guzzlehttp/psr7" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/sebastian/environment" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfonycasts/verify-email-bundle" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/symfonycasts/sass-bundle" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/masterminds/html5" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/friendsofphp/php-cs-fixer" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/vincentlanglet/twig-cs-fixer" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/thecodingmachine/safe" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/thecodingmachine/phpstan-safe-rule" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/composer" />
|
<path value="$PROJECT_DIR$/vendor/composer" />
|
||||||
<path value="$PROJECT_DIR$/vendor/psr/http-message" />
|
<path value="$PROJECT_DIR$/vendor/dama/doctrine-test-bundle" />
|
||||||
<path value="$PROJECT_DIR$/vendor/psr/container" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/psr/cache" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/psr/event-dispatcher" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/psr/clock" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/psr/http-client" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/psr/log" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/twig/extra-bundle" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/twig/intl-extra" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/psr/http-factory" />
|
|
||||||
<path value="$PROJECT_DIR$/vendor/clue/ndjson-react" />
|
<path value="$PROJECT_DIR$/vendor/clue/ndjson-react" />
|
||||||
<path value="$PROJECT_DIR$/vendor/fidry/cpu-core-counter" />
|
<path value="$PROJECT_DIR$/vendor/psr/http-factory" />
|
||||||
<path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
|
<path value="$PROJECT_DIR$/vendor/psr/clock" />
|
||||||
<path value="$PROJECT_DIR$/vendor/twig/twig" />
|
<path value="$PROJECT_DIR$/vendor/twig/twig" />
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/ux-turbo" />
|
<path value="$PROJECT_DIR$/vendor/twig/intl-extra" />
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/stimulus-bundle" />
|
<path value="$PROJECT_DIR$/vendor/twig/extra-bundle" />
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-uuid" />
|
<path value="$PROJECT_DIR$/vendor/stof/doctrine-extensions-bundle" />
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php84" />
|
<path value="$PROJECT_DIR$/vendor/psr/event-dispatcher" />
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/brevo-mailer" />
|
<path value="$PROJECT_DIR$/vendor/psr/cache" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
|
||||||
|
<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/rector/rector" />
|
||||||
|
<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/egulias/email-validator" />
|
||||||
|
<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/react/event-loop" />
|
||||||
|
<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/react/dns" />
|
||||||
|
<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/phpunit/php-text-template" />
|
||||||
|
<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/symfony/framework-bundle" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/phpunit/php-invoker" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/phpstan/phpstan" />
|
||||||
|
<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/phpstan/extension-installer" />
|
||||||
|
<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/symfony/intl" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/security-bundle" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/browser-kit" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/asset" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/security-http" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/config" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/translation" />
|
<path value="$PROJECT_DIR$/vendor/symfony/translation" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/ux-turbo" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/form" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-icu" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-deepclone" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/cache" />
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/validator" />
|
<path value="$PROJECT_DIR$/vendor/symfony/validator" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/dotenv" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/serializer" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-idn" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/security-csrf" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/options-resolver" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/filesystem" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/web-profiler-bundle" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-uuid" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/twig-bridge" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/maker-bundle" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/runtime" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/asset-mapper" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/uid" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/mailer" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/brevo-mailer" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/var-dumper" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/phpunit-bridge" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/yaml" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/http-kernel" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/stopwatch" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/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/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/http-client" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/finder" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/twig-bundle" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/property-access" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/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/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/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/var-exporter" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/doctrine-bridge" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/http-foundation" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/type-info" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-grapheme" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/console" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/doctrine/orm" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/doctrine/doctrine-fixtures-bundle" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/doctrine/persistence" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/doctrine/deprecations" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/doctrine/sql-formatter" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/doctrine/collections" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/doctrine/event-manager" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/doctrine/migrations" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/doctrine/doctrine-migrations-bundle" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/doctrine/dbal" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/doctrine/lexer" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/doctrine/data-fixtures" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/sebastian/lines-of-code" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/sebastian/diff" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/sebastian/complexity" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/maennchen/zipstream-php" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/evenement/evenement" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/ergebnis/agent-detector" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/markbaker/matrix" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/markbaker/complex" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfonycasts/sass-bundle" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfonycasts/verify-email-bundle" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/friendsofphp/php-cs-fixer" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/vincentlanglet/twig-cs-fixer" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
|
||||||
|
<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/sebastian/file-filter" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/webmozart/assert" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/sebastian/git-state" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/sebastian/environment" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/thecodingmachine/phpstan-safe-rule" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/thecodingmachine/safe" />
|
||||||
<path value="$PROJECT_DIR$/vendor/martin-georgiev/postgresql-for-doctrine" />
|
<path value="$PROJECT_DIR$/vendor/martin-georgiev/postgresql-for-doctrine" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/object-mapper" />
|
||||||
</include_path>
|
</include_path>
|
||||||
</component>
|
</component>
|
||||||
<component name="PhpInterpreters">
|
<component name="PhpInterpreters">
|
||||||
<interpreters>
|
<interpreters>
|
||||||
<interpreter id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" name="Compose PHP 8.4" home="docker-compose://DATA" auto="false" debugger_id="php.debugger.XDebug">
|
<interpreter id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" name="Compose PHP" home="docker-compose://DATA" auto="false" debugger_id="php.debugger.XDebug">
|
||||||
<remote_data INTERPRETER_PATH="php" HELPERS_PATH="/opt/.phpstorm_helpers" VALID="true" RUN_AS_ROOT_VIA_SUDO="false" DOCKER_ACCOUNT_NAME="Colima" DOCKER_COMPOSE_SERVICE_NAME="php" DOCKER_REMOTE_PROJECT_PATH="/opt/project">
|
<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" />
|
<type_data command="EXEC" />
|
||||||
<dockerComposeConfigurationPaths>
|
<dockerComposeConfigurationPaths>
|
||||||
@@ -214,15 +223,15 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="PhpInterpretersPhpInfoCache">
|
<component name="PhpInterpretersPhpInfoCache">
|
||||||
<phpInfoCache>
|
<phpInfoCache>
|
||||||
<interpreter name="Compose PHP 8.4">
|
<interpreter name="Compose PHP">
|
||||||
<phpinfo binary_type="PHP" php_cgi="/usr/local/bin/php-cgi" php_cli="/usr/local/bin/php" path_separator=":" version="8.4.8">
|
<phpinfo binary_type="PHP" php_cgi="/usr/local/bin/php-cgi" php_cli="/usr/local/bin/php" path_separator=":" version="8.5.2">
|
||||||
<additional_php_ini>/usr/local/etc/php/conf.d/docker-php-ext-apcu.ini, /usr/local/etc/php/conf.d/docker-php-ext-excimer.ini, /usr/local/etc/php/conf.d/docker-php-ext-gd.ini, /usr/local/etc/php/conf.d/docker-php-ext-intl.ini, /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini, /usr/local/etc/php/conf.d/docker-php-ext-pdo_pgsql.ini, /usr/local/etc/php/conf.d/docker-php-ext-sodium.ini, /usr/local/etc/php/conf.d/docker-php-ext-uuid.ini, /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini, /usr/local/etc/php/conf.d/docker-php-ext-zip.ini, /usr/local/etc/php/app.conf.d/10-app.ini, /usr/local/etc/php/app.conf.d/20-app.dev.ini</additional_php_ini>
|
<additional_php_ini>/usr/local/etc/php/conf.d/docker-php-ext-apcu.ini, /usr/local/etc/php/conf.d/docker-php-ext-excimer.ini, /usr/local/etc/php/conf.d/docker-php-ext-gd.ini, /usr/local/etc/php/conf.d/docker-php-ext-intl.ini, /usr/local/etc/php/conf.d/docker-php-ext-pdo_pgsql.ini, /usr/local/etc/php/conf.d/docker-php-ext-sodium.ini, /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini, /usr/local/etc/php/conf.d/docker-php-ext-zip.ini, /usr/local/etc/php/app.conf.d/10-app.ini, /usr/local/etc/php/app.conf.d/20-app.dev.ini</additional_php_ini>
|
||||||
<configuration_file>/usr/local/etc/php/php.ini</configuration_file>
|
<configuration_file>/usr/local/etc/php/php.ini</configuration_file>
|
||||||
<configuration_options>
|
<configuration_options>
|
||||||
<configuration_option name="include_path" value=".:/usr/local/lib/php" />
|
<configuration_option name="include_path" value=".:/usr/local/lib/php" />
|
||||||
</configuration_options>
|
</configuration_options>
|
||||||
<debuggers>
|
<debuggers>
|
||||||
<debugger_info debugger="xdebug" debugger_version="3.4.3">
|
<debugger_info debugger="xdebug" debugger_version="3.5.0">
|
||||||
<debug_extensions />
|
<debug_extensions />
|
||||||
</debugger_info>
|
</debugger_info>
|
||||||
</debuggers>
|
</debuggers>
|
||||||
@@ -247,6 +256,7 @@
|
|||||||
<extension name="iconv" />
|
<extension name="iconv" />
|
||||||
<extension name="intl" />
|
<extension name="intl" />
|
||||||
<extension name="json" />
|
<extension name="json" />
|
||||||
|
<extension name="lexbor" />
|
||||||
<extension name="libxml" />
|
<extension name="libxml" />
|
||||||
<extension name="mbstring" />
|
<extension name="mbstring" />
|
||||||
<extension name="mysqlnd" />
|
<extension name="mysqlnd" />
|
||||||
@@ -262,7 +272,7 @@
|
|||||||
<extension name="sqlite3" />
|
<extension name="sqlite3" />
|
||||||
<extension name="standard" />
|
<extension name="standard" />
|
||||||
<extension name="tokenizer" />
|
<extension name="tokenizer" />
|
||||||
<extension name="uuid" />
|
<extension name="uri" />
|
||||||
<extension name="xdebug" />
|
<extension name="xdebug" />
|
||||||
<extension name="xml" />
|
<extension name="xml" />
|
||||||
<extension name="xmlreader" />
|
<extension name="xmlreader" />
|
||||||
@@ -274,7 +284,109 @@
|
|||||||
</interpreter>
|
</interpreter>
|
||||||
</phpInfoCache>
|
</phpInfoCache>
|
||||||
</component>
|
</component>
|
||||||
<component name="PhpProjectSharedConfiguration" php_language_level="8.4" />
|
<component name="PhpProjectSharedConfiguration" php_language_level="8.5" />
|
||||||
|
<component name="PhpRuntimeConfiguration">
|
||||||
|
<extensions>
|
||||||
|
<extension name="Ev" enabled="false" />
|
||||||
|
<extension name="SQLite" enabled="false" />
|
||||||
|
<extension name="SplType" enabled="false" />
|
||||||
|
<extension name="ZendDebugger" enabled="false" />
|
||||||
|
<extension name="ZendUtils" enabled="false" />
|
||||||
|
<extension name="amqp" enabled="false" />
|
||||||
|
<extension name="apache" enabled="false" />
|
||||||
|
<extension name="bcmath" enabled="false" />
|
||||||
|
<extension name="brotli" enabled="false" />
|
||||||
|
<extension name="bz2" enabled="false" />
|
||||||
|
<extension name="calendar" enabled="false" />
|
||||||
|
<extension name="cassandra" enabled="false" />
|
||||||
|
<extension name="couchbase" enabled="false" />
|
||||||
|
<extension name="cubrid" enabled="false" />
|
||||||
|
<extension name="dba" enabled="false" />
|
||||||
|
<extension name="decimal" enabled="false" />
|
||||||
|
<extension name="dio" enabled="false" />
|
||||||
|
<extension name="elastic_apm" enabled="false" />
|
||||||
|
<extension name="enchant" enabled="false" />
|
||||||
|
<extension name="exif" enabled="false" />
|
||||||
|
<extension name="fann" enabled="false" />
|
||||||
|
<extension name="ffmpeg" enabled="false" />
|
||||||
|
<extension name="frankenphp" enabled="false" />
|
||||||
|
<extension name="ftp" enabled="false" />
|
||||||
|
<extension name="gearman" enabled="false" />
|
||||||
|
<extension name="geoip" enabled="false" />
|
||||||
|
<extension name="geos" enabled="false" />
|
||||||
|
<extension name="gettext" enabled="false" />
|
||||||
|
<extension name="gmagick" enabled="false" />
|
||||||
|
<extension name="gmp" enabled="false" />
|
||||||
|
<extension name="gnupg" enabled="false" />
|
||||||
|
<extension name="grpc" enabled="false" />
|
||||||
|
<extension name="http" enabled="false" />
|
||||||
|
<extension name="ibm_db2" enabled="false" />
|
||||||
|
<extension name="igbinary" enabled="false" />
|
||||||
|
<extension name="imagick" enabled="false" />
|
||||||
|
<extension name="imap" enabled="false" />
|
||||||
|
<extension name="inotify" enabled="false" />
|
||||||
|
<extension name="interbase" enabled="false" />
|
||||||
|
<extension name="jsonpath" enabled="false" />
|
||||||
|
<extension name="judy" enabled="false" />
|
||||||
|
<extension name="ldap" enabled="false" />
|
||||||
|
<extension name="libevent" enabled="false" />
|
||||||
|
<extension name="libsodium" enabled="false" />
|
||||||
|
<extension name="mailparse" enabled="false" />
|
||||||
|
<extension name="mcrypt" enabled="false" />
|
||||||
|
<extension name="memcache" enabled="false" />
|
||||||
|
<extension name="memcached" enabled="false" />
|
||||||
|
<extension name="ming" enabled="false" />
|
||||||
|
<extension name="mongo" enabled="false" />
|
||||||
|
<extension name="mongodb" enabled="false" />
|
||||||
|
<extension name="mosquitto-php" enabled="false" />
|
||||||
|
<extension name="mqseries" enabled="false" />
|
||||||
|
<extension name="mssql" enabled="false" />
|
||||||
|
<extension name="mysql" enabled="false" />
|
||||||
|
<extension name="mysql_xdevapi" enabled="false" />
|
||||||
|
<extension name="mysqli" enabled="false" />
|
||||||
|
<extension name="ncurses" enabled="false" />
|
||||||
|
<extension name="newrelic" enabled="false" />
|
||||||
|
<extension name="oauth" enabled="false" />
|
||||||
|
<extension name="oci8" enabled="false" />
|
||||||
|
<extension name="odbc" enabled="false" />
|
||||||
|
<extension name="opentelemetry" enabled="false" />
|
||||||
|
<extension name="pcntl" enabled="false" />
|
||||||
|
<extension name="pdflib" enabled="false" />
|
||||||
|
<extension name="pgsql" enabled="false" />
|
||||||
|
<extension name="pspell" enabled="false" />
|
||||||
|
<extension name="pthreads" enabled="false" />
|
||||||
|
<extension name="rar" enabled="false" />
|
||||||
|
<extension name="recode" enabled="false" />
|
||||||
|
<extension name="redis" enabled="false" />
|
||||||
|
<extension name="relay" enabled="false" />
|
||||||
|
<extension name="rrd" enabled="false" />
|
||||||
|
<extension name="shmop" enabled="false" />
|
||||||
|
<extension name="snappy" enabled="false" />
|
||||||
|
<extension name="snmp" enabled="false" />
|
||||||
|
<extension name="soap" enabled="false" />
|
||||||
|
<extension name="sockets" enabled="false" />
|
||||||
|
<extension name="sqlsrv" enabled="false" />
|
||||||
|
<extension name="ssh2" enabled="false" />
|
||||||
|
<extension name="suhosin" enabled="false" />
|
||||||
|
<extension name="svn" enabled="false" />
|
||||||
|
<extension name="sybase" enabled="false" />
|
||||||
|
<extension name="sysvmsg" enabled="false" />
|
||||||
|
<extension name="sysvsem" enabled="false" />
|
||||||
|
<extension name="sysvshm" enabled="false" />
|
||||||
|
<extension name="tidy" enabled="false" />
|
||||||
|
<extension name="v8js" enabled="false" />
|
||||||
|
<extension name="wddx" enabled="false" />
|
||||||
|
<extension name="win32service" enabled="false" />
|
||||||
|
<extension name="wincache" enabled="false" />
|
||||||
|
<extension name="xhprof" enabled="false" />
|
||||||
|
<extension name="xlswriter" enabled="false" />
|
||||||
|
<extension name="xmlrpc" enabled="false" />
|
||||||
|
<extension name="xsl" enabled="false" />
|
||||||
|
<extension name="yaml" enabled="false" />
|
||||||
|
<extension name="zend" enabled="false" />
|
||||||
|
<extension name="zmq" enabled="false" />
|
||||||
|
</extensions>
|
||||||
|
</component>
|
||||||
<component name="PhpStan">
|
<component name="PhpStan">
|
||||||
<PhpStan_settings>
|
<PhpStan_settings>
|
||||||
<phpstan_by_interpreter interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" tool_path="vendor/bin/phpstan" timeout="60000" />
|
<phpstan_by_interpreter interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" tool_path="vendor/bin/phpstan" timeout="60000" />
|
||||||
@@ -289,7 +401,7 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="PhpUnit">
|
<component name="PhpUnit">
|
||||||
<phpunit_settings>
|
<phpunit_settings>
|
||||||
<phpunit_by_interpreter interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" configuration_file_path="phpunit.xml.dist" custom_loader_path="vendor/autoload.php" phpunit_phar_path="" use_configuration_file="true" />
|
<phpunit_by_interpreter interpreter_id="96512cb2-7b9e-4e1d-bfa2-bf7f3be424c8" bootstrap_file_path="./tests/bootstrap.php" configuration_file_path="./phpunit.dist.xml" custom_loader_path="/app/vendor/autoload.php" phpunit_phar_path="" use_bootstrap_file="true" use_configuration_file="true" />
|
||||||
</phpunit_settings>
|
</phpunit_settings>
|
||||||
</component>
|
</component>
|
||||||
<component name="Psalm">
|
<component name="Psalm">
|
||||||
|
|||||||
Generated
-6
@@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="SqlDialectMappings">
|
|
||||||
<file url="PROJECT" dialect="PostgreSQL" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
+11
-2
@@ -9,6 +9,7 @@ $finder = new Finder()
|
|||||||
->in(__DIR__)
|
->in(__DIR__)
|
||||||
->exclude('var')
|
->exclude('var')
|
||||||
->exclude('bin')
|
->exclude('bin')
|
||||||
|
->notPath(['config/reference.php'])
|
||||||
;
|
;
|
||||||
|
|
||||||
return new Config()
|
return new Config()
|
||||||
@@ -24,8 +25,15 @@ return new Config()
|
|||||||
'no_unreachable_default_argument_value' => true,
|
'no_unreachable_default_argument_value' => true,
|
||||||
'no_useless_else' => true,
|
'no_useless_else' => true,
|
||||||
'no_useless_return' => true,
|
'no_useless_return' => true,
|
||||||
'php_unit_strict' => true,
|
'phpdoc_line_span' => [
|
||||||
'phpdoc_line_span' => ['const' => 'single', 'method' => 'single', 'property' => 'single'],
|
'case' => 'single',
|
||||||
|
'class' => 'single',
|
||||||
|
'const' => 'single',
|
||||||
|
'method' => 'single',
|
||||||
|
'other' => 'single',
|
||||||
|
'property' => 'single',
|
||||||
|
'trait_import' => 'single',
|
||||||
|
],
|
||||||
'phpdoc_order' => true,
|
'phpdoc_order' => true,
|
||||||
'single_line_empty_body' => true,
|
'single_line_empty_body' => true,
|
||||||
'strict_comparison' => true,
|
'strict_comparison' => true,
|
||||||
@@ -36,4 +44,5 @@ return new Config()
|
|||||||
])
|
])
|
||||||
->setRiskyAllowed(true)
|
->setRiskyAllowed(true)
|
||||||
->setFinder($finder)
|
->setFinder($finder)
|
||||||
|
->setUnsupportedPhpVersionAllowed(true)
|
||||||
;
|
;
|
||||||
|
|||||||
@@ -0,0 +1,241 @@
|
|||||||
|
# CLAUDE.md
|
||||||
|
|
||||||
|
This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
|
||||||
|
|
||||||
|
## Project Overview
|
||||||
|
|
||||||
|
**Tijd voor de test** is a PHP/Symfony 8.1 application for managing quizzes in the style of **Wie is de Mol?** (WIDM) — a Dutch TV show where contestants try to identify a saboteur ("de Mol") among them. At the end of each episode, participants take a quiz about the Mol's identity and actions; the candidate with the least correct answers is eliminated. This app replicates that quiz format with:
|
||||||
|
- Test creation with variable question counts
|
||||||
|
- Season management with active test controls
|
||||||
|
- Candidate answer tracking with automatic timing
|
||||||
|
- Elimination tracking with joker adjustments
|
||||||
|
- Backoffice management for quiz administration and statistics
|
||||||
|
|
||||||
|
Tech Stack:
|
||||||
|
- **Framework**: Symfony 8.1
|
||||||
|
- **PHP**: 8.5+
|
||||||
|
- **Database**: PostgreSQL 16
|
||||||
|
- **ORM**: Doctrine
|
||||||
|
- **Server**: FrankenPHP with Caddy
|
||||||
|
- **Container**: Docker Compose
|
||||||
|
- **Frontend**: Twig templates with SASS (via asset mapper)
|
||||||
|
- **Testing**: PHPUnit 13 with DAMA Doctrine test bundle
|
||||||
|
|
||||||
|
## Build & Development Commands
|
||||||
|
|
||||||
|
All commands assume Docker is running. The project uses a [Justfile](https://just.systems) as the primary interface.
|
||||||
|
|
||||||
|
### Essential Commands
|
||||||
|
|
||||||
|
```bash
|
||||||
|
just up # Start Docker services (PHP, PostgreSQL)
|
||||||
|
just stop # Stop services
|
||||||
|
just down # Stop and remove containers/orphans
|
||||||
|
just shell # Interactive shell inside the PHP container
|
||||||
|
just shell-run # Shell in a fresh one-off container
|
||||||
|
```
|
||||||
|
|
||||||
|
### Database
|
||||||
|
|
||||||
|
```bash
|
||||||
|
just migrate # Run Doctrine migrations (starts services first)
|
||||||
|
just fixtures # Load dev fixtures (truncates first)
|
||||||
|
just reload-tests # Drop/recreate test DB, migrate, load test fixtures
|
||||||
|
```
|
||||||
|
|
||||||
|
### Testing
|
||||||
|
|
||||||
|
```bash
|
||||||
|
just test # Run full PHPUnit suite
|
||||||
|
just test tests/Path/To/TestFile.php # Run a specific test file
|
||||||
|
just test --coverage-html var/coverage # Generate HTML coverage report
|
||||||
|
```
|
||||||
|
|
||||||
|
### Code Quality & Linting
|
||||||
|
|
||||||
|
```bash
|
||||||
|
just fix-cs # Auto-fix PHP-CS-Fixer + Twig-CS-Fixer
|
||||||
|
just phpstan # PHPStan static analysis (level 9)
|
||||||
|
just phpstan --no-progress # Without progress output
|
||||||
|
just rector # Apply Rector modernizations
|
||||||
|
just rector --dry-run # Preview Rector changes
|
||||||
|
```
|
||||||
|
|
||||||
|
### Other
|
||||||
|
|
||||||
|
```bash
|
||||||
|
just translations # Extract/update nl translation strings
|
||||||
|
just clean # Nuke containers (volumes) + all generated files (prompts for confirmation)
|
||||||
|
just trust-cert # Trust the local Caddy TLS certificate (macOS)
|
||||||
|
just exec <cmd> # Run any command inside the PHP container
|
||||||
|
```
|
||||||
|
|
||||||
|
All code quality checks run in CI/CD (.github/workflows/ci.yml) and should pass before merging.
|
||||||
|
|
||||||
|
## Project Structure
|
||||||
|
|
||||||
|
```
|
||||||
|
src/
|
||||||
|
Controller/ # HTTP request handlers (attribute-routed)
|
||||||
|
Backoffice/ # Admin panel controllers
|
||||||
|
Entity/ # Doctrine ORM entities
|
||||||
|
Repository/ # Database queries
|
||||||
|
Service/ # Business logic
|
||||||
|
Command/ # CLI commands
|
||||||
|
Form/ # Symfony form types
|
||||||
|
Dto/ # Data transfer objects
|
||||||
|
Enum/ # Enumerations (FlashType, etc.)
|
||||||
|
Exception/ # Custom exceptions
|
||||||
|
Factory/ # Object factories
|
||||||
|
Helpers/ # Utility functions
|
||||||
|
Security/ # Auth and voter classes
|
||||||
|
Voter/ # Authorization voters
|
||||||
|
DataFixtures/ # Test data loaders
|
||||||
|
|
||||||
|
config/
|
||||||
|
packages/ # Symfony bundle configurations
|
||||||
|
routes/ # Route definitions
|
||||||
|
services.yaml # Service container configuration
|
||||||
|
routes.yaml # Main route entry point
|
||||||
|
|
||||||
|
templates/
|
||||||
|
backoffice/ # Admin UI templates
|
||||||
|
quiz/ # Public quiz UI templates
|
||||||
|
base.html.twig # Main layout
|
||||||
|
|
||||||
|
tests/
|
||||||
|
Command/ # Command tests
|
||||||
|
Controller/ # Controller/integration tests
|
||||||
|
Repository/ # Repository tests
|
||||||
|
Security/ # Auth tests
|
||||||
|
Helpers/ # Utility tests
|
||||||
|
bootstrap.php # PHPUnit bootstrap with test container setup
|
||||||
|
```
|
||||||
|
|
||||||
|
## Core Domain Entities
|
||||||
|
|
||||||
|
- **Season**: Groups quizzes and candidates for a specific period, with a linked `SeasonSettings`.
|
||||||
|
- **Quiz**: A test within a season containing multiple `Question`s, each with multiple `Answer`s.
|
||||||
|
- **Candidate**: A participant in the season.
|
||||||
|
- **QuizCandidate**: Represents a candidate's attempt at a specific quiz (tracks start/end time).
|
||||||
|
- **GivenAnswer**: The specific answer a candidate selected during a quiz.
|
||||||
|
- **Elimination**: Records red/green screens and forced results with joker adjustments.
|
||||||
|
- **User**: Administrative accounts for managing the system.
|
||||||
|
|
||||||
|
## Architecture Notes
|
||||||
|
|
||||||
|
### Routing
|
||||||
|
- Routes are **attribute-based** (PHP 8 attributes in controller methods)
|
||||||
|
- Configured in `config/routes/attributes.yaml` for automatic discovery
|
||||||
|
- Main entry point: `config/routes.yaml`
|
||||||
|
|
||||||
|
### Service Container & Dependency Injection
|
||||||
|
- Services in `src/` are automatically registered via PSR-4 namespace `Tvdt\`
|
||||||
|
- Exclusions: Entity, DependencyInjection, Kernel classes
|
||||||
|
- Autowiring and autoconfiguration enabled by default
|
||||||
|
- Service definitions in `config/services.yaml`
|
||||||
|
|
||||||
|
### Database & Migrations
|
||||||
|
- PostgreSQL-based with Doctrine ORM
|
||||||
|
- Migrations in `migrations/` at project root, namespace `DoctrineMigrations` (intentionally not autoloaded); generate with `bin/console make:migration`
|
||||||
|
- Test fixtures in `src/DataFixtures/` (loaded with `--group=test`)
|
||||||
|
- Test database configured separately via `.env.test`
|
||||||
|
|
||||||
|
### Testing Infrastructure
|
||||||
|
- **PHPUnit 13** with DAMA Doctrine Test Bundle for transaction rollback
|
||||||
|
- Bootstrap: `tests/bootstrap.php` loads env vars and autoloader; `tests/symfony-container.php` boots the test kernel/container (used by Rector)
|
||||||
|
- Symfony test utilities (BrowserKit, CSS selectors) available
|
||||||
|
- Coverage excluded from: `src/DataFixtures/`
|
||||||
|
- Test environment: `APP_ENV=test` (set in phpunit.dist.xml)
|
||||||
|
|
||||||
|
### Code Style & Standards
|
||||||
|
- **PHP-CS-Fixer**: Symfony ruleset + risky rules enabled
|
||||||
|
- Strict types declaration required
|
||||||
|
- Trailing commas in multiline structures
|
||||||
|
- No else-only blocks
|
||||||
|
- **Rector**: Aggressive modernization with all attribute sets + prepared sets (dead code, code quality, Doctrine, Symfony, PHPUnit)
|
||||||
|
- **PHPStan**: Level 8 with extensions for Doctrine and Symfony
|
||||||
|
- **Twig-CS-Fixer**: Template style enforcement
|
||||||
|
- **Safe functions**: Use `thecodingmachine/safe` wrappers for standard PHP functions that return `false` on failure — they throw exceptions instead
|
||||||
|
|
||||||
|
### Environment Configuration
|
||||||
|
- `.env` - Local development defaults (uncommitted in .env.local)
|
||||||
|
- `.env.dev` - Development overrides
|
||||||
|
- `.env.test` - Test environment configuration
|
||||||
|
- Production uses `composer dump-env prod` for compiled configuration
|
||||||
|
- Key variables:
|
||||||
|
- `APP_ENV` - Environment (dev/test/prod)
|
||||||
|
- `DATABASE_URL` - PostgreSQL connection string
|
||||||
|
- `MAILER_SENDER` - From address for emails
|
||||||
|
|
||||||
|
### Frontend Build
|
||||||
|
- Asset mapper (no Node.js/Webpack) for JS/CSS bundling; JS modules declared in `importmap.php`
|
||||||
|
- **Stimulus** controllers in `assets/controllers/`, **Turbo** for SPA-like navigation
|
||||||
|
- Sass sources in `assets/styles/`, compiled via `bin/console sass:build`
|
||||||
|
- Production: Assets precompiled during Docker build
|
||||||
|
- Development: Watch mode enabled in FrankenPHP container
|
||||||
|
|
||||||
|
## CI/CD Pipeline
|
||||||
|
|
||||||
|
GitHub Actions workflow (`.github/workflows/ci.yml`):
|
||||||
|
|
||||||
|
1. **Linting**: Dockerfile (hadolint), Twig templates
|
||||||
|
2. **Code Quality**:
|
||||||
|
- PHP-CS-Fixer style check
|
||||||
|
- Twig-CS-Fixer style check
|
||||||
|
- PHPStan static analysis
|
||||||
|
- Rector dry-run
|
||||||
|
3. **Integration Tests**:
|
||||||
|
- Docker image build and start services
|
||||||
|
- Database creation and migration
|
||||||
|
- Fixture loading
|
||||||
|
- Full PHPUnit test suite with JUnit XML output
|
||||||
|
- Doctrine schema validation
|
||||||
|
4. **Build & Deploy** (on tags or main, disabled currently):
|
||||||
|
- Docker image push to GitHub Container Registry
|
||||||
|
- Sentry release creation
|
||||||
|
- Portainer webhook trigger for production deployment
|
||||||
|
|
||||||
|
Runs on all pushes to main and pull requests. Concurrency cancels old runs on new commits.
|
||||||
|
|
||||||
|
## Important Files & Conventions
|
||||||
|
|
||||||
|
- **Kernel**: `src/Kernel.php` - Symfony kernel class
|
||||||
|
- **AbstractController**: Base class for all controllers — defines route parameter regexes (`SEASON_CODE_REGEX`, `CANDIDATE_HASH_REGEX`) and flash helpers
|
||||||
|
- **Flash Messages**: Use `FlashType` enum instead of string literals
|
||||||
|
- **QuizSpreadsheetService**: Handles importing quizzes from XLSX files
|
||||||
|
- **Rector container**: `tests/symfony-container.php` — boots a test kernel so Rector can resolve Symfony service types
|
||||||
|
- **.gitignore**: Excludes var/, vendor/, .env.local, .phpunit.cache
|
||||||
|
- **Dockerfile**: Multi-stage build with dev/prod separation, FrankenPHP-based
|
||||||
|
- **Docker Compose**: PHP service with Caddy, PostgreSQL database, persistent volumes
|
||||||
|
|
||||||
|
## Security & Authorization
|
||||||
|
|
||||||
|
- Doctrine extensions enabled (timestamps, slugs, etc.)
|
||||||
|
- Voter-based authorization in `src/Security/Voter/`
|
||||||
|
- User entity with security encoding configured
|
||||||
|
- CSRF protection enabled
|
||||||
|
- Email verification available via SymfonyCasts bundle
|
||||||
|
|
||||||
|
## Composer Scripts
|
||||||
|
|
||||||
|
Auto-executed scripts on install/update:
|
||||||
|
- `cache:clear` - Symfony cache clear
|
||||||
|
- `assets:install` - Copy public assets
|
||||||
|
- `importmap:install` - JS import map setup
|
||||||
|
|
||||||
|
## Writing Style (Help Content & UI Text)
|
||||||
|
|
||||||
|
When writing Dutch help content in `templates/backoffice/help/nl/`:
|
||||||
|
|
||||||
|
- **No em-dashes** (—): use a comma or restructure the sentence instead.
|
||||||
|
- **No semicolons** (;): use a comma. Semicolons are technically correct but read as AI-generated text.
|
||||||
|
- **Natural Dutch**: write the way a person would explain it to a colleague, not in formal documentation style.
|
||||||
|
- **Colons after bold labels** (e.g. `<strong>Label:</strong> description`) are fine and intentional.
|
||||||
|
|
||||||
|
## Notes for Future Work
|
||||||
|
|
||||||
|
- The backoffice elimination logic is in `Controller/Backoffice/PrepareEliminationController.php`
|
||||||
|
- Quiz timing logic starts on candidate start click and stops on final answer selection
|
||||||
|
- Background music feature noted but not yet implemented (requirements only)
|
||||||
|
- Statistics functionality is marked TBD in README
|
||||||
+8
-10
@@ -1,7 +1,7 @@
|
|||||||
#syntax=docker/dockerfile:1
|
#syntax=docker/dockerfile:1
|
||||||
|
|
||||||
# Versions
|
# Versions
|
||||||
FROM dunglas/frankenphp:1-php8.4 AS frankenphp_upstream
|
FROM dunglas/frankenphp:1-php8.5 AS frankenphp_upstream
|
||||||
|
|
||||||
# The different stages of this Dockerfile are meant to be built into separate images
|
# The different stages of this Dockerfile are meant to be built into separate images
|
||||||
# https://docs.docker.com/develop/develop-images/multistage-build/#stop-at-a-specific-build-stage
|
# https://docs.docker.com/develop/develop-images/multistage-build/#stop-at-a-specific-build-stage
|
||||||
@@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||||||
file \
|
file \
|
||||||
gettext \
|
gettext \
|
||||||
git \
|
git \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
RUN set -eux; \
|
RUN set -eux; \
|
||||||
install-php-extensions \
|
install-php-extensions \
|
||||||
@@ -62,8 +62,8 @@ ENV APP_ENV=dev XDEBUG_MODE=off
|
|||||||
|
|
||||||
# hadolint ignore=DL3008
|
# hadolint ignore=DL3008
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
bash-completion \
|
bash-completion \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
COPY --link frankenphp/console-complete.bash /usr/share/bash-completion/completions/console
|
COPY --link frankenphp/console-complete.bash /usr/share/bash-completion/completions/console
|
||||||
COPY --link frankenphp/composer-complete.bash /usr/share/bash-completion/completions/composer
|
COPY --link frankenphp/composer-complete.bash /usr/share/bash-completion/completions/composer
|
||||||
@@ -72,7 +72,7 @@ RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
|
|||||||
|
|
||||||
RUN set -eux; \
|
RUN set -eux; \
|
||||||
install-php-extensions \
|
install-php-extensions \
|
||||||
xdebug \
|
xdebug/xdebug@3.5.0 \
|
||||||
;
|
;
|
||||||
|
|
||||||
COPY --link frankenphp/conf.d/20-app.dev.ini $PHP_INI_DIR/app.conf.d/
|
COPY --link frankenphp/conf.d/20-app.dev.ini $PHP_INI_DIR/app.conf.d/
|
||||||
@@ -87,12 +87,10 @@ FROM frankenphp_base AS frankenphp_prod
|
|||||||
RUN rm -rf /var/lib/apt/lists/*
|
RUN rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
ENV APP_ENV=prod
|
ENV APP_ENV=prod
|
||||||
ENV FRANKENPHP_CONFIG="import worker.Caddyfile"
|
|
||||||
|
|
||||||
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
|
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
|
||||||
|
|
||||||
COPY --link frankenphp/conf.d/20-app.prod.ini $PHP_INI_DIR/app.conf.d/
|
COPY --link frankenphp/conf.d/20-app.prod.ini $PHP_INI_DIR/app.conf.d/
|
||||||
COPY --link frankenphp/worker.Caddyfile /etc/caddy/worker.Caddyfile
|
|
||||||
|
|
||||||
# prevent the reinstallation of vendors at every changes in the source code
|
# prevent the reinstallation of vendors at every changes in the source code
|
||||||
COPY --link composer.* symfony.* ./
|
COPY --link composer.* symfony.* ./
|
||||||
@@ -109,6 +107,6 @@ RUN set -eux; \
|
|||||||
composer dump-env prod; \
|
composer dump-env prod; \
|
||||||
composer run-script --no-dev post-install-cmd; \
|
composer run-script --no-dev post-install-cmd; \
|
||||||
chmod +x bin/console; \
|
chmod +x bin/console; \
|
||||||
bin/console sass:build; \
|
bin/console sass:build; \
|
||||||
bin/console asset-map:compile --no-debug --quiet --no-ansi; \
|
bin/console asset-map:compile --no-debug --quiet --no-ansi; \
|
||||||
sync;
|
sync;
|
||||||
|
|||||||
@@ -14,16 +14,18 @@ exec *args:
|
|||||||
shell:
|
shell:
|
||||||
@docker compose exec php bash
|
@docker compose exec php bash
|
||||||
|
|
||||||
bash: shell
|
[no-exit-message]
|
||||||
|
shell-run:
|
||||||
|
@docker compose run --rm php bash
|
||||||
|
|
||||||
migrate: up
|
migrate: up
|
||||||
docker compose run --rm php bin/console doctrine:migrations:migrate --no-interaction
|
docker compose run --rm php bin/console doctrine:migrations:migrate --no-interaction
|
||||||
|
|
||||||
fixtures:
|
fixtures:
|
||||||
docker compose exec php bin/console doctrine:fixtures:load --purge-with-truncate --no-interaction
|
docker compose exec php bin/console doctrine:fixtures:load --purge-with-truncate --no-interaction --group=dev
|
||||||
|
|
||||||
translations:
|
translations:
|
||||||
docker compose exec php bin/console translation:extract --force --format=xliff --sort=asc --clean nl
|
docker compose exec php bin/console translation:extract --force --format=xliff --sort=asc nl
|
||||||
|
|
||||||
fix-cs:
|
fix-cs:
|
||||||
docker compose exec php vendor/bin/php-cs-fixer fix
|
docker compose exec php vendor/bin/php-cs-fixer fix
|
||||||
@@ -35,7 +37,27 @@ rector *args:
|
|||||||
phpstan *args:
|
phpstan *args:
|
||||||
docker compose exec php vendor/bin/phpstan analyse {{ args }}
|
docker compose exec php vendor/bin/phpstan analyse {{ args }}
|
||||||
|
|
||||||
|
test *args:
|
||||||
|
docker compose exec php vendor/bin/phpunit {{ args }}
|
||||||
|
|
||||||
[confirm]
|
[confirm]
|
||||||
clean:
|
clean:
|
||||||
docker compose down -v --remove-orphans
|
docker compose down -v --remove-orphans
|
||||||
rm -rf vendor var assets/vendor public/assets public/bundles .php-cs-fixer.cache .twig-cs-fixer.cache
|
rm -rf vendor var assets/vendor public/assets public/bundles .php-cs-fixer.cache .twig-cs-fixer.cache
|
||||||
|
|
||||||
|
reload-tests:
|
||||||
|
@docker compose exec php bin/console --env=test doctrine:database:drop --if-exists --force
|
||||||
|
@docker compose exec php bin/console --env=test doctrine:database:create
|
||||||
|
@docker compose exec php bin/console --env=test doctrine:migrations:migrate -n
|
||||||
|
@docker compose exec php bin/console --env=test doctrine:fixtures:load -n --group=test
|
||||||
|
|
||||||
|
install-hooks:
|
||||||
|
git config core.hooksPath .githooks
|
||||||
|
chmod +x .githooks/pre-commit
|
||||||
|
@echo "Pre-commit hook installed."
|
||||||
|
|
||||||
|
trust-cert:
|
||||||
|
sudo security add-trusted-cer -d \
|
||||||
|
-r trustRoot \
|
||||||
|
-k "$HOME/Library/Keychains/login.keychain" \
|
||||||
|
./frankenphp/data/caddy/pki/authorities/local/root.crt
|
||||||
|
|||||||
@@ -0,0 +1,661 @@
|
|||||||
|
GNU AFFERO GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 19 November 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU Affero General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works, specifically designed to ensure
|
||||||
|
cooperation with the community in the case of network server software.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
our General Public Licenses are intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
Developers that use our General Public Licenses protect your rights
|
||||||
|
with two steps: (1) assert copyright on the software, and (2) offer
|
||||||
|
you this License which gives you legal permission to copy, distribute
|
||||||
|
and/or modify the software.
|
||||||
|
|
||||||
|
A secondary benefit of defending all users' freedom is that
|
||||||
|
improvements made in alternate versions of the program, if they
|
||||||
|
receive widespread use, become available for other developers to
|
||||||
|
incorporate. Many developers of free software are heartened and
|
||||||
|
encouraged by the resulting cooperation. However, in the case of
|
||||||
|
software used on network servers, this result may fail to come about.
|
||||||
|
The GNU General Public License permits making a modified version and
|
||||||
|
letting the public access it on a server without ever releasing its
|
||||||
|
source code to the public.
|
||||||
|
|
||||||
|
The GNU Affero General Public License is designed specifically to
|
||||||
|
ensure that, in such cases, the modified source code becomes available
|
||||||
|
to the community. It requires the operator of a network server to
|
||||||
|
provide the source code of the modified version running there to the
|
||||||
|
users of that server. Therefore, public use of a modified version, on
|
||||||
|
a publicly accessible server, gives the public access to the source
|
||||||
|
code of the modified version.
|
||||||
|
|
||||||
|
An older license, called the Affero General Public License and
|
||||||
|
published by Affero, was designed to accomplish similar goals. This is
|
||||||
|
a different license, not a version of the Affero GPL, but Affero has
|
||||||
|
released a new version of the Affero GPL which permits relicensing under
|
||||||
|
this license.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU Affero General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Remote Network Interaction; Use with the GNU General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, if you modify the
|
||||||
|
Program, your modified version must prominently offer all users
|
||||||
|
interacting with it remotely through a computer network (if your version
|
||||||
|
supports such interaction) an opportunity to receive the Corresponding
|
||||||
|
Source of your version by providing access to the Corresponding Source
|
||||||
|
from a network server at no charge, through some standard or customary
|
||||||
|
means of facilitating copying of software. This Corresponding Source
|
||||||
|
shall include the Corresponding Source for any work covered by version 3
|
||||||
|
of the GNU General Public License that is incorporated pursuant to the
|
||||||
|
following paragraph.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the work with which it is combined will remain governed by version
|
||||||
|
3 of the GNU General Public License.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU Affero General Public License from time to time. Such new versions
|
||||||
|
will be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU Affero General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU Affero General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU Affero General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as published
|
||||||
|
by the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If your software can interact with users remotely through a computer
|
||||||
|
network, you should also make sure that it provides a way for users to
|
||||||
|
get its source. For example, if your program is a web application, its
|
||||||
|
interface could display a "Source" link that leads users to an archive
|
||||||
|
of the code. There are many ways you could offer source, and different
|
||||||
|
solutions will be better for different programs; see section 13 for the
|
||||||
|
specific requirements.
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU AGPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
.DEFAULT_GOAL := help
|
|
||||||
|
|
||||||
.PHONY: up
|
|
||||||
up: ## Start application
|
|
||||||
@docker compose up -d
|
|
||||||
|
|
||||||
stop: ## Stop application
|
|
||||||
@docker compose stop
|
|
||||||
|
|
||||||
.PHONY: shell
|
|
||||||
shell: ## Start a shell inside the container
|
|
||||||
@docker compose exec php bash
|
|
||||||
|
|
||||||
.PHONY: help
|
|
||||||
help:
|
|
||||||
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-10s\033[0m %s\n", $$1, $$2}'
|
|
||||||
@@ -1,39 +1,162 @@
|
|||||||
# Tijd voor de test
|
# Tijd voor de test
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
PHP/Symfony application for WIDM-style quiz management.
|
||||||
|
Built with FrankenPHP, PostgreSQL, and Docker.
|
||||||
|
|
||||||
|
> **Disclaimer:** This is an unofficial, non-commercial, open-source fan
|
||||||
|
> project. It is not affiliated with, endorsed by, or associated with
|
||||||
|
> *Wie is de Mol?* (produced by IDTV, broadcast by AVROTROS/NPO) or
|
||||||
|
> *De Mol* (produced by Woestijnvis, broadcast by Play/De Vijver Media).
|
||||||
|
> *Wie is de Mol?* and *De Mol* are trademarks of their respective rights
|
||||||
|
> holders. No copyright infringement is intended.
|
||||||
|
|
||||||
## Requirements
|
## Requirements
|
||||||
|
|
||||||
### Maken van de test
|
- Docker
|
||||||
|
- [Just](https://just.systems) (`brew install just`)
|
||||||
|
|
||||||
- WIDM-tests met een variabel aantal vragen.
|
## Local development
|
||||||
- Vragen in een vaste volgorde zijn samen één test (een vraag kan niet bij
|
|
||||||
meerdere tests horen).
|
|
||||||
- Vragen hebben 2 of meer antwoordmogelijkheden. Slechts één antwoord is correct.
|
|
||||||
- Meerdere test samen vormen een seizoen.
|
|
||||||
- Een seizoen heeft één of geen actieve tests, als er een test actief is kan
|
|
||||||
uitsluitend die test gemaakt worden.
|
|
||||||
- Kandidaten kunnen een test maximaal 1 keer invullen.
|
|
||||||
- Vanaf het moment dat de kandidaat op start klikt na het intypen van hun naam
|
|
||||||
gaat de tijd lopen. Deze stopt na het aanklikken van een antwoord op de laatste
|
|
||||||
vraag van de test.
|
|
||||||
- Achtergrondmuziek
|
|
||||||
|
|
||||||
### Schermen kijken
|
```bash
|
||||||
|
just up # Start PHP + PostgreSQL containers
|
||||||
|
just migrate # Run pending database migrations
|
||||||
|
just fixtures # Load dev fixtures (truncates first)
|
||||||
|
```
|
||||||
|
|
||||||
- Nadat een speler een test heeft gemaakt (of vooraf als de namen vooraf
|
The app is available at **https://localhost** (self-signed cert — run
|
||||||
ingevoerd zijn) kunnen jokers toegekend worden aan de test van kandidaat. Een
|
`just trust-cert` on macOS to trust it).
|
||||||
positief getal om antwoorden goed te rekenen, een negatief getal om
|
|
||||||
antwoorden fout te rekenen.
|
|
||||||
- Vooraf kan gekozen worden hoe veel afvallers er zijn.
|
|
||||||
- Bij het kijken naam rode en groene schermen wordt een naam ingevoerd. Er
|
|
||||||
wordt een rood of groen scherm getoond.
|
|
||||||
- Spelers kunnen geforceerd op groen of rood gezet worden, deze worden dan niet
|
|
||||||
meegenomen in de berekening van de slechtste speler.
|
|
||||||
|
|
||||||
### Statistieken
|
### Useful commands
|
||||||
|
|
||||||
TBD
|
```bash
|
||||||
|
just shell # Shell inside the running PHP container
|
||||||
|
just shell-run # Shell in a fresh one-off container
|
||||||
|
just stop # Stop containers (keep volumes)
|
||||||
|
just down # Stop and remove containers
|
||||||
|
just clean # Nuclear: remove containers + volumes + generated files
|
||||||
|
just exec <cmd> # Run any command inside the PHP container
|
||||||
|
```
|
||||||
|
|
||||||
## Nice to haves
|
### Environment
|
||||||
|
|
||||||
- Optie voor antwoord geven in twee klikken (selecteren en volgende).
|
Copy `.env` and override locally via `.env.local` (not committed):
|
||||||
|
|
||||||
|
| Variable | Description |
|
||||||
|
|----------------|-------------------------------------|
|
||||||
|
| `APP_SECRET` | Symfony app secret |
|
||||||
|
| `DATABASE_URL` | PostgreSQL DSN (auto-set in Docker) |
|
||||||
|
| `SENTRY_DSN` | Sentry error tracking |
|
||||||
|
| `DEFAULT_URI` | Base URL for CLI-generated links |
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
|
||||||
|
```bash
|
||||||
|
just test # Full PHPUnit suite
|
||||||
|
just test tests/Path/To/TestFile.php # Single file
|
||||||
|
just test --coverage-html var/coverage # HTML coverage report
|
||||||
|
just reload-tests # Drop/recreate test DB + migrate + test fixtures
|
||||||
|
```
|
||||||
|
|
||||||
|
Tests use a separate database configured via `.env.test`. The DAMA
|
||||||
|
Doctrine bundle wraps each test in a transaction that is rolled back after.
|
||||||
|
`just reload-tests` loads the `--group=test` fixtures; `just fixtures`
|
||||||
|
loads the dev group and is unrelated to the test database.
|
||||||
|
|
||||||
|
## Code quality
|
||||||
|
|
||||||
|
All checks run in CI and must pass before merging.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
just fix-cs # Auto-fix PHP-CS-Fixer + Twig-CS-Fixer
|
||||||
|
just phpstan # PHPStan static analysis (level 8)
|
||||||
|
just rector # Apply Rector modernizations
|
||||||
|
just rector --dry-run # Preview Rector changes without applying
|
||||||
|
```
|
||||||
|
|
||||||
|
## Database
|
||||||
|
|
||||||
|
```bash
|
||||||
|
just migrate # Run pending migrations
|
||||||
|
just fixtures # Load dev fixtures
|
||||||
|
bin/console make:migration # Generate a new migration (inside container)
|
||||||
|
```
|
||||||
|
|
||||||
|
Migrations live in `migrations/` (namespace `DoctrineMigrations`). Test
|
||||||
|
fixtures are in `src/DataFixtures/` loaded with `--group=test`.
|
||||||
|
|
||||||
|
## Translations
|
||||||
|
|
||||||
|
```bash
|
||||||
|
just translations # Extract/update nl translation strings into translations/
|
||||||
|
```
|
||||||
|
|
||||||
|
## Contributing
|
||||||
|
|
||||||
|
1. Create a branch from `main` — use a prefix like `feat/`, `fix/`,
|
||||||
|
or `docs/`.
|
||||||
|
2. Open a pull request; CI must pass before merging.
|
||||||
|
3. Install the pre-commit hook (see below) to catch issues before pushing.
|
||||||
|
|
||||||
|
### Pre-commit hook
|
||||||
|
|
||||||
|
A pre-commit hook lives in `.githooks/pre-commit`. Install it once after cloning:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
just install-hooks
|
||||||
|
```
|
||||||
|
|
||||||
|
On every commit it runs automatically, **only on staged files**:
|
||||||
|
|
||||||
|
| Staged file type | Tools run |
|
||||||
|
|-------------------------|------------------------------------------------------------------------------|
|
||||||
|
| `.php` | Rector → PHP-CS-Fixer (auto-fix + re-stage), then PHPStan (blocks on errors) |
|
||||||
|
| `.twig` | Twig-CS-Fixer (auto-fix + re-stage) |
|
||||||
|
| Other (docs, config, …) | Nothing — commit proceeds immediately |
|
||||||
|
|
||||||
|
If the PHP container is not running, the hook falls back to
|
||||||
|
`docker compose run --rm` so checks still execute. PHPUnit is not
|
||||||
|
run in the hook; CI covers that.
|
||||||
|
|
||||||
|
## Deployment
|
||||||
|
|
||||||
|
Docker images are published to `ghcr.io/marijndoeve/tijdvoordetest`
|
||||||
|
for each tagged release.
|
||||||
|
|
||||||
|
### First-time setup
|
||||||
|
|
||||||
|
1. Copy `compose.yaml` and `compose.prod.yaml` to your server.
|
||||||
|
2. Create a `.env.prod.local` file with the required variables (see below).
|
||||||
|
3. Start the stack — migrations run automatically on container start:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
IMAGE_TAG=latest docker compose -f compose.yaml -f compose.prod.yaml up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
### Updating to a new version
|
||||||
|
|
||||||
|
```bash
|
||||||
|
IMAGE_TAG=<tag> docker compose -f compose.yaml -f compose.prod.yaml pull
|
||||||
|
IMAGE_TAG=<tag> docker compose -f compose.yaml -f compose.prod.yaml up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
### Required environment variables
|
||||||
|
|
||||||
|
| Variable | Description |
|
||||||
|
|----------------------------|---------------------------------------------|
|
||||||
|
| `IMAGE_TAG` | Image tag to run (e.g. `1.2.3` or `latest`) |
|
||||||
|
| `APP_SECRET` | Random secret string for Symfony |
|
||||||
|
| `CADDY_MERCURE_JWT_SECRET` | JWT secret for the Mercure hub |
|
||||||
|
| `POSTGRES_PASSWORD` | PostgreSQL password |
|
||||||
|
| `MAILER_DSN` | Mailer transport DSN |
|
||||||
|
| `MAILER_SENDER` | From address for emails |
|
||||||
|
| `SENTRY_DSN` | Sentry project DSN (optional) |
|
||||||
|
|
||||||
|
The `compose.prod.yaml` configures Traefik labels for TLS termination at
|
||||||
|
`tijdvoordetest.nl`. Adjust the `traefik` labels in that file if you're
|
||||||
|
hosting on a different domain or using a different reverse proxy.
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
[MIT](LICENSE)
|
||||||
|
|||||||
+36
-4
@@ -1,5 +1,37 @@
|
|||||||
import * as bootstrap from 'bootstrap'
|
import 'bootstrap/dist/css/bootstrap.min.css';
|
||||||
import './bootstrap.js';
|
import 'bootstrap-icons/font/bootstrap-icons.min.css';
|
||||||
import 'bootstrap/dist/css/bootstrap.min.css'
|
|
||||||
|
|
||||||
import './styles/backoffice.scss';
|
import './styles/backoffice.scss';
|
||||||
|
import './stimulus.js';
|
||||||
|
import './bootstrap.js';
|
||||||
|
import * as Sentry from '@sentry/browser';
|
||||||
|
|
||||||
|
const dsn = document.querySelector('meta[name="sentry-dsn"]')?.content ?? '';
|
||||||
|
const userEmail = document.querySelector('meta[name="user-email"]')?.content ?? '';
|
||||||
|
|
||||||
|
// When no real DSN is configured, route to the local Spotlight sidecar so
|
||||||
|
// nothing reaches Sentry. A syntactically valid DSN is still required for the
|
||||||
|
// SDK to initialise; the tunnel option redirects all transport to Spotlight.
|
||||||
|
const useSpotlight = !dsn;
|
||||||
|
const effectiveDsn = dsn || 'https://0@o0.ingest.sentry.io/0';
|
||||||
|
|
||||||
|
const feedbackIntegration = Sentry.feedbackIntegration({
|
||||||
|
colorScheme: 'system',
|
||||||
|
showName: true,
|
||||||
|
showEmail: true,
|
||||||
|
isNameRequired: false,
|
||||||
|
isEmailRequired: false,
|
||||||
|
autoInject: false,
|
||||||
|
});
|
||||||
|
|
||||||
|
Sentry.init({
|
||||||
|
dsn: effectiveDsn,
|
||||||
|
tunnel: useSpotlight ? 'http://localhost:8969/stream' : undefined,
|
||||||
|
integrations: [feedbackIntegration],
|
||||||
|
});
|
||||||
|
|
||||||
|
// autoInject is unreliable in Sentry v10 due to the setupOnce guard; mount manually.
|
||||||
|
feedbackIntegration.createWidget();
|
||||||
|
|
||||||
|
if (userEmail) {
|
||||||
|
Sentry.setUser({ email: userEmail });
|
||||||
|
}
|
||||||
|
|||||||
Vendored
+1
-5
@@ -1,5 +1 @@
|
|||||||
import { startStimulusApp } from '@symfony/stimulus-bundle';
|
import * as bootstrap from 'bootstrap'
|
||||||
|
|
||||||
const app = startStimulusApp();
|
|
||||||
// register any custom, 3rd party controllers here
|
|
||||||
// app.register('some_controller_name', SomeImportedController);
|
|
||||||
|
|||||||
@@ -3,7 +3,10 @@
|
|||||||
"@symfony/ux-turbo": {
|
"@symfony/ux-turbo": {
|
||||||
"turbo-core": {
|
"turbo-core": {
|
||||||
"enabled": false,
|
"enabled": false,
|
||||||
"fetch": "eager"
|
"fetch": "eager",
|
||||||
|
"autoimport": {
|
||||||
|
"@symfony/ux-turbo/dist/mercure_stream_source_element.js": true
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"mercure-turbo-stream": {
|
"mercure-turbo-stream": {
|
||||||
"enabled": false,
|
"enabled": false,
|
||||||
|
|||||||
@@ -0,0 +1,104 @@
|
|||||||
|
import {Controller} from '@hotwired/stimulus';
|
||||||
|
|
||||||
|
export default class extends Controller {
|
||||||
|
static targets = ['collection'];
|
||||||
|
static values = {prototype: String};
|
||||||
|
|
||||||
|
connect() {
|
||||||
|
this.index = this.collectionTarget.children.length;
|
||||||
|
this._setupDrag();
|
||||||
|
this._syncOrdering();
|
||||||
|
}
|
||||||
|
|
||||||
|
addItem() {
|
||||||
|
const item = document.createElement('div');
|
||||||
|
item.innerHTML = this.prototypeValue.replace(/__name__/g, this.index);
|
||||||
|
const el = item.firstElementChild;
|
||||||
|
this.collectionTarget.appendChild(el);
|
||||||
|
this._makeDraggable(el);
|
||||||
|
this.index++;
|
||||||
|
this._syncOrdering();
|
||||||
|
}
|
||||||
|
|
||||||
|
removeItem(event) {
|
||||||
|
event.target.closest('[data-collection-item]').remove();
|
||||||
|
}
|
||||||
|
|
||||||
|
sortAlphabetically() {
|
||||||
|
const items = [...this.collectionTarget.children];
|
||||||
|
items.sort((a, b) => {
|
||||||
|
const textA = (a.querySelector('input[type="text"]')?.value ?? '').toLowerCase();
|
||||||
|
const textB = (b.querySelector('input[type="text"]')?.value ?? '').toLowerCase();
|
||||||
|
return textA.localeCompare(textB);
|
||||||
|
});
|
||||||
|
items.forEach(item => this.collectionTarget.appendChild(item));
|
||||||
|
this._syncOrdering();
|
||||||
|
}
|
||||||
|
|
||||||
|
randomize() {
|
||||||
|
const items = [...this.collectionTarget.children];
|
||||||
|
for (let i = items.length - 1; i > 0; i--) {
|
||||||
|
const j = Math.floor(Math.random() * (i + 1));
|
||||||
|
[items[i], items[j]] = [items[j], items[i]];
|
||||||
|
}
|
||||||
|
items.forEach(item => this.collectionTarget.appendChild(item));
|
||||||
|
this._syncOrdering();
|
||||||
|
}
|
||||||
|
|
||||||
|
// — drag-and-drop —
|
||||||
|
|
||||||
|
_setupDrag() {
|
||||||
|
[...this.collectionTarget.children].forEach(el => this._makeDraggable(el));
|
||||||
|
}
|
||||||
|
|
||||||
|
_makeDraggable(el) {
|
||||||
|
const handle = el.querySelector('[data-drag-handle]');
|
||||||
|
if (!handle) return;
|
||||||
|
|
||||||
|
handle.setAttribute('draggable', 'true');
|
||||||
|
|
||||||
|
handle.addEventListener('dragstart', (e) => {
|
||||||
|
this._dragging = el;
|
||||||
|
el.classList.add('opacity-50');
|
||||||
|
e.dataTransfer.effectAllowed = 'move';
|
||||||
|
});
|
||||||
|
|
||||||
|
handle.addEventListener('dragend', () => {
|
||||||
|
this._dragging = null;
|
||||||
|
el.classList.remove('opacity-50');
|
||||||
|
this.collectionTarget.querySelectorAll('[data-collection-item]').forEach(i => i.classList.remove('border-top', 'border-bottom', 'border-primary'));
|
||||||
|
});
|
||||||
|
|
||||||
|
el.addEventListener('dragover', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
if (!this._dragging || this._dragging === el) return;
|
||||||
|
e.dataTransfer.dropEffect = 'move';
|
||||||
|
const rect = el.getBoundingClientRect();
|
||||||
|
const isBottom = e.clientY > rect.top + rect.height / 2;
|
||||||
|
el.classList.toggle('border-top', !isBottom);
|
||||||
|
el.classList.toggle('border-bottom', isBottom);
|
||||||
|
el.classList.add('border-primary');
|
||||||
|
});
|
||||||
|
|
||||||
|
el.addEventListener('dragleave', () => {
|
||||||
|
el.classList.remove('border-top', 'border-bottom', 'border-primary');
|
||||||
|
});
|
||||||
|
|
||||||
|
el.addEventListener('drop', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
el.classList.remove('border-top', 'border-bottom', 'border-primary');
|
||||||
|
if (!this._dragging || this._dragging === el) return;
|
||||||
|
const rect = el.getBoundingClientRect();
|
||||||
|
const isBottom = e.clientY > rect.top + rect.height / 2;
|
||||||
|
this.collectionTarget.insertBefore(this._dragging, isBottom ? el.nextSibling : el);
|
||||||
|
this._syncOrdering();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
_syncOrdering() {
|
||||||
|
[...this.collectionTarget.children].forEach((el, i) => {
|
||||||
|
const input = el.querySelector('input[name*="[ordering]"]');
|
||||||
|
if (input) input.value = i;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,17 +1,28 @@
|
|||||||
import {Controller} from '@hotwired/stimulus';
|
import {Controller} from '@hotwired/stimulus';
|
||||||
import * as bootstrap from 'bootstrap'
|
import {Tooltip, Modal} from 'bootstrap';
|
||||||
|
|
||||||
export default class extends Controller {
|
export default class extends Controller {
|
||||||
|
static targets = ['clearModal', 'deleteModal'];
|
||||||
|
|
||||||
connect() {
|
connect() {
|
||||||
const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]')
|
this.tooltips = [];
|
||||||
const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl))
|
const tooltipTriggerList = this.element.querySelectorAll('[data-bs-toggle="tooltip"]');
|
||||||
|
[...tooltipTriggerList].forEach(tooltipTriggerEl => {
|
||||||
|
this.tooltips.push(Tooltip.getOrCreateInstance(tooltipTriggerEl));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
disconnect() {
|
||||||
|
this.tooltips.forEach(tooltip => tooltip.dispose());
|
||||||
}
|
}
|
||||||
|
|
||||||
clearQuiz() {
|
clearQuiz() {
|
||||||
new bootstrap.Modal('#clearQuizModal').show();
|
const modal = Modal.getOrCreateInstance(this.clearModalTarget);
|
||||||
|
modal.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
deleteQuiz() {
|
deleteQuiz() {
|
||||||
new bootstrap.Modal('#deleteQuizModal').show();
|
const modal = Modal.getOrCreateInstance(this.deleteModalTarget);
|
||||||
|
modal.show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
const nameCheck = /^[-_a-zA-Z0-9]{4,22}$/;
|
const nameCheck = /^[-_a-zA-Z0-9]{4,22}$/;
|
||||||
const tokenCheck = /^[-_\/+a-zA-Z0-9]{24,}$/;
|
const tokenCheck = /^[-_/+a-zA-Z0-9]{24,}$/;
|
||||||
|
|
||||||
// Generate and double-submit a CSRF token in a form field and a cookie, as defined by Symfony's SameOriginCsrfTokenManager
|
// Generate and double-submit a CSRF token in a form field and a cookie, as defined by Symfony's SameOriginCsrfTokenManager
|
||||||
|
// Use `form.requestSubmit()` to ensure that the submit event is triggered. Using `form.submit()` will not trigger the event
|
||||||
|
// and thus this event-listener will not be executed.
|
||||||
document.addEventListener('submit', function (event) {
|
document.addEventListener('submit', function (event) {
|
||||||
generateCsrfToken(event.target);
|
generateCsrfToken(event.target);
|
||||||
}, true);
|
}, true);
|
||||||
@@ -33,8 +35,8 @@ export function generateCsrfToken (formElement) {
|
|||||||
if (!csrfCookie && nameCheck.test(csrfToken)) {
|
if (!csrfCookie && nameCheck.test(csrfToken)) {
|
||||||
csrfField.setAttribute('data-csrf-protection-cookie-value', csrfCookie = csrfToken);
|
csrfField.setAttribute('data-csrf-protection-cookie-value', csrfCookie = csrfToken);
|
||||||
csrfField.defaultValue = csrfToken = btoa(String.fromCharCode.apply(null, (window.crypto || window.msCrypto).getRandomValues(new Uint8Array(18))));
|
csrfField.defaultValue = csrfToken = btoa(String.fromCharCode.apply(null, (window.crypto || window.msCrypto).getRandomValues(new Uint8Array(18))));
|
||||||
csrfField.dispatchEvent(new Event('change', { bubbles: true }));
|
|
||||||
}
|
}
|
||||||
|
csrfField.dispatchEvent(new Event('change', { bubbles: true }));
|
||||||
|
|
||||||
if (csrfCookie && tokenCheck.test(csrfToken)) {
|
if (csrfCookie && tokenCheck.test(csrfToken)) {
|
||||||
const cookie = csrfCookie + '_' + csrfToken + '=' + csrfCookie + '; path=/; samesite=strict';
|
const cookie = csrfCookie + '_' + csrfToken + '=' + csrfCookie + '; path=/; samesite=strict';
|
||||||
|
|||||||
@@ -2,9 +2,13 @@ import {Controller} from '@hotwired/stimulus';
|
|||||||
|
|
||||||
export default class extends Controller {
|
export default class extends Controller {
|
||||||
next() {
|
next() {
|
||||||
const currentUrl = window.location.href;
|
const currentUrl = new URL(window.location.href);
|
||||||
const urlParts = currentUrl.split('/');
|
const pathParts = currentUrl.pathname.split('/');
|
||||||
urlParts.pop();
|
// Remove the last segment
|
||||||
window.location.href = urlParts.join('/');
|
pathParts.pop();
|
||||||
|
// Update the pathname
|
||||||
|
currentUrl.pathname = pathParts.join('/');
|
||||||
|
// Navigate
|
||||||
|
window.location.href = currentUrl.href;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-5
@@ -1,6 +1,4 @@
|
|||||||
|
import 'bootstrap/dist/css/bootstrap.min.css';
|
||||||
|
import './styles/quiz.scss';
|
||||||
|
import './stimulus.js';
|
||||||
import './bootstrap.js';
|
import './bootstrap.js';
|
||||||
import 'bootstrap/dist/css/bootstrap.min.css'
|
|
||||||
import * as bootstrap from 'bootstrap'
|
|
||||||
|
|
||||||
import './styles/app.scss'
|
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
import { startStimulusApp } from '@symfony/stimulus-bundle';
|
||||||
|
|
||||||
|
const app = startStimulusApp();
|
||||||
@@ -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;
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
.col-result-xs { width: 10%; }
|
||||||
|
.col-result-sm { width: 15%; }
|
||||||
|
.col-result-md { width: 20%; }
|
||||||
|
|||||||
@@ -0,0 +1,109 @@
|
|||||||
|
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%;
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
.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;
|
||||||
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/compose-spec/compose-go/master/schema/compose-spec.json
|
||||||
services:
|
services:
|
||||||
php:
|
php:
|
||||||
build:
|
build:
|
||||||
|
|||||||
+10
-1
@@ -1,3 +1,4 @@
|
|||||||
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/compose-spec/compose-go/master/schema/compose-spec.json
|
||||||
# Development environment override
|
# Development environment override
|
||||||
services:
|
services:
|
||||||
php:
|
php:
|
||||||
@@ -6,6 +7,7 @@ services:
|
|||||||
target: frankenphp_dev
|
target: frankenphp_dev
|
||||||
volumes:
|
volumes:
|
||||||
- ./:/app
|
- ./:/app
|
||||||
|
- ~/.composer/cache:/root/.composer/cache
|
||||||
- ./frankenphp/Caddyfile:/etc/caddy/Caddyfile:ro
|
- ./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/conf.d/20-app.dev.ini:/usr/local/etc/php/app.conf.d/20-app.dev.ini:ro
|
||||||
- ./frankenphp/data:/data
|
- ./frankenphp/data:/data
|
||||||
@@ -45,6 +47,8 @@ services:
|
|||||||
- sass:build
|
- sass:build
|
||||||
- --watch
|
- --watch
|
||||||
- -v
|
- -v
|
||||||
|
healthcheck:
|
||||||
|
disable: true
|
||||||
|
|
||||||
###> symfony/mercure-bundle ###
|
###> symfony/mercure-bundle ###
|
||||||
###< symfony/mercure-bundle ###
|
###< symfony/mercure-bundle ###
|
||||||
@@ -60,11 +64,16 @@ services:
|
|||||||
image: axllent/mailpit
|
image: axllent/mailpit
|
||||||
ports:
|
ports:
|
||||||
- "1025"
|
- "1025"
|
||||||
- "8025"
|
- "8025:8025"
|
||||||
environment:
|
environment:
|
||||||
MP_SMTP_AUTH_ACCEPT_ANY: 1
|
MP_SMTP_AUTH_ACCEPT_ANY: 1
|
||||||
MP_SMTP_AUTH_ALLOW_INSECURE: 1
|
MP_SMTP_AUTH_ALLOW_INSECURE: 1
|
||||||
###< symfony/mailer ###
|
###< symfony/mailer ###
|
||||||
|
|
||||||
|
spotlight:
|
||||||
|
image: ghcr.io/getsentry/spotlight:latest
|
||||||
|
ports:
|
||||||
|
- "8969:8969"
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
sass:
|
sass:
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/compose-spec/compose-go/master/schema/compose-spec.json
|
||||||
# Production environment override
|
# Production environment override
|
||||||
services:
|
services:
|
||||||
php:
|
php:
|
||||||
@@ -9,6 +10,8 @@ services:
|
|||||||
MAILER_DSN: ${MAILER_DSN}
|
MAILER_DSN: ${MAILER_DSN}
|
||||||
MAILER_SENDER: ${MAILER_SENDER}
|
MAILER_SENDER: ${MAILER_SENDER}
|
||||||
SENTRY_DSN: ${SENTRY_DSN}
|
SENTRY_DSN: ${SENTRY_DSN}
|
||||||
|
SENTRY_RELEASE: ${SENTRY_RELEASE}
|
||||||
|
SENTRY_ENVIRONMENT: ${SENTRY_ENVIRONMENT}
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.http.routers.tvdt.rule=Host(`tijdvoordetest.nl`)"
|
- "traefik.http.routers.tvdt.rule=Host(`tijdvoordetest.nl`)"
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/compose-spec/compose-go/master/schema/compose-spec.json
|
||||||
services:
|
services:
|
||||||
php:
|
php:
|
||||||
image: ${IMAGES_PREFIX:-}app-php
|
image: ${IMAGES_PREFIX:-}app-php
|
||||||
|
|||||||
+59
-57
@@ -6,66 +6,67 @@
|
|||||||
"minimum-stability": "stable",
|
"minimum-stability": "stable",
|
||||||
"prefer-stable": true,
|
"prefer-stable": true,
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=8.4",
|
"php": ">=8.5",
|
||||||
"ext-ctype": "*",
|
"ext-ctype": "*",
|
||||||
"ext-iconv": "*",
|
"ext-iconv": "*",
|
||||||
"doctrine/dbal": "^4.3.3",
|
"doctrine/dbal": "^4.4.3",
|
||||||
"doctrine/doctrine-bundle": "^2.16.2",
|
"doctrine/doctrine-bundle": "^3.2.2",
|
||||||
"doctrine/doctrine-migrations-bundle": "^3.4.2",
|
"doctrine/doctrine-migrations-bundle": "^4.0",
|
||||||
"doctrine/orm": "^3.5.2",
|
"doctrine/orm": "^3.6.2",
|
||||||
"martin-georgiev/postgresql-for-doctrine": "^3.5",
|
"martin-georgiev/postgresql-for-doctrine": "^4.4",
|
||||||
"phpdocumentor/reflection-docblock": "^5.6.3",
|
"phpdocumentor/reflection-docblock": "^6.0.3",
|
||||||
"phpoffice/phpspreadsheet": "^5.1",
|
"phpoffice/phpspreadsheet": "^5.5",
|
||||||
"phpstan/phpdoc-parser": "^2.3",
|
"phpstan/phpdoc-parser": "^2.3.2",
|
||||||
"runtime/frankenphp-symfony": "^0.2.0",
|
"sentry/sentry-symfony": "^5.9.0",
|
||||||
"sentry/sentry-symfony": "^5.6",
|
"stof/doctrine-extensions-bundle": "^1.15.3",
|
||||||
"symfony/asset": "7.3.*",
|
"symfony/asset": "8.1.*",
|
||||||
"symfony/asset-mapper": "7.3.*",
|
"symfony/asset-mapper": "8.1.*",
|
||||||
"symfony/brevo-mailer": "7.3.*",
|
"symfony/brevo-mailer": "8.1.*",
|
||||||
"symfony/console": "7.3.*",
|
"symfony/console": "8.1.*",
|
||||||
"symfony/dotenv": "7.3.*",
|
"symfony/dotenv": "8.1.*",
|
||||||
"symfony/flex": "^2.8.2",
|
"symfony/flex": "^2.11.0",
|
||||||
"symfony/form": "7.3.*",
|
"symfony/form": "8.1.*",
|
||||||
"symfony/framework-bundle": "7.3.*",
|
"symfony/framework-bundle": "8.1.*",
|
||||||
"symfony/mailer": "7.3.*",
|
"symfony/mailer": "8.1.*",
|
||||||
"symfony/property-access": "7.3.*",
|
"symfony/object-mapper": "8.1.*",
|
||||||
"symfony/property-info": "7.3.*",
|
"symfony/property-access": "8.1.*",
|
||||||
"symfony/runtime": "7.3.*",
|
"symfony/property-info": "8.1.*",
|
||||||
"symfony/security-bundle": "7.3.*",
|
"symfony/runtime": "8.1.*",
|
||||||
"symfony/security-csrf": "7.3.*",
|
"symfony/security-bundle": "8.1.*",
|
||||||
"symfony/serializer": "7.3.*",
|
"symfony/security-csrf": "8.1.*",
|
||||||
"symfony/translation": "7.3.*",
|
"symfony/serializer": "8.1.*",
|
||||||
"symfony/twig-bundle": "7.3.*",
|
"symfony/translation": "8.1.*",
|
||||||
"symfony/uid": "7.3.*",
|
"symfony/twig-bundle": "8.1.*",
|
||||||
"symfony/ux-turbo": "^2.30.0",
|
"symfony/uid": "8.1.*",
|
||||||
"symfony/validator": "7.3.*",
|
"symfony/ux-turbo": "^3.1",
|
||||||
"symfony/yaml": "7.3.*",
|
"symfony/validator": "8.1.*",
|
||||||
"symfonycasts/sass-bundle": "^0.8.3",
|
"symfony/yaml": "8.1.*",
|
||||||
"symfonycasts/verify-email-bundle": "^1.17.4",
|
"symfonycasts/sass-bundle": "^0.10",
|
||||||
"thecodingmachine/safe": "^3.3.0",
|
"symfonycasts/verify-email-bundle": "^1.18.0",
|
||||||
"twig/extra-bundle": "^3.21",
|
"thecodingmachine/safe": "^3.4.0",
|
||||||
"twig/intl-extra": "^3.21",
|
"twig/extra-bundle": "^3.24.0",
|
||||||
"twig/twig": "^3.21.1"
|
"twig/intl-extra": "^3.24.0",
|
||||||
|
"twig/twig": "^3.27.1"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"doctrine/doctrine-fixtures-bundle": "^4.1",
|
"dama/doctrine-test-bundle": "^8.6",
|
||||||
"friendsofphp/php-cs-fixer": "^3.88.2",
|
"doctrine/doctrine-fixtures-bundle": "^4.3.1",
|
||||||
|
"friendsofphp/php-cs-fixer": "^3.94.2",
|
||||||
"phpstan/extension-installer": "^1.4.3",
|
"phpstan/extension-installer": "^1.4.3",
|
||||||
"phpstan/phpstan": "^2.1.30",
|
"phpstan/phpstan": "^2.1.42",
|
||||||
"phpstan/phpstan-doctrine": "^2.0.6",
|
"phpstan/phpstan-doctrine": "^2.0.20",
|
||||||
"phpstan/phpstan-phpunit": "^2.0.7",
|
"phpstan/phpstan-phpunit": "^2.0.16",
|
||||||
"phpstan/phpstan-symfony": "^2.0.8",
|
"phpstan/phpstan-symfony": "^2.0.15",
|
||||||
"phpunit/phpunit": "^12.4.0",
|
"phpunit/phpunit": "^13.0.5",
|
||||||
"rector/rector": "^2.1.7",
|
"rector/rector": "^2.3.9",
|
||||||
"roave/security-advisories": "dev-latest",
|
"symfony/browser-kit": "8.1.*",
|
||||||
"symfony/browser-kit": "7.3.*",
|
"symfony/css-selector": "8.1.*",
|
||||||
"symfony/css-selector": "7.3.*",
|
"symfony/maker-bundle": "^1.67.0",
|
||||||
"symfony/maker-bundle": "^1.64.0",
|
"symfony/phpunit-bridge": "8.1.*",
|
||||||
"symfony/phpunit-bridge": "7.3.*",
|
"symfony/stopwatch": "8.1.*",
|
||||||
"symfony/stopwatch": "7.3.*",
|
"symfony/web-profiler-bundle": "8.1.*",
|
||||||
"symfony/web-profiler-bundle": "7.3.*",
|
"thecodingmachine/phpstan-safe-rule": "^1.4.3",
|
||||||
"thecodingmachine/phpstan-safe-rule": "^1.4.1",
|
"vincentlanglet/twig-cs-fixer": "^4.0.0"
|
||||||
"vincentlanglet/twig-cs-fixer": "^3.10.0"
|
|
||||||
},
|
},
|
||||||
"config": {
|
"config": {
|
||||||
"allow-plugins": {
|
"allow-plugins": {
|
||||||
@@ -98,7 +99,8 @@
|
|||||||
"symfony/polyfill-php81": "*",
|
"symfony/polyfill-php81": "*",
|
||||||
"symfony/polyfill-php82": "*",
|
"symfony/polyfill-php82": "*",
|
||||||
"symfony/polyfill-php83": "*",
|
"symfony/polyfill-php83": "*",
|
||||||
"symfony/polyfill-php84": "*"
|
"symfony/polyfill-php84": "*",
|
||||||
|
"symfony/polyfill-php85": "*"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"auto-scripts": {
|
"auto-scripts": {
|
||||||
@@ -119,7 +121,7 @@
|
|||||||
"extra": {
|
"extra": {
|
||||||
"symfony": {
|
"symfony": {
|
||||||
"allow-contrib": false,
|
"allow-contrib": false,
|
||||||
"require": "7.3.*",
|
"require": "8.1.*",
|
||||||
"docker": true
|
"docker": true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+2667
-3032
File diff suppressed because it is too large
Load Diff
+5
-1
@@ -2,10 +2,12 @@
|
|||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use DAMA\DoctrineTestBundle\DAMADoctrineTestBundle;
|
||||||
use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
|
use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
|
||||||
use Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle;
|
use Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle;
|
||||||
use Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle;
|
use Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle;
|
||||||
use Sentry\SentryBundle\SentryBundle;
|
use Sentry\SentryBundle\SentryBundle;
|
||||||
|
use Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle;
|
||||||
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
|
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
|
||||||
use Symfony\Bundle\MakerBundle\MakerBundle;
|
use Symfony\Bundle\MakerBundle\MakerBundle;
|
||||||
use Symfony\Bundle\SecurityBundle\SecurityBundle;
|
use Symfony\Bundle\SecurityBundle\SecurityBundle;
|
||||||
@@ -28,8 +30,10 @@ return [
|
|||||||
TwigExtraBundle::class => ['all' => true],
|
TwigExtraBundle::class => ['all' => true],
|
||||||
DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
|
DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
|
||||||
SymfonyCastsVerifyEmailBundle::class => ['all' => true],
|
SymfonyCastsVerifyEmailBundle::class => ['all' => true],
|
||||||
SentryBundle::class => ['prod' => true],
|
SentryBundle::class => ['dev' => true, 'prod' => true],
|
||||||
SymfonycastsSassBundle::class => ['all' => true],
|
SymfonycastsSassBundle::class => ['all' => true],
|
||||||
StimulusBundle::class => ['all' => true],
|
StimulusBundle::class => ['all' => true],
|
||||||
TurboBundle::class => ['all' => true],
|
TurboBundle::class => ['all' => true],
|
||||||
|
DAMADoctrineTestBundle::class => ['test' => true],
|
||||||
|
StofDoctrineExtensionsBundle::class => ['all' => true],
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
when@test:
|
||||||
|
dama_doctrine_test:
|
||||||
|
enable_static_connection: true
|
||||||
|
enable_static_meta_data_cache: true
|
||||||
|
enable_static_query_cache: true
|
||||||
@@ -2,12 +2,7 @@ doctrine:
|
|||||||
dbal:
|
dbal:
|
||||||
url: '%env(resolve:DATABASE_URL)%'
|
url: '%env(resolve:DATABASE_URL)%'
|
||||||
|
|
||||||
# IMPORTANT: You MUST configure your server version,
|
|
||||||
# either here or in the DATABASE_URL env var (see .env file)
|
|
||||||
#server_version: '16'
|
|
||||||
|
|
||||||
profiling_collect_backtrace: '%kernel.debug%'
|
profiling_collect_backtrace: '%kernel.debug%'
|
||||||
use_savepoints: true
|
|
||||||
types:
|
types:
|
||||||
# JSON types
|
# JSON types
|
||||||
jsonb: MartinGeorgiev\Doctrine\DBAL\Types\Jsonb
|
jsonb: MartinGeorgiev\Doctrine\DBAL\Types\Jsonb
|
||||||
@@ -22,14 +17,15 @@ doctrine:
|
|||||||
|
|
||||||
|
|
||||||
orm:
|
orm:
|
||||||
auto_generate_proxy_classes: true
|
|
||||||
enable_native_lazy_objects: 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
|
||||||
|
filters:
|
||||||
|
softdeleteable:
|
||||||
|
class: Gedmo\SoftDeleteable\Filter\SoftDeleteableFilter
|
||||||
|
enabled: true
|
||||||
mappings:
|
mappings:
|
||||||
Tvdt:
|
Tvdt:
|
||||||
type: attribute
|
type: attribute
|
||||||
@@ -37,8 +33,6 @@ doctrine:
|
|||||||
dir: '%kernel.project_dir%/src/Entity'
|
dir: '%kernel.project_dir%/src/Entity'
|
||||||
prefix: 'Tvdt\Entity'
|
prefix: 'Tvdt\Entity'
|
||||||
alias: Tvdt
|
alias: Tvdt
|
||||||
controller_resolver:
|
|
||||||
auto_mapping: false
|
|
||||||
|
|
||||||
when@test:
|
when@test:
|
||||||
doctrine:
|
doctrine:
|
||||||
@@ -49,8 +43,6 @@ when@test:
|
|||||||
when@prod:
|
when@prod:
|
||||||
doctrine:
|
doctrine:
|
||||||
orm:
|
orm:
|
||||||
auto_generate_proxy_classes: false
|
|
||||||
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
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
# yaml-language-server: $schema=../../vendor/symfony/dependency-injection/Loader/schema/services.schema.json
|
||||||
|
when@dev:
|
||||||
|
maker:
|
||||||
|
root_namespace: 'Tvdt'
|
||||||
|
generate_final_classes: true
|
||||||
|
generate_final_entities: false
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
framework:
|
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: '%env(DEFAULT_URI)%'
|
||||||
|
|
||||||
when@prod:
|
when@prod:
|
||||||
framework:
|
framework:
|
||||||
|
|||||||
@@ -2,17 +2,17 @@ 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)
|
|
||||||
tvdt_user_provider:
|
tvdt_user_provider:
|
||||||
entity:
|
entity:
|
||||||
class: Tvdt\Entity\User
|
class: Tvdt\Entity\User
|
||||||
property: email
|
property: email
|
||||||
# used to reload user from session & other features (e.g. switch_user)
|
|
||||||
firewalls:
|
firewalls:
|
||||||
dev:
|
dev:
|
||||||
pattern: ^/(_(profiler|wdt)|css|images|js)/
|
# Ensure dev tools and static assets are always allowed
|
||||||
|
pattern: ^/(_profiler|_wdt|assets|build)/
|
||||||
security: false
|
security: false
|
||||||
main:
|
main:
|
||||||
lazy: true
|
lazy: true
|
||||||
@@ -24,17 +24,10 @@ security:
|
|||||||
default_target_path: tvdt_backoffice_index
|
default_target_path: tvdt_backoffice_index
|
||||||
logout:
|
logout:
|
||||||
path: tvdt_login_logout
|
path: tvdt_login_logout
|
||||||
# where to redirect after logout
|
remember_me:
|
||||||
# target: tvdt_any_route
|
secret: '%kernel.secret%'
|
||||||
|
lifetime: 604800 # 1 week in seconds
|
||||||
|
|
||||||
# activate different ways to authenticate
|
|
||||||
# https://symfony.com/doc/current/security.html#the-firewall
|
|
||||||
|
|
||||||
# https://symfony.com/doc/current/security/impersonating_user.html
|
|
||||||
# switch_user: true
|
|
||||||
|
|
||||||
# Easy way to control access for large sections of your site
|
|
||||||
# Note: Only the *first* access control that matches will be used
|
|
||||||
access_control:
|
access_control:
|
||||||
- { path: ^/admin, roles: ROLE_ADMIN }
|
- { path: ^/admin, roles: ROLE_ADMIN }
|
||||||
- { path: ^/backoffice, roles: ROLE_USER }
|
- { path: ^/backoffice, roles: ROLE_USER }
|
||||||
@@ -42,10 +35,8 @@ security:
|
|||||||
when@test:
|
when@test:
|
||||||
security:
|
security:
|
||||||
password_hashers:
|
password_hashers:
|
||||||
# By default, password hashers are resource intensive and take time. This is
|
# Password hashers are resource-intensive by design to ensure security.
|
||||||
# important to generate secure password hashes. In tests however, secure hashes
|
# In tests, it's safe to reduce their cost to improve performance.
|
||||||
# are not important, waste resources and increase test times. The following
|
|
||||||
# reduces the work factor to the lowest possible values.
|
|
||||||
Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface:
|
Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface:
|
||||||
algorithm: auto
|
algorithm: auto
|
||||||
cost: 4 # Lowest possible value for bcrypt
|
cost: 4 # Lowest possible value for bcrypt
|
||||||
|
|||||||
+34
-18
@@ -1,31 +1,47 @@
|
|||||||
|
when@dev:
|
||||||
|
sentry:
|
||||||
|
dsn: 'https://placeholder@placeholder.ingest.sentry.io/0'
|
||||||
|
options:
|
||||||
|
spotlight: true
|
||||||
|
spotlight_url: 'http://spotlight:8969/stream'
|
||||||
|
|
||||||
when@prod:
|
when@prod:
|
||||||
sentry:
|
sentry:
|
||||||
dsn: '%env(SENTRY_DSN)%'
|
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:
|
options:
|
||||||
traces_sample_rate: 1.0
|
# Add request headers, cookies, IP address and the authenticated user
|
||||||
profiles_sample_rate: 1.0
|
# see https://docs.sentry.io/platforms/php/data-management/data-collected/ for more info
|
||||||
|
# send_default_pii: true
|
||||||
ignore_exceptions:
|
ignore_exceptions:
|
||||||
- 'Symfony\Component\ErrorHandler\Error\FatalError'
|
- 'Symfony\Component\ErrorHandler\Error\FatalError'
|
||||||
- 'Symfony\Component\Debug\Exception\FatalErrorException'
|
- 'Symfony\Component\Debug\Exception\FatalErrorException'
|
||||||
|
- 'Symfony\Component\HttpKernel\Exception\NotFoundHttpException'
|
||||||
# If you are using Monolog, you also need this additional configuration to log the errors correctly:
|
#
|
||||||
# https://docs.sentry.io/platforms/php/guides/symfony/#monolog-integration
|
# # If you are using Monolog, you also need this additional configuration to log the errors correctly:
|
||||||
|
# # https://docs.sentry.io/platforms/php/guides/symfony/integrations/monolog/
|
||||||
# register_error_listener: false
|
# register_error_listener: false
|
||||||
# register_error_handler: false
|
# register_error_handler: false
|
||||||
|
#
|
||||||
# monolog:
|
# monolog:
|
||||||
# handlers:
|
# handlers:
|
||||||
|
# # Use this only if you don't want to use structured logging and instead receive
|
||||||
|
# # certain log levels as errors.
|
||||||
# sentry:
|
# sentry:
|
||||||
# type: sentry
|
# type: service
|
||||||
# level: !php/const Monolog\Logger::ERROR
|
# id: Sentry\Monolog\Handler
|
||||||
# hub_id: Sentry\State\HubInterface
|
#
|
||||||
|
# # Use this for structured log integration
|
||||||
# Uncomment these lines to register a log message processor that resolves PSR-3 placeholders
|
# sentry_logs:
|
||||||
# https://docs.sentry.io/platforms/php/guides/symfony/#monolog-integration
|
# type: service
|
||||||
|
# id: Sentry\SentryBundle\Monolog\LogsHandler
|
||||||
|
#
|
||||||
|
# # Enable one of the two services below, depending on your choice above
|
||||||
# services:
|
# services:
|
||||||
# Monolog\Processor\PsrLogMessageProcessor:
|
# Sentry\Monolog\Handler:
|
||||||
# tags: { name: monolog.processor, handler: sentry }
|
# arguments:
|
||||||
|
# $hub: '@Sentry\State\HubInterface'
|
||||||
|
# $level: !php/const Monolog\Logger::ERROR
|
||||||
|
# $fillExtraContext: true # Enables sending monolog context to Sentry
|
||||||
|
# Sentry\SentryBundle\Monolog\LogsHandler:
|
||||||
|
# arguments:
|
||||||
|
# - !php/const Monolog\Logger::INFO
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
# Read the documentation: https://symfony.com/doc/current/bundles/StofDoctrineExtensionsBundle/index.html
|
||||||
|
# See the official DoctrineExtensions documentation for more details: https://github.com/doctrine-extensions/DoctrineExtensions/tree/main/doc
|
||||||
|
stof_doctrine_extensions:
|
||||||
|
default_locale: nl
|
||||||
|
orm:
|
||||||
|
default:
|
||||||
|
timestampable: true
|
||||||
|
softdeleteable: true
|
||||||
|
loggable: true
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
symfonycasts_sass:
|
||||||
|
root_sass:
|
||||||
|
- './assets/styles/quiz.scss'
|
||||||
|
- './assets/styles/backoffice.scss'
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
twig:
|
twig:
|
||||||
file_name_pattern: '*.twig'
|
file_name_pattern: '*.twig'
|
||||||
form_themes: [ 'bootstrap_5_layout.html.twig' ]
|
form_themes: [ 'bootstrap_5_layout.html.twig' ]
|
||||||
|
globals:
|
||||||
|
sentry_dsn: '%env(SENTRY_DSN)%'
|
||||||
|
|
||||||
when@test:
|
when@test:
|
||||||
twig:
|
twig:
|
||||||
|
|||||||
@@ -0,0 +1,2 @@
|
|||||||
|
symfonycasts_verify_email:
|
||||||
|
lifetime: 604800 # 1 week in seconds
|
||||||
@@ -6,7 +6,6 @@ when@dev:
|
|||||||
framework:
|
framework:
|
||||||
profiler:
|
profiler:
|
||||||
only_exceptions: false
|
only_exceptions: false
|
||||||
collect_serializer_data: true
|
|
||||||
|
|
||||||
when@test:
|
when@test:
|
||||||
web_profiler:
|
web_profiler:
|
||||||
|
|||||||
+2
-2
@@ -2,6 +2,6 @@
|
|||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
if (file_exists(dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php')) {
|
if (file_exists(dirname(__DIR__).'/var/cache/prod/Tvdt_KernelProdContainer.preload.php')) {
|
||||||
require dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php';
|
require dirname(__DIR__).'/var/cache/prod/Tvdt_KernelProdContainer.preload.php';
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+1663
File diff suppressed because it is too large
Load Diff
+10
-4
@@ -1,5 +1,11 @@
|
|||||||
|
# yaml-language-server: $schema=../vendor/symfony/routing/Loader/schema/routing.schema.json
|
||||||
|
|
||||||
|
# This file is the entry point to configure the routes of your app.
|
||||||
|
# Methods with the #[Route] attribute are automatically imported.
|
||||||
|
# See also https://symfony.com/doc/current/routing.html
|
||||||
|
|
||||||
|
# To list all registered routes, run the following command:
|
||||||
|
# bin/console debug:router
|
||||||
|
|
||||||
controllers:
|
controllers:
|
||||||
resource:
|
resource: routing.controllers
|
||||||
path: ../src/Controller/
|
|
||||||
namespace: Tvdt\Controller
|
|
||||||
type: attribute
|
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
|
# yaml-language-server: $schema=../vendor/symfony/dependency-injection/Loader/schema/services.schema.json
|
||||||
|
|
||||||
# This file is the entry point to configure your own services.
|
# This file is the entry point to configure your own services.
|
||||||
# Files in the packages/ subdirectory configure your dependencies.
|
# Files in the packages/ subdirectory configure your dependencies.
|
||||||
|
# See also https://symfony.com/doc/current/service_container/import.html
|
||||||
|
|
||||||
# Put parameters here that don't need to change on each machine where the app is deployed
|
# Put parameters here that don't need to change on each machine where the app is deployed
|
||||||
# https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
|
# https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
|
||||||
|
|||||||
+14
-14
@@ -22,20 +22,20 @@
|
|||||||
root /app/public
|
root /app/public
|
||||||
encode zstd br gzip
|
encode zstd br gzip
|
||||||
|
|
||||||
mercure {
|
# mercure {
|
||||||
# Transport to use (default to Bolt)
|
# # Transport to use (default to Bolt)
|
||||||
transport_url {$MERCURE_TRANSPORT_URL:bolt:///data/mercure.db}
|
## transport_url {$MERCURE_TRANSPORT_URL:bolt:///data/mercure.db}
|
||||||
# Publisher JWT key
|
# Publisher JWT key
|
||||||
publisher_jwt {env.MERCURE_PUBLISHER_JWT_KEY} {env.MERCURE_PUBLISHER_JWT_ALG}
|
# publisher_jwt {env.MERCURE_PUBLISHER_JWT_KEY} {env.MERCURE_PUBLISHER_JWT_ALG}
|
||||||
# Subscriber JWT key
|
# # Subscriber JWT key
|
||||||
subscriber_jwt {env.MERCURE_SUBSCRIBER_JWT_KEY} {env.MERCURE_SUBSCRIBER_JWT_ALG}
|
# subscriber_jwt {env.MERCURE_SUBSCRIBER_JWT_KEY} {env.MERCURE_SUBSCRIBER_JWT_ALG}
|
||||||
# Allow anonymous subscribers (double-check that it's what you want)
|
# # Allow anonymous subscribers (double-check that it's what you want)
|
||||||
anonymous
|
# anonymous
|
||||||
# Enable the subscription API (double-check that it's what you want)
|
# # Enable the subscription API (double-check that it's what you want)
|
||||||
subscriptions
|
# subscriptions
|
||||||
# Extra directives
|
# # Extra directives
|
||||||
{$MERCURE_EXTRA_DIRECTIVES}
|
# {$MERCURE_EXTRA_DIRECTIVES}
|
||||||
}
|
# }
|
||||||
|
|
||||||
vulcain
|
vulcain
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
worker {
|
|
||||||
file ./public/index.php
|
|
||||||
env APP_RUNTIME Runtime\FrankenPhpSymfony\Runtime
|
|
||||||
}
|
|
||||||
+27
-27
@@ -12,33 +12,33 @@ declare(strict_types=1);
|
|||||||
* be used as an "entrypoint" (and passed to the importmap() Twig function).
|
* 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.
|
* The "importmap:require" command can be used to add new entries to this file.
|
||||||
|
*
|
||||||
|
* @return array<string, array{ // Import name as key, description of the imported file as value
|
||||||
|
* path: string, // Logical, relative or absolute path to the file
|
||||||
|
* type?: 'js'|'css'|'json', // Type of the file, defaults to 'js'
|
||||||
|
* entrypoint?: bool, // Whether the file is an entrypoint, for 'js' only
|
||||||
|
* }|array{
|
||||||
|
* version: string, // Version of the remote package
|
||||||
|
* package_specifier?: string, // Remote "package-name/path" specifier, defaults to the import name
|
||||||
|
* type?: 'js'|'css'|'json',
|
||||||
|
* entrypoint?: bool,
|
||||||
|
* }>
|
||||||
*/
|
*/
|
||||||
return [
|
return [
|
||||||
'quiz' => [
|
'quiz' => ['path' => './assets/quiz.js', 'entrypoint' => true],
|
||||||
'path' => './assets/quiz.js',
|
'backoffice' => ['path' => './assets/backoffice.js', 'entrypoint' => true],
|
||||||
'entrypoint' => true,
|
'@symfony/stimulus-bundle' => ['path' => './vendor/symfony/stimulus-bundle/assets/dist/loader.js'],
|
||||||
],
|
'bootstrap' => ['version' => '5.3.8'],
|
||||||
'backoffice' => [
|
'@popperjs/core' => ['version' => '2.11.8'],
|
||||||
'path' => './assets/backoffice.js',
|
'bootstrap/dist/css/bootstrap.min.css' => ['version' => '5.3.8', 'type' => 'css'],
|
||||||
'entrypoint' => true,
|
'@hotwired/stimulus' => ['version' => '3.2.2'],
|
||||||
],
|
'@hotwired/turbo' => ['version' => '8.0.23'],
|
||||||
'bootstrap' => [
|
'bootstrap-icons/font/bootstrap-icons.min.css' => ['version' => '1.13.1', 'type' => 'css'],
|
||||||
'version' => '5.3.6',
|
'@sentry/browser' => ['version' => '10.63.0'],
|
||||||
],
|
'@sentry/feedback' => ['version' => '10.63.0'],
|
||||||
'@popperjs/core' => [
|
'@sentry/core/browser' => ['version' => '10.63.0'],
|
||||||
'version' => '2.11.8',
|
'@sentry/browser-utils' => ['version' => '10.63.0'],
|
||||||
],
|
'@sentry/replay' => ['version' => '10.63.0'],
|
||||||
'bootstrap/dist/css/bootstrap.min.css' => [
|
'@sentry/replay-canvas' => ['version' => '10.63.0'],
|
||||||
'version' => '5.3.6',
|
'@sentry/core' => ['version' => '10.63.0'],
|
||||||
'type' => 'css',
|
|
||||||
],
|
|
||||||
'@hotwired/stimulus' => [
|
|
||||||
'version' => '3.2.2',
|
|
||||||
],
|
|
||||||
'@symfony/stimulus-bundle' => [
|
|
||||||
'path' => './vendor/symfony/stimulus-bundle/assets/dist/loader.js',
|
|
||||||
],
|
|
||||||
'@hotwired/turbo' => [
|
|
||||||
'version' => '7.3.0',
|
|
||||||
],
|
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
/** Auto-generated Migration: Please modify to your needs! */
|
||||||
|
final class Version20260125191247 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this up() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('ALTER TABLE quiz_candidate ADD penalty_seconds SMALLINT DEFAULT 0 NOT NULL');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this down() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('ALTER TABLE quiz_candidate DROP penalty_seconds');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
/** Auto-generated Migration: Please modify to your needs! */
|
||||||
|
final class Version20260309215703 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this up() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('ALTER TABLE quiz_candidate ADD active BOOLEAN DEFAULT true NOT NULL');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this down() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('ALTER TABLE quiz_candidate DROP active');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
/** Auto-generated Migration: Please modify to your needs! */
|
||||||
|
final class Version20260309220448 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Add started field to quiz_candidate and copy existing created values';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this up() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('ALTER TABLE quiz_candidate ADD started TIMESTAMP(0) WITH TIME ZONE DEFAULT NULL');
|
||||||
|
|
||||||
|
// Copy created to started for existing rows (these were created when quiz started)
|
||||||
|
$this->addSql('UPDATE quiz_candidate SET started = created WHERE started IS NULL');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this down() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('ALTER TABLE quiz_candidate DROP started');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260523095205 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Add soft-delete support (deleted_at columns) and rename elimination.created to created_at';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this up() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('ALTER TABLE elimination ADD deleted_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
|
||||||
|
$this->addSql('ALTER TABLE elimination RENAME COLUMN created TO created_at');
|
||||||
|
$this->addSql('ALTER TABLE given_answer ADD deleted_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
|
||||||
|
$this->addSql('ALTER TABLE quiz_candidate ADD deleted_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this down() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('ALTER TABLE elimination DROP deleted_at');
|
||||||
|
$this->addSql('ALTER TABLE elimination RENAME COLUMN created_at TO created');
|
||||||
|
$this->addSql('ALTER TABLE given_answer DROP deleted_at');
|
||||||
|
$this->addSql('ALTER TABLE quiz_candidate DROP deleted_at');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260523095302 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Add updated_at column to elimination table and set it to created_at';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this up() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('ALTER TABLE elimination ADD updated_at TIMESTAMP(0) WITHOUT TIME ZONE');
|
||||||
|
$this->addSql('ALTER TABLE elimination ALTER created_at TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
|
||||||
|
$this->addSql('UPDATE elimination SET updated_at = created_at');
|
||||||
|
$this->addSql('ALTER TABLE elimination ALTER updated_at SET NOT NULL');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this down() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('ALTER TABLE elimination DROP updated_at');
|
||||||
|
$this->addSql('ALTER TABLE elimination ALTER created_at TYPE TIMESTAMP(0) WITH TIME ZONE');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260524135246 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Add unique constraint for quiz_candidate with deleted_at filter';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this up() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('DROP INDEX uniq_ced2ffa291bd8781853cd175');
|
||||||
|
$this->addSql('CREATE UNIQUE INDEX UNIQ_CED2FFA291BD8781853CD175 ON quiz_candidate (candidate_id, quiz_id) WHERE (deleted_at IS NULL)');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this down() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('DROP INDEX UNIQ_CED2FFA291BD8781853CD175');
|
||||||
|
$this->addSql('CREATE UNIQUE INDEX uniq_ced2ffa291bd8781853cd175 ON quiz_candidate (candidate_id, quiz_id)');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
<?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 Version20260705142647 extends AbstractMigration
|
||||||
|
{
|
||||||
|
#[\Override]
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Add season question bank tables, quiz finalization, Gedmo Loggable log entries, and label colour/slug';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this up() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('CREATE TABLE bank_answer (id UUID NOT NULL, ordering SMALLINT DEFAULT 0 NOT NULL, text VARCHAR(255) NOT NULL, is_right_answer BOOLEAN NOT NULL, bank_question_id UUID NOT NULL, PRIMARY KEY (id))');
|
||||||
|
$this->addSql('CREATE INDEX IDX_FAB865583CAC40C0 ON bank_answer (bank_question_id)');
|
||||||
|
$this->addSql('CREATE TABLE bank_question (id UUID NOT NULL, question VARCHAR(255) NOT NULL, reusable BOOLEAN DEFAULT false NOT NULL, season_id UUID NOT NULL, PRIMARY KEY (id))');
|
||||||
|
$this->addSql('CREATE INDEX IDX_87B753C94EC001D1 ON bank_question (season_id)');
|
||||||
|
$this->addSql('CREATE TABLE bank_question_question_label (bank_question_id UUID NOT NULL, question_label_id UUID NOT NULL, PRIMARY KEY (bank_question_id, question_label_id))');
|
||||||
|
$this->addSql('CREATE INDEX IDX_856E26833CAC40C0 ON bank_question_question_label (bank_question_id)');
|
||||||
|
$this->addSql('CREATE INDEX IDX_856E268350B19F35 ON bank_question_question_label (question_label_id)');
|
||||||
|
$this->addSql('CREATE TABLE bank_question_usage (id UUID NOT NULL, created TIMESTAMP(0) WITH TIME ZONE NOT NULL, question_id UUID DEFAULT NULL, bank_question_id UUID NOT NULL, quiz_id UUID NOT NULL, PRIMARY KEY (id))');
|
||||||
|
$this->addSql('CREATE INDEX IDX_775833AD1E27F6BF ON bank_question_usage (question_id)');
|
||||||
|
$this->addSql('CREATE INDEX IDX_775833AD3CAC40C0 ON bank_question_usage (bank_question_id)');
|
||||||
|
$this->addSql('CREATE INDEX IDX_775833AD853CD175 ON bank_question_usage (quiz_id)');
|
||||||
|
$this->addSql('CREATE UNIQUE INDEX UNIQ_775833AD3CAC40C0853CD175 ON bank_question_usage (bank_question_id, quiz_id)');
|
||||||
|
$this->addSql('CREATE TABLE ext_log_entries (data JSON DEFAULT NULL, id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, action VARCHAR(8) NOT NULL, logged_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, object_id VARCHAR(64) DEFAULT NULL, object_class VARCHAR(191) NOT NULL, version INT NOT NULL, username VARCHAR(191) DEFAULT NULL, PRIMARY KEY (id))');
|
||||||
|
$this->addSql('CREATE INDEX log_class_lookup_idx ON ext_log_entries (object_class)');
|
||||||
|
$this->addSql('CREATE INDEX log_date_lookup_idx ON ext_log_entries (logged_at)');
|
||||||
|
$this->addSql('CREATE INDEX log_user_lookup_idx ON ext_log_entries (username)');
|
||||||
|
$this->addSql('CREATE INDEX log_version_lookup_idx ON ext_log_entries (object_id, object_class, version)');
|
||||||
|
$this->addSql("CREATE TABLE question_label (id UUID NOT NULL, colour VARCHAR(16) DEFAULT 'secondary' NOT NULL, slug VARCHAR(64) NOT NULL, name VARCHAR(64) NOT NULL, season_id UUID NOT NULL, PRIMARY KEY (id))");
|
||||||
|
$this->addSql('CREATE INDEX IDX_3E4C41EC4EC001D1 ON question_label (season_id)');
|
||||||
|
$this->addSql('CREATE UNIQUE INDEX UNIQ_3E4C41EC5E237E064EC001D1 ON question_label (name, season_id)');
|
||||||
|
$this->addSql('CREATE UNIQUE INDEX uq_question_label_slug_season ON question_label (slug, season_id)');
|
||||||
|
$this->addSql('ALTER TABLE bank_answer ADD CONSTRAINT FK_FAB865583CAC40C0 FOREIGN KEY (bank_question_id) REFERENCES bank_question (id) NOT DEFERRABLE');
|
||||||
|
$this->addSql('ALTER TABLE bank_question ADD CONSTRAINT FK_87B753C94EC001D1 FOREIGN KEY (season_id) REFERENCES season (id) NOT DEFERRABLE');
|
||||||
|
$this->addSql('ALTER TABLE bank_question_question_label ADD CONSTRAINT FK_856E26833CAC40C0 FOREIGN KEY (bank_question_id) REFERENCES bank_question (id) ON DELETE CASCADE');
|
||||||
|
$this->addSql('ALTER TABLE bank_question_question_label ADD CONSTRAINT FK_856E268350B19F35 FOREIGN KEY (question_label_id) REFERENCES question_label (id) ON DELETE CASCADE');
|
||||||
|
$this->addSql('ALTER TABLE bank_question_usage ADD CONSTRAINT FK_775833AD1E27F6BF FOREIGN KEY (question_id) REFERENCES question (id) ON DELETE SET NULL NOT DEFERRABLE');
|
||||||
|
$this->addSql('ALTER TABLE bank_question_usage ADD CONSTRAINT FK_775833AD3CAC40C0 FOREIGN KEY (bank_question_id) REFERENCES bank_question (id) NOT DEFERRABLE');
|
||||||
|
$this->addSql('ALTER TABLE bank_question_usage ADD CONSTRAINT FK_775833AD853CD175 FOREIGN KEY (quiz_id) REFERENCES quiz (id) ON DELETE CASCADE NOT DEFERRABLE');
|
||||||
|
$this->addSql('ALTER TABLE question_label ADD CONSTRAINT FK_3E4C41EC4EC001D1 FOREIGN KEY (season_id) REFERENCES season (id) NOT DEFERRABLE');
|
||||||
|
$this->addSql('ALTER TABLE quiz ADD finalized_at TIMESTAMP(0) WITH TIME ZONE DEFAULT NULL');
|
||||||
|
}
|
||||||
|
|
||||||
|
#[\Override]
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this down() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('ALTER TABLE bank_answer DROP CONSTRAINT FK_FAB865583CAC40C0');
|
||||||
|
$this->addSql('ALTER TABLE bank_question DROP CONSTRAINT FK_87B753C94EC001D1');
|
||||||
|
$this->addSql('ALTER TABLE bank_question_question_label DROP CONSTRAINT FK_856E26833CAC40C0');
|
||||||
|
$this->addSql('ALTER TABLE bank_question_question_label DROP CONSTRAINT FK_856E268350B19F35');
|
||||||
|
$this->addSql('ALTER TABLE bank_question_usage DROP CONSTRAINT FK_775833AD1E27F6BF');
|
||||||
|
$this->addSql('ALTER TABLE bank_question_usage DROP CONSTRAINT FK_775833AD3CAC40C0');
|
||||||
|
$this->addSql('ALTER TABLE bank_question_usage DROP CONSTRAINT FK_775833AD853CD175');
|
||||||
|
$this->addSql('ALTER TABLE question_label DROP CONSTRAINT FK_3E4C41EC4EC001D1');
|
||||||
|
$this->addSql('DROP TABLE bank_answer');
|
||||||
|
$this->addSql('DROP TABLE bank_question');
|
||||||
|
$this->addSql('DROP TABLE bank_question_question_label');
|
||||||
|
$this->addSql('DROP TABLE bank_question_usage');
|
||||||
|
$this->addSql('DROP TABLE ext_log_entries');
|
||||||
|
$this->addSql('DROP TABLE question_label');
|
||||||
|
$this->addSql('ALTER TABLE quiz DROP finalized_at');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,6 +7,8 @@ parameters:
|
|||||||
- public/
|
- public/
|
||||||
- src/
|
- src/
|
||||||
- tests/
|
- tests/
|
||||||
|
excludePaths:
|
||||||
|
- config/reference.php
|
||||||
treatPhpDocTypesAsCertain: false
|
treatPhpDocTypesAsCertain: false
|
||||||
symfony:
|
symfony:
|
||||||
containerXmlPath: var/cache/dev/Tvdt_KernelDevDebugContainer.xml
|
containerXmlPath: var/cache/dev/Tvdt_KernelDevDebugContainer.xml
|
||||||
|
|||||||
+5
-1
@@ -8,7 +8,7 @@
|
|||||||
failOnNotice="true"
|
failOnNotice="true"
|
||||||
failOnWarning="true"
|
failOnWarning="true"
|
||||||
bootstrap="tests/bootstrap.php"
|
bootstrap="tests/bootstrap.php"
|
||||||
cacheDirectory=".phpunit.cache"
|
cacheDirectory="/tmp/phpunit.cache"
|
||||||
>
|
>
|
||||||
<php>
|
<php>
|
||||||
<ini name="display_errors" value="1" />
|
<ini name="display_errors" value="1" />
|
||||||
@@ -27,8 +27,12 @@
|
|||||||
<include>
|
<include>
|
||||||
<directory>src</directory>
|
<directory>src</directory>
|
||||||
</include>
|
</include>
|
||||||
|
<exclude>
|
||||||
|
<directory>src/DataFixtures</directory>
|
||||||
|
</exclude>
|
||||||
</source>
|
</source>
|
||||||
|
|
||||||
<extensions>
|
<extensions>
|
||||||
|
<bootstrap class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension" />
|
||||||
</extensions>
|
</extensions>
|
||||||
</phpunit>
|
</phpunit>
|
||||||
|
|||||||
+4
-1
@@ -3,6 +3,7 @@
|
|||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
use Rector\Config\RectorConfig;
|
use Rector\Config\RectorConfig;
|
||||||
|
use Rector\PHPUnit\CodeQuality\Rector\Class_\AddSeeTestAnnotationRector;
|
||||||
use Rector\Symfony\Bridge\Symfony\Routing\SymfonyRoutesProvider;
|
use Rector\Symfony\Bridge\Symfony\Routing\SymfonyRoutesProvider;
|
||||||
use Rector\Symfony\Contract\Bridge\Symfony\Routing\SymfonyRoutesProviderInterface;
|
use Rector\Symfony\Contract\Bridge\Symfony\Routing\SymfonyRoutesProviderInterface;
|
||||||
|
|
||||||
@@ -13,6 +14,7 @@ return RectorConfig::configure()
|
|||||||
__DIR__.'/src',
|
__DIR__.'/src',
|
||||||
__DIR__.'/tests',
|
__DIR__.'/tests',
|
||||||
])
|
])
|
||||||
|
->withSkipPath(__DIR__.'/config/reference.php')
|
||||||
->withSymfonyContainerXml(__DIR__.'/var/cache/dev/Tvdt_KernelDevDebugContainer.xml')
|
->withSymfonyContainerXml(__DIR__.'/var/cache/dev/Tvdt_KernelDevDebugContainer.xml')
|
||||||
->withSymfonyContainerPhp(__DIR__.'/tests/symfony-container.php')
|
->withSymfonyContainerPhp(__DIR__.'/tests/symfony-container.php')
|
||||||
->registerService(SymfonyRoutesProvider::class, SymfonyRoutesProviderInterface::class)
|
->registerService(SymfonyRoutesProvider::class, SymfonyRoutesProviderInterface::class)
|
||||||
@@ -26,7 +28,6 @@ return RectorConfig::configure()
|
|||||||
privatization: true,
|
privatization: true,
|
||||||
instanceOf: true,
|
instanceOf: true,
|
||||||
earlyReturn: true,
|
earlyReturn: true,
|
||||||
strictBooleans: true,
|
|
||||||
rectorPreset: true,
|
rectorPreset: true,
|
||||||
phpunitCodeQuality: true,
|
phpunitCodeQuality: true,
|
||||||
doctrineCodeQuality: true,
|
doctrineCodeQuality: true,
|
||||||
@@ -34,4 +35,6 @@ return RectorConfig::configure()
|
|||||||
)
|
)
|
||||||
->withAttributesSets(all: true)
|
->withAttributesSets(all: true)
|
||||||
->withComposerBased(twig: true, doctrine: true, phpunit: true, symfony: true)
|
->withComposerBased(twig: true, doctrine: true, phpunit: true, symfony: true)
|
||||||
|
->withSkip([AddSeeTestAnnotationRector::class])
|
||||||
|
|
||||||
;
|
;
|
||||||
|
|||||||
@@ -1,41 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
namespace Tvdt\Command;
|
|
||||||
|
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
|
||||||
use Symfony\Component\Console\Attribute\AsCommand;
|
|
||||||
use Symfony\Component\Console\Command\Command;
|
|
||||||
use Symfony\Component\Console\Input\InputInterface;
|
|
||||||
use Symfony\Component\Console\Output\OutputInterface;
|
|
||||||
use Symfony\Component\Console\Style\SymfonyStyle;
|
|
||||||
use Tvdt\Entity\SeasonSettings;
|
|
||||||
use Tvdt\Repository\SeasonRepository;
|
|
||||||
|
|
||||||
#[AsCommand(
|
|
||||||
name: 'tvdt:add-settings',
|
|
||||||
description: 'Add a short description for your command',
|
|
||||||
)]
|
|
||||||
readonly class AddSettingsCommand
|
|
||||||
{
|
|
||||||
public function __construct(private SeasonRepository $seasonRepository, private EntityManagerInterface $entityManager) {}
|
|
||||||
|
|
||||||
public function __invoke(InputInterface $input, OutputInterface $output): int
|
|
||||||
{
|
|
||||||
$io = new SymfonyStyle($input, $output);
|
|
||||||
|
|
||||||
foreach ($this->seasonRepository->findAll() as $season) {
|
|
||||||
if (null !== $season->settings) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
$io->text('Adding settings to season : '.$season->seasonCode);
|
|
||||||
$season->settings = new SeasonSettings();
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->entityManager->flush();
|
|
||||||
|
|
||||||
return Command::SUCCESS;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -8,9 +8,8 @@ use Doctrine\ORM\EntityManagerInterface;
|
|||||||
use Symfony\Component\Console\Attribute\Argument;
|
use Symfony\Component\Console\Attribute\Argument;
|
||||||
use Symfony\Component\Console\Attribute\AsCommand;
|
use Symfony\Component\Console\Attribute\AsCommand;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
use Symfony\Component\Console\Input\InputInterface;
|
|
||||||
use Symfony\Component\Console\Output\OutputInterface;
|
|
||||||
use Symfony\Component\Console\Style\SymfonyStyle;
|
use Symfony\Component\Console\Style\SymfonyStyle;
|
||||||
|
use Tvdt\Entity\Season;
|
||||||
use Tvdt\Repository\SeasonRepository;
|
use Tvdt\Repository\SeasonRepository;
|
||||||
use Tvdt\Repository\UserRepository;
|
use Tvdt\Repository\UserRepository;
|
||||||
|
|
||||||
@@ -18,7 +17,7 @@ use Tvdt\Repository\UserRepository;
|
|||||||
name: 'tvdt:claim-season',
|
name: 'tvdt:claim-season',
|
||||||
description: 'Give a user owner rights on a season',
|
description: 'Give a user owner rights on a season',
|
||||||
)]
|
)]
|
||||||
readonly class ClaimSeasonCommand
|
final readonly class ClaimSeasonCommand
|
||||||
{
|
{
|
||||||
public function __construct(private UserRepository $userRepository, private SeasonRepository $seasonRepository, private EntityManagerInterface $entityManager) {}
|
public function __construct(private UserRepository $userRepository, private SeasonRepository $seasonRepository, private EntityManagerInterface $entityManager) {}
|
||||||
|
|
||||||
@@ -27,14 +26,11 @@ readonly class ClaimSeasonCommand
|
|||||||
string $seasonCode,
|
string $seasonCode,
|
||||||
#[Argument]
|
#[Argument]
|
||||||
string $email,
|
string $email,
|
||||||
InputInterface $input,
|
SymfonyStyle $io,
|
||||||
OutputInterface $output,
|
|
||||||
): int {
|
): int {
|
||||||
$io = new SymfonyStyle($input, $output);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$season = $this->seasonRepository->findOneBy(['seasonCode' => $seasonCode]);
|
$season = $this->seasonRepository->findOneBySeasonCode($seasonCode);
|
||||||
if (null === $season) {
|
if (!$season instanceof Season) {
|
||||||
throw new \InvalidArgumentException('Season not found');
|
throw new \InvalidArgumentException('Season not found');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,8 +7,6 @@ namespace Tvdt\Command;
|
|||||||
use Symfony\Component\Console\Attribute\Argument;
|
use Symfony\Component\Console\Attribute\Argument;
|
||||||
use Symfony\Component\Console\Attribute\AsCommand;
|
use Symfony\Component\Console\Attribute\AsCommand;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
use Symfony\Component\Console\Input\InputInterface;
|
|
||||||
use Symfony\Component\Console\Output\OutputInterface;
|
|
||||||
use Symfony\Component\Console\Style\SymfonyStyle;
|
use Symfony\Component\Console\Style\SymfonyStyle;
|
||||||
use Tvdt\Repository\UserRepository;
|
use Tvdt\Repository\UserRepository;
|
||||||
|
|
||||||
@@ -16,17 +14,15 @@ use Tvdt\Repository\UserRepository;
|
|||||||
name: 'tvdt:make-admin',
|
name: 'tvdt:make-admin',
|
||||||
description: 'Give a user the role admin',
|
description: 'Give a user the role admin',
|
||||||
)]
|
)]
|
||||||
readonly class MakeAdminCommand
|
final readonly class MakeAdminCommand
|
||||||
{
|
{
|
||||||
public function __construct(private UserRepository $userRepository) {}
|
public function __construct(private UserRepository $userRepository) {}
|
||||||
|
|
||||||
public function __invoke(
|
public function __invoke(
|
||||||
#[Argument]
|
#[Argument]
|
||||||
string $email,
|
string $email,
|
||||||
InputInterface $input,
|
SymfonyStyle $io,
|
||||||
OutputInterface $output,
|
|
||||||
): int {
|
): int {
|
||||||
$io = new SymfonyStyle($input, $output);
|
|
||||||
try {
|
try {
|
||||||
$this->userRepository->makeAdmin($email);
|
$this->userRepository->makeAdmin($email);
|
||||||
} catch (\InvalidArgumentException) {
|
} catch (\InvalidArgumentException) {
|
||||||
|
|||||||
@@ -6,17 +6,21 @@ namespace Tvdt\Controller\Backoffice;
|
|||||||
|
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Symfony\Bundle\SecurityBundle\Security;
|
use Symfony\Bundle\SecurityBundle\Security;
|
||||||
|
use Symfony\Component\HttpFoundation\HeaderUtils;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Component\HttpFoundation\StreamedResponse;
|
use Symfony\Component\HttpFoundation\StreamedResponse;
|
||||||
use Symfony\Component\HttpKernel\Attribute\AsController;
|
use Symfony\Component\HttpKernel\Attribute\AsController;
|
||||||
use Symfony\Component\Routing\Attribute\Route;
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
|
use Symfony\Component\Routing\Requirement\Requirement;
|
||||||
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||||
use Tvdt\Controller\AbstractController;
|
use Tvdt\Controller\AbstractController;
|
||||||
|
use Tvdt\Entity\Quiz;
|
||||||
use Tvdt\Entity\Season;
|
use Tvdt\Entity\Season;
|
||||||
use Tvdt\Entity\User;
|
use Tvdt\Entity\User;
|
||||||
use Tvdt\Form\CreateSeasonFormType;
|
use Tvdt\Form\CreateSeasonFormType;
|
||||||
use Tvdt\Repository\SeasonRepository;
|
use Tvdt\Repository\SeasonRepository;
|
||||||
|
use Tvdt\Security\Voter\SeasonVoter;
|
||||||
use Tvdt\Service\QuizSpreadsheetService;
|
use Tvdt\Service\QuizSpreadsheetService;
|
||||||
|
|
||||||
#[AsController]
|
#[AsController]
|
||||||
@@ -26,6 +30,8 @@ final class BackofficeController extends AbstractController
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly SeasonRepository $seasonRepository,
|
private readonly SeasonRepository $seasonRepository,
|
||||||
private readonly Security $security,
|
private readonly Security $security,
|
||||||
|
private readonly QuizSpreadsheetService $excel,
|
||||||
|
private readonly EntityManagerInterface $em,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
#[Route('/backoffice/', name: 'tvdt_backoffice_index')]
|
#[Route('/backoffice/', name: 'tvdt_backoffice_index')]
|
||||||
@@ -44,7 +50,7 @@ final class BackofficeController extends AbstractController
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[Route('/backoffice/season/add', name: 'tvdt_backoffice_season_add', priority: 10)]
|
#[Route('/backoffice/season/add', name: 'tvdt_backoffice_season_add', priority: 10)]
|
||||||
public function addSeason(Request $request, EntityManagerInterface $em): Response
|
public function addSeason(Request $request): Response
|
||||||
{
|
{
|
||||||
$season = new Season();
|
$season = new Season();
|
||||||
$form = $this->createForm(CreateSeasonFormType::class, $season);
|
$form = $this->createForm(CreateSeasonFormType::class, $season);
|
||||||
@@ -58,8 +64,8 @@ final class BackofficeController extends AbstractController
|
|||||||
$season->addOwner($user);
|
$season->addOwner($user);
|
||||||
$season->generateSeasonCode();
|
$season->generateSeasonCode();
|
||||||
|
|
||||||
$em->persist($season);
|
$this->em->persist($season);
|
||||||
$em->flush();
|
$this->em->flush();
|
||||||
|
|
||||||
return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->seasonCode]);
|
return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->seasonCode]);
|
||||||
}
|
}
|
||||||
@@ -68,12 +74,28 @@ final class BackofficeController extends AbstractController
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[Route('/backoffice/template', name: 'tvdt_backoffice_template', priority: 10)]
|
#[Route('/backoffice/template', name: 'tvdt_backoffice_template', priority: 10)]
|
||||||
public function getTemplate(QuizSpreadsheetService $excel): Response
|
public function getTemplate(): StreamedResponse
|
||||||
{
|
{
|
||||||
$response = new StreamedResponse($excel->generateTemplate());
|
$response = new StreamedResponse($this->excel->generateTemplate());
|
||||||
$response->headers->set('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
|
$response->headers->set('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
|
||||||
$response->headers->set('Content-Disposition', 'attachment; filename="template.xlsx"');
|
$response->headers->set('Content-Disposition', 'attachment; filename="template.xlsx"');
|
||||||
|
|
||||||
return $response;
|
return $response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/quiz/{quiz}/export',
|
||||||
|
name: 'tvdt_backoffice_quiz_export',
|
||||||
|
requirements: ['quiz' => Requirement::UUID],
|
||||||
|
methods: ['GET'],
|
||||||
|
)]
|
||||||
|
public function exportQuiz(Quiz $quiz): StreamedResponse
|
||||||
|
{
|
||||||
|
$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'));
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,46 +5,57 @@ declare(strict_types=1);
|
|||||||
namespace Tvdt\Controller\Backoffice;
|
namespace Tvdt\Controller\Backoffice;
|
||||||
|
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
|
use Symfony\Component\HttpFoundation\RedirectResponse;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Component\Routing\Attribute\Route;
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
use Symfony\Component\Routing\Requirement\Requirement;
|
use Symfony\Component\Routing\Requirement\Requirement;
|
||||||
|
use Symfony\Component\Security\Http\Attribute\IsCsrfTokenValid;
|
||||||
use Tvdt\Controller\AbstractController;
|
use Tvdt\Controller\AbstractController;
|
||||||
use Tvdt\Entity\Elimination;
|
use Tvdt\Entity\Elimination;
|
||||||
use Tvdt\Entity\Quiz;
|
use Tvdt\Entity\Quiz;
|
||||||
use Tvdt\Entity\Season;
|
use Tvdt\Entity\Season;
|
||||||
|
use Tvdt\Enum\FlashType;
|
||||||
use Tvdt\Factory\EliminationFactory;
|
use Tvdt\Factory\EliminationFactory;
|
||||||
|
|
||||||
final class PrepareEliminationController extends AbstractController
|
final class PrepareEliminationController extends AbstractController
|
||||||
{
|
{
|
||||||
|
public function __construct(private readonly EliminationFactory $eliminationFactory, private readonly EntityManagerInterface $em) {}
|
||||||
|
|
||||||
|
#[IsCsrfTokenValid('prepare_elimination')]
|
||||||
#[Route(
|
#[Route(
|
||||||
'/backoffice/season/{seasonCode:season}/quiz/{quiz}/elimination/prepare',
|
'/backoffice/season/{seasonCode:season}/quiz/{quiz}/elimination/prepare',
|
||||||
name: 'tvdt_prepare_elimination',
|
name: 'tvdt_prepare_elimination',
|
||||||
requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID],
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID],
|
||||||
|
methods: ['POST'],
|
||||||
)]
|
)]
|
||||||
public function index(Season $season, Quiz $quiz, EliminationFactory $eliminationFactory): Response
|
public function index(Season $season, Quiz $quiz): RedirectResponse
|
||||||
{
|
{
|
||||||
$elimination = $eliminationFactory->createEliminationFromQuiz($quiz);
|
$elimination = $this->eliminationFactory->createEliminationFromQuiz($quiz);
|
||||||
|
|
||||||
return $this->redirectToRoute('tvdt_prepare_elimination_view', ['elimination' => $elimination->id]);
|
return $this->redirectToRoute('tvdt_prepare_elimination_view', ['elimination' => $elimination->id]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[IsCsrfTokenValid('prepare_elimination', methods: ['POST'])]
|
||||||
#[Route(
|
#[Route(
|
||||||
'/backoffice/elimination/{elimination}',
|
'/backoffice/elimination/{elimination}',
|
||||||
name: 'tvdt_prepare_elimination_view',
|
name: 'tvdt_prepare_elimination_view',
|
||||||
requirements: ['elimination' => Requirement::UUID],
|
requirements: ['elimination' => Requirement::UUID],
|
||||||
|
methods: ['GET', 'POST'],
|
||||||
)]
|
)]
|
||||||
public function viewElimination(Elimination $elimination, Request $request, EntityManagerInterface $em): Response
|
public function viewElimination(Elimination $elimination, Request $request): Response
|
||||||
{
|
{
|
||||||
if ('POST' === $request->getMethod()) {
|
if ($request->isMethod('POST')) {
|
||||||
$elimination->updateFromInputBag($request->request);
|
$elimination->updateFromInputBag($request->request);
|
||||||
$em->flush();
|
$this->em->flush();
|
||||||
|
|
||||||
if ($request->request->getBoolean('start')) {
|
if ($request->request->getBoolean('start')) {
|
||||||
return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);
|
return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->addFlash('success', 'Elimination updated');
|
$this->addFlash(FlashType::Success, 'Elimination updated');
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_prepare_elimination_view', ['elimination' => $elimination->id]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->render('backoffice/prepare_elimination/index.html.twig', [
|
return $this->render('backoffice/prepare_elimination/index.html.twig', [
|
||||||
|
|||||||
@@ -0,0 +1,387 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Tvdt\Controller\Backoffice;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
|
||||||
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
|
use Symfony\Component\HttpFoundation\RedirectResponse;
|
||||||
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
|
use Symfony\Component\HttpKernel\Attribute\AsController;
|
||||||
|
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
|
||||||
|
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||||
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
|
use Symfony\Component\Routing\Requirement\Requirement;
|
||||||
|
use Symfony\Component\Security\Http\Attribute\IsCsrfTokenValid;
|
||||||
|
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||||
|
use Symfony\Component\String\Slugger\SluggerInterface;
|
||||||
|
use Symfony\Component\Uid\Uuid;
|
||||||
|
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||||
|
use Tvdt\Controller\AbstractController;
|
||||||
|
use Tvdt\Entity\BankQuestion;
|
||||||
|
use Tvdt\Entity\BankQuestionUsage;
|
||||||
|
use Tvdt\Entity\QuestionLabel;
|
||||||
|
use Tvdt\Entity\Quiz;
|
||||||
|
use Tvdt\Entity\Season;
|
||||||
|
use Tvdt\Enum\FlashType;
|
||||||
|
use Tvdt\Enum\LabelColour;
|
||||||
|
use Tvdt\Exception\BankQuestionAlreadyUsedException;
|
||||||
|
use Tvdt\Exception\BankQuestionIncompleteException;
|
||||||
|
use Tvdt\Exception\QuizLockedException;
|
||||||
|
use Tvdt\Form\BankQuestionFormType;
|
||||||
|
use Tvdt\Repository\BankQuestionRepository;
|
||||||
|
use Tvdt\Repository\QuestionLabelRepository;
|
||||||
|
use Tvdt\Repository\QuizRepository;
|
||||||
|
use Tvdt\Security\Voter\SeasonVoter;
|
||||||
|
use Tvdt\Service\QuestionBankService;
|
||||||
|
|
||||||
|
#[AsController]
|
||||||
|
#[IsGranted('ROLE_USER')]
|
||||||
|
class QuestionBankController extends AbstractController
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private readonly TranslatorInterface $translator,
|
||||||
|
private readonly EntityManagerInterface $em,
|
||||||
|
private readonly BankQuestionRepository $bankQuestionRepository,
|
||||||
|
private readonly QuestionLabelRepository $questionLabelRepository,
|
||||||
|
private readonly QuizRepository $quizRepository,
|
||||||
|
private readonly QuestionBankService $questionBankService,
|
||||||
|
private readonly SluggerInterface $slugger,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/season/{seasonCode:season}/question-bank',
|
||||||
|
name: 'tvdt_backoffice_question_bank',
|
||||||
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX],
|
||||||
|
priority: 10,
|
||||||
|
)]
|
||||||
|
public function index(Season $season, Request $request): Response
|
||||||
|
{
|
||||||
|
$label = null;
|
||||||
|
$labelSlug = $request->query->getString('label');
|
||||||
|
if ('' !== $labelSlug) {
|
||||||
|
$label = $this->questionLabelRepository->findBySlugAndSeason($labelSlug, $season);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->render('backoffice/season.html.twig', [
|
||||||
|
'season' => $season,
|
||||||
|
'bankQuestions' => $this->bankQuestionRepository->findBySeason($season, $label),
|
||||||
|
'assignableQuizzes' => $this->quizRepository->findAssignableForSeason($season),
|
||||||
|
'activeLabel' => $label,
|
||||||
|
'labelColours' => LabelColour::cases(),
|
||||||
|
'activeTab' => 'question-bank',
|
||||||
|
'template' => 'backoffice/season/tab_question_bank.html.twig',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/season/{seasonCode:season}/question-bank/new',
|
||||||
|
name: 'tvdt_backoffice_question_bank_new',
|
||||||
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX],
|
||||||
|
priority: 10,
|
||||||
|
)]
|
||||||
|
public function new(Season $season, Request $request): Response
|
||||||
|
{
|
||||||
|
$bankQuestion = new BankQuestion();
|
||||||
|
|
||||||
|
$form = $this->createForm(BankQuestionFormType::class, $bankQuestion, ['season' => $season]);
|
||||||
|
$form->handleRequest($request);
|
||||||
|
|
||||||
|
if ($form->isSubmitted() && $form->isValid()) {
|
||||||
|
$this->applyAnswerOrdering($bankQuestion);
|
||||||
|
$season->addBankQuestion($bankQuestion);
|
||||||
|
$this->em->persist($bankQuestion);
|
||||||
|
$this->em->flush();
|
||||||
|
|
||||||
|
$this->addFlash(FlashType::Success, $this->translator->trans('Question added to the question bank'));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_question_bank', ['seasonCode' => $season->seasonCode]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->render('backoffice/question_bank/form.html.twig', [
|
||||||
|
'season' => $season,
|
||||||
|
'form' => $form,
|
||||||
|
'bankQuestion' => null,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/season/{seasonCode:season}/question-bank/{bankQuestion}/edit',
|
||||||
|
name: 'tvdt_backoffice_question_bank_edit',
|
||||||
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'bankQuestion' => Requirement::UUID],
|
||||||
|
priority: 10,
|
||||||
|
)]
|
||||||
|
public function edit(Season $season, BankQuestion $bankQuestion, Request $request): Response
|
||||||
|
{
|
||||||
|
$this->assertSameSeason($season, $bankQuestion->season);
|
||||||
|
|
||||||
|
$form = $this->createForm(BankQuestionFormType::class, $bankQuestion, ['season' => $season]);
|
||||||
|
$form->handleRequest($request);
|
||||||
|
|
||||||
|
if ($form->isSubmitted() && $form->isValid()) {
|
||||||
|
$this->em->flush();
|
||||||
|
|
||||||
|
$this->syncUsagesAfterEdit($bankQuestion);
|
||||||
|
|
||||||
|
$this->addFlash(FlashType::Success, $this->translator->trans('Question updated'));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_question_bank', ['seasonCode' => $season->seasonCode]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->render('backoffice/question_bank/form.html.twig', [
|
||||||
|
'season' => $season,
|
||||||
|
'form' => $form,
|
||||||
|
'bankQuestion' => $bankQuestion,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[IsCsrfTokenValid('delete_bank_question')]
|
||||||
|
#[IsGranted(SeasonVoter::DELETE, subject: 'season')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/season/{seasonCode:season}/question-bank/{bankQuestion}/delete',
|
||||||
|
name: 'tvdt_backoffice_question_bank_delete',
|
||||||
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'bankQuestion' => Requirement::UUID],
|
||||||
|
methods: ['POST'],
|
||||||
|
priority: 10,
|
||||||
|
)]
|
||||||
|
public function delete(Season $season, BankQuestion $bankQuestion): RedirectResponse
|
||||||
|
{
|
||||||
|
$this->assertSameSeason($season, $bankQuestion->season);
|
||||||
|
|
||||||
|
$hasLockedUsages = $bankQuestion->usages->exists(
|
||||||
|
static fn (int $key, BankQuestionUsage $usage): bool => $usage->quiz->isLocked,
|
||||||
|
);
|
||||||
|
if ($hasLockedUsages) {
|
||||||
|
$this->addFlash(FlashType::Danger, $this->translator->trans('This question cannot be deleted because it is used in a locked or active quiz'));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_question_bank', ['seasonCode' => $season->seasonCode]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->em->remove($bankQuestion);
|
||||||
|
$this->em->flush();
|
||||||
|
|
||||||
|
$this->addFlash(FlashType::Success, $this->translator->trans('Question removed from the question bank'));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_question_bank', ['seasonCode' => $season->seasonCode]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[IsCsrfTokenValid('assign_bank_question')]
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/season/{seasonCode:season}/question-bank/{bankQuestion}/assign',
|
||||||
|
name: 'tvdt_backoffice_question_bank_assign',
|
||||||
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'bankQuestion' => Requirement::UUID],
|
||||||
|
methods: ['POST'],
|
||||||
|
priority: 10,
|
||||||
|
)]
|
||||||
|
public function assign(Season $season, BankQuestion $bankQuestion, Request $request): RedirectResponse
|
||||||
|
{
|
||||||
|
$this->assertSameSeason($season, $bankQuestion->season);
|
||||||
|
|
||||||
|
$quizId = $request->request->getString('quiz');
|
||||||
|
if (!Uuid::isValid($quizId)) {
|
||||||
|
throw new BadRequestHttpException('Invalid quiz');
|
||||||
|
}
|
||||||
|
|
||||||
|
$quiz = $this->em->getRepository(Quiz::class)->find($quizId);
|
||||||
|
if (!$quiz instanceof Quiz || $quiz->season !== $season) {
|
||||||
|
throw new BadRequestHttpException('Invalid quiz');
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->denyAccessUnlessGranted(SeasonVoter::MODIFY_QUIZ_CONTENT, $quiz);
|
||||||
|
|
||||||
|
try {
|
||||||
|
$this->questionBankService->assignToQuiz($bankQuestion, $quiz);
|
||||||
|
$this->addFlash(FlashType::Success, $this->translator->trans('Question added to quiz %quiz%', ['%quiz%' => $quiz->name]));
|
||||||
|
} catch (QuizLockedException) {
|
||||||
|
$this->addFlash(FlashType::Danger, $this->translator->trans('This quiz can no longer be altered'));
|
||||||
|
} catch (BankQuestionAlreadyUsedException) {
|
||||||
|
$this->addFlash(FlashType::Danger, $this->translator->trans('This question has already been used'));
|
||||||
|
} catch (BankQuestionIncompleteException) {
|
||||||
|
$this->addFlash(FlashType::Warning, $this->translator->trans('This question is incomplete: it needs at least two answers and exactly one correct answer'));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_question_bank', ['seasonCode' => $season->seasonCode]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[IsCsrfTokenValid('add_question_label')]
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/season/{seasonCode:season}/question-bank/labels',
|
||||||
|
name: 'tvdt_backoffice_question_bank_labels',
|
||||||
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX],
|
||||||
|
methods: ['POST'],
|
||||||
|
priority: 15,
|
||||||
|
)]
|
||||||
|
public function addLabel(Season $season, Request $request): RedirectResponse
|
||||||
|
{
|
||||||
|
$name = mb_trim($request->request->getString('name'));
|
||||||
|
|
||||||
|
if ('' === $name || mb_strlen($name) > 64) {
|
||||||
|
$this->addFlash(FlashType::Danger, $this->translator->trans('Invalid label name'));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_question_bank', ['seasonCode' => $season->seasonCode]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$slug = mb_strtolower($this->slugger->slug($name)->toString());
|
||||||
|
|
||||||
|
$colour = LabelColour::tryFrom($request->request->getString('colour')) ?? LabelColour::Gray;
|
||||||
|
|
||||||
|
$exists = $season->questionLabels->exists(static fn (int $key, QuestionLabel $label): bool => $label->name === $name);
|
||||||
|
if (!$exists) {
|
||||||
|
if ($this->questionLabelRepository->slugExistsForSeason($slug, $season)) {
|
||||||
|
$this->addFlash(FlashType::Danger, $this->translator->trans('A label with a similar name already exists'));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_question_bank', ['seasonCode' => $season->seasonCode]);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
$newLabel = new QuestionLabel($name);
|
||||||
|
$newLabel->slug = $slug;
|
||||||
|
$newLabel->colour = $colour;
|
||||||
|
$season->addQuestionLabel($newLabel);
|
||||||
|
$this->em->flush();
|
||||||
|
$this->addFlash(FlashType::Success, $this->translator->trans('Label added'));
|
||||||
|
} catch (UniqueConstraintViolationException) {
|
||||||
|
// Concurrent request already inserted the same label; treat as a no-op
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_question_bank', ['seasonCode' => $season->seasonCode]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[IsCsrfTokenValid('delete_question_label')]
|
||||||
|
#[IsGranted(SeasonVoter::DELETE, subject: 'season')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/season/{seasonCode:season}/question-bank/labels/{labelSlug}/delete',
|
||||||
|
name: 'tvdt_backoffice_question_bank_label_delete',
|
||||||
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'labelSlug' => '[a-z0-9-]+'],
|
||||||
|
methods: ['POST'],
|
||||||
|
priority: 15,
|
||||||
|
)]
|
||||||
|
public function deleteLabel(Season $season, string $labelSlug): RedirectResponse
|
||||||
|
{
|
||||||
|
$label = $this->questionLabelRepository->findBySlugAndSeason($labelSlug, $season);
|
||||||
|
if (!$label instanceof QuestionLabel) {
|
||||||
|
throw $this->createNotFoundException();
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($label->bankQuestions as $bankQuestion) {
|
||||||
|
$bankQuestion->removeLabel($label);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->em->remove($label);
|
||||||
|
$this->em->flush();
|
||||||
|
|
||||||
|
$this->addFlash(FlashType::Success, $this->translator->trans('Label removed'));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_question_bank', ['seasonCode' => $season->seasonCode]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[IsCsrfTokenValid('unassign_bank_question')]
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/season/{seasonCode:season}/question-bank/{bankQuestion}/unassign/{usage}',
|
||||||
|
name: 'tvdt_backoffice_question_bank_unassign',
|
||||||
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'bankQuestion' => Requirement::UUID, 'usage' => Requirement::UUID],
|
||||||
|
methods: ['POST'],
|
||||||
|
priority: 10,
|
||||||
|
)]
|
||||||
|
public function unassign(Season $season, BankQuestion $bankQuestion, BankQuestionUsage $usage): RedirectResponse
|
||||||
|
{
|
||||||
|
$this->assertSameSeason($season, $bankQuestion->season);
|
||||||
|
|
||||||
|
if ($usage->bankQuestion !== $bankQuestion) {
|
||||||
|
throw new NotFoundHttpException();
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($usage->quiz->isLocked) {
|
||||||
|
$this->addFlash(FlashType::Danger, $this->translator->trans('This quiz can no longer be altered'));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_question_bank', ['seasonCode' => $season->seasonCode]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->questionBankService->unassignFromQuiz($usage);
|
||||||
|
$this->addFlash(FlashType::Success, $this->translator->trans('Question removed from quiz %quiz%', ['%quiz%' => $usage->quiz->name]));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_question_bank', ['seasonCode' => $season->seasonCode]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[IsCsrfTokenValid('sync_bank_question')]
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/season/{seasonCode:season}/question-bank/{bankQuestion}/sync/{usage}',
|
||||||
|
name: 'tvdt_backoffice_question_bank_sync',
|
||||||
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'bankQuestion' => Requirement::UUID, 'usage' => Requirement::UUID],
|
||||||
|
methods: ['POST'],
|
||||||
|
priority: 10,
|
||||||
|
)]
|
||||||
|
public function syncToQuiz(Season $season, BankQuestion $bankQuestion, BankQuestionUsage $usage): RedirectResponse
|
||||||
|
{
|
||||||
|
$this->assertSameSeason($season, $bankQuestion->season);
|
||||||
|
|
||||||
|
if ($usage->bankQuestion !== $bankQuestion) {
|
||||||
|
throw new NotFoundHttpException();
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($usage->quiz->isLocked) {
|
||||||
|
$this->addFlash(FlashType::Danger, $this->translator->trans('This quiz can no longer be altered'));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_question_bank', ['seasonCode' => $season->seasonCode]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->questionBankService->syncToQuiz($bankQuestion, $usage);
|
||||||
|
$this->em->flush();
|
||||||
|
$this->addFlash(FlashType::Success, $this->translator->trans('Question synced to quiz %quiz%', ['%quiz%' => $usage->quiz->name]));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_question_bank', ['seasonCode' => $season->seasonCode]);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function assertSameSeason(Season $season, Season $subjectSeason): void
|
||||||
|
{
|
||||||
|
if ($season !== $subjectSeason) {
|
||||||
|
throw new NotFoundHttpException();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function applyAnswerOrdering(BankQuestion $bankQuestion): void
|
||||||
|
{
|
||||||
|
$ordering = 1;
|
||||||
|
foreach ($bankQuestion->answers as $answer) {
|
||||||
|
$answer->ordering = $ordering++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function syncUsagesAfterEdit(BankQuestion $bankQuestion): void
|
||||||
|
{
|
||||||
|
$pendingNames = [];
|
||||||
|
$synced = false;
|
||||||
|
foreach ($bankQuestion->usages as $usage) {
|
||||||
|
if (!$usage->quiz->isLocked) {
|
||||||
|
$this->questionBankService->syncToQuiz($bankQuestion, $usage);
|
||||||
|
$synced = true;
|
||||||
|
} else {
|
||||||
|
$pendingNames[] = $usage->quiz->name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($synced) {
|
||||||
|
$this->em->flush();
|
||||||
|
}
|
||||||
|
|
||||||
|
if ([] !== $pendingNames) {
|
||||||
|
$this->addFlash(
|
||||||
|
FlashType::Warning,
|
||||||
|
$this->translator->trans(
|
||||||
|
'The question was not synced to finalized quiz(zes): %quizzes%. Use the Sync button to update them.',
|
||||||
|
['%quizzes%' => implode(', ', $pendingNames)],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,21 +5,26 @@ declare(strict_types=1);
|
|||||||
namespace Tvdt\Controller\Backoffice;
|
namespace Tvdt\Controller\Backoffice;
|
||||||
|
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
|
use Safe\DateTimeImmutable;
|
||||||
use Symfony\Component\HttpFoundation\RedirectResponse;
|
use Symfony\Component\HttpFoundation\RedirectResponse;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Component\HttpKernel\Attribute\AsController;
|
use Symfony\Component\HttpKernel\Attribute\AsController;
|
||||||
use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
|
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
|
||||||
use Symfony\Component\Routing\Attribute\Route;
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
use Symfony\Component\Routing\Requirement\Requirement;
|
use Symfony\Component\Routing\Requirement\Requirement;
|
||||||
|
use Symfony\Component\Security\Http\Attribute\IsCsrfTokenValid;
|
||||||
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||||
use Symfony\Contracts\Translation\TranslatorInterface;
|
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||||
use Tvdt\Controller\AbstractController;
|
use Tvdt\Controller\AbstractController;
|
||||||
|
use Tvdt\Entity\Answer;
|
||||||
use Tvdt\Entity\Candidate;
|
use Tvdt\Entity\Candidate;
|
||||||
|
use Tvdt\Entity\Question;
|
||||||
use Tvdt\Entity\Quiz;
|
use Tvdt\Entity\Quiz;
|
||||||
|
use Tvdt\Entity\QuizCandidate;
|
||||||
use Tvdt\Entity\Season;
|
use Tvdt\Entity\Season;
|
||||||
|
use Tvdt\Enum\FlashType;
|
||||||
use Tvdt\Exception\ErrorClearingQuizException;
|
use Tvdt\Exception\ErrorClearingQuizException;
|
||||||
use Tvdt\Repository\CandidateRepository;
|
|
||||||
use Tvdt\Repository\QuizCandidateRepository;
|
use Tvdt\Repository\QuizCandidateRepository;
|
||||||
use Tvdt\Repository\QuizRepository;
|
use Tvdt\Repository\QuizRepository;
|
||||||
use Tvdt\Security\Voter\SeasonVoter;
|
use Tvdt\Security\Voter\SeasonVoter;
|
||||||
@@ -29,8 +34,10 @@ use Tvdt\Security\Voter\SeasonVoter;
|
|||||||
class QuizController extends AbstractController
|
class QuizController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly CandidateRepository $candidateRepository,
|
private readonly QuizRepository $quizRepository,
|
||||||
private readonly TranslatorInterface $translator,
|
private readonly TranslatorInterface $translator,
|
||||||
|
private readonly QuizCandidateRepository $quizCandidateRepository,
|
||||||
|
private readonly EntityManagerInterface $em,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
||||||
@@ -41,80 +48,388 @@ class QuizController extends AbstractController
|
|||||||
)]
|
)]
|
||||||
public function index(Season $season, Quiz $quiz): Response
|
public function index(Season $season, Quiz $quiz): Response
|
||||||
{
|
{
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_quiz_overview', ['seasonCode' => $season->seasonCode, 'quiz' => $quiz->id]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/season/{seasonCode:season}/quiz/{quiz}/overview',
|
||||||
|
name: 'tvdt_backoffice_quiz_overview',
|
||||||
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID],
|
||||||
|
)]
|
||||||
|
public function overview(Season $season, Quiz $quiz): Response
|
||||||
|
{
|
||||||
|
$fetchedQuiz = $this->quizRepository->fetchWithQuestionsAndCandidates($quiz->id);
|
||||||
|
|
||||||
|
// Create indexed lookup for quiz candidates by candidate ID
|
||||||
|
$quizCandidatesByCandidateId = [];
|
||||||
|
foreach ($fetchedQuiz->candidateData as $qc) {
|
||||||
|
$quizCandidatesByCandidateId[$qc->candidate->id->toString()] = $qc;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get given answers counts efficiently via database query
|
||||||
|
$givenAnswersCountByCandidateId = $this->quizRepository->getGivenAnswersCountPerCandidate($quiz);
|
||||||
|
|
||||||
|
// Pre-compute candidate data to avoid nested loops in template
|
||||||
|
$candidateData = [];
|
||||||
|
foreach ($season->candidates as $candidate) {
|
||||||
|
$candidateIdString = $candidate->id->toString();
|
||||||
|
$candidateData[] = [
|
||||||
|
'candidate' => $candidate,
|
||||||
|
'quizCandidate' => $quizCandidatesByCandidateId[$candidateIdString] ?? null,
|
||||||
|
'givenAnswersCount' => $givenAnswersCountByCandidateId[$candidateIdString] ?? 0,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
return $this->render('backoffice/quiz.html.twig', [
|
return $this->render('backoffice/quiz.html.twig', [
|
||||||
'season' => $season,
|
'season' => $season,
|
||||||
'quiz' => $quiz,
|
'quiz' => $fetchedQuiz,
|
||||||
'result' => $this->candidateRepository->getScores($quiz),
|
'questionErrors' => $fetchedQuiz->getQuestionErrors(),
|
||||||
|
'candidateData' => $candidateData,
|
||||||
|
'activeTab' => 'overview',
|
||||||
|
'template' => 'backoffice/quiz/tab_overview.html.twig',
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/season/{seasonCode:season}/quiz/{quiz}/result',
|
||||||
|
name: 'tvdt_backoffice_quiz_result',
|
||||||
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID],
|
||||||
|
)]
|
||||||
|
public function result(Season $season, Quiz $quiz): Response
|
||||||
|
{
|
||||||
|
$fetchedQuiz = $this->quizRepository->fetchWithQuestions($quiz->id);
|
||||||
|
|
||||||
|
return $this->render('backoffice/quiz.html.twig', [
|
||||||
|
'season' => $season,
|
||||||
|
'quiz' => $fetchedQuiz,
|
||||||
|
'result' => $this->quizRepository->getScores($quiz),
|
||||||
|
'activeTab' => 'result',
|
||||||
|
'template' => 'backoffice/quiz/tab_result.html.twig',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/season/{seasonCode:season}/quiz/{quiz}/candidates-list',
|
||||||
|
name: 'tvdt_backoffice_quiz_candidates_tab',
|
||||||
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID],
|
||||||
|
)]
|
||||||
|
public function candidatesTab(Season $season, Quiz $quiz): Response
|
||||||
|
{
|
||||||
|
// Create indexed lookup for quiz candidates by candidate ID
|
||||||
|
$quizCandidatesByCandidateId = [];
|
||||||
|
foreach ($quiz->candidateData as $qc) {
|
||||||
|
$quizCandidatesByCandidateId[$qc->candidate->id->toString()] = $qc;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get given answers counts efficiently via database query
|
||||||
|
$givenAnswersCountByCandidateId = $this->quizRepository->getGivenAnswersCountPerCandidate($quiz);
|
||||||
|
|
||||||
|
// Pre-compute candidate data to avoid nested loops in template
|
||||||
|
$candidateData = [];
|
||||||
|
foreach ($season->candidates as $candidate) {
|
||||||
|
$candidateIdString = $candidate->id->toString();
|
||||||
|
$candidateData[] = [
|
||||||
|
'candidate' => $candidate,
|
||||||
|
'quizCandidate' => $quizCandidatesByCandidateId[$candidateIdString] ?? null,
|
||||||
|
'givenAnswersCount' => $givenAnswersCountByCandidateId[$candidateIdString] ?? 0,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->render('backoffice/quiz.html.twig', [
|
||||||
|
'season' => $season,
|
||||||
|
'quiz' => $quiz,
|
||||||
|
'candidateData' => $candidateData,
|
||||||
|
'activeTab' => 'candidates',
|
||||||
|
'template' => 'backoffice/quiz/tab_candidates_list.html.twig',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/season/{seasonCode:season}/quiz/{quiz}/answer-mapping',
|
||||||
|
name: 'tvdt_backoffice_quiz_candidates',
|
||||||
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID],
|
||||||
|
)]
|
||||||
|
public function answerMapping(Season $season, Quiz $quiz): Response
|
||||||
|
{
|
||||||
|
$fetchedQuiz = $this->quizRepository->fetchWithQuestions($quiz->id);
|
||||||
|
|
||||||
|
if ($fetchedQuiz->questions->isEmpty()) {
|
||||||
|
$this->addFlash(FlashType::Warning, $this->translator->trans('This quiz has no questions yet'));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_quiz_overview', ['seasonCode' => $season->seasonCode, 'quiz' => $quiz->id]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$firstQuestion = $fetchedQuiz->questions->first();
|
||||||
|
\assert($firstQuestion instanceof Question);
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_quiz_candidates_question', [
|
||||||
|
'seasonCode' => $season->seasonCode,
|
||||||
|
'quiz' => $quiz->id,
|
||||||
|
'question' => $firstQuestion->id,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/season/{seasonCode:season}/quiz/{quiz}/candidates/{question}',
|
||||||
|
name: 'tvdt_backoffice_quiz_candidates_question',
|
||||||
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID],
|
||||||
|
methods: ['GET'],
|
||||||
|
)]
|
||||||
|
public function candidates_question(Season $season, Quiz $quiz, Question $question): Response
|
||||||
|
{
|
||||||
|
return $this->render('backoffice/quiz.html.twig', [
|
||||||
|
'season' => $season,
|
||||||
|
'quiz' => $quiz,
|
||||||
|
'question' => $question,
|
||||||
|
'candidates' => $season->candidates,
|
||||||
|
'activeTab' => 'answers',
|
||||||
|
'template' => 'backoffice/quiz/tab_candidates.html.twig',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[IsCsrfTokenValid('candidate_answer')]
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/season/{seasonCode:season}/quiz/{quiz}/candidates/{question}',
|
||||||
|
name: 'tvdt_backoffice_quiz_candidates_question_save',
|
||||||
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID],
|
||||||
|
methods: ['POST'],
|
||||||
|
)]
|
||||||
|
public function saveCandidateAnswers(Season $season, Quiz $quiz, Question $question, Request $request): RedirectResponse
|
||||||
|
{
|
||||||
|
if (false === $season->quizzes->contains($quiz)
|
||||||
|
|| false === $quiz->questions->contains($question)) {
|
||||||
|
throw new BadRequestHttpException('Invalid quiz or question');
|
||||||
|
}
|
||||||
|
|
||||||
|
$candidateAnswers = $request->request->all('candidate_answer');
|
||||||
|
|
||||||
|
// Clear existing candidate-answer associations for this question
|
||||||
|
foreach ($question->answers as $answer) {
|
||||||
|
if (false === $quiz->questions->contains($answer->question)) {
|
||||||
|
throw new BadRequestHttpException('Invalid question');
|
||||||
|
}
|
||||||
|
|
||||||
|
$answer->candidates->clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add new associations
|
||||||
|
foreach ($candidateAnswers as $candidateId => $answerIds) {
|
||||||
|
$candidate = $this->em->getRepository(Candidate::class)->find($candidateId);
|
||||||
|
|
||||||
|
if (false === $season->candidates->contains($candidate)) {
|
||||||
|
throw new BadRequestHttpException('Invalid candidate');
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ((array) $answerIds as $answerId) {
|
||||||
|
$answer = $this->em->getRepository(Answer::class)->find($answerId);
|
||||||
|
|
||||||
|
if (false === $question->answers->contains($answer)) {
|
||||||
|
throw new BadRequestHttpException('Invalid answer');
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($answer && $candidate) {
|
||||||
|
$answer->addCandidate($candidate);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->em->flush();
|
||||||
|
|
||||||
|
$this->addFlash(FlashType::Success, $this->translator->trans('Candidate answers saved'));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_quiz_candidates_question', [
|
||||||
|
'seasonCode' => $season->seasonCode,
|
||||||
|
'quiz' => $quiz->id,
|
||||||
|
'question' => $question->id,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[IsCsrfTokenValid('enable_quiz')]
|
||||||
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
||||||
#[Route(
|
#[Route(
|
||||||
'/backoffice/season/{seasonCode:season}/quiz/{quiz}/enable',
|
'/backoffice/season/{seasonCode:season}/quiz/{quiz}/enable',
|
||||||
name: 'tvdt_backoffice_enable',
|
name: 'tvdt_backoffice_enable',
|
||||||
requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID.'|null'],
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID.'|null'],
|
||||||
|
methods: ['POST'],
|
||||||
)]
|
)]
|
||||||
public function enableQuiz(Season $season, ?Quiz $quiz, EntityManagerInterface $em): RedirectResponse
|
public function enableQuiz(Season $season, ?Quiz $quiz, Request $request): RedirectResponse
|
||||||
{
|
{
|
||||||
|
if ($quiz instanceof Quiz && !$quiz->isFinalized) {
|
||||||
|
$this->addFlash(FlashType::Danger, $this->translator->trans('The quiz must be finalized before it can be activated'));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_quiz_overview', ['seasonCode' => $season->seasonCode, 'quiz' => $quiz->id]);
|
||||||
|
}
|
||||||
|
|
||||||
$season->activeQuiz = $quiz;
|
$season->activeQuiz = $quiz;
|
||||||
$em->flush();
|
$this->em->flush();
|
||||||
|
|
||||||
if ($quiz instanceof Quiz) {
|
if ($quiz instanceof Quiz) {
|
||||||
return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $season->seasonCode, 'quiz' => $quiz->id]);
|
return $this->redirectToRoute('tvdt_backoffice_quiz_overview', ['seasonCode' => $season->seasonCode, 'quiz' => $quiz->id]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// When deactivating, stay on the quiz page if one was passed
|
||||||
|
$previousQuizId = $request->request->getString('redirect_quiz');
|
||||||
|
if ('' !== $previousQuizId) {
|
||||||
|
$previousQuiz = $this->em->getRepository(Quiz::class)->find($previousQuizId);
|
||||||
|
if ($previousQuiz instanceof Quiz && $previousQuiz->season === $season) {
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_quiz_overview', ['seasonCode' => $season->seasonCode, 'quiz' => $previousQuiz->id]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->seasonCode]);
|
return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->seasonCode]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[IsCsrfTokenValid('clear_quiz')]
|
||||||
#[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
|
#[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
|
||||||
#[Route(
|
#[Route(
|
||||||
'/backoffice/quiz/{quiz}/clear',
|
'/backoffice/quiz/{quiz}/clear',
|
||||||
name: 'tvdt_backoffice_quiz_clear',
|
name: 'tvdt_backoffice_quiz_clear',
|
||||||
requirements: ['quiz' => Requirement::UUID],
|
requirements: ['quiz' => Requirement::UUID],
|
||||||
|
methods: ['POST'],
|
||||||
)]
|
)]
|
||||||
public function clearQuiz(Quiz $quiz, QuizRepository $quizRepository): RedirectResponse
|
public function clearQuiz(Quiz $quiz): RedirectResponse
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
$quizRepository->clearQuiz($quiz);
|
$this->quizRepository->clearQuiz($quiz);
|
||||||
$this->addFlash('success', $this->translator->trans('Quiz cleared'));
|
$this->addFlash(FlashType::Success, $this->translator->trans('Quiz cleared and no longer finalized'));
|
||||||
} catch (ErrorClearingQuizException) {
|
} catch (ErrorClearingQuizException) {
|
||||||
$this->addFlash('error', $this->translator->trans('Error clearing quiz'));
|
$this->addFlash(FlashType::Danger, $this->translator->trans('Error clearing quiz'));
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->season->seasonCode, 'quiz' => $quiz->id]);
|
return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->season->seasonCode, 'quiz' => $quiz->id]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[IsCsrfTokenValid('finalize_quiz')]
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/quiz/{quiz}/finalize',
|
||||||
|
name: 'tvdt_backoffice_quiz_finalize',
|
||||||
|
requirements: ['quiz' => Requirement::UUID],
|
||||||
|
methods: ['POST'],
|
||||||
|
)]
|
||||||
|
public function finalizeQuiz(Quiz $quiz): RedirectResponse
|
||||||
|
{
|
||||||
|
if ($quiz->questions->isEmpty() || [] !== $quiz->getQuestionErrors()) {
|
||||||
|
$this->addFlash(FlashType::Warning, $this->translator->trans('The quiz cannot be finalized while it has errors'));
|
||||||
|
} elseif (!$quiz->isFinalized) {
|
||||||
|
$quiz->finalizedAt = new DateTimeImmutable();
|
||||||
|
$this->em->flush();
|
||||||
|
$this->addFlash(FlashType::Success, $this->translator->trans('Quiz finalized'));
|
||||||
|
} else {
|
||||||
|
$this->addFlash(FlashType::Warning, $this->translator->trans('The quiz is already finalized'));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->season->seasonCode, 'quiz' => $quiz->id]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[IsCsrfTokenValid('unfinalize_quiz')]
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/quiz/{quiz}/unfinalize',
|
||||||
|
name: 'tvdt_backoffice_quiz_unfinalize',
|
||||||
|
requirements: ['quiz' => Requirement::UUID],
|
||||||
|
methods: ['POST'],
|
||||||
|
)]
|
||||||
|
public function unfinalizeQuiz(Quiz $quiz): RedirectResponse
|
||||||
|
{
|
||||||
|
if ($quiz->hasStartedCandidates) {
|
||||||
|
$this->addFlash(FlashType::Danger, $this->translator->trans('The quiz has already been filled in and can no longer be altered'));
|
||||||
|
} elseif ($quiz->season->activeQuiz === $quiz) {
|
||||||
|
$this->addFlash(FlashType::Danger, $this->translator->trans('Deactivate the quiz before undoing the finalization'));
|
||||||
|
} else {
|
||||||
|
$quiz->finalizedAt = null;
|
||||||
|
$this->em->flush();
|
||||||
|
$this->addFlash(FlashType::Success, $this->translator->trans('Quiz is no longer finalized'));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->season->seasonCode, 'quiz' => $quiz->id]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[IsCsrfTokenValid('delete_quiz')]
|
||||||
#[IsGranted(SeasonVoter::DELETE, subject: 'quiz')]
|
#[IsGranted(SeasonVoter::DELETE, subject: 'quiz')]
|
||||||
#[Route(
|
#[Route(
|
||||||
'/backoffice/quiz/{quiz}/delete',
|
'/backoffice/quiz/{quiz}/delete',
|
||||||
name: 'tvdt_backoffice_quiz_delete',
|
name: 'tvdt_backoffice_quiz_delete',
|
||||||
requirements: ['quiz' => Requirement::UUID],
|
requirements: ['quiz' => Requirement::UUID],
|
||||||
|
methods: ['POST'],
|
||||||
)]
|
)]
|
||||||
public function deleteQuiz(Quiz $quiz, QuizRepository $quizRepository): RedirectResponse
|
public function deleteQuiz(Quiz $quiz): RedirectResponse
|
||||||
{
|
{
|
||||||
$quizRepository->deleteQuiz($quiz);
|
$this->quizRepository->deleteQuiz($quiz);
|
||||||
|
|
||||||
$this->addFlash('success', $this->translator->trans('Quiz deleted'));
|
$this->addFlash(FlashType::Success, $this->translator->trans('Quiz deleted'));
|
||||||
|
|
||||||
return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $quiz->season->seasonCode]);
|
return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $quiz->season->seasonCode]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[IsCsrfTokenValid('candidate_correction')]
|
||||||
#[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
|
#[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
|
||||||
#[Route(
|
#[Route(
|
||||||
'/backoffice/quiz/{quiz}/candidate/{candidate}/modify_correction',
|
'/backoffice/quiz/{quiz}/candidate/{candidate}/modify_correction',
|
||||||
name: 'tvdt_backoffice_modify_correction',
|
name: 'tvdt_backoffice_modify_correction',
|
||||||
requirements: ['quiz' => Requirement::UUID, 'candidate' => Requirement::UUID],
|
requirements: ['quiz' => Requirement::UUID, 'candidate' => Requirement::UUID],
|
||||||
|
methods: ['POST'],
|
||||||
)]
|
)]
|
||||||
public function modifyCorrection(Quiz $quiz, Candidate $candidate, QuizCandidateRepository $quizCandidateRepository, Request $request): RedirectResponse
|
public function modifyCorrection(Quiz $quiz, Candidate $candidate, Request $request): RedirectResponse
|
||||||
{
|
{
|
||||||
if (!$request->isMethod('POST')) {
|
|
||||||
throw new MethodNotAllowedHttpException(['POST']);
|
|
||||||
}
|
|
||||||
|
|
||||||
$corrections = (float) $request->request->get('corrections');
|
$corrections = (float) $request->request->get('corrections');
|
||||||
|
|
||||||
$quizCandidateRepository->setCorrectionsForCandidate($quiz, $candidate, $corrections);
|
$this->quizCandidateRepository->setCorrectionsForCandidate($quiz, $candidate, $corrections);
|
||||||
|
|
||||||
return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->season->seasonCode, 'quiz' => $quiz->id]);
|
return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->season->seasonCode, 'quiz' => $quiz->id]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[IsCsrfTokenValid('candidate_penalty')]
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/quiz/{quiz}/candidate/{candidate}/modify_penalty',
|
||||||
|
name: 'tvdt_backoffice_modify_penalty',
|
||||||
|
requirements: ['quiz' => Requirement::UUID, 'candidate' => Requirement::UUID],
|
||||||
|
methods: ['POST'],
|
||||||
|
)]
|
||||||
|
public function modifyPenalty(Quiz $quiz, Candidate $candidate, Request $request): RedirectResponse
|
||||||
|
{
|
||||||
|
$penalty = (int) $request->request->get('penalty');
|
||||||
|
|
||||||
|
$this->quizCandidateRepository->setPenaltyForCandidate($quiz, $candidate, $penalty);
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_quiz', ['seasonCode' => $quiz->season->seasonCode, 'quiz' => $quiz->id]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[IsCsrfTokenValid('toggle_candidate')]
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'quiz')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/quiz/{quiz}/candidate/{candidate}/toggle',
|
||||||
|
name: 'tvdt_backoffice_toggle_candidate',
|
||||||
|
requirements: ['quiz' => Requirement::UUID, 'candidate' => Requirement::UUID],
|
||||||
|
methods: ['POST'],
|
||||||
|
)]
|
||||||
|
public function toggleCandidate(Quiz $quiz, Candidate $candidate): RedirectResponse
|
||||||
|
{
|
||||||
|
$quizCandidate = $this->quizCandidateRepository->findOneBy([
|
||||||
|
'quiz' => $quiz,
|
||||||
|
'candidate' => $candidate,
|
||||||
|
]);
|
||||||
|
|
||||||
|
if (!$quizCandidate instanceof QuizCandidate) {
|
||||||
|
// Create new QuizCandidate if it doesn't exist (inactive by default when first toggling)
|
||||||
|
$quizCandidate = new QuizCandidate($quiz, $candidate);
|
||||||
|
$quizCandidate->active = false;
|
||||||
|
$this->em->persist($quizCandidate);
|
||||||
|
} else {
|
||||||
|
$quizCandidate->active = !$quizCandidate->active;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->em->flush();
|
||||||
|
|
||||||
|
$this->addFlash(FlashType::Success, $this->translator->trans('Candidate status updated'));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_quiz_candidates_tab', ['seasonCode' => $quiz->season->seasonCode, 'quiz' => $quiz->id]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,75 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Tvdt\Controller\Backoffice;
|
||||||
|
|
||||||
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
|
use Symfony\Component\HttpKernel\Attribute\AsController;
|
||||||
|
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||||
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
|
use Symfony\Component\Routing\Requirement\Requirement;
|
||||||
|
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||||
|
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||||
|
use Tvdt\Controller\AbstractController;
|
||||||
|
use Tvdt\Entity\Question;
|
||||||
|
use Tvdt\Entity\Quiz;
|
||||||
|
use Tvdt\Entity\Season;
|
||||||
|
use Tvdt\Enum\FlashType;
|
||||||
|
use Tvdt\Form\QuestionFormType;
|
||||||
|
use Tvdt\Security\Voter\SeasonVoter;
|
||||||
|
|
||||||
|
#[AsController]
|
||||||
|
#[IsGranted('ROLE_USER')]
|
||||||
|
class QuizQuestionController extends AbstractController
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private readonly EntityManagerInterface $em,
|
||||||
|
private readonly TranslatorInterface $translator,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
#[IsGranted(SeasonVoter::MODIFY_QUIZ_CONTENT, subject: 'question')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/season/{seasonCode:season}/quiz/{quiz}/question/{question}/edit',
|
||||||
|
name: 'tvdt_backoffice_quiz_question_edit',
|
||||||
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'quiz' => Requirement::UUID, 'question' => Requirement::UUID],
|
||||||
|
)]
|
||||||
|
public function edit(Season $season, Quiz $quiz, Question $question, Request $request): Response
|
||||||
|
{
|
||||||
|
if ($question->quiz !== $quiz || $quiz->season !== $season) {
|
||||||
|
throw new NotFoundHttpException();
|
||||||
|
}
|
||||||
|
|
||||||
|
$form = $this->createForm(QuestionFormType::class, $question);
|
||||||
|
$form->handleRequest($request);
|
||||||
|
|
||||||
|
if ($form->isSubmitted() && $form->isValid()) {
|
||||||
|
$this->applyAnswerOrdering($question);
|
||||||
|
$this->em->flush();
|
||||||
|
|
||||||
|
$this->addFlash(FlashType::Success, $this->translator->trans('Question updated'));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_quiz_overview', [
|
||||||
|
'seasonCode' => $season->seasonCode,
|
||||||
|
'quiz' => $quiz->id,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->render('backoffice/quiz/question_form.html.twig', [
|
||||||
|
'season' => $season,
|
||||||
|
'quiz' => $quiz,
|
||||||
|
'question' => $question,
|
||||||
|
'form' => $form,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function applyAnswerOrdering(Question $question): void
|
||||||
|
{
|
||||||
|
$ordering = 1;
|
||||||
|
foreach ($question->answers as $answer) {
|
||||||
|
$answer->ordering = $ordering++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,13 +4,19 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace Tvdt\Controller\Backoffice;
|
namespace Tvdt\Controller\Backoffice;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
|
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
|
||||||
|
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
||||||
|
use Symfony\Component\Form\FormError;
|
||||||
use Symfony\Component\HttpFoundation\File\UploadedFile;
|
use Symfony\Component\HttpFoundation\File\UploadedFile;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Component\HttpKernel\Attribute\AsController;
|
use Symfony\Component\HttpKernel\Attribute\AsController;
|
||||||
use Symfony\Component\Routing\Attribute\Route;
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||||
|
use Symfony\Component\Validator\Constraints\Length;
|
||||||
|
use Symfony\Component\Validator\Constraints\NotBlank;
|
||||||
use Symfony\Contracts\Translation\TranslatorInterface;
|
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||||
use Tvdt\Controller\AbstractController;
|
use Tvdt\Controller\AbstractController;
|
||||||
use Tvdt\Entity\Candidate;
|
use Tvdt\Entity\Candidate;
|
||||||
@@ -30,6 +36,7 @@ class SeasonController extends AbstractController
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly TranslatorInterface $translator,
|
private readonly TranslatorInterface $translator,
|
||||||
private readonly EntityManagerInterface $em,
|
private readonly EntityManagerInterface $em,
|
||||||
|
private readonly QuizSpreadsheetService $quizSpreadsheet,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
||||||
@@ -38,7 +45,39 @@ class SeasonController extends AbstractController
|
|||||||
name: 'tvdt_backoffice_season',
|
name: 'tvdt_backoffice_season',
|
||||||
requirements: ['seasonCode' => self::SEASON_CODE_REGEX],
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX],
|
||||||
)]
|
)]
|
||||||
public function index(Season $season, Request $request): Response
|
public function index(Season $season): Response
|
||||||
|
{
|
||||||
|
return $this->render('backoffice/season.html.twig', [
|
||||||
|
'season' => $season,
|
||||||
|
'activeTab' => 'tests',
|
||||||
|
'template' => 'backoffice/season/tab_tests.html.twig',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/season/{seasonCode:season}/candidates',
|
||||||
|
name: 'tvdt_backoffice_season_candidates',
|
||||||
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX],
|
||||||
|
priority: 10,
|
||||||
|
)]
|
||||||
|
public function candidatesTab(Season $season): Response
|
||||||
|
{
|
||||||
|
return $this->render('backoffice/season.html.twig', [
|
||||||
|
'season' => $season,
|
||||||
|
'activeTab' => 'candidates',
|
||||||
|
'template' => 'backoffice/season/tab_candidates.html.twig',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/season/{seasonCode:season}/settings',
|
||||||
|
name: 'tvdt_backoffice_season_settings',
|
||||||
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX],
|
||||||
|
priority: 10,
|
||||||
|
)]
|
||||||
|
public function settingsTab(Season $season, Request $request): Response
|
||||||
{
|
{
|
||||||
$form = $this->createForm(SettingsForm::class, $season->settings);
|
$form = $this->createForm(SettingsForm::class, $season->settings);
|
||||||
|
|
||||||
@@ -46,11 +85,15 @@ class SeasonController extends AbstractController
|
|||||||
|
|
||||||
if ($form->isSubmitted() && $form->isValid()) {
|
if ($form->isSubmitted() && $form->isValid()) {
|
||||||
$this->em->flush();
|
$this->em->flush();
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_season_settings', ['seasonCode' => $season->seasonCode]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->render('backoffice/season.html.twig', [
|
return $this->render('backoffice/season.html.twig', [
|
||||||
'season' => $season,
|
'season' => $season,
|
||||||
'form' => $form,
|
'form' => $form,
|
||||||
|
'activeTab' => 'settings',
|
||||||
|
'template' => 'backoffice/season/tab_settings.html.twig',
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -77,7 +120,7 @@ class SeasonController extends AbstractController
|
|||||||
return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->seasonCode]);
|
return $this->redirectToRoute('tvdt_backoffice_season', ['seasonCode' => $season->seasonCode]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->render('backoffice/season_add_candidates.html.twig', ['form' => $form]);
|
return $this->render('backoffice/season_add_candidates.html.twig', ['form' => $form, 'season' => $season]);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
||||||
@@ -87,7 +130,7 @@ class SeasonController extends AbstractController
|
|||||||
requirements: ['seasonCode' => self::SEASON_CODE_REGEX],
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX],
|
||||||
priority: 10,
|
priority: 10,
|
||||||
)]
|
)]
|
||||||
public function addQuiz(Request $request, Season $season, QuizSpreadsheetService $quizSpreadsheet): Response
|
public function addQuiz(Request $request, Season $season): Response
|
||||||
{
|
{
|
||||||
$quiz = new Quiz();
|
$quiz = new Quiz();
|
||||||
$form = $this->createForm(UploadQuizFormType::class, $quiz);
|
$form = $this->createForm(UploadQuizFormType::class, $quiz);
|
||||||
@@ -98,7 +141,7 @@ class SeasonController extends AbstractController
|
|||||||
/* @var UploadedFile $sheet */
|
/* @var UploadedFile $sheet */
|
||||||
$sheet = $form->get('sheet')->getData();
|
$sheet = $form->get('sheet')->getData();
|
||||||
|
|
||||||
$quizSpreadsheet->xlsxToQuiz($quiz, $sheet);
|
$this->quizSpreadsheet->xlsxToQuiz($quiz, $sheet);
|
||||||
|
|
||||||
$quiz->season = $season;
|
$quiz->season = $season;
|
||||||
$this->em->persist($quiz);
|
$this->em->persist($quiz);
|
||||||
@@ -111,4 +154,52 @@ class SeasonController extends AbstractController
|
|||||||
|
|
||||||
return $this->render('/backoffice/quiz_add.html.twig', ['form' => $form, 'season' => $season]);
|
return $this->render('/backoffice/quiz_add.html.twig', ['form' => $form, 'season' => $season]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[IsGranted(SeasonVoter::EDIT, subject: 'season')]
|
||||||
|
#[Route(
|
||||||
|
'/backoffice/season/{seasonCode:season}/add-blank-quiz',
|
||||||
|
name: 'tvdt_backoffice_quiz_add_blank',
|
||||||
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX],
|
||||||
|
priority: 10,
|
||||||
|
)]
|
||||||
|
public function addBlankQuiz(Request $request, Season $season): Response
|
||||||
|
{
|
||||||
|
$form = $this->createFormBuilder(new Quiz())
|
||||||
|
->add('name', TextType::class, [
|
||||||
|
'label' => $this->translator->trans('Quiz name'),
|
||||||
|
'translation_domain' => false,
|
||||||
|
'constraints' => [
|
||||||
|
new NotBlank(),
|
||||||
|
new Length(max: 64),
|
||||||
|
],
|
||||||
|
])
|
||||||
|
->add('save', SubmitType::class, ['label' => 'Create'])
|
||||||
|
->getForm();
|
||||||
|
|
||||||
|
$form->handleRequest($request);
|
||||||
|
|
||||||
|
if ($form->isSubmitted() && $form->isValid()) {
|
||||||
|
/** @var Quiz $quiz */
|
||||||
|
$quiz = $form->getData();
|
||||||
|
$quiz->season = $season;
|
||||||
|
$this->em->persist($quiz);
|
||||||
|
|
||||||
|
try {
|
||||||
|
$this->em->flush();
|
||||||
|
} catch (UniqueConstraintViolationException) {
|
||||||
|
$form->get('name')->addError(new FormError($this->translator->trans('A quiz with this name already exists in this season')));
|
||||||
|
|
||||||
|
return $this->render('/backoffice/quiz_add_blank.html.twig', ['form' => $form, 'season' => $season]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->addFlash(FlashType::Success, $this->translator->trans('Quiz Added!'));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_quiz_overview', [
|
||||||
|
'seasonCode' => $season->seasonCode,
|
||||||
|
'quiz' => $quiz->id,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->render('/backoffice/quiz_add_blank.html.twig', ['form' => $form, 'season' => $season]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ use function Symfony\Component\Translation\t;
|
|||||||
#[IsGranted('ROLE_USER')]
|
#[IsGranted('ROLE_USER')]
|
||||||
final class EliminationController extends AbstractController
|
final class EliminationController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(private readonly TranslatorInterface $translator) {}
|
public function __construct(private readonly TranslatorInterface $translator, private readonly CandidateRepository $candidateRepository) {}
|
||||||
|
|
||||||
#[IsGranted(SeasonVoter::ELIMINATION, 'elimination')]
|
#[IsGranted(SeasonVoter::ELIMINATION, 'elimination')]
|
||||||
#[Route('/elimination/{elimination}', name: 'tvdt_elimination', requirements: ['elimination' => Requirement::UUID])]
|
#[Route('/elimination/{elimination}', name: 'tvdt_elimination', requirements: ['elimination' => Requirement::UUID])]
|
||||||
@@ -50,12 +50,12 @@ final class EliminationController extends AbstractController
|
|||||||
|
|
||||||
#[IsGranted(SeasonVoter::ELIMINATION, 'elimination')]
|
#[IsGranted(SeasonVoter::ELIMINATION, 'elimination')]
|
||||||
#[Route('/elimination/{elimination}/{candidateHash}', name: 'tvdt_elimination_candidate', requirements: ['elimination' => Requirement::UUID, 'candidateHash' => self::CANDIDATE_HASH_REGEX])]
|
#[Route('/elimination/{elimination}/{candidateHash}', name: 'tvdt_elimination_candidate', requirements: ['elimination' => Requirement::UUID, 'candidateHash' => self::CANDIDATE_HASH_REGEX])]
|
||||||
public function candidateScreen(Elimination $elimination, string $candidateHash, CandidateRepository $candidateRepository): Response
|
public function candidateScreen(Elimination $elimination, string $candidateHash): Response
|
||||||
{
|
{
|
||||||
$candidate = $candidateRepository->getCandidateByHash($elimination->quiz->season, $candidateHash);
|
$candidate = $this->candidateRepository->getCandidateByHash($elimination->quiz->season, $candidateHash);
|
||||||
if (!$candidate instanceof Candidate) {
|
if (!$candidate instanceof Candidate) {
|
||||||
$this->addFlash(FlashType::Warning,
|
$this->addFlash(FlashType::Warning,
|
||||||
t('Cound not find candidate with name %name%', ['%name%' => Base64::base64UrlDecode($candidateHash)])->trans($this->translator),
|
t('Could not find candidate with name {name}', ['name' => Base64::base64UrlDecode($candidateHash)])->trans($this->translator),
|
||||||
);
|
);
|
||||||
|
|
||||||
return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);
|
return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);
|
||||||
@@ -64,7 +64,7 @@ final class EliminationController extends AbstractController
|
|||||||
$screenColour = $elimination->getScreenColour($candidate->name);
|
$screenColour = $elimination->getScreenColour($candidate->name);
|
||||||
|
|
||||||
if (null === $screenColour) {
|
if (null === $screenColour) {
|
||||||
$this->addFlash(FlashType::Warning, $this->translator->trans('Cound not find candidate with name %name% in elimination.', ['%name%' => $candidate->name]));
|
$this->addFlash(FlashType::Warning, $this->translator->trans('Could not find candidate with name {name} in elimination.', ['name' => $candidate->name]));
|
||||||
|
|
||||||
return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);
|
return $this->redirectToRoute('tvdt_elimination', ['elimination' => $elimination->id]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ use Symfony\Component\HttpFoundation\Response;
|
|||||||
use Symfony\Component\HttpKernel\Attribute\AsController;
|
use Symfony\Component\HttpKernel\Attribute\AsController;
|
||||||
use Symfony\Component\Routing\Attribute\Route;
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
use Symfony\Component\Security\Core\Exception\AuthenticationException;
|
use Symfony\Component\Security\Core\Exception\AuthenticationException;
|
||||||
|
use Symfony\Component\Security\Core\User\UserInterface;
|
||||||
use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
|
use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
|
||||||
use Symfony\Contracts\Translation\TranslatorInterface;
|
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||||
use Tvdt\Enum\FlashType;
|
use Tvdt\Enum\FlashType;
|
||||||
@@ -15,17 +16,21 @@ use Tvdt\Enum\FlashType;
|
|||||||
#[AsController]
|
#[AsController]
|
||||||
final class LoginController extends AbstractController
|
final class LoginController extends AbstractController
|
||||||
{
|
{
|
||||||
|
public function __construct(private readonly AuthenticationUtils $authenticationUtils, private readonly TranslatorInterface $translator) {}
|
||||||
|
|
||||||
#[Route(path: '/login', name: 'tvdt_login_login')]
|
#[Route(path: '/login', name: 'tvdt_login_login')]
|
||||||
public function login(AuthenticationUtils $authenticationUtils, TranslatorInterface $translator): Response
|
public function login(): Response
|
||||||
{
|
{
|
||||||
|
if ($this->getUser() instanceof UserInterface) {
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_index');
|
||||||
|
}
|
||||||
|
|
||||||
// get the login error if there is one
|
// get the login error if there is one
|
||||||
$error = $authenticationUtils->getLastAuthenticationError();
|
$error = $this->authenticationUtils->getLastAuthenticationError();
|
||||||
|
|
||||||
// last username entered by the user
|
// last username entered by the user
|
||||||
$lastUsername = $authenticationUtils->getLastUsername();
|
$lastUsername = $this->authenticationUtils->getLastUsername();
|
||||||
|
|
||||||
if ($error instanceof AuthenticationException) {
|
if ($error instanceof AuthenticationException) {
|
||||||
$this->addFlash(FlashType::Danger, $translator->trans($error->getMessageKey(), $error->getMessageData(), 'security'));
|
$this->addFlash(FlashType::Danger, $this->translator->trans($error->getMessageKey(), $error->getMessageData(), 'security'));
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->render('backoffice/login/login.html.twig', [
|
return $this->render('backoffice/login/login.html.twig', [
|
||||||
|
|||||||
@@ -4,11 +4,12 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace Tvdt\Controller;
|
namespace Tvdt\Controller;
|
||||||
|
|
||||||
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Component\HttpKernel\Attribute\AsController;
|
use Symfony\Component\HttpKernel\Attribute\AsController;
|
||||||
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
|
|
||||||
use Symfony\Component\Routing\Attribute\Route;
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
|
use Symfony\Component\Security\Http\Attribute\IsCsrfTokenValid;
|
||||||
use Symfony\Contracts\Translation\TranslatorInterface;
|
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||||
use Tvdt\Entity\Answer;
|
use Tvdt\Entity\Answer;
|
||||||
use Tvdt\Entity\Candidate;
|
use Tvdt\Entity\Candidate;
|
||||||
@@ -22,7 +23,6 @@ use Tvdt\Form\SelectSeasonType;
|
|||||||
use Tvdt\Helpers\Base64;
|
use Tvdt\Helpers\Base64;
|
||||||
use Tvdt\Repository\AnswerRepository;
|
use Tvdt\Repository\AnswerRepository;
|
||||||
use Tvdt\Repository\CandidateRepository;
|
use Tvdt\Repository\CandidateRepository;
|
||||||
use Tvdt\Repository\GivenAnswerRepository;
|
|
||||||
use Tvdt\Repository\QuestionRepository;
|
use Tvdt\Repository\QuestionRepository;
|
||||||
use Tvdt\Repository\QuizCandidateRepository;
|
use Tvdt\Repository\QuizCandidateRepository;
|
||||||
use Tvdt\Repository\SeasonRepository;
|
use Tvdt\Repository\SeasonRepository;
|
||||||
@@ -30,10 +30,10 @@ use Tvdt\Repository\SeasonRepository;
|
|||||||
#[AsController]
|
#[AsController]
|
||||||
final class QuizController extends AbstractController
|
final class QuizController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(private readonly TranslatorInterface $translator) {}
|
public function __construct(private readonly TranslatorInterface $translator, private readonly EntityManagerInterface $entityManager, private readonly SeasonRepository $seasonRepository, private readonly CandidateRepository $candidateRepository, private readonly QuestionRepository $questionRepository, private readonly AnswerRepository $answerRepository, private readonly QuizCandidateRepository $quizCandidateRepository) {}
|
||||||
|
|
||||||
#[Route(path: '/', name: 'tvdt_quiz_select_season', methods: ['GET', 'POST'])]
|
#[Route(path: '/', name: 'tvdt_quiz_select_season', methods: ['GET', 'POST'])]
|
||||||
public function selectSeason(Request $request, SeasonRepository $seasonRepository): Response
|
public function selectSeason(Request $request): Response
|
||||||
{
|
{
|
||||||
$form = $this->createForm(SelectSeasonType::class);
|
$form = $this->createForm(SelectSeasonType::class);
|
||||||
$form->handleRequest($request);
|
$form->handleRequest($request);
|
||||||
@@ -41,7 +41,7 @@ final class QuizController extends AbstractController
|
|||||||
if ($form->isSubmitted() && $form->isValid()) {
|
if ($form->isSubmitted() && $form->isValid()) {
|
||||||
$seasonCode = $form->get('season_code')->getData();
|
$seasonCode = $form->get('season_code')->getData();
|
||||||
|
|
||||||
if ([] === $seasonRepository->findBy(['seasonCode' => $seasonCode])) {
|
if ([] === $this->seasonRepository->findBy(['seasonCode' => $seasonCode])) {
|
||||||
$this->addFlash(FlashType::Warning, $this->translator->trans('Invalid season code'));
|
$this->addFlash(FlashType::Warning, $this->translator->trans('Invalid season code'));
|
||||||
|
|
||||||
return $this->redirectToRoute('tvdt_quiz_select_season');
|
return $this->redirectToRoute('tvdt_quiz_select_season');
|
||||||
@@ -71,22 +71,19 @@ final class QuizController extends AbstractController
|
|||||||
return $this->render('quiz/enter_name.twig', ['season' => $season, 'form' => $form]);
|
return $this->render('quiz/enter_name.twig', ['season' => $season, 'form' => $form]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[IsCsrfTokenValid('question', tokenKey: 'token', methods: ['POST'])]
|
||||||
#[Route(
|
#[Route(
|
||||||
path: '/{seasonCode:season}/{nameHash}',
|
path: '/{seasonCode:season}/{nameHash}',
|
||||||
name: 'tvdt_quiz_quiz_page',
|
name: 'tvdt_quiz_quiz_page',
|
||||||
requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'nameHash' => self::CANDIDATE_HASH_REGEX],
|
requirements: ['seasonCode' => self::SEASON_CODE_REGEX, 'nameHash' => self::CANDIDATE_HASH_REGEX],
|
||||||
|
methods: ['GET', 'POST'],
|
||||||
)]
|
)]
|
||||||
public function quizPage(
|
public function quizPage(
|
||||||
Season $season,
|
Season $season,
|
||||||
string $nameHash,
|
string $nameHash,
|
||||||
Request $request,
|
Request $request,
|
||||||
CandidateRepository $candidateRepository,
|
|
||||||
QuestionRepository $questionRepository,
|
|
||||||
AnswerRepository $answerRepository,
|
|
||||||
GivenAnswerRepository $givenAnswerRepository,
|
|
||||||
QuizCandidateRepository $quizCandidateRepository,
|
|
||||||
): Response {
|
): Response {
|
||||||
$candidate = $candidateRepository->getCandidateByHash($season, $nameHash);
|
$candidate = $this->candidateRepository->getCandidateByHash($season, $nameHash);
|
||||||
|
|
||||||
if (!$candidate instanceof Candidate) {
|
if (!$candidate instanceof Candidate) {
|
||||||
$this->addFlash(FlashType::Danger, $this->translator->trans('Candidate not found'));
|
$this->addFlash(FlashType::Danger, $this->translator->trans('Candidate not found'));
|
||||||
@@ -102,29 +99,58 @@ final class QuizController extends AbstractController
|
|||||||
return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->seasonCode]);
|
return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->seasonCode]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ('POST' === $request->getMethod()) {
|
if ($request->isMethod('POST')) {
|
||||||
$answer = $answerRepository->findOneBy(['id' => $request->request->get('answer')]);
|
// TODO: Extract saving answer logic to a service
|
||||||
|
// Check if candidate is inactive for this quiz
|
||||||
|
$quizCandidate = $this->quizCandidateRepository->findOneBy(['quiz' => $quiz, 'candidate' => $candidate]);
|
||||||
|
if (null !== $quizCandidate && !$quizCandidate->active) {
|
||||||
|
$this->addFlash(FlashType::Danger, $this->translator->trans('You are not allowed to answer this quiz'));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->seasonCode]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$answer = $this->answerRepository->findOneBy(['id' => $request->request->get('answer')]);
|
||||||
|
|
||||||
if (!$answer instanceof Answer) {
|
if (!$answer instanceof Answer) {
|
||||||
throw new BadRequestHttpException('Invalid Answer ID');
|
$this->addFlash(FlashType::Danger, $this->translator->trans('Please select an answer'));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_quiz_quiz_page', ['seasonCode' => $season->seasonCode, 'nameHash' => $nameHash]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($answer->question !== $this->questionRepository->findNextQuestionForCandidate($candidate)) {
|
||||||
|
$this->addFlash(FlashType::Danger, $this->translator->trans('You cannot answer this question'));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_quiz_quiz_page', ['seasonCode' => $season->seasonCode, 'nameHash' => $nameHash]);
|
||||||
}
|
}
|
||||||
|
|
||||||
$givenAnswer = new GivenAnswer($candidate, $answer->question->quiz, $answer);
|
$givenAnswer = new GivenAnswer($candidate, $answer->question->quiz, $answer);
|
||||||
$givenAnswerRepository->save($givenAnswer);
|
$this->entityManager->persist($givenAnswer);
|
||||||
|
$this->entityManager->flush();
|
||||||
|
|
||||||
|
// end of extracting saving answer logic
|
||||||
return $this->redirectToRoute('tvdt_quiz_quiz_page', ['seasonCode' => $season->seasonCode, 'nameHash' => $nameHash]);
|
return $this->redirectToRoute('tvdt_quiz_quiz_page', ['seasonCode' => $season->seasonCode, 'nameHash' => $nameHash]);
|
||||||
}
|
}
|
||||||
|
|
||||||
$question = $questionRepository->findNextQuestionForCandidate($candidate);
|
// TODO: Extract getting next question logic to a service
|
||||||
|
$question = $this->questionRepository->findNextQuestionForCandidate($candidate);
|
||||||
|
|
||||||
|
// Keep creating flash here based on the return type of service call
|
||||||
if (!$question instanceof Question) {
|
if (!$question instanceof Question) {
|
||||||
$this->addFlash(FlashType::Success, $this->translator->trans('Quiz completed'));
|
$this->addFlash(FlashType::Success, $this->translator->trans('Quiz completed'));
|
||||||
|
|
||||||
return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->seasonCode]);
|
return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->seasonCode]);
|
||||||
}
|
}
|
||||||
|
|
||||||
$quizCandidateRepository->createIfNotExist($quiz, $candidate);
|
$result = $this->quizCandidateRepository->createIfNotExist($quiz, $candidate);
|
||||||
|
|
||||||
|
// Check if candidate is inactive
|
||||||
|
if (null === $result) {
|
||||||
|
$this->addFlash(FlashType::Danger, $this->translator->trans('You are not allowed to answer this quiz'));
|
||||||
|
|
||||||
|
return $this->redirectToRoute('tvdt_quiz_enter_name', ['seasonCode' => $season->seasonCode]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// end of extracting getting next question logic
|
||||||
return $this->render('quiz/question.twig', ['candidate' => $candidate, 'question' => $question, 'season' => $season]);
|
return $this->render('quiz/question.twig', ['candidate' => $candidate, 'question' => $question, 'season' => $season]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,30 +9,33 @@ use Psr\Log\LoggerInterface;
|
|||||||
use Symfony\Bridge\Twig\Mime\TemplatedEmail;
|
use Symfony\Bridge\Twig\Mime\TemplatedEmail;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Bundle\SecurityBundle\Security;
|
use Symfony\Bundle\SecurityBundle\Security;
|
||||||
|
use Symfony\Component\HttpFoundation\RedirectResponse;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
|
use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
|
||||||
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
|
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
|
||||||
use Symfony\Component\Routing\Attribute\Route;
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
|
use Symfony\Component\Security\Core\User\UserInterface;
|
||||||
use Symfony\Contracts\Translation\TranslatorInterface;
|
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||||
use SymfonyCasts\Bundle\VerifyEmail\Exception\VerifyEmailExceptionInterface;
|
use SymfonyCasts\Bundle\VerifyEmail\Exception\VerifyEmailExceptionInterface;
|
||||||
use Tvdt\Entity\User;
|
use Tvdt\Entity\User;
|
||||||
|
use Tvdt\Enum\FlashType;
|
||||||
use Tvdt\Form\RegistrationFormType;
|
use Tvdt\Form\RegistrationFormType;
|
||||||
use Tvdt\Repository\UserRepository;
|
use Tvdt\Repository\UserRepository;
|
||||||
use Tvdt\Security\EmailVerifier;
|
use Tvdt\Security\EmailVerifier;
|
||||||
|
|
||||||
final class RegistrationController extends AbstractController
|
final class RegistrationController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(private readonly EmailVerifier $emailVerifier, private readonly TranslatorInterface $translator) {}
|
public function __construct(private readonly EmailVerifier $emailVerifier, private readonly TranslatorInterface $translator, private readonly UserPasswordHasherInterface $userPasswordHasher, private readonly Security $security, private readonly LoggerInterface $logger, private readonly UserRepository $userRepository, private readonly EntityManagerInterface $entityManager) {}
|
||||||
|
|
||||||
#[Route('/register', name: 'tvdt_register')]
|
#[Route('/register', name: 'tvdt_register')]
|
||||||
public function register(
|
public function register(
|
||||||
Request $request,
|
Request $request,
|
||||||
UserPasswordHasherInterface $userPasswordHasher,
|
|
||||||
Security $security,
|
|
||||||
EntityManagerInterface $entityManager,
|
|
||||||
LoggerInterface $logger,
|
|
||||||
): Response {
|
): Response {
|
||||||
|
if ($this->getUser() instanceof UserInterface) {
|
||||||
|
return $this->redirectToRoute('tvdt_backoffice_index');
|
||||||
|
}
|
||||||
|
|
||||||
$user = new User();
|
$user = new User();
|
||||||
$form = $this->createForm(RegistrationFormType::class, $user);
|
$form = $this->createForm(RegistrationFormType::class, $user);
|
||||||
$form->handleRequest($request);
|
$form->handleRequest($request);
|
||||||
@@ -41,10 +44,10 @@ final class RegistrationController extends AbstractController
|
|||||||
/** @var string $plainPassword */
|
/** @var string $plainPassword */
|
||||||
$plainPassword = $form->get('plainPassword')->getData();
|
$plainPassword = $form->get('plainPassword')->getData();
|
||||||
|
|
||||||
$user->password = $userPasswordHasher->hashPassword($user, $plainPassword);
|
$user->password = $this->userPasswordHasher->hashPassword($user, $plainPassword);
|
||||||
|
|
||||||
$entityManager->persist($user);
|
$this->entityManager->persist($user);
|
||||||
$entityManager->flush();
|
$this->entityManager->flush();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// generate a signed url and email it to the user
|
// generate a signed url and email it to the user
|
||||||
@@ -55,10 +58,10 @@ final class RegistrationController extends AbstractController
|
|||||||
->htmlTemplate('backoffice/registration/confirmation_email.html.twig'),
|
->htmlTemplate('backoffice/registration/confirmation_email.html.twig'),
|
||||||
);
|
);
|
||||||
} catch (TransportExceptionInterface $e) {
|
} catch (TransportExceptionInterface $e) {
|
||||||
$logger->error($e->getMessage());
|
$this->logger->error($e->getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
$response = $security->login($user, 'form_login', 'main');
|
$response = $this->security->login($user, 'form_login', 'main');
|
||||||
\assert($response instanceof Response);
|
\assert($response instanceof Response);
|
||||||
|
|
||||||
return $response;
|
return $response;
|
||||||
@@ -70,7 +73,7 @@ final class RegistrationController extends AbstractController
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[Route('/verify/email', name: 'tvdt_verify_email')]
|
#[Route('/verify/email', name: 'tvdt_verify_email')]
|
||||||
public function verifyUserEmail(Request $request, TranslatorInterface $translator, UserRepository $userRepository): Response
|
public function verifyUserEmail(Request $request): RedirectResponse
|
||||||
{
|
{
|
||||||
$id = $request->query->get('id');
|
$id = $request->query->get('id');
|
||||||
|
|
||||||
@@ -78,7 +81,7 @@ final class RegistrationController extends AbstractController
|
|||||||
return $this->redirectToRoute('tvdt_register');
|
return $this->redirectToRoute('tvdt_register');
|
||||||
}
|
}
|
||||||
|
|
||||||
$user = $userRepository->find($id);
|
$user = $this->userRepository->find($id);
|
||||||
|
|
||||||
if (null === $user) {
|
if (null === $user) {
|
||||||
return $this->redirectToRoute('tvdt_register');
|
return $this->redirectToRoute('tvdt_register');
|
||||||
@@ -88,12 +91,12 @@ final class RegistrationController extends AbstractController
|
|||||||
try {
|
try {
|
||||||
$this->emailVerifier->handleEmailConfirmation($request, $user);
|
$this->emailVerifier->handleEmailConfirmation($request, $user);
|
||||||
} catch (VerifyEmailExceptionInterface $verifyEmailException) {
|
} catch (VerifyEmailExceptionInterface $verifyEmailException) {
|
||||||
$this->addFlash('verify_email_error', $translator->trans($verifyEmailException->getReason(), [], 'VerifyEmailBundle'));
|
$this->addFlash('verify_email_error', $this->translator->trans($verifyEmailException->getReason(), [], 'VerifyEmailBundle'));
|
||||||
|
|
||||||
return $this->redirectToRoute('tvdt_register');
|
return $this->redirectToRoute('tvdt_register');
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->addFlash('success', $this->translator->trans('Your email address has been verified.'));
|
$this->addFlash(FlashType::Success->value, $this->translator->trans('Your email address has been verified.'));
|
||||||
|
|
||||||
return $this->redirectToRoute('tvdt_backoffice_index');
|
return $this->redirectToRoute('tvdt_backoffice_index');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,35 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Tvdt\DataFixtures;
|
||||||
|
|
||||||
|
use Doctrine\Bundle\FixturesBundle\Fixture;
|
||||||
|
use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
|
||||||
|
use Doctrine\Persistence\ObjectManager;
|
||||||
|
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
|
||||||
|
use Tvdt\Entity\User;
|
||||||
|
|
||||||
|
final class DevFixtures extends Fixture implements FixtureGroupInterface
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private readonly UserPasswordHasherInterface $passwordHasher,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public static function getGroups(): array
|
||||||
|
{
|
||||||
|
return ['dev'];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function load(ObjectManager $manager): void
|
||||||
|
{
|
||||||
|
$user = new User();
|
||||||
|
$user->email = 'admin@tijdvoordetest.nl';
|
||||||
|
$user->password = $this->passwordHasher->hashPassword($user, '12345678');
|
||||||
|
$user->roles = ['ROLE_ADMIN'];
|
||||||
|
|
||||||
|
$manager->persist($user);
|
||||||
|
|
||||||
|
$manager->flush();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,15 +5,39 @@ declare(strict_types=1);
|
|||||||
namespace Tvdt\DataFixtures;
|
namespace Tvdt\DataFixtures;
|
||||||
|
|
||||||
use Doctrine\Bundle\FixturesBundle\Fixture;
|
use Doctrine\Bundle\FixturesBundle\Fixture;
|
||||||
|
use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
|
||||||
use Doctrine\Persistence\ObjectManager;
|
use Doctrine\Persistence\ObjectManager;
|
||||||
|
use Safe\DateTimeImmutable;
|
||||||
use Tvdt\Entity\Answer;
|
use Tvdt\Entity\Answer;
|
||||||
|
use Tvdt\Entity\BankAnswer;
|
||||||
|
use Tvdt\Entity\BankQuestion;
|
||||||
|
use Tvdt\Entity\BankQuestionUsage;
|
||||||
use Tvdt\Entity\Candidate;
|
use Tvdt\Entity\Candidate;
|
||||||
use Tvdt\Entity\Question;
|
use Tvdt\Entity\Question;
|
||||||
|
use Tvdt\Entity\QuestionLabel;
|
||||||
use Tvdt\Entity\Quiz;
|
use Tvdt\Entity\Quiz;
|
||||||
use Tvdt\Entity\Season;
|
use Tvdt\Entity\Season;
|
||||||
|
use Tvdt\Entity\SeasonSettings;
|
||||||
|
|
||||||
class KrtekFixtures extends Fixture
|
final class KrtekFixtures extends Fixture implements FixtureGroupInterface
|
||||||
{
|
{
|
||||||
|
public const string KRTEK_SEASON = 'krtek-seaspm';
|
||||||
|
|
||||||
|
public const string KRTEK_QUIZ_1 = 'krtek-quiz-1';
|
||||||
|
|
||||||
|
public const string KRTEK_QUIZ_2 = 'krtek-quiz-2';
|
||||||
|
|
||||||
|
public const string BANK_QUESTION_REUSABLE = 'bank-question-reusable';
|
||||||
|
|
||||||
|
public const string BANK_QUESTION_USED = 'bank-question-used';
|
||||||
|
|
||||||
|
public const string BANK_QUESTION_UNUSED = 'bank-question-unused';
|
||||||
|
|
||||||
|
public static function getGroups(): array
|
||||||
|
{
|
||||||
|
return ['test', 'dev'];
|
||||||
|
}
|
||||||
|
|
||||||
public function load(ObjectManager $manager): void
|
public function load(ObjectManager $manager): void
|
||||||
{
|
{
|
||||||
$season = new Season();
|
$season = new Season();
|
||||||
@@ -38,9 +62,68 @@ class KrtekFixtures extends Fixture
|
|||||||
$quiz1 = $this->createQuiz1($season);
|
$quiz1 = $this->createQuiz1($season);
|
||||||
$season->addQuiz($quiz1);
|
$season->addQuiz($quiz1);
|
||||||
$season->activeQuiz = $quiz1;
|
$season->activeQuiz = $quiz1;
|
||||||
$season->addQuiz($this->createQuiz2($season));
|
|
||||||
|
$quiz1->finalizedAt = new DateTimeImmutable();
|
||||||
|
$quiz2 = $this->createQuiz2($season);
|
||||||
|
$season->addQuiz($quiz2);
|
||||||
|
|
||||||
|
\assert($season->settings instanceof SeasonSettings);
|
||||||
|
|
||||||
|
$season->settings->confirmAnswers = true;
|
||||||
|
$season->settings->showNumbers = true;
|
||||||
|
|
||||||
|
$this->createQuestionBank($season, $quiz2);
|
||||||
|
|
||||||
$manager->flush();
|
$manager->flush();
|
||||||
|
|
||||||
|
$this->addReference(self::KRTEK_SEASON, $season);
|
||||||
|
$this->addReference(self::KRTEK_QUIZ_1, $quiz1);
|
||||||
|
$this->addReference(self::KRTEK_QUIZ_2, $quiz2);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function createQuestionBank(Season $season, Quiz $usedInQuiz): void
|
||||||
|
{
|
||||||
|
$location = new QuestionLabel('Locatie');
|
||||||
|
$location->slug = 'locatie';
|
||||||
|
|
||||||
|
$season->addQuestionLabel($location);
|
||||||
|
$finale = new QuestionLabel('Finale');
|
||||||
|
$finale->slug = 'finale';
|
||||||
|
|
||||||
|
$season->addQuestionLabel($finale);
|
||||||
|
|
||||||
|
$reusable = new BankQuestion();
|
||||||
|
$reusable->question = 'Wie is de Krtek?';
|
||||||
|
$reusable->reusable = true;
|
||||||
|
$reusable->addLabel($finale);
|
||||||
|
$reusable->addAnswer(new BankAnswer('Claudia', true));
|
||||||
|
$reusable->addAnswer(new BankAnswer('Eelco'));
|
||||||
|
$reusable->addAnswer(new BankAnswer('Elise'));
|
||||||
|
|
||||||
|
$season->addBankQuestion($reusable);
|
||||||
|
|
||||||
|
$used = new BankQuestion();
|
||||||
|
$used->question = 'Waar sliep de Krtek?';
|
||||||
|
$used->addLabel($location);
|
||||||
|
$used->addAnswer(new BankAnswer('Boven', true));
|
||||||
|
$used->addAnswer(new BankAnswer('Beneden'));
|
||||||
|
$used->addUsage(new BankQuestionUsage($used, $usedInQuiz));
|
||||||
|
|
||||||
|
$season->addBankQuestion($used);
|
||||||
|
|
||||||
|
$unused = new BankQuestion();
|
||||||
|
$unused->question = 'Wat at de Krtek als ontbijt?';
|
||||||
|
$unused->addLabel($location);
|
||||||
|
$unused->addLabel($finale);
|
||||||
|
$unused->addAnswer(new BankAnswer('Brood', true));
|
||||||
|
$unused->addAnswer(new BankAnswer('Yoghurt'));
|
||||||
|
$unused->addAnswer(new BankAnswer('Niks'));
|
||||||
|
|
||||||
|
$season->addBankQuestion($unused);
|
||||||
|
|
||||||
|
$this->addReference(self::BANK_QUESTION_REUSABLE, $reusable);
|
||||||
|
$this->addReference(self::BANK_QUESTION_USED, $used);
|
||||||
|
$this->addReference(self::BANK_QUESTION_UNUSED, $unused);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function createQuiz1(Season $season): Quiz
|
private function createQuiz1(Season $season): Quiz
|
||||||
|
|||||||
@@ -0,0 +1,75 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Tvdt\DataFixtures;
|
||||||
|
|
||||||
|
use Doctrine\Bundle\FixturesBundle\Fixture;
|
||||||
|
use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
|
||||||
|
use Doctrine\Common\DataFixtures\DependentFixtureInterface;
|
||||||
|
use Doctrine\Persistence\ObjectManager;
|
||||||
|
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
|
||||||
|
use Tvdt\Entity\Season;
|
||||||
|
use Tvdt\Entity\User;
|
||||||
|
|
||||||
|
final class TestFixtures extends Fixture implements FixtureGroupInterface, DependentFixtureInterface
|
||||||
|
{
|
||||||
|
public const string PASSWORD = 'test1234';
|
||||||
|
|
||||||
|
public function __construct(
|
||||||
|
private readonly UserPasswordHasherInterface $passwordHasher,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public static function getGroups(): array
|
||||||
|
{
|
||||||
|
return ['test'];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getDependencies(): array
|
||||||
|
{
|
||||||
|
return [KrtekFixtures::class];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function load(ObjectManager $manager): void
|
||||||
|
{
|
||||||
|
$user = new User();
|
||||||
|
$user->email = 'test@example.org';
|
||||||
|
$user->password = $this->passwordHasher->hashPassword($user, self::PASSWORD);
|
||||||
|
|
||||||
|
$manager->persist($user);
|
||||||
|
|
||||||
|
$user = new User();
|
||||||
|
$user->email = 'krtek-admin@example.org';
|
||||||
|
$user->password = $this->passwordHasher->hashPassword($user, self::PASSWORD);
|
||||||
|
|
||||||
|
$manager->persist($user);
|
||||||
|
|
||||||
|
$krtek = $this->getReference(KrtekFixtures::KRTEK_SEASON, Season::class);
|
||||||
|
$krtek->addOwner($user);
|
||||||
|
|
||||||
|
$anotherSeason = new Season();
|
||||||
|
$anotherSeason->name = 'Another Season';
|
||||||
|
$anotherSeason->seasonCode = 'bbbbb';
|
||||||
|
|
||||||
|
$manager->persist($anotherSeason);
|
||||||
|
$this->addReference('another-season', $anotherSeason);
|
||||||
|
|
||||||
|
$user = new User();
|
||||||
|
$user->email = 'user1@example.org';
|
||||||
|
$user->password = $this->passwordHasher->hashPassword($user, self::PASSWORD);
|
||||||
|
|
||||||
|
$manager->persist($user);
|
||||||
|
$user->addSeason($anotherSeason);
|
||||||
|
|
||||||
|
$user = new User();
|
||||||
|
$user->email = 'user2@example.org';
|
||||||
|
$user->password = $this->passwordHasher->hashPassword($user, self::PASSWORD);
|
||||||
|
|
||||||
|
$manager->persist($user);
|
||||||
|
|
||||||
|
$krtek->addOwner($user);
|
||||||
|
$anotherSeason->addOwner($user);
|
||||||
|
|
||||||
|
$manager->flush();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,6 +13,7 @@ final readonly class Result
|
|||||||
public string $name,
|
public string $name,
|
||||||
public int $correct,
|
public int $correct,
|
||||||
public float $corrections,
|
public float $corrections,
|
||||||
|
public int $penaltySeconds,
|
||||||
public \DateInterval $time,
|
public \DateInterval $time,
|
||||||
public float $score,
|
public float $score,
|
||||||
) {}
|
) {}
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Tvdt\Entity;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Types\Types;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
|
||||||
|
#[ORM\MappedSuperclass]
|
||||||
|
abstract class AbstractBaseAnswer implements \Stringable
|
||||||
|
{
|
||||||
|
#[ORM\Column(type: Types::SMALLINT, options: ['default' => 0])]
|
||||||
|
public int $ordering = 0;
|
||||||
|
|
||||||
|
public function __construct(
|
||||||
|
#[ORM\Column(length: 255)]
|
||||||
|
public string $text,
|
||||||
|
#[ORM\Column]
|
||||||
|
public bool $isRightAnswer = false,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public function __toString(): string
|
||||||
|
{
|
||||||
|
return $this->text;
|
||||||
|
}
|
||||||
|
}
|
||||||
+4
-11
@@ -6,14 +6,13 @@ namespace Tvdt\Entity;
|
|||||||
|
|
||||||
use Doctrine\Common\Collections\ArrayCollection;
|
use Doctrine\Common\Collections\ArrayCollection;
|
||||||
use Doctrine\Common\Collections\Collection;
|
use Doctrine\Common\Collections\Collection;
|
||||||
use Doctrine\DBAL\Types\Types;
|
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use Symfony\Bridge\Doctrine\Types\UuidType;
|
use Symfony\Bridge\Doctrine\Types\UuidType;
|
||||||
use Symfony\Component\Uid\Uuid;
|
use Symfony\Component\Uid\Uuid;
|
||||||
use Tvdt\Repository\AnswerRepository;
|
use Tvdt\Repository\AnswerRepository;
|
||||||
|
|
||||||
#[ORM\Entity(repositoryClass: AnswerRepository::class)]
|
#[ORM\Entity(repositoryClass: AnswerRepository::class)]
|
||||||
class Answer
|
class Answer extends AbstractBaseAnswer
|
||||||
{
|
{
|
||||||
#[ORM\Column(type: UuidType::NAME)]
|
#[ORM\Column(type: UuidType::NAME)]
|
||||||
#[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
|
#[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
|
||||||
@@ -21,9 +20,6 @@ class Answer
|
|||||||
#[ORM\Id]
|
#[ORM\Id]
|
||||||
public private(set) Uuid $id;
|
public private(set) Uuid $id;
|
||||||
|
|
||||||
#[ORM\Column(type: Types::SMALLINT, options: ['default' => 0])]
|
|
||||||
public int $ordering = 0;
|
|
||||||
|
|
||||||
#[ORM\JoinColumn(nullable: false)]
|
#[ORM\JoinColumn(nullable: false)]
|
||||||
#[ORM\ManyToOne(inversedBy: 'answers')]
|
#[ORM\ManyToOne(inversedBy: 'answers')]
|
||||||
public Question $question;
|
public Question $question;
|
||||||
@@ -36,12 +32,9 @@ class Answer
|
|||||||
#[ORM\OneToMany(targetEntity: GivenAnswer::class, mappedBy: 'answer', orphanRemoval: true)]
|
#[ORM\OneToMany(targetEntity: GivenAnswer::class, mappedBy: 'answer', orphanRemoval: true)]
|
||||||
public private(set) Collection $givenAnswers;
|
public private(set) Collection $givenAnswers;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(string $text, bool $isRightAnswer = false)
|
||||||
#[ORM\Column(length: 255)]
|
{
|
||||||
public string $text,
|
parent::__construct($text, $isRightAnswer);
|
||||||
#[ORM\Column]
|
|
||||||
public bool $isRightAnswer = false,
|
|
||||||
) {
|
|
||||||
$this->candidates = new ArrayCollection();
|
$this->candidates = new ArrayCollection();
|
||||||
$this->givenAnswers = new ArrayCollection();
|
$this->givenAnswers = new ArrayCollection();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Tvdt\Entity;
|
||||||
|
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Bridge\Doctrine\Types\UuidType;
|
||||||
|
use Symfony\Component\ObjectMapper\Attribute\Map;
|
||||||
|
use Symfony\Component\Uid\Uuid;
|
||||||
|
|
||||||
|
#[ORM\Entity]
|
||||||
|
class BankAnswer extends AbstractBaseAnswer
|
||||||
|
{
|
||||||
|
#[Map(if: false)]
|
||||||
|
#[ORM\Column(type: UuidType::NAME)]
|
||||||
|
#[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
|
||||||
|
#[ORM\GeneratedValue(strategy: 'CUSTOM')]
|
||||||
|
#[ORM\Id]
|
||||||
|
public private(set) Uuid $id;
|
||||||
|
|
||||||
|
#[Map(if: false)]
|
||||||
|
#[ORM\JoinColumn(nullable: false)]
|
||||||
|
#[ORM\ManyToOne(inversedBy: 'answers')]
|
||||||
|
public BankQuestion $bankQuestion;
|
||||||
|
}
|
||||||
@@ -0,0 +1,147 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Tvdt\Entity;
|
||||||
|
|
||||||
|
use Doctrine\Common\Collections\ArrayCollection;
|
||||||
|
use Doctrine\Common\Collections\Collection;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Gedmo\Mapping\Annotation as Gedmo;
|
||||||
|
use Symfony\Bridge\Doctrine\Types\UuidType;
|
||||||
|
use Symfony\Component\ObjectMapper\Attribute\Map;
|
||||||
|
use Symfony\Component\Uid\Uuid;
|
||||||
|
use Symfony\Component\Validator\Constraints as Assert;
|
||||||
|
use Symfony\Component\Validator\Context\ExecutionContextInterface;
|
||||||
|
use Tvdt\Repository\BankQuestionRepository;
|
||||||
|
|
||||||
|
#[Gedmo\Loggable(logEntryClass: LogEntry::class)]
|
||||||
|
#[ORM\Entity(repositoryClass: BankQuestionRepository::class)]
|
||||||
|
class BankQuestion implements \Stringable
|
||||||
|
{
|
||||||
|
#[Map(if: false)]
|
||||||
|
#[ORM\Column(type: UuidType::NAME)]
|
||||||
|
#[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
|
||||||
|
#[ORM\GeneratedValue(strategy: 'CUSTOM')]
|
||||||
|
#[ORM\Id]
|
||||||
|
public private(set) Uuid $id;
|
||||||
|
|
||||||
|
#[Gedmo\Versioned]
|
||||||
|
#[ORM\Column(length: 255)]
|
||||||
|
public string $question;
|
||||||
|
|
||||||
|
#[Map(if: false)]
|
||||||
|
#[ORM\JoinColumn(nullable: false)]
|
||||||
|
#[ORM\ManyToOne(inversedBy: 'bankQuestions')]
|
||||||
|
public Season $season;
|
||||||
|
|
||||||
|
#[Gedmo\Versioned]
|
||||||
|
#[Map(if: false)]
|
||||||
|
#[ORM\Column(options: ['default' => false])]
|
||||||
|
public bool $reusable = false;
|
||||||
|
|
||||||
|
/** @var Collection<int, QuestionLabel> */
|
||||||
|
#[Map(if: false)]
|
||||||
|
#[ORM\ManyToMany(targetEntity: QuestionLabel::class, inversedBy: 'bankQuestions')]
|
||||||
|
public private(set) Collection $labels;
|
||||||
|
|
||||||
|
/** @var Collection<int, BankAnswer> */
|
||||||
|
#[Map(if: false)]
|
||||||
|
#[ORM\OneToMany(targetEntity: BankAnswer::class, mappedBy: 'bankQuestion', cascade: ['persist'], orphanRemoval: true)]
|
||||||
|
#[ORM\OrderBy(['ordering' => 'ASC'])]
|
||||||
|
public private(set) Collection $answers;
|
||||||
|
|
||||||
|
/** @var Collection<int, BankQuestionUsage> */
|
||||||
|
#[Map(if: false)]
|
||||||
|
#[ORM\OneToMany(targetEntity: BankQuestionUsage::class, mappedBy: 'bankQuestion', cascade: ['persist'], orphanRemoval: true)]
|
||||||
|
public private(set) Collection $usages;
|
||||||
|
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
$this->labels = new ArrayCollection();
|
||||||
|
$this->answers = new ArrayCollection();
|
||||||
|
$this->usages = new ArrayCollection();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function addAnswer(BankAnswer $answer): static
|
||||||
|
{
|
||||||
|
if (!$this->answers->contains($answer)) {
|
||||||
|
$this->answers->add($answer);
|
||||||
|
$answer->bankQuestion = $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function removeAnswer(BankAnswer $answer): static
|
||||||
|
{
|
||||||
|
$this->answers->removeElement($answer);
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function addLabel(QuestionLabel $label): static
|
||||||
|
{
|
||||||
|
if (!$this->labels->contains($label)) {
|
||||||
|
$this->labels->add($label);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function removeLabel(QuestionLabel $label): static
|
||||||
|
{
|
||||||
|
$this->labels->removeElement($label);
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function addUsage(BankQuestionUsage $usage): static
|
||||||
|
{
|
||||||
|
if (!$this->usages->contains($usage)) {
|
||||||
|
$this->usages->add($usage);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool $isUsed {
|
||||||
|
get => !$this->usages->isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool $canBeAssigned {
|
||||||
|
get => $this->reusable || !$this->isUsed;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** True when the question is fully complete and can be assigned to a quiz. */
|
||||||
|
public bool $isCompleteForQuiz {
|
||||||
|
get => $this->answers->count() >= 2
|
||||||
|
&& 1 === $this->answers->filter(static fn (BankAnswer $answer): bool => $answer->isRightAnswer)->count();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function isUsedInQuiz(Quiz $quiz): bool
|
||||||
|
{
|
||||||
|
return $this->usages->exists(static fn (int $key, BankQuestionUsage $usage): bool => $usage->quiz === $quiz);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[Assert\Callback]
|
||||||
|
public function validateAnswers(ExecutionContextInterface $context): void
|
||||||
|
{
|
||||||
|
if ($this->answers->isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->answers->filter(static fn (BankAnswer $answer): bool => $answer->isRightAnswer)->count();
|
||||||
|
|
||||||
|
if ($this->answers->count() < 2) {
|
||||||
|
$context->buildViolation('A question needs at least two answers')
|
||||||
|
->atPath('answers')
|
||||||
|
->addViolation();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function __toString(): string
|
||||||
|
{
|
||||||
|
return $this->question;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Tvdt\Entity;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Types\Types;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Gedmo\Mapping\Annotation as Gedmo;
|
||||||
|
use Symfony\Bridge\Doctrine\Types\UuidType;
|
||||||
|
use Symfony\Component\Uid\Uuid;
|
||||||
|
|
||||||
|
#[ORM\Entity]
|
||||||
|
#[ORM\UniqueConstraint(fields: ['bankQuestion', 'quiz'])]
|
||||||
|
class BankQuestionUsage
|
||||||
|
{
|
||||||
|
#[ORM\Column(type: UuidType::NAME)]
|
||||||
|
#[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
|
||||||
|
#[ORM\GeneratedValue(strategy: 'CUSTOM')]
|
||||||
|
#[ORM\Id]
|
||||||
|
public private(set) Uuid $id;
|
||||||
|
|
||||||
|
#[Gedmo\Timestampable(on: 'create')]
|
||||||
|
#[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE, nullable: false)]
|
||||||
|
public private(set) \DateTimeImmutable $created;
|
||||||
|
|
||||||
|
#[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')]
|
||||||
|
#[ORM\ManyToOne]
|
||||||
|
public ?Question $question = null;
|
||||||
|
|
||||||
|
public function __construct(
|
||||||
|
#[ORM\JoinColumn(nullable: false)]
|
||||||
|
#[ORM\ManyToOne(inversedBy: 'usages')]
|
||||||
|
public private(set) BankQuestion $bankQuestion,
|
||||||
|
|
||||||
|
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
|
||||||
|
#[ORM\ManyToOne]
|
||||||
|
public private(set) Quiz $quiz,
|
||||||
|
) {}
|
||||||
|
}
|
||||||
+11
-11
@@ -6,16 +6,21 @@ namespace Tvdt\Entity;
|
|||||||
|
|
||||||
use Doctrine\DBAL\Types\Types;
|
use Doctrine\DBAL\Types\Types;
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use Safe\DateTimeImmutable;
|
use Gedmo\Mapping\Annotation as Gedmo;
|
||||||
|
use Gedmo\SoftDeleteable\Traits\SoftDeleteableEntity;
|
||||||
|
use Gedmo\Timestampable\Traits\TimestampableEntity;
|
||||||
use Symfony\Bridge\Doctrine\Types\UuidType;
|
use Symfony\Bridge\Doctrine\Types\UuidType;
|
||||||
use Symfony\Component\HttpFoundation\InputBag;
|
use Symfony\Component\HttpFoundation\InputBag;
|
||||||
use Symfony\Component\Uid\Uuid;
|
use Symfony\Component\Uid\Uuid;
|
||||||
use Tvdt\Repository\EliminationRepository;
|
use Tvdt\Repository\EliminationRepository;
|
||||||
|
|
||||||
|
#[Gedmo\SoftDeleteable]
|
||||||
#[ORM\Entity(repositoryClass: EliminationRepository::class)]
|
#[ORM\Entity(repositoryClass: EliminationRepository::class)]
|
||||||
#[ORM\HasLifecycleCallbacks]
|
|
||||||
class Elimination
|
class Elimination
|
||||||
{
|
{
|
||||||
|
use SoftDeleteableEntity;
|
||||||
|
use TimestampableEntity;
|
||||||
|
|
||||||
public const string SCREEN_GREEN = 'green';
|
public const string SCREEN_GREEN = 'green';
|
||||||
|
|
||||||
public const string SCREEN_RED = 'red';
|
public const string SCREEN_RED = 'red';
|
||||||
@@ -30,9 +35,6 @@ class Elimination
|
|||||||
#[ORM\Column(type: Types::JSONB)]
|
#[ORM\Column(type: Types::JSONB)]
|
||||||
public array $data = [];
|
public array $data = [];
|
||||||
|
|
||||||
#[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE, nullable: false)]
|
|
||||||
public private(set) \DateTimeImmutable $created;
|
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
|
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
|
||||||
#[ORM\ManyToOne(inversedBy: 'eliminations')]
|
#[ORM\ManyToOne(inversedBy: 'eliminations')]
|
||||||
@@ -54,12 +56,10 @@ class Elimination
|
|||||||
|
|
||||||
public function getScreenColour(?string $name): ?string
|
public function getScreenColour(?string $name): ?string
|
||||||
{
|
{
|
||||||
|
if (null === $name) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
return $this->data[$name] ?? null;
|
return $this->data[$name] ?? null;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[ORM\PrePersist]
|
|
||||||
public function setCreatedAtValue(): void
|
|
||||||
{
|
|
||||||
$this->created = new DateTimeImmutable();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,41 +6,39 @@ namespace Tvdt\Entity;
|
|||||||
|
|
||||||
use Doctrine\DBAL\Types\Types;
|
use Doctrine\DBAL\Types\Types;
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use Safe\DateTimeImmutable;
|
use Gedmo\Mapping\Annotation as Gedmo;
|
||||||
|
use Gedmo\SoftDeleteable\Traits\SoftDeleteableEntity;
|
||||||
use Symfony\Bridge\Doctrine\Types\UuidType;
|
use Symfony\Bridge\Doctrine\Types\UuidType;
|
||||||
use Symfony\Component\Uid\Uuid;
|
use Symfony\Component\Uid\Uuid;
|
||||||
use Tvdt\Repository\GivenAnswerRepository;
|
use Tvdt\Repository\GivenAnswerRepository;
|
||||||
|
|
||||||
|
#[Gedmo\SoftDeleteable]
|
||||||
#[ORM\Entity(repositoryClass: GivenAnswerRepository::class)]
|
#[ORM\Entity(repositoryClass: GivenAnswerRepository::class)]
|
||||||
#[ORM\HasLifecycleCallbacks]
|
|
||||||
class GivenAnswer
|
class GivenAnswer
|
||||||
{
|
{
|
||||||
|
use SoftDeleteableEntity;
|
||||||
|
|
||||||
#[ORM\Column(type: UuidType::NAME, unique: true)]
|
#[ORM\Column(type: UuidType::NAME, unique: true)]
|
||||||
#[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
|
#[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
|
||||||
#[ORM\GeneratedValue(strategy: 'CUSTOM')]
|
#[ORM\GeneratedValue(strategy: 'CUSTOM')]
|
||||||
#[ORM\Id]
|
#[ORM\Id]
|
||||||
public private(set) Uuid $id;
|
public private(set) Uuid $id;
|
||||||
|
|
||||||
|
#[Gedmo\Timestampable(on: 'create')]
|
||||||
#[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE, nullable: false)]
|
#[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE, nullable: false)]
|
||||||
public private(set) \DateTimeImmutable $created;
|
public private(set) \DateTimeImmutable $created;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
#[ORM\JoinColumn(nullable: false)]
|
#[ORM\JoinColumn(nullable: false)]
|
||||||
#[ORM\ManyToOne(inversedBy: 'givenAnswers')]
|
#[ORM\ManyToOne(inversedBy: 'givenAnswers')]
|
||||||
private(set) Candidate $candidate,
|
public private(set) Candidate $candidate,
|
||||||
|
|
||||||
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
|
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
|
||||||
#[ORM\ManyToOne]
|
#[ORM\ManyToOne]
|
||||||
private(set) Quiz $quiz,
|
public private(set) Quiz $quiz,
|
||||||
|
|
||||||
#[ORM\JoinColumn(nullable: false)]
|
#[ORM\JoinColumn(nullable: false)]
|
||||||
#[ORM\ManyToOne(inversedBy: 'givenAnswers')]
|
#[ORM\ManyToOne(inversedBy: 'givenAnswers')]
|
||||||
private(set) Answer $answer,
|
public private(set) Answer $answer,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
#[ORM\PrePersist]
|
|
||||||
public function setCreatedAtValue(): void
|
|
||||||
{
|
|
||||||
$this->created = new DateTimeImmutable();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Tvdt\Entity;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Types\Types;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Gedmo\Loggable\Entity\MappedSuperclass\AbstractLogEntry;
|
||||||
|
use Gedmo\Loggable\Entity\Repository\LogEntryRepository;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Custom LogEntry that stores change data as JSON (instead of serialized `array`)
|
||||||
|
* so it works with the PostgreSQL-only DBAL setup in this project.
|
||||||
|
*
|
||||||
|
* @extends AbstractLogEntry<object>
|
||||||
|
*/
|
||||||
|
#[ORM\Entity(repositoryClass: LogEntryRepository::class)]
|
||||||
|
#[ORM\Index(name: 'log_class_lookup_idx', columns: ['object_class'])]
|
||||||
|
#[ORM\Index(name: 'log_date_lookup_idx', columns: ['logged_at'])]
|
||||||
|
#[ORM\Index(name: 'log_user_lookup_idx', columns: ['username'])]
|
||||||
|
#[ORM\Index(name: 'log_version_lookup_idx', columns: ['object_id', 'object_class', 'version'])]
|
||||||
|
#[ORM\Table(name: 'ext_log_entries')]
|
||||||
|
class LogEntry extends AbstractLogEntry
|
||||||
|
{
|
||||||
|
#[ORM\Column(type: Types::JSON, nullable: true)]
|
||||||
|
#[\Override]
|
||||||
|
protected $data;
|
||||||
|
}
|
||||||
+3
-17
@@ -13,7 +13,7 @@ use Symfony\Component\Uid\Uuid;
|
|||||||
use Tvdt\Repository\QuestionRepository;
|
use Tvdt\Repository\QuestionRepository;
|
||||||
|
|
||||||
#[ORM\Entity(repositoryClass: QuestionRepository::class)]
|
#[ORM\Entity(repositoryClass: QuestionRepository::class)]
|
||||||
class Question
|
class Question implements \Stringable
|
||||||
{
|
{
|
||||||
#[ORM\Column(type: UuidType::NAME)]
|
#[ORM\Column(type: UuidType::NAME)]
|
||||||
#[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
|
#[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
|
||||||
@@ -54,22 +54,8 @@ class Question
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getErrors(): ?string
|
public function __toString(): string
|
||||||
{
|
{
|
||||||
if (0 === \count($this->answers)) {
|
return $this->question ?? '';
|
||||||
return 'This question has no answers';
|
|
||||||
}
|
|
||||||
|
|
||||||
$correctAnswers = $this->answers->filter(static fn (Answer $answer): bool => $answer->isRightAnswer)->count();
|
|
||||||
|
|
||||||
if (0 === $correctAnswers) {
|
|
||||||
return 'This question has no correct answers';
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($correctAnswers > 1) {
|
|
||||||
return 'This question has multiple correct answers';
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,51 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Tvdt\Entity;
|
||||||
|
|
||||||
|
use Doctrine\Common\Collections\ArrayCollection;
|
||||||
|
use Doctrine\Common\Collections\Collection;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Bridge\Doctrine\Types\UuidType;
|
||||||
|
use Symfony\Component\Uid\Uuid;
|
||||||
|
use Tvdt\Enum\LabelColour;
|
||||||
|
use Tvdt\Repository\QuestionLabelRepository;
|
||||||
|
|
||||||
|
#[ORM\Entity(repositoryClass: QuestionLabelRepository::class)]
|
||||||
|
#[ORM\UniqueConstraint(fields: ['name', 'season'])]
|
||||||
|
#[ORM\UniqueConstraint(name: 'uq_question_label_slug_season', fields: ['slug', 'season'])]
|
||||||
|
class QuestionLabel implements \Stringable
|
||||||
|
{
|
||||||
|
#[ORM\Column(type: UuidType::NAME)]
|
||||||
|
#[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
|
||||||
|
#[ORM\GeneratedValue(strategy: 'CUSTOM')]
|
||||||
|
#[ORM\Id]
|
||||||
|
public private(set) Uuid $id;
|
||||||
|
|
||||||
|
#[ORM\JoinColumn(nullable: false)]
|
||||||
|
#[ORM\ManyToOne(inversedBy: 'questionLabels')]
|
||||||
|
public Season $season;
|
||||||
|
|
||||||
|
/** @var Collection<int, BankQuestion> */
|
||||||
|
#[ORM\ManyToMany(targetEntity: BankQuestion::class, mappedBy: 'labels')]
|
||||||
|
public private(set) Collection $bankQuestions;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 16, enumType: LabelColour::class, options: ['default' => 'secondary'])]
|
||||||
|
public LabelColour $colour = LabelColour::Gray;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 64)]
|
||||||
|
public string $slug = '';
|
||||||
|
|
||||||
|
public function __construct(
|
||||||
|
#[ORM\Column(length: 64)]
|
||||||
|
public string $name,
|
||||||
|
) {
|
||||||
|
$this->bankQuestions = new ArrayCollection();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function __toString(): string
|
||||||
|
{
|
||||||
|
return $this->name;
|
||||||
|
}
|
||||||
|
}
|
||||||
+129
-1
@@ -6,6 +6,7 @@ namespace Tvdt\Entity;
|
|||||||
|
|
||||||
use Doctrine\Common\Collections\ArrayCollection;
|
use Doctrine\Common\Collections\ArrayCollection;
|
||||||
use Doctrine\Common\Collections\Collection;
|
use Doctrine\Common\Collections\Collection;
|
||||||
|
use Doctrine\DBAL\Types\Types;
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use Symfony\Bridge\Doctrine\Types\UuidType;
|
use Symfony\Bridge\Doctrine\Types\UuidType;
|
||||||
use Symfony\Component\Uid\Uuid;
|
use Symfony\Component\Uid\Uuid;
|
||||||
@@ -40,9 +41,12 @@ class Quiz
|
|||||||
#[ORM\Column(nullable: false, options: ['default' => 1])]
|
#[ORM\Column(nullable: false, options: ['default' => 1])]
|
||||||
public int $dropouts = 1;
|
public int $dropouts = 1;
|
||||||
|
|
||||||
|
#[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE, nullable: true)]
|
||||||
|
public ?\DateTimeImmutable $finalizedAt = null;
|
||||||
|
|
||||||
/** @var Collection<int, Elimination> */
|
/** @var Collection<int, Elimination> */
|
||||||
#[ORM\OneToMany(targetEntity: Elimination::class, mappedBy: 'quiz', cascade: ['persist'], orphanRemoval: true)]
|
#[ORM\OneToMany(targetEntity: Elimination::class, mappedBy: 'quiz', cascade: ['persist'], orphanRemoval: true)]
|
||||||
#[ORM\OrderBy(['created' => 'DESC'])]
|
#[ORM\OrderBy(['createdAt' => 'DESC'])]
|
||||||
public private(set) Collection $eliminations;
|
public private(set) Collection $eliminations;
|
||||||
|
|
||||||
public function __construct()
|
public function __construct()
|
||||||
@@ -62,10 +66,134 @@ class Quiz
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool $isFinalized {
|
||||||
|
get => $this->finalizedAt instanceof \DateTimeImmutable;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool $hasStartedCandidates {
|
||||||
|
get => $this->candidateData->exists(static fn (int $key, QuizCandidate $quizCandidate): bool => $quizCandidate->started instanceof \DateTimeImmutable);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A locked quiz can no longer be altered: it is either explicitly finalized or a candidate has already started filling it in. */
|
||||||
|
public bool $isLocked {
|
||||||
|
get => $this->isFinalized || $this->hasStartedCandidates;
|
||||||
|
}
|
||||||
|
|
||||||
public function addElimination(Elimination $elimination): self
|
public function addElimination(Elimination $elimination): self
|
||||||
{
|
{
|
||||||
$this->eliminations->add($elimination);
|
$this->eliminations->add($elimination);
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get errors for all questions in the quiz.
|
||||||
|
* Returns an array where keys are question IDs and values are error messages.
|
||||||
|
*
|
||||||
|
* @return array<string, string>
|
||||||
|
*/
|
||||||
|
public function getQuestionErrors(): array
|
||||||
|
{
|
||||||
|
$errors = [];
|
||||||
|
|
||||||
|
// Check if any answer in the entire quiz has candidate relations
|
||||||
|
$hasCandidateRelations = false;
|
||||||
|
foreach ($this->questions as $question) {
|
||||||
|
foreach ($question->answers as $answer) {
|
||||||
|
if ($answer->candidates->count() > 0) {
|
||||||
|
$hasCandidateRelations = true;
|
||||||
|
break 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pre-compute active candidates once for all questions
|
||||||
|
$activeCandidates = [];
|
||||||
|
if ($hasCandidateRelations) {
|
||||||
|
foreach ($this->candidateData as $quizCandidate) {
|
||||||
|
if ($quizCandidate->active) {
|
||||||
|
$activeCandidates[] = $quizCandidate->candidate;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($this->questions as $question) {
|
||||||
|
$error = $this->getQuestionError($question, $hasCandidateRelations, $activeCandidates);
|
||||||
|
if (null !== $error) {
|
||||||
|
$errors[$question->id->toString()] = $error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $errors;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param list<Candidate> $activeCandidates */
|
||||||
|
private function getQuestionError(Question $question, bool $hasCandidateRelations, array $activeCandidates): ?string
|
||||||
|
{
|
||||||
|
if (0 === \count($question->answers)) {
|
||||||
|
return 'This question has no answers';
|
||||||
|
}
|
||||||
|
|
||||||
|
$correctAnswers = $question->answers->filter(static fn (Answer $answer): bool => $answer->isRightAnswer)->count();
|
||||||
|
|
||||||
|
if (0 === $correctAnswers) {
|
||||||
|
return 'This question has no correct answers';
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($correctAnswers > 1) {
|
||||||
|
return 'This question has multiple correct answers';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only validate candidate-answer relations if at least one exists in the quiz
|
||||||
|
if ($hasCandidateRelations) {
|
||||||
|
$candidateCounts = [];
|
||||||
|
|
||||||
|
// Count how many times each candidate appears in answers
|
||||||
|
foreach ($question->answers as $answer) {
|
||||||
|
foreach ($answer->candidates as $candidate) {
|
||||||
|
$candidateId = $candidate->id->toString();
|
||||||
|
if (!isset($candidateCounts[$candidateId])) {
|
||||||
|
$candidateCounts[$candidateId] = ['name' => $candidate->name, 'count' => 0];
|
||||||
|
}
|
||||||
|
|
||||||
|
++$candidateCounts[$candidateId]['count'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check for missing and duplicate candidates (only active ones)
|
||||||
|
$missing = [];
|
||||||
|
$duplicates = [];
|
||||||
|
|
||||||
|
foreach ($activeCandidates as $candidate) {
|
||||||
|
$candidateId = $candidate->id->toString();
|
||||||
|
$count = $candidateCounts[$candidateId]['count'] ?? 0;
|
||||||
|
|
||||||
|
if (0 === $count) {
|
||||||
|
$missing[] = $candidate->name;
|
||||||
|
} elseif ($count > 1) {
|
||||||
|
$duplicates[] = $candidate->name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ([] !== $missing || [] !== $duplicates) {
|
||||||
|
$errors = [];
|
||||||
|
if ([] !== $missing) {
|
||||||
|
// If all active candidates are missing, show a special message
|
||||||
|
if (\count($missing) === \count($activeCandidates)) {
|
||||||
|
$errors[] = 'No candidates assigned to this question';
|
||||||
|
} else {
|
||||||
|
$errors[] = 'Missing candidates: '.implode(', ', $missing);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ([] !== $duplicates) {
|
||||||
|
$errors[] = 'Duplicate candidates: '.implode(', ', $duplicates);
|
||||||
|
}
|
||||||
|
|
||||||
|
return implode('. ', $errors);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,16 +6,19 @@ namespace Tvdt\Entity;
|
|||||||
|
|
||||||
use Doctrine\DBAL\Types\Types;
|
use Doctrine\DBAL\Types\Types;
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use Safe\DateTimeImmutable;
|
use Gedmo\Mapping\Annotation as Gedmo;
|
||||||
|
use Gedmo\SoftDeleteable\Traits\SoftDeleteableEntity;
|
||||||
use Symfony\Bridge\Doctrine\Types\UuidType;
|
use Symfony\Bridge\Doctrine\Types\UuidType;
|
||||||
use Symfony\Component\Uid\Uuid;
|
use Symfony\Component\Uid\Uuid;
|
||||||
use Tvdt\Repository\QuizCandidateRepository;
|
use Tvdt\Repository\QuizCandidateRepository;
|
||||||
|
|
||||||
|
#[Gedmo\SoftDeleteable]
|
||||||
#[ORM\Entity(repositoryClass: QuizCandidateRepository::class)]
|
#[ORM\Entity(repositoryClass: QuizCandidateRepository::class)]
|
||||||
#[ORM\HasLifecycleCallbacks]
|
#[ORM\UniqueConstraint(columns: ['candidate_id', 'quiz_id'], options: ['where' => '(deleted_at IS NULL)'])]
|
||||||
#[ORM\UniqueConstraint(columns: ['candidate_id', 'quiz_id'])]
|
|
||||||
class QuizCandidate
|
class QuizCandidate
|
||||||
{
|
{
|
||||||
|
use SoftDeleteableEntity;
|
||||||
|
|
||||||
#[ORM\Column(type: UuidType::NAME, unique: true)]
|
#[ORM\Column(type: UuidType::NAME, unique: true)]
|
||||||
#[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
|
#[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
|
||||||
#[ORM\GeneratedValue(strategy: 'CUSTOM')]
|
#[ORM\GeneratedValue(strategy: 'CUSTOM')]
|
||||||
@@ -25,6 +28,16 @@ class QuizCandidate
|
|||||||
#[ORM\Column]
|
#[ORM\Column]
|
||||||
public float $corrections = 0;
|
public float $corrections = 0;
|
||||||
|
|
||||||
|
#[ORM\Column(type: Types::SMALLINT, options: ['default' => 0])]
|
||||||
|
public int $penaltySeconds = 0;
|
||||||
|
|
||||||
|
#[ORM\Column(type: Types::BOOLEAN, options: ['default' => true])]
|
||||||
|
public bool $active = true;
|
||||||
|
|
||||||
|
#[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE, nullable: true)]
|
||||||
|
public ?\DateTimeImmutable $started = null;
|
||||||
|
|
||||||
|
#[Gedmo\Timestampable(on: 'create')]
|
||||||
#[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE)]
|
#[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE)]
|
||||||
public private(set) \DateTimeImmutable $created;
|
public private(set) \DateTimeImmutable $created;
|
||||||
|
|
||||||
@@ -37,10 +50,4 @@ class QuizCandidate
|
|||||||
#[ORM\ManyToOne(inversedBy: 'quizData')]
|
#[ORM\ManyToOne(inversedBy: 'quizData')]
|
||||||
public Candidate $candidate,
|
public Candidate $candidate,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
#[ORM\PrePersist]
|
|
||||||
public function setCreatedAtValue(): void
|
|
||||||
{
|
|
||||||
$this->created = new DateTimeImmutable();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user