🚿

Author: codemasher

composer.json

@@ -28,10 +28,9 @@
 		"psr/simple-cache": "^1.0"
 	},
 	"require-dev": {
-		"chillerlan/php-curl": "^1.0",
 		"chillerlan/php-database": "^2.0",
 		"chillerlan/php-log": "^1.0",
-		"phpunit/phpunit": "^7.1"
+		"phpunit/phpunit": "^7.2"
 	},
 	"autoload": {
 		"psr-4": {

examples/oauth-example-common.php

@@ -11,15 +11,14 @@
 	Database, DatabaseOptionsTrait, Drivers\MySQLiDrv
 };
 use chillerlan\HTTP\{
-	HTTPClientAbstract, HTTPResponseInterface, TinyCurlClient
+	HTTPClientAbstract, HTTPResponseInterface, CurlClient
 };
 use chillerlan\Logger\{
 	Log, LogOptionsTrait, Output\ConsoleLog
 };
 use chillerlan\OAuth\{
 	OAuthOptions, Storage\SessionStorage
 };
-use chillerlan\TinyCurl\Request;
 use chillerlan\Traits\{
 	ContainerInterface, DotEnv
 };
@@ -78,7 +77,7 @@
 
 	public function __construct(ContainerInterface $options){
 		parent::__construct($options);
-		$this->client = new TinyCurlClient($this->options, new Request($this->options));
+		$this->client = new CurlClient($this->options);
 	}
 
 	protected function getResponse():HTTPResponseInterface{

phpunit.xml

@@ -15,10 +15,6 @@
 	<testsuites>
 		<testsuite name="php-oauth-core test suite">
 			<directory suffix=".php">./tests</directory>
-			<!--
-			<exclude>./tests/API</exclude>
-			<exclude>./tests/Providers</exclude>
-			-->
 		</testsuite>
 	</testsuites>
 	<filter>

tests/Core/APITestAbstract.php

@@ -13,13 +13,12 @@
 namespace chillerlan\OAuthTest\Core;
 
 use chillerlan\HTTP\{
-	HTTPClientAbstract, HTTPClientInterface, HTTPResponseInterface, TinyCurlClient
+	HTTPClientAbstract, HTTPClientInterface, HTTPResponseInterface, CurlClient
 };
 use chillerlan\OAuth\{
 	Core\AccessToken, Core\OAuthInterface, OAuthOptions, Storage\MemoryStorage, Storage\OAuthStorageInterface
 };
 use chillerlan\OAuthTest\OAuthTestAbstract;
-use chillerlan\TinyCurl\Request;
 use chillerlan\Traits\ContainerInterface;
 use Psr\Log\LoggerInterface;
 
@@ -117,7 +116,7 @@ protected function initHttp(ContainerInterface $options):HTTPClientInterface{
 
 			public function __construct(ContainerInterface $options){
 				parent::__construct($options);
-				$this->client = new TinyCurlClient($this->options, new Request($this->options));
+				$this->client = new CurlClient($this->options);
 			}
 
 			protected function getResponse():HTTPResponseInterface{