changed parameter order of OAuth1Client::requestHeaders()

Author: codemasher

src/Core/OAuth1Provider.php

@@ -212,20 +212,20 @@ public function getAccessToken(string $token, string $verifier, string $tokenSec
 	 * @return array
 	 */
 	protected function getAccessTokenHeaders(array $body):array {
-		return $this->requestHeaders($this->accessTokenURL, $body, 'POST', [], $this->storage->getAccessToken($this->serviceName));
+		return $this->requestHeaders($this->storage->getAccessToken($this->serviceName), $this->accessTokenURL, 'POST', $body, []);
 	}
 
 	/**
+	 * @param \chillerlan\OAuth\Core\AccessToken $token
 	 * @param string                             $url
-	 * @param array|string                       $params
 	 * @param string                             $method
+	 * @param array|string                       $params
 	 * @param array                              $headers
-	 * @param \chillerlan\OAuth\Core\AccessToken $token
 	 *
 	 * @return array
 	 * @throws \Exception
 	 */
-	protected function requestHeaders(string $url, $params = null, string $method, array $headers = null, AccessToken $token):array{
+	protected function requestHeaders(AccessToken $token, string $url, string $method, $params = null, array $headers = null):array{
 		$this->tokenSecret = $token->accessTokenSecret;
 		$parameters        = $this->requestHeaderParams($token);
 
@@ -252,7 +252,7 @@ protected function requestHeaderParams(AccessToken $token):array {
 			'oauth_consumer_key'     => $this->options->key,
 			'oauth_nonce'            => $this->nonce(),
 			'oauth_signature_method' => 'HMAC-SHA1',
-			'oauth_timestamp'        => (new DateTime())->format('U'),
+			'oauth_timestamp'        => (new DateTime)->format('U'),
 			'oauth_token'            => $token->accessToken,
 			'oauth_version'          => '1.0',
 		];
@@ -271,11 +271,11 @@ public function request(string $path, array $params = null, string $method = nul
 		$method = $method ?? 'GET';
 
 		$headers = $this->requestHeaders(
+			$this->storage->getAccessToken($this->serviceName),
 			$this->apiURL.$path,
-			$body ?? $params,
 			$method,
-			$headers,
-			$this->storage->getAccessToken($this->serviceName)
+			$body ?? $params,
+			$headers
 		);
 
 		return $this->httpRequest($this->apiURL.$path, $params, $method, $body, $headers);

tests/Core/OAuth1Test.php

@@ -111,7 +111,7 @@ public function testGetRequestTokenHeaderParams(){
 	public function testRequestHeaders(){
 		$headers = $this
 			->getMethod('requestHeaders')
-			->invokeArgs($this->provider, ['http://localhost/api/whatever', ['oauth_session_handle' => 'nope'], 'GET', [], new AccessToken(['accessTokenSecret' => 'test_token_secret', 'accessToken' => 'test_token'])]);
+			->invokeArgs($this->provider, [new AccessToken(['accessTokenSecret' => 'test_token_secret', 'accessToken' => 'test_token']), 'http://localhost/api/whatever', 'GET', ['oauth_session_handle' => 'nope'], []]);
 
 		$this->assertContains('OAuth oauth_consumer_key="'.$this->options->key.'", oauth_nonce="', $headers['Authorization']);
 	}