constants and strings can be passed as modifiers

Author: davert

lib/remote/RemoteKeyboard.php

@@ -20,7 +20,15 @@ class RemoteKeyboard implements WebDriverKeyboard {
 
   private $executor;
 
-  protected $modifiers = array('control','shift','alt','command','meta');
+  protected $modifiers = array(
+    WebDriverKeys::CONTROL,
+    WebDriverKeys::SHIFT,
+    WebDriverKeys::ALT,
+    WebDriverKeys::COMMAND,
+    WebDriverKeys::META
+  );
+  
+  protected $modifierNames = array('control', 'shift', 'alt', 'command', 'meta');  
 
   public function __construct($executor) {
     $this->executor = $executor;
@@ -73,8 +81,9 @@ private function sendKeysToActiveElement($value)
 
   private function getModifierKey($key)
   {
+    if (in_array($key, $this->modifierNames)) $key = constant('WebDriverKeys::'.strtoupper($key));  
     if (!in_array($key, $this->modifiers))
-      throw new InvalidArgumentException("$key is not a modifier key, expected one of ".implode(', ',$this->modifiers));
-    return array(constant('WebDriverKeys::'.strtoupper($key)));
+      throw new InvalidArgumentException("This is not a modifier key, expected ".implode(', ', $this->modifierNames));
+    return array($key);
   }
 }