php-webdriver · OndraM · Feb 13, 2020 · Feb 11, 2020
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Fixed
+- Accept array as possible input to `sendKeys()` method. (Unintentional BC break in 1.8.0.)
 
 ## 1.8.0 - 2020-02-10
 ### Added

diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
@@ -330,7 +330,7 @@ public function sendKeys($value)
         if ($local_file === null) {
             if ($this->isW3cCompliant) {
                 $params = [
-                    'text' => (string) $value,
+                    'text' => WebDriverKeys::encode($value, true),
                     ':id' => $this->id,
                 ];
             } else {

diff --git a/lib/WebDriverKeys.php b/lib/WebDriverKeys.php
@@ -90,11 +90,13 @@ class WebDriverKeys
     const COMMAND = self::META;
 
     /**
-     * Encode input of `sendKeys()`.
+     * Encode input of `sendKeys()` to appropriate format according to protocol.
+     *
      * @param string|array|int|float $keys
-     * @return array
+     * @param bool $isW3cCompliant
+     * @return array|string
      */
-    public static function encode($keys)
+    public static function encode($keys, $isW3cCompliant = false)
     {
         if (is_numeric($keys)) {
             $keys = (string) $keys;
@@ -105,7 +107,11 @@ public static function encode($keys)
         }
 
         if (!is_array($keys)) {
-            return [];
+            if (!$isW3cCompliant) {
+                return [];
+            }
+
+            return '';
         }
 
         $encoded = [];
@@ -117,6 +123,10 @@ public static function encode($keys)
             $encoded[] = (string) $key;
         }
 
-        return $encoded;
+        if (!$isW3cCompliant) {
+            return $encoded;
+        }
+
+        return implode('', $encoded);
     }
 }
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
@@ -157,6 +157,11 @@ public function testShouldSendKeysToFormElement()
         $this->assertSame('foo bar', $textarea->getAttribute('value'));
         $textarea->sendKeys(' baz');
         $this->assertSame('foo bar baz', $textarea->getAttribute('value'));
+
+        // Send keys as array
+        $textarea->clear();
+        $textarea->sendKeys(['bat', 1, '3', ' ', 3, '7']);
+        $this->assertSame('bat13 37', $textarea->getAttribute('value'));
     }
 
     /**

diff --git a/tests/unit/WebDriverKeysTest.php b/tests/unit/WebDriverKeysTest.php
@@ -12,11 +12,13 @@ class WebDriverKeysTest extends TestCase
     /**
      * @dataProvider provideKeys
      * @param mixed $keys
-     * @param array $expectedOutput
+     * @param array $expectedOssOutput
+     * @param string $expectedW3cOutput
      */
-    public function testShouldEncodeKeysToArrayOfStrings($keys, $expectedOutput)
+    public function testShouldEncodeKeysToFormatOfEachProtocol($keys, $expectedOssOutput, $expectedW3cOutput)
     {
-        $this->assertSame($expectedOutput, WebDriverKeys::encode($keys));
+        $this->assertSame($expectedOssOutput, WebDriverKeys::encode($keys));
+        $this->assertSame($expectedW3cOutput, WebDriverKeys::encode($keys, true));
     }
 
     /**
@@ -25,19 +27,32 @@ public function testShouldEncodeKeysToArrayOfStrings($keys, $expectedOutput)
     public function provideKeys()
     {
         return [
-            'empty string' => ['', ['']],
-            'simple string' => ['foo', ['foo']],
-            'string as an array' => [['foo'], ['foo']],
-            'string with modifier as an array' => [[WebDriverKeys::SHIFT, 'foo'], [WebDriverKeys::SHIFT, 'foo']],
-            'string with concatenated modifier' => [[WebDriverKeys::SHIFT . 'foo'], [WebDriverKeys::SHIFT . 'foo']],
-            'simple numeric value' => [3, ['3']],
-            'multiple numeric values' => [[1, 3.33], ['1', '3.33']],
-            'multiple mixed values ' => [['foo', WebDriverKeys::END, '1.234'], ['foo', WebDriverKeys::END, '1.234']],
+            'empty string' => ['', [''], ''],
+            'simple string' => ['foo', ['foo'], 'foo'],
+            'string as an array' => [['foo'], ['foo'], 'foo'],
+            'string with modifier as an array' => [
+                [WebDriverKeys::SHIFT, 'foo'],
+                [WebDriverKeys::SHIFT, 'foo'],
+                WebDriverKeys::SHIFT . 'foo',
+            ],
+            'string with concatenated modifier' => [
+                [WebDriverKeys::SHIFT . 'foo'],
+                [WebDriverKeys::SHIFT . 'foo'],
+                WebDriverKeys::SHIFT . 'foo',
+            ],
+            'simple numeric value' => [3, ['3'], '3'],
+            'multiple numeric values' => [[1, 3.33], ['1', '3.33'], '13.33'],
+            'multiple mixed values ' => [
+                ['foo', WebDriverKeys::END, '1.234'],
+                ['foo', WebDriverKeys::END, '1.234'],
+                'foo' . WebDriverKeys::END . '1.234',
+            ],
             'array of strings with modifiers should separate them with NULL character' => [
                 [[WebDriverKeys::SHIFT, 'foo'], [WebDriverKeys::META, 'bar']],
                 [WebDriverKeys::SHIFT . 'foo' . WebDriverKeys::NULL, WebDriverKeys::META . 'bar' . WebDriverKeys::NULL],
+                WebDriverKeys::SHIFT . 'foo' . WebDriverKeys::NULL . WebDriverKeys::META . 'bar' . WebDriverKeys::NULL,
             ],
-            'null' => [null, []],
+            'null' => [null, [], ''],
         ];
     }
 }