Merge branch '5.1'

neos · Jun 21, 2021 · 168907c · 168907c
2 parents b76e137 + bcb806b
commit 168907c
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 6 deletions.
diff --git a/Classes/Core/Runtime/FormRuntime.php b/Classes/Core/Runtime/FormRuntime.php
@@ -165,7 +165,7 @@ public function initializeObject()
         $this->initializeFormStateFromRequest();
         $this->initializeCurrentPageFromRequest();
 
-        if (!$this->isFirstRequest() && $this->getRequest()->getHttpRequest()->getMethod() === 'POST') {
+        if (!$this->isFirstRequest()) {
             $this->processSubmittedFormValues();
         }
     }

diff --git a/Classes/Finishers/EmailFinisher.php b/Classes/Finishers/EmailFinisher.php
@@ -168,7 +168,7 @@ protected function executeInternal()
         }
     }
 
-    protected function addMessages(SwiftMailerMessage $mail, array $messages): void
+    protected function addMessages(SwiftMailerMessage $mail, array $messages)
     {
         foreach ($messages as $messageFormat => $message) {
             if (count($messages) === 1) {

diff --git a/Resources/Private/Translations/no/Main.xlf b/Resources/Private/Translations/no/Main.xlf
@@ -4,10 +4,10 @@
     <body>
       <trans-unit id="forms.navigation.previousPage" xml:space="preserve">
                 <source>Previous page</source>
-            <target state="needs-translation">Previous page</target></trans-unit>
+            <target state="translated">Forrige side</target></trans-unit>
       <trans-unit id="forms.navigation.nextPage" xml:space="preserve">
                 <source>Next page</source>
-            <target state="needs-translation">Next page</target></trans-unit>
+            <target state="translated">Neste side</target></trans-unit>
       <trans-unit id="forms.navigation.submit" xml:space="preserve">
                 <source>Submit</source>
             <target state="translated">Send</target></trans-unit>

diff --git a/Resources/Private/Translations/uk/Main.xlf b/Resources/Private/Translations/uk/Main.xlf
@@ -13,7 +13,7 @@
             <target state="translated">Надіслати</target></trans-unit>
       <trans-unit id="forms.pages.labelTitle" xml:space="preserve">
                 <source>Label</source>
-            <target state="needs-translation">Label</target></trans-unit>
+            <target state="translated">Мітка</target></trans-unit>
       <trans-unit id="forms.pages.valueTitle" xml:space="preserve">
                 <source>Value</source>
             <target state="translated">Значення</target></trans-unit>

diff --git a/Resources/Private/Translations/zh/Main.xlf b/Resources/Private/Translations/zh/Main.xlf
@@ -4,7 +4,7 @@
     <body>
       <trans-unit id="forms.navigation.previousPage" xml:space="preserve">
                 <source>Previous page</source>
-            <target state="translated">前一页</target></trans-unit>
+            <target state="translated">上一页</target></trans-unit>
       <trans-unit id="forms.navigation.nextPage" xml:space="preserve">
                 <source>Next page</source>
             <target state="translated">下一页</target></trans-unit>

diff --git a/Tests/Functional/SimpleFormTest.php b/Tests/Functional/SimpleFormTest.php
@@ -81,6 +81,30 @@ public function goingForthAndBackStoresFormValuesOfSecondPageAndTriggersValidati
         Assert::assertSame('', $form['--three-page-form-with-validation']['text3-1']->getValue());
     }
 
+    /**
+     * @test
+     * Thanks to Anian Weber for reporting that issue!
+     */
+    public function validationIsNotSkippedForGetRequests()
+    {
+        $this->browser->request('http://localhost/test/form/simpleform/ThreePageFormWithValidation');
+
+        // Navigate to 2nd form page
+        $this->gotoNextFormPage($this->browser->getForm());
+
+        $form = $this->browser->getForm();
+        // Change form method to "GET"
+        ObjectAccess::setProperty($form, 'method', 'GET', true);
+
+        // Set invalid value (field "text2-1" has an IntegerValidator assigned)
+        $form['--three-page-form-with-validation']['text2-1']->setValue('My Text on the second page');
+
+        // Submit form
+        $this->gotoNextFormPage($form);
+
+        // Expect validation errors
+        Assert::assertSame(' error', $this->browser->getCrawler()->filterXPath('//*[contains(@class,"error")]//input[@id="three-page-form-with-validation-text2-1"]')->attr('class'));
+    }
 
     /**
      * This is an edge-case which occurs if somebody makes the formState persistent, which can happen when subclassing the FormRuntime.
@@ -94,6 +118,7 @@ public function goingForthAndBackStoresFormValuesOfSecondPageAndTriggersValidati
      */
     public function goingForthAndBackStoresFormValuesOfSecondPageEvenWhenSecondPageIsManuallyCalledAsGetRequest()
     {
+        $this->markTestSkipped('This test is skipped because we no longer allow Form validators to be skipped, see https://github.com/neos/form/security/advisories/GHSA-m5vx-8chx-qvmm');
         // 1. TEST SETUP: FORM STATE PREPARATION
         // - go to the 2nd page of the form, and fill in text2-1.
         $this->browser->request('http://localhost/test/form/simpleform/ThreePageFormWithValidation');