🚿

Author: codemasher

tests/API/OAuthAPITestAbstract.php

@@ -18,8 +18,6 @@
 use Psr\Http\Client\ClientInterface;
 use Psr\Log\LoggerInterface;
 
-use const DIRECTORY_SEPARATOR;
-
 abstract class OAuthAPITestAbstract extends ProviderTestAbstract{
 
 	protected string $ENV;

tests/Providers/OAuth1ProviderTestAbstract.php

@@ -13,7 +13,6 @@
 use chillerlan\OAuth\Core\{AccessToken, OAuth1Interface, ProviderException};
 use chillerlan\HTTP\Utils\Query;
 
-use function chillerlan\HTTP\Utils\get_json;
 use function parse_url;
 
 use const PHP_URL_QUERY;
@@ -143,7 +142,7 @@ public function testRequest():void{
 		$token = new AccessToken(['accessTokenSecret' => 'test_token']);
 		$this->storage->storeAccessToken($this->provider->serviceName, $token);
 
-		$this::assertSame('such data! much wow!', get_json($this->provider->request('/request'))->data);
+		$this::assertSame('such data! much wow!', $this->responseJson($this->provider->request('/request'))->data);
 
 		// coverage, @todo
 		$this->provider

tests/Providers/OAuth2ProviderTestAbstract.php

@@ -14,10 +14,7 @@
 use chillerlan\OAuth\OAuthException;
 use chillerlan\HTTP\Utils\Query;
 
-use function chillerlan\HTTP\Utils\get_json;
-
 use function explode, parse_url, sleep, time;
-
 use const PHP_URL_QUERY;
 
 /**
@@ -131,7 +128,7 @@ public function testRequest():void{
 		$token = new AccessToken(['accessToken' => 'test_access_token_secret', 'expires' => 1]);
 		$this->storage->storeAccessToken($this->provider->serviceName, $token);
 
-		$this::assertSame('such data! much wow!', get_json($this->provider->request('/request'))->data);
+		$this::assertSame('such data! much wow!', $this->responseJson($this->provider->request('/request'))->data);
 	}
 
 	public function testRequestInvalidAuthTypeException():void{
@@ -229,7 +226,7 @@ public function testRequestWithTokenRefresh():void{
 
 		sleep(2);
 
-		$this::assertSame('such data! much wow!', get_json($this->provider->request('/request'))->data);
+		$this::assertSame('such data! much wow!', $this->responseJson($this->provider->request('/request'))->data);
 	}
 
 	public function testGetClientCredentials():void{

tests/Providers/RequestTest/OAuthProviderRequestTest.php

@@ -69,7 +69,7 @@ public function testCallMagicEndpoints():void{
 		// get with path segment and query
 		$r = $this->provider->test('withpath', 'andquery', ['foo' => 'bar', 'this-param' => 'does not exist']);
 		$this::assertSame(
-			'https://localhost/api/test/withpath/andquery/__echo__?foo=bar',
+			'https://localhost/api/test/withpath/andquery'.$this::ECHO_REQUEST.'?foo=bar',
 			$r->getHeaderLine('x-request-uri')
 		);
 
@@ -81,31 +81,31 @@ public function testCallMagicEndpoints():void{
 		$r = $this->provider->postNoPathNoQuery($body);
 		$this::assertSame($expectedBody, (string)$r->getBody());
 		$this::assertSame(
-			'https://localhost/api/post/nopathnoquery/__echo__',
+			'https://localhost/api/post/nopathnoquery'.$this::ECHO_REQUEST,
 			$r->getHeaderLine('x-request-uri')
 		);
 
 		// path segment and body
 		$r = $this->provider->postWithPathNoQuery('withpathnoquery', $body);
 		$this::assertSame($expectedBody, (string)$r->getBody());
 		$this::assertSame(
-			'https://localhost/api/post/withpathnoquery/__echo__',
+			'https://localhost/api/post/withpathnoquery'.$this::ECHO_REQUEST,
 			$r->getHeaderLine('x-request-uri')
 		);
 
 		// query parameters and body
 		$r = $this->provider->postNoPathWithQuery($params, $body);
 		$this::assertSame($expectedBody, (string)$r->getBody());
 		$this::assertSame(
-			'https://localhost/api/post/nopathwithquery/__echo__?query=whatever',
+			'https://localhost/api/post/nopathwithquery'.$this::ECHO_REQUEST.'?query=whatever',
 			$r->getHeaderLine('x-request-uri')
 		);
 
 		// path segment, query params and body
 		$r = $this->provider->postWithPathAndQuery('withpathandquery', $params, $body);
 		$this::assertSame($expectedBody, (string)$r->getBody());
 		$this::assertSame(
-			'https://localhost/api/post/withpathandquery/__echo__?query=whatever',
+			'https://localhost/api/post/withpathandquery'.$this::ECHO_REQUEST.'?query=whatever',
 			$r->getHeaderLine('x-request-uri')
 		);
 

tests/Providers/TestEndpoints.php

@@ -17,7 +17,7 @@ class TestEndpoints extends EndpointMap{
 	protected string $API_BASE = '/api';
 
 	protected array $test = [
-		'path'          => '/test/%1$s/%2$s/__echo__',
+		'path'          => '/test/%1$s/%2$s'.OAuthProviderTestAbstract::ECHO_REQUEST,
 		'method'        => 'GET',
 		'query'         => ['foo'],
 		'path_elements' => ['a', 'b'],
@@ -26,7 +26,7 @@ class TestEndpoints extends EndpointMap{
 	];
 
 	protected array $postNoPathNoQuery = [
-		'path'          => '/post/nopathnoquery/__echo__',
+		'path'          => '/post/nopathnoquery'.OAuthProviderTestAbstract::ECHO_REQUEST,
 		'method'        => 'POST',
 		'query'         => null,
 		'path_elements' => null,
@@ -35,7 +35,7 @@ class TestEndpoints extends EndpointMap{
 	];
 
 	protected array $postWithPathNoQuery = [
-		'path'          => '/post/%1$s/__echo__',
+		'path'          => '/post/%1$s'.OAuthProviderTestAbstract::ECHO_REQUEST,
 		'method'        => 'POST',
 		'query'         => null,
 		'path_elements' => ['path'],
@@ -44,7 +44,7 @@ class TestEndpoints extends EndpointMap{
 	];
 
 	protected array $postNoPathWithQuery = [
-		'path'          => '/post/nopathwithquery/__echo__',
+		'path'          => '/post/nopathwithquery'.OAuthProviderTestAbstract::ECHO_REQUEST,
 		'method'        => 'POST',
 		'query'         => ['query'],
 		'path_elements' => null,
@@ -53,7 +53,7 @@ class TestEndpoints extends EndpointMap{
 	];
 
 	protected array $postWithPathAndQuery = [
-		'path'          => '/post/%1$s/__echo__',
+		'path'          => '/post/%1$s'.OAuthProviderTestAbstract::ECHO_REQUEST,
 		'method'        => 'POST',
 		'query'         => ['query'],
 		'path_elements' => ['pathandquery'],