Remove event loop adapter from public API

Author: kelunik

README.md

@@ -14,24 +14,24 @@ composer require revolt/event-loop-adapter-react
 
 ## Usage
 
-Everywhere where a ReactPHP library requires an instance of `LoopInterface`, you just pass `ReactAdapter::get()` to run
-the ReactPHP library on the [Revolt event loop](https://revolt.run/).
+Everywhere where a ReactPHP library requires an instance of `LoopInterface`, you just pass `Loop::get()` as normal.
+We automatically set up everything to run the ReactPHP library on the [Revolt event loop](https://revolt.run/).
 
 ```php
 <?php
 
 require 'vendor/autoload.php';
 
+use React\EventLoop\Loop;
 use Revolt\EventLoop;
-use Revolt\EventLoop\Adapter\React\RevoltLoop;
 
 $app = function ($request, $response) {
     $response->writeHead(200, array('Content-Type' => 'text/plain'));
     $response->end("Hello World\n");
 };
 
-$socket = new React\Socket\Server(RevoltLoop::get());
-$http = new React\Http\Server($socket, RevoltLoop::get());
+$socket = new React\Socket\Server(Loop::get());
+$http = new React\Http\Server($socket, Loop::get());
 
 $http->on('request', $app);
 echo "Server running at http://127.0.0.1:1337\n";
@@ -40,10 +40,3 @@ $socket->listen(1337);
 
 EventLoop::run();
 ```
-
-You can also use the adapter to run ReactPHP apps on a specific [Revolt event loop](https://revolt.run/) implementation
-without relying on Revolt's global event loop.
-
-```php
-$loop = new Revolt\EventLoop\Adapter\React\RevoltLoop((new Revolt\EventLoop\DriverFactory)->create());
-```

etc/Factory.php

@@ -2,7 +2,7 @@
 
 namespace React\EventLoop;
 
-use Revolt\EventLoop\Adapter\React\RevoltLoop;
+use Revolt\EventLoop\Adapter\React\Internal\EventLoopAdapter;
 
 (static function () {
     $constName = 'REVOLT_ADAPTER_REACT_DISABLE_FACTORY_OVERRIDE';
@@ -23,7 +23,7 @@ public static function create(): LoopInterface
             {
                 throw new \Error(
                     __METHOD__ . '() has been overridden by revolt/event-loop-adapter-react to prevent you from accidentally creating two event loop instances. ' .
-                    'Use ' . RevoltLoop::class . '::get() instead of React\EventLoop\Factory::create() to ensure everything is running on the same event loop. ' .
+                    'Use ' . EventLoopAdapter::class . '::get() instead of React\EventLoop\Factory::create() to ensure everything is running on the same event loop. ' .
                     'You may set a constant or environment variable named REVOLT_ADAPTER_REACT_DISABLE_FACTORY_OVERRIDE to disable this protection or open an issue at https://github.com/revoltphp/event-loop-adapter-react if you\'re unsure on the right way forward.'
                 );
             }

src/RevoltLoop.php src/Internal/EventLoopAdapter.phpsrc/RevoltLoop.php renamed to src/Internal/EventLoopAdapter.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Revolt\EventLoop\Adapter\React;
+namespace Revolt\EventLoop\Adapter\React\Internal;
 
 use React\EventLoop\LoopInterface;
 use React\EventLoop\TimerInterface;
 use Revolt\EventLoop;
-use Revolt\EventLoop\Adapter\React\Internal\Timer;
 use Revolt\EventLoop\Driver;
 
-final class RevoltLoop implements LoopInterface
+/** @internal */
+final class EventLoopAdapter implements LoopInterface
 {
     private static \WeakMap $instances;
 

src/bootstrap.php

@@ -1,9 +1,9 @@
 <?php
 
 use React\EventLoop\Loop;
-use Revolt\EventLoop\Adapter\React\RevoltLoop;
+use Revolt\EventLoop\Adapter\React\Internal\EventLoopAdapter;
 
 /**
  * @psalm-suppress InternalMethod
  */
-Loop::set(RevoltLoop::get());
+Loop::set(EventLoopAdapter::get());

test/EvTest.php

@@ -4,6 +4,7 @@
 
 use React\EventLoop\LoopInterface;
 use Revolt\EventLoop;
+use Revolt\EventLoop\Adapter\React\Internal\EventLoopAdapter;
 
 class EvTest extends Test
 {
@@ -14,6 +15,6 @@ public function createLoop(): LoopInterface
         }
 
         EventLoop::setDriver(new EventLoop\Driver\EvDriver());
-        return RevoltLoop::get();
+        return EventLoopAdapter::get();
     }
 }

test/EvTimerTest.php

@@ -4,6 +4,7 @@
 
 use React\EventLoop\LoopInterface;
 use Revolt\EventLoop;
+use Revolt\EventLoop\Adapter\React\Internal\EventLoopAdapter;
 
 class EvTimerTest extends TimerTest
 {
@@ -14,6 +15,6 @@ public function createLoop(): LoopInterface
         }
 
         EventLoop::setDriver(new EventLoop\Driver\EvDriver());
-        return RevoltLoop::get();
+        return EventLoopAdapter::get();
     }
 }

test/EventTest.php

@@ -14,6 +14,6 @@ public function createLoop(): LoopInterface
         }
 
         EventLoop::setDriver(new EventLoop\Driver\EventDriver());
-        return EventLoop\Adapter\React\RevoltLoop::get();
+        return Internal\EventLoopAdapter::get();
     }
 }

