joomla-framework / oauth1

src/Client.php

Doc Comments +2 added lines, -2 removed lines

@@ -336,7 +336,7 @@ 
 	 * Method to validate a response.
 	 *
 	 * @param   string    $url       The request URL.
-	 * @param   Response  $response  The response to validate.
+	 * @param   \Joomla\Http\Response  $response  The response to validate.
 	 *
 	 * @return  void
 	 *
@@ -584,7 +584,7 @@ 
 	 * Set an option for the OAuth1 Client instance.
 	 *
 	 * @param   string  $key    The name of the option to set
-	 * @param   mixed   $value  The option value to set
+	 * @param   string   $value  The option value to set
 	 *
 	 * @return  $this
 	 *

Spacing +6 added lines, -6 removed lines

@@ -217,12 +217,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'))
@@ -370,11 +370,11 @@ 
 		{
 			if (!strcmp($header, 'OAuth '))
 			{
-				$header .= $key . '="' . $this->safeEncode($value) . '"';
+				$header .= $key.'="'.$this->safeEncode($value).'"';
 			}
 			else
 			{
-				$header .= ', ' . $key . '="' . $value . '"';
+				$header .= ', '.$key.'="'.$value.'"';
 			}
 		}
 
@@ -513,7 +513,7 @@ 
 	public static function generateNonce()
 	{
 		// The md5s look nicer than numbers.
-		return md5(microtime() . random_bytes(16));
+		return md5(microtime().random_bytes(16));
 	}
 
 	/**
@@ -525,7 +525,7 @@ 
 	 */
 	private function prepareSigningKey(): string
 	{
-		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'] : '');
 	}
 
 	/**

Braces +4 added lines, -8 removed lines

@@ -129,8 +129,7 @@ 
 		if (strcmp($this->version, '1.0a') === 0)
 		{
 			$verifier = $this->input->get('oauth_verifier');
-		}
-		else
+		} else
 		{
 			$verifier = $this->input->get('oauth_token');
 		}
@@ -290,8 +289,7 @@ 
 		if (isset($headers['Content-Type']) && strpos($headers['Content-Type'], 'multipart/form-data') !== false || !\is_array($data))
 		{
 			$oauthHeaders = $parameters;
-		}
-		else
+		} else
 		{
 			// Use all parameters for the signature.
 			$oauthHeaders = array_merge($parameters, $data);
@@ -371,8 +369,7 @@ 
 			if (!strcmp($header, 'OAuth '))
 			{
 				$header .= $key . '="' . $this->safeEncode($value) . '"';
-			}
-			else
+			} else
 			{
 				$header .= ', ' . $key . '="' . $value . '"';
 			}
@@ -452,8 +449,7 @@ 
 					$v    = $this->safeEncode($v);
 					$kv[] = "{$key}={$v}";
 				}
-			}
-			else
+			} else
 			{
 				$value = $this->safeEncode($value);
 				$kv[]  = "{$key}={$value}";

Tests/ClientTest.php

Braces +3 added lines, -6 removed lines

@@ -144,8 +144,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');
@@ -183,8 +182,7 @@ 
 			if ($version === '1.0a')
 			{
 				$data = ['oauth_verifier' => 'verifier', 'oauth_token' => 'token'];
-			}
-			else
+			} else
 			{
 				$data = ['oauth_token' => 'token'];
 			}
@@ -306,8 +304,7 @@ 
 					['Content-Type' => 'multipart/form-data']
 				)
 			);
-		}
-		else
+		} else
 		{
 			$this->client->expects($this->at(0))
 				->method($method)