Merge branch 'iFixit-request-timeout--allow-specifying-during-connection'

Author: whhone

lib/chrome/ChromeDriver.php

@@ -44,10 +44,17 @@ public function startSession($desired_capabilities) {
     $this->setSessionID($response->getSessionID());
   }
 
+  /**
+   * @param string $url The url of the remote server
+   * @param DesiredCapabilities $desired_capabilities The desired capabilities
+   * @param int|null $connection_timeout_in_ms
+   * @param int|null $request_timeout_in_ms
+   */
   public static function create(
     $url = 'http://localhost:4444/wd/hub',
     $desired_capabilities = null,
-    $timeout_in_ms = 300000
+    $timeout_in_ms = null,
+    $request_timeout_in_ms = null
   ) {
     throw new WebDriverException('Please use ChromeDriver::start() instead.');
   }

lib/remote/RemoteWebDriver.php

@@ -46,13 +46,15 @@ protected function __construct() {}
    *
    * @param string $url The url of the remote server
    * @param DesiredCapabilities $desired_capabilities The desired capabilities
-   * @param int $connection_timeout_in_ms
+   * @param int|null $connection_timeout_in_ms
+   * @param int|null $request_timeout_in_ms
    * @return RemoteWebDriver
    */
   public static function create(
     $url = 'http://localhost:4444/wd/hub',
     $desired_capabilities = null,
-    $connection_timeout_in_ms = 300000
+    $connection_timeout_in_ms = null,
+    $request_timeout_in_ms = null
   ) {
     $url = preg_replace('#/+$#', '', $url);
 
@@ -63,7 +65,12 @@ public static function create(
     }
 
     $executor = new HttpCommandExecutor($url);
-    $executor->setConnectionTimeout($connection_timeout_in_ms);
+    if ($connection_timeout_in_ms !== null) {
+      $executor->setConnectionTimeout($connection_timeout_in_ms);
+    }
+    if ($request_timeout_in_ms !== null) {
+      $executor->setRequestTimeout($request_timeout_in_ms);
+    }
 
     $command = new WebDriverCommand(
       null,