CR fixes

tests/Form/GeneralTest.php

@@ -8,7 +8,7 @@
 final class GeneralTest extends TestCase
 {
     // test multiple submit buttons
-    public function testIssue212(): void
+    public function testIssue212()
     {
         $session = $this->getSession();
 
@@ -18,7 +18,7 @@ public function testIssue212(): void
         $this->assertEquals('poney', $field->getValue());
     }
 
-    public function testBasicForm(): void
+    public function testBasicForm()
     {
         $this->getSession()->visit($this->pathTo('/basic_form.html'));
 
@@ -58,7 +58,7 @@ public function testBasicForm(): void
     /**
      * @dataProvider formSubmitWaysDataProvider
      */
-    public function testFormSubmitWays(string $submitVia): void
+    public function testFormSubmitWays(string $submitVia)
     {
         $session = $this->getSession();
         $session->visit($this->pathTo('/basic_form.html'));
@@ -87,7 +87,7 @@ public static function formSubmitWaysDataProvider(): iterable
         ];
     }
 
-    public function testFormSubmit(): void
+    public function testFormSubmit()
     {
         $session = $this->getSession();
         $session->visit($this->pathTo('/basic_form.html'));
@@ -102,7 +102,7 @@ public function testFormSubmit(): void
         }
     }
 
-    public function testFormSubmitWithoutButton(): void
+    public function testFormSubmitWithoutButton()
     {
         $session = $this->getSession();
         $session->visit($this->pathTo('/form_without_button.html'));
@@ -117,7 +117,7 @@ public function testFormSubmitWithoutButton(): void
         }
     }
 
-    public function testBasicGetForm(): void
+    public function testBasicGetForm()
     {
         $this->getSession()->visit($this->pathTo('/basic_get_form.php'));
         $webAssert = $this->getAssertSession();
@@ -133,7 +133,7 @@ public function testBasicGetForm(): void
         $this->assertEquals('some#query', $div->getText());
     }
 
-    public function testAdvancedForm(): void
+    public function testAdvancedForm()
     {
         $this->getSession()->visit($this->pathTo('/advanced_form.html'));
         $page = $this->getSession()->getPage();
@@ -222,7 +222,7 @@ public function testAdvancedForm(): void
         }
     }
 
-    public function testQuoteInValue(): void
+    public function testQuoteInValue()
     {
         $this->getSession()->visit($this->pathTo('/advanced_form.html'));
 
@@ -262,7 +262,7 @@ public function testQuoteInValue(): void
         }
     }
 
-    public function testMultiInput(): void
+    public function testMultiInput()
     {
         $this->getSession()->visit($this->pathTo('/multi_input_form.html'));
         $page = $this->getSession()->getPage();
@@ -307,7 +307,7 @@ public function testMultiInput(): void
         $this->assertStringContainsString($out, $page->getContent());
     }
 
-    public function testAdvancedFormSecondSubmit(): void
+    public function testAdvancedFormSecondSubmit()
     {
         $this->getSession()->visit($this->pathTo('/advanced_form.html'));
         $page = $this->getSession()->getPage();
@@ -329,7 +329,7 @@ public function testAdvancedFormSecondSubmit(): void
         }
     }
 
-    public function testSubmitEmptyTextarea(): void
+    public function testSubmitEmptyTextarea()
     {
         $this->getSession()->visit($this->pathTo('/empty_textarea.html'));
         $page = $this->getSession()->getPage();
@@ -354,30 +354,37 @@ public function testSubmitEmptyTextarea(): void
      *
      * @param mixed $value
      */
-    public function testSetInvalidValueInField(string $field, $value): void
+    public function testSetInvalidValueInField(string $field, $value)
     {
         $this->getSession()->visit($this->pathTo('/advanced_form.html'));
 
         $webAssert = $this->getAssertSession();
 
-        $color = $webAssert->elementExists('named', ['id_or_name', $field]);
+        $color = $webAssert->elementExists('named', array('id_or_name', $field));
 
         $this->expectException(DriverException::class);
         $color->setValue($value);
     }
 
     public static function provideInvalidValues(): iterable
     {
+        $nullValue = ['null', null];
+        $trueValue = ['true', true];
+        $falseValue = ['false', false];
+        $arrayValue = ['array', ['bad']];
+        $stringValue = ['string', 'updated'];
+
         $scenarios = [
-            'about' => [null, true, false, ['bad']],
-            'notes' => [null, true, false, ['bad']],
-            'first_name' => [null, true, false, ['bad']],
-            'submit' => [null, true, false, ['bad'], 'update'],
+            // field type, name or id, list of values to check
+            ['file', 'about', [$nullValue, $trueValue, $falseValue, $arrayValue]],
+            ['textarea', 'notes', [$nullValue, $trueValue, $falseValue, $arrayValue]],
+            ['text', 'first_name', [$nullValue, $trueValue, $falseValue, $arrayValue]],
+            ['button', 'submit', [$nullValue, $trueValue, $falseValue, $arrayValue, $stringValue]],
         ];
 
-        foreach ($scenarios as $field => $values) {
-            foreach ($values as $value) {
-                yield "$field field with " . var_export($value, true) => [$field, $value];
+        foreach ($scenarios as [$fieldType, $fieldNameOrId, $values]) {
+            foreach ($values as [$valueDesc, $actualValue]) {
+                yield "$fieldType field with $valueDesc" => [$fieldNameOrId, $actualValue];
             }
         }
     }