LastFM: removes superfluous method requestParams()

Author: codemasher

src/LastFM/LastFM.php

@@ -186,27 +186,6 @@ protected function parseTokenResponse(ResponseInterface $response):AccessToken{
 		return $token;
 	}
 
-	/**
-	 * @param string $apiMethod
-	 * @param array  $params
-	 * @param array  $body
-	 *
-	 * @return array
-	 */
-	protected function requestParams(string $apiMethod, array $params, array $body):array{
-
-		$params = array_merge($params, $body, [
-			'method'  => $apiMethod,
-			'format'  => 'json',
-			'api_key' => $this->options->key,
-			'sk'      => $this->storage->getAccessToken($this->serviceName)->accessToken,
-		]);
-
-		$params['api_sig'] = $this->getSignature($params);
-
-		return $params;
-	}
-
 	/**
 	 * @inheritDoc
 	 */
@@ -218,7 +197,15 @@ public function request(
 		array $headers = null
 	):ResponseInterface{
 		$method ??= 'GET';
-		$params = $this->requestParams($path, $params ?? [], $body ?? []);
+
+		$params = array_merge(($params ?? []), ($body ?? []), [
+			'method'  => $path,
+			'format'  => 'json',
+			'api_key' => $this->options->key,
+			'sk'      => $this->storage->getAccessToken($this->serviceName)->accessToken,
+		]);
+
+		$params['api_sig'] = $this->getSignature($params);
 
 		if($method === 'POST'){
 			$body   = $params;

tests/LastFM/LastFMTest.php

@@ -91,17 +91,6 @@ public function testParseTokenResponseNoToken():void{
 			->invokeArgs($this->provider, [$r]);
 	}
 
-	public function testRequestParams():void{
-		$params = $this
-			->getMethod('requestParams')
-			->invokeArgs($this->provider, ['whatever', ['foo' => 'bar'], []]);
-
-		$this::assertSame('310be19b3ff6967ca8425666753019fb', $params['api_sig']);
-		$this::assertSame($this->options->key, $params['api_key']);
-		$this::assertSame('whatever', $params['method']);
-		$this::assertSame('bar', $params['foo']);
-	}
-
 	public function testGetAccessToken():void{
 		$this->setProperty($this->provider, 'apiURL', '/lastfm/auth');