refactoring

Author: robocoder

lib/WebDriver/AbstractWebDriver.php

@@ -140,16 +140,18 @@ protected function curl($requestMethod, $command, $parameters = null, $extraOpti
             throw WebDriverException::factory($results['status'], $message);
         }
 
-        $return = array('value' => $value, 'info' => $info);
-
-        // Pass through the sessionId return value if it exists, failing over to webdriver.remote.sessionid in the val
-        if(isset($results['sessionId'])) {
-            $return['sessionId'] = $results['sessionId'];
-        } else if(isset($value['webdriver.remote.sessionid'])) {
-            $return['sessionId']  = $value['webdriver.remote.sessionid'];
-        }
-
-        return $return;
+        $sessionId = isset($results['sessionId'])
+                   ? $results['sessionId']
+                   : (isset($value['webdriver.remote.sessionid'])
+                   ? $value['webdriver.remote.sessionid']
+                   : null);
+
+        return array(
+            'value'      => $value,
+            'info'       => $info,
+            'sessionId'  => $sessionId,
+            'sessionUrl' => $sessionId ? $this->url . '/session/' . $sessionId : $info['url'],
+        );
     }
 
     /**

lib/WebDriver/WebDriver.php

@@ -75,12 +75,7 @@ public function session($requiredCapabilities = Browser::FIREFOX, $desiredCapabi
             array(CURLOPT_FOLLOWLOCATION => true)
         );
 
-        if (isset($results['sessionId'])) {
-            return new Session($this->url . '/session/' . $results['sessionId']);
-        }
-
-        // backward compatibility fallback
-        return new Session($results['info']['url']);
+        return new Session($results['sessionUrl']);
     }
 
     /**