Refactor YAML and Twig files for consistent indentation and formatting

2026-03-05 20:44:19 +01:00 · 2025-03-05 22:47:59 +01:00
parent 0ccce51af8
commit f7b4b98da4
33 changed files with 1504 additions and 532 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -33,6 +33,7 @@ indent_size = 4

 [*.{yaml,yml}]
 trim_trailing_whitespace = false
+indent_size = 2

 [.github/workflows/*.yml]
 indent_size = 2
--- a/.gitignore
+++ b/.gitignore
@@ -105,3 +105,7 @@ phpstan.neon
 /phpunit.xml
 .phpunit.result.cache
 ###< phpunit/phpunit ###
+
+###> vincentlanglet/twig-cs-fixer ###
+/.twig-cs-fixer.cache
+###< vincentlanglet/twig-cs-fixer ###
--- a/.idea/TijdVoorDeTest.iml
+++ b/.idea/TijdVoorDeTest.iml
@@ -85,7 +85,6 @@
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-intl-grapheme" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-intl-normalizer" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-mbstring" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php83" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/process" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/routing" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/runtime" />
@@ -133,6 +132,8 @@
      <excludeFolder url="file://$MODULE_DIR$/vendor/twig/html-extra" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/data-fixtures" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/doctrine-fixtures-bundle" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/vincentlanglet/twig-cs-fixer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/assert" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -46,7 +46,6 @@
      <path value="$PROJECT_DIR$/vendor/symfony/finder" />
      <path value="$PROJECT_DIR$/vendor/symfony/runtime" />
      <path value="$PROJECT_DIR$/vendor/symfony/routing" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php83" />
      <path value="$PROJECT_DIR$/vendor/psr/event-dispatcher" />
      <path value="$PROJECT_DIR$/vendor/symfony/var-exporter" />
      <path value="$PROJECT_DIR$/vendor/psr/cache" />
@@ -163,6 +162,8 @@
      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
      <path value="$PROJECT_DIR$/vendor/doctrine/data-fixtures" />
      <path value="$PROJECT_DIR$/vendor/doctrine/doctrine-fixtures-bundle" />
+      <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
+      <path value="$PROJECT_DIR$/vendor/vincentlanglet/twig-cs-fixer" />
    </include_path>
  </component>
  <component name="PhpInterpreters">
--- a/.idea/phpunit.xml
+++ b/.idea/phpunit.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PHPUnit">
+    <option name="directories">
+      <list>
+        <option value="$PROJECT_DIR$/tests" />
+      </list>
+    </option>
+  </component>
+</project>
--- a/2
+++ b/2
@@ -67,6 +67,8 @@ RUN set -eux; \

 COPY --link frankenphp/conf.d/20-app.dev.ini $PHP_INI_DIR/app.conf.d/

+RUN git config --global --add safe.directory /app
+
 CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile", "--watch" ]

 # Prod FrankenPHP image
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -0,0 +1,20 @@
+version: '3'
+
+tasks:
+  up:
+    cmds:
+      - docker compose up -d
+  down:
+    cmds:
+      - docker compose down
+  stop:
+    cmds:
+      - docker compose stop
+  shell:
+    cmds:
+      - docker compose exec app bash
+  migrate:
+    cmds:
+      - docker compose run php bin/console doctrine:migrations:migrate
+      
+      
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "symfony/skeleton",
+    "name": "MarijnDoeve/TijdVoorDeTest",
    "type": "project",
    "license": "MIT",
    "description": "A minimal Symfony project recommended to create bare bones applications",
@@ -9,16 +9,16 @@
        "php": ">=8.3.15",
        "ext-ctype": "*",
        "ext-iconv": "*",
-        "doctrine/dbal": "^3",
-        "doctrine/doctrine-bundle": "^2.13",
-        "doctrine/doctrine-migrations-bundle": "^3.3",
-        "doctrine/orm": "^3.3",
-        "easycorp/easyadmin-bundle": "^4.23",
+        "doctrine/dbal": "^4.2.2",
+        "doctrine/doctrine-bundle": "^2.13.2",
+        "doctrine/doctrine-migrations-bundle": "^3.4.1",
+        "doctrine/orm": "^3.3.2",
+        "easycorp/easyadmin-bundle": "^4.24.4",
        "runtime/frankenphp-symfony": "^0.2.0",
        "symfony/asset": "7.2.*",
        "symfony/console": "7.2.*",
        "symfony/dotenv": "7.2.*",
-        "symfony/flex": "^2.4.7",
+        "symfony/flex": "^2.5.0",
        "symfony/form": "7.2.*",
        "symfony/framework-bundle": "7.2.*",
        "symfony/runtime": "7.2.*",
@@ -29,19 +29,21 @@
        "thecodingmachine/safe": "^2.5"
    },
    "require-dev": {
+        "roave/security-advisories": "dev-latest",
        "doctrine/doctrine-fixtures-bundle": "^4.0",
-        "friendsofphp/php-cs-fixer": "^3.65",
-        "phpstan/extension-installer": "^1.4",
-        "phpstan/phpstan": "^2.0",
-        "phpstan/phpstan-doctrine": "^2.0",
-        "phpstan/phpstan-phpunit": "^2.0",
-        "phpstan/phpstan-symfony": "^2.0",
-        "phpunit/phpunit": "^11",
-        "rector/rector": "^2.0",
+        "friendsofphp/php-cs-fixer": "^3.70.2",
+        "phpstan/extension-installer": "^1.4.3",
+        "phpstan/phpstan": "^2.1.7",
+        "phpstan/phpstan-doctrine": "^2.0.2",
+        "phpstan/phpstan-phpunit": "^2.0.4",
+        "phpstan/phpstan-symfony": "^2.0.2",
+        "phpunit/phpunit": "^11.5.11",
+        "rector/rector": "^2.0.10",
        "symfony/maker-bundle": "^1.62.1",
        "symfony/stopwatch": "7.2.*",
        "symfony/web-profiler-bundle": "7.2.*",
-        "thecodingmachine/phpstan-safe-rule": "^1.3"
+        "thecodingmachine/phpstan-safe-rule": "^1.4",
+        "vincentlanglet/twig-cs-fixer": "^3.5.1"
    },
    "config": {
        "allow-plugins": {
@@ -71,7 +73,8 @@
        "symfony/polyfill-php74": "*",
        "symfony/polyfill-php80": "*",
        "symfony/polyfill-php81": "*",
-        "symfony/polyfill-php82": "*"
+        "symfony/polyfill-php82": "*",
+        "symfony/polyfill-php83": "*"
    },
    "scripts": {
        "auto-scripts": {
--- a/composer.lock
+++ b/composer.lock
--- a/src/Controller/QuizController.php
+++ b/src/Controller/QuizController.php
@@ -83,14 +83,14 @@ class QuizController extends AbstractController
        $candidate = $candidateRepository->getCandidateByHash($season, $nameHash);

        if (!$candidate instanceof Candidate) {
-            if (false === $season->isPreregisterCandidates()) {
-                $candidate = new Candidate(Base64::base64_url_decode($nameHash));
-                $candidateRepository->save($candidate);
-            } else {
+            if (true === $season->isPreregisterCandidates()) {
                $this->addFlash(FlashType::Danger, 'Candidate not found');

                return $this->redirectToRoute('enter_name', ['seasonCode' => $season->getSeasonCode()]);
            }
+
+            $candidate = new Candidate(Base64::base64_url_decode($nameHash));
+            $candidateRepository->save($candidate);
        }

        if ('POST' === $request->getMethod()) {
@@ -100,10 +100,9 @@ class QuizController extends AbstractController
                throw new BadRequestException('Invalid Answer ID');
            }

-            $givenAnswer = new GivenAnswer();
-            $givenAnswer->setCandidate($candidate)
-                ->setAnswer($answer)
-                ->setQuiz($answer->getQuestion()->getQuiz());
+            $givenAnswer = (new GivenAnswer())
+                ->setCandidate($candidate)
+                ->setAnswer($answer);
            $givenAnswerRepository->save($givenAnswer);
        }

@@ -115,6 +114,7 @@ class QuizController extends AbstractController
            return $this->redirectToRoute('enter_name', ['seasonCode' => $season->getSeasonCode()]);
        }

+        // TODO One first question record time
        return $this->render('quiz/question.twig', ['candidate' => $candidate, 'question' => $question]);
    }
 }
--- a/src/DataFixtures/KrtekFixtures.php
+++ b/src/DataFixtures/KrtekFixtures.php
@@ -77,7 +77,7 @@ class KrtekFixtures extends Fixture
                ->addAnswer(new Answer('Met de auto'))
            )
            ->addQuestion((new Question())
-                ->setQuestion('Met wie keek de Kretek video bij binnenkomst?')
+                ->setQuestion('Met wie keek de Krtek video bij binnenkomst?')
                ->addAnswer(new Answer('Claudia'))
                ->addAnswer(new Answer('Eelco'))
                ->addAnswer(new Answer('Elise'))
--- a/symfony.lock
+++ b/symfony.lock
@@ -250,5 +250,14 @@
    },
    "twig/extra-bundle": {
        "version": "v3.18.0"
+    },
+    "vincentlanglet/twig-cs-fixer": {
+        "version": "3.5",
+        "recipe": {
+            "repo": "github.com/symfony/recipes-contrib",
+            "branch": "main",
+            "version": "3.0",
+            "ref": "d42582ae1bce86fd43491d6264c738b0867f8ffe"
+        }
    }
 }
--- a/templates/quiz/enter_name.twig
+++ b/templates/quiz/enter_name.twig
@@ -1,4 +1,4 @@
-{% extends "quiz/base.html.twig" %}
+{% extends 'quiz/base.html.twig' %}
 {% block body %}
    {{ season.name }}
    {{ form(form) }}
--- a/templates/quiz/question.twig
+++ b/templates/quiz/question.twig
@@ -1,7 +1,5 @@
-{% extends "quiz/base.html.twig" %}
+{% extends 'quiz/base.html.twig' %}
 {% block body %}
-    Candiadte: {{ candidate.name }}<br/>
-
    {{ question.question }}<br/>
    <form method="post">
        {% for answer in question.answers %}
--- a/templates/quiz/select_season.html.twig
+++ b/templates/quiz/select_season.html.twig
@@ -1,4 +1,4 @@
-{% extends "quiz/base.html.twig" %}
+{% extends 'quiz/base.html.twig' %}
 {% block body %}
    {{ form(form) }}
 {% endblock body %}