mirror of
https://github.com/MarijnDoeve/TijdVoorDeTest.git
synced 2026-03-06 04:44:19 +01:00
Compare commits
7 Commits
main
...
eb1e6f3de0
| Author | SHA1 | Date | |
|---|---|---|---|
|
eb1e6f3de0
|
|||
|
85c7725289
|
|||
|
456d09f459
|
|||
|
68b019135f
|
|||
|
56f97c77ea
|
|||
|
f886f0f6c2
|
|||
|
e41bedce8d
|
1
.env
1
.env
@@ -36,3 +36,4 @@ MAILER_DSN=null://null
|
|||||||
###> sentry/sentry-symfony ###
|
###> sentry/sentry-symfony ###
|
||||||
SENTRY_DSN=
|
SENTRY_DSN=
|
||||||
###< sentry/sentry-symfony ###
|
###< sentry/sentry-symfony ###
|
||||||
|
XDEBUG_MODE=coverage
|
||||||
|
|||||||
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@@ -57,6 +57,8 @@ jobs:
|
|||||||
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
|
||||||
- name: Doctrine Schema Validator
|
- name: Doctrine Schema Validator
|
||||||
|
|||||||
4
.idea/TijdVoorDeTest.iml
generated
4
.idea/TijdVoorDeTest.iml
generated
@@ -165,6 +165,10 @@
|
|||||||
<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/brianium/paratest" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/vendor/dama/doctrine-test-bundle" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/vendor/gedmo/doctrine-extensions" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/vendor/stof/doctrine-extensions-bundle" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="inheritedJdk" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
|||||||
2
.idea/php-test-framework.xml
generated
2
.idea/php-test-framework.xml
generated
@@ -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>
|
||||||
|
|||||||
8
.idea/php.xml
generated
8
.idea/php.xml
generated
@@ -195,6 +195,11 @@
|
|||||||
<path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
|
<path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
|
||||||
<path value="$PROJECT_DIR$/vendor/symfony/dependency-injection" />
|
<path value="$PROJECT_DIR$/vendor/symfony/dependency-injection" />
|
||||||
<path value="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet" />
|
<path value="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php84" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/brianium/paratest" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/dama/doctrine-test-bundle" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/stof/doctrine-extensions-bundle" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/gedmo/doctrine-extensions" />
|
||||||
</include_path>
|
</include_path>
|
||||||
</component>
|
</component>
|
||||||
<component name="PhpInterpreters">
|
<component name="PhpInterpreters">
|
||||||
@@ -288,8 +293,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" paratest_path="$PROJECT_DIR$/vendor/bin/paratest_for_phpstorm" phpunit_phar_path="" use_bootstrap_file="true" use_configuration_file="true" />
|
||||||
<PhpUnitSettings custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" />
|
|
||||||
</phpunit_settings>
|
</phpunit_settings>
|
||||||
</component>
|
</component>
|
||||||
<component name="Psalm">
|
<component name="Psalm">
|
||||||
|
|||||||
8
Justfile
8
Justfile
@@ -20,7 +20,7 @@ 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 --clean nl
|
||||||
@@ -39,3 +39,9 @@ phpstan *args:
|
|||||||
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:schema:create --quiet
|
||||||
|
@docker compose exec php bin/console --env=test doctrine:fixtures:load --no-interaction --group=test
|
||||||
|
|||||||
@@ -19,6 +19,7 @@
|
|||||||
"phpstan/phpdoc-parser": "^2.3",
|
"phpstan/phpdoc-parser": "^2.3",
|
||||||
"runtime/frankenphp-symfony": "^0.2.0",
|
"runtime/frankenphp-symfony": "^0.2.0",
|
||||||
"sentry/sentry-symfony": "^5.6",
|
"sentry/sentry-symfony": "^5.6",
|
||||||
|
"stof/doctrine-extensions-bundle": "^1.14",
|
||||||
"symfony/asset": "7.3.*",
|
"symfony/asset": "7.3.*",
|
||||||
"symfony/asset-mapper": "7.3.*",
|
"symfony/asset-mapper": "7.3.*",
|
||||||
"symfony/brevo-mailer": "7.3.*",
|
"symfony/brevo-mailer": "7.3.*",
|
||||||
@@ -48,6 +49,8 @@
|
|||||||
"twig/twig": "^3.21.1"
|
"twig/twig": "^3.21.1"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
|
"brianium/paratest": "^7.14",
|
||||||
|
"dama/doctrine-test-bundle": "^8.4",
|
||||||
"doctrine/doctrine-fixtures-bundle": "^4.3",
|
"doctrine/doctrine-fixtures-bundle": "^4.3",
|
||||||
"friendsofphp/php-cs-fixer": "^3.89.0",
|
"friendsofphp/php-cs-fixer": "^3.89.0",
|
||||||
"phpstan/extension-installer": "^1.4.3",
|
"phpstan/extension-installer": "^1.4.3",
|
||||||
|
|||||||
377
composer.lock
generated
377
composer.lock
generated
@@ -4,7 +4,7 @@
|
|||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "a87c0ab4f169484014962048bb246199",
|
"content-hash": "944e218741f3c7a1f04072e075255c2c",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "composer/pcre",
|
"name": "composer/pcre",
|
||||||
@@ -1338,6 +1338,138 @@
|
|||||||
],
|
],
|
||||||
"time": "2025-03-06T22:45:56+00:00"
|
"time": "2025-03-06T22:45:56+00:00"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "gedmo/doctrine-extensions",
|
||||||
|
"version": "v3.21.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/doctrine-extensions/DoctrineExtensions.git",
|
||||||
|
"reference": "eb53dfcb2b592327b76ac5226fbb003d32aea37e"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/doctrine-extensions/DoctrineExtensions/zipball/eb53dfcb2b592327b76ac5226fbb003d32aea37e",
|
||||||
|
"reference": "eb53dfcb2b592327b76ac5226fbb003d32aea37e",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"doctrine/collections": "^1.2 || ^2.0",
|
||||||
|
"doctrine/deprecations": "^1.0",
|
||||||
|
"doctrine/event-manager": "^1.2 || ^2.0",
|
||||||
|
"doctrine/persistence": "^2.2 || ^3.0 || ^4.0",
|
||||||
|
"php": "^7.4 || ^8.0",
|
||||||
|
"psr/cache": "^1 || ^2 || ^3",
|
||||||
|
"psr/clock": "^1",
|
||||||
|
"symfony/cache": "^5.4 || ^6.0 || ^7.0",
|
||||||
|
"symfony/string": "^5.4 || ^6.0 || ^7.0"
|
||||||
|
},
|
||||||
|
"conflict": {
|
||||||
|
"behat/transliterator": "<1.2 || >=2.0",
|
||||||
|
"doctrine/annotations": "<1.13 || >=3.0",
|
||||||
|
"doctrine/common": "<2.13 || >=4.0",
|
||||||
|
"doctrine/dbal": "<3.7 || >=5.0",
|
||||||
|
"doctrine/mongodb-odm": "<2.3 || >=3.0",
|
||||||
|
"doctrine/orm": "<2.20 || >=3.0 <3.3 || >=4.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"behat/transliterator": "^1.2",
|
||||||
|
"doctrine/annotations": "^1.13 || ^2.0",
|
||||||
|
"doctrine/cache": "^1.11 || ^2.0",
|
||||||
|
"doctrine/common": "^2.13 || ^3.0",
|
||||||
|
"doctrine/dbal": "^3.7 || ^4.0",
|
||||||
|
"doctrine/doctrine-bundle": "^2.3",
|
||||||
|
"doctrine/mongodb-odm": "^2.3",
|
||||||
|
"doctrine/orm": "^2.20 || ^3.3",
|
||||||
|
"friendsofphp/php-cs-fixer": "^3.70",
|
||||||
|
"nesbot/carbon": "^2.71 || ^3.0",
|
||||||
|
"phpstan/phpstan": "^2.1.1",
|
||||||
|
"phpstan/phpstan-doctrine": "^2.0.1",
|
||||||
|
"phpstan/phpstan-phpunit": "^2.0.3",
|
||||||
|
"phpunit/phpunit": "^9.6",
|
||||||
|
"rector/rector": "^2.0.6",
|
||||||
|
"symfony/console": "^5.4 || ^6.0 || ^7.0",
|
||||||
|
"symfony/doctrine-bridge": "^5.4 || ^6.0 || ^7.0",
|
||||||
|
"symfony/phpunit-bridge": "^6.4 || ^7.0",
|
||||||
|
"symfony/uid": "^5.4 || ^6.0 || ^7.0",
|
||||||
|
"symfony/yaml": "^5.4 || ^6.0 || ^7.0"
|
||||||
|
},
|
||||||
|
"suggest": {
|
||||||
|
"doctrine/mongodb-odm": "to use the extensions with the MongoDB ODM",
|
||||||
|
"doctrine/orm": "to use the extensions with the ORM"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-main": "3.x-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"Gedmo\\": "src/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Gediminas Morkevicius",
|
||||||
|
"email": "gediminas.morkevicius@gmail.com"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Gustavo Falco",
|
||||||
|
"email": "comfortablynumb84@gmail.com"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "David Buchmann",
|
||||||
|
"email": "david@liip.ch"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Doctrine behavioral extensions",
|
||||||
|
"homepage": "http://gediminasm.org/",
|
||||||
|
"keywords": [
|
||||||
|
"Blameable",
|
||||||
|
"behaviors",
|
||||||
|
"doctrine",
|
||||||
|
"extensions",
|
||||||
|
"gedmo",
|
||||||
|
"loggable",
|
||||||
|
"nestedset",
|
||||||
|
"odm",
|
||||||
|
"orm",
|
||||||
|
"sluggable",
|
||||||
|
"sortable",
|
||||||
|
"timestampable",
|
||||||
|
"translatable",
|
||||||
|
"tree",
|
||||||
|
"uploadable"
|
||||||
|
],
|
||||||
|
"support": {
|
||||||
|
"docs": "https://github.com/doctrine-extensions/DoctrineExtensions/tree/main/doc",
|
||||||
|
"issues": "https://github.com/doctrine-extensions/DoctrineExtensions/issues",
|
||||||
|
"source": "https://github.com/doctrine-extensions/DoctrineExtensions/tree/v3.21.0"
|
||||||
|
},
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"url": "https://github.com/l3pp4rd",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "https://github.com/mbabker",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "https://github.com/phansys",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "https://github.com/stof",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"time": "2025-09-22T17:04:34+00:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "guzzlehttp/psr7",
|
"name": "guzzlehttp/psr7",
|
||||||
"version": "2.8.0",
|
"version": "2.8.0",
|
||||||
@@ -2858,6 +2990,87 @@
|
|||||||
],
|
],
|
||||||
"time": "2025-09-24T13:41:01+00:00"
|
"time": "2025-09-24T13:41:01+00:00"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "stof/doctrine-extensions-bundle",
|
||||||
|
"version": "v1.14.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/stof/StofDoctrineExtensionsBundle.git",
|
||||||
|
"reference": "bdf3eb10baeb497ac5985b8f78a6cf55862c2662"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/bdf3eb10baeb497ac5985b8f78a6cf55862c2662",
|
||||||
|
"reference": "bdf3eb10baeb497ac5985b8f78a6cf55862c2662",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"gedmo/doctrine-extensions": "^3.20.0",
|
||||||
|
"php": "^8.1",
|
||||||
|
"symfony/cache": "^6.4 || ^7.0",
|
||||||
|
"symfony/config": "^6.4 || ^7.0",
|
||||||
|
"symfony/dependency-injection": "^6.4 || ^7.0",
|
||||||
|
"symfony/event-dispatcher": "^6.4 || ^7.0",
|
||||||
|
"symfony/http-kernel": "^6.4 || ^7.0",
|
||||||
|
"symfony/translation-contracts": "^2.5 || ^3.5"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpstan/phpstan": "^2.1",
|
||||||
|
"phpstan/phpstan-deprecation-rules": "^2.0",
|
||||||
|
"phpstan/phpstan-phpunit": "^2.0",
|
||||||
|
"phpstan/phpstan-strict-rules": "^2.0",
|
||||||
|
"phpstan/phpstan-symfony": "^2.0",
|
||||||
|
"symfony/mime": "^6.4 || ^7.0",
|
||||||
|
"symfony/phpunit-bridge": "^v6.4.1 || ^7.0.1",
|
||||||
|
"symfony/security-core": "^6.4 || ^7.0"
|
||||||
|
},
|
||||||
|
"suggest": {
|
||||||
|
"doctrine/doctrine-bundle": "to use the ORM extensions",
|
||||||
|
"doctrine/mongodb-odm-bundle": "to use the MongoDB ODM extensions",
|
||||||
|
"symfony/mime": "To use the Mime component integration for Uploadable"
|
||||||
|
},
|
||||||
|
"type": "symfony-bundle",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-main": "1.x-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"Stof\\DoctrineExtensionsBundle\\": "src"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Christophe Coevoet",
|
||||||
|
"email": "stof@notk.org"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Integration of the gedmo/doctrine-extensions with Symfony",
|
||||||
|
"homepage": "https://github.com/stof/StofDoctrineExtensionsBundle",
|
||||||
|
"keywords": [
|
||||||
|
"behaviors",
|
||||||
|
"doctrine2",
|
||||||
|
"extensions",
|
||||||
|
"gedmo",
|
||||||
|
"loggable",
|
||||||
|
"nestedset",
|
||||||
|
"sluggable",
|
||||||
|
"sortable",
|
||||||
|
"timestampable",
|
||||||
|
"translatable",
|
||||||
|
"tree"
|
||||||
|
],
|
||||||
|
"support": {
|
||||||
|
"issues": "https://github.com/stof/StofDoctrineExtensionsBundle/issues",
|
||||||
|
"source": "https://github.com/stof/StofDoctrineExtensionsBundle/tree/v1.14.0"
|
||||||
|
},
|
||||||
|
"time": "2025-05-01T08:00:32+00:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/asset",
|
"name": "symfony/asset",
|
||||||
"version": "v7.3.0",
|
"version": "v7.3.0",
|
||||||
@@ -8537,6 +8750,99 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"packages-dev": [
|
"packages-dev": [
|
||||||
|
{
|
||||||
|
"name": "brianium/paratest",
|
||||||
|
"version": "v7.14.2",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/paratestphp/paratest.git",
|
||||||
|
"reference": "de06de1ae1203b11976c6ca01d6a9081c8b33d45"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/paratestphp/paratest/zipball/de06de1ae1203b11976c6ca01d6a9081c8b33d45",
|
||||||
|
"reference": "de06de1ae1203b11976c6ca01d6a9081c8b33d45",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"ext-dom": "*",
|
||||||
|
"ext-pcre": "*",
|
||||||
|
"ext-reflection": "*",
|
||||||
|
"ext-simplexml": "*",
|
||||||
|
"fidry/cpu-core-counter": "^1.3.0",
|
||||||
|
"jean85/pretty-package-versions": "^2.1.1",
|
||||||
|
"php": "~8.3.0 || ~8.4.0 || ~8.5.0",
|
||||||
|
"phpunit/php-code-coverage": "^12.4.0",
|
||||||
|
"phpunit/php-file-iterator": "^6",
|
||||||
|
"phpunit/php-timer": "^8",
|
||||||
|
"phpunit/phpunit": "^12.4.1",
|
||||||
|
"sebastian/environment": "^8.0.3",
|
||||||
|
"symfony/console": "^6.4.20 || ^7.3.4",
|
||||||
|
"symfony/process": "^6.4.20 || ^7.3.4"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"doctrine/coding-standard": "^14.0.0",
|
||||||
|
"ext-pcntl": "*",
|
||||||
|
"ext-pcov": "*",
|
||||||
|
"ext-posix": "*",
|
||||||
|
"phpstan/phpstan": "^2.1.31",
|
||||||
|
"phpstan/phpstan-deprecation-rules": "^2.0.3",
|
||||||
|
"phpstan/phpstan-phpunit": "^2.0.7",
|
||||||
|
"phpstan/phpstan-strict-rules": "^2.0.7",
|
||||||
|
"symfony/filesystem": "^6.4.13 || ^7.3.2"
|
||||||
|
},
|
||||||
|
"bin": [
|
||||||
|
"bin/paratest",
|
||||||
|
"bin/paratest_for_phpstorm"
|
||||||
|
],
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"ParaTest\\": [
|
||||||
|
"src/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Brian Scaturro",
|
||||||
|
"email": "scaturrob@gmail.com",
|
||||||
|
"role": "Developer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Filippo Tessarotto",
|
||||||
|
"email": "zoeslam@gmail.com",
|
||||||
|
"role": "Developer"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Parallel testing for PHP",
|
||||||
|
"homepage": "https://github.com/paratestphp/paratest",
|
||||||
|
"keywords": [
|
||||||
|
"concurrent",
|
||||||
|
"parallel",
|
||||||
|
"phpunit",
|
||||||
|
"testing"
|
||||||
|
],
|
||||||
|
"support": {
|
||||||
|
"issues": "https://github.com/paratestphp/paratest/issues",
|
||||||
|
"source": "https://github.com/paratestphp/paratest/tree/v7.14.2"
|
||||||
|
},
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"url": "https://github.com/sponsors/Slamdunk",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "https://paypal.me/filippotessarotto",
|
||||||
|
"type": "paypal"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"time": "2025-10-24T07:20:53+00:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "clue/ndjson-react",
|
"name": "clue/ndjson-react",
|
||||||
"version": "v1.3.0",
|
"version": "v1.3.0",
|
||||||
@@ -8667,6 +8973,75 @@
|
|||||||
],
|
],
|
||||||
"time": "2024-05-06T16:37:16+00:00"
|
"time": "2024-05-06T16:37:16+00:00"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "dama/doctrine-test-bundle",
|
||||||
|
"version": "v8.4.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/dmaicher/doctrine-test-bundle.git",
|
||||||
|
"reference": "ce7cd44126c36694e2f2d92c4aedd4fc5b0874f2"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/dmaicher/doctrine-test-bundle/zipball/ce7cd44126c36694e2f2d92c4aedd4fc5b0874f2",
|
||||||
|
"reference": "ce7cd44126c36694e2f2d92c4aedd4fc5b0874f2",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"doctrine/dbal": "^3.3 || ^4.0",
|
||||||
|
"doctrine/doctrine-bundle": "^2.11.0 || ^3.0",
|
||||||
|
"php": ">= 8.1",
|
||||||
|
"psr/cache": "^2.0 || ^3.0",
|
||||||
|
"symfony/cache": "^6.4 || ^7.3 || ^8.0",
|
||||||
|
"symfony/framework-bundle": "^6.4 || ^7.3 || ^8.0"
|
||||||
|
},
|
||||||
|
"conflict": {
|
||||||
|
"phpunit/phpunit": "<10.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"behat/behat": "^3.0",
|
||||||
|
"friendsofphp/php-cs-fixer": "^3.27",
|
||||||
|
"phpstan/phpstan": "^2.0",
|
||||||
|
"phpunit/phpunit": "^10.5.57 || ^11.5.41|| ^12.3.14",
|
||||||
|
"symfony/dotenv": "^6.4 || ^7.3 || ^8.0",
|
||||||
|
"symfony/process": "^6.4 || ^7.3 || ^8.0"
|
||||||
|
},
|
||||||
|
"type": "symfony-bundle",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "8.x-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"DAMA\\DoctrineTestBundle\\": "src"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "David Maicher",
|
||||||
|
"email": "mail@dmaicher.de"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Symfony bundle to isolate doctrine database tests and improve test performance",
|
||||||
|
"keywords": [
|
||||||
|
"doctrine",
|
||||||
|
"isolation",
|
||||||
|
"performance",
|
||||||
|
"symfony",
|
||||||
|
"testing",
|
||||||
|
"tests"
|
||||||
|
],
|
||||||
|
"support": {
|
||||||
|
"issues": "https://github.com/dmaicher/doctrine-test-bundle/issues",
|
||||||
|
"source": "https://github.com/dmaicher/doctrine-test-bundle/tree/v8.4.0"
|
||||||
|
},
|
||||||
|
"time": "2025-10-11T15:24:02+00:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "doctrine/data-fixtures",
|
"name": "doctrine/data-fixtures",
|
||||||
"version": "2.2.0",
|
"version": "2.2.0",
|
||||||
|
|||||||
@@ -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;
|
||||||
@@ -32,4 +34,6 @@ return [
|
|||||||
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],
|
||||||
];
|
];
|
||||||
|
|||||||
5
config/packages/dama_doctrine_test_bundle.yaml
Normal file
5
config/packages/dama_doctrine_test_bundle.yaml
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
when@test:
|
||||||
|
dama_doctrine_test:
|
||||||
|
enable_static_connection: true
|
||||||
|
enable_static_meta_data_cache: true
|
||||||
|
enable_static_query_cache: true
|
||||||
7
config/packages/stof_doctrine_extensions.yaml
Normal file
7
config/packages/stof_doctrine_extensions.yaml
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
# Read the documentation: https://symfony.com/doc/current/bundles/StofDoctrineExtensionsBundle/index.html
|
||||||
|
# See the official DoctrineExtensions documentation for more details: https://github.com/doctrine-extensions/DoctrineExtensions/tree/main/doc
|
||||||
|
stof_doctrine_extensions:
|
||||||
|
default_locale: nl
|
||||||
|
orm:
|
||||||
|
default:
|
||||||
|
timestampable: true
|
||||||
@@ -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';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
@@ -26,7 +26,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,
|
||||||
|
|||||||
@@ -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) {
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ use Tvdt\Entity\Candidate;
|
|||||||
use Tvdt\Entity\Quiz;
|
use Tvdt\Entity\Quiz;
|
||||||
use Tvdt\Entity\Season;
|
use Tvdt\Entity\Season;
|
||||||
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,7 +28,7 @@ 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,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@@ -44,7 +43,7 @@ class QuizController extends AbstractController
|
|||||||
return $this->render('backoffice/quiz.html.twig', [
|
return $this->render('backoffice/quiz.html.twig', [
|
||||||
'season' => $season,
|
'season' => $season,
|
||||||
'quiz' => $quiz,
|
'quiz' => $quiz,
|
||||||
'result' => $this->candidateRepository->getScores($quiz),
|
'result' => $this->quizRepository->getScores($quiz),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ 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;
|
||||||
@@ -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,7 +30,7 @@ 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) {}
|
||||||
|
|
||||||
#[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, SeasonRepository $seasonRepository): Response
|
||||||
@@ -83,7 +83,6 @@ final class QuizController extends AbstractController
|
|||||||
CandidateRepository $candidateRepository,
|
CandidateRepository $candidateRepository,
|
||||||
QuestionRepository $questionRepository,
|
QuestionRepository $questionRepository,
|
||||||
AnswerRepository $answerRepository,
|
AnswerRepository $answerRepository,
|
||||||
GivenAnswerRepository $givenAnswerRepository,
|
|
||||||
QuizCandidateRepository $quizCandidateRepository,
|
QuizCandidateRepository $quizCandidateRepository,
|
||||||
): Response {
|
): Response {
|
||||||
$candidate = $candidateRepository->getCandidateByHash($season, $nameHash);
|
$candidate = $candidateRepository->getCandidateByHash($season, $nameHash);
|
||||||
@@ -103,20 +102,24 @@ final class QuizController extends AbstractController
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ('POST' === $request->getMethod()) {
|
if ('POST' === $request->getMethod()) {
|
||||||
|
// TODO: Extract saving answer logic to a service
|
||||||
$answer = $answerRepository->findOneBy(['id' => $request->request->get('answer')]);
|
$answer = $answerRepository->findOneBy(['id' => $request->request->get('answer')]);
|
||||||
|
|
||||||
if (!$answer instanceof Answer) {
|
if (!$answer instanceof Answer) {
|
||||||
throw new BadRequestHttpException('Invalid Answer ID');
|
throw new BadRequestHttpException('Invalid Answer ID');
|
||||||
}
|
}
|
||||||
|
|
||||||
$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 extarcting 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]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: Extract getting next question logic to a service
|
||||||
$question = $questionRepository->findNextQuestionForCandidate($candidate);
|
$question = $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'));
|
||||||
|
|
||||||
@@ -125,6 +128,7 @@ final class QuizController extends AbstractController
|
|||||||
|
|
||||||
$quizCandidateRepository->createIfNotExist($quiz, $candidate);
|
$quizCandidateRepository->createIfNotExist($quiz, $candidate);
|
||||||
|
|
||||||
|
// 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]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ 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 Tvdt\Entity\Answer;
|
use Tvdt\Entity\Answer;
|
||||||
use Tvdt\Entity\Candidate;
|
use Tvdt\Entity\Candidate;
|
||||||
@@ -12,8 +13,15 @@ use Tvdt\Entity\Question;
|
|||||||
use Tvdt\Entity\Quiz;
|
use Tvdt\Entity\Quiz;
|
||||||
use Tvdt\Entity\Season;
|
use Tvdt\Entity\Season;
|
||||||
|
|
||||||
class KrtekFixtures extends Fixture
|
final class KrtekFixtures extends Fixture implements FixtureGroupInterface
|
||||||
{
|
{
|
||||||
|
public const string KRTEK_SEASON = 'krtek-seaspm';
|
||||||
|
|
||||||
|
public static function getGroups(): array
|
||||||
|
{
|
||||||
|
return ['test', 'dev'];
|
||||||
|
}
|
||||||
|
|
||||||
public function load(ObjectManager $manager): void
|
public function load(ObjectManager $manager): void
|
||||||
{
|
{
|
||||||
$season = new Season();
|
$season = new Season();
|
||||||
@@ -41,6 +49,8 @@ class KrtekFixtures extends Fixture
|
|||||||
$season->addQuiz($this->createQuiz2($season));
|
$season->addQuiz($this->createQuiz2($season));
|
||||||
|
|
||||||
$manager->flush();
|
$manager->flush();
|
||||||
|
|
||||||
|
$this->addReference(self::KRTEK_SEASON, $season);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function createQuiz1(Season $season): Quiz
|
private function createQuiz1(Season $season): Quiz
|
||||||
|
|||||||
75
src/DataFixtures/TestFixtures.php
Normal file
75
src/DataFixtures/TestFixtures.php
Normal file
@@ -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();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,7 +6,7 @@ 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 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;
|
||||||
@@ -30,6 +30,7 @@ class Elimination
|
|||||||
#[ORM\Column(type: Types::JSONB)]
|
#[ORM\Column(type: Types::JSONB)]
|
||||||
public array $data = [];
|
public array $data = [];
|
||||||
|
|
||||||
|
#[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;
|
||||||
|
|
||||||
@@ -56,10 +57,4 @@ class Elimination
|
|||||||
{
|
{
|
||||||
return $this->data[$name] ?? null;
|
return $this->data[$name] ?? null;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[ORM\PrePersist]
|
|
||||||
public function setCreatedAtValue(): void
|
|
||||||
{
|
|
||||||
$this->created = new DateTimeImmutable();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,13 +6,12 @@ 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 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;
|
||||||
|
|
||||||
#[ORM\Entity(repositoryClass: GivenAnswerRepository::class)]
|
#[ORM\Entity(repositoryClass: GivenAnswerRepository::class)]
|
||||||
#[ORM\HasLifecycleCallbacks]
|
|
||||||
class GivenAnswer
|
class GivenAnswer
|
||||||
{
|
{
|
||||||
#[ORM\Column(type: UuidType::NAME, unique: true)]
|
#[ORM\Column(type: UuidType::NAME, unique: true)]
|
||||||
@@ -21,6 +20,7 @@ class GivenAnswer
|
|||||||
#[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;
|
||||||
|
|
||||||
@@ -37,10 +37,4 @@ class GivenAnswer
|
|||||||
#[ORM\ManyToOne(inversedBy: 'givenAnswers')]
|
#[ORM\ManyToOne(inversedBy: 'givenAnswers')]
|
||||||
private(set) Answer $answer,
|
private(set) Answer $answer,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
#[ORM\PrePersist]
|
|
||||||
public function setCreatedAtValue(): void
|
|
||||||
{
|
|
||||||
$this->created = new DateTimeImmutable();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,13 +6,12 @@ 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 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;
|
||||||
|
|
||||||
#[ORM\Entity(repositoryClass: QuizCandidateRepository::class)]
|
#[ORM\Entity(repositoryClass: QuizCandidateRepository::class)]
|
||||||
#[ORM\HasLifecycleCallbacks]
|
|
||||||
#[ORM\UniqueConstraint(columns: ['candidate_id', 'quiz_id'])]
|
#[ORM\UniqueConstraint(columns: ['candidate_id', 'quiz_id'])]
|
||||||
class QuizCandidate
|
class QuizCandidate
|
||||||
{
|
{
|
||||||
@@ -25,6 +24,7 @@ class QuizCandidate
|
|||||||
#[ORM\Column]
|
#[ORM\Column]
|
||||||
public float $corrections = 0;
|
public float $corrections = 0;
|
||||||
|
|
||||||
|
#[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 +37,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();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ class Season
|
|||||||
return $this->owners->contains($user);
|
return $this->owners->contains($user);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function generateSeasonCode(): self
|
public function generateSeasonCode(): void
|
||||||
{
|
{
|
||||||
$code = '';
|
$code = '';
|
||||||
$len = mb_strlen(self::SEASON_CODE_CHARACTERS) - 1;
|
$len = mb_strlen(self::SEASON_CODE_CHARACTERS) - 1;
|
||||||
@@ -108,7 +108,5 @@ class Season
|
|||||||
}
|
}
|
||||||
|
|
||||||
$this->seasonCode = $code;
|
$this->seasonCode = $code;
|
||||||
|
|
||||||
return $this;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,12 +7,12 @@ namespace Tvdt\Factory;
|
|||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Tvdt\Entity\Elimination;
|
use Tvdt\Entity\Elimination;
|
||||||
use Tvdt\Entity\Quiz;
|
use Tvdt\Entity\Quiz;
|
||||||
use Tvdt\Repository\CandidateRepository;
|
use Tvdt\Repository\QuizRepository;
|
||||||
|
|
||||||
final readonly class EliminationFactory
|
final readonly class EliminationFactory
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private CandidateRepository $candidateRepository,
|
private QuizRepository $quizRepository,
|
||||||
private EntityManagerInterface $em,
|
private EntityManagerInterface $em,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@@ -21,7 +21,7 @@ final readonly class EliminationFactory
|
|||||||
$elimination = new Elimination($quiz);
|
$elimination = new Elimination($quiz);
|
||||||
$this->em->persist($elimination);
|
$this->em->persist($elimination);
|
||||||
|
|
||||||
$scores = $this->candidateRepository->getScores($quiz);
|
$scores = $this->quizRepository->getScores($quiz);
|
||||||
|
|
||||||
$simpleScores = [];
|
$simpleScores = [];
|
||||||
|
|
||||||
|
|||||||
@@ -6,12 +6,8 @@ namespace Tvdt\Repository;
|
|||||||
|
|
||||||
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
||||||
use Doctrine\Persistence\ManagerRegistry;
|
use Doctrine\Persistence\ManagerRegistry;
|
||||||
use Safe\DateTimeImmutable;
|
|
||||||
use Safe\Exceptions\DatetimeException;
|
|
||||||
use Safe\Exceptions\UrlException;
|
use Safe\Exceptions\UrlException;
|
||||||
use Tvdt\Dto\Result;
|
|
||||||
use Tvdt\Entity\Candidate;
|
use Tvdt\Entity\Candidate;
|
||||||
use Tvdt\Entity\Quiz;
|
|
||||||
use Tvdt\Entity\Season;
|
use Tvdt\Entity\Season;
|
||||||
use Tvdt\Helpers\Base64;
|
use Tvdt\Helpers\Base64;
|
||||||
|
|
||||||
@@ -42,49 +38,4 @@ class CandidateRepository extends ServiceEntityRepository
|
|||||||
->setParameter('name', $name)
|
->setParameter('name', $name)
|
||||||
->getOneOrNullResult();
|
->getOneOrNullResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function save(Candidate $candidate, bool $flush = true): void
|
|
||||||
{
|
|
||||||
$this->getEntityManager()->persist($candidate);
|
|
||||||
|
|
||||||
if ($flush) {
|
|
||||||
$this->getEntityManager()->flush();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @throws DatetimeException
|
|
||||||
*
|
|
||||||
* @return list<Result>
|
|
||||||
*/
|
|
||||||
public function getScores(Quiz $quiz): array
|
|
||||||
{
|
|
||||||
$result = $this->getEntityManager()->createQuery(<<<DQL
|
|
||||||
select
|
|
||||||
c.id,
|
|
||||||
c.name,
|
|
||||||
sum(case when a.isRightAnswer = true then 1 else 0 end) as correct,
|
|
||||||
qc.corrections,
|
|
||||||
max(ga.created) as end_time,
|
|
||||||
qc.created as start_time,
|
|
||||||
(sum(case when a.isRightAnswer = true then 1 else 0 end) + qc.corrections) as score
|
|
||||||
from Tvdt\Entity\Candidate c
|
|
||||||
join c.givenAnswers ga
|
|
||||||
join ga.answer a
|
|
||||||
join c.quizData qc
|
|
||||||
where qc.quiz = :quiz and ga.quiz = :quiz
|
|
||||||
group by ga.quiz, c.id, qc.id
|
|
||||||
order by score desc, max(ga.created) - qc.created asc
|
|
||||||
DQL
|
|
||||||
)->setParameter('quiz', $quiz)->getResult();
|
|
||||||
|
|
||||||
return array_map(static fn (array $row): Result => new Result(
|
|
||||||
id: $row['id'],
|
|
||||||
name: $row['name'],
|
|
||||||
correct: (int) $row['correct'],
|
|
||||||
corrections: $row['corrections'],
|
|
||||||
time: new DateTimeImmutable($row['end_time'])->diff($row['start_time']),
|
|
||||||
score: $row['score'],
|
|
||||||
), $result);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,13 +17,4 @@ class GivenAnswerRepository extends ServiceEntityRepository
|
|||||||
{
|
{
|
||||||
parent::__construct($registry, GivenAnswer::class);
|
parent::__construct($registry, GivenAnswer::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function save(GivenAnswer $givenAnswer, bool $flush = true): void
|
|
||||||
{
|
|
||||||
$this->getEntityManager()->persist($givenAnswer);
|
|
||||||
|
|
||||||
if ($flush) {
|
|
||||||
$this->getEntityManager()->flush();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,10 +7,10 @@ namespace Tvdt\Repository;
|
|||||||
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
||||||
use Doctrine\Persistence\ManagerRegistry;
|
use Doctrine\Persistence\ManagerRegistry;
|
||||||
use Psr\Log\LoggerInterface;
|
use Psr\Log\LoggerInterface;
|
||||||
use Tvdt\Entity\Elimination;
|
use Safe\DateTimeImmutable;
|
||||||
use Tvdt\Entity\GivenAnswer;
|
use Safe\Exceptions\DatetimeException;
|
||||||
|
use Tvdt\Dto\Result;
|
||||||
use Tvdt\Entity\Quiz;
|
use Tvdt\Entity\Quiz;
|
||||||
use Tvdt\Entity\QuizCandidate;
|
|
||||||
use Tvdt\Exception\ErrorClearingQuizException;
|
use Tvdt\Exception\ErrorClearingQuizException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -29,22 +29,26 @@ class QuizRepository extends ServiceEntityRepository
|
|||||||
$em = $this->getEntityManager();
|
$em = $this->getEntityManager();
|
||||||
$em->beginTransaction();
|
$em->beginTransaction();
|
||||||
try {
|
try {
|
||||||
$em->createQueryBuilder()
|
$em->createQuery(<<<DQL
|
||||||
->delete()->from(QuizCandidate::class, 'qc')
|
delete from Tvdt\Entity\QuizCandidate qc
|
||||||
->where('qc.quiz = :quiz')
|
where qc.quiz = :quiz
|
||||||
|
DQL)
|
||||||
->setParameter('quiz', $quiz)
|
->setParameter('quiz', $quiz)
|
||||||
->getQuery()->execute();
|
->execute();
|
||||||
|
|
||||||
$em->createQueryBuilder()
|
$em->createQuery(<<<DQL
|
||||||
->delete()->from(GivenAnswer::class, 'ga')
|
delete from Tvdt\Entity\GivenAnswer ga
|
||||||
->where('ga.quiz = :quiz')
|
where ga.quiz = :quiz
|
||||||
|
DQL)
|
||||||
->setParameter('quiz', $quiz)
|
->setParameter('quiz', $quiz)
|
||||||
->getQuery()->execute();
|
->execute();
|
||||||
$em->createQueryBuilder()
|
|
||||||
->delete()->from(Elimination::class, 'e')
|
$em->createQuery(<<<DQL
|
||||||
->where('e.quiz = :quiz')
|
delete from Tvdt\Entity\Elimination e
|
||||||
|
where e.quiz = :quiz
|
||||||
|
DQL)
|
||||||
->setParameter('quiz', $quiz)
|
->setParameter('quiz', $quiz)
|
||||||
->getQuery()->execute();
|
->execute();
|
||||||
} catch (\Throwable $throwable) {
|
} catch (\Throwable $throwable) {
|
||||||
$this->logger->error($throwable->getMessage());
|
$this->logger->error($throwable->getMessage());
|
||||||
$em->rollback();
|
$em->rollback();
|
||||||
@@ -59,4 +63,40 @@ class QuizRepository extends ServiceEntityRepository
|
|||||||
$this->getEntityManager()->remove($quiz);
|
$this->getEntityManager()->remove($quiz);
|
||||||
$this->getEntityManager()->flush();
|
$this->getEntityManager()->flush();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @throws DatetimeException
|
||||||
|
*
|
||||||
|
* @return list<Result>
|
||||||
|
*/
|
||||||
|
public function getScores(Quiz $quiz): array
|
||||||
|
{
|
||||||
|
$result = $this->getEntityManager()->createQuery(<<<DQL
|
||||||
|
select
|
||||||
|
c.id,
|
||||||
|
c.name,
|
||||||
|
sum(case when a.isRightAnswer = true then 1 else 0 end) as correct,
|
||||||
|
qc.corrections,
|
||||||
|
max(ga.created) as end_time,
|
||||||
|
qc.created as start_time,
|
||||||
|
(sum(case when a.isRightAnswer = true then 1 else 0 end) + qc.corrections) as score
|
||||||
|
from Tvdt\Entity\Candidate c
|
||||||
|
join c.givenAnswers ga
|
||||||
|
join ga.answer a
|
||||||
|
join c.quizData qc
|
||||||
|
where qc.quiz = :quiz and ga.quiz = :quiz
|
||||||
|
group by ga.quiz, c.id, qc.id
|
||||||
|
order by score desc, max(ga.created) - qc.created asc
|
||||||
|
DQL
|
||||||
|
)->setParameter('quiz', $quiz)->getResult();
|
||||||
|
|
||||||
|
return array_map(static fn (array $row): Result => new Result(
|
||||||
|
id: $row['id'],
|
||||||
|
name: $row['name'],
|
||||||
|
correct: (int) $row['correct'],
|
||||||
|
corrections: $row['corrections'],
|
||||||
|
time: new DateTimeImmutable($row['end_time'])->diff($row['start_time']),
|
||||||
|
score: $row['score'],
|
||||||
|
), $result);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,17 @@ class SeasonRepository extends ServiceEntityRepository
|
|||||||
parent::__construct($registry, Season::class);
|
parent::__construct($registry, Season::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function findOneBySeasonCode(string $seasonCode): ?Season
|
||||||
|
{
|
||||||
|
return $this->getEntityManager()->createQuery(<<<DQL
|
||||||
|
select s from Tvdt\Entity\Season s
|
||||||
|
where s.seasonCode = :seasonCode
|
||||||
|
DQL)
|
||||||
|
->setParameter('seasonCode', $seasonCode)
|
||||||
|
->setMaxResults(1)
|
||||||
|
->getOneOrNullResult();
|
||||||
|
}
|
||||||
|
|
||||||
/** @return list<Season> Returns an array of Season objects */
|
/** @return list<Season> Returns an array of Season objects */
|
||||||
public function getSeasonsForUser(User $user): array
|
public function getSeasonsForUser(User $user): array
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -48,24 +48,14 @@ final class SeasonVoter extends Voter
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (true) {
|
$season = match (true) {
|
||||||
case $subject instanceof Answer:
|
$subject instanceof Answer => $subject->question->quiz->season,
|
||||||
$season = $subject->question->quiz->season;
|
$subject instanceof Elimination,
|
||||||
break;
|
$subject instanceof Question => $subject->quiz->season,
|
||||||
case $subject instanceof Elimination:
|
$subject instanceof Candidate,
|
||||||
case $subject instanceof Question:
|
$subject instanceof Quiz => $subject->season,
|
||||||
$season = $subject->quiz->season;
|
$subject instanceof Season => $subject,
|
||||||
break;
|
};
|
||||||
case $subject instanceof Candidate:
|
|
||||||
case $subject instanceof Quiz:
|
|
||||||
$season = $subject->season;
|
|
||||||
break;
|
|
||||||
case $subject instanceof Season:
|
|
||||||
$season = $subject;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return match ($attribute) {
|
return match ($attribute) {
|
||||||
self::EDIT, self::DELETE, self::ELIMINATION => $season->isOwner($user),
|
self::EDIT, self::DELETE, self::ELIMINATION => $season->isOwner($user),
|
||||||
|
|||||||
@@ -55,6 +55,10 @@ class QuizSpreadsheetService
|
|||||||
/** @throws SpreadsheetDataException */
|
/** @throws SpreadsheetDataException */
|
||||||
public function xlsxToQuiz(Quiz $quiz, File $file): void
|
public function xlsxToQuiz(Quiz $quiz, File $file): void
|
||||||
{
|
{
|
||||||
|
if (!$this->isSpreadsheetFile($file)) {
|
||||||
|
throw new \InvalidArgumentException('File must be a valid XLSX spreadsheet');
|
||||||
|
}
|
||||||
|
|
||||||
$spreadsheet = $this->readSheet($file);
|
$spreadsheet = $this->readSheet($file);
|
||||||
$sheet = $spreadsheet->getSheet($spreadsheet->getFirstSheetIndex());
|
$sheet = $spreadsheet->getSheet($spreadsheet->getFirstSheetIndex());
|
||||||
|
|
||||||
@@ -112,7 +116,10 @@ class QuizSpreadsheetService
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function quizToXlsx(Quiz $quiz): void {}
|
public function quizToXlsx(Quiz $quiz): void
|
||||||
|
{
|
||||||
|
throw new \Exception('Not implemented');
|
||||||
|
}
|
||||||
|
|
||||||
private function toXlsx(Spreadsheet $spreadsheet): \Closure
|
private function toXlsx(Spreadsheet $spreadsheet): \Closure
|
||||||
{
|
{
|
||||||
@@ -120,4 +127,9 @@ class QuizSpreadsheetService
|
|||||||
|
|
||||||
return static fn () => $writer->save('php://output');
|
return static fn () => $writer->save('php://output');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function isSpreadsheetFile(File $file): bool
|
||||||
|
{
|
||||||
|
return 'xlsx' === $file->getExtension();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
24
symfony.lock
24
symfony.lock
@@ -1,4 +1,16 @@
|
|||||||
{
|
{
|
||||||
|
"dama/doctrine-test-bundle": {
|
||||||
|
"version": "8.4",
|
||||||
|
"recipe": {
|
||||||
|
"repo": "github.com/symfony/recipes-contrib",
|
||||||
|
"branch": "main",
|
||||||
|
"version": "8.3",
|
||||||
|
"ref": "dfc51177476fb39d014ed89944cde53dc3326d23"
|
||||||
|
},
|
||||||
|
"files": [
|
||||||
|
"config/packages/dama_doctrine_test_bundle.yaml"
|
||||||
|
]
|
||||||
|
},
|
||||||
"doctrine/deprecations": {
|
"doctrine/deprecations": {
|
||||||
"version": "1.1",
|
"version": "1.1",
|
||||||
"recipe": {
|
"recipe": {
|
||||||
@@ -97,6 +109,18 @@
|
|||||||
"config/packages/sentry.yaml"
|
"config/packages/sentry.yaml"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"stof/doctrine-extensions-bundle": {
|
||||||
|
"version": "1.14",
|
||||||
|
"recipe": {
|
||||||
|
"repo": "github.com/symfony/recipes-contrib",
|
||||||
|
"branch": "main",
|
||||||
|
"version": "1.2",
|
||||||
|
"ref": "e805aba9eff5372e2d149a9ff56566769e22819d"
|
||||||
|
},
|
||||||
|
"files": [
|
||||||
|
"config/packages/stof_doctrine_extensions.yaml"
|
||||||
|
]
|
||||||
|
},
|
||||||
"symfony/asset-mapper": {
|
"symfony/asset-mapper": {
|
||||||
"version": "7.2",
|
"version": "7.2",
|
||||||
"recipe": {
|
"recipe": {
|
||||||
|
|||||||
70
tests/Command/ClaimSeasonCommandTest.php
Normal file
70
tests/Command/ClaimSeasonCommandTest.php
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Tvdt\Tests\Command;
|
||||||
|
|
||||||
|
use PHPUnit\Framework\Attributes\CoversClass;
|
||||||
|
use Symfony\Bundle\FrameworkBundle\Console\Application;
|
||||||
|
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
|
||||||
|
use Symfony\Component\Console\Command\Command;
|
||||||
|
use Symfony\Component\Console\Tester\CommandTester;
|
||||||
|
use Symfony\Component\HttpKernel\KernelInterface;
|
||||||
|
use Tvdt\Command\ClaimSeasonCommand;
|
||||||
|
use Tvdt\Entity\Season;
|
||||||
|
use Tvdt\Repository\SeasonRepository;
|
||||||
|
|
||||||
|
#[CoversClass(ClaimSeasonCommand::class)]
|
||||||
|
final class ClaimSeasonCommandTest extends KernelTestCase
|
||||||
|
{
|
||||||
|
private SeasonRepository $seasonRepository;
|
||||||
|
|
||||||
|
private CommandTester $commandTester;
|
||||||
|
|
||||||
|
protected function setUp(): void
|
||||||
|
{
|
||||||
|
$container = self::getContainer();
|
||||||
|
|
||||||
|
$this->assertInstanceOf(KernelInterface::class, self::$kernel);
|
||||||
|
|
||||||
|
$this->seasonRepository = $container->get(SeasonRepository::class);
|
||||||
|
$application = new Application(self::$kernel);
|
||||||
|
$command = $application->find('tvdt:claim-season');
|
||||||
|
$this->commandTester = new CommandTester($command);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testSeasonClaim(): void
|
||||||
|
{
|
||||||
|
$this->commandTester->execute([
|
||||||
|
'season-code' => 'krtek',
|
||||||
|
'email' => 'test@example.org',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$season = $this->seasonRepository->findOneBySeasonCode('krtek');
|
||||||
|
|
||||||
|
$this->assertInstanceOf(Season::class, $season);
|
||||||
|
|
||||||
|
$this->assertSame(Command::SUCCESS, $this->commandTester->getStatusCode());
|
||||||
|
$this->assertCount(3, $season->owners);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testInvalidEmailFails(): void
|
||||||
|
{
|
||||||
|
$this->commandTester->execute([
|
||||||
|
'season-code' => 'krtek',
|
||||||
|
'email' => 'nonexisting@example.org',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertSame(Command::FAILURE, $this->commandTester->getStatusCode());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testInvalidSeasonCodeFails(): void
|
||||||
|
{
|
||||||
|
$this->commandTester->execute([
|
||||||
|
'season-code' => 'dhadk',
|
||||||
|
'email' => 'test@example.org',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertSame(Command::FAILURE, $this->commandTester->getStatusCode());
|
||||||
|
}
|
||||||
|
}
|
||||||
57
tests/Command/MakeAdminCommandTest.php
Normal file
57
tests/Command/MakeAdminCommandTest.php
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Tvdt\Tests\Command;
|
||||||
|
|
||||||
|
use PHPUnit\Framework\Attributes\CoversClass;
|
||||||
|
use Symfony\Bundle\FrameworkBundle\Console\Application;
|
||||||
|
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
|
||||||
|
use Symfony\Component\Console\Command\Command;
|
||||||
|
use Symfony\Component\Console\Tester\CommandTester;
|
||||||
|
use Symfony\Component\HttpKernel\KernelInterface;
|
||||||
|
use Tvdt\Command\MakeAdminCommand;
|
||||||
|
use Tvdt\Entity\User;
|
||||||
|
use Tvdt\Repository\UserRepository;
|
||||||
|
|
||||||
|
#[CoversClass(MakeAdminCommand::class)]
|
||||||
|
final class MakeAdminCommandTest extends KernelTestCase
|
||||||
|
{
|
||||||
|
private UserRepository $userRepository;
|
||||||
|
|
||||||
|
private CommandTester $commandTester;
|
||||||
|
|
||||||
|
protected function setUp(): void
|
||||||
|
{
|
||||||
|
$container = self::getContainer();
|
||||||
|
|
||||||
|
$this->assertInstanceOf(KernelInterface::class, self::$kernel);
|
||||||
|
|
||||||
|
$this->userRepository = $container->get(UserRepository::class);
|
||||||
|
$application = new Application(self::$kernel);
|
||||||
|
$command = $application->find('tvdt:make-admin');
|
||||||
|
$this->commandTester = new CommandTester($command);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testMakeAdmin(): void
|
||||||
|
{
|
||||||
|
$this->commandTester->execute([
|
||||||
|
'email' => 'test@example.org',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$user = $this->userRepository->findOneBy(['email' => 'test@example.org']);
|
||||||
|
$this->assertInstanceOf(User::class, $user);
|
||||||
|
|
||||||
|
$this->assertSame(Command::SUCCESS, $this->commandTester->getStatusCode());
|
||||||
|
$this->assertContains('ROLE_ADMIN', $user->roles);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testInvalidEmailFails(): void
|
||||||
|
{
|
||||||
|
$this->commandTester->execute([
|
||||||
|
'email' => 'nonexisting@example.org',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertSame(Command::FAILURE, $this->commandTester->getStatusCode());
|
||||||
|
}
|
||||||
|
}
|
||||||
56
tests/Repository/CandidateRepositoryTest.php
Normal file
56
tests/Repository/CandidateRepositoryTest.php
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Tvdt\Tests\Repository;
|
||||||
|
|
||||||
|
use PHPUnit\Framework\Attributes\CoversClass;
|
||||||
|
use PHPUnit\Framework\Attributes\DataProvider;
|
||||||
|
use Tvdt\Entity\Candidate;
|
||||||
|
use Tvdt\Repository\CandidateRepository;
|
||||||
|
|
||||||
|
#[CoversClass(CandidateRepository::class)]
|
||||||
|
final class CandidateRepositoryTest extends DatabaseTestCase
|
||||||
|
{
|
||||||
|
/** @return iterable<string, array{0: string}> */
|
||||||
|
public static function candidateHashDataProvider(): iterable
|
||||||
|
{
|
||||||
|
yield 'Normal' => ['Q2xhdWRpYQ'];
|
||||||
|
yield 'lowercase' => ['Y2xhdWRpYQ'];
|
||||||
|
yield 'UPPERCASE' => ['Q0xBVURJQQ'];
|
||||||
|
}
|
||||||
|
|
||||||
|
#[DataProvider('candidateHashDataProvider')]
|
||||||
|
public function testGetCandidateByHash(string $hash): void
|
||||||
|
{
|
||||||
|
$krtekSeason = $this->getSeasonByCode('krtek');
|
||||||
|
$candidate = $this->candidateRepository->getCandidateByHash(
|
||||||
|
$krtekSeason,
|
||||||
|
$hash,
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->assertInstanceOf(Candidate::class, $candidate);
|
||||||
|
|
||||||
|
$this->assertSame('Claudia', $candidate->name);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetCandidateByHashUnknownHashReturnsNull(): void
|
||||||
|
{
|
||||||
|
$krtekSeason = $this->getSeasonByCode('krtek');
|
||||||
|
$result = $this->candidateRepository->getCandidateByHash(
|
||||||
|
$krtekSeason,
|
||||||
|
'TWFyaWpu',
|
||||||
|
);
|
||||||
|
$this->assertNotInstanceOf(Candidate::class, $result);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetCandidateByHashInvalidBase64HashReturnsNull(): void
|
||||||
|
{
|
||||||
|
$krtekSeason = $this->getSeasonByCode('krtek');
|
||||||
|
$result = $this->candidateRepository->getCandidateByHash(
|
||||||
|
$krtekSeason,
|
||||||
|
'TWFyaWpu*',
|
||||||
|
);
|
||||||
|
$this->assertNotInstanceOf(Candidate::class, $result);
|
||||||
|
}
|
||||||
|
}
|
||||||
70
tests/Repository/DatabaseTestCase.php
Normal file
70
tests/Repository/DatabaseTestCase.php
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Tvdt\Tests\Repository;
|
||||||
|
|
||||||
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
|
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
|
||||||
|
use Tvdt\Entity\Candidate;
|
||||||
|
use Tvdt\Entity\Season;
|
||||||
|
use Tvdt\Entity\User;
|
||||||
|
use Tvdt\Repository\CandidateRepository;
|
||||||
|
use Tvdt\Repository\QuestionRepository;
|
||||||
|
use Tvdt\Repository\QuizCandidateRepository;
|
||||||
|
use Tvdt\Repository\QuizRepository;
|
||||||
|
use Tvdt\Repository\SeasonRepository;
|
||||||
|
use Tvdt\Repository\UserRepository;
|
||||||
|
|
||||||
|
abstract class DatabaseTestCase extends KernelTestCase
|
||||||
|
{
|
||||||
|
protected private(set) EntityManagerInterface $entityManager;
|
||||||
|
|
||||||
|
protected private(set) CandidateRepository $candidateRepository;
|
||||||
|
|
||||||
|
protected private(set) QuestionRepository $questionRepository;
|
||||||
|
|
||||||
|
protected private(set) QuizCandidateRepository $quizCandidateRepository;
|
||||||
|
|
||||||
|
protected private(set) QuizRepository $quizRepository;
|
||||||
|
|
||||||
|
protected private(set) SeasonRepository $seasonRepository;
|
||||||
|
|
||||||
|
protected private(set) UserRepository $userRepository;
|
||||||
|
|
||||||
|
protected function setUp(): void
|
||||||
|
{
|
||||||
|
$this->entityManager = self::getContainer()->get(EntityManagerInterface::class);
|
||||||
|
|
||||||
|
$this->candidateRepository = self::getContainer()->get(CandidateRepository::class);
|
||||||
|
$this->questionRepository = self::getContainer()->get(QuestionRepository::class);
|
||||||
|
$this->quizCandidateRepository = self::getContainer()->get(QuizCandidateRepository::class);
|
||||||
|
$this->quizRepository = self::getContainer()->get(QuizRepository::class);
|
||||||
|
$this->seasonRepository = self::getContainer()->get(SeasonRepository::class);
|
||||||
|
$this->userRepository = self::getContainer()->get(UserRepository::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getUserByEmail(string $email): User
|
||||||
|
{
|
||||||
|
$user = $this->userRepository->findOneBy(['email' => $email]);
|
||||||
|
$this->assertInstanceOf(User::class, $user);
|
||||||
|
|
||||||
|
return $user;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getSeasonByCode(string $code): Season
|
||||||
|
{
|
||||||
|
$season = $this->seasonRepository->findOneBySeasonCode($code);
|
||||||
|
$this->assertInstanceOf(Season::class, $season);
|
||||||
|
|
||||||
|
return $season;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getCandidateBySeasonAndName(Season $season, string $name): Candidate
|
||||||
|
{
|
||||||
|
$candidate = $this->candidateRepository->findOneBy(['season' => $season, 'name' => $name]);
|
||||||
|
$this->assertInstanceOf(Candidate::class, $candidate);
|
||||||
|
|
||||||
|
return $candidate;
|
||||||
|
}
|
||||||
|
}
|
||||||
87
tests/Repository/QuestionRepositoryTest.php
Normal file
87
tests/Repository/QuestionRepositoryTest.php
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Tvdt\Tests\Repository;
|
||||||
|
|
||||||
|
use PHPUnit\Framework\Attributes\CoversClass;
|
||||||
|
use Tvdt\Entity\Answer;
|
||||||
|
use Tvdt\Entity\Candidate;
|
||||||
|
use Tvdt\Entity\GivenAnswer;
|
||||||
|
use Tvdt\Entity\Question;
|
||||||
|
use Tvdt\Entity\Quiz;
|
||||||
|
use Tvdt\Repository\QuestionRepository;
|
||||||
|
|
||||||
|
#[CoversClass(QuestionRepository::class)]
|
||||||
|
final class QuestionRepositoryTest extends DatabaseTestCase
|
||||||
|
{
|
||||||
|
public function testFindNextQuestionReturnsRightQuestion(): void
|
||||||
|
{
|
||||||
|
$krtekSeason = $this->getSeasonByCode('krtek');
|
||||||
|
$candidate = $this->getCandidateBySeasonAndName($krtekSeason, 'Tom');
|
||||||
|
|
||||||
|
$question = $this->questionRepository->findNextQuestionForCandidate($candidate);
|
||||||
|
$this->assertInstanceOf(Question::class, $question);
|
||||||
|
$this->assertSame('Is de Krtek een man of een vrouw?', $question->question, 'Wrong first question');
|
||||||
|
|
||||||
|
$this->answerQuestion($question, $candidate);
|
||||||
|
|
||||||
|
$question = $this->questionRepository->findNextQuestionForCandidate($candidate);
|
||||||
|
$this->assertInstanceOf(Question::class, $question);
|
||||||
|
$this->assertSame('Hoeveel broers heeft de Krtek?', $question->question, 'Wrong second question');
|
||||||
|
|
||||||
|
$question = $this->questionRepository->findNextQuestionForCandidate($candidate);
|
||||||
|
$this->assertInstanceOf(Question::class, $question);
|
||||||
|
$this->assertSame('Hoeveel broers heeft de Krtek?', $question->question, 'Getting question a second time fails');
|
||||||
|
|
||||||
|
$quiz = $krtekSeason->quizzes->last();
|
||||||
|
$this->assertInstanceOf(Quiz::class, $quiz);
|
||||||
|
$krtekSeason->activeQuiz = $quiz;
|
||||||
|
$this->entityManager->flush();
|
||||||
|
|
||||||
|
$question = $this->questionRepository->findNextQuestionForCandidate($candidate);
|
||||||
|
$this->assertInstanceOf(Question::class, $question);
|
||||||
|
$this->assertSame('Is de Krtek een man of een vrouw?', $question->question, 'Wrong question after switching season.');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testFindNextQuestionGivesNullWhenAllQuestionsAnswered(): void
|
||||||
|
{
|
||||||
|
$krtekSeason = $this->getSeasonByCode('krtek');
|
||||||
|
$candidate = $this->getCandidateBySeasonAndName($krtekSeason, 'Tom');
|
||||||
|
|
||||||
|
for ($i = 0; $i < 15; ++$i) {
|
||||||
|
$question = $this->questionRepository->findNextQuestionForCandidate($candidate);
|
||||||
|
$this->assertInstanceOf(Question::class, $question);
|
||||||
|
$this->answerQuestion($question, $candidate);
|
||||||
|
}
|
||||||
|
|
||||||
|
$question = $this->questionRepository->findNextQuestionForCandidate($candidate);
|
||||||
|
|
||||||
|
$this->assertNotInstanceOf(Question::class, $question);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testFindNextQuestionWithNoActiveQuizReturnsNull(): void
|
||||||
|
{
|
||||||
|
$krtekSeason = $this->getSeasonByCode('krtek');
|
||||||
|
$candidate = $this->getCandidateBySeasonAndName($krtekSeason, 'Tom');
|
||||||
|
|
||||||
|
$krtekSeason->activeQuiz = null;
|
||||||
|
$this->entityManager->flush();
|
||||||
|
|
||||||
|
$question = $this->questionRepository->findNextQuestionForCandidate($candidate);
|
||||||
|
|
||||||
|
$this->assertNotInstanceOf(Question::class, $question);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function answerQuestion(Question $question, Candidate $candidate): void
|
||||||
|
{
|
||||||
|
$answer = $question->answers->first();
|
||||||
|
$this->assertInstanceOf(Answer::class, $answer);
|
||||||
|
$this->entityManager->persist(new GivenAnswer(
|
||||||
|
$candidate,
|
||||||
|
$question->quiz,
|
||||||
|
$answer,
|
||||||
|
));
|
||||||
|
$this->entityManager->flush();
|
||||||
|
}
|
||||||
|
}
|
||||||
72
tests/Repository/QuizCandidateRepositoryTest.php
Normal file
72
tests/Repository/QuizCandidateRepositoryTest.php
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Tvdt\Tests\Repository;
|
||||||
|
|
||||||
|
use PHPUnit\Framework\Attributes\CoversClass;
|
||||||
|
use Tvdt\Entity\Quiz;
|
||||||
|
use Tvdt\Entity\QuizCandidate;
|
||||||
|
use Tvdt\Repository\QuizCandidateRepository;
|
||||||
|
|
||||||
|
#[CoversClass(QuizCandidateRepository::class)]
|
||||||
|
final class QuizCandidateRepositoryTest extends DatabaseTestCase
|
||||||
|
{
|
||||||
|
public function testCreateIfNotExists(): void
|
||||||
|
{
|
||||||
|
$krtekSeason = $this->getSeasonByCode('krtek');
|
||||||
|
$candidate = $this->getCandidateBySeasonAndName($krtekSeason, 'Myrthe');
|
||||||
|
$quiz = $krtekSeason->activeQuiz;
|
||||||
|
$this->assertInstanceOf(Quiz::class, $quiz);
|
||||||
|
|
||||||
|
$result = $this->quizCandidateRepository->createIfNotExist($quiz, $candidate);
|
||||||
|
$this->assertTrue($result);
|
||||||
|
|
||||||
|
$quizCandidate = $this->quizCandidateRepository->findOneBy([
|
||||||
|
'candidate' => $candidate,
|
||||||
|
'quiz' => $quiz,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertInstanceOf(QuizCandidate::class, $quizCandidate);
|
||||||
|
|
||||||
|
$result = $this->quizCandidateRepository->createIfNotExist($quiz, $candidate);
|
||||||
|
$this->assertFalse($result);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testSetCorrectionsForCandidateUpdatesCandidateCorrectly(): void
|
||||||
|
{
|
||||||
|
$krtekSeason = $this->getSeasonByCode('krtek');
|
||||||
|
$candidate = $this->getCandidateBySeasonAndName($krtekSeason, 'Myrthe');
|
||||||
|
$quiz = $krtekSeason->activeQuiz;
|
||||||
|
$this->assertInstanceOf(Quiz::class, $quiz);
|
||||||
|
|
||||||
|
$this->quizCandidateRepository->createIfNotExist($quiz, $candidate);
|
||||||
|
|
||||||
|
$this->quizCandidateRepository->setCorrectionsForCandidate(
|
||||||
|
$quiz, $candidate, 3.5,
|
||||||
|
);
|
||||||
|
|
||||||
|
$quizCandidate = $this->quizCandidateRepository->findOneBy([
|
||||||
|
'candidate' => $candidate,
|
||||||
|
'quiz' => $quiz,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertInstanceOf(QuizCandidate::class, $quizCandidate);
|
||||||
|
|
||||||
|
$this->assertEqualsWithDelta(3.5, $quizCandidate->corrections, 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCannotGiveCorrectionsToCandidateWithoutResult(): void
|
||||||
|
{
|
||||||
|
$krtekSeason = $this->getSeasonByCode('krtek');
|
||||||
|
$candidate = $this->getCandidateBySeasonAndName($krtekSeason, 'Myrthe');
|
||||||
|
$quiz = $krtekSeason->activeQuiz;
|
||||||
|
$this->assertInstanceOf(Quiz::class, $quiz);
|
||||||
|
|
||||||
|
$this->expectException(\InvalidArgumentException::class);
|
||||||
|
|
||||||
|
$this->quizCandidateRepository->setCorrectionsForCandidate(
|
||||||
|
$quiz, $candidate, 3.5,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
65
tests/Repository/QuizRepositoryTest.php
Normal file
65
tests/Repository/QuizRepositoryTest.php
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Tvdt\Tests\Repository;
|
||||||
|
|
||||||
|
use PHPUnit\Framework\Attributes\CoversClass;
|
||||||
|
use Psr\Clock\ClockInterface;
|
||||||
|
use Symfony\Component\Clock\MockClock;
|
||||||
|
use Tvdt\Entity\Quiz;
|
||||||
|
use Tvdt\Entity\QuizCandidate;
|
||||||
|
use Tvdt\Repository\GivenAnswerRepository;
|
||||||
|
use Tvdt\Repository\QuizRepository;
|
||||||
|
|
||||||
|
#[CoversClass(QuizRepository::class)]
|
||||||
|
final class QuizRepositoryTest extends DatabaseTestCase
|
||||||
|
{
|
||||||
|
public function testClearQuiz(): void
|
||||||
|
{
|
||||||
|
$krtekSeason = $this->getSeasonByCode('krtek');
|
||||||
|
$quiz = $krtekSeason->activeQuiz;
|
||||||
|
$this->assertInstanceOf(Quiz::class, $quiz);
|
||||||
|
|
||||||
|
$this->quizRepository->clearQuiz($quiz);
|
||||||
|
|
||||||
|
$this->entityManager->refresh($krtekSeason);
|
||||||
|
|
||||||
|
$this->assertEmpty($quiz->candidateData);
|
||||||
|
$this->assertEmpty($quiz->eliminations);
|
||||||
|
|
||||||
|
/** @var GivenAnswerRepository $givenAnswerRepository */
|
||||||
|
$givenAnswerRepository = self::getContainer()->get(GivenAnswerRepository::class);
|
||||||
|
$this->assertEmpty($givenAnswerRepository->findBy(['quiz' => $quiz]));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testDeleteQuiz(): void
|
||||||
|
{
|
||||||
|
$krtekSeason = $this->getSeasonByCode('krtek');
|
||||||
|
$quiz = $krtekSeason->quizzes->last();
|
||||||
|
$this->assertInstanceOf(Quiz::class, $quiz);
|
||||||
|
|
||||||
|
$this->quizRepository->deleteQuiz($quiz);
|
||||||
|
|
||||||
|
$this->entityManager->refresh($krtekSeason);
|
||||||
|
|
||||||
|
$this->assertCount(1, $krtekSeason->quizzes);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetScores(): void
|
||||||
|
{
|
||||||
|
$clock = new MockClock('2025-11-01 16:00:00');
|
||||||
|
self::getContainer()->set(ClockInterface::class, $clock);
|
||||||
|
$krtekSeason = $this->getSeasonByCode('krtek');
|
||||||
|
$candidate = $this->getCandidateBySeasonAndName($krtekSeason, 'Iris');
|
||||||
|
|
||||||
|
// Start Quiz
|
||||||
|
$qc = new QuizCandidate($krtekSeason->activeQuiz, $candidate);
|
||||||
|
$this->entityManager->persist($qc);
|
||||||
|
$this->entityManager->flush();
|
||||||
|
|
||||||
|
dump($qc->created);
|
||||||
|
|
||||||
|
$this->markTestIncomplete('TODO: Make fixtures first and write good test.');
|
||||||
|
}
|
||||||
|
}
|
||||||
59
tests/Repository/SeasonRepositoryTest.php
Normal file
59
tests/Repository/SeasonRepositoryTest.php
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Tvdt\Tests\Repository;
|
||||||
|
|
||||||
|
use PHPUnit\Framework\Attributes\CoversClass;
|
||||||
|
use Tvdt\Entity\Season;
|
||||||
|
use Tvdt\Repository\SeasonRepository;
|
||||||
|
|
||||||
|
#[CoversClass(SeasonRepository::class)]
|
||||||
|
final class SeasonRepositoryTest extends DatabaseTestCase
|
||||||
|
{
|
||||||
|
public function testGetSeasonsForUser(): void
|
||||||
|
{
|
||||||
|
$user = $this->getUserByEmail('krtek-admin@example.org');
|
||||||
|
|
||||||
|
$seasons = $this->seasonRepository->getSeasonsForUser($user);
|
||||||
|
$this->assertCount(1, $seasons);
|
||||||
|
$this->assertSame('krtek', $seasons[0]->seasonCode);
|
||||||
|
|
||||||
|
$user = $this->getUserByEmail('user1@example.org');
|
||||||
|
|
||||||
|
$seasons = $this->seasonRepository->getSeasonsForUser($user);
|
||||||
|
$this->assertCount(1, $seasons);
|
||||||
|
$this->assertSame('bbbbb', $seasons[0]->seasonCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testUserWithMultipleSeasons(): void
|
||||||
|
{
|
||||||
|
$user = $this->getUserByEmail('user2@example.org');
|
||||||
|
$seasons = $this->seasonRepository->getSeasonsForUser($user);
|
||||||
|
|
||||||
|
$this->assertCount(2, $seasons);
|
||||||
|
$this->assertSame('bbbbb', $seasons[0]->seasonCode);
|
||||||
|
$this->assertSame('krtek', $seasons[1]->seasonCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetSeasonsForUserWithoutSeasonsReturnsEmpty(): void
|
||||||
|
{
|
||||||
|
$user = $this->getUserByEmail('test@example.org');
|
||||||
|
|
||||||
|
$seasons = $this->seasonRepository->getSeasonsForUser($user);
|
||||||
|
$this->assertEmpty($seasons);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testFindOneBySeasonCode(): void
|
||||||
|
{
|
||||||
|
$season = $this->seasonRepository->findOneBySeasonCode('krtek');
|
||||||
|
$this->assertInstanceOf(Season::class, $season);
|
||||||
|
$this->assertSame('krtek', $season->seasonCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testFindOneBySeasonCodeUnknownSeasonReturnsNull(): void
|
||||||
|
{
|
||||||
|
$season = $this->seasonRepository->findOneBySeasonCode('invalid');
|
||||||
|
$this->assertNotInstanceOf(Season::class, $season);
|
||||||
|
}
|
||||||
|
}
|
||||||
45
tests/Repository/UserRepositoryTest.php
Normal file
45
tests/Repository/UserRepositoryTest.php
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Tvdt\Tests\Repository;
|
||||||
|
|
||||||
|
use PHPUnit\Framework\Attributes\CoversClass;
|
||||||
|
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
|
||||||
|
use Tvdt\DataFixtures\TestFixtures;
|
||||||
|
use Tvdt\Repository\UserRepository;
|
||||||
|
|
||||||
|
use function PHPUnit\Framework\assertEmpty;
|
||||||
|
|
||||||
|
#[CoversClass(UserRepository::class)]
|
||||||
|
final class UserRepositoryTest extends DatabaseTestCase
|
||||||
|
{
|
||||||
|
public function testUpgradePassword(): void
|
||||||
|
{
|
||||||
|
$passwordHasher = self::getContainer()->get(UserPasswordHasherInterface::class);
|
||||||
|
$user = $this->getUserByEmail('user1@example.org');
|
||||||
|
|
||||||
|
$newHash = $passwordHasher->hashPassword($user, TestFixtures::PASSWORD);
|
||||||
|
|
||||||
|
$this->assertNotSame($newHash, $user->password);
|
||||||
|
$this->userRepository->upgradePassword($user, $newHash);
|
||||||
|
|
||||||
|
$this->entityManager->refresh($user);
|
||||||
|
$this->assertSame($newHash, $user->password);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testMakeAdmin(): void
|
||||||
|
{
|
||||||
|
$user = $this->getUserByEmail('test@example.org');
|
||||||
|
assertEmpty($user->roles);
|
||||||
|
$this->userRepository->makeAdmin('test@example.org');
|
||||||
|
$this->entityManager->refresh($user);
|
||||||
|
$this->assertSame(['ROLE_ADMIN'], $user->roles);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testMakeAdminInvalidEmail(): void
|
||||||
|
{
|
||||||
|
$this->expectException(\InvalidArgumentException::class);
|
||||||
|
$this->userRepository->makeAdmin('invalid@example.org');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,11 +4,13 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace Tvdt\Tests\Security\Voter;
|
namespace Tvdt\Tests\Security\Voter;
|
||||||
|
|
||||||
|
use PHPUnit\Framework\Attributes\CoversClass;
|
||||||
use PHPUnit\Framework\Attributes\DataProvider;
|
use PHPUnit\Framework\Attributes\DataProvider;
|
||||||
use PHPUnit\Framework\MockObject\Stub;
|
use PHPUnit\Framework\MockObject\Stub;
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
|
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
|
||||||
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
|
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
|
||||||
|
use Symfony\Component\Security\Core\User\UserInterface;
|
||||||
use Tvdt\Entity\Answer;
|
use Tvdt\Entity\Answer;
|
||||||
use Tvdt\Entity\Candidate;
|
use Tvdt\Entity\Candidate;
|
||||||
use Tvdt\Entity\Elimination;
|
use Tvdt\Entity\Elimination;
|
||||||
@@ -18,6 +20,7 @@ use Tvdt\Entity\Season;
|
|||||||
use Tvdt\Entity\User;
|
use Tvdt\Entity\User;
|
||||||
use Tvdt\Security\Voter\SeasonVoter;
|
use Tvdt\Security\Voter\SeasonVoter;
|
||||||
|
|
||||||
|
#[CoversClass(SeasonVoter::class)]
|
||||||
final class SeasonVoterTest extends TestCase
|
final class SeasonVoterTest extends TestCase
|
||||||
{
|
{
|
||||||
private SeasonVoter $seasonVoter;
|
private SeasonVoter $seasonVoter;
|
||||||
@@ -51,27 +54,57 @@ final class SeasonVoterTest extends TestCase
|
|||||||
{
|
{
|
||||||
$season = self::createStub(Season::class);
|
$season = self::createStub(Season::class);
|
||||||
$season->method('isOwner')->willReturn(true);
|
$season->method('isOwner')->willReturn(true);
|
||||||
|
yield 'Season' => [$season];
|
||||||
$quiz = self::createStub(Quiz::class);
|
|
||||||
$quiz->season = $season;
|
|
||||||
|
|
||||||
$elimination = self::createStub(Elimination::class);
|
|
||||||
$elimination->quiz = $quiz;
|
|
||||||
|
|
||||||
$candidate = self::createStub(Candidate::class);
|
$candidate = self::createStub(Candidate::class);
|
||||||
$candidate->season = $season;
|
$candidate->season = $season;
|
||||||
|
yield 'Candidate' => [$candidate];
|
||||||
|
|
||||||
|
$quiz = self::createStub(Quiz::class);
|
||||||
|
$quiz->season = $season;
|
||||||
|
yield 'Quiz' => [$quiz];
|
||||||
|
|
||||||
|
$elimination = self::createStub(Elimination::class);
|
||||||
|
$elimination->quiz = $quiz;
|
||||||
|
yield 'Elimination' => [$elimination];
|
||||||
|
|
||||||
$question = self::createStub(Question::class);
|
$question = self::createStub(Question::class);
|
||||||
$question->quiz = $quiz;
|
$question->quiz = $quiz;
|
||||||
|
yield 'Question' => [$question];
|
||||||
|
|
||||||
$answer = self::createStub(Answer::class);
|
$answer = self::createStub(Answer::class);
|
||||||
$answer->question = $question;
|
$answer->question = $question;
|
||||||
|
|
||||||
yield 'Season' => [$season];
|
|
||||||
yield 'Elimination' => [$elimination];
|
|
||||||
yield 'Quiz' => [$quiz];
|
|
||||||
yield 'Candidate' => [$candidate];
|
|
||||||
yield 'Question' => [$question];
|
|
||||||
yield 'Answer' => [$answer];
|
yield 'Answer' => [$answer];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testWrongUserTypeReturnFalse(): void
|
||||||
|
{
|
||||||
|
$user = self::createStub(UserInterface::class);
|
||||||
|
$token = $this->createStub(TokenInterface::class);
|
||||||
|
$token->method('getUser')->willReturn($user);
|
||||||
|
|
||||||
|
$this->assertSame(VoterInterface::ACCESS_DENIED, $this->seasonVoter->vote($token, new Season(), ['SEASON_EDIT']));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testAdminCanDoAnything(): void
|
||||||
|
{
|
||||||
|
$user = new User();
|
||||||
|
$user->roles = ['ROLE_ADMIN'];
|
||||||
|
$token = $this->createStub(TokenInterface::class);
|
||||||
|
$token->method('getUser')->willReturn($user);
|
||||||
|
|
||||||
|
$this->assertSame(VoterInterface::ACCESS_GRANTED, $this->seasonVoter->vote($token, new Season(), ['SEASON_EDIT']));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testRandomClassWillAbstain(): void
|
||||||
|
{
|
||||||
|
$subject = new \stdClass();
|
||||||
|
$this->assertSame(VoterInterface::ACCESS_ABSTAIN, $this->seasonVoter->vote($this->token, $subject, ['SEASON_EDIT']));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testRandomSunjectWillAbstain(): void
|
||||||
|
{
|
||||||
|
$subject = new Season();
|
||||||
|
$this->assertSame(VoterInterface::ACCESS_ABSTAIN, $this->seasonVoter->vote($this->token, $subject, ['DO_NOTHING']));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user