Skip to content

Commit 3805885

Browse files
robocoderrobocoder
committed
phpcs clean-up
1 parent 42335d8 commit 3805885

File tree

10 files changed

+71
-50
lines changed

10 files changed

+71
-50
lines changed

‎lib/WebDriver/AbstractWebDriver.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ protected function curl($requestMethod, $command, $parameters = null, $extraOpti
134134
}
135135

136136
// if not success, throw exception
137-
if ($results['status'] != 0) {
137+
if ($results['status'] !== 0) {
138138
throw WebDriverException::factory($results['status'], $message);
139139
}
140140

‎lib/WebDriver/ClassLoader.php‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,24 @@ public static function autoload($class)
6060
}
6161
}
6262

63-
// Note: only one __autoload per PHP instance
64-
if(function_exists('spl_autoload_register'))
65-
{
66-
// use the SPL autoload stack
63+
if (function_exists('spl_autoload_register')) {
64+
/**
65+
* use the SPL autoload stack
66+
*/
6767
spl_autoload_register(array('WebDriver\ClassLoader', 'autoload'));
6868

69-
// preserve any existing __autoload
70-
if(function_exists('__autoload'))
71-
{
69+
/**
70+
* preserve any existing __autoload
71+
*/
72+
if (function_exists('__autoload')) {
7273
spl_autoload_register('__autoload');
7374
}
74-
}
75-
else
76-
{
75+
} else {
76+
/**
77+
* Our fallback; only one __autoload per PHP instance
78+
*
79+
* @param string $class Class name
80+
*/
7781
function __autoload($class)
7882
{
7983
ClassLoader::autoload($class);

‎lib/WebDriver/Container.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ protected function webDriverElement($value)
192192
*/
193193
public function __call($name, $arguments)
194194
{
195-
if (count($arguments) == 1 && in_array(str_replace('_', ' ', $name), $this->strategies)) {
195+
if (count($arguments) === 1 && in_array(str_replace('_', ' ', $name), $this->strategies)) {
196196
return $this->locate($name, $arguments[0]);
197197
}
198198

‎lib/WebDriver/Exception.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public static function factory($code, $message = null, $previousException = null
139139
{
140140
// unknown error
141141
if (!isset(self::$errs[$code])) {
142-
if (trim($message) == '') {
142+
if (trim($message) === '') {
143143
$message = 'Unknown Error';
144144
}
145145

@@ -148,7 +148,7 @@ public static function factory($code, $message = null, $previousException = null
148148

149149
$errorDefinition = self::$errs[$code];
150150

151-
if (trim($message) == '') {
151+
if (trim($message) === '') {
152152
$message = $errorDefinition[1];
153153
}
154154

‎lib/WebDriver/SauceLabs/SauceRest.php‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
* @package WebDriver
1818
*
1919
* @author Anthon Pang <apang@softwaredevelopment.ca>
20+
* @author Fabrizio Branca <mail@fabrizio-branca.de>
2021
*/
2122

2223
namespace WebDriver\SauceLabs;
@@ -43,25 +44,25 @@ class SauceRest
4344
/**
4445
* Constructor
4546
*
46-
* @param string $userName Your Sauce user name
47+
* @param string $userId Your Sauce user name
4748
* @param string $accessKey Your Sauce API key
4849
*/
49-
public function __construct($userName, $accessKey)
50+
public function __construct($userId, $accessKey)
5051
{
51-
$this->userId = $userName;
52+
$this->userId = $userId;
5253
$this->accessKey = $accessKey;
5354
}
5455

5556
/**
5657
* Execute Sauce Labs REST API command
5758
*
58-
* @see http://saucelabs.com/docs/saucerest
59-
*
6059
* @param string $requestMethod HTTP request method
6160
* @param string $url URL
6261
* @param mixed $parameters Parameters
6362
*
6463
* @return mixed
64+
*
65+
* @see http://saucelabs.com/docs/saucerest
6566
*/
6667
protected function execute($requestMethod, $url, $parameters = null)
6768
{
@@ -118,6 +119,8 @@ public function createSubAccount($accountInfo)
118119
*
119120
* @param string $userId User ID
120121
* @param string $plan Plan
122+
*
123+
* @return array
121124
*/
122125
public function updateSubAccount($userId, $plan)
123126
{
@@ -128,8 +131,10 @@ public function updateSubAccount($userId, $plan)
128131
* Unsubscribe a sub-account: /rest/v1/users/:userId/subscription (DELETE)
129132
*
130133
* @param string $userId User ID
134+
*
135+
* @return array
131136
*/
132-
public function unsubscribeSubAccount($userId, $plan)
137+
public function unsubscribeSubAccount($userId)
133138
{
134139
return $this->execute('DELETE', 'users/' . $userId . '/subscription');
135140
}
@@ -212,7 +217,7 @@ public function updateJob($jobId, $jobInfo)
212217
*/
213218
public function stopJob($jobId)
214219
{
215-
return $this->execute('', $this->userId . '/jobs/' . $jobId . '/stop');
220+
return $this->execute('PUT', $this->userId . '/jobs/' . $jobId . '/stop');
216221
}
217222

218223
/**

‎lib/WebDriver/Service/CurlService.php‎

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*
1919
* @author Justin Bishop <jubishop@gmail.com>
2020
* @author Anthon Pang <apang@softwaredevelopment.ca>
21+
* @author Fabrizio Branca <mail@fabrizio-branca.de>
2122
*/
2223

2324
namespace WebDriver\Service;
@@ -36,30 +37,41 @@ class CurlService implements CurlServiceInterface
3637
*/
3738
public function execute($requestMethod, $url, $parameters = null, $extraOptions = array())
3839
{
39-
$customHeaders = array(
40+
$customHeaders = array(
4041
'Content-Type: application/json;charset=UTF-8',
4142
'Accept: application/json;charset=UTF-8',
4243
);
4344

4445
$curl = curl_init($url);
4546
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
4647

47-
if ($requestMethod === 'POST') {
48-
curl_setopt($curl, CURLOPT_POST, true);
49-
if ($parameters && is_array($parameters)) {
50-
curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($parameters));
51-
} else {
52-
$customHeaders[] = 'Content-Length: 0';
53-
}
54-
} else if ($requestMethod == 'DELETE') {
55-
curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'DELETE');
56-
} else if ($requestMethod == 'PUT') {
57-
curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'PUT');
58-
if ($parameters && is_array($parameters)) {
59-
curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($parameters));
60-
} else {
61-
$customHeaders[] = 'Content-Length: 0';
62-
}
48+
switch ($requestMethod) {
49+
case 'GET':
50+
break;
51+
52+
case 'POST':
53+
if ($parameters && is_array($parameters)) {
54+
curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($parameters));
55+
} else {
56+
$customHeaders[] = 'Content-Length: 0';
57+
}
58+
59+
curl_setopt($curl, CURLOPT_POST, true);
60+
break;
61+
62+
case 'DELETE':
63+
curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'DELETE');
64+
break;
65+
66+
case 'PUT':
67+
if ($parameters && is_array($parameters)) {
68+
curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($parameters));
69+
} else {
70+
$customHeaders[] = 'Content-Length: 0';
71+
}
72+
73+
curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'PUT');
74+
break;
6375
}
6476

6577
foreach ($extraOptions as $option => $value) {

‎lib/WebDriver/Session.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ public function deleteCookie($cookieName)
224224
public function window()
225225
{
226226
// close current window
227-
if (func_num_args() == 0) {
227+
if (func_num_args() === 0) {
228228
$this->curl('DELETE', '/window');
229229

230230
return $this;
@@ -278,14 +278,14 @@ public function focusWindow($name)
278278
public function timeouts()
279279
{
280280
// set timeouts
281-
if (func_num_args() == 1) {
281+
if (func_num_args() === 1) {
282282
$arg = func_get_arg(0); // json
283283
$this->curl('POST', '/timeouts', $arg);
284284

285285
return $this;
286286
}
287287

288-
if (func_num_args() == 2) {
288+
if (func_num_args() === 2) {
289289
$arg = array(
290290
'type' => func_get_arg(0), // 'script' or 'implicit'
291291
'ms' => func_get_arg(1), // timeout in milliseconds

‎lib/WebDriver/Storage.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ protected function methods()
5353
public function get()
5454
{
5555
// get all keys
56-
if (func_num_args() == 0) {
56+
if (func_num_args() === 0) {
5757
$result = $this->curl('GET', '');
5858

5959
return $result['value'];
6060
}
6161

6262
// get key/value pair
63-
if (func_num_args() == 1) {
63+
if (func_num_args() === 1) {
6464
return $this->getKey(func_get_arg(0));
6565
}
6666

@@ -76,15 +76,15 @@ public function get()
7676
*/
7777
public function set()
7878
{
79-
if (func_num_args() == 1
79+
if (func_num_args() === 1
8080
&& is_array($arg = func_get_arg(0))
8181
) {
8282
$this->curl('POST', '', $arg);
8383

8484
return $this;
8585
}
8686

87-
if (func_num_args() == 2) {
87+
if (func_num_args() === 2) {
8888
$arg = array(
8989
'key' => func_get_arg(0),
9090
'value' => func_get_arg(1),
@@ -107,14 +107,14 @@ public function set()
107107
public function delete()
108108
{
109109
// delete storage
110-
if (func_num_args() == 0) {
110+
if (func_num_args() === 0) {
111111
$this->curl('DELETE', '');
112112

113113
return $this;
114114
}
115115

116116
// delete key from storage
117-
if (func_num_args() == 1) {
117+
if (func_num_args() === 1) {
118118
return $this->deleteKey(func_get_arg(0));
119119
}
120120

‎lib/WebDriver/WebDriver.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function session($requiredCapabilities = Browser::FIREFOX, $desiredCapabi
6060

6161
$requiredCapabilities = array();
6262
}
63-
63+
6464
$results = $this->curl(
6565
'POST',
6666
'/session',

‎lib/WebDriver/WebTest/WebTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ public function runTests($file)
252252
$reflectionParameters = $reflectionMethod->getParameters();
253253

254254
foreach ($reflectionParameters as $reflectionParameter) {
255-
if ($reflectionParameter->getName() == 'description'
255+
if ($reflectionParameter->getName() === 'description'
256256
&& $reflectionParameter->isDefaultValueAvailable()
257257
) {
258258
$defaultValue = $reflectionParameter->getDefaultValue();
@@ -327,7 +327,7 @@ static public function main($argc, $argv)
327327
/*
328328
* parse command line options
329329
*/
330-
if ($argc == 1) {
330+
if ($argc === 1) {
331331
$argc++;
332332
array_push($argv, '-h');
333333
}

0 commit comments

Comments
 (0)