🚿

Author: codemasher

src/Storage/OAuthStorageAbstract.php

@@ -23,8 +23,6 @@
 abstract class OAuthStorageAbstract implements OAuthStorageInterface, LoggerAwareInterface{
 	use LoggerAwareTrait;
 
-	protected const TOKEN_NONCE = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01";
-
 	/**
 	 * @var \chillerlan\OAuth\OAuthOptions
 	 */

src/Storage/OAuthStorageInterface.php

@@ -16,6 +16,8 @@
 
 interface OAuthStorageInterface{
 
+	public const TOKEN_NONCE = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01";
+
 	/**
 	 * @param string                             $service
 	 * @param \chillerlan\OAuth\Core\AccessToken $token

tests/Core/APITestAbstract.php

@@ -120,9 +120,8 @@ public function __construct(ContainerInterface $options){
 				$this->client = new TinyCurlClient($this->options, new Request($this->options));
 			}
 
-			public function request(string $url, array $params = null, string $method = null, $body = null, array $headers = null):HTTPResponseInterface{
-				$args = func_get_args();
-				$response = $this->client->request(...$args);
+			protected function getResponse():HTTPResponseInterface{
+				$response = $this->client->request($this->requestURL, $this->requestParams, $this->requestMethod, $this->requestBody, $this->requestHeaders);
 				usleep($this->options->sleep * 1000000);
 				return $response;
 			}

tests/Core/OAuth1Test.php

@@ -42,8 +42,8 @@ protected function setUp(){
 
 	protected function initHttp():HTTPClientInterface{
 		return new class(new OAuthOptions) extends HTTPClientAbstract{
-			public function request(string $url, array $params = null, string $method = null, $body = null, array $headers = null):HTTPResponseInterface{
-				return new HTTPResponse(['body' => OAuth1Test::OAUTH1_RESPONSES[$url]]);
+			protected function getResponse():HTTPResponseInterface{
+				return new HTTPResponse(['body' => OAuth1Test::OAUTH1_RESPONSES[$this->requestURL]]);
 			}
 		};
 	}

tests/Core/OAuth2Test.php

@@ -16,7 +16,7 @@
 	HTTPClientAbstract, HTTPClientInterface, HTTPResponse, HTTPResponseInterface
 };
 use chillerlan\OAuth\{
-	Core\AccessToken, Core\ClientCredentials, Core\TokenRefresh, OAuthOptions
+	Core\AccessToken, Core\ClientCredentials, Core\CSRFToken, Core\TokenRefresh, OAuthOptions
 };
 
 /**
@@ -59,16 +59,16 @@ protected function setUp(){
 			$this->setProperty($this->provider, 'clientCredentialsTokenURL', 'https://localhost/oauth2/client_credentials');
 		}
 
-		if($this->provider instanceof \chillerlan\OAuth\Core\CSRFToken){
+		if($this->provider instanceof CSRFToken){
 			$this->storage->storeCSRFState($this->provider->serviceName, 'test_state');
 		}
 
 	}
 
 	protected function initHttp():HTTPClientInterface{
 		return new class(new OAuthOptions) extends HTTPClientAbstract{
-			public function request(string $url, array $params = null, string $method = null, $body = null, array $headers = null):HTTPResponseInterface{
-				return new HTTPResponse(['body' => json_encode(OAuth2Test::OAUTH2_RESPONSES[$url])]);
+			protected function getResponse():HTTPResponseInterface{
+				return new HTTPResponse(['body' => json_encode(OAuth2Test::OAUTH2_RESPONSES[$this->requestURL])]);
 			}
 		};
 	}

tests/Core/ProviderTestAbstract.php

@@ -14,12 +14,10 @@
 
 use chillerlan\HTTP\HTTPClientInterface;
 use chillerlan\OAuth\{
-	Core\AccessToken, OAuthOptions, Storage\MemoryStorage, Storage\OAuthStorageInterface
+	Core\AccessToken, Core\OAuthInterface, OAuthOptions, Storage\MemoryStorage, Storage\OAuthStorageInterface
 };
 use PHPUnit\Framework\TestCase;
-use ReflectionClass;
-use ReflectionMethod;
-use ReflectionProperty;
+use ReflectionClass, ReflectionMethod, ReflectionProperty;
 
 abstract class ProviderTestAbstract extends TestCase{
 
@@ -119,7 +117,7 @@ protected function storeToken(AccessToken $token){
 	}
 
 	public function testInstance(){
-		$this->assertInstanceOf(\chillerlan\OAuth\Core\OAuthInterface::class, $this->provider);
+		$this->assertInstanceOf(OAuthInterface::class, $this->provider);
 	}
 
 	public function testMagicGetServicename(){