@@ -134,8 +134,7 @@ discard block |
||
| 134 | 134 | $this->object->setToken($token); |
| 135 | 135 | $result = $this->object->authenticate(); |
| 136 | 136 | $this->assertEquals($result, $token); |
| 137 | - } |
|
| 138 | - else |
|
| 137 | + } else |
|
| 139 | 138 | { |
| 140 | 139 | $this->object->setOption('requestTokenURL', 'https://example.com/request_token'); |
| 141 | 140 | $this->object->setOption('authoriseURL', 'https://example.com/authorize'); |
@@ -173,8 +172,7 @@ discard block |
||
| 173 | 172 | { |
| 174 | 173 | TestHelper::setValue($this->object, 'version', $version); |
| 175 | 174 | $data = array('oauth_verifier' => 'verifier', 'oauth_token' => 'token'); |
| 176 | - } |
|
| 177 | - else |
|
| 175 | + } else |
|
| 178 | 176 | { |
| 179 | 177 | TestHelper::setValue($this->object, 'version', $version); |
| 180 | 178 | $data = array('oauth_token' => 'token'); |
@@ -203,8 +201,7 @@ discard block |
||
| 203 | 201 | if (method_exists($this, 'expectException')) |
| 204 | 202 | { |
| 205 | 203 | $this->expectException('DomainException'); |
| 206 | - } |
|
| 207 | - else |
|
| 204 | + } else |
|
| 208 | 205 | { |
| 209 | 206 | $this->setExpectedException('DomainException'); |
| 210 | 207 | } |
@@ -309,8 +306,7 @@ discard block |
||
| 309 | 306 | $this->object->oauthRequest('www.example.com', $method, array('oauth_token' => '1235'), $data, array('Content-Type' => 'multipart/form-data')), |
| 310 | 307 | $this->equalTo($returnData) |
| 311 | 308 | ); |
| 312 | - } |
|
| 313 | - else |
|
| 309 | + } else |
|
| 314 | 310 | { |
| 315 | 311 | $this->client->expects($this->at(0)) |
| 316 | 312 | ->method($method) |
@@ -93,8 +93,7 @@ discard block |
||
| 93 | 93 | if ($response) |
| 94 | 94 | { |
| 95 | 95 | return $this->token; |
| 96 | - } |
|
| 97 | - else |
|
| 96 | + } else |
|
| 98 | 97 | { |
| 99 | 98 | $this->token = null; |
| 100 | 99 | } |
@@ -104,8 +103,7 @@ discard block |
||
| 104 | 103 | if (strcmp($this->version, '1.0a') === 0) |
| 105 | 104 | { |
| 106 | 105 | $verifier = $this->input->get('oauth_verifier'); |
| 107 | - } |
|
| 108 | - else |
|
| 106 | + } else |
|
| 109 | 107 | { |
| 110 | 108 | $verifier = $this->input->get('oauth_token'); |
| 111 | 109 | } |
@@ -163,8 +161,7 @@ discard block |
||
| 163 | 161 | $parameters = array( |
| 164 | 162 | 'oauth_callback' => $this->getOption('callback'), |
| 165 | 163 | ); |
| 166 | - } |
|
| 167 | - else |
|
| 164 | + } else |
|
| 168 | 165 | { |
| 169 | 166 | $parameters = array(); |
| 170 | 167 | } |
@@ -270,8 +267,7 @@ discard block |
||
| 270 | 267 | if (isset($headers['Content-Type']) && strpos($headers['Content-Type'], 'multipart/form-data') !== false || !\is_array($data)) |
| 271 | 268 | { |
| 272 | 269 | $oauthHeaders = $parameters; |
| 273 | - } |
|
| 274 | - else |
|
| 270 | + } else |
|
| 275 | 271 | { |
| 276 | 272 | // Use all parameters for the signature. |
| 277 | 273 | $oauthHeaders = array_merge($parameters, $data); |
@@ -344,8 +340,7 @@ discard block |
||
| 344 | 340 | if (!strcmp($header, 'OAuth ')) |
| 345 | 341 | { |
| 346 | 342 | $header .= $key . '="' . $this->safeEncode($value) . '"'; |
| 347 | - } |
|
| 348 | - else |
|
| 343 | + } else |
|
| 349 | 344 | { |
| 350 | 345 | $header .= ', ' . $key . '="' . $value . '"'; |
| 351 | 346 | } |
@@ -375,14 +370,12 @@ discard block |
||
| 375 | 370 | if (strpos($url, '?') === false) |
| 376 | 371 | { |
| 377 | 372 | $url .= '?' . $key . '=' . $v; |
| 378 | - } |
|
| 379 | - else |
|
| 373 | + } else |
|
| 380 | 374 | { |
| 381 | 375 | $url .= '&' . $key . '=' . $v; |
| 382 | 376 | } |
| 383 | 377 | } |
| 384 | - } |
|
| 385 | - else |
|
| 378 | + } else |
|
| 386 | 379 | { |
| 387 | 380 | if (strpos($value, ' ') !== false) |
| 388 | 381 | { |
@@ -392,8 +385,7 @@ discard block |
||
| 392 | 385 | if (strpos($url, '?') === false) |
| 393 | 386 | { |
| 394 | 387 | $url .= '?' . $key . '=' . $value; |
| 395 | - } |
|
| 396 | - else |
|
| 388 | + } else |
|
| 397 | 389 | { |
| 398 | 390 | $url .= '&' . $key . '=' . $value; |
| 399 | 391 | } |
@@ -456,8 +448,7 @@ discard block |
||
| 456 | 448 | $v = $this->safeEncode($v); |
| 457 | 449 | $kv[] = "{$key}={$v}"; |
| 458 | 450 | } |
| 459 | - } |
|
| 460 | - else |
|
| 451 | + } else |
|
| 461 | 452 | { |
| 462 | 453 | $value = $this->safeEncode($value); |
| 463 | 454 | $kv[] = "{$key}={$value}"; |