MPForms 4 only works in Contao 4

Author: aschempp

composer-dependency-analyser.php

@@ -6,7 +6,4 @@
 return (new Configuration())
     // Optional integrations
     ->ignoreErrorsOnPackage('terminal42/contao-mp_forms', [ErrorType::DEV_DEPENDENCY_IN_PROD])
-
-    // Old version of mp-forms
-    ->ignoreUnknownClasses([\MPFormsSessionManager::class])
 ;

composer.json

@@ -39,7 +39,7 @@
     "require-dev": {
         "contao/manager-plugin": "^2.0",
         "terminal42/contao-build-tools": "dev-main",
-        "terminal42/contao-mp_forms": "^4.4 || ^5.0"
+        "terminal42/contao-mp_forms": "^5.0"
     },
     "conflict": {
         "contao/manager-plugin": "<2.0 || >=3.0",

src/FormHandler.php

@@ -179,27 +179,16 @@ private function getInput(string $fieldName)
 
     private function getPreviousDataFromMpForms(): array
     {
-        // MP Forms v5
-        if (null !== $this->formManagerFactory) {
-            $manager = $this->formManagerFactory->forFormId((int) $this->form->id);
-
-            if ($manager->isPreparing()) {
-                return [];
-            }
-
-            $previousStepsData = $manager->getDataOfAllSteps();
-
-            return $previousStepsData->getAllSubmitted();
+        if (null === $this->formManagerFactory) {
+            return [];
         }
 
-        // MP Forms v4
-        if (class_exists(\MPFormsSessionManager::class)) {
-            $manager = new \MPFormsSessionManager($this->form->id);
-            $previousStepsData = $manager->getDataOfAllSteps();
+        $manager = $this->formManagerFactory->forFormId((int) $this->form->id);
 
-            return $previousStepsData['submitted'];
+        if ($manager->isPreparing()) {
+            return [];
         }
 
-        return [];
+        return $manager->getDataOfAllSteps()->getAllSubmitted();
     }
 }