#12: Update namespace

Author: mekras

README.md

@@ -23,12 +23,12 @@ $ composer require php-http/curl-client
 ### Using [php-http/utils](https://packagist.org/packages/php-http/utils):
 
 ```php
+use Http\Client\Curl\Client;
 use Http\Client\Utils\MessageFactory\GuzzleMessageFactory;
 use Http\Client\Utils\StreamFactory\GuzzleStreamFactory;
-use Http\Curl\CurlHttpClient;
 
 $messageFactory = new GuzzleMessageFactory();
-$client = new CurlHttpClient($messageFactory, new GuzzleStreamFactory());
+$client = new Client($messageFactory, new GuzzleStreamFactory());
 
 $request = $messageFactory->createRequest('GET', 'http://example.com/');
 $response = $client->sendRequest($request);
@@ -37,31 +37,31 @@ $response = $client->sendRequest($request);
 ### Using [mekras/httplug-diactoros-bridge](https://packagist.org/packages/mekras/httplug-diactoros-bridge):
 
 ```php
-use Http\Curl\CurlHttpClient;
+use Http\Client\Curl\Client;
 use Mekras\HttplugDiactorosBridge\DiactorosMessageFactory;
 use Mekras\HttplugDiactorosBridge\DiactorosStreamFactory;
 
 $messageFactory = new DiactorosMessageFactory();
-$client = new CurlHttpClient($messageFactory, new DiactorosStreamFactory());
+$client = new Client($messageFactory, new DiactorosStreamFactory());
 
 $request = $messageFactory->createRequest('GET', 'http://example.com/');
 $response = $client->sendRequest($request);
 ```
 
 ### Configuring client
 
-You can use [cURL options](http://php.net/curl_setopt) to configure CurlHttpClient:
+You can use [cURL options](http://php.net/curl_setopt) to configure Client:
 
 ```php
+use Http\Client\Curl\Client;
 use Http\Client\Utils\MessageFactory\GuzzleMessageFactory;
 use Http\Client\Utils\StreamFactory\GuzzleStreamFactory;
-use Http\Curl\CurlHttpClient;
 
 $options = [
     CURLOPT_CONNECTTIMEOUT => 10, // The number of seconds to wait while trying to connect. 
     CURLOPT_SSL_VERIFYPEER => false // Stop cURL from verifying the peer's certificate
 ];
