diff --git a/src/Forms/Form.php b/src/Forms/Form.php index 4ce24d70f..3f5f95771 100644 --- a/src/Forms/Form.php +++ b/src/Forms/Form.php @@ -1401,7 +1401,7 @@ class Form extends ViewableData implements HasRequestHandler // `setValue` method to use. if (($mergeStrategy & self::MERGE_AS_INTERNAL_VALUE) == self::MERGE_AS_INTERNAL_VALUE) { $submitted = false; - } else if (($mergeStrategy & self::MERGE_AS_SUBMITTED_VALUE) == self::MERGE_AS_SUBMITTED_VALUE) { + } elseif (($mergeStrategy & self::MERGE_AS_SUBMITTED_VALUE) == self::MERGE_AS_SUBMITTED_VALUE) { $submitted = true; } diff --git a/tests/php/Forms/FormTest.php b/tests/php/Forms/FormTest.php index 8b9a2948b..3322eb1b5 100644 --- a/tests/php/Forms/FormTest.php +++ b/tests/php/Forms/FormTest.php @@ -1071,7 +1071,6 @@ class FormTest extends FunctionalTest $this->mainSession->session()->get('FormInfo.Form_Form'), 'Our form was reloaded successfully. That should have cleared our session.' ); - } protected function getStubForm()