Merge pull request php-webdriver#397 from OndraM/fix/code-fixes

Various codestyle and typehint fixes

Author: OndraM

lib/Chrome/ChromeDriver.php

@@ -63,7 +63,8 @@ public static function create(
         $connection_timeout_in_ms = null,
         $request_timeout_in_ms = null,
         $http_proxy = null,
-        $http_proxy_port = null
+        $http_proxy_port = null,
+        DesiredCapabilities $required_capabilities = null
     ) {
         throw new WebDriverException('Please use ChromeDriver::start() instead.');
     }

lib/Firefox/FirefoxProfile.php

@@ -226,9 +226,12 @@ private function installExtension($extension, $profile_dir)
             $ext_dir = $profile_dir . '/extensions/' . $matches[1];
             mkdir($ext_dir, 0777, true);
             $this->extractTo($extension, $ext_dir);
+        } else {
+            $this->deleteDirectory($temp_dir);
+
+            throw new WebDriverException('Cannot get the extension id from the install manifest.');
         }
 
-        // clean up
         $this->deleteDirectory($temp_dir);
 
         return $ext_dir;

lib/Interactions/WebDriverActions.php

@@ -27,6 +27,7 @@
 use Facebook\WebDriver\Interactions\Internal\WebDriverSendKeysAction;
 use Facebook\WebDriver\WebDriver;
 use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriverHasInputDevices;
 
 /**
  * WebDriver action builder. It implements the builder pattern.
@@ -39,9 +40,9 @@ class WebDriverActions
     protected $action;
 
     /**
-     * @param WebDriver $driver
+     * @param WebDriverHasInputDevices $driver
      */
-    public function __construct(WebDriver $driver)
+    public function __construct(WebDriverHasInputDevices $driver)
     {
         $this->driver = $driver;
         $this->keyboard = $driver->getKeyboard();

lib/Remote/RemoteWebDriver.php

@@ -20,16 +20,16 @@
 use Facebook\WebDriver\WebDriver;
 use Facebook\WebDriver\WebDriverBy;
 use Facebook\WebDriver\WebDriverCapabilities;
-use Facebook\WebDriver\WebDriverCommandExecutor;
 use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriverHasInputDevices;
 use Facebook\WebDriver\WebDriverNavigation;
 use Facebook\WebDriver\WebDriverOptions;
 use Facebook\WebDriver\WebDriverWait;
 
-class RemoteWebDriver implements WebDriver, JavaScriptExecutor
+class RemoteWebDriver implements WebDriver, JavaScriptExecutor, WebDriverHasInputDevices
 {
     /**
-     * @var HttpCommandExecutor
+     * @var HttpCommandExecutor|null
      */
     protected $executor;
     /**
@@ -507,10 +507,10 @@ protected function newElement($id)
      * @deprecated To be removed in the future. Executor should be passed in the constructor.
      * @internal
      * @codeCoverageIgnore
-     * @param WebDriverCommandExecutor $executor
+     * @param HttpCommandExecutor $executor
      * @return RemoteWebDriver
      */
-    public function setCommandExecutor(WebDriverCommandExecutor $executor)
+    public function setCommandExecutor(HttpCommandExecutor $executor)
     {
         $this->executor = $executor;
 

lib/Remote/Service/DriverService.php

@@ -46,7 +46,7 @@ class DriverService
     private $environment;
 
     /**
-     * @var Process
+     * @var Process|null
      */
     private $process;
 

lib/Support/Events/EventFiringWebDriver.php

@@ -50,8 +50,6 @@ public function __construct(WebDriver $driver, WebDriverDispatcher $dispatcher =
             $this->dispatcher->setDefaultDriver($this);
         }
         $this->driver = $driver;
-
-        return $this;
     }
 
     /**
@@ -105,6 +103,7 @@ public function get($url)
             $this->driver->get($url);
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
         $this->dispatch('afterNavigateTo', $url, $this);
 
@@ -127,6 +126,7 @@ public function findElements(WebDriverBy $by)
             }
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
 
         $this->dispatch('afterFindBy', $by, null, $this);
@@ -147,6 +147,7 @@ public function findElement(WebDriverBy $by)
             $element = $this->newElement($this->driver->findElement($by));
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
 
         $this->dispatch('afterFindBy', $by, null, $this);
@@ -174,6 +175,7 @@ public function executeScript($script, array $arguments = [])
             $result = $this->driver->executeScript($script, $arguments);
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
 
         $this->dispatch('afterScript', $script, $this);
@@ -200,6 +202,7 @@ public function executeAsyncScript($script, array $arguments = [])
             $result = $this->driver->executeAsyncScript($script, $arguments);
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
         $this->dispatch('afterScript', $script, $this);
 
@@ -218,6 +221,7 @@ public function close()
             return $this;
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -231,6 +235,7 @@ public function getCurrentURL()
             return $this->driver->getCurrentURL();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -244,6 +249,7 @@ public function getPageSource()
             return $this->driver->getPageSource();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -257,6 +263,7 @@ public function getTitle()
             return $this->driver->getTitle();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -270,6 +277,7 @@ public function getWindowHandle()
             return $this->driver->getWindowHandle();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -283,6 +291,7 @@ public function getWindowHandles()
             return $this->driver->getWindowHandles();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -295,6 +304,7 @@ public function quit()
             $this->driver->quit();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -309,6 +319,7 @@ public function takeScreenshot($save_as = null)
             return $this->driver->takeScreenshot($save_as);
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -324,6 +335,7 @@ public function wait($timeout_in_second = 30, $interval_in_millisecond = 250)
             return $this->driver->wait($timeout_in_second, $interval_in_millisecond);
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -337,6 +349,7 @@ public function manage()
             return $this->driver->manage();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -353,6 +366,7 @@ public function navigate()
             );
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -366,6 +380,7 @@ public function switchTo()
             return $this->driver->switchTo();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -379,13 +394,16 @@ public function getTouch()
             return $this->driver->getTouch();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
-    private function dispatchOnException($exception)
+    /**
+     * @param WebDriverException $exception
+     */
+    private function dispatchOnException(WebDriverException $exception)
     {
         $this->dispatch('onException', $exception, $this);
-        throw $exception;
     }
 
     public function execute($name, $params)
@@ -394,6 +412,7 @@ public function execute($name, $params)
             return $this->driver->execute($name, $params);
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 }