Merge pull request #16 from oveleon/develop

[Bugfix] Fix potential PHP 8.1 errors
oveleon · Oct 27, 2022 · 3a12e36 · 3a12e36
2 parents f60844c + 755b4c1
commit 3a12e36
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/Resources/contao/classes/AdvancedForm.php b/src/Resources/contao/classes/AdvancedForm.php
@@ -39,7 +39,7 @@ public function compileFormFields($arrFields, $formId, Form $form)
             return $manager->getFieldsWithoutPageBreaks();
         }
 
-        if ($_POST['pageSwitch'] === 'back')
+        if (isset($_POST['pageSwitch']) && $_POST['pageSwitch'] === 'back')
         {
             $manager->storeData($_POST, [], (array) $_SESSION['FILES']);
             $this->redirectToStep($manager, $manager->getPreviousStep());

diff --git a/src/Resources/contao/classes/FormPageManager.php b/src/Resources/contao/classes/FormPageManager.php
@@ -436,6 +436,11 @@ public function storeData(array $submitted, array $labels, array $files)
      */
     public function getDataOfStep($step)
     {
+        if (!isset($_SESSION['FORMSTORAGE'][$this->objForm->id][$step]))
+        {
+            return [];
+        }
+
         return (array) $_SESSION['FORMSTORAGE'][$this->objForm->id][$step];
     }
 
@@ -501,6 +506,11 @@ public function setPreviousStepsWereInvalid()
      */
     public function getPreviousStepsWereInvalid()
     {
+        if (!isset($_SESSION['FORMSTORAGE_PSWI'][$this->objForm->id]))
+        {
+            return false;
+        }
+
         return $_SESSION['FORMSTORAGE_PSWI'][$this->objForm->id] === true;
     }
 
@@ -629,7 +639,7 @@ public function validateField(FormFieldModel $formField, $step)
         $form = $this->createDummyForm();
 
         // HOOK: load form field callback
-        if (isset($GLOBALS['TL_HOOKS']['loadFormField']) && \is_array($GLOBALS['TL_HOOKS']['loadFormField']))
+        if (isset($GLOBALS['TL_HOOKS']['loadFormField']) && is_array($GLOBALS['TL_HOOKS']['loadFormField']))
         {
             foreach ($GLOBALS['TL_HOOKS']['loadFormField'] as $callback)
             {
@@ -703,7 +713,10 @@ public function validateField(FormFieldModel $formField, $step)
     protected function createDummyForm()
     {
         $form = new \stdClass();
-        $form->form = $this->objForm->id;
+        $form->form =       $this->objForm->id;
+        $form->headline =   null;
+        $form->typePrefix = null;
+        $form->cssID =      null;
 
         return new Form($form);
     }