Merge pull request #59 from m-vo/housekeeping

Housekeeping

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
+    }
   }
 }

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);

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;
         }
 

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());
     }
 }