java compatible interface, license

Author: davert

lib/WebDriverKeyboard.php

@@ -12,7 +12,7 @@ public function sendKeys($keys);
    * @param $key
    * @return $this
    */
-  public function press($key);
+  public function pressKey($key);
 
   /**
    * Release a modifier key
@@ -21,6 +21,6 @@ public function press($key);
    * @param $key
    * @return $this
    */
-  public function release($key);
+  public function releaseKey($key);
 
 }

lib/remote/RemoteKeyboard.php

@@ -20,15 +20,6 @@ class RemoteKeyboard implements WebDriverKeyboard {
 
   private $executor;
 
-  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;
@@ -52,9 +43,9 @@ public function sendKeys($keys) {
    * @param $key
    * @return $this
    */
-  public function press($key)
+  public function pressKey($key)
   {
-    $this->sendKeysToActiveElement($this->getModifierKey($key));
+    $this->sendKeysToActiveElement(array($key));
     return $this;
   }
 
@@ -65,9 +56,9 @@ public function press($key)
    * @param $key
    * @return $this
    */
-  public function release($key)
+  public function releaseKey($key)
   {
-    $this->sendKeysToActiveElement($this->getModifierKey($key));
+    $this->sendKeysToActiveElement(array($key));
     return $this;
   }
 
@@ -76,14 +67,7 @@ private function sendKeysToActiveElement($value)
     $params = array(
       'value' => $value
     );
-    $this->executor->execute('sendKeysToActiveElement', $params);   
+    $this->executor->execute('sendKeys', $params);
   }    
 
-  private function getModifierKey($key)
-  {
-    if (in_array($key, $this->modifierNames)) $key = constant('WebDriverKeys::'.strtoupper($key));  
-    if (!in_array($key, $this->modifiers))
-      throw new InvalidArgumentException("This is not a modifier key, expected ".implode(', ', $this->modifierNames));
-    return array($key);
-  }
 }

lib/remote/WebDriverCommandExecutor.php

@@ -71,7 +71,6 @@ class WebDriverCommandExecutor {
     'sendKeys' =>          array('method' => 'POST', 'url' => '/session/:sessionId/keys'),
     'sendKeysToAlert' =>    array('method' => 'POST', 'url' => '/session/:sessionId/alert_text'),
     'sendKeysToElement' => array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/value'),
-    'sendKeysToActiveElement' => array('method' => 'POST', 'url' => '/session/:sessionId/keys'),
     'setImplicitWaitTimeout' => array('method' => 'POST', 'url' => '/session/:sessionId/timeouts/implicit_wait'),
     'setPageLoadTimeout' => array('method' => 'POST', 'url' => '/session/:sessionId/timeouts'),
     'setScriptTimeout' =>  array('method' => 'POST', 'url' => '/session/:sessionId/timeouts/async_script'),