refactor commandexecutor

Author: whhone

lib/WebDriver.php

@@ -16,7 +16,7 @@
 /**
  * The interface for WebDriver.
  */
-interface WebDriver {
+interface WebDriver extends WebDriverSearchContext {
 
   /**
    * Close the current window.
@@ -28,23 +28,23 @@ public function close();
   /**
    * Find the first WebDriverElement using the given mechanism.
    *
-   * @param WebDriverBy $by
+   * @param WebDriverBy $locator
    * @return WebDriverElement NoSuchElementWebDriverError is thrown in
-   *    WebDriverCommandExecutor if no element is found.
+   *    HttpCommandExecutor if no element is found.
    * @see WebDriverBy
    */
-  public function findElement(WebDriverBy $by);
+  public function findElement(WebDriverBy $locator);
 
   /**
    * Find all WebDriverElements within the current page using the given
    * mechanism.
    *
-   * @param WebDriverBy $by
+   * @param WebDriverBy $locator
    * @return array A list of all WebDriverElements, or an empty array if
    *    nothing matches
    * @see WebDriverBy
    */
-  public function findElements(WebDriverBy $by);
+  public function findElements(WebDriverBy $locator);
 
   /**
    * Load a new web page in the current browser window.

lib/WebDriverCommandExecutor.php

@@ -0,0 +1,23 @@
+<?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.
+
+/**
+ * Interface for all command executor.
+ */
+interface WebDriverCommandExecutor {
+
+  // $command and $params will be merged to an command object in the future.
+  public function execute($command, array $params);
+}

lib/WebDriverElement.php

@@ -16,7 +16,7 @@
 /**
  * Interface for an HTML element in the WebDriver framework.
  */
-interface WebDriverElement {
+interface WebDriverElement extends WebDriverSearchContext {
 
   /**
    * If this element is a TEXTAREA or text INPUT element, this will clear the
@@ -37,22 +37,22 @@ public function click();
    * Find the first WebDriverElement within this element using the given
    * mechanism.
    *
-   * @param WebDriverBy $by
+   * @param WebDriverBy $locator
    * @return WebDriverElement NoSuchElementWebDriverError is thrown in
-   *    WebDriverCommandExecutor if no element is found.
+   *    HttpCommandExecutor if no element is found.
    * @see WebDriverBy
    */
-  public function findElement(WebDriverBy $by);
+  public function findElement(WebDriverBy $locator);
 
   /**
    * Find all WebDriverElements within this element using the given mechanism.
    *
-   * @param WebDriverBy $by
+   * @param WebDriverBy $locator
    * @return array A list of all WebDriverElements, or an empty array if
    *    nothing matches
    * @see WebDriverBy
    */
-  public function findElements(WebDriverBy $by);
+  public function findElements(WebDriverBy $locator);
 
   /**
    * Get the value of a the given attribute of the element.

lib/WebDriverSearchContext.php

@@ -0,0 +1,42 @@
+<?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.
+
+/**
+ * The interface for WebDriver and WebDriverElement which is able to search for
+ * WebDriverElement inside.
+ */
+interface WebDriverSearchContext {
+
+  /**
+   * Find the first WebDriverElement within this element using the given
+   * mechanism.
+   *
+   * @param WebDriverBy $locator
+   * @return WebDriverElement NoSuchElementWebDriverError is thrown in
+   *    HttpCommandExecutor if no element is found.
+   * @see WebDriverBy
+   */
+  public function findElement(WebDriverBy $locator);
+
+  /**
+   * Find all WebDriverElements within this element using the given mechanism.
+   *
+   * @param WebDriverBy $locator
+   * @return array A list of all WebDriverElements, or an empty array if
+   *    nothing matches
+   * @see WebDriverBy
+   */
+  public function findElements(WebDriverBy $locator);
+}

lib/__init__.php

@@ -13,12 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// interface
+require_once('WebDriverSearchContext.php');
 require_once('WebDriver.php');
+require_once('WebDriverElement.php');
+require_once('WebDriverCommandExecutor.php');
+
+// class
 require_once('WebDriverAction.php');
 require_once('WebDriverAlert.php');
 require_once('WebDriverBy.php');
 require_once('WebDriverDimension.php');
-require_once('WebDriverElement.php');
 require_once('WebDriverExceptions.php');
 require_once('WebDriverExpectedCondition.php');
 require_once('WebDriverHasInputDevices.php');
@@ -49,4 +54,4 @@
 require_once('remote/RemoteWebElement.php');
 require_once('remote/WebDriverBrowserType.php');
 require_once('remote/WebDriverCapabilityType.php');
-require_once('remote/WebDriverCommandExecutor.php');
+require_once('remote/HttpCommandExecutor.php');