Merge pull request #410 from clue-labs/default-loop

Simplify usage by supporting new default loop
reactphp · Jul 11, 2021 · f37c964 · f37c964
2 parents bc53727 + d9401a5
commit f37c964
Show file tree

Hide file tree

Showing 38 changed files with 240 additions and 329 deletions.
diff --git a/README.md b/README.md
diff --git a/composer.json b/composer.json
@@ -29,11 +29,11 @@
         "php": ">=5.3.0",
         "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
         "psr/http-message": "^1.0",
-        "react/event-loop": "^1.0 || ^0.5",
+        "react/event-loop": "^1.2",
         "react/promise": "^2.3 || ^1.2.1",
         "react/promise-stream": "^1.1",
-        "react/socket": "^1.6",
-        "react/stream": "^1.1",
+        "react/socket": "^1.8",
+        "react/stream": "^1.2",
         "ringcentral/psr7": "^1.2"
     },
     "require-dev": {

diff --git a/examples/01-client-get-request.php b/examples/01-client-get-request.php
@@ -5,11 +5,8 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$loop = React\EventLoop\Factory::create();
-$client = new Browser($loop);
+$client = new Browser();
 
 $client->get('http://google.com/')->then(function (ResponseInterface $response) {
     var_dump($response->getHeaders(), (string)$response->getBody());
 });
-
-$loop->run();
diff --git a/examples/02-client-concurrent-requests.php b/examples/02-client-concurrent-requests.php
@@ -5,8 +5,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$loop = React\EventLoop\Factory::create();
-$client = new Browser($loop);
+$client = new Browser();
 
 $client->head('http://www.github.com/clue/http-react')->then(function (ResponseInterface $response) {
     var_dump($response->getHeaders(), (string)$response->getBody());
@@ -19,5 +18,3 @@
 $client->get('http://www.lueck.tv/psocksd')->then(function (ResponseInterface $response) {
     var_dump($response->getHeaders(), (string)$response->getBody());
 });
-
-$loop->run();
diff --git a/examples/03-client-request-any.php b/examples/03-client-request-any.php
@@ -8,8 +8,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$loop = React\EventLoop\Factory::create();
-$client = new Browser($loop);
+$client = new Browser();
 
 $promises = array(
     $client->head('http://www.github.com/clue/http-react'),
@@ -28,5 +27,3 @@
     var_dump($response->getHeaders());
     echo PHP_EOL . $response->getBody();
 });
-
-$loop->run();
diff --git a/examples/04-client-post-json.php b/examples/04-client-post-json.php
@@ -5,8 +5,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$loop = React\EventLoop\Factory::create();
-$client = new Browser($loop);
+$client = new Browser();
 
 $data = array(
     'name' => array(
@@ -25,5 +24,3 @@
 )->then(function (ResponseInterface $response) {
     echo (string)$response->getBody();
 }, 'printf');
-
-$loop->run();
diff --git a/examples/05-client-put-xml.php b/examples/05-client-put-xml.php
@@ -5,8 +5,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$loop = React\EventLoop\Factory::create();
-$client = new Browser($loop);
+$client = new Browser();
 
 $xml = new SimpleXMLElement('<users></users>');
 $child = $xml->addChild('user');
@@ -22,5 +21,3 @@
 )->then(function (ResponseInterface $response) {
     echo (string)$response->getBody();
 }, 'printf');
-
-$loop->run();
diff --git a/examples/11-client-http-connect-proxy.php b/examples/11-client-http-connect-proxy.php
@@ -6,29 +6,24 @@
 // $ php examples/72-server-http-connect-proxy.php 8080
 // $ php examples/11-client-http-connect-proxy.php
 
-use React\Http\Browser;
 use Clue\React\HttpProxy\ProxyConnector as HttpConnectClient;
 use Psr\Http\Message\ResponseInterface;
-use React\EventLoop\Factory as LoopFactory;
+use React\Http\Browser;
 use React\Socket\Connector;
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$loop = LoopFactory::create();
-
 // create a new HTTP CONNECT proxy client which connects to a HTTP CONNECT proxy server listening on localhost:8080
-$proxy = new HttpConnectClient('127.0.0.1:8080', new Connector($loop));
+$proxy = new HttpConnectClient('127.0.0.1:8080', new Connector());
 
 // create a Browser object that uses the HTTP CONNECT proxy client for connections
-$connector = new Connector($loop, array(
+$connector = new Connector(null, array(
     'tcp' => $proxy,
     'dns' => false
 ));
-$browser = new Browser($loop, $connector);
+$browser = new Browser(null, $connector);
 
 // demo fetching HTTP headers (or bail out otherwise)
 $browser->get('https://www.google.com/')->then(function (ResponseInterface $response) {
     echo RingCentral\Psr7\str($response);
 }, 'printf');
-
-$loop->run();
diff --git a/examples/12-client-socks-proxy.php b/examples/12-client-socks-proxy.php
@@ -3,29 +3,24 @@
 // not already running a SOCKS proxy server?
 // Try LeProxy.org or this: `ssh -D 1080 localhost`
 
-use React\Http\Browser;
 use Clue\React\Socks\Client as SocksClient;
 use Psr\Http\Message\ResponseInterface;
-use React\EventLoop\Factory as LoopFactory;
+use React\Http\Browser;
 use React\Socket\Connector;
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$loop = LoopFactory::create();
-
 // create a new SOCKS proxy client which connects to a SOCKS proxy server listening on localhost:1080
-$proxy = new SocksClient('127.0.0.1:1080', new Connector($loop));
+$proxy = new SocksClient('127.0.0.1:1080', new Connector());
 
 // create a Browser object that uses the SOCKS proxy client for connections
-$connector = new Connector($loop, array(
+$connector = new Connector(null, array(
     'tcp' => $proxy,
     'dns' => false
 ));
-$browser = new Browser($loop, $connector);
+$browser = new Browser(null, $connector);
 
 // demo fetching HTTP headers (or bail out otherwise)
 $browser->get('https://www.google.com/')->then(function (ResponseInterface $response) {
     echo RingCentral\Psr7\str($response);
 }, 'printf');
-
-$loop->run();
diff --git a/examples/13-client-ssh-proxy.php b/examples/13-client-ssh-proxy.php
@@ -1,29 +1,25 @@
 <?php
 
-use React\Http\Browser;
 use Clue\React\SshProxy\SshSocksConnector;
 use Psr\Http\Message\ResponseInterface;
-use React\EventLoop\Factory as LoopFactory;
+use React\EventLoop\Loop;
+use React\Http\Browser;
 use React\Socket\Connector;
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$loop = LoopFactory::create();
-
 // create a new SSH proxy client which connects to a SSH server listening on localhost:22
 // You can pass any SSH server address as first argument, e.g. user@example.com
-$proxy = new SshSocksConnector(isset($argv[1]) ? $argv[1] : 'localhost:22', $loop);
+$proxy = new SshSocksConnector(isset($argv[1]) ? $argv[1] : 'localhost:22', Loop::get());
 
 // create a Browser object that uses the SSH proxy client for connections
-$connector = new Connector($loop, array(
+$connector = new Connector(null, array(
     'tcp' => $proxy,
     'dns' => false
 ));
-$browser = new Browser($loop, $connector);
+$browser = new Browser(null, $connector);
 
 // demo fetching HTTP headers (or bail out otherwise)
 $browser->get('https://www.google.com/')->then(function (ResponseInterface $response) {
     echo RingCentral\Psr7\str($response);
 }, 'printf');
-
-$loop->run();
diff --git a/examples/14-client-unix-domain-sockets.php b/examples/14-client-unix-domain-sockets.php
@@ -1,27 +1,22 @@
 <?php
 
-use React\Http\Browser;
 use Psr\Http\Message\ResponseInterface;
-use React\EventLoop\Factory as LoopFactory;
+use React\Http\Browser;
 use React\Socket\FixedUriConnector;
 use React\Socket\UnixConnector;
 use RingCentral\Psr7;
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$loop = LoopFactory::create();
-
 // create a Browser object that uses the a Unix Domain Sockets (UDS) path for all requests
 $connector = new FixedUriConnector(
     'unix:///var/run/docker.sock',
-    new UnixConnector($loop)
+    new UnixConnector()
 );
 
-$browser = new Browser($loop, $connector);
+$browser = new Browser(null, $connector);
 
 // demo fetching HTTP headers (or bail out otherwise)
 $browser->get('http://localhost/info')->then(function (ResponseInterface $response) {
     echo Psr7\str($response);
 }, 'printf');
-
-$loop->run();
diff --git a/examples/21-client-request-streaming-to-stdout.php b/examples/21-client-request-streaming-to-stdout.php
@@ -13,11 +13,10 @@
     exit(1);
 }
 
-$loop = React\EventLoop\Factory::create();
-$client = new Browser($loop);
+$client = new Browser();
 
-$out = new WritableResourceStream(STDOUT, $loop);
-$info = new WritableResourceStream(STDERR, $loop);
+$out = new WritableResourceStream(STDOUT);
+$info = new WritableResourceStream(STDERR);
 
 $url = isset($argv[1]) ? $argv[1] : 'http://google.com/';
 $info->write('Requesting ' . $url . '…' . PHP_EOL);
@@ -29,5 +28,3 @@
     assert($body instanceof ReadableStreamInterface);
     $body->pipe($out);
 }, 'printf');
-
-$loop->run();
diff --git a/examples/22-client-stream-upload-from-stdin.php b/examples/22-client-stream-upload-from-stdin.php
@@ -1,7 +1,7 @@
 <?php
 
-use React\Http\Browser;
 use Psr\Http\Message\ResponseInterface;
+use React\Http\Browser;
 use React\Stream\ReadableResourceStream;
 use RingCentral\Psr7;
 
@@ -12,16 +12,13 @@
     exit(1);
 }
 
-$loop = React\EventLoop\Factory::create();
-$client = new Browser($loop);
+$client = new Browser();
 
-$in = new ReadableResourceStream(STDIN, $loop);
+$in = new ReadableResourceStream(STDIN);
 
 $url = isset($argv[1]) ? $argv[1] : 'https://httpbin.org/post';
 echo 'Sending STDIN as POST to ' . $url . '…' . PHP_EOL;
 
 $client->post($url, array(), $in)->then(function (ResponseInterface $response) {
     echo 'Received' . PHP_EOL . Psr7\str($response);
 }, 'printf');
-
-$loop->run();
diff --git a/examples/51-server-hello-world.php b/examples/51-server-hello-world.php
@@ -1,15 +1,12 @@
 <?php
 
 use Psr\Http\Message\ServerRequestInterface;
-use React\EventLoop\Factory;
 use React\Http\Message\Response;
 use React\Http\Server;
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$loop = Factory::create();
-
-$server = new Server($loop, function (ServerRequestInterface $request) {
+$server = new Server(function (ServerRequestInterface $request) {
     return new Response(
         200,
         array(
@@ -19,9 +16,7 @@
     );
 });
 
-$socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0', $loop);
+$socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
 $server->listen($socket);
 
 echo 'Listening on ' . str_replace('tcp:', 'http:', $socket->getAddress()) . PHP_EOL;
-
-$loop->run();
diff --git a/examples/52-server-count-visitors.php b/examples/52-server-count-visitors.php
@@ -1,16 +1,13 @@
 <?php
 
 use Psr\Http\Message\ServerRequestInterface;
-use React\EventLoop\Factory;
 use React\Http\Message\Response;
 use React\Http\Server;
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$loop = Factory::create();
-
 $counter = 0;
-$server = new Server($loop, function (ServerRequestInterface $request) use (&$counter) {
+$server = new Server(function (ServerRequestInterface $request) use (&$counter) {
     return new Response(
         200,
         array(
@@ -20,9 +17,7 @@
     );
 });
 
-$socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0', $loop);
+$socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
 $server->listen($socket);
 
 echo 'Listening on ' . str_replace('tcp:', 'http:', $socket->getAddress()) . PHP_EOL;
-
-$loop->run();
diff --git a/examples/53-server-whatsmyip.php b/examples/53-server-whatsmyip.php
@@ -1,15 +1,12 @@
 <?php
 
 use Psr\Http\Message\ServerRequestInterface;
-use React\EventLoop\Factory;
 use React\Http\Message\Response;
 use React\Http\Server;
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$loop = Factory::create();
-
-$server = new Server($loop, function (ServerRequestInterface $request) {
+$server = new Server(function (ServerRequestInterface $request) {
     $body = "Your IP is: " . $request->getServerParams()['REMOTE_ADDR'];
 
     return new Response(
@@ -21,9 +18,7 @@
     );
 });
 
-$socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0', $loop);
+$socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
 $server->listen($socket);
 
 echo 'Listening on ' . str_replace('tcp:', 'http:', $socket->getAddress()) . PHP_EOL;
-
-$loop->run();
diff --git a/examples/54-server-query-parameter.php b/examples/54-server-query-parameter.php
@@ -1,15 +1,12 @@
 <?php
 
 use Psr\Http\Message\ServerRequestInterface;
-use React\EventLoop\Factory;
 use React\Http\Message\Response;
 use React\Http\Server;
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$loop = Factory::create();
-
-$server = new Server($loop, function (ServerRequestInterface $request) {
+$server = new Server(function (ServerRequestInterface $request) {
     $queryParams = $request->getQueryParams();
 
     $body = 'The query parameter "foo" is not set. Click the following link ';
@@ -28,9 +25,7 @@
     );
 });
 
-$socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0', $loop);
+$socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0');
 $server->listen($socket);
 
 echo 'Listening on ' . str_replace('tcp:', 'http:', $socket->getAddress()) . PHP_EOL;
-
-$loop->run();