Merge pull request #9 from clue/nohttp

Remove HTTP support and link to clue/buzz-react instead

Author: clue

README.md

@@ -48,22 +48,12 @@ $tcp->create('www.google.com',80)->then(function (React\Stream\Stream $stream) {
 
 ### HTTP requests
 
-Or if all you want to do is HTTP requests, `Socks/Client` provides an even simpler [HTTP client](https://github.com/reactphp/http-client) interface:
-```PHP
-$httpclient = $client->createHttpClient();
-
-$request = $httpclient->request('GET', 'https://www.google.com/', array('user-agent'=>'Custom/1.0'));
-$request->on('response', function (React\HttpClient\Response $response) {
-    var_dump('Headers received:', $response->getHeaders());
-    
-    // dump whole response body
-    $response->on('data', function ($data) {
-        echo $data;
-    });
-});
-$request->end();
-```
-Yes, this works for both plain HTTP and SSL encrypted HTTPS requests.
+HTTP operates on a higher layer than this low-level SOCKS implementation.
+If you want to issue HTTP requests, you can add a dependency for
+[clue/buzz-react](https://github.com/clue/php-buzz-react).
+It can interact with this library by issuing all
+[http requests through a SOCKS server](https://github.com/clue/php-buzz-react/#via-socks-server).
+This works for both plain HTTP and SSL encrypted HTTPS requests.
 
 ### SSL/TLS encrypted
 

composer.json

@@ -15,7 +15,6 @@
     },
     "require": {
         "php": ">=5.3",
-        "react/http-client": "0.3.*",
         "react/event-loop": "0.3.*",
         "react/socket-client": "0.3.*",
         "react/socket": "0.3.*",

composer.lock

@@ -2,8 +2,6 @@
 
 use ConnectionManager\SecureConnectionManager;
 use React\Promise\PromiseInterface;
-use React\HttpClient\Client as HttpClient;
-use React\HttpClient\Response;
 use React\Stream\Stream;
 
 include_once __DIR__.'/../vendor/autoload.php';
@@ -86,20 +84,6 @@ function (Exception $error) use ($name) {
 //     });
 // });
 
-// $factory = new React\HttpClient\Factory();
-// $httpclient = $factory->create($loop, $dns);
-$httpclient = $client->createHttpClient();
-
-$request = $httpclient->request('GET', 'https://www.google.com/', array('user-agent'=>'none'));
-$request->on('response', function (Response $response) {
-    echo '[response1]' . PHP_EOL;
-    //var_dump($response->getHeaders());
-    $response->on('data', function ($data) {
-        echo $data;
-    });
-});
-$request->end();
-
 $loop->addTimer(8, function() use ($loop) {
     $loop->stop();
     echo 'STOP - stopping mainloop after 8 seconds' . PHP_EOL;

examples/client.php

@@ -4,7 +4,6 @@
 
 use React\Promise\When;
 use React\Promise\Deferred;
-use React\HttpClient\Client as HttpClient;
 use React\Dns\Resolver\Resolver;
 use React\Stream\Stream;
 use React\EventLoop\LoopInterface;
@@ -109,11 +108,6 @@ public function unsetAuth()
         $this->auth = null;
     }
 
-    public function createHttpClient()
-    {
-        return new HttpClient($this->loop, $this->createConnector(), $this->createSecureConnector());
-    }
-
     public function createSecureConnector()
     {
         return new SecureConnector($this->createConnector(), $this->loop);

src/Client.php

@@ -120,11 +120,6 @@ public function testSetTimeout()
         $this->client->setTimeout(3);
     }
 
-    public function testCreateHttpClient()
-    {
-        $this->assertInstanceOf('\React\HttpClient\Client', $this->client->createHttpClient());
-    }
-
     public function testCreateConnector()
     {
         $this->assertInstanceOf('\React\SocketClient\ConnectorInterface', $this->client->createConnector());

tests/ClientApiTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use Clue\React\Socks\Factory;
+use React\Stream\Stream;
 
 class PairTest extends TestCase
 {
@@ -17,7 +18,7 @@ public function setUp()
         $this->factory = new Factory($this->loop, $dns);
     }
 
-    public function testClientHttpRequest()
+    public function testClientConnection()
     {
         $socket = $this->createSocketServer();
         $port = $socket->getPort();
@@ -32,21 +33,15 @@ public function testClientHttpRequest()
 
         $client = $this->factory->createClient('127.0.0.1', $port);
 
-        $http = $client->createHttpClient();
-
-        $request = $http->request('GET', 'https://www.google.com/', array('user-agent'=>'none'));
-        $request->on('response', function (React\HttpClient\Response $response) {
-            // response received, do not care for the rest of the response body
-            $response->close();
-        });
-        $request->end();
-
-//         $loop = $this->loop;
-//         $that = $this;
-//         $this->loop->addTimer(1.0, function() use ($that, $loop) {
-//             $that->fail('timeout timer');
-//             $loop->stop();
-//         });
+        $that = $this;
+        $client->getConnection('www.google.com', 80)->then(
+            function (Stream $stream) {
+                $stream->close();
+            },
+            function ($error) use ($that) {
+                $that->fail('Unable to connect');
+            }
+        );
 
         $this->loop->run();
     }