Rename "results" to "result" (for consistency)

Author: robocoder

lib/WebDriver/AbstractWebDriver.php

@@ -120,13 +120,13 @@ protected function curl($requestMethod, $command, $parameters = null, $extraOpti
             $url .= '/' . $parameters;
         }
 
-        list($rawResults, $info) = ServiceFactory::getInstance()->getService('service.curl')->execute($requestMethod, $url, $parameters, $extraOptions);
+        list($rawResult, $info) = ServiceFactory::getInstance()->getService('service.curl')->execute($requestMethod, $url, $parameters, $extraOptions);
 
-        $results = json_decode($rawResults, true);
+        $result = json_decode($rawResult, true);
         $value   = null;
 
-        if (is_array($results) && array_key_exists('value', $results)) {
-            $value = $results['value'];
+        if (is_array($result) && array_key_exists('value', $result)) {
+            $value = $result['value'];
         }
 
         $message = null;
@@ -136,12 +136,12 @@ protected function curl($requestMethod, $command, $parameters = null, $extraOpti
         }
 
         // if not success, throw exception
-        if ((int) $results['status'] !== 0) {
-            throw WebDriverException::factory($results['status'], $message);
+        if ((int) $result['status'] !== 0) {
+            throw WebDriverException::factory($result['status'], $message);
         }
 
-        $sessionId = isset($results['sessionId'])
-                   ? $results['sessionId']
+        $sessionId = isset($result['sessionId'])
+                   ? $result['sessionId']
                    : (isset($value['webdriver.remote.sessionid'])
                    ? $value['webdriver.remote.sessionid']
                    : null);
@@ -193,13 +193,13 @@ public function __call($name, $arguments)
             );
         }
 
-        $results = $this->curl(
+        $result = $this->curl(
             $requestMethod,
             '/' . $webdriverCommand,
             array_shift($arguments)
         );
 
-        return $results['value'];
+        return $result['value'];
     }
 
     /**

lib/WebDriver/Container.php

@@ -60,7 +60,7 @@ public function element($using = null, $value = null)
         $locatorJson = $this->parseArgs('element', func_get_args());
 
         try {
-            $results = $this->curl(
+            $result = $this->curl(
                 'POST',
                 '/element',
                 $locatorJson
@@ -78,7 +78,7 @@ public function element($using = null, $value = null)
             );
         }
 
-        $element = $this->webDriverElement($results['value']);
+        $element = $this->webDriverElement($result['value']);
 
         if ($element === null) {
             throw WebDriverException::factory(WebDriverException::NO_SUCH_ELEMENT,
@@ -109,18 +109,18 @@ public function elements($using = null, $value = null)
     {
         $locatorJson = $this->parseArgs('elements', func_get_args());
 
-        $results = $this->curl(
+        $result = $this->curl(
             'POST',
             '/elements',
             $locatorJson
         );
 
-        if (!is_array($results['value'])) {
+        if (!is_array($result['value'])) {
             return array();
         }
 
         return array_filter(array_map(
-            array($this, 'webDriverElement'), $results['value']
+            array($this, 'webDriverElement'), $result['value']
         ));
     }
 

lib/WebDriver/SauceLabs/SauceRest.php

@@ -73,9 +73,9 @@ protected function execute($requestMethod, $url, $parameters = null)
 
         $url = 'https://saucelabs.com/rest/v1/' . $url;
 
-        list($rawResults, $info) = ServiceFactory::getInstance()->getService('service.curl')->execute($requestMethod, $url, $parameters, $extraOptions);
+        list($rawResult, $info) = ServiceFactory::getInstance()->getService('service.curl')->execute($requestMethod, $url, $parameters, $extraOptions);
 
-        return json_decode($rawResults, true);
+        return json_decode($rawResult, true);
     }
 
     /**

lib/WebDriver/Service/CurlService.php

@@ -82,7 +82,7 @@ public function execute($requestMethod, $url, $parameters = null, $extraOptions
 
         curl_setopt($curl, CURLOPT_HTTPHEADER, $customHeaders);
 
-        $rawResults = trim(curl_exec($curl));
+        $rawResult = trim(curl_exec($curl));
         $info = curl_getinfo($curl);
 
         if (CURLE_GOT_NOTHING !== curl_errno($curl) && $error = curl_error($curl)) {
@@ -99,6 +99,6 @@ public function execute($requestMethod, $url, $parameters = null, $extraOptions
 
         curl_close($curl);
 
-        return array($rawResults, $info);
+        return array($rawResult, $info);
     }
 }

lib/WebDriver/Session.php

@@ -348,9 +348,9 @@ public function ime()
      */
     public function activeElement()
     {
-        $results = $this->curl('POST', '/element/active');
+        $result = $this->curl('POST', '/element/active');
 
-        return $this->webDriverElement($results['value']);
+        return $this->webDriverElement($result['value']);
     }
 
     /**
@@ -417,9 +417,9 @@ public function log()
                 )
             }
 
-            $this->curl('POST', '/log', $arg);
+            $result = $this->curl('POST', '/log', $arg);
 
-            return $this;
+            eeturn $result['value'];
         }
 
         // chaining

lib/WebDriver/WebDriver.php

@@ -69,14 +69,14 @@ public function session($requiredCapabilities = Browser::FIREFOX, $desiredCapabi
             $parameters['requiredCapabilities'] = $requiredCapabilities;
         }
 
-        $results = $this->curl(
+        $result = $this->curl(
             'POST',
             '/session',
             $parameters,
             array(CURLOPT_FOLLOWLOCATION => true)
         );
 
-        return new Session($results['sessionUrl']);
+        return new Session($result['sessionUrl']);
     }
 
     /**