Do not throw fatal error when null is passed to sendKeys (fixes php-webdriver#419)

Author: OndraM

CHANGELOG.md

@@ -7,6 +7,9 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 - Cookies retrieved using `getCookieNamed()` and `getCookies()` methods of `WebDriverOptions` are now encapsulated in `Cookie` object instead of an plain array. The object implements `ArrayAccess` interface to provide backward compatibility.
 - `ext-zip` is now specified as required dependency in composer.json (but the extension was already required by the code, though).
 
+### Fixed
+- Do not throw fatal error when `null` is passed to `sendKeys()`.
+
 ## 1.3.0 - 2017-01-13
 ### Added
 - Added `getCapabilities()` method of `RemoteWebDriver`, to retrieve actual capabilities acknowledged by the remote driver on startup.

lib/Interactions/WebDriverCompositeAction.php

@@ -23,7 +23,7 @@
 class WebDriverCompositeAction implements WebDriverAction
 {
     /**
-     * @var array
+     * @var WebDriverAction[]
      */
     private $actions = [];
 

lib/WebDriverKeys.php

@@ -88,24 +88,28 @@ class WebDriverKeys
 
     /**
      * Encode input of `sendKeys()`.
-     * @param string|array $keys
+     * @param string|array|int|float $keys
      * @return array
      */
     public static function encode($keys)
     {
         if (is_numeric($keys)) {
-            $keys = '' . $keys;
+            $keys = (string) $keys;
         }
 
         if (is_string($keys)) {
             $keys = [$keys];
         }
 
+        if (!is_array($keys)) {
+            return [];
+        }
+
         $encoded = [];
         foreach ($keys as $key) {
             if (is_array($key)) {
-                // handle modified keys
-                $key = implode('', $key) . self::NULL;
+                // handle key modifiers
+                $key = implode('', $key) . self::NULL; // the NULL clears the input state (eg. previous modifiers)
             }
             $encoded[] = (string) $key;
         }

tests/unit/WebDriverKeysTest.php

@@ -0,0 +1,54 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Facebook\WebDriver;
+
+/**
+ * @covers Facebook\WebDriver\WebDriverKeys
+ */
+class WebDriverKeysTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provideKeys
+     * @param mixed $keys
+     * @param array $expectedOutput
+     */
+    public function testShouldEncodeKeysToArrayOfStrings($keys, $expectedOutput)
+    {
+        $this->assertSame($expectedOutput, WebDriverKeys::encode($keys));
+    }
+
+    /**
+     * @return array[]
+     */
+    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']],
+            '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],
+            ],
+            'null' => [null, []],
+        ];
+    }
+}