Update react/http-client to v0.5, support react/stream v0.6 and react/socket-client v0.7 and drop legacy PHP 5.3 support

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-# - 5.3 # requires old distro, see below
   - 5.4
   - 5.5
   - 5.6
@@ -12,9 +11,6 @@ php:
 dist: trusty
 
 matrix:
-  include:
-    - php: 5.3
-      dist: precise
   allow_failures:
     - php: hhvm
 

README.md

@@ -315,10 +315,6 @@ $request = $request->withProtocolVersion(1.1);
 $browser->send($request)->then(…);
 ```
 
-> Legacy compatibility: Note that the custom HTTP protocol version will be
-ignored for legacy versions (PHP 5.3) because the underlying `http-client`
-v0.3 API does not support this parameter.
-
 #### withOptions()
 
 The `withOptions(array $options)` method can be used to change the [options](#options) to use:
@@ -481,12 +477,6 @@ connector settings (DNS resolution, SSL/TLS parameters, timeouts etc.), you can
 explicitly pass a custom instance of the
 [legacy `ConnectorInterface`](https://github.com/reactphp/socket-client#connectorinterface).
 
-The below examples assume you've installed the latest legacy SocketClient version:
-
-```bash
-$ composer require react/socket-client:^0.5
-```
-
 You can optionally pass additional
 [socket context options](http://php.net/manual/en/context.socket.php)
 to the constructor like this:
@@ -583,7 +573,7 @@ $ composer require clue/buzz-react:^1.1.1
 See also the [CHANGELOG](CHANGELOG.md) for details about version upgrades.
 
 This project aims to run on any platform and thus does not require any PHP
-extensions and supports running on legacy PHP 5.3 through current PHP 7+ and
+extensions and supports running on legacy PHP 5.4 through current PHP 7+ and
 HHVM.
 It's *highly recommended to use PHP 7+* for this project.
 

composer.json

@@ -14,14 +14,13 @@
         "psr-4": { "Clue\\React\\Buzz\\": "src/" }
     },
     "require": {
-    	"php": ">=5.3",
+    	"php": ">=5.4",
         "react/event-loop": "^0.4 || ^0.3",
-        "react/http-client": "^0.5 || ^0.4 || ^0.3",
-        "react/socket": "^0.8",
-        "react/socket-client": "^0.5 || ^0.4.5",
-        "react/dns": "^0.4.1 || ^0.3",
+        "react/http-client": "^0.5",
         "react/promise": "^2 || ^1.1",
-        "react/stream": "^0.4 || ^0.3.1",
+        "react/socket": "^0.8",
+        "react/socket-client": "^0.7 || ^0.6",
+        "react/stream": "^0.6 || ^0.5 || ^0.4.6",
         "psr/http-message": "^1.0",
         "ringcentral/psr7": "^1.2"
     },

examples/21-stream-forwarding.php

@@ -1,9 +1,8 @@
 <?php
 
 use Clue\React\Buzz\Browser;
-use React\Stream\ReadableStreamInterface;
 use Psr\Http\Message\ResponseInterface;
-use React\Stream\Stream;
+use React\Stream\WritableResourceStream;
 use RingCentral\Psr7;
 
 $url = isset($argv[1]) ? $argv[1] : 'http://google.com/';
@@ -13,11 +12,8 @@
 $loop = React\EventLoop\Factory::create();
 $client = new Browser($loop);
 
-$out = new Stream(STDOUT, $loop);
-$out->pause();
-
-$info = new Stream(STDERR, $loop);
-$info->pause();
+$out = new WritableResourceStream(STDOUT, $loop);
+$info = new WritableResourceStream(STDERR, $loop);
 
 $info->write('Requesting ' . $url . '…' . PHP_EOL);
 

examples/22-stream-stdin.php

@@ -1,9 +1,8 @@
 <?php
 
 use Clue\React\Buzz\Browser;
-use React\Stream\ReadableStreamInterface;
 use Psr\Http\Message\ResponseInterface;
-use React\Stream\Stream;
+use React\Stream\ReadableResourceStream;
 use RingCentral\Psr7;
 
 $url = isset($argv[1]) ? $argv[1] : 'https://httpbin.org/post';
@@ -13,7 +12,7 @@
 $loop = React\EventLoop\Factory::create();
 $client = new Browser($loop);
 
-$in = new Stream(STDIN, $loop);
+$in = new ReadableResourceStream(STDIN, $loop);
 
 echo 'Sending STDIN as POST to ' . $url . '…' . PHP_EOL;
 

src/Io/ConnectionUpcaster.php

@@ -9,7 +9,7 @@
 use React\Stream\Util;
 
 /**
- * Adapter to upcast a legacy SocketClient:v0.5 Connector result to a new Socket:v0.8 ConnectionInterface
+ * Adapter to upcast a legacy SocketClient-Connector result to a new Socket-ConnectionInterface
  *
  * @internal
  */

src/Io/ConnectorUpcaster.php

@@ -4,30 +4,25 @@
 
 use React\Socket\ConnectorInterface;
 use React\SocketClient\ConnectorInterface as LegacyConnectorInterface;
-use React\Stream\Stream;
+use React\Stream\DuplexStreamInterface;
 
 /**
- * Adapter to upcast a legacy SocketClient:v0.5 Connector to a new Socket:v0.8 Connector
+ * Adapter to upcast a legacy SocketClient:v0.7/v0.6 Connector to a new Socket:v0.8 Connector
  *
  * @internal
  */
 class ConnectorUpcaster implements ConnectorInterface
 {
     private $legacy;
 
-    public function __construct(LegacyConnectorInterface$connector)
+    public function __construct(LegacyConnectorInterface $connector)
     {
         $this->legacy = $connector;
     }
 
     public function connect($uri)
     {
-        $parts = parse_url((strpos($uri, '://') === false ? 'tcp://' : '') . $uri);
-        if (!$parts || !isset($parts['host'], $parts['port'])) {
-            return \React\Promise\reject(new \InvalidArgumentException('Unable to parse URI'));
-        }
-
-        return $this->legacy->create($parts['host'], $parts['port'])->then(function (Stream $stream) {
+        return $this->legacy->connect($uri)->then(function (DuplexStreamInterface $stream) {
             return new ConnectionUpcaster($stream);
         });
     }

src/Io/FixedUriConnector.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Clue\React\Buzz\Io;
+
+use React\Socket\ConnectorInterface;
+
+/** @internal */
+class FixedUriConnector implements ConnectorInterface
+{
+    private $uri;
+    private $connector;
+
+    public function __construct($uri, ConnectorInterface $connector)
+    {
+        $this->uri = $uri;
+        $this->connector = $connector;
+    }
+
+    public function connect($_)
+    {
+        return $this->connector->connect($this->uri);
+    }
+}

src/Io/Sender.php

@@ -2,22 +2,20 @@
 
 namespace Clue\React\Buzz\Io;
 
-use React\HttpClient\Client as HttpClient;
+use Clue\React\Buzz\Message\MessageFactory;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
+use React\EventLoop\LoopInterface;
+use React\HttpClient\Client as HttpClient;
 use React\HttpClient\Request as RequestStream;
 use React\HttpClient\Response as ResponseStream;
+use React\Promise;
 use React\Promise\Deferred;
-use React\EventLoop\LoopInterface;
-use React\Dns\Resolver\Factory as ResolverFactory;
 use React\Socket\Connector;
-use React\SocketClient\Connector as LegacyConnector;
 use React\SocketClient\SecureConnector;
 use React\SocketClient\ConnectorInterface as LegacyConnectorInterface;
-use React\Dns\Resolver\Resolver;
-use React\Promise;
-use Clue\React\Buzz\Message\MessageFactory;
 use React\Stream\ReadableStreamInterface;
+use React\Socket\UnixConnector;
 
 class Sender
 {
@@ -41,36 +39,23 @@ class Sender
      */
     public static function createFromLoop(LoopInterface $loop)
     {
-        $ref = new \ReflectionClass('React\HttpClient\Client');
-        $num = $ref->getConstructor()->getNumberOfRequiredParameters();
-        if ($num === 1) {
-            // react/http 0.5
-            return new self(new HttpClient($loop));
-        }
-
-        // react/http 0.4/0.3
-        return self::createFromLoopDns($loop, '8.8.8.8');
+        return new self(new HttpClient($loop));
     }
 
     /**
      * [deprecated] create sender attached to the given event loop and DNS resolver
      *
      * @param LoopInterface   $loop
-     * @param Resolver|string $dns  DNS resolver instance or IP address
+     * @param \React\Dns\Resolver\Resolver|string $dns  DNS resolver instance or IP address
      * @return self
      * @deprecated as of v1.2.0, see createFromLoop()
      * @see self::createFromLoop()
      */
     public static function createFromLoopDns(LoopInterface $loop, $dns)
     {
-        if (!($dns instanceof Resolver)) {
-            $dnsResolverFactory = new ResolverFactory();
-            $dns = $dnsResolverFactory->createCached($dns, $loop);
-        }
-
-        $connector = new LegacyConnector($loop, $dns);
-
-        return self::createFromLoopConnectors($loop, $connector);
+        return new self(new HttpClient($loop, new Connector($loop, array(
+            'dns' => $dns
+        ))));
     }
 
     /**
@@ -89,27 +74,13 @@ public static function createFromLoopConnectors(LoopInterface $loop, LegacyConne
             $secureConnector = new SecureConnector($connector, $loop);
         }
 
-        // create HttpClient for React 0.5/0.4/0.3 (code coverage will be achieved by testing versions with Travis)
-        // @codeCoverageIgnoreStart
-        $ref = new \ReflectionClass('React\HttpClient\Client');
-        $num = $ref->getConstructor()->getNumberOfRequiredParameters();
-        if ($num === 1) {
-            // react/http-client:0.5 only requires the loop, the connector is actually optional
-            // v0.5 requires the new Socket-Connector, so we upcast from the legacy SocketClient-Connectors here
-            $http = new HttpClient($loop, new Connector($loop, array(
-                'tcp' => new ConnectorUpcaster($connector),
-                'tls' => new ConnectorUpcaster($secureConnector),
-                'dns' => false
-            )));
-        } elseif ($num === 2) {
-            // react/http-client:0.4 removed the $loop parameter
-            $http = new HttpClient($connector, $secureConnector);
-        } else {
-            $http = new HttpClient($loop, $connector, $secureConnector);
-        }
-        // @codeCoverageIgnoreEnd
-
-        return new self($http);
+        // react/http v0.5 requires the new Socket-Connector, so we upcast from the legacy SocketClient-Connectors here
+        return new self(new HttpClient($loop, new Connector($loop, array(
+            'tcp' => new ConnectorUpcaster($connector),
+            'tls' => new ConnectorUpcaster($secureConnector),
+            'dns' => false,
+            'timeout' => false
+        ))));
     }
 
     /**
@@ -121,9 +92,15 @@ public static function createFromLoopConnectors(LoopInterface $loop, LegacyConne
      */
     public static function createFromLoopUnix(LoopInterface $loop, $path)
     {
-        $connector = new UnixConnector($loop, $path);
-
-        return self::createFromLoopConnectors($loop, $connector);
+        return new self(
+            new HttpClient(
+                $loop,
+                new FixedUriConnector(
+                    $path,
+                    new UnixConnector($loop)
+                )
+            )
+        );
     }
 
     private $http;

tests/FunctionalBrowserTest.php

@@ -183,6 +183,7 @@ public function testPostStreamChunked()
 
         $this->loop->addTimer(0.001, function () use ($stream) {
             $stream->emit('data', array('hello world'));
+            $stream->emit('end');
             $stream->close();
         });
 

tests/Io/FixedUriConnectorTest.php

@@ -0,0 +1,16 @@
+<?php
+
+use Clue\React\Buzz\Io\FixedUriConnector;
+
+class FixedUriConnectorTest extends PHPUnit_Framework_TestCase
+{
+    public function testWillInvokeGivenConnector()
+    {
+        $base = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();
+        $base->expects($this->once())->method('connect')->with('test')->willReturn('ret');
+
+        $connector = new FixedUriConnector('test', $base);
+
+        $this->assertEquals('ret', $connector->connect('ignored'));
+    }
+}