From 65282d674f6a134972bf72315bab645fb8b9c20e Mon Sep 17 00:00:00 2001
From: "M. Vondano" <m-vo@users.noreply.github.com>
Date: Thu, 3 Feb 2022 09:57:42 +0100
Subject: [PATCH 1/4] drop leftover compiler pass

---
 .../Compiler/RegisterSessionStoragePass.php   | 27 -------------------
 src/MvoContaoSurveyBundle.php                 |  3 ---
 2 files changed, 30 deletions(-)
 delete mode 100644 src/DependencyInjection/Compiler/RegisterSessionStoragePass.php

diff --git a/src/DependencyInjection/Compiler/RegisterSessionStoragePass.php b/src/DependencyInjection/Compiler/RegisterSessionStoragePass.php
deleted file mode 100644
index fecc5df..0000000
--- a/src/DependencyInjection/Compiler/RegisterSessionStoragePass.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * @author  Moritz Vondano
- * @license MIT
- */
-
-namespace Mvo\ContaoSurvey\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-
-class RegisterSessionStoragePass implements CompilerPassInterface
-{
-    public function process(ContainerBuilder $container): void
-    {
-        if (!$container->hasDefinition('session')) {
-            return;
-        }
-
-        $session = $container->findDefinition('session');
-        $session->addMethodCall('registerBag', [new Reference('mvo.survey.session_storage')]);
-    }
-}
diff --git a/src/MvoContaoSurveyBundle.php b/src/MvoContaoSurveyBundle.php
index 653448a..a586c53 100644
--- a/src/MvoContaoSurveyBundle.php
+++ b/src/MvoContaoSurveyBundle.php
@@ -9,7 +9,6 @@
 
 namespace Mvo\ContaoSurvey;
 
-use Mvo\ContaoSurvey\DependencyInjection\Compiler\RegisterSessionStoragePass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
@@ -18,7 +17,5 @@ class MvoContaoSurveyBundle extends Bundle
     public function build(ContainerBuilder $container): void
     {
         parent::build($container);
-
-        $container->addCompilerPass(new RegisterSessionStoragePass());
     }
 }

From 6151e00169d1832040bf837528e19bb29fae7b74 Mon Sep 17 00:00:00 2001
From: "M. Vondano" <m-vo@users.noreply.github.com>
Date: Thu, 3 Feb 2022 09:58:05 +0100
Subject: [PATCH 2/4] do not use deprecated Request#get()

---
 src/Controller/DisplayRecordsController.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Controller/DisplayRecordsController.php b/src/Controller/DisplayRecordsController.php
index d85f305..df0cb82 100644
--- a/src/Controller/DisplayRecordsController.php
+++ b/src/Controller/DisplayRecordsController.php
@@ -46,8 +46,7 @@ public function question(Request $request, int $id): Response
             throw $this->createAccessDeniedException();
         }
 
-        $stateParameter = $request->get('state');
-        $overwriteState = null !== $stateParameter ? (bool) $stateParameter : null;
+        $overwriteState = $request->query->has('state') ? (bool) $request->query->get('state') : null;
 
         /** @var Question|null $question */
         $question = $this->questionRepository->find($id);

From 4f2d6758623f1fa56b33798867c6ee6e406cb0e7 Mon Sep 17 00:00:00 2001
From: "M. Vondano" <m-vo@users.noreply.github.com>
Date: Thu, 3 Feb 2022 09:58:21 +0100
Subject: [PATCH 3/4] help psalm understand the code

---
 src/Controller/SurveyFragment.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Controller/SurveyFragment.php b/src/Controller/SurveyFragment.php
index d6f29f0..7267911 100644
--- a/src/Controller/SurveyFragment.php
+++ b/src/Controller/SurveyFragment.php
@@ -22,6 +22,7 @@
 use Mvo\ContaoSurvey\Form\SurveyManagerFactory;
 use Mvo\ContaoSurvey\Registry;
 use Mvo\ContaoSurvey\Repository\SurveyRepository;
+use Symfony\Component\Form\SubmitButton;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
@@ -127,14 +128,20 @@ private function proceedUntilCompleted(SurveyManager $manager): bool
         }
 
         // reset (back to the first step)
-        if ($manager->form['reset']->isClicked()) {
+        /** @var SubmitButton $resetButton */
+        $resetButton = $manager->form['reset'];
+
+        if ($resetButton->isClicked()) {
             $manager->reset();
 
             return false;
         }
 
         // back to the previous step
-        if (isset($manager->form['previous']) && $manager->form['previous']->isClicked() && $manager->previousStep()) {
+        /** @var SubmitButton|null $backButton */
+        $backButton = $manager->form['previous'] ?? null;
+
+        if ($backButton && $backButton->isClicked() && $manager->previousStep()) {
             return false;
         }
 

From f979e154f465435bc8bc6e93d9b23206cdcbd9f3 Mon Sep 17 00:00:00 2001
From: "M. Vondano" <m-vo@users.noreply.github.com>
Date: Thu, 3 Feb 2022 09:58:39 +0100
Subject: [PATCH 4/4] configure allowed plugins

---
 composer.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/composer.json b/composer.json
index d559ae6..ba37158 100644
--- a/composer.json
+++ b/composer.json
@@ -90,5 +90,12 @@
       "@chain",
       "yarn build"
     ]
+  },
+  "config": {
+    "allow-plugins": {
+      "contao-components/installer": true,
+      "bamarni/composer-bin-plugin": true,
+      "contao/manager-plugin": true
+    }
   }
 }