Fix some comments

dunglas · dunglas · commit 0630dba99066 · 2018-09-26T12:55:42.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -93,8 +93,8 @@ before_script:
   - if [ "$BROWSER_NAME" = "chrome" ]; then mkdir chromedriver; wget -q -t 3 https://chromedriver.storage.googleapis.com/$CHROMEDRIVER_VERSION/chromedriver_linux64.zip; unzip chromedriver_linux64 -d chromedriver; fi
   - if [ "$BROWSER_NAME" = "chrome" ]; then export CHROMEDRIVER_PATH=$PWD/chromedriver/chromedriver; fi
   - sh -e /etc/init.d/xvfb start
-  - if [ ! -f jar/selenium-server-standalone-3.8.1.jar ]; then wget -q -t 3 -P jar https://selenium-release.storage.googleapis.com/3.8/selenium-server-standalone-3.8.1.jar; fi
-  - java -Dwebdriver.firefox.marionette=false -Dwebdriver.chrome.driver="$CHROMEDRIVER_PATH" -jar jar/selenium-server-standalone-3.8.1.jar -enablePassThrough false -log ./logs/selenium.log &
+  - if [ ! -f jar/selenium-server-standalone-3.8.1.jar ]; then wget -q -t 3 -P jar https://selenium-release.storage.googleapis.com/3.14/selenium-server-standalone-3.14.0.jar; fi
+  - java -Dwebdriver.firefox.marionette=false -Dwebdriver.chrome.driver="$CHROMEDRIVER_PATH" -jar jar/selenium-server-standalone-3.14.0.jar -enablePassThrough false -log ./logs/selenium.log &
   - until $(echo | nc localhost 4444); do sleep 1; echo Waiting for Selenium server on port 4444...; done; echo "Selenium server started"
   - php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
   - until $(echo | nc localhost 8000); do sleep 1; echo waiting for PHP server on port 8000...; done; echo "PHP server started"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -37,10 +37,10 @@ For the functional tests you must first [download](http://selenium-release.stora
 the selenium standalone server, start the local PHP server which will serve the test pages and then run the `functional`
 test suite:
 
-    java -jar selenium-server-standalone-3.12.0.jar -log selenium.log &
+    java -jar selenium-server-standalone-3.14.0.jar -log selenium.log &
     php -S localhost:8000 -t tests/functional/web/ &
     ./vendor/bin/phpunit --testsuite functional
-    
+
 The functional tests will be started in HtmlUnit headless browser by default. If you want to run them in eg. Firefox,
 simply set the `BROWSER_NAME` environment variable:
 
diff --git a/lib/Exception/WebDriverException.php b/lib/Exception/WebDriverException.php
@@ -84,9 +84,9 @@ public function getResults()
      * @throws WebDriverCurlException
      * @throws XPathLookupException
      */
-    public static function throwException($status_code, $message, $results, $w3c_compliant = false)
+    public static function throwException($status_code, $message, $results)
     {
-        if ($w3c_compliant) {
+        if (is_string($status_code)) {
             // see https://w3c.github.io/webdriver/webdriver-spec.html#handling-errors
             switch ($status_code) {
                 case 'no such element':
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
@@ -273,7 +273,7 @@ public function execute(WebDriverCommand $command)
             }
         }
 
-        if ($params && \is_array($params) && $http_method !== 'POST') {
+        if ($params && is_array($params) && $http_method !== 'POST') {
             throw new BadMethodCallException(sprintf(
                 'The http method called for %s is %s but it has to be POST' .
                 ' if you want to pass the JSON params %s',
@@ -292,7 +292,7 @@ public function execute(WebDriverCommand $command)
             curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, $http_method);
         }
 
-        if (\in_array($http_method, ['POST', 'PUT'])) {
+        if (in_array($http_method, ['POST', 'PUT'])) {
             // Disable sending 'Expect: 100-Continue' header, as it is causing issues with eg. squid proxy
             // https://tools.ietf.org/html/rfc7231#section-5.1.1
             curl_setopt($this->curl, CURLOPT_HTTPHEADER, array_merge(static::DEFAULT_HTTP_HEADERS, ['Expect:']));
@@ -302,7 +302,7 @@ public function execute(WebDriverCommand $command)
 
         $encoded_params = null;
         if ($http_method === 'POST') {
-            $encoded_params = $params && \is_array($params) ? json_encode($params) : '{}';
+            $encoded_params = $params && is_array($params) ? json_encode($params) : '{}';
         }
 
         curl_setopt($this->curl, CURLOPT_POSTFIELDS, $encoded_params);
@@ -315,7 +315,7 @@ public function execute(WebDriverCommand $command)
                 $http_method,
                 $url
             );
-            if ($params && \is_array($params)) {
+            if ($params && is_array($params)) {
                 $msg .= sprintf(' with params: %s', json_encode($params));
             }
 
@@ -337,20 +337,20 @@ public function execute(WebDriverCommand $command)
         }
 
         $value = null;
-        if (\is_array($results) && array_key_exists('value', $results)) {
+        if (is_array($results) && array_key_exists('value', $results)) {
             $value = $results['value'];
         }
 
         $message = null;
-        if (\is_array($value) && array_key_exists('message', $value)) {
+        if (is_array($value) && array_key_exists('message', $value)) {
             $message = $value['message'];
         }
 
         $sessionId = null;
-        if (\is_array($value) && array_key_exists('sessionId', $value)) {
+        if (is_array($value) && array_key_exists('sessionId', $value)) {
             // W3C's WebDriver
             $sessionId = $value['sessionId'];
-        } elseif (\is_array($results) && array_key_exists('sessionId', $results)) {
+        } elseif (is_array($results) && array_key_exists('sessionId', $results)) {
             // Legacy JsonWire
             $sessionId = $results['sessionId'];
         }
diff --git a/lib/Remote/JsonWireCompat.php b/lib/Remote/JsonWireCompat.php
@@ -47,13 +47,13 @@ public static function getElement(array $rawElement)
      * @param bool $w3cCompliance
      * @return array
      */
-    public static function getUsing(WebDriverBy $by, $w3cCompliance)
+    public static function getUsing(WebDriverBy $by, $w3cCompliant)
     {
         $mechanism = $by->getMechanism();
         $value = $by->getValue();
 
-        if ($w3cCompliance) {
-            switch ($mechanism) {
+        if ($w3cCompliant) {
+            switch ($w3cCompliant) {
                 // Convert to CSS selectors
                 case 'class name':
                     $mechanism = 'css selector';

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ public function execute(WebDriverCommand $command)`
`273`	`273`	`}`
`274`	`274`	`}`
`275`	`275`
`276`		`- if ($params && \is_array($params) && $http_method !== 'POST') {`
	`276`	`+ if ($params && is_array($params) && $http_method !== 'POST') {`
`277`	`277`	`throw new BadMethodCallException(sprintf(`
`278`	`278`	`'The http method called for %s is %s but it has to be POST' .`
`279`	`279`	`' if you want to pass the JSON params %s',`
`@@ -292,7 +292,7 @@ public function execute(WebDriverCommand $command)`
`292`	`292`	`curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, $http_method);`
`293`	`293`	`}`
`294`	`294`
`295`		`- if (\in_array($http_method, ['POST', 'PUT'])) {`
	`295`	`+ if (in_array($http_method, ['POST', 'PUT'])) {`
`296`	`296`	`// Disable sending 'Expect: 100-Continue' header, as it is causing issues with eg. squid proxy`
`297`	`297`	`// https://tools.ietf.org/html/rfc7231#section-5.1.1`
`298`	`298`	`curl_setopt($this->curl, CURLOPT_HTTPHEADER, array_merge(static::DEFAULT_HTTP_HEADERS, ['Expect:']));`
`@@ -302,7 +302,7 @@ public function execute(WebDriverCommand $command)`
`302`	`302`
`303`	`303`	`$encoded_params = null;`
`304`	`304`	`if ($http_method === 'POST') {`
`305`		`- $encoded_params = $params && \is_array($params) ? json_encode($params) : '{}';`
	`305`	`+ $encoded_params = $params && is_array($params) ? json_encode($params) : '{}';`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`curl_setopt($this->curl, CURLOPT_POSTFIELDS, $encoded_params);`
`@@ -315,7 +315,7 @@ public function execute(WebDriverCommand $command)`
`315`	`315`	`$http_method,`
`316`	`316`	`$url`
`317`	`317`	`);`
`318`		`- if ($params && \is_array($params)) {`
	`318`	`+ if ($params && is_array($params)) {`
`319`	`319`	`$msg .= sprintf(' with params: %s', json_encode($params));`
`320`	`320`	`}`
`321`	`321`
`@@ -337,20 +337,20 @@ public function execute(WebDriverCommand $command)`
`337`	`337`	`}`
`338`	`338`
`339`	`339`	`$value = null;`
`340`		`- if (\is_array($results) && array_key_exists('value', $results)) {`
	`340`	`+ if (is_array($results) && array_key_exists('value', $results)) {`
`341`	`341`	`$value = $results['value'];`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`$message = null;`
`345`		`- if (\is_array($value) && array_key_exists('message', $value)) {`
	`345`	`+ if (is_array($value) && array_key_exists('message', $value)) {`
`346`	`346`	`$message = $value['message'];`
`347`	`347`	`}`
`348`	`348`
`349`	`349`	`$sessionId = null;`
`350`		`- if (\is_array($value) && array_key_exists('sessionId', $value)) {`
	`350`	`+ if (is_array($value) && array_key_exists('sessionId', $value)) {`
`351`	`351`	`// W3C's WebDriver`
`352`	`352`	`$sessionId = $value['sessionId'];`
`353`		`- } elseif (\is_array($results) && array_key_exists('sessionId', $results)) {`
	`353`	`+ } elseif (is_array($results) && array_key_exists('sessionId', $results)) {`
`354`	`354`	`// Legacy JsonWire`
`355`	`355`	`$sessionId = $results['sessionId'];`
`356`	`356`	`}`