🚿 clean up token creation

Author: codemasher

src/Deezer/Deezer.php

@@ -115,12 +115,12 @@ protected function parseTokenResponse(ResponseInterface $response):AccessToken{
 			throw new ProviderException('token missing');
 		}
 
-		$token = new AccessToken([
-			'provider'     => $this->serviceName,
-			'accessToken'  => $data['access_token'],
-			'expires'      => $data['expires'] ?? $data['expires_in'] ?? AccessToken::EOL_NEVER_EXPIRES,
-			'refreshToken' => $data['refresh_token'] ?? null,
-		]);
+		$token = new AccessToken;
+
+		$token->provider     = $this->serviceName;
+		$token->accessToken  = $data['access_token'];
+		$token->expires      = $data['expires'] ?? $data['expires_in'] ?? AccessToken::EOL_NEVER_EXPIRES;
+		$token->refreshToken = $data['refresh_token'] ?? null;
 
 		unset($data['expires'], $data['expires_in'], $data['refresh_token'], $data['access_token']);
 

src/GuildWars2/GuildWars2.php

@@ -279,18 +279,18 @@ public function storeGW2Token(string $access_token):AccessToken{
 
 		if(isset($tokeninfo->id) && strpos($access_token, $tokeninfo->id) === 0){
 
-			$token = new AccessToken([
-				'provider'     => $this->serviceName,
-				'accessToken'       => $access_token,
-				'accessTokenSecret' => substr($access_token, 36, 36), // the actual token
-				'expires'           => AccessToken::EOL_NEVER_EXPIRES,
-				'extraParams'       => [
-					'token_type' => 'Bearer',
-					'id'         => $tokeninfo->id,
-					'name'       => $tokeninfo->name,
-					'scope'      => implode($this->scopesDelimiter, $tokeninfo->permissions),
-				],
-			]);
+			$token = new AccessToken;
+
+			$token->provider          = $this->serviceName;
+			$token->accessToken       = $access_token;
+			$token->accessTokenSecret = substr($access_token, 36, 36); // the actual token
+			$token->expires           = AccessToken::EOL_NEVER_EXPIRES;
+			$token->extraParams       = [
+				'token_type' => 'Bearer',
+				'id'         => $tokeninfo->id,
+				'name'       => $tokeninfo->name,
+				'scope'      => implode($this->scopesDelimiter, $tokeninfo->permissions),
+			];
 
 			$this->storage->storeAccessToken($this->serviceName, $token);
 

src/LastFM/LastFM.php

@@ -172,11 +172,11 @@ protected function parseTokenResponse(ResponseInterface $response):AccessToken{
 			throw new ProviderException('token missing');
 		}
 
-		$token = new AccessToken([
-			'provider'    => $this->serviceName,
-			'accessToken' => $data['session']['key'],
-			'expires'     => AccessToken::EOL_NEVER_EXPIRES,
-		]);
+		$token = new AccessToken;
+
+		$token->provider     = $this->serviceName;
+		$token->accessToken  = $data['session']['key'];
+		$token->expires      = AccessToken::EOL_NEVER_EXPIRES;
 
 		unset($data['session']['key']);
 

src/PayPal/PayPal.php

@@ -78,12 +78,12 @@ protected function parseTokenResponse(ResponseInterface $response):AccessToken{
 			throw new ProviderException('token missing');
 		}
 
-		$token = new AccessToken([
-			'provider'     => $this->serviceName,
-			'accessToken'  => $data['access_token'],
-			'expires'      => $data['expires_in'] ?? AccessToken::EOL_NEVER_EXPIRES,
-			'refreshToken' => $data['refresh_token'] ?? null,
-		]);
+		$token = new AccessToken;
+
+		$token->provider     = $this->serviceName;
+		$token->accessToken  = $data['access_token'];
+		$token->expires      = $data['expires_in'] ?? AccessToken::EOL_NEVER_EXPIRES;
+		$token->refreshToken = $data['refresh_token'] ?? null;
 
 		unset($data['expires_in'], $data['refresh_token'], $data['access_token']);