PSR-2 codestyle

Author: OndraM

CHANGELOG.md

@@ -3,6 +3,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 - Fixed FirefoxProfile to support installation of extensions with custom namespace prefix in their manifest file
+- Comply codestyle with [PSR-2](http://www.php-fig.org/psr/psr-2/)
 
 ## 1.1.2 - 2016-06-04
 - Added ext-curl to composer.json

lib/Chrome/ChromeDriver.php

@@ -15,72 +15,72 @@
 
 namespace Facebook\WebDriver\Chrome;
 
+use Facebook\WebDriver\Exception\WebDriverException;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\DriverCommand;
-use Facebook\WebDriver\Remote\Service\DriverCommandExecutor;
-use Facebook\WebDriver\Exception\WebDriverException;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\Remote\Service\DriverCommandExecutor;
 use Facebook\WebDriver\Remote\WebDriverCommand;
 
-class ChromeDriver extends RemoteWebDriver {
+class ChromeDriver extends RemoteWebDriver
+{
+    public static function start(DesiredCapabilities $desired_capabilities = null, ChromeDriverService $service = null)
+    {
+        if ($desired_capabilities === null) {
+            $desired_capabilities = DesiredCapabilities::chrome();
+        }
+        if ($service === null) {
+            $service = ChromeDriverService::createDefaultService();
+        }
+        $executor = new DriverCommandExecutor($service);
+        $driver = new static();
+        $driver->setCommandExecutor($executor)
+            ->startSession($desired_capabilities);
 
-  public static function start(
-    DesiredCapabilities $desired_capabilities = null,
-    ChromeDriverService $service = null
-  ) {
-    if ($desired_capabilities === null) {
-      $desired_capabilities = DesiredCapabilities::chrome();
+        return $driver;
     }
-    if ($service === null) {
-      $service = ChromeDriverService::createDefaultService();
-    }
-    $executor = new DriverCommandExecutor($service);
-    $driver = new static();
-    $driver->setCommandExecutor($executor)
-           ->startSession($desired_capabilities);
-    return $driver;
-  }
 
-  public function startSession($desired_capabilities) {
-    $command = new WebDriverCommand(
-      null,
-      DriverCommand::NEW_SESSION,
-      array(
-        'desiredCapabilities' => $desired_capabilities->toArray(),
-      )
-    );
-    $response = $this->executor->execute($command);
-    $this->setSessionID($response->getSessionID());
-  }
+    public function startSession($desired_capabilities)
+    {
+        $command = new WebDriverCommand(
+            null,
+            DriverCommand::NEW_SESSION,
+            array(
+                'desiredCapabilities' => $desired_capabilities->toArray(),
+            )
+        );
+        $response = $this->executor->execute($command);
+        $this->setSessionID($response->getSessionID());
+    }
 
-  /**
-   * Always throws an exception. Use ChromeDriver::start() instead.
-   *
-   * @throws WebDriverException
-   */
-  public static function create(
-    $url = 'http://localhost:4444/wd/hub',
-    $desired_capabilities = null,
-    $connection_timeout_in_ms = null,
-    $request_timeout_in_ms = null,
-    $http_proxy = null,
-    $http_proxy_port = null
-  ) {
-    throw new WebDriverException('Please use ChromeDriver::start() instead.');
-  }
+    /**
+     * Always throws an exception. Use ChromeDriver::start() instead.
+     *
+     * @throws WebDriverException
+     */
+    public static function create(
+        $url = 'http://localhost:4444/wd/hub',
+        $desired_capabilities = null,
+        $connection_timeout_in_ms = null,
+        $request_timeout_in_ms = null,
+        $http_proxy = null,
+        $http_proxy_port = null
+    ) {
+        throw new WebDriverException('Please use ChromeDriver::start() instead.');
+    }
 
-  /**
-   * Always throws an exception. Use ChromeDriver::start() instead.
-   *
-   * @param string $session_id The existing session id
-   * @param string $url        The url of the remote server
-   *
-   * @throws WebDriverException
-   */
-  public static function createBySessionID(
-    $session_id,
-    $url = 'http://localhost:4444/wd/hub'
-  ) {
-    throw new WebDriverException('Please use ChromeDriver::start() instead.');
-  }
+    /**
+     * Always throws an exception. Use ChromeDriver::start() instead.
+     *
+     * @param string $session_id The existing session id
+     * @param string $url The url of the remote server
+     *
+     * @throws WebDriverException
+     */
+    public static function createBySessionID(
+        $session_id,
+        $url = 'http://localhost:4444/wd/hub'
+    ) {
+        throw new WebDriverException('Please use ChromeDriver::start() instead.');
+    }
 }

lib/Chrome/ChromeDriverService.php

@@ -17,17 +17,18 @@
 
 use Facebook\WebDriver\Remote\Service\DriverService;
 
-class ChromeDriverService extends DriverService {
+class ChromeDriverService extends DriverService
+{
+    // The environment variable storing the path to the chrome driver executable.
+    const CHROME_DRIVER_EXE_PROPERTY = 'webdriver.chrome.driver';
 
-  // The environment variable storing the path to the chrome driver executable.
-  const CHROME_DRIVER_EXE_PROPERTY = "webdriver.chrome.driver";
-
-  public static function createDefaultService() {
-    $exe = getenv(self::CHROME_DRIVER_EXE_PROPERTY);
-    $port = 9515; // TODO: Get another port if the default port is used.
-    $args = array("--port=$port");
-    $service = new ChromeDriverService($exe, $port, $args);
-    return $service;
-  }
+    public static function createDefaultService()
+    {
+        $exe = getenv(self::CHROME_DRIVER_EXE_PROPERTY);
+        $port = 9515; // TODO: Get another port if the default port is used.
+        $args = array("--port=$port");
+        $service = new self($exe, $port, $args);
 
+        return $service;
+    }
 }