-$client = new CurlHttpClient(new GuzzleMessageFactory(), new GuzzleStreamFactory(), $options);
+$client = new Client(new GuzzleMessageFactory(), new GuzzleStreamFactory(), $options);
 ```
 
 These options can not ne used:
@@ -76,7 +76,7 @@ These options can not ne used:
 * CURLOPT_RETURNTRANSFER
 * CURLOPT_URL
 
-These options can be overwritten by CurlHttpClient:
+These options can be overwritten by Client:
 
 * CURLOPT_USERPWD
 

composer.json

@@ -26,12 +26,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Http\\Curl\\": "src/"
+            "Http\\Client\\Curl\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Http\\Curl\\Tests\\": "tests/"
+            "Http\\Client\\Curl\\Tests\\": "tests/"
         }
     },
     "provide": {

src/CurlHttpClient.php renamed to src/Client.php

@@ -1,5 +1,5 @@
 <?php
-namespace Http\Curl;
+namespace Http\Client\Curl;
 
 use Http\Client\Exception;
 use Http\Client\Exception\RequestException;
@@ -22,7 +22,7 @@
  * @api
  * @since   1.0
  */
-class CurlHttpClient implements HttpClient, HttpAsyncClient
+class Client implements HttpClient, HttpAsyncClient
 {
     /**
      * cURL options

src/CurlPromise.php

@@ -1,5 +1,5 @@
 <?php
-namespace Http\Curl;
+namespace Http\Client\Curl;
 
 use Http\Client\Exception;
 use Http\Promise\Promise;

src/MultiRunner.php

@@ -1,5 +1,5 @@
 <?php
-namespace Http\Curl;
+namespace Http\Client\Curl;
 
 use Http\Client\Exception\RequestException;
 

src/PromiseCore.php

@@ -1,5 +1,5 @@
 <?php
-namespace Http\Curl;
+namespace Http\Client\Curl;
 
 use Http\Client\Exception;
 use Http\Promise\Promise;

src/ResponseParser.php

@@ -1,7 +1,7 @@
 <?php
-namespace Http\Curl;
+namespace Http\Client\Curl;
 
-use Http\Curl\Tools\HeadersParser;
+use Http\Client\Curl\Tools\HeadersParser;
 use Http\Message\MessageFactory;
 use Http\Message\StreamFactory;
 use Psr\Http\Message\ResponseInterface;

src/Tools/HeadersParser.php

@@ -1,5 +1,5 @@
 <?php
-namespace Http\Curl\Tools;
+namespace Http\Client\Curl\Tools;
 
 use Psr\Http\Message\ResponseInterface;
 

tests/BaseUnitTestCase.php

@@ -1,7 +1,7 @@
 <?php
-namespace Http\Curl\Tests;
+namespace Http\Client\Curl\Tests;
 
-use Http\Curl\PromiseCore;
+use Http\Client\Curl\PromiseCore;
 use Http\Discovery\MessageFactoryDiscovery;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;

tests/CurlPromiseTest.php

@@ -1,10 +1,10 @@
 <?php
-namespace Http\Curl\Tests;
+namespace Http\Client\Curl\Tests;
 
+use Http\Client\Curl\CurlPromise;
+use Http\Client\Curl\MultiRunner;
 use Http\Client\Exception\TransferException;
 use Http\Promise\Promise;
-use Http\Curl\CurlPromise;
-use Http\Curl\MultiRunner;
 
 /**
  * Tests for Http\Curl\CurlPromise

tests/CurlHttpAsyncClientDiactorosTest.php renamed to tests/HttpAsyncClientDiactorosTest.php

@@ -1,23 +1,23 @@
 <?php
-namespace Http\Curl\Tests;
+namespace Http\Client\Curl\Tests;
 
+use Http\Client\Curl\Client;
 use Http\Client\HttpClient;
 use Http\Client\Utils\MessageFactory\DiactorosMessageFactory;
 use Http\Client\Utils\StreamFactory\DiactorosStreamFactory;
-use Http\Curl\CurlHttpClient;
 use Zend\Diactoros\Request;
 use Zend\Diactoros\Response;
 
 /**
- * Tests for Http\Curl\CurlHttpClient
+ * Tests for Http\Client\Curl\Client
  */
-class CurlHttpAsyncClientDiactorosTest extends CurlHttpAsyncClientTestCase
+class HttpAsyncClientDiactorosTest extends HttpAsyncClientTestCase
 {
     /**
      * @return HttpClient
      */
     protected function createHttpAsyncClient()
     {
-        return new CurlHttpClient(new DiactorosMessageFactory(), new DiactorosStreamFactory());
+        return new Client(new DiactorosMessageFactory(), new DiactorosStreamFactory());
     }
 }

tests/CurlHttpAsyncClientGuzzleTest.php renamed to tests/HttpAsyncClientGuzzleTest.php

@@ -1,21 +1,21 @@
 <?php
-namespace Http\Curl\Tests;
+namespace Http\Client\Curl\Tests;
 
+use Http\Client\Curl\Client;
 use Http\Client\HttpClient;
 use Http\Client\Utils\MessageFactory\GuzzleMessageFactory;
 use Http\Client\Utils\StreamFactory\GuzzleStreamFactory;
-use Http\Curl\CurlHttpClient;
 
 /**
- * Tests for Http\Curl\CurlHttpClient
+ * Tests for Http\Curl\Client
  */
-class CurlHttpAsyncClientGuzzleTest extends CurlHttpAsyncClientTestCase
+class HttpAsyncClientGuzzleTest extends HttpAsyncClientTestCase
 {
     /**
      * @return HttpClient
      */
     protected function createHttpAsyncClient()
     {
-        return new CurlHttpClient(new GuzzleMessageFactory(), new GuzzleStreamFactory());
+        return new Client(new GuzzleMessageFactory(), new GuzzleStreamFactory());
     }
 }

tests/CurlHttpAsyncClientTestCase.php renamed to tests/HttpAsyncClientTestCase.php

@@ -1,12 +1,12 @@
 <?php
-namespace Http\Curl\Tests;
+namespace Http\Client\Curl\Tests;
 
 use Http\Client\Tests\HttpAsyncClientTest;
 
 /**
  * Base class for async client integration tests
  */
-abstract class CurlHttpAsyncClientTestCase extends HttpAsyncClientTest
+abstract class HttpAsyncClientTestCase extends HttpAsyncClientTest
 {
     /**
      * @dataProvider requestProvider

tests/CurlHttpClientDiactorosTest.php renamed to tests/HttpClientDiactorosTest.php

@@ -1,23 +1,23 @@
 <?php
-namespace Http\Curl\Tests;
+namespace Http\Client\Curl\Tests;
 
+use Http\Client\Curl\Client;
 use Http\Client\HttpClient;
 use Http\Client\Utils\MessageFactory\DiactorosMessageFactory;
 use Http\Client\Utils\StreamFactory\DiactorosStreamFactory;
-use Http\Curl\CurlHttpClient;
 use Zend\Diactoros\Request;
 use Zend\Diactoros\Response;
 
 /**
- * Tests for Http\Curl\CurlHttpClient
+ * Tests for Http\Curl\Client
  */
-class CurlHttpClientDiactorosTest extends CurlHttpClientTestCase
+class HttpClientDiactorosTest extends HttpClientTestCase
 {
     /**
      * @return HttpClient
      */
     protected function createHttpAdapter()
     {
-        return new CurlHttpClient(new DiactorosMessageFactory(), new DiactorosStreamFactory());
+        return new Client(new DiactorosMessageFactory(), new DiactorosStreamFactory());
     }
 }

tests/CurlHttpClientGuzzleTest.php renamed to tests/HttpClientGuzzleTest.php

@@ -1,21 +1,21 @@
 <?php
-namespace Http\Curl\Tests;
+namespace Http\Client\Curl\Tests;
 
+use Http\Client\Curl\Client;
 use Http\Client\HttpClient;
 use Http\Client\Utils\MessageFactory\GuzzleMessageFactory;
 use Http\Client\Utils\StreamFactory\GuzzleStreamFactory;
-use Http\Curl\CurlHttpClient;
 
 /**
- * Tests for Http\Curl\CurlHttpClient
+ * Tests for Http\Curl\Client
  */
-class CurlHttpClientGuzzleTest extends CurlHttpClientTestCase
+class HttpClientGuzzleTest extends HttpClientTestCase
 {
     /**
      * @return HttpClient
      */
     protected function createHttpAdapter()
     {
-        return new CurlHttpClient(new GuzzleMessageFactory(), new GuzzleStreamFactory());
+        return new Client(new GuzzleMessageFactory(), new GuzzleStreamFactory());
     }
 }

tests/CurlHttpClientTestCase.php renamed to tests/HttpClientTestCase.php

@@ -1,12 +1,12 @@
 <?php
-namespace Http\Curl\Tests;
+namespace Http\Client\Curl\Tests;
 
 use Http\Client\Tests\HttpClientTest;
 
 /**
  * Base class for client integration tests
  */
-abstract class CurlHttpClientTestCase extends HttpClientTest
+abstract class HttpClientTestCase extends HttpClientTest
 {
     /**
      * @dataProvider requestProvider

tests/PromiseCoreTest.php

@@ -1,10 +1,10 @@
 <?php
-namespace Http\Curl\Tests;
+namespace Http\Client\Curl\Tests;
 
+use Http\Client\Curl\PromiseCore;
 use Http\Client\Exception;
 use Http\Client\Exception\RequestException;
 use Http\Promise\Promise;
-use Http\Curl\PromiseCore;
 use Psr\Http\Message\ResponseInterface;
 
 /**

tests/Tools/HeadersParserTest.php

@@ -1,7 +1,7 @@
 <?php
-namespace Http\Curl\Tests\Tools;
+namespace Http\Client\Curl\Tests\Tools;
 
-use Http\Curl\Tools\HeadersParser;
+use Http\Client\Curl\Tools\HeadersParser;
 use Http\Discovery\MessageFactoryDiscovery;
 
 /**