test/EventTimerTest.php

@@ -4,6 +4,7 @@
 
 use React\EventLoop\LoopInterface;
 use Revolt\EventLoop;
+use Revolt\EventLoop\Adapter\React\Internal\EventLoopAdapter;
 
 class EventTimerTest extends TimerTest
 {
@@ -14,6 +15,6 @@ public function createLoop(): LoopInterface
         }
 
         EventLoop::setDriver(new EventLoop\Driver\EventDriver());
-        return RevoltLoop::get();
+        return EventLoopAdapter::get();
     }
 }

test/Test.php

@@ -5,6 +5,7 @@
 use React\EventLoop\LoopInterface;
 use React\Tests\EventLoop\AbstractLoopTest;
 use Revolt\EventLoop;
+use Revolt\EventLoop\Adapter\React\Internal\EventLoopAdapter;
 use Revolt\EventLoop\Adapter\React\Internal\Timer;
 use Revolt\EventLoop\Driver;
 use Revolt\EventLoop\Driver\StreamSelectDriver;
@@ -15,7 +16,7 @@ class Test extends AbstractLoopTest
     public function createLoop(): LoopInterface
     {
         EventLoop::setDriver(new StreamSelectDriver());
-        return RevoltLoop::get();
+        return EventLoopAdapter::get();
     }
 
     public function testIgnoreRemovedCallback()
@@ -58,7 +59,7 @@ public function testCancelTimerReturnsIfNotSet()
         $driver = $this->createMock(EventLoop\Driver::class);
         $driver->expects($this->never())->method($this->anything());
 
-        $loop = new RevoltLoop($driver);
+        $loop = new EventLoopAdapter($driver);
         $loop->cancelTimer($timer);
     }
 
@@ -74,7 +75,7 @@ public function testAddSignalUnsupportedFeatureExceptionIsCast()
         $driver = $this->createMock(Driver::class);
         $driver->method('onSignal')->with($signal, $listener)->willThrowException($exception);
 
-        $loop = new RevoltLoop($driver);
+        $loop = new EventLoopAdapter($driver);
         $loop->addSignal($signal, $listener);
     }
 }

test/TimerTest.php

@@ -5,12 +5,13 @@
 use React\EventLoop\LoopInterface;
 use React\Tests\EventLoop\Timer\AbstractTimerTest;
 use Revolt\EventLoop;
+use Revolt\EventLoop\Adapter\React\Internal\EventLoopAdapter;
 
 class TimerTest extends AbstractTimerTest
 {
     public function createLoop(): LoopInterface
     {
         EventLoop::setDriver(new EventLoop\Driver\StreamSelectDriver());
-        return RevoltLoop::get();
+        return EventLoopAdapter::get();
     }
 }