joomla-framework / oauth1

Tests/ClientTest.php

Braces +3 added lines, -6 removed lines

@@ -136,8 +136,7 @@ 
 			$this->object->setToken($token);
 			$result = $this->object->authenticate();
 			$this->assertEquals($result, $token);
-		}
-		else
+		} else
 		{
 			$this->object->setOption('requestTokenURL', 'https://example.com/request_token');
 			$this->object->setOption('authoriseURL', 'https://example.com/authorize');
@@ -175,8 +174,7 @@ 
 			{
 				TestHelper::setValue($this->object, 'version', $version);
 				$data = array('oauth_verifier' => 'verifier', 'oauth_token' => 'token');
-			}
-			else
+			} else
 			{
 				TestHelper::setValue($this->object, 'version', $version);
 				$data = array('oauth_token' => 'token');
@@ -302,8 +300,7 @@ 
 				$this->object->oauthRequest('www.example.com', $method, array('oauth_token' => '1235'), $data, array('Content-Type' => 'multipart/form-data')),
 				$this->equalTo($returnData)
 				);
-		}
-		else
+		} else
 		{
 			$this->client->expects($this->at(0))
 				->method($method)

Indentation +4 added lines, -4 removed lines

@@ -260,10 +260,10 @@
 	}
 
 	/**
-	* Provides test data.
-	*
-	* @return  array
-	*/
+	 * Provides test data.
+	 *
+	 * @return  array
+	 */
 	public function seedOauthRequest()
 	{
 		// Method

src/Client.php

Braces +7 added lines, -14 removed lines

@@ -121,8 +121,7 @@ 
 		if (strcmp($this->version, '1.0a') === 0)
 		{
 			$verifier = $this->input->get('oauth_verifier');
-		}
-		else
+		} else
 		{
 			$verifier = $this->input->get('oauth_token');
 		}
@@ -282,8 +281,7 @@ 
 		if (isset($headers['Content-Type']) && strpos($headers['Content-Type'], 'multipart/form-data') !== false || !is_array($data))
 		{
 			$oauth_headers = $parameters;
-		}
-		else
+		} else
 		{
 			// Use all parameters for the signature.
 			$oauth_headers = array_merge($parameters, $data);
@@ -355,8 +353,7 @@ 
 			if (!strcmp($header, 'OAuth '))
 			{
 				$header .= $key . '="' . $this->safeEncode($value) . '"';
-			}
-			else
+			} else
 			{
 				$header .= ', ' . $key . '="' . $value . '"';
 			}
@@ -386,16 +383,14 @@ 
 					if (strpos($url, '?') === false)
 					{
 						$url .= '?';
-					}
-					else
+					} else
 					{
 						$url .= '&';
 					}
 
 					$url .= $key . '=' . $v;
 				}
-			}
-			else
+			} else
 			{
 				if (strpos($value, ' ') !== false)
 				{
@@ -405,8 +400,7 @@ 
 				if (strpos($url, '?') === false)
 				{
 					$url .= '?';
-				}
-				else
+				} else
 				{
 					$url .= '&';
 				}
@@ -471,8 +465,7 @@ 
 					$v = $this->safeEncode($v);
 					$kv[] = "{$key}={$v}";
 				}
-			}
-			else
+			} else
 			{
 				$value = $this->safeEncode($value);
 				$kv[] = "{$key}={$value}";

Spacing +8 added lines, -8 removed lines

@@ -209,12 +209,12 @@ 
 	 */
 	private function authorise()
 	{
-		$url = $this->getOption('authoriseURL') . '?oauth_token=' . $this->token['key'];
+		$url = $this->getOption('authoriseURL').'?oauth_token='.$this->token['key'];
 
 		if ($this->getOption('scope'))
 		{
 			$scope = is_array($this->getOption('scope')) ? implode(' ', $this->getOption('scope')) : $this->getOption('scope');
-			$url .= '&scope=' . urlencode($scope);
+			$url .= '&scope='.urlencode($scope);
 		}
 
 		if ($this->getOption('sendheaders'))
@@ -354,11 +354,11 @@ 
 		{
 			if (!strcmp($header, 'OAuth '))
 			{
-				$header .= $key . '="' . $this->safeEncode($value) . '"';
+				$header .= $key.'="'.$this->safeEncode($value).'"';
 			}
 			else
 			{
-				$header .= ', ' . $key . '="' . $value . '"';
+				$header .= ', '.$key.'="'.$value.'"';
 			}
 		}
 
@@ -392,7 +392,7 @@ 
 						$url .= '&';
 					}
 
-					$url .= $key . '=' . $v;
+					$url .= $key.'='.$v;
 				}
 			}
 			else
@@ -411,7 +411,7 @@ 
 					$url .= '&';
 				}
 
-				$url .= $key . '=' . $value;
+				$url .= $key.'='.$value;
 			}
 		}
 
@@ -532,7 +532,7 @@ 
 	public static function generateNonce()
 	{
 		// The md5s look nicer than numbers.
-		return md5(microtime() . random_bytes(16));
+		return md5(microtime().random_bytes(16));
 	}
 
 	/**
@@ -544,7 +544,7 @@ 
 	 */
 	private function prepareSigningKey()
 	{
-		return $this->safeEncode($this->getOption('consumer_secret')) . '&' . $this->safeEncode(($this->token) ? $this->token['secret'] : '');
+		return $this->safeEncode($this->getOption('consumer_secret')).'&'.$this->safeEncode(($this->token) ? $this->token['secret'] : '');
 	}
 
 	/**