Merge pull request #128 from okrad/master

Wrong reference in WebDriverExpectedCondition, possible encode error

Author: whhone

lib/WebDriverExpectedCondition.php

@@ -352,15 +352,15 @@ public static function elementSelectionStateToBe(
     if ($element_or_by instanceof WebDriverElement) {
       return new WebDriverExpectedCondition(
         function ($driver) use ($element_or_by, $selected) {
-          return $element_or_by->isSelected === $selected;
+          return $element_or_by->isSelected() === $selected;
         }
       );
     } else if ($element_or_by instanceof WebDriverBy) {
       return new WebDriverExpectedCondition(
         function ($driver) use ($element_or_by, $selected) {
           try {
             $element = $driver->findElement($element_or_by);
-            return $element->isSelected === $selected;
+            return $element->isSelected() === $selected;
           } catch (StaleElementReferenceException $e) {
             return null;
           }

lib/WebDriverKeys.php

@@ -90,6 +90,10 @@ class WebDriverKeys {
    * @return array
    */
   public static function encode($keys) {
+
+    if(is_numeric($keys))
+      $keys = '' . $keys;
+
     if (is_string($keys)) {
       $keys = array($keys);
     }
@@ -100,7 +104,7 @@ public static function encode($keys) {
         // handle modified keys
         $key = implode('', $key).self::NULL;
       }
-      $encoded[] = (string)$key;
+      $encoded = array_merge($encoded, str_split((string)$key));
     }
 
     return $encoded;