Add static Loop methods

README.md

@@ -14,6 +14,7 @@ single [`run()`](#run) call that is controlled by the user.
 * [Quickstart example](#quickstart-example)
 * [Usage](#usage)
   * [Loop](#loop)
+    * [Loop methods](#loop-methods)
     * [get()](#get)
   * [Factory](#factory)
     * [create()](#create)
@@ -52,88 +53,215 @@ use React\EventLoop\Loop;
 $server = stream_socket_server('tcp://127.0.0.1:8080');
 stream_set_blocking($server, false);
 
-Loop::get()->addReadStream($server, function ($server) {
+Loop::addReadStream($server, function ($server) {
     $conn = stream_socket_accept($server);
     $data = "HTTP/1.1 200 OK\r\nContent-Length: 3\r\n\r\nHi\n";
-    Loop::get()->addWriteStream($conn, function ($conn) use (&$data) {
+    Loop::addWriteStream($conn, function ($conn) use (&$data) {
         $written = fwrite($conn, $data);
         if ($written === strlen($data)) {
             fclose($conn);
-            Loop::get()->removeWriteStream($conn);
+            Loop::removeWriteStream($conn);
         } else {
             $data = substr($data, $written);
         }
     });
 });
 
-Loop::get()->addPeriodicTimer(5, function () {
+Loop::addPeriodicTimer(5, function () {
     $memory = memory_get_usage() / 1024;
     $formatted = number_format($memory, 3).'K';
     echo "Current memory usage: {$formatted}\n";
 });
 
-Loop::get()->run();
+Loop::run();
 ```
 
 See also the [examples](examples).
 
 ## Usage
 
-Typical applications use a single event loop which is created at the beginning
-and run at the end of the program.
+As of `v1.2.0`, typical applications would use the [`Loop` object](#loop)
+to use the currently active event loop instance like this:
 
 ```php
-// [1]
-$loop = React\EventLoop\Factory::create();
+use React\EventLoop\Loop;
 
-// [2]
-$loop->addPeriodicTimer(1, function () {
-    echo "Tick\n";
+$timer = Loop::addPeriodicTimer(0.1, function () {
+    echo "Tick" . PHP_EOL;
+});
+Loop::addTimer(1.0, function () use ($timer) {
+    Loop::cancelTimer($timer);
+    echo 'Done' . PHP_EOL;
 });
 
-$stream = new React\Stream\ReadableResourceStream(
-    fopen('file.txt', 'r'),
-    $loop
-);
+Loop::run();
+```
+
+As an alternative, you can also explicitly create an event loop instance at the
+beginning, reuse it throughout your program and finally run it at the end of the
+program like this:
+
+```php
+$loop = React\EventLoop\Loop::get(); // or deprecated React\EventLoop\Factory::create();
+
+$timer = $loop->addPeriodicTimer(0.1, function () {
+    echo "Tick" . PHP_EOL;
+});
+$loop->addTimer(1.0, function () use ($loop, $timer) {
+    $loop->cancelTimer($timer);
+    echo 'Done' . PHP_EOL;
+});
 
-// [3]
 $loop->run();
 ```
 
-1. The loop instance is created at the beginning of the program. A convenience
-   factory [`React\EventLoop\Factory::create()`](#create) is provided by this library which
-   picks the best available [loop implementation](#loop-implementations).
-2. The loop instance is used directly or passed to library and application code.
-   In this example, a periodic timer is registered with the event loop which
-   simply outputs `Tick` every second and a
-   [readable stream](https://github.com/reactphp/stream#readableresourcestream)
-   is created by using ReactPHP's
-   [stream component](https://github.com/reactphp/stream) for demonstration
-   purposes.
-3. The loop is run with a single [`$loop->run()`](#run) call at the end of the program.
+While the former is more concise, the latter is more explicit.
+In both cases, the program would perform the exact same steps.
+
+1. The event loop instance is created at the beginning of the program. This is
+   implicitly done the first time you call the [`Loop` class](#loop) or
+   explicitly when using the deprecated [`Factory::create() method`](#create)
+   (or manually instantiating any of the [loop implementation](#loop-implementations)).
+2. The event loop is used directly or passed as an instance to library and
+   application code. In this example, a periodic timer is registered with the
+   event loop which simply outputs `Tick` every fraction of a second until another
+   timer stops the periodic timer after a second.
+3. The event loop is run at the end of the program with a single [`run()`](#run)
+   call at the end of the program.
+
+As of `v1.2.0`, we highly recommend using the [`Loop` class](#loop).
+The explicit loop instructions are still valid and may still be useful in some
+applications, especially for a transition period towards the more concise style.
 
 ### Loop
 
 The `Loop` class exists as a convenient global accessor for the event loop.
 
-#### get()
+#### Loop methods
 
-The `get(): LoopInterface` method is the preferred way to get and use the event loop. With 
-it there is no need to always pass the loop around anymore. 
+The `Loop` class provides all methods that exist on the [`LoopInterface`](#loopinterface)
+as static methods:
+
+* [run()](#run)
+* [stop()](#stop)
+* [addTimer()](#addtimer)
+* [addPeriodicTimer()](#addperiodictimer)
+* [cancelTimer()](#canceltimer)
+* [futureTick()](#futuretick)
+* [addSignal()](#addsignal)
+* [removeSignal()](#removesignal)
+* [addReadStream()](#addreadstream)
+* [addWriteStream()](#addwritestream)
+* [removeReadStream()](#removereadstream)
+* [removeWriteStream()](#removewritestream)
+
+If you're working with the event loop in your application code, it's often
+easiest to directly interface with the static methods defined on the `Loop` class
+like this:
 
 ```php
 use React\EventLoop\Loop;
 
-Loop::get()->addTimer(0.02, function () {
-    echo 'World!';
+$timer = Loop::addPeriodicTimer(0.1, function () {
+    echo 'tick!' . PHP_EOL;
 });
-Loop::get()->addTimer(0.01, function () {
-    echo 'Hello ';
+
+Loop::addTimer(1.0, function () use ($timer) {
+    Loop::cancelTimer($timer);
+    echo 'Done' . PHP_EOL;
 });
 
-Loop::get()->run();
+Loop::run();
 ```
 
+On the other hand, if you're familiar with object-oriented programming (OOP) and
+dependency injection (DI), you may want to inject an event loop instance and
+invoke instance methods on the `LoopInterface` like this:
+
+```php
+use React\EventLoop\Loop;
+use React\EventLoop\LoopInterface;
+
+class Greeter
+{
+    private $loop;
+
+    public function __construct(LoopInterface $loop)
+    {
+        $this->loop = $loop;
+    }
+
+    public function greet(string $name)
+    {
+        $this->loop->addTimer(1.0, function () use ($name) {
+            echo 'Hello ' . $name . '!' . PHP_EOL;
+        });
+    }
+}
+
+$greeter = new Greeter(Loop::get());
+$greeter->greet('Alice');
+$greeter->greet('Bob');
+
+Loop::run();
+```
+
+Each static method call will be forwarded as-is to the underlying event loop
+instance by using the [`Loop::get()`](#get) call internally.
+See [`LoopInterface`](#loopinterface) for more details about available methods.
+
+#### get()
+
+The `get(): LoopInterface` method can be used to
+get the currently active event loop instance.
+
+This method will always return the same event loop instance throughout the
+lifetime of your application.
+
+```php
+use React\EventLoop\Loop;
+use React\EventLoop\LoopInterface;
+
+$loop = Loop::get();
+
+assert($loop instanceof LoopInterface);
+assert($loop === Loop::get());
+```
+
+This is particularly useful if you're using object-oriented programming (OOP)
+and dependency injection (DI). In this case, you may want to inject an event
+loop instance and invoke instance methods on the `LoopInterface` like this:
+
+```php
+use React\EventLoop\Loop;
+use React\EventLoop\LoopInterface;
+
+class Greeter
+{
+    private $loop;
+
+    public function __construct(LoopInterface $loop)
+    {
+        $this->loop = $loop;
+    }
+
+    public function greet(string $name)
+    {
+        $this->loop->addTimer(1.0, function () use ($name) {
+            echo 'Hello ' . $name . '!' . PHP_EOL;
+        });
+    }
+}
+
+$greeter = new Greeter(Loop::get());
+$greeter->greet('Alice');
+$greeter->greet('Bob');
+
+Loop::run();
+```
+
+See [`LoopInterface`](#loopinterface) for more details about available methods.
+
 ### Factory
 
 The `Factory` class exists as a convenient way to pick the best available

examples/01-timers.php

@@ -4,12 +4,12 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-Loop::get()->addTimer(0.8, function () {
+Loop::addTimer(0.8, function () {
     echo 'world!' . PHP_EOL;
 });
 
-Loop::get()->addTimer(0.3, function () {
+Loop::addTimer(0.3, function () {
     echo 'hello ';
 });
 
-Loop::get()->run();
+Loop::run();

examples/02-periodic.php

@@ -4,13 +4,13 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$timer = Loop::get()->addPeriodicTimer(0.1, function () {
+$timer = Loop::addPeriodicTimer(0.1, function () {
     echo 'tick!' . PHP_EOL;
 });
 
-Loop::get()->addTimer(1.0, function () use ($timer) {
-    Loop::get()->cancelTimer($timer);
+Loop::addTimer(1.0, function () use ($timer) {
+    Loop::cancelTimer($timer);
     echo 'Done' . PHP_EOL;
 });
 
-Loop::get()->run();
+Loop::run();

examples/03-ticks.php

@@ -4,12 +4,12 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-Loop::get()->futureTick(function () {
+Loop::futureTick(function () {
     echo 'b';
 });
-Loop::get()->futureTick(function () {
+Loop::futureTick(function () {
     echo 'c';
 });
 echo 'a';
 
-Loop::get()->run();
+Loop::run();

examples/04-signals.php

@@ -9,11 +9,11 @@
     exit(1);
 }
 
-Loop::get()->addSignal(SIGINT, $func = function ($signal) use (&$func) {
+Loop::addSignal(SIGINT, $func = function ($signal) use (&$func) {
     echo 'Signal: ', (string)$signal, PHP_EOL;
-    Loop::get()->removeSignal(SIGINT, $func);
+    Loop::removeSignal(SIGINT, $func);
 });
 
 echo 'Listening for SIGINT. Use "kill -SIGINT ' . getmypid() . '" or CTRL+C' . PHP_EOL;
 
-Loop::get()->run();
+Loop::run();

examples/11-consume-stdin.php

@@ -11,12 +11,12 @@
 
 // read everything from STDIN and report number of bytes
 // for illustration purposes only, should use react/stream instead
-Loop::get()->addReadStream(STDIN, function ($stream) {
+Loop::addReadStream(STDIN, function ($stream) {
     $chunk = fread($stream, 64 * 1024);
 
     // reading nothing means we reached EOF
     if ($chunk === '') {
-        Loop::get()->removeReadStream($stream);
+        Loop::removeReadStream($stream);
         stream_set_blocking($stream, true);
         fclose($stream);
         return;
@@ -25,4 +25,4 @@
     echo strlen($chunk) . ' bytes' . PHP_EOL;
 });
 
-Loop::get()->run();
+Loop::run();

examples/12-generate-yes.php

@@ -17,13 +17,13 @@
 
 // write data to STDOUT whenever its write buffer accepts data
 // for illustrations purpose only, should use react/stream instead
-Loop::get()->addWriteStream(STDOUT, function ($stdout) use (&$data) {
+Loop::addWriteStream(STDOUT, function ($stdout) use (&$data) {
     // try to write data
     $r = fwrite($stdout, $data);
 
     // nothing could be written despite being writable => closed
     if ($r === 0) {
-        Loop::get()->removeWriteStream($stdout);
+        Loop::removeWriteStream($stdout);
         fclose($stdout);
         stream_set_blocking($stdout, true);
         fwrite(STDERR, 'Stopped because STDOUT closed' . PHP_EOL);
@@ -38,4 +38,4 @@
     }
 });
 
-Loop::get()->run();
+Loop::run();

examples/13-http-client-blocking.php

@@ -16,18 +16,18 @@
 fwrite($stream, "GET / HTTP/1.1\r\nHost: www.google.com\r\nConnection: close\r\n\r\n");
 
 // wait for HTTP response
-Loop::get()->addReadStream($stream, function ($stream) {
+Loop::addReadStream($stream, function ($stream) {
     $chunk = fread($stream, 64 * 1024);
 
     // reading nothing means we reached EOF
     if ($chunk === '') {
         echo '[END]' . PHP_EOL;
-        Loop::get()->removeReadStream($stream);
+        Loop::removeReadStream($stream);
         fclose($stream);
         return;
     }
 
     echo $chunk;
 });
 
-Loop::get()->run();
+Loop::